From 9551b16d7755fe21d4ddb56d853e27f87a4b0159 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Mon, 13 Mar 2023 00:08:06 +0100 Subject: [PATCH] Build world/area_mac/machi for PAL (#967) * Build machi and mac_00 for PAL * Import `segtypes.common.asm` * PAL rest of area_mac * fixup * tik * Rename gMasterGfxPos to gMainGfxPos * kgr * kgr * Use s32 for casts * PAL area_kmr * Cleanup * Fix defines --- Jenkinsfile | 12 +- include/common_structs.h | 4 + include/enums.h | 26 + include/macros.h | 6 + include/script_api/common.h | 1 + src/hud_element.h | 3 + src/world/area_kmr/kmr_00/kmr_00.h | 1 + src/world/area_kmr/kmr_00/kmr_00_3_revival.c | 261 +- src/world/area_kmr/kmr_02/kmr_02.h | 5 + src/world/area_kmr/kmr_02/kmr_02_2_main.c | 2 +- src/world/area_kmr/kmr_02/kmr_02_3_npc.c | 228 +- src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c | 30 +- src/world/area_kmr/kmr_02/kmr_02_5_entity.c | 24 +- src/world/area_kmr/kmr_02/kmr_02_7_kammy.c | 62 +- src/world/area_kmr/kmr_03/kmr_03_3_npc.c | 20 +- .../area_kmr/kmr_03/kmr_03_6_fall_down.c | 30 +- src/world/area_kmr/kmr_04/kmr_04_3_npc.c | 40 +- src/world/area_kmr/kmr_04/kmr_04_5_foliage.c | 14 +- src/world/area_kmr/kmr_05/kmr_05_3_npc.c | 4 +- src/world/area_kmr/kmr_07/kmr_07_3_npc.c | 46 +- src/world/area_kmr/kmr_11/kmr_11_3_scenes.c | 54 +- src/world/area_kmr/kmr_11/kmr_11_4_npc.c | 26 +- src/world/area_kmr/kmr_11/kmr_11_5_entity.c | 4 +- src/world/area_kmr/kmr_11/kmr_11_6_kammy.c | 14 +- .../area_kmr/kmr_20/kmr_20_11_npc_intro.c | 82 +- src/world/area_kmr/kmr_20/kmr_20_13_records.c | 26 +- .../area_kmr/kmr_20/kmr_20_4_documents.c | 2 +- src/world/area_kmr/kmr_21/kmr_21_1_main.c | 16 +- src/world/area_kmr/kmr_22/kmr_22_1_main.c | 30 +- src/world/area_kmr/kmr_23/kmr_23_2_npc.c | 18 +- .../area_mac/mac_00/mac_00_10_shared_npc.c | 18 +- src/world/area_mac/mac_00/mac_00_12_intro.c | 26 +- src/world/area_mac/mac_00/mac_00_2_main.c | 4 + src/world/area_mac/mac_01/mac_01_12_intro.c | 16 +- src/world/area_mac/mac_01/mac_01_2_main.c | 4 + src/world/area_mac/mac_01/mac_01_9_npc.c | 168 +- .../area_mac/mac_01/npc/flower_gate.inc.c | 18 +- src/world/area_mac/mac_02/npc/bootler.inc.c | 30 +- src/world/area_mac/mac_02/npc/tayce_t.inc.c | 14 +- src/world/area_mac/mac_03/mac_03_2_main.c | 4 + src/world/area_mac/mac_04/npc_muskular.inc.c | 60 +- .../area_mac/mac_04/npc_toybox_shyguy.inc.c | 42 +- src/world/area_mac/mac_04/npc_twink.inc.c | 24 +- src/world/area_mac/mac_05/mac_05_4_npc.c | 20 +- src/world/common/complete/Quizmo.inc.c | 13 + src/world/common/entity/SuperBlock.inc.c | 36 +- tools/build/configure.py | 3 +- tools/splat_ext/msg_pal_en.yaml | 8045 +++++++++++++++++ ver/pal/asm/header.s | 16 + ver/pal/checksum.sha1 | 1 + ver/pal/splat.yaml | 1368 +++ ver/pal/symbol_addrs.txt | 15 + ver/pal/undefined_funcs_auto.txt | 0 ver/pal/undefined_syms.txt | 519 ++ ver/pal/undefined_syms_auto.txt | 0 55 files changed, 10862 insertions(+), 693 deletions(-) create mode 100644 tools/splat_ext/msg_pal_en.yaml create mode 100644 ver/pal/asm/header.s create mode 100644 ver/pal/checksum.sha1 create mode 100644 ver/pal/splat.yaml create mode 100644 ver/pal/symbol_addrs.txt create mode 100644 ver/pal/undefined_funcs_auto.txt create mode 100644 ver/pal/undefined_syms.txt create mode 100644 ver/pal/undefined_syms_auto.txt diff --git a/Jenkinsfile b/Jenkinsfile index b0ed7c8031..17b22d53ac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,6 +9,7 @@ pipeline { sh 'cp /usr/local/etc/roms/papermario.us.z64 ver/us/baserom.z64' sh 'cp /usr/local/etc/roms/papermario.jp.z64 ver/jp/baserom.z64' sh 'cp /usr/local/etc/roms/papermario.ique.z64 ver/ique/baserom.z64' + sh 'cp /usr/local/etc/roms/papermario.pal.z64 ver/pal/baserom.z64' sh 'curl -L "https://github.com/pmret/gcc-papermario/releases/download/master/linux.tar.gz" | tar zx -C tools/build/cc/gcc' sh 'curl -L "https://github.com/pmret/binutils-papermario/releases/download/master/linux.tar.gz" | tar zx -C tools/build/cc/gcc' sh 'curl -L "https://github.com/decompals/ido-static-recomp/releases/download/v0.2/ido-5.3-recomp-ubuntu-latest.tar.gz" | tar zx -C tools/build/cc/ido5.3' @@ -35,6 +36,7 @@ pipeline { def us_progress = sh(returnStdout: true, script: "python3 progress.py us --pr-comment").trim() def jp_progress = sh(returnStdout: true, script: "python3 progress.py jp --pr-comment").trim() def ique_progress = sh(returnStdout: true, script: "python3 progress.py ique --pr-comment").trim() + def pal_progress = sh(returnStdout: true, script: "python3 progress.py pal --pr-comment").trim() def warnings = sh(returnStdout: true, script: "./tools/warnings_count/check_new_warnings.sh --jenkins").trim() def comment_id = -1 @@ -44,9 +46,9 @@ pipeline { } } - def message = "${us_progress}\n${jp_progress}\n${ique_progress}\n${warnings}" + def message = "${us_progress}\n${jp_progress}\n${ique_progress}\n${pal_progress}\n${warnings}" - if (message != "\n\n\n") { + if (message != "\n\n\n\n") { if (comment_id == -1) { echo message pullRequest.comment(message) @@ -74,6 +76,9 @@ pipeline { sh 'python3 progress.py ique --csv >> reports/progress_ique.csv' sh 'python3 progress.py ique --shield-json > reports/progress_ique_shield.json' + sh 'python3 progress.py pal --csv >> reports/progress_pal.csv' + sh 'python3 progress.py pal --shield-json > reports/progress_pal_shield.json' + sh 'cat build_log.txt | grep warning | sort > tools/warnings_count/warnings.txt' sh 'cp tools/warnings_count/warnings.txt reports/warnings.txt' @@ -98,6 +103,9 @@ pipeline { sh 'cat reports/progress_ique.csv >> /var/www/papermar.io/html/reports/progress_ique.csv' sh 'cat reports/progress_ique_shield.json > /var/www/papermar.io/html/reports/progress_ique_shield.json' + sh 'cat reports/progress_pal.csv >> /var/www/papermar.io/html/reports/progress_pal.csv' + sh 'cat reports/progress_pal_shield.json > /var/www/papermar.io/html/reports/progress_pal_shield.json' + sh 'cat reports/warnings.txt > /var/www/papermar.io/html/reports/warnings.txt' } } diff --git a/include/common_structs.h b/include/common_structs.h index cdb58991fb..5c393c4e65 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -2229,6 +2229,10 @@ typedef struct { /* 0x00030 */ Mtx camPerspMatrix[8]; // could only be length 4, unsure /* 0x00230 */ Gfx mainGfx[DISPLAYCONTEXT_GFX_COUNT]; /* 0x10630 */ Gfx backgroundGfx[0x200]; // used by gfx_task_background +#if VERSION_PAL + // TODO: find where this space belongs to + s32 pad[0x300]; +#endif /* 0x11630 */ Mtx matrixStack[0x200]; } DisplayContext; // size = 0x19630 diff --git a/include/enums.h b/include/enums.h index 578fb1fabb..8c4f99c20e 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2976,6 +2976,32 @@ enum DoorSounds { #ifdef VERSION_US #include "sprite/sprite_shading_profiles.h" +#elif VERSION_PAL +// TODO: remove and split shading profiles +enum ShadingProfile { + SHADING_NONE = 0xFFFFFFFF, + SHADING_TIK_01 = 0, + SHADING_TIK_02, + SHADING_TIK_03, + SHADING_TIK_04, + SHADING_TIK_05, + SHADING_TIK_06, + SHADING_TIK_07, + SHADING_TIK_08, + SHADING_TIK_09, + SHADING_TIK_10, + SHADING_TIK_12, + SHADING_TIK_14, + SHADING_TIK_15, + SHADING_TIK_18, + SHADING_TIK_20, + SHADING_TIK_21, + SHADING_TIK_22, + SHADING_TIK_23, + SHADING_TIK_24, + SHADING_TIK_25, + SHADING_KMR_30 = 0x10000, +}; #endif enum LightSourceFlags { diff --git a/include/macros.h b/include/macros.h index d14a6c9055..e8db412bf1 100644 --- a/include/macros.h +++ b/include/macros.h @@ -227,4 +227,10 @@ #define VLA 0 #endif +#if VERSION_PAL +#define DT (50.0f/60.0f) +#else +#define DT (1.0f) +#endif + #endif diff --git a/include/script_api/common.h b/include/script_api/common.h index d41b62a853..edc3c08649 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -337,6 +337,7 @@ ApiStatus MakeLocalVertexCopy(Evt* script, s32 isInitialCall); ApiStatus SetCustomGfx(Evt* script, s32 isInitialCall); ApiStatus SetCustomGfxBuilders(Evt* script, s32 isInitialCall); ApiStatus SetModelCustomGfx(Evt* script, s32 isInitialCall); +ApiStatus GetLanguage(Evt* script, s32 isInitialCall); ApiStatus SetModelTexVariant(Evt* script, s32 isInitialCall); ApiStatus SetNpcPaletteSwapMode(Evt* script, s32 isInitialCall); ApiStatus SetNpcPaletteSwapLower(Evt* script, s32 isInitialCall); diff --git a/src/hud_element.h b/src/hud_element.h index 1dc284a699..6be656c558 100644 --- a/src/hud_element.h +++ b/src/hud_element.h @@ -135,6 +135,9 @@ typedef struct PopupMenu { /* 0x328 */ s32 initialPos; /* 0x32C */ s16 result; /* 0x32E */ char unk_32E[0x2]; +#if VERSION_PAL + /* 0x330 */ char unk_330[0x14]; +#endif } PopupMenu; // size = 0x330 typedef struct Shop { diff --git a/src/world/area_kmr/kmr_00/kmr_00.h b/src/world/area_kmr/kmr_00/kmr_00.h index 2d4d6ce1e1..3e7b0b671a 100644 --- a/src/world/area_kmr/kmr_00/kmr_00.h +++ b/src/world/area_kmr/kmr_00/kmr_00.h @@ -31,6 +31,7 @@ enum { enum { MV_Unk_01 = MapVar(1), + MV_Unk_02 = MapVar(2), }; #define NAMESPACE kmr_00 diff --git a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c index 7b1a3edb98..4ee8b684ea 100644 --- a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c +++ b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c @@ -103,16 +103,30 @@ API_CALLABLE(N(func_802405F0_8AC580)) { FUNC_STATE_3 = 3 }; +#if VERSION_PAL +#define VAR_1 varTable[11] +#define VAR_2 varTable[12] +#else +#define VAR_1 functionTemp[3] +#define VAR_2 varTable[14] +#endif + Bytecode* args = script->ptrReadPos; ApiStatus retVal = ApiStatus_BLOCK; Npc* npc; + s32 var; if (isInitialCall) { script->functionTemp[1] = evt_get_variable(script, *args++); script->functionTemp[2] = evt_get_variable(script, *args++); script->varTable[15] = evt_get_variable(script, *args++); script->functionTemp[0] = FUNC_STATE_0; - script->functionTemp[3] = 0; + script->VAR_1 = 0; +#if VERSION_PAL + script->varTable[13] = 0; + script->VAR_2 = 0; + script->varTable[14] = 0; +#endif } npc = get_npc_unsafe(script->functionTemp[1]); @@ -121,12 +135,12 @@ API_CALLABLE(N(func_802405F0_8AC580)) { npc->pos.x = 0.0f; npc->pos.y = NPC_DISPOSE_POS_Y; npc->pos.z = -50.0f; - npc->moveToPos.x = script->functionTemp[3] * 3; + npc->moveToPos.x = script->VAR_1 * 3; npc->moveToPos.y = 3.0f; - if (script->functionTemp[3] >= script->varTable[15]) { + if (script->VAR_1 >= script->varTable[15]) { npc->pos.y = 100.0f; - add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); - npc->pos.y += (-npc->pos.z + -50.0f + 70.0f) * 0.15f; + add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f / DT, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); + npc->pos.y += (-npc->pos.z + -50.0f + 70.0f / DT) * 0.15f; sfx_play_sound_at_position(SOUND_B000001E, SOUND_SPACE_MODE_0, npc->pos.x, npc->pos.y, npc->pos.z); fx_sparkles(FX_SPARKLES_0, npc->pos.x, npc->pos.y + 20.0f, npc->pos.z, 20.0f); script->functionTemp[0] = FUNC_STATE_1; @@ -136,49 +150,65 @@ API_CALLABLE(N(func_802405F0_8AC580)) { npc->pos.x = 0.0f; npc->pos.z = -50.0f; npc->pos.y = 100.0f; - add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); - npc->pos.y += (-npc->pos.z + -50.0f + 70.0f) * 0.15f; - if ((script->functionTemp[3] + script->functionTemp[2]) == - (((script->functionTemp[3] + script->functionTemp[2]) / 13) * 13)) { + add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f / DT, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); + npc->pos.y += (-npc->pos.z + -50.0f + 70.0f / DT) * 0.15f; + if ((script->VAR_1 + script->functionTemp[2]) == + (((script->VAR_1 + script->functionTemp[2]) / 13) * 13)) { fx_sparkles(FX_SPARKLES_3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f); } - if (script->functionTemp[3] > 256) { + if (script->VAR_1 > 256) { script->functionTemp[0] = FUNC_STATE_2; - script->varTable[14] = 0; + script->VAR_2 = 0; } break; case FUNC_STATE_2: npc->pos.x = 0.0f; npc->pos.z = -50.0f; - npc->pos.y = 100.0f - (script->varTable[14] * 0.3f); - add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); - npc->pos.y += (-npc->pos.z + -50.0f + 70.0f) * 0.15f; - if ((script->functionTemp[3] + script->functionTemp[2]) == - (((script->functionTemp[3] + script->functionTemp[2]) / 13) * 13)) { + npc->pos.y = 100.0f - (script->VAR_2 * 0.3f); + add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f / DT, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); + npc->pos.y += (-npc->pos.z + -50.0f + 70.0f / DT) * 0.15f; + if ((script->VAR_1 + script->functionTemp[2]) == + (((script->VAR_1 + script->functionTemp[2]) / 13) * 13)) { fx_sparkles(FX_SPARKLES_3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f); } - if (script->varTable[14]++ > 180) { + if (script->VAR_2++ > 180) { script->functionTemp[0] = FUNC_STATE_3; - script->varTable[14] = 0; + script->VAR_2 = 0; } + +#if VERSION_PAL + script->varTable[14] += 0x10000; + script->VAR_2 = script->varTable[14] >> 16; +#endif break; case FUNC_STATE_3: npc->moveToPos.y -= 0.03f; npc->pos.x = 0.0f; npc->pos.z = -50.0f; npc->pos.y = 45.999996f; - add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); - npc->pos.y += (-npc->pos.z + -50.0f + 70.0f) * 0.15f; - if ((script->functionTemp[3] + script->functionTemp[2]) == - (((script->functionTemp[3] + script->functionTemp[2]) / 13) * 13)) { + add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f / DT, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); + npc->pos.y += (-npc->pos.z + -50.0f + 70.0f / DT) * 0.15f; + if ((script->VAR_1 + script->functionTemp[2]) == + (((script->VAR_1 + script->functionTemp[2]) / 13) * 13)) { fx_sparkles(FX_SPARKLES_3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f); } if (npc->moveToPos.y < 0.0f) { +#if VERSION_PAL + var = evt_get_variable(NULL, MV_Unk_02); + evt_set_variable(NULL, MV_Unk_02, var + 1); +#endif retVal = ApiStatus_DONE2; } break; } + +#if VERSION_PAL + script->varTable[13] += 0x10000; + script->varTable[11] = script->varTable[13] >> 16; +#else script->functionTemp[3]++; +#endif + npc->moveToPos.x += npc->moveToPos.y; return retVal; } @@ -205,6 +235,16 @@ API_CALLABLE(N(func_80240BD8_8ACB68)) { return ApiStatus_BLOCK; } +#if VERSION_PAL +API_CALLABLE(N(func_PAL_80240D08)) { + if (evt_get_variable(NULL, MV_Unk_02) == 7) { + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} +#endif + EvtScript N(EVS_Scene_MarioRevived) = { EVT_IF_GE(GB_StoryProgress, STORY_CH0_WAKE_UP) EVT_CALL(EnableModel, MODEL_reef_1, FALSE) @@ -239,63 +279,70 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(func_802D4D14, 180) EVT_CALL(SetPlayerPos, 0, 2, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Fallen) - EVT_WAIT(60) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.7)) + EVT_WAIT(60 * DT) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.7 / DT)) EVT_CALL(SetCamDistance, CAM_DEFAULT, -350) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD EVT_WAIT(2) EVT_SETF(LVar0, 0) EVT_SETF(LVar1, 0) - EVT_LOOP(90) + EVT_LOOP(90 * DT) EVT_CALL(TranslateModel, MODEL_reef_3, LVar0, 0, 0) EVT_CALL(TranslateModel, MODEL_reef_4, LVar1, 0, 0) - EVT_ADDF(LVar0, EVT_FLOAT(-0.66)) - EVT_ADDF(LVar1, EVT_FLOAT(0.66)) + EVT_ADDF(LVar0, EVT_FLOAT(-0.66 / DT)) +#if VERSION_PAL + EVT_ADDF(LVar1, EVT_FLOAT(0.79296875)) // 0.66 / DT rounds slightly off +#else + EVT_ADDF(LVar1, EVT_FLOAT(0.66 / DT)) +#endif EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_SETF(LVar0, 0) EVT_SETF(LVar1, 0) - EVT_LOOP(120) + EVT_LOOP(120 * DT) EVT_CALL(TranslateModel, MODEL_reef_1, LVar0, 0, 0) EVT_CALL(TranslateModel, MODEL_reef_2, LVar1, 0, 0) EVT_CALL(TranslateModel, MODEL_moku2, LVar1, 0, 0) EVT_CALL(TranslateModel, MODEL_ha2_1, LVar1, 0, 0) EVT_CALL(TranslateModel, MODEL_ha2_2, LVar1, 0, 0) EVT_CALL(TranslateModel, MODEL_ha2_3, LVar1, 0, 0) - EVT_ADDF(LVar0, EVT_FLOAT(-0.75)) - EVT_ADDF(LVar1, EVT_FLOAT(0.75)) + EVT_ADDF(LVar0, EVT_FLOAT(-0.75 / DT)) + EVT_ADDF(LVar1, EVT_FLOAT(0.75 / DT)) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_SETF(LVar0, 0) EVT_SETF(LVar1, 0) - EVT_LOOP(120) + EVT_LOOP(120 * DT) EVT_CALL(TranslateModel, MODEL_moku1, LVar0, 0, 0) EVT_CALL(TranslateModel, MODEL_ha1, LVar0, 0, 0) EVT_CALL(TranslateModel, MODEL_ha2, LVar0, 0, 0) EVT_CALL(RotateModel, MODEL_moku1, LVar1, 0, 1, 0) EVT_CALL(RotateModel, MODEL_ha1, LVar1, 0, 1, 0) EVT_CALL(RotateModel, MODEL_ha2, LVar1, 0, 1, 0) - EVT_ADDF(LVar0, EVT_FLOAT(-0.2)) - EVT_ADDF(LVar1, EVT_FLOAT(-0.4)) + EVT_ADDF(LVar0, EVT_FLOAT(-0.2 / DT)) + EVT_ADDF(LVar1, EVT_FLOAT(-0.4 / DT)) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - EVT_WAIT(140) + EVT_WAIT(140 * DT) EVT_CALL(N(func_80240584_8AC514)) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetMusicTrack, 0, SONG_STAR_SPIRIT_THEME, 0, 8) EVT_THREAD - EVT_CALL(N(func_80240000_8ABF90), 50, 50, 50, 0, 0, 0, 50) + EVT_CALL(N(func_80240000_8ABF90), 50, 50, 50, 0, 0, 0, 50 * DT) EVT_END_THREAD - EVT_WAIT(90) + EVT_WAIT(90 * DT) EVT_CALL(func_802D4D88) +#if VERSION_PAL + EVT_SET(MV_Unk_02, 0) +#endif EVT_THREAD EVT_CALL(N(func_802405F0_8AC580), 1, 0, 180) EVT_END_THREAD @@ -318,8 +365,8 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(N(func_802405F0_8AC580), 7, 6, 120) EVT_END_THREAD EVT_THREAD - EVT_WAIT(330) - EVT_CALL(MakeLerp, 6000, 12000, 120, EASING_LINEAR) + EVT_WAIT(330 * DT) + EVT_CALL(MakeLerp, 6000, 12000, 120 * DT, EASING_LINEAR) EVT_LABEL(25) EVT_CALL(UpdateLerp) EVT_CALL(N(func_802404E8_8AC478)) @@ -328,59 +375,65 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_GOTO(25) EVT_END_IF EVT_END_THREAD - EVT_WAIT(550) + EVT_WAIT(550 * DT) +#if VERSION_PAL + EVT_WAIT(15 * DT) + EVT_CALL(N(func_PAL_80240D08)) +#endif EVT_CALL(GetNpcPos, NPC_Kalmar, LVar6, LVar7, LVar8) EVT_CALL(GetNpcPos, NPC_Mamar, LVar9, LVarA, LVarB) +#if !VERSION_PAL EVT_WAIT(15) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) +#endif + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetCamDistance, CAM_DEFAULT, -200) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_LeanLeft) - EVT_CALL(NpcFlyTo, NPC_Kalmar, 20, 10, -5, 25, -10, EASING_QUADRATIC_OUT) - EVT_WAIT(10) + EVT_CALL(NpcFlyTo, NPC_Kalmar, 20, 10, -5, 25 * DT, -10, EASING_QUADRATIC_OUT) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_LeanLeftAlt) - EVT_WAIT(35) + EVT_WAIT(35 * DT) EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_LeanRight) EVT_END_THREAD EVT_THREAD EVT_LOOP(3) EVT_CALL(N(func_80240530_8AC4C0), NPC_Kalmar) - EVT_WAIT(6) + EVT_WAIT(6 * DT) EVT_END_LOOP EVT_END_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD EVT_CALL(N(func_80240530_8AC4C0), NPC_Mamar) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_LeanLeft) - EVT_CALL(NpcFlyTo, NPC_Mamar, -20, 10, -5, 25, -10, EASING_QUADRATIC_OUT) - EVT_WAIT(5) + EVT_CALL(NpcFlyTo, NPC_Mamar, -20, 10, -5, 25 * DT, -10, EASING_QUADRATIC_OUT) + EVT_WAIT(5 * DT) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_LeanLeftAlt) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_LeanRight) EVT_END_THREAD EVT_THREAD EVT_LOOP(3) EVT_CALL(N(func_80240530_8AC4C0), NPC_Mamar) - EVT_WAIT(6) + EVT_WAIT(6 * DT) EVT_END_LOOP EVT_END_THREAD - EVT_WAIT(35) + EVT_WAIT(35 * DT) EVT_CALL(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, 5, MSG_CH0_0000) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SpeakToPlayer, NPC_Kalmar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, 5, MSG_CH0_0001) EVT_WAIT(3) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_LeanLeftAlt) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_LeanRight) - EVT_WAIT(10) - EVT_CALL(NpcFlyTo, NPC_Kalmar, LVar6, LVar7, LVar8, 15, -10, EASING_CUBIC_OUT) + EVT_WAIT(10 * DT) + EVT_CALL(NpcFlyTo, NPC_Kalmar, LVar6, LVar7, LVar8, 15 * DT, -10, EASING_CUBIC_OUT) EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Idle) EVT_END_THREAD EVT_THREAD - EVT_WAIT(40) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_WAIT(40 * DT) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetCamDistance, CAM_DEFAULT, -350) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_LOOP(3) @@ -390,28 +443,28 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_LeanLeftAlt) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_LeanRight) - EVT_WAIT(10) - EVT_CALL(NpcFlyTo, NPC_Mamar, LVar9, LVarA, LVarB, 15, -10, EASING_CUBIC_OUT) + EVT_WAIT(10 * DT) + EVT_CALL(NpcFlyTo, NPC_Mamar, LVar9, LVarA, LVarB, 15 * DT, -10, EASING_CUBIC_OUT) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Idle) EVT_END_THREAD EVT_THREAD - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_LOOP(3) EVT_CALL(N(func_80240530_8AC4C0), NPC_Mamar) EVT_WAIT(4) EVT_END_LOOP EVT_END_THREAD - EVT_WAIT(90) + EVT_WAIT(90 * DT) EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Wave, 5, MSG_CH0_0002) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_THREAD EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Leap) EVT_CALL(SetNpcJumpscale, NPC_Eldstar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Eldstar, LVar6, LVar7, LVar8) - EVT_CALL(NpcJump0, NPC_Eldstar, LVar6, LVar7, LVar8, 5) + EVT_CALL(NpcJump0, NPC_Eldstar, LVar6, LVar7, LVar8, 5 * DT) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Idle) EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 0, 0, 3, 10) @@ -422,7 +475,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Mamar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Mamar, LVar6, LVar7, LVar8) - EVT_CALL(NpcJump0, NPC_Mamar, LVar6, LVar7, LVar8, 5) + EVT_CALL(NpcJump0, NPC_Mamar, LVar6, LVar7, LVar8, 5 * DT) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Idle) EVT_END_THREAD EVT_THREAD @@ -431,7 +484,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Skolar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Skolar, LVar6, LVar7, LVar8) - EVT_CALL(NpcJump0, NPC_Skolar, LVar6, LVar7, LVar8, 5) + EVT_CALL(NpcJump0, NPC_Skolar, LVar6, LVar7, LVar8, 5 * DT) EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_Idle) EVT_END_THREAD EVT_THREAD @@ -440,7 +493,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Muskular, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Muskular, LVar6, LVar7, LVar8) - EVT_CALL(NpcJump0, NPC_Muskular, LVar6, LVar7, LVar8, 5) + EVT_CALL(NpcJump0, NPC_Muskular, LVar6, LVar7, LVar8, 5 * DT) EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Idle) EVT_END_THREAD EVT_THREAD @@ -449,7 +502,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(SetNpcFlagBits, NPC_Misstar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Misstar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Misstar, LVar6, LVar7, LVar8) - EVT_CALL(NpcJump0, NPC_Misstar, LVar6, LVar7, LVar8, 5) + EVT_CALL(NpcJump0, NPC_Misstar, LVar6, LVar7, LVar8, 5 * DT) EVT_CALL(SetNpcAnimation, NPC_Misstar, ANIM_WorldMisstar_Idle) EVT_END_THREAD EVT_THREAD @@ -458,7 +511,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Klevar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Klevar, LVar6, LVar7, LVar8) - EVT_CALL(NpcJump0, NPC_Klevar, LVar6, LVar7, LVar8, 5) + EVT_CALL(NpcJump0, NPC_Klevar, LVar6, LVar7, LVar8, 5 * DT) EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Idle) EVT_END_THREAD EVT_THREAD @@ -467,42 +520,42 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_TOUCHES_GROUND, FALSE) EVT_CALL(SetNpcJumpscale, NPC_Kalmar, EVT_FLOAT(3.2)) EVT_CALL(GetNpcPos, NPC_Kalmar, LVar6, LVar7, LVar8) - EVT_CALL(NpcJump0, NPC_Kalmar, LVar6, LVar7, LVar8, 5) + EVT_CALL(NpcJump0, NPC_Kalmar, LVar6, LVar7, LVar8, 5 * DT) EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Idle) EVT_END_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_THREAD - EVT_WAIT(45) + EVT_WAIT(45 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802404A0_8AC430)) EVT_END_THREAD EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 10, 10, 3, 10) - EVT_WAIT(6) + EVT_WAIT(6 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 0, 10, 3, 15) - EVT_WAIT(6) + EVT_WAIT(6 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, -10, 10, 3, 20) - EVT_WAIT(6) + EVT_WAIT(6 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 10, 10, 3, 25) - EVT_WAIT(6) + EVT_WAIT(6 * DT) EVT_LOOP(3) EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 0, 10, 3, 30) - EVT_WAIT(6) + EVT_WAIT(6 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, -10, 10, 3, 30) - EVT_WAIT(6) + EVT_WAIT(6 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, SOUND_SPACE_MODE_0) EVT_CALL(N(func_802403B8_8AC348), 0, 10, 10, 3, 30) - EVT_WAIT(6) + EVT_WAIT(6 * DT) EVT_END_LOOP - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Wave, 5, MSG_CH0_0003) EVT_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(N(func_80240BD8_8ACB68), 5) EVT_WAIT(2) EVT_CALL(N(func_80240BD8_8ACB68), 2) @@ -517,14 +570,14 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_WAIT(2) EVT_CALL(N(func_80240BD8_8ACB68), 1) EVT_END_THREAD - EVT_CALL(FadeOutMusic, 0, 0x00001388) + EVT_CALL(FadeOutMusic, 0, 5000 * DT) EVT_THREAD - EVT_WAIT(90) + EVT_WAIT(90 * DT) EVT_CALL(N(func_802405A8_8AC538)) EVT_END_THREAD - EVT_WAIT(60) - EVT_CALL(N(func_80240000_8ABF90), 255, 255, 255, 0, 0, 0, 50) - EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(3.0)) + EVT_WAIT(60 * DT) + EVT_CALL(N(func_80240000_8ABF90), 255, 255, 255, 0, 0, 0, 50 * DT) + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) EVT_CALL(EnableNpcShadow, NPC_Goombaria, TRUE) @@ -533,42 +586,42 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(NpcMoveTo, NPC_Goombaria, 110, 0, 0) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Stand) EVT_CALL(InterpNpcYaw, NPC_Goombaria, 90, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpNpcYaw, NPC_Goombaria, 270, 1) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(InterpNpcYaw, NPC_Goombaria, 90, 1) - EVT_WAIT(18) + EVT_WAIT(18 * DT) EVT_CALL(InterpNpcYaw, NPC_Goombaria, 270, 1) - EVT_WAIT(10) - EVT_WAIT(6) + EVT_WAIT(10 * DT) + EVT_WAIT(6 * DT) EVT_CALL(SetCamDistance, CAM_DEFAULT, 200) EVT_CALL(SetCamPitch, CAM_DEFAULT, 15, -12) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(GetNpcPos, NPC_Goombaria, LVar3, LVar4, LVar5) EVT_ADD(LVar3, -20) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_LeanOver) EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Goombaria, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Stand) EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Stand, 5, MSG_CH0_0004) EVT_CALL(SetCamSpeed, CAM_DEFAULT, 1) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, 0) - EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Run) EVT_CALL(NpcMoveTo, NPC_Goombaria, 30, -10, 0) EVT_WAIT(2) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Inspect) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Inspect, ANIM_Goombaria_Inspect, 5, MSG_CH0_0005) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Talk) EVT_CALL(NpcJump0, NPC_Goombaria, 30, 0, -10, 4) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_LeanOver) EVT_CALL(NpcJump0, NPC_Goombaria, 30, 0, -10, 4) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Stand, 5, MSG_CH0_0006) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Run) EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(6.0)) @@ -594,16 +647,16 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(NpcFacePlayer, NPC_Goombaria, 5) EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(4.0)) EVT_CALL(NpcJump0, NPC_Goombaria, 33, 0, 5, 4) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Stand, 5, MSG_CH0_0007) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_THREAD - EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(4.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Goombaria, 450, 0, 0) EVT_END_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Stand, 5, MSG_CH0_0008) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_SET(GB_StoryProgress, STORY_CH0_WAKE_UP) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(N(func_802405CC_8AC55C)) diff --git a/src/world/area_kmr/kmr_02/kmr_02.h b/src/world/area_kmr/kmr_02/kmr_02.h index 1d6f40f8ae..2270edd98d 100644 --- a/src/world/area_kmr/kmr_02/kmr_02.h +++ b/src/world/area_kmr/kmr_02/kmr_02.h @@ -39,8 +39,13 @@ enum { enum { MV_Unk_00 = MapVar(0), MV_Unk_01 = MapVar(1), +#if VERSION_PAL + MV_Unk_04 = MapVar(5), + MV_Unk_05 = MapVar(6), +#else MV_Unk_04 = MapVar(4), MV_Unk_05 = MapVar(5), +#endif }; enum { diff --git a/src/world/area_kmr/kmr_02/kmr_02_2_main.c b/src/world/area_kmr/kmr_02/kmr_02_2_main.c index d050781cae..5c9958b2a7 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_2_main.c +++ b/src/world/area_kmr/kmr_02/kmr_02_2_main.c @@ -50,7 +50,7 @@ EvtScript N(EVS_EnterMap) = { EVT_EXEC(EnterWalk) EVT_IF_EQ(GF_KMR02_ReturnedWithGoompa, FALSE) EVT_CALL(DisablePlayerInput, TRUE) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 4, MSG_CH0_001C) EVT_CALL(EnablePartnerAI) diff --git a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c index dbc4f657da..c792173989 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c +++ b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c @@ -135,10 +135,10 @@ EvtScript N(EVS_NpcInteract_Goombario) = { EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) EVT_IF_EQ(GF_KMR02_Met_Goombario, FALSE) EVT_SET(GF_KMR02_Met_Goombario, TRUE) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 0, EVT_FLOAT(-275.0), EVT_FLOAT(15.2), EVT_FLOAT(-7.5)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0 * DT), 0, EVT_FLOAT(-275.0), EVT_FLOAT(15.2), EVT_FLOAT(-7.5)) EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 5, MSG_CH0_004D) EVT_THREAD - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 * DT)) EVT_END_THREAD EVT_ELSE EVT_IF_EQ(GF_KMR02_Goombario_SwapDialogue, FALSE) @@ -402,7 +402,7 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(NpcMoveTo, NPC_PARTNER, -295, -30, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyWalk) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_269, SOUND_SPACE_MODE_0) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySoundAtCollider, COLLIDER_mm1, SOUND_1D2, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 120, 20, EASING_COS_IN_OUT) EVT_LABEL(0) @@ -428,56 +428,56 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -189, 0, -40) EVT_CALL(SetPanTarget, CAM_DEFAULT, -189, 0, -40) EVT_CALL(SetCamDistance, CAM_DEFAULT, -350) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.3)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.3 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD - EVT_CALL(SetNpcSpeed, NPC_Goombario, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_Goombario, EVT_FLOAT(4.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Run) EVT_CALL(NpcMoveTo, NPC_Goombario, -109, -61, 0) EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Idle) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(4.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_SadRun) EVT_CALL(NpcMoveTo, NPC_Goombaria, -142, -95, 0) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_SadIdle) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, -238, -33, 0) EVT_END_THREAD EVT_CALL(N(func_80242014_8B2084)) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyWalk) EVT_CALL(NpcMoveTo, NPC_PARTNER, -168, -15, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyIdle) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToNpc, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, NPC_PARTNER, MSG_CH0_001E) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToNpc, NPC_Goombaria, ANIM_Goombaria_SadTalk, ANIM_Goombaria_SadIdle, 0, NPC_PARTNER, MSG_CH0_001F) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_Goompa_WearyTalk, ANIM_Goompa_WearyIdle, 0, NPC_Goombario, MSG_CH0_0020) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -79, 0, -10) EVT_CALL(SetPanTarget, CAM_DEFAULT, -22, 0, 12) EVT_CALL(SetCamDistance, CAM_DEFAULT, -350) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.4)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.4 / DT)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD - EVT_WAIT(30) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_WAIT(30 * DT) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, -79, -10, 0) EVT_END_THREAD EVT_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Run) EVT_CALL(NpcMoveTo, NPC_Goombario, -45, 40, 0) EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Idle) EVT_END_THREAD EVT_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_SadRun) EVT_CALL(NpcMoveTo, NPC_Goombaria, -23, -21, 0) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_SadIdle) @@ -486,10 +486,10 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(NpcMoveTo, NPC_PARTNER, 30, 35, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyIdle) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_WearyTalk, ANIM_Goompa_WearyIdle, 0, MSG_CH0_0021) - EVT_WAIT(10) - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(4.0)) + EVT_WAIT(10 * DT) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(4.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyWalk) EVT_CALL(NpcMoveTo, NPC_PARTNER, 41, -147, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyIdle) @@ -522,16 +522,16 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(-350.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(PlayerFaceNpc, NPC_Goombario, TRUE) EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0022) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(ShowChoice, MSG_Choice_0011) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_CALL(CloseMessage) @@ -540,28 +540,28 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(PlayerFaceNpc, NPC_Goombaria, TRUE) EVT_CALL(PlayerMoveTo, -50, -24, 0) EVT_CALL(InterpPlayerYaw, 94, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_EXEC_WAIT(N(EVS_HandOverDolly)) EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_SadTalk, ANIM_Goombaria_SadIdle, 0, MSG_CH0_0024) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Inspect) EVT_CALL(InterpNpcYaw, NPC_Goombaria, 90, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpNpcYaw, NPC_Goombaria, 270, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Idle) EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0025) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_GIVE_STAR_PIECE() EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0026) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_EXEC(N(EVS_Goombaria_Kiss)) EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_Goombaria, -30, 0, -19, 10) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_5, 1, 1, 1, 0) - EVT_WAIT(35) - EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(3.0)) + EVT_WAIT(35 * DT) + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Walk) EVT_CALL(NpcMoveTo, NPC_Goombaria, -23, -21, 0) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Idle) @@ -569,30 +569,30 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(PlayerMoveTo, -85, -10, 0) EVT_CALL(PlayerFaceNpc, NPC_Goombaria, TRUE) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CASE_EQ(1) EVT_CALL(ContinueSpeech, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0023) EVT_SET(GF_KMR02_KeptDolly, TRUE) EVT_WAIT(10) EVT_END_SWITCH EVT_THREAD - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), 30, EVT_FLOAT(-275.0), EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT), 30, EVT_FLOAT(-275.0), EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_ELSE EVT_THREAD - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), 30, EVT_FLOAT(-275.0), EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT), 30, EVT_FLOAT(-275.0), EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_END_IF EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0027) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0028) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0029) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_SET(LVar0, 0) EVT_LOOP(10) @@ -602,7 +602,7 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_END_LOOP EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_THREAD - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(2.0), 40, EVT_FLOAT(-350.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(2.0 / DT), 40, EVT_FLOAT(-350.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) EVT_END_THREAD EVT_CALL(SetNpcPos, NPC_PARTNER, 127, 0, -157) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Run) @@ -622,27 +622,27 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_END_LOOP EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_002A) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToNpc, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, NPC_PARTNER, MSG_CH0_002B) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Run) EVT_CALL(NpcMoveTo, NPC_PARTNER, 3, 9, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) EVT_CALL(PlayerFaceNpc, NPC_PARTNER, 3) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_002C) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Walk) EVT_CALL(NpcMoveTo, NPC_PARTNER, -60, -14, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_GIVE_BADGE_REWARD(ITEM_POWER_JUMP) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Walk) EVT_CALL(NpcMoveTo, NPC_PARTNER, 3, 9, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_EXEC_WAIT(N(EVS_PromptForBadgeTutorial)) EVT_CALL(EnableNpcAI, NPC_Goombario, FALSE) EVT_CALL(EnableNpcAI, NPC_Goombaria, FALSE) @@ -650,20 +650,20 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(EnableNpcAI, NPC_Goomama, FALSE) EVT_CALL(N(LoadHeartBlockMsgImg)) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_0031) - EVT_WAIT(10) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), 30, EVT_FLOAT(-275.0), EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) + EVT_WAIT(10 * DT) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT), 30, EVT_FLOAT(-275.0), EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_0032) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD EVT_CALL(NpcFacePlayer, NPC_Goombaria, 3) EVT_END_THREAD EVT_CALL(NpcFacePlayer, NPC_Goombario, 3) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0033) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD EVT_CALL(GetAngleBetweenNPCs, NPC_Goombaria, NPC_PARTNER, LVar0) EVT_CALL(InterpNpcYaw, NPC_Goombaria, LVar0, 3) @@ -671,32 +671,32 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(GetAngleBetweenNPCs, NPC_Goombario, NPC_PARTNER, LVar0) EVT_CALL(InterpNpcYaw, NPC_Goombario, LVar0, 3) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_0034) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(NpcFacePlayer, NPC_Goombario, 3) EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0035) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(NpcFacePlayer, NPC_Goombaria, 3) EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0036) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(GetAngleBetweenNPCs, NPC_Goombario, NPC_PARTNER, LVar0) EVT_CALL(InterpNpcYaw, NPC_Goombario, LVar0, 3) EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, NPC_Goombario, MSG_CH0_0037) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcJumpscale, NPC_Goombario, EVT_FLOAT(1.2)) EVT_CALL(GetNpcPos, NPC_Goombario, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_Goombario, LVar0, LVar1, LVar2, 7) + EVT_CALL(NpcJump0, NPC_Goombario, LVar0, LVar1, LVar2, 7 * DT) EVT_CALL(SpeakToNpc, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, NPC_PARTNER, MSG_CH0_0038) EVT_CALL(N(LoadPartyImage)) EVT_EXEC(N(EVS_PushNewPartnerSong)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0189, 160, 40) EVT_EXEC(N(EVS_PopSong)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToNpc, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, NPC_Goombario, MSG_CH0_0039) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_003A) - EVT_WAIT(10) - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_WAIT(10 * DT) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Run) EVT_CALL(NpcMoveTo, NPC_PARTNER, 41, -143, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) @@ -729,7 +729,7 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_003C) EVT_END_IF EVT_CALL(N(ChangeNpcToPartner), NPC_Goombario, PARTNER_GOOMBARIO) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcPos, NPC_Goombario, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcFlagBits, NPC_Goombario, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcPos, NPC_Gooma, 115, 0, -309) @@ -743,7 +743,7 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(EnableNpcAI, NPC_Gooma, TRUE) EVT_CALL(EnableNpcAI, NPC_Goomama, TRUE) EVT_THREAD - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_END_THREAD EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(EnablePartnerAI) @@ -850,14 +850,14 @@ EvtScript N(EVS_NpcInteract_Goompa) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) EVT_IF_EQ(GF_KMR02_Met_Goompa, FALSE) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 0, EVT_FLOAT(-275.0), EVT_FLOAT(20.0), EVT_FLOAT(-8.5)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0 * DT), 0, EVT_FLOAT(-275.0), EVT_FLOAT(20.0), EVT_FLOAT(-8.5)) EVT_EXEC_WAIT(N(EVS_Goompa_TurnAround)) EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_0019) EVT_EXEC_WAIT(N(EVS_Goompa_TurnBack)) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 499, 0, -378) EVT_CALL(SetPanTarget, CAM_DEFAULT, 499, 70, -378) EVT_CALL(SetCamDistance, CAM_DEFAULT, 370) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 * DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_SET(GF_KMR02_Met_Goompa, TRUE) EVT_SET(GB_StoryProgress, STORY_CH0_MET_GOOMPA) @@ -943,7 +943,7 @@ EvtScript N(EVS_NpcInit_Goompa) = { EvtScript N(D_8024BEF8_8BBF68) = { EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_Walk) - EVT_CALL(NpcMoveTo, NPC_Goompapa, 272, 281, 20) + EVT_CALL(NpcMoveTo, NPC_Goompapa, 272, 281, 20 * DT) EVT_CALL(GetNpcYaw, NPC_Goompapa, LVar3) EVT_SET(LVar4, LVar3) EVT_ADD(LVar4, 180) @@ -951,7 +951,7 @@ EvtScript N(D_8024BEF8_8BBF68) = { EVT_WAIT(7) EVT_CALL(InterpNpcYaw, NPC_Goompapa, LVar3, 0) EVT_WAIT(7) - EVT_CALL(NpcMoveTo, NPC_Goompapa, 266, 228, 20) + EVT_CALL(NpcMoveTo, NPC_Goompapa, 266, 228, 20 * DT) EVT_CALL(GetNpcYaw, NPC_Goompapa, LVar3) EVT_SET(LVar4, LVar3) EVT_ADD(LVar4, 180) @@ -1219,10 +1219,10 @@ EvtScript N(EVS_NpcInteract_Gooma) = { EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) EVT_IF_EQ(GF_KMR02_Met_Gooma, FALSE) EVT_SET(GF_KMR02_Met_Gooma, TRUE) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 0, EVT_FLOAT(-275.5), EVT_FLOAT(15.5), EVT_FLOAT(-10.0)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0 * DT), 0, EVT_FLOAT(-275.5), EVT_FLOAT(15.5), EVT_FLOAT(-10.0)) EVT_CALL(SpeakToPlayer, NPC_Gooma, ANIM_Gooma_Talk, ANIM_Gooma_Idle, 5, MSG_CH0_009C) EVT_THREAD - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 * DT)) EVT_END_THREAD EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_Gooma, ANIM_Gooma_Talk, ANIM_Gooma_Idle, 5, MSG_CH0_009D) @@ -1446,7 +1446,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(InterpPlayerYaw, 143, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_LayingDown) EVT_CALL(GetPlayerPos, -220, 33, -342) - EVT_WAIT(90) + EVT_WAIT(90 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Eldstar_02, SOUND_2041, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -198, 115, -272, 10) EVT_CALL(SetNpcPos, NPC_Eldstar_02, -198, 140, -272) @@ -1454,7 +1454,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_SETF(MV_Unk_00, 0) EVT_CALL(BindNpcAI, NPC_Eldstar_02, EVT_PTR(N(EVS_NpcAI_Eldstar_02))) EVT_THREAD - EVT_CALL(MakeLerp, 0, 120, 80, EASING_LINEAR) + EVT_CALL(MakeLerp, 0, 120, 80 * DT, EASING_LINEAR) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(func_802CFD30, NPC_Eldstar_02, FOLD_TYPE_7, LVar0, 0, 0, 0) @@ -1464,7 +1464,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_END_IF EVT_END_THREAD EVT_THREAD - EVT_CALL(MakeLerp, 0, 2880, 80, EASING_QUADRATIC_OUT) + EVT_CALL(MakeLerp, 0, 2880, 80 * DT, EASING_QUADRATIC_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(SetNpcRotation, NPC_Eldstar_02, 0, LVar0, 0) @@ -1474,7 +1474,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_END_IF EVT_END_THREAD EVT_THREAD - EVT_CALL(MakeLerp, 140, 60, 80, EASING_QUADRATIC_OUT) + EVT_CALL(MakeLerp, 140, 60, 80 * DT, EASING_QUADRATIC_OUT) EVT_LABEL(2) EVT_CALL(UpdateLerp) EVT_CALL(SetNpcPos, NPC_Eldstar_02, -198, LVar0, -272) @@ -1483,7 +1483,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_GOTO(2) EVT_END_IF EVT_END_THREAD - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -1494,7 +1494,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_Eldstar_02, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 0, MSG_CH0_0009) - EVT_CALL(MakeLerp, 120, 60, 20, EASING_LINEAR) + EVT_CALL(MakeLerp, 120, 60, 20 * DT, EASING_LINEAR) EVT_LABEL(5) EVT_CALL(UpdateLerp) EVT_SET(MV_Unk_01, LVar0) @@ -1512,9 +1512,9 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(-190.0), EVT_FLOAT(-310.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD - EVT_CALL(MakeLerp, 60, 0, 40, EASING_LINEAR) + EVT_CALL(MakeLerp, 60, 0, 40 * DT, EASING_LINEAR) EVT_LABEL(6) EVT_CALL(UpdateLerp) EVT_CALL(func_802CFD30, NPC_Eldstar_02, FOLD_TYPE_7, LVar0, 0, 0, 0) @@ -1526,19 +1526,19 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(BindNpcAI, NPC_Eldstar_02, EVT_PTR(N(EVS_NpcAI_Eldstar_02_NoAI))) EVT_CALL(GetNpcPos, NPC_Eldstar_02, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Eldstar_02, SOUND_2041, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) EVT_CALL(SetNpcPos, NPC_Eldstar_02, NPC_DISPOSE_LOCATION) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_EXEC(N(EVS_FadeOutMusic)) EVT_THREAD EVT_CALL(N(func_80242F08_8B2F78)) - EVT_CALL(N(func_80242BC0_8B2C30), 255, 255, 255, 0, 0, 0, 50) + EVT_CALL(N(func_80242BC0_8B2C30), 255, 255, 255, 0, 0, 0, 50 * DT) EVT_END_THREAD - EVT_WAIT(110) + EVT_WAIT(110 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SitIdle) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetGroupVisibility, MODEL_Root, MODEL_GROUP_VISIBLE) EVT_CALL(N(func_80242F28_8B2F98)) EVT_CALL(EnableModel, MODEL_o561, FALSE) @@ -1548,28 +1548,28 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(PlayerJump, -180, 19, -335, 10) EVT_CALL(InterpPlayerYaw, 143, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(InterpPlayerYaw, 143, 3) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 323, 3) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 143, 3) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 323, 3) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 143, 3) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 323, 3) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(SetNpcPos, NPC_Toad, -197, 39, -188) EVT_CALL(SetNpcAnimation, NPC_Toad, ANIM_Toad_Red_Walk) EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_GRAVITY, TRUE) EVT_THREAD EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit7, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) - EVT_CALL(MakeLerp, 0, 90, 10, EASING_LINEAR) + EVT_CALL(MakeLerp, 0, 90, 10 * DT, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) EVT_CALL(RotateModel, MODEL_o275, LVar0, 0, 1, 0) @@ -1577,8 +1577,8 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_WAIT(10) - EVT_CALL(MakeLerp, 90, 0, 10, EASING_LINEAR) + EVT_WAIT(10 * DT) + EVT_CALL(MakeLerp, 90, 0, 10 * DT, EASING_LINEAR) EVT_LABEL(11) EVT_CALL(UpdateLerp) EVT_CALL(RotateModel, MODEL_o275, LVar0, 0, 1, 0) @@ -1588,61 +1588,61 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_END_IF EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit7, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD - EVT_CALL(NpcMoveTo, NPC_Toad, -192, -230, 20) + EVT_CALL(NpcMoveTo, NPC_Toad, -192, -230, 20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000A) - EVT_WAIT(5) - EVT_CALL(NpcMoveTo, NPC_Toad, -160, -310, 33) + EVT_WAIT(5 * DT) + EVT_CALL(NpcMoveTo, NPC_Toad, -160, -310, 33 * DT) EVT_CALL(SetNpcAnimation, NPC_Toad, ANIM_Toad_Red_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000B) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000C) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_JoltAwake) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000D) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 0, EVT_FLOAT(-300.0), EVT_FLOAT(20.0), EVT_FLOAT(-10.0)) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Surprise) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000E) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000F) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Question) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 60, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_WAIT(55) + EVT_WAIT(55 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_0010) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_0011) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(-375.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(-9.0)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 10) + EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(BindNpcInteract, NPC_Toad, EVT_PTR(N(EVS_NpcInteract_Toad))) EVT_SET(GB_StoryProgress, STORY_CH0_MET_INNKEEPER) diff --git a/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c b/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c index 81ddcef7c3..f22515d7cf 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c +++ b/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c @@ -102,7 +102,7 @@ EvtScript N(EVS_RoomListener_Verdana) = { EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_DONE) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetGroupVisibility, MODEL_monohoshi, MODEL_GROUP_HIDDEN) EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) EVT_IF_GT(GB_StoryProgress, STORY_CH0_GATE_CRUSHED) @@ -137,29 +137,29 @@ EvtScript N(EVS_RoomListener_Verdana) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_LOOP(3) EVT_CALL(SetGroupVisibility, MODEL_monohoshi, MODEL_GROUP_VISIBLE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetGroupVisibility, MODEL_monohoshi, MODEL_GROUP_HIDDEN) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_END_LOOP EVT_CALL(FadeOutMusic, 0, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Surprise) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, 233, 1) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 53, 1) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(InterpPlayerYaw, 233, 1) - EVT_WAIT(3) + EVT_WAIT(3 * DT) EVT_CALL(InterpPlayerYaw, 53, 1) - EVT_WAIT(3) - EVT_WAIT(10) + EVT_WAIT(3 * DT) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_SET(GB_StoryProgress, STORY_CH0_FELL_OFF_CLIFF) EVT_END_IF EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicStill) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 150) @@ -171,7 +171,7 @@ EvtScript N(EVS_RoomListener_Verdana) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_THREAD EVT_LOOP(0) - EVT_SUB(LVar1, 16) + EVT_SUB(LVar1, 16 / DT) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_END_LOOP @@ -180,15 +180,15 @@ EvtScript N(EVS_RoomListener_Verdana) = { EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_THREAD EVT_LOOP(0) - EVT_SUB(LVar1, 16) + EVT_SUB(LVar1, 16 / DT) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_END_IF - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(GotoMap, EVT_PTR("kmr_03"), kmr_03_ENTRY_2) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_END_IF EVT_END_IF EVT_END_SWITCH diff --git a/src/world/area_kmr/kmr_02/kmr_02_5_entity.c b/src/world/area_kmr/kmr_02/kmr_02_5_entity.c index 13f2e80807..437f7dead0 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_5_entity.c +++ b/src/world/area_kmr/kmr_02/kmr_02_5_entity.c @@ -50,13 +50,13 @@ API_CALLABLE(N(AnimateBlockScale)) { EvtScript N(EVS_OnSmash_GateBlock) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0066) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(N(PlayerHasBadgeEquipped)) EVT_IF_EQ(LVar0, FALSE) EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0067) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_END_IF EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt2, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(GB_StoryProgress, STORY_CH0_SMASHED_GATE_BLOCK) @@ -69,16 +69,16 @@ EvtScript N(EVS_SummonGateBlock) = { EVT_CALL(PlaySoundAt, SOUND_207A, SOUND_SPACE_MODE_0, 373, 88, 255) EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, 373, 88, 255, 1, 100) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlaySoundAt, SOUND_207B, SOUND_SPACE_MODE_0, 326, 150, 261) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, 326, 150, 261, 1, 60) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, 326, 150, 261, 1, 60) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, 326, 150, 261, 1, 60) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, 326, 150, 261, 1, 60) - EVT_WAIT(3) + EVT_WAIT(3 * DT) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, 326, 150, 261, 1, 60) EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer1Block), 326, 120, 261, 148, MAKE_ENTITY_END) EVT_SET(LVarA, LVar0) @@ -86,7 +86,7 @@ EvtScript N(EVS_SummonGateBlock) = { EVT_CALL(N(AnimateBlockScale)) EVT_SET(LVar9, LVarA) EVT_CALL(N(GetEntityPosition), LVar9, LVar2, LVar3, LVar4) - EVT_CALL(MakeLerp, LVar3, 300, 20, EASING_QUADRATIC_IN) + EVT_CALL(MakeLerp, LVar3, 300, 20 * DT, EASING_QUADRATIC_IN) EVT_LABEL(10) EVT_CALL(UpdateLerp) EVT_CALL(N(SetEntityPositionF), LVar9, LVar2, LVar0, LVar4) @@ -95,14 +95,14 @@ EvtScript N(EVS_SummonGateBlock) = { EVT_GOTO(10) EVT_END_IF EVT_CALL(PlaySoundAt, SOUND_207C, SOUND_SPACE_MODE_0, LVar2, LVar0, LVar4) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) EVT_THREAD EVT_WAIT(15) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar2, 0, LVar4, 0) EVT_END_THREAD EVT_CALL(PlaySoundAt, SOUND_207D, SOUND_SPACE_MODE_0, LVar2, LVar0, LVar4) - EVT_CALL(MakeLerp, 300, 0, 20, EASING_CUBIC_IN) + EVT_CALL(MakeLerp, 300, 0, 20 * DT, EASING_CUBIC_IN) EVT_LABEL(20) EVT_CALL(UpdateLerp) EVT_CALL(N(SetEntityPositionF), LVar9, LVar2, LVar0, LVar4) @@ -114,7 +114,7 @@ EvtScript N(EVS_SummonGateBlock) = { EVT_CALL(EnableGroup, MODEL_1, FALSE) EVT_CALL(PlaySoundAt, SOUND_DD, SOUND_SPACE_MODE_0, LVar2, LVar0, LVar4) EVT_THREAD - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15 * DT, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c index 28941e320b..f0cfb5e2a2 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c +++ b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c @@ -45,7 +45,7 @@ Vec3f N(FlightPath_KammyDepart)[] = { EvtScript N(EVS_PlayKammyFlightSounds) = { EVT_LOOP(0) EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_295, SOUND_SPACE_MODE_0) - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_END_LOOP EVT_RETURN EVT_END @@ -91,7 +91,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_THREAD EVT_EXEC_GET_TID(N(EVS_PlayKammyFlightSounds), MV_Unk_04) EVT_EXEC_GET_TID(N(EVS_MakeNpcsFaceKammy), MV_Unk_05) - EVT_CALL(LoadPath, 40, EVT_PTR(N(FlightPath_KammyAppear)), ARRAY_COUNT(N(FlightPath_KammyAppear)), EASING_LINEAR) + EVT_CALL(LoadPath, 40 * DT, EVT_PTR(N(FlightPath_KammyAppear)), ARRAY_COUNT(N(FlightPath_KammyAppear)), EASING_LINEAR) EVT_LABEL(10) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_Kammy, LVar1, LVar2, LVar3) @@ -100,9 +100,9 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_GOTO(10) EVT_END_IF EVT_END_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Shocked) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) EVT_CALL(SetCamPitch, CAM_DEFAULT, 3, 0) @@ -113,7 +113,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) - EVT_CALL(LoadPath, 120, EVT_PTR(N(FlightPath_ToGate1)), ARRAY_COUNT(N(FlightPath_ToGate1)), EASING_LINEAR) + EVT_CALL(LoadPath, 120 * DT, EVT_PTR(N(FlightPath_ToGate1)), ARRAY_COUNT(N(FlightPath_ToGate1)), EASING_LINEAR) EVT_LABEL(20) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_Kammy, LVar1, LVar2, LVar3) @@ -121,7 +121,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_IF_EQ(LVar0, 1) EVT_GOTO(20) EVT_END_IF - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) EVT_CALL(SetCamPitch, CAM_DEFAULT, 8, -10) EVT_CALL(SetCamPosA, CAM_DEFAULT, 41, 729) @@ -138,7 +138,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_CALL(SetPlayerPos, 220, 0, 213) EVT_CALL(SetNpcPos, NPC_Goompapa, 255, 0, 232) EVT_CALL(SetNpcPos, NPC_Goombaria, 190, 0, 212) - EVT_CALL(LoadPath, 10, EVT_PTR(N(FlightPath_ToGate2)), ARRAY_COUNT(N(FlightPath_ToGate2)), EASING_LINEAR) + EVT_CALL(LoadPath, 10 * DT, EVT_PTR(N(FlightPath_ToGate2)), ARRAY_COUNT(N(FlightPath_ToGate2)), EASING_LINEAR) EVT_LABEL(30) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_Kammy, LVar1, LVar2, LVar3) @@ -180,7 +180,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_IF_EQ(LVar0, 1) EVT_GOTO(40) EVT_END_IF - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13) EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 512, MSG_CH0_005A) EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) @@ -210,26 +210,26 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_EXEC_WAIT(N(EVS_SummonGateBlock)) EVT_THREAD EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicHoverStill) EVT_CALL(func_802D286C, 256) EVT_CALL(func_802D2520, ANIM_MarioW2_PanicHoverStill, 5, 0, 1, 1, 0) - EVT_WAIT(13) + EVT_WAIT(13 * DT) EVT_CALL(func_802D2520, ANIM_MarioW2_PanicHoverStill, 0, 0, 0, 0, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicHover) EVT_CALL(func_802D286C, 256) EVT_CALL(func_802D2520, ANIM_MarioW2_PanicHover, 5, 0, 1, 1, 0) - EVT_WAIT(13) + EVT_WAIT(13 * DT) EVT_CALL(func_802D2520, ANIM_MarioW2_PanicHover, 0, 0, 0, 0, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.8)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 25) + EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 25 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_THREAD @@ -238,7 +238,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_CALL(func_802CFD30, NPC_Goombaria, FOLD_TYPE_5, 0, 1, 1, 0) EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(1.5)) EVT_CALL(GetNpcPos, NPC_Goombaria, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_Goombaria, LVar0, LVar1, LVar2, 25) + EVT_CALL(NpcJump0, NPC_Goombaria, LVar0, LVar1, LVar2, 25 * DT) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_LookUp) EVT_CALL(func_802CFD30, NPC_Goombaria, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_END_THREAD @@ -247,10 +247,10 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_Shock) EVT_CALL(SetNpcJumpscale, NPC_Goompapa, EVT_FLOAT(1.2)) EVT_CALL(GetNpcPos, NPC_Goompapa, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_Goompapa, LVar0, LVar1, LVar2, 25) + EVT_CALL(NpcJump0, NPC_Goompapa, LVar0, LVar1, LVar2, 25 * DT) EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_LookUp) EVT_CALL(func_802CFD30, NPC_Goompapa, FOLD_TYPE_NONE, 0, 0, 0, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13) EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(6.0), EVT_FLOAT(-6.0)) @@ -260,7 +260,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 512, MSG_CH0_005D) EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) EVT_CALL(SetCamPitch, CAM_DEFAULT, 3, 0) @@ -268,10 +268,10 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_CALL(SetCamPosB, CAM_DEFAULT, 159, 0) EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, EVT_FLOAT(109.7)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 1220) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD - EVT_LOOP(150) + EVT_LOOP(150 * DT) EVT_CALL(PlayerFaceNpc, NPC_Kammy, FALSE) EVT_CALL(GetAngleBetweenNPCs, NPC_Goombaria, NPC_Kammy, LVar0) EVT_CALL(InterpNpcYaw, NPC_Goombaria, LVar0, 0) @@ -282,11 +282,11 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim15) EVT_EXEC_GET_TID(N(EVS_MakeNpcsFaceKammy), MV_Unk_05) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 0x200, MSG_CH0_005E) - EVT_CALL(FadeOutMusic, 0, 3000) + EVT_CALL(FadeOutMusic, 0, 3000 * DT) EVT_EXEC_GET_TID(N(EVS_PlayKammyFlightSounds), MV_Unk_04) - EVT_CALL(LoadPath, 90, EVT_PTR(N(FlightPath_KammyDepart)), ARRAY_COUNT(N(FlightPath_KammyDepart)), EASING_QUADRATIC_IN) + EVT_CALL(LoadPath, 90 * DT, EVT_PTR(N(FlightPath_KammyDepart)), ARRAY_COUNT(N(FlightPath_KammyDepart)), EASING_QUADRATIC_IN) EVT_LABEL(70) EVT_CALL(GetNextPathPos) EVT_CALL(SetNpcPos, NPC_Kammy, LVar1, LVar2, LVar3) @@ -296,7 +296,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_END_IF EVT_KILL_THREAD(MV_Unk_04) EVT_KILL_THREAD(MV_Unk_05) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_Angry) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Idle) @@ -306,19 +306,19 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_CALL(GetAngleToPlayer, NPC_Goombaria, LVar0) EVT_CALL(InterpNpcYaw, NPC_Goombaria, LVar0, 0) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, EVT_FLOAT(-300.0), EVT_FLOAT(12.0), EVT_FLOAT(-8.5)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_AngryTalk, ANIM_Goompapa_Angry, 0, MSG_CH0_005F) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_Idle) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0060) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0061) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0062) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcSpeed, NPC_Goombario, EVT_FLOAT(2.0)) EVT_CALL(EnableNpcAI, NPC_Goombario, TRUE) EVT_CALL(EnableNpcAI, NPC_Goomama, TRUE) @@ -333,7 +333,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_CALL(EnableNpcShadow, NPC_Goompa, FALSE) EVT_SET(GB_StoryProgress, STORY_CH0_GATE_CRUSHED) EVT_THREAD - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_END_THREAD EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c index 069b9776d1..7f39824144 100644 --- a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c +++ b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c @@ -65,39 +65,39 @@ EvtScript N(EVS_NpcAI_Goompa) = { EVT_CALL(SetNpcAux, NPC_Goompa, 0) EVT_CALL(PlaySoundAtNpc, NPC_Goompa, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Goompa, EMOTE_EXCLAMATION, 45, 15, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A6) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -220, 20, -72) EVT_CALL(SetPanTarget, CAM_DEFAULT, -20, 0, 68) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.5)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 275) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) EVT_CALL(PlayerMoveTo, -38, 68, 0) EVT_END_THREAD EVT_CALL(GetNpcPos, NPC_Goompa, LVar7, LVar8, LVar9) - EVT_CALL(SetNpcSpeed, NPC_Goompa, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_Goompa, EVT_FLOAT(4.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_Goompa, ANIM_Goompa_Run) EVT_CALL(NpcMoveTo, NPC_Goompa, 0, 70, 0) EVT_CALL(SetNpcAnimation, NPC_Goompa, ANIM_Goompa_Idle) - EVT_CALL(InterpNpcYaw, NPC_Goompa, 276, 20) - EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_Goompa, 276, 20 * DT) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A7) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A8) EVT_CALL(N(ChangeNpcToPartner), 0, 5) EVT_SET(GB_StoryProgress, STORY_CH0_GOOMPA_JOINED_PARTY) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -220, 20, -72) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) diff --git a/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c b/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c index 57efd5cf43..85315f5591 100644 --- a/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c +++ b/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c @@ -11,7 +11,7 @@ EvtScript N(EVS_Scene_FallingDown) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetPlayerPos, -224, 20, -80) EVT_CALL(SetNpcPos, NPC_PARTNER, -224, 20, -80) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -26,17 +26,17 @@ EvtScript N(EVS_Scene_FallingDown) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerPos, LVar0, NPC_DISPOSE_POS_Y, LVar2) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetCamDistance, CAM_DEFAULT, 220) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_THREAD - EVT_WAIT(18) + EVT_WAIT(18 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_175, SOUND_SPACE_MODE_0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_176, SOUND_SPACE_MODE_0) - EVT_WAIT(28) + EVT_WAIT(28 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_175, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(HidePlayerShadow, TRUE) @@ -46,33 +46,37 @@ EvtScript N(EVS_Scene_FallingDown) = { EVT_LABEL(0) EVT_WAIT(1) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) +#if VERSION_PAL + EVT_ADDF(LVar1, EVT_FLOAT(-2 * DT)) +#else EVT_ADD(LVar1, -2) +#endif EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) EVT_IF_GT(LVar1, 86) EVT_GOTO(0) EVT_END_IF EVT_CALL(SetPlayerPos, -310, 20, -80) EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPanTarget, CAM_DEFAULT, -310, 20, -80) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_END_THREAD EVT_CALL(func_802D286C, 0x00002800) EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 5, 1, 1, 0) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) EVT_CALL(HidePlayerShadow, FALSE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) - EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 10) + EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_THREAD - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 * DT)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -80,7 +84,7 @@ EvtScript N(EVS_Scene_FallingDown) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_END_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN diff --git a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c index 65a4c7198b..1cb0b9f9e3 100644 --- a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c +++ b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c @@ -44,14 +44,14 @@ EvtScript N(EVS_NpcAI_Goompa) = { EVT_CALL(func_802CF56C, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 30) - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcMoveTo, LVar0, LVar1, LVar2, 0) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A9) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) EVT_CALL(EnablePartnerAI) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_SET(GB_StoryProgress, STORY_CH0_LOOKING_FOR_HAMMER) EVT_CASE_EQ(STORY_CH0_FOUND_HAMMER) @@ -79,14 +79,14 @@ EvtScript N(EVS_NpcAI_Goompa) = { EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_PARTNER, 420, 6, 0) EVT_THREAD - EVT_WAIT(3) + EVT_WAIT(3 * DT) EVT_CALL(PlayerFaceNpc, NPC_PARTNER, 3) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00AC) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, 395, 0, 0) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_END_THREAD @@ -98,11 +98,11 @@ EvtScript N(EVS_NpcAI_Goompa) = { EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8, FALSE) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_61, SOUND_SPACE_MODE_0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00AD) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD EVT_SET(LVar0, 0) EVT_CALL(SetNpcRotationPivot, NPC_PARTNER, 10) - EVT_LOOP(60) + EVT_LOOP(60 * DT) EVT_ADD(LVar0, 53) EVT_CALL(SetNpcRotation, NPC_PARTNER, 0, 0, LVar0) EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) @@ -112,15 +112,15 @@ EvtScript N(EVS_NpcAI_Goompa) = { EVT_CALL(SetNpcRotation, NPC_PARTNER, 0, 0, 0) EVT_END_THREAD EVT_THREAD - EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15 * DT, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_PLAY_EFFECT(EFFECT_DAMAGE_STARS, 1, 495, 15, 9, 460, 15, 9, 6) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Injured) - EVT_CALL(NpcMoveTo, NPC_PARTNER, 250, 6, 60) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 250, 6, 60 * DT) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Injured) EVT_CALL(SetNpcRotation, NPC_PARTNER, 0, 0, 0) EVT_THREAD - EVT_LOOP(20) + EVT_LOOP(20 * DT) EVT_CALL(SetNpcPos, NPC_PARTNER, 250, 0, 6) EVT_WAIT(3) EVT_CALL(SetNpcPos, NPC_PARTNER, 250, 0, 0) @@ -155,13 +155,13 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { EVT_CASE_EQ(1) EVT_EXEC(N(EVS_SetJrTroopaMusic)) EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, 430, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.5), EVT_FLOAT(-7.5)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_END_THREAD @@ -169,18 +169,18 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_WAIT(1) EVT_CALL(PlayerFaceNpc, NPC_JrTroopa, 3) - EVT_CALL(SetNpcSpeed, NPC_JrTroopa, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_JrTroopa, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_JrTroopa_Run) EVT_CALL(NpcMoveTo, NPC_JrTroopa, 465, 0, 0) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_JrTroopa_PointIdle) EVT_CALL(PlayerFaceNpc, NPC_JrTroopa, 3) EVT_CALL(SpeakToPlayer, NPC_JrTroopa, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_PointIdle, 0, MSG_CH0_00AE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, 430, LVar1, LVar2) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) @@ -214,11 +214,11 @@ EvtScript N(EVS_NpcDefeat_JrTroopa) = { EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Hurt) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_Hurt, ANIM_JrTroopa_Hurt, 0, MSG_CH0_00B5) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(6.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(6.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Run) EVT_CALL(NpcMoveTo, NPC_SELF, 564, 10, 0) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(SetNpcPos, NPC_SELF, 564, 0, 10) EVT_CALL(NpcMoveTo, NPC_SELF, 435, 10, 0) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_PointIdle, 0, MSG_CH0_00B6) @@ -226,7 +226,11 @@ EvtScript N(EVS_NpcDefeat_JrTroopa) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Idle) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_THREAD +#if VERSION_PAL + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4 * DT)) +#else EVT_CALL(ResetCam, CAM_DEFAULT, 4) +#endif EVT_END_THREAD EVT_EXEC(N(EVS_SetNormalMusic)) EVT_SET(AB_KMR_0, 0) diff --git a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c index ae50afeeba..17a3c35f7d 100644 --- a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c +++ b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c @@ -48,7 +48,7 @@ EvtScript N(EVS_GotHammer) = { EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 9, LVar5, LVar6, LVar7, EVT_FLOAT(1.0), 100) EVT_EXEC(N(EVS_PlayUpgradeSong)) EVT_THREAD - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) EVT_ADD(LVar4, 50) EVT_ADD(LVar5, 2) @@ -75,19 +75,23 @@ EvtScript N(EVS_OnSearch_HammerBush) = { EVT_SET(MF_Unk_12, FALSE) EVT_EXEC(N(EVS_GotHammer)) EVT_CALL(N(GiveWoodenHammer)) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(N(SetMessageImage_HammerBlock)) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Inspect_FoundHammer, 160, 40) EVT_SET(MF_Unk_12, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00AA) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) EVT_SET(GB_StoryProgress, STORY_CH0_FOUND_HAMMER) EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) EVT_CALL(EnablePartnerAI) EVT_THREAD +#if VERSION_PAL + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3 * DT)) +#else EVT_CALL(ResetCam, CAM_DEFAULT, 3) +#endif EVT_END_THREAD EVT_RETURN EVT_END @@ -109,7 +113,7 @@ EvtScript N(EVS_OnSearchBush8) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(MakeLerp, 0, 85, 20, EASING_COS_IN_OUT) + EVT_CALL(MakeLerp, 0, 85, 20 * DT, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(RotateModel, MODEL_o213, LVar0, 1, 0, 0) @@ -118,7 +122,7 @@ EvtScript N(EVS_OnSearchBush8) = { EVT_GOTO(0) EVT_END_IF EVT_EXEC_WAIT(N(EVS_OnSearch_HammerBush)) - EVT_CALL(MakeLerp, 85, 0, 20, EASING_COS_IN_OUT) + EVT_CALL(MakeLerp, 85, 0, 20 * DT, EASING_COS_IN_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) EVT_CALL(RotateModel, MODEL_o213, LVar0, 1, 0, 0) diff --git a/src/world/area_kmr/kmr_05/kmr_05_3_npc.c b/src/world/area_kmr/kmr_05/kmr_05_3_npc.c index 23188e95e6..2283982586 100644 --- a/src/world/area_kmr/kmr_05/kmr_05_3_npc.c +++ b/src/world/area_kmr/kmr_05/kmr_05_3_npc.c @@ -6,8 +6,8 @@ EvtScript N(EVS_GoompaRemark) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_WAIT(10) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_WAIT(10 * DT) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, -60, -19, 0) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00B7) diff --git a/src/world/area_kmr/kmr_07/kmr_07_3_npc.c b/src/world/area_kmr/kmr_07/kmr_07_3_npc.c index 3e00ed3bfd..177f2efd85 100644 --- a/src/world/area_kmr/kmr_07/kmr_07_3_npc.c +++ b/src/world/area_kmr/kmr_07/kmr_07_3_npc.c @@ -46,11 +46,11 @@ EvtScript N(EVS_NpcIdle_GoombaBros_Red) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 360, 80, 35) EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_THREAD - EVT_CALL(SetNpcSpeed, NPC_GoombaBros_Red, EVT_FLOAT(6.0)) + EVT_CALL(SetNpcSpeed, NPC_GoombaBros_Red, EVT_FLOAT(6.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_GoombaBros_Red, ANIM_GoombaBros_Red_Walk) EVT_SET(LVar0, 0) EVT_EXEC_GET_TID(N(EVS_PlayWalkingSounds), LVarA) @@ -59,7 +59,7 @@ EvtScript N(EVS_NpcIdle_GoombaBros_Red) = { EVT_CALL(SetNpcAnimation, NPC_GoombaBros_Red, ANIM_GoombaBros_Red_Idle) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_GoombaBros_Blue, ANIM_GoombaBros_Blue_Walk) - EVT_CALL(SetNpcSpeed, NPC_GoombaBros_Blue, EVT_FLOAT(6.0)) + EVT_CALL(SetNpcSpeed, NPC_GoombaBros_Blue, EVT_FLOAT(6.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_GoombaBros_Blue, ANIM_GoombaBros_Blue_Walk) EVT_SET(LVar0, 1) EVT_EXEC_GET_TID(N(EVS_PlayWalkingSounds), LVarA) @@ -67,37 +67,37 @@ EvtScript N(EVS_NpcIdle_GoombaBros_Red) = { EVT_KILL_THREAD(LVarA) EVT_CALL(SetNpcAnimation, NPC_GoombaBros_Blue, ANIM_GoombaBros_Blue_Idle) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(SpeakToPlayer, NPC_GoombaBros_Red, ANIM_GoombaBros_Red_Talk, ANIM_GoombaBros_Red_Idle, 0, MSG_CH0_00BC) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPanTarget, CAM_DEFAULT, 270, 80, 45) EVT_CALL(SetCamDistance, CAM_DEFAULT, 450) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-3.0)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_GoombaBros_Red, ANIM_GoombaBros_Red_Talk, ANIM_GoombaBros_Red_Idle, 0, MSG_CH0_00BD) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_GoombaBros_Blue, ANIM_GoombaBros_Blue_Talk, ANIM_GoombaBros_Blue_Idle, 0, MSG_CH0_00BE) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD EVT_WAIT(5) EVT_CALL(SetNpcJumpscale, NPC_GoombaBros_Blue, EVT_FLOAT(0.8)) EVT_CALL(SetNpcAnimation, NPC_GoombaBros_Blue, ANIM_GoombaBros_Blue_Walk) EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Blue, SOUND_10F, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_GoombaBros_Blue, 267, 0, 28, 30) + EVT_CALL(NpcJump0, NPC_GoombaBros_Blue, 267, 0, 28, 30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcJumpscale, NPC_GoombaBros_Red, EVT_FLOAT(0.8)) EVT_CALL(SetNpcAnimation, NPC_GoombaBros_Red, ANIM_GoombaBros_Red_Walk) EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Red, SOUND_10F, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_GoombaBros_Red, 276, 0, 55, 30) + EVT_CALL(NpcJump0, NPC_GoombaBros_Red, 276, 0, 55, 30 * DT) EVT_END_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) @@ -107,7 +107,7 @@ EvtScript N(EVS_NpcIdle_GoombaBros_Red) = { EvtScript N(EVS_NpcDefeat_GoombaBros_Red) = { EVT_THREAD - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetMusicTrack, 0, SONG_GOOMBA_BROS_RETREAT, 0, 8) EVT_END_THREAD EVT_CALL(GetBattleOutcome, LVar0) @@ -123,12 +123,12 @@ EvtScript N(EVS_NpcDefeat_GoombaBros_Red) = { EVT_CALL(SetNpcJumpscale, NPC_GoombaBros_Blue, EVT_FLOAT(1.8)) EVT_CALL(SetNpcAnimation, NPC_GoombaBros_Blue, ANIM_GoombaBros_Blue_CryWalk) EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Blue, SOUND_10F, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_GoombaBros_Blue, 307, 25, 49, 20) + EVT_CALL(NpcJump0, NPC_GoombaBros_Blue, 307, 25, 49, 20 * DT) EVT_CALL(N(PlaySpringReboundAnimation)) EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Blue, SOUND_2086, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_GoombaBros_Blue, 401, 80, 25, 30) - EVT_WAIT(5) - EVT_CALL(SetNpcSpeed, NPC_GoombaBros_Blue, EVT_FLOAT(6.0)) + EVT_CALL(NpcJump0, NPC_GoombaBros_Blue, 401, 80, 25, 30 * DT) + EVT_WAIT(5 * DT) + EVT_CALL(SetNpcSpeed, NPC_GoombaBros_Blue, EVT_FLOAT(6.0 / DT)) EVT_SET(LVar0, 1) EVT_EXEC_GET_TID(N(EVS_PlayWalkingSounds), LVarA) EVT_CALL(NpcMoveTo, NPC_GoombaBros_Blue, 616, -47, 0) @@ -137,16 +137,16 @@ EvtScript N(EVS_NpcDefeat_GoombaBros_Red) = { EVT_CALL(SetNpcPos, NPC_GoombaBros_Blue, NPC_DISPOSE_LOCATION) EVT_WAIT(1) EVT_END_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcJumpscale, NPC_GoombaBros_Red, EVT_FLOAT(1.8)) EVT_CALL(SetNpcAnimation, NPC_GoombaBros_Red, ANIM_GoombaBros_Red_CryWalk) EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Red, SOUND_10F, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_GoombaBros_Red, 307, 25, 49, 20) + EVT_CALL(NpcJump0, NPC_GoombaBros_Red, 307, 25, 49, 20 * DT) EVT_CALL(N(PlaySpringReboundAnimation)) EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Red, SOUND_2086, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_GoombaBros_Red, 401, 80, 25, 30) - EVT_WAIT(5) - EVT_CALL(SetNpcSpeed, NPC_GoombaBros_Red, EVT_FLOAT(6.0)) + EVT_CALL(NpcJump0, NPC_GoombaBros_Red, 401, 80, 25, 30 * DT) + EVT_WAIT(5 * DT) + EVT_CALL(SetNpcSpeed, NPC_GoombaBros_Red, EVT_FLOAT(6.0 / DT)) EVT_SET(LVar0, 0) EVT_EXEC_GET_TID(N(EVS_PlayWalkingSounds), LVarA) EVT_CALL(NpcMoveTo, NPC_GoombaBros_Red, 616, -47, 0) diff --git a/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c b/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c index 52c8b5be34..0bbd56d09f 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c +++ b/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c @@ -207,17 +207,17 @@ EvtScript N(EVS_Scene_SelfDestruct) = { EVT_CALL(SetCamPosA, CAM_DEFAULT, -389, -12) EVT_CALL(SetCamPosB, CAM_DEFAULT, -469, 156) EVT_CALL(SetPanTarget, CAM_DEFAULT, -389, 120, -12) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 * DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetNpcPos, NPC_GoombaKing, -380, 0, -42) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcJumpscale, NPC_GoombaKing, EVT_FLOAT(0.8)) EVT_CALL(NpcFacePlayer, NPC_GoombaKing, 0) EVT_CALL(PlaySoundAtNpc, NPC_GoombaKing, SOUND_3E7, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump1, NPC_GoombaKing, -380, 120, -42, 25) + EVT_CALL(NpcJump1, NPC_GoombaKing, -380, 120, -42, 25 * DT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerPos, -497, 0, 130) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(SetNpcPos, NPC_PARTNER, -534, 0, 127) @@ -230,7 +230,7 @@ EvtScript N(EVS_Scene_SelfDestruct) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.7)) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -100, 0) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(SpeakToPlayer, NPC_GoombaKing, ANIM_GoombaKing_Idle, ANIM_GoombaKing_Idle, 0, MSG_CH0_00D9) EVT_LOOP(100) EVT_CALL(GetNpcPos, NPC_GoombaKing, LVar0, LVar1, LVar2) @@ -315,16 +315,16 @@ EvtScript N(EVS_BouncePlayerAndPartner) = { EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_EXEC_WAIT(N(EVS_FocusCam_FortressExterior)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.3)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.3 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, EVT_FLOAT(0.5), 1) - EVT_WAIT(170) + EVT_WAIT(170 * DT) EVT_CALL(SetNpcPos, NPC_BlueGoombaBro, -830, 0, -70) EVT_CALL(SetNpcPos, NPC_RedGoombaBro, -800, 0, -20) EVT_CALL(SetNpcAnimation, NPC_BlueGoombaBro, ANIM_GoombaBros_Blue_CryRun) EVT_CALL(SetNpcAnimation, NPC_RedGoombaBro, ANIM_GoombaBros_Red_CryRun) - EVT_CALL(SetNpcSpeed, NPC_BlueGoombaBro, EVT_FLOAT(4.0)) - EVT_CALL(SetNpcSpeed, NPC_RedGoombaBro, EVT_FLOAT(4.0)) - EVT_WAIT(50) + EVT_CALL(SetNpcSpeed, NPC_BlueGoombaBro, EVT_FLOAT(4.0 / DT)) + EVT_CALL(SetNpcSpeed, NPC_RedGoombaBro, EVT_FLOAT(4.0 / DT)) + EVT_WAIT(50 * DT) EVT_THREAD EVT_CALL(NpcMoveTo, NPC_BlueGoombaBro, -521, -100, 0) EVT_END_THREAD @@ -361,15 +361,15 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -617, 108, -137, 100) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.5)) EVT_CALL(SetPlayerPos, -920, 0, -35) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, -575, -60, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(DisablePartnerAI, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_00C5) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) @@ -377,7 +377,7 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.2)) EVT_SET(LVar3, 2) EVT_EXEC(N(EVS_BouncePlayerAndPartner)) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) @@ -385,7 +385,7 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.6)) EVT_SET(LVar3, 4) EVT_EXEC(N(EVS_BouncePlayerAndPartner)) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) @@ -393,7 +393,7 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_SET(LVar3, 6) EVT_EXEC(N(EVS_BouncePlayerAndPartner)) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) @@ -401,9 +401,9 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.5)) EVT_SET(LVar3, 8) EVT_EXEC(N(EVS_BouncePlayerAndPartner)) - EVT_WAIT(28) + EVT_WAIT(28 * DT) EVT_CALL(SetMusicTrack, 0, SONG_GOOMBA_KING_THEME, 0, 8) - EVT_WAIT(32) + EVT_WAIT(32 * DT) EVT_CALL(SetNpcAnimation, NPC_BlueGoombaBro, ANIM_GoombaBros_Blue_Idle) EVT_CALL(SetNpcAnimation, NPC_RedGoombaBro, ANIM_GoombaBros_Red_Idle) EVT_CALL(SetNpcJumpscale, NPC_BlueGoombaBro, EVT_FLOAT(0.8)) @@ -411,17 +411,17 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_THREAD EVT_CALL(SetNpcPos, NPC_BlueGoombaBro, -400, 0, -162) EVT_CALL(PlaySoundAtNpc, NPC_BlueGoombaBro, SOUND_10F, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_BlueGoombaBro, -432, 130, -146, 30) + EVT_CALL(NpcJump0, NPC_BlueGoombaBro, -432, 130, -146, 30 * DT) EVT_END_THREAD EVT_CALL(SetNpcPos, NPC_RedGoombaBro, -400, 0, -41) EVT_CALL(PlaySoundAtNpc, NPC_RedGoombaBro, SOUND_10F, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_RedGoombaBro, -412, 130, -35, 30) - EVT_WAIT(10) + EVT_CALL(NpcJump0, NPC_RedGoombaBro, -412, 130, -35, 30 * DT) + EVT_WAIT(10 * DT) EVT_THREAD EVT_CALL(SetNpcJumpscale, NPC_GoombaKing, EVT_FLOAT(0.8)) EVT_CALL(SetNpcPos, NPC_GoombaKing, -405, 0, -91) EVT_CALL(PlaySoundAtNpc, NPC_GoombaKing, SOUND_3E7, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_GoombaKing, -419, 119, -91, 30) + EVT_CALL(NpcJump0, NPC_GoombaKing, -419, 119, -91, 30 * DT) EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_MODE_0, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) @@ -431,7 +431,7 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_EXEC_WAIT(N(EVS_FocusCam_Battlement)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(55) + EVT_WAIT(55 * DT) EVT_CALL(SpeakToPlayer, NPC_GoombaKing, ANIM_GoombaKing_Idle, ANIM_GoombaKing_Idle, 0, MSG_CH0_00C6) EVT_CALL(SpeakToPlayer, NPC_RedGoombaBro, ANIM_GoombaBros_Red_Walk, ANIM_GoombaBros_Red_Idle, 0, MSG_CH0_00C7) EVT_CALL(SpeakToPlayer, NPC_BlueGoombaBro, ANIM_GoombaBros_Blue_Walk, ANIM_GoombaBros_Blue_Idle, 0, MSG_CH0_00C8) @@ -439,16 +439,16 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(DisablePartnerAI, 0) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_00C9) EVT_CALL(DisablePartnerAI, 0) EVT_EXEC_WAIT(N(EVS_FocusCam_Battlement)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SpeakToPlayer, NPC_GoombaKing, ANIM_GoombaKing_Idle, ANIM_GoombaKing_Idle, 0, MSG_CH0_00CA) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcVar, NPC_GoombaKing, 0, 1) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_11/kmr_11_4_npc.c b/src/world/area_kmr/kmr_11/kmr_11_4_npc.c index 95da3bda3b..1b679e40cf 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_4_npc.c +++ b/src/world/area_kmr/kmr_11/kmr_11_4_npc.c @@ -19,7 +19,7 @@ EvtScript N(EVS_NpcIdle_GoombaKing) = { EVT_CALL(GetNpcPos, NPC_GoombaKing, LVar0, LVar1, LVar2) EVT_CALL(AwaitPlayerApproach, LVar0, LVar2, 300) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, -564, -64, 0) EVT_ELSE EVT_LABEL(0) @@ -40,23 +40,23 @@ EvtScript N(EVS_NpcIdle_GoombaKing) = { EVT_CALL(GetAngleToPlayer, NPC_RedGoombaBro, LVar3) EVT_CALL(AddVectorPolar, LVar0, LVar2, EVT_FLOAT(100.0), LVar3) EVT_CALL(PlaySoundAtNpc, NPC_RedGoombaBro, SOUND_10F, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_RedGoombaBro, LVar0, 0, LVar2, 30) + EVT_CALL(NpcJump0, NPC_RedGoombaBro, LVar0, 0, LVar2, 30 * DT) EVT_END_THREAD EVT_THREAD EVT_CALL(GetNpcPos, NPC_BlueGoombaBro, LVar0, LVar1, LVar2) EVT_CALL(GetAngleToPlayer, NPC_BlueGoombaBro, LVar3) EVT_CALL(AddVectorPolar, LVar0, LVar2, EVT_FLOAT(100.0), LVar3) EVT_CALL(PlaySoundAtNpc, NPC_BlueGoombaBro, SOUND_10F, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_BlueGoombaBro, LVar0, 0, LVar2, 30) + EVT_CALL(NpcJump0, NPC_BlueGoombaBro, LVar0, 0, LVar2, 30 * DT) EVT_END_THREAD EVT_THREAD EVT_CALL(GetNpcPos, NPC_GoombaKing, LVar0, LVar1, LVar2) EVT_CALL(GetAngleToPlayer, NPC_GoombaKing, LVar3) EVT_CALL(AddVectorPolar, LVar0, LVar2, EVT_FLOAT(100.0), LVar3) EVT_CALL(PlaySoundAtNpc, NPC_GoombaKing, SOUND_3E7, SOUND_SPACE_MODE_0) - EVT_CALL(NpcJump0, NPC_GoombaKing, LVar0, 0, LVar2, 30) + EVT_CALL(NpcJump0, NPC_GoombaKing, LVar0, 0, LVar2, 30 * DT) EVT_END_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(StartBossBattle, SONG_GOOMBA_KING_BATTLE) EVT_RETURN EVT_END @@ -74,9 +74,9 @@ EvtScript N(EVS_Scene_BossDefeated) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(N(SetCameraVFov), 25) EVT_CALL(SpeakToPlayer, NPC_GoombaKing, ANIM_GoombaKing_Walk, ANIM_GoombaKing_Idle, 0, MSG_CH0_00D1) - EVT_CALL(SetNpcSpeed, NPC_BlueGoombaBro, EVT_FLOAT(6.0)) - EVT_CALL(SetNpcSpeed, NPC_RedGoombaBro, EVT_FLOAT(6.0)) - EVT_CALL(SetNpcSpeed, NPC_GoombaKing, EVT_FLOAT(6.0)) + EVT_CALL(SetNpcSpeed, NPC_BlueGoombaBro, EVT_FLOAT(6.0 / DT)) + EVT_CALL(SetNpcSpeed, NPC_RedGoombaBro, EVT_FLOAT(6.0 / DT)) + EVT_CALL(SetNpcSpeed, NPC_GoombaKing, EVT_FLOAT(6.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_BlueGoombaBro, ANIM_GoombaBros_Blue_Run) EVT_CALL(SetNpcAnimation, NPC_RedGoombaBro, ANIM_GoombaBros_Red_Run) EVT_CALL(SetNpcAnimation, NPC_GoombaKing, ANIM_GoombaKing_Run) @@ -102,7 +102,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(MakeLerp, 90, 0, 20, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) @@ -116,16 +116,16 @@ EvtScript N(EVS_Scene_BossDefeated) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(2.0)) EVT_SET(GB_StoryProgress, STORY_CH0_DEFEATED_GOOMBA_KING) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 0, EVT_FLOAT(250.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.5)) - EVT_WAIT(10) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT), 0, EVT_FLOAT(250.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.5)) + EVT_WAIT(10 * DT) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_00D2) EVT_CALL(EnablePartnerAI) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(DisablePlayerInput, TRUE) EVT_THREAD EVT_WAIT(40) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_CALL(DisablePlayerInput, FALSE) EVT_END_THREAD EVT_CALL(SetNpcPos, NPC_BlueGoombaBro, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_kmr/kmr_11/kmr_11_5_entity.c b/src/world/area_kmr/kmr_11/kmr_11_5_entity.c index 349feb2b53..e869910cc3 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_5_entity.c +++ b/src/world/area_kmr/kmr_11/kmr_11_5_entity.c @@ -50,10 +50,10 @@ EvtScript N(EVS_Interact_SwitchBush) = { EVT_CALL(SetNpcFlagBits, NPC_BlueGoombaBro, NPC_FLAG_HAS_NO_SPRITE, TRUE) EVT_EXEC_GET_TID(N(EVS_TetherSwitchToBlueGoomba), LVarB) EVT_CALL(SetNpcJumpscale, NPC_BlueGoombaBro, EVT_FLOAT(2.0)) - EVT_CALL(NpcJump0, NPC_BlueGoombaBro, -445, 0, 92, 15) + EVT_CALL(NpcJump0, NPC_BlueGoombaBro, -445, 0, 92, 15 * DT) EVT_CALL(PlaySoundAt, SOUND_48, SOUND_SPACE_MODE_0, -469, 1, 92) EVT_CALL(SetNpcJumpscale, NPC_BlueGoombaBro, EVT_FLOAT(2.0)) - EVT_CALL(NpcJump0, NPC_BlueGoombaBro, -469, 0, 92, 7) + EVT_CALL(NpcJump0, NPC_BlueGoombaBro, -469, 0, 92, 7 * DT) EVT_KILL_THREAD(LVarB) EVT_CALL(SetNpcPos, NPC_BlueGoombaBro, NPC_DISPOSE_LOCATION) EVT_SET(GB_StoryProgress, STORY_CH0_FOUND_GATEHOUSE_SWITCH) diff --git a/src/world/area_kmr/kmr_11/kmr_11_6_kammy.c b/src/world/area_kmr/kmr_11/kmr_11_6_kammy.c index e75a8b903d..551f0d4c36 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_6_kammy.c +++ b/src/world/area_kmr/kmr_11/kmr_11_6_kammy.c @@ -19,22 +19,22 @@ EvtScript N(EVS_Scene_KammyWatching) = { EVT_CALL(SetCamPitch, CAM_DEFAULT, 8, -5) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 100, 0, -220) EVT_CALL(SetPanTarget, CAM_DEFAULT, 100, 190, -353) EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 100, 0, -220) EVT_CALL(SetPanTarget, CAM_DEFAULT, 100, 190, -353) EVT_CALL(SetCamDistance, CAM_DEFAULT, 1000) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.65)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.65 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_THREAD EVT_CALL(GetNpcPos, NPC_Kammy, LVar7, LVar8, LVar9) - EVT_CALL(LoadPath, 80, EVT_PTR(N(FlightPath_Away)), ARRAY_COUNT(N(FlightPath_Away)), EASING_LINEAR) + EVT_CALL(LoadPath, 80 * DT, EVT_PTR(N(FlightPath_Away)), ARRAY_COUNT(N(FlightPath_Away)), EASING_LINEAR) EVT_LABEL(0) EVT_CALL(GetNextPathPos) EVT_ADD(LVar1, LVar7) @@ -47,12 +47,12 @@ EvtScript N(EVS_Scene_KammyWatching) = { EVT_END_IF EVT_END_THREAD EVT_THREAD - EVT_LOOP(24) + EVT_LOOP(24 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_295, SOUND_SPACE_MODE_0) EVT_WAIT(4) EVT_END_LOOP EVT_END_THREAD - EVT_WAIT(110) + EVT_WAIT(110 * DT) EVT_EXEC_WAIT(N(EVS_BadExit_kmr_24_0)) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c index 97375cc378..aef6e0a7c7 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c +++ b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c @@ -195,7 +195,7 @@ s32* N(UnknownLists)[] = { EvtScript N(EVS_Scene_BeginGame) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_THREAD - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetMusicTrack, 0, SONG_MAIL_CALL, 0, 8) EVT_END_THREAD EVT_CALL(InterpPlayerYaw, 90, 0) @@ -216,8 +216,8 @@ EvtScript N(EVS_Scene_BeginGame) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.7)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD - EVT_WAIT(10) - EVT_CALL(MakeLerp, 0, 70, 60, EASING_LINEAR) + EVT_WAIT(10 * DT) + EVT_CALL(MakeLerp, 0, 70, 60 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_g108, LVar0, 0, 0) @@ -231,8 +231,8 @@ EvtScript N(EVS_Scene_BeginGame) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_WAIT(30) - EVT_CALL(MakeLerp, 0, 50, 40, EASING_LINEAR) + EVT_WAIT(30 * DT) + EVT_CALL(MakeLerp, 0, 50, 40 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_g109, LVar0, 0, 0) @@ -246,8 +246,8 @@ EvtScript N(EVS_Scene_BeginGame) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_WAIT(50) - EVT_CALL(MakeLerp, 0, 50, 40, EASING_LINEAR) + EVT_WAIT(50 * DT) + EVT_CALL(MakeLerp, 0, 50, 40 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, MODEL_g105, LVar0, 0, 0) @@ -263,10 +263,10 @@ EvtScript N(EVS_Scene_BeginGame) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - EVT_WAIT(120) - EVT_CALL(NpcFlyTo, NPC_Scene_Parakarry, 430, 20, -165, 60, -10, EASING_LINEAR) + EVT_WAIT(120 * DT) + EVT_CALL(NpcFlyTo, NPC_Scene_Parakarry, 430, 20, -165, 60 * DT, -10, EASING_LINEAR) EVT_CALL(InterpNpcYaw, NPC_Scene_Parakarry, 45, 10) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Scene_Parakarry, SOUND_E0, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(TranslateModel, MODEL_o222, 2, 0, 0) @@ -289,23 +289,23 @@ EvtScript N(EVS_Scene_BeginGame) = { EVT_CALL(TranslateModel, MODEL_o223, 0, 0, 0) EVT_CALL(TranslateModel, MODEL_o224, 0, 0, 0) EVT_END_THREAD - EVT_WAIT(35) + EVT_WAIT(35 * DT) EVT_CALL(InterpNpcYaw, NPC_Scene_Parakarry, 220, 5) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Scene_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, MSG_Intro_001E) - EVT_WAIT(10) - EVT_CALL(NpcFlyTo, NPC_Scene_Parakarry, 360, 260, 60, 60, -10, EASING_LINEAR) - EVT_WAIT(30) + EVT_WAIT(10 * DT) + EVT_CALL(NpcFlyTo, NPC_Scene_Parakarry, 360, 260, 60, 60 * DT, -10, EASING_LINEAR) + EVT_WAIT(30 * DT) EVT_EXEC(N(EVS_OpenAndCloseDoor_Intro)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Run) EVT_EXEC_GET_TID(N(EVS_Luigi_PlayWalkSounds_Intro), LVarA) - EVT_CALL(SetNpcSpeed, NPC_Scene_Luigi, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_Scene_Luigi, EVT_FLOAT(4.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Scene_Luigi, 450, -80, 0) EVT_CALL(NpcMoveTo, NPC_Scene_Luigi, 430, -165, 0) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Idle) EVT_KILL_THREAD(LVarA) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_E0, SOUND_SPACE_MODE_0) EVT_THREAD EVT_CALL(TranslateModel, MODEL_o222, 1, 0, 0) @@ -330,7 +330,7 @@ EvtScript N(EVS_Scene_BeginGame) = { EVT_END_THREAD EVT_WAIT(2) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_IdleLetter) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(InterpNpcYaw, NPC_Scene_Luigi, 270, 5) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_RunLetter) EVT_EXEC_GET_TID(N(EVS_Luigi_PlayWalkSounds_Intro), LVarA) @@ -355,12 +355,12 @@ EvtScript N(EVS_Scene_BeginGame) = { EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_WalkLetter) EVT_EXEC_GET_TID(N(EVS_Luigi_PlayWalkSounds_Intro), LVarA) - EVT_CALL(SetNpcSpeed, NPC_Scene_Luigi, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_Scene_Luigi, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Scene_Luigi, 240, -80, 0) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_IdleLetter) EVT_KILL_THREAD(LVarA) EVT_CALL(SpeakToPlayer, NPC_Scene_Luigi, ANIM_Luigi_TalkLetter, ANIM_Luigi_IdleLetter, 0, MSG_Intro_001F) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_EXEC(N(EVS_TetherCamToLuigi)) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_WalkLetter) @@ -371,24 +371,24 @@ EvtScript N(EVS_Scene_BeginGame) = { EVT_KILL_THREAD(LVarA) EVT_CALL(SetNpcVar, NPC_Scene_Luigi, 0, 0) EVT_END_THREAD - EVT_WAIT(20) - EVT_CALL(func_802D1270, 70, -80, EVT_FLOAT(2.0)) - EVT_CALL(func_802D1270, 70, -110, EVT_FLOAT(2.0)) - EVT_WAIT(10) + EVT_WAIT(20 * DT) + EVT_CALL(func_802D1270, 70, -80, EVT_FLOAT(2.0 / DT)) + EVT_CALL(func_802D1270, 70, -110, EVT_FLOAT(2.0 / DT)) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Scene_Luigi, ANIM_Luigi_TalkLetter, ANIM_Luigi_IdleLetter, 0, MSG_Intro_0020) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_OpenLetter) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_IdleRead) EVT_CALL(SpeakToPlayer, NPC_Scene_Luigi, ANIM_Luigi_TalkRead, ANIM_Luigi_IdleRead, 0, MSG_Intro_0021) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_ReadLetter) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetMusicTrack, 0, SONG_PRISONER_PEACH_THEME, 0, 8) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(ClearAmbientSounds, 250) EVT_CALL(GotoMapSpecial, EVT_PTR("osr_00"), osr_00_ENTRY_3, TRANSITION_7) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(ClearAmbientSounds, 250) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_RETURN EVT_END }; @@ -401,12 +401,12 @@ EvtScript N(EVS_Scene_SettingOff) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 320, 30, -70) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 1, 8) EVT_EXEC(N(EVS_OpenAndCloseDoor_Intro)) EVT_THREAD - EVT_WAIT(10) - EVT_CALL(SetNpcSpeed, NPC_Scene_Luigi, EVT_FLOAT(3.0)) + EVT_WAIT(10 * DT) + EVT_CALL(SetNpcSpeed, NPC_Scene_Luigi, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Run) EVT_EXEC_GET_TID(N(EVS_Luigi_PlayWalkSounds_Intro), LVarA) EVT_CALL(NpcMoveTo, NPC_Scene_Luigi, 320, -70, 0) @@ -415,25 +415,25 @@ EvtScript N(EVS_Scene_SettingOff) = { EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Idle) EVT_KILL_THREAD(LVarA) EVT_END_THREAD - EVT_CALL(func_802D1270, 320, -70, EVT_FLOAT(3.0)) + EVT_CALL(func_802D1270, 320, -70, EVT_FLOAT(3.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(func_802D1270, 460, -70, EVT_FLOAT(3.0)) - EVT_CALL(func_802D1270, 570, -170, EVT_FLOAT(3.0)) + EVT_CALL(func_802D1270, 460, -70, EVT_FLOAT(3.0 / DT)) + EVT_CALL(func_802D1270, 570, -170, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) - EVT_CALL(PlayerJump, 594, 30, -216, 15) + EVT_CALL(PlayerJump, 594, 30, -216, 15 * DT) EVT_EXEC_WAIT(N(EVS_Player_EnterPipe_Intro)) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_JumpStance) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Jump) EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_JUMP_2081, SOUND_SPACE_MODE_0) - EVT_WAIT(7) - EVT_WAIT(7) + EVT_WAIT(7 * DT) + EVT_WAIT(7 * DT) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Idle) EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_SOFT_LAND, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_Scene_Luigi, EVT_FLOAT(1.0)) - EVT_CALL(NpcJump0, NPC_Scene_Luigi, 594, 30, -216, 15) + EVT_CALL(NpcJump0, NPC_Scene_Luigi, 594, 30, -216, 15 * DT) EVT_EXEC_WAIT(N(EVS_Luigi_EnterPipe_Intro)) EVT_EXEC(N(EVS_FadeOutAmbientSounds)) EVT_CALL(GotoMap, EVT_PTR("mac_00"), mac_00_ENTRY_5) diff --git a/src/world/area_kmr/kmr_20/kmr_20_13_records.c b/src/world/area_kmr/kmr_20/kmr_20_13_records.c index ff0f96d654..58e1d34905 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_13_records.c +++ b/src/world/area_kmr/kmr_20/kmr_20_13_records.c @@ -60,6 +60,12 @@ s32 N(RecipeFoundVars)[] = { void N(appendGfx_records_impl)(GameRecords* records, s32 alpha) { s32 width; +#if VERSION_PAL +#define CHARSET (1) +#else +#define CHARSET (0) +#endif + if (alpha > 0) { gSPDisplayList(gMainGfxPos++, N(records_screen_gfx)); gDPPipeSync(gMainGfxPos++); @@ -68,22 +74,22 @@ void N(appendGfx_records_impl)(GameRecords* records, s32 alpha) { gDPPipeSync(gMainGfxPos++); msg_draw_frame(30, 40, 260, 155, MSG_STYLE_INSPECT, MSG_PAL_WHITE, TRUE, alpha * 0.55, alpha); - draw_msg(MSG_CH0_00FC, 206 - get_msg_width(MSG_CH0_00FC, 0), 50, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MSG_CH0_00FC, 206 - get_msg_width(MSG_CH0_00FC, CHARSET), 50, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); draw_number(gPlayerData.totalCoinsEarned, 216, 51, 1, MSG_PAL_WHITE, alpha, 2); - draw_msg(MSG_CH0_00FD, 206 - get_msg_width(MSG_CH0_00FD, 0), 65, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MSG_CH0_00FD, 206 - get_msg_width(MSG_CH0_00FD, CHARSET), 65, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); draw_number(records->equippedBadges, 231, 66, 1, MSG_PAL_WHITE, alpha, 3); draw_msg(MSG_MenuTip_0034, 232, 63, alpha, MSG_PAL_WHITE, 0); draw_number(80, 244, 66, 1, MSG_PAL_WHITE, alpha, 2); if (gPlayerData.starPiecesCollected == 0) { draw_msg(MSG_CH0_00FA, 109, 80, alpha, MSG_PAL_WHITE, 1); } else { - draw_msg(MSG_CH0_00FB, 206 - get_msg_width(MSG_CH0_00FB, 0), 80, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MSG_CH0_00FB, 206 - get_msg_width(MSG_CH0_00FB, CHARSET), 80, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); draw_number(gPlayerData.starPiecesCollected, 231, 81, 1, MSG_PAL_WHITE, alpha, 3); draw_msg(MSG_MenuTip_0034, 232, 78, alpha, MSG_PAL_WHITE, 0); draw_number(160, 244, 80, 1, MSG_PAL_WHITE, alpha, 2); } - width = get_msg_width(MSG_CH0_00FE, 0); + width = get_msg_width(MSG_CH0_00FE, CHARSET); if (records->recipesFoundCount == 0) { draw_msg(MSG_CH0_00FA, 110, 95, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); } else { @@ -101,27 +107,29 @@ void N(appendGfx_records_impl)(GameRecords* records, s32 alpha) { if (gPlayerData.quizzesAnswered == 0) { draw_msg(MSG_CH0_00FA, 109, 110, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); } else { - draw_msg(MSG_CH0_00FF, 206 - get_msg_width(MSG_CH0_00FF, 0), 110, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MSG_CH0_00FF, 206 - get_msg_width(MSG_CH0_00FF, CHARSET), 110, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); draw_number(gPlayerData.quizzesCorrect, 231, 111, 1, MSG_PAL_WHITE, alpha, 3); draw_msg(MSG_MenuTip_0034, 232, 108, alpha, MSG_PAL_WHITE, 0); draw_number(gPlayerData.quizzesAnswered, 244, 111, 1, MSG_PAL_WHITE, alpha, 2); } - draw_msg(MSG_CH0_00F4, 206 - get_msg_width(MSG_CH0_00F4, 0), 125, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MSG_CH0_00F4, 206 - get_msg_width(MSG_CH0_00F4, CHARSET), 125, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); draw_number(gPlayerData.battlesCount, 216, 126, 1, MSG_PAL_WHITE, alpha, 2); - width = get_msg_width(MSG_CH0_00F7, 0); + width = get_msg_width(MSG_CH0_00F7, CHARSET); draw_msg(MSG_CH0_00F7, 206 - width, 140, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); draw_number(gPlayerData.playerFirstStrikes, 216, 141, 1, MSG_PAL_WHITE, alpha, 2); - draw_msg(MSG_CH0_00F8, 206 - get_msg_width(MSG_CH0_00F8, 0), 155, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MSG_CH0_00F8, 206 - get_msg_width(MSG_CH0_00F8, CHARSET), 155, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); draw_number(gPlayerData.enemyFirstStrikes, 216, 156, 1, MSG_PAL_WHITE, alpha, 2); if (gPlayerData.powerBounces == 0) { draw_msg(MSG_CH0_00FA, 109, 170, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); } else { - draw_msg(MSG_CH0_00F9, 206 - get_msg_width(MSG_CH0_00F9, 0), 170, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MSG_CH0_00F9, 206 - get_msg_width(MSG_CH0_00F9, CHARSET), 170, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); draw_number(gPlayerData.powerBounces, 216, 171, 1, MSG_PAL_WHITE, alpha, 2); } } + +#undef CHARSET } void N(appendGfx_records)(void* data) { diff --git a/src/world/area_kmr/kmr_20/kmr_20_4_documents.c b/src/world/area_kmr/kmr_20/kmr_20_4_documents.c index 52962cb646..1fa26ee41f 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_4_documents.c +++ b/src/world/area_kmr/kmr_20/kmr_20_4_documents.c @@ -17,7 +17,7 @@ extern HudScript HES_Item_Unused_08C; extern HudScript HES_Item_Unused_08C_disabled; BSS PopupMenu N(ChooseDocumentPopupMenu); -BSS IMG_BIN N(LetterBackgroundImg)[0x3D86]; +BSS IMG_BIN N(LetterBackgroundImg)[0x3D86] ALIGNED(16); BSS PAL_BIN N(LetterBackgroundPal)[0x100]; BSS char N(static_pad)[0x8]; // padding BSS IMG_BIN N(LetterPhotoImg)[0x3D86]; diff --git a/src/world/area_kmr/kmr_21/kmr_21_1_main.c b/src/world/area_kmr/kmr_21/kmr_21_1_main.c index fac76626e0..7093cb1470 100644 --- a/src/world/area_kmr/kmr_21/kmr_21_1_main.c +++ b/src/world/area_kmr/kmr_21/kmr_21_1_main.c @@ -68,6 +68,7 @@ API_CALLABLE(N(LoadTitleImage)) { return ApiStatus_DONE2; } +#if !VERSION_PAL API_CALLABLE(N(AwaitConfirmInput)) { u32 pressedButtons = gGameStatusPtr->pressedButtons[0]; if (pressedButtons & (BUTTON_A | BUTTON_START)) { @@ -76,6 +77,7 @@ API_CALLABLE(N(AwaitConfirmInput)) { return ApiStatus_BLOCK; } } +#endif API_CALLABLE(N(SetTitlePrimAlpha)) { TitlePrimAlpha = script->varTable[0]; @@ -89,9 +91,9 @@ API_CALLABLE(N(SetTitlePosY)) { EvtScript N(EVS_Scene_ShowTitle) = { EVT_CALL(N(LoadTitleImage)) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_THREAD - EVT_CALL(MakeLerp, 0, 255, 100, EASING_CUBIC_OUT) + EVT_CALL(MakeLerp, 0, 255, 100 * DT, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(N(SetTitlePrimAlpha)) @@ -101,7 +103,7 @@ EvtScript N(EVS_Scene_ShowTitle) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(MakeLerp, 106, 56, 100, EASING_CUBIC_OUT) + EVT_CALL(MakeLerp, 106, 56, 100 * DT, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(N(SetTitlePosY)) @@ -110,8 +112,8 @@ EvtScript N(EVS_Scene_ShowTitle) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_WAIT(30) - EVT_CALL(MakeLerp, 255, 0, 50, EASING_QUADRATIC_IN) + EVT_WAIT(30 * DT) + EVT_CALL(MakeLerp, 255, 0, 50 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(N(SetTitlePrimAlpha)) @@ -120,9 +122,9 @@ EvtScript N(EVS_Scene_ShowTitle) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_0, TRANSITION_6) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_22/kmr_22_1_main.c b/src/world/area_kmr/kmr_22/kmr_22_1_main.c index ac80cfcb28..794fb6fcf4 100644 --- a/src/world/area_kmr/kmr_22/kmr_22_1_main.c +++ b/src/world/area_kmr/kmr_22/kmr_22_1_main.c @@ -4,11 +4,25 @@ BSS EffectInstance* N(ChapterEffect); BSS s32 N(ChapterEffectTime); -s16 N(AnimTextOffsets)[] = { +#if VERSION_PAL +#define CHUNK_SIZE (8) +#else +#define CHUNK_SIZE (10) +#endif + + +s16 N(AnimTextOffsets)[CHUNK_SIZE * 2] = { +#if VERSION_PAL + 310, 270, 240, 210, + 180, 150, 120, 100, + 80, 50, 24, 12, + 5, 3, 2, 1, +#else 310, 290, 270, 250, 230, 210, 190, 170, 150, 130, 110, 90, 70, 50, 32, 16, 8, 4, 2, 1, +#endif }; API_CALLABLE(N(ManageEffects)) { @@ -29,7 +43,7 @@ API_CALLABLE(N(ManageEffects)) { x = xOffset + 117; if (N(ChapterEffectTime) >= 0) { - if (N(ChapterEffectTime) < 20) { + if (N(ChapterEffectTime) < 2 * CHUNK_SIZE) { x -= N(AnimTextOffsets)[N(ChapterEffectTime)]; } } else { @@ -40,9 +54,9 @@ API_CALLABLE(N(ManageEffects)) { N(ChapterEffect)->data.chapterChange->chapterPos.y = y; x = xOffset + 117; - if (N(ChapterEffectTime) >= 10) { - if (N(ChapterEffectTime) < 30) { - y -= N(AnimTextOffsets)[N(ChapterEffectTime) - 10]; + if (N(ChapterEffectTime) >= CHUNK_SIZE) { + if (N(ChapterEffectTime) < 3 * CHUNK_SIZE) { + y -= N(AnimTextOffsets)[N(ChapterEffectTime) - CHUNK_SIZE]; } } else { y = -252; @@ -51,9 +65,9 @@ API_CALLABLE(N(ManageEffects)) { N(ChapterEffect)->data.chapterChange->endOfPos.y = y; x = 280; - if (N(ChapterEffectTime) >= 20) { - if (N(ChapterEffectTime) < 40) { - x += N(AnimTextOffsets)[N(ChapterEffectTime) - 20]; + if (N(ChapterEffectTime) >= 2 * CHUNK_SIZE) { + if (N(ChapterEffectTime) < 4 * CHUNK_SIZE) { + x += N(AnimTextOffsets)[N(ChapterEffectTime) - 2 * CHUNK_SIZE]; } } else { x = 590; diff --git a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c index 9b508fb813..e8d8a1b3de 100644 --- a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c +++ b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c @@ -468,23 +468,23 @@ EvtScript N(EVS_Scene_EndOfChapter) = { EVT_END_THREAD EVT_WAIT(1) EVT_THREAD - EVT_CALL(N(AddCardAngularVelocity), 10) + EVT_CALL(N(AddCardAngularVelocity), 10 / DT) EVT_END_THREAD EVT_THREAD - EVT_CALL(N(AccelerateCardSpin), 20, 150) + EVT_CALL(N(AccelerateCardSpin), 20, 150 * DT) EVT_END_THREAD - EVT_CALL(N(MakeCardFloatUpward), 5, 0, 60, 150) - EVT_WAIT(30) - EVT_CALL(N(ShowRadialShimmer), 1, 120) - EVT_CALL(N(FadeInSpiritNpc), 60) + EVT_CALL(N(MakeCardFloatUpward), 5, 0, 60, 150 * DT) EVT_WAIT(30) + EVT_CALL(N(ShowRadialShimmer), 1, 120 * DT) + EVT_CALL(N(FadeInSpiritNpc), 60 * DT) + EVT_WAIT(30 * DT) EVT_CALL(N(FlashScreenWhite)) - EVT_CALL(N(SpinDownStarSpirit), 1800, 100) + EVT_CALL(N(SpinDownStarSpirit), 1800, 100 * DT) EVT_CALL(N(EndOfChapterBounceIn), 36, 0, 55, 60) EVT_THREAD EVT_CALL(N(AddCardAngularVelocity), 0) EVT_END_THREAD - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_SET(MF_Unk_0B, TRUE) EVT_WAIT(1) EVT_CALL(SetNpcAnimation, NPC_StarSpirit, ENEMY_ANIM_8) @@ -510,7 +510,7 @@ EvtScript N(EVS_Scene_EndOfChapter) = { EVT_END_SWITCH EVT_CALL(ShowMessageAtScreenPos, LVar1, 160, 40) EVT_CALL(N(ShowMessagesBehindCurtains)) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_SET(AF_JAN01_TreeDrop_StarPiece, TRUE) EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_00/mac_00_10_shared_npc.c b/src/world/area_mac/mac_00/mac_00_10_shared_npc.c index 9068270828..d27210a56c 100644 --- a/src/world/area_mac/mac_00/mac_00_10_shared_npc.c +++ b/src/world/area_mac/mac_00/mac_00_10_shared_npc.c @@ -31,34 +31,34 @@ EvtScript N(EVS_Scene_ToadTownGreeting) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD - EVT_WAIT(35) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.1)) + EVT_WAIT(35 * DT) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.1 / DT)) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -225, 0, -300) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpNpcYaw, NPC_Toad_04, 230, 0) EVT_CALL(SetNpcJumpscale, NPC_Toad_04, EVT_FLOAT(1.5)) EVT_CALL(GetNpcPos, NPC_Toad_04, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_Toad_04, LVar0, LVar1, LVar2, 5) - EVT_WAIT(10) + EVT_CALL(NpcJump0, NPC_Toad_04, LVar0, LVar1, LVar2, 5 * DT) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Toad_04, ANIM_Toad_Red_Run) - EVT_CALL(NpcMoveTo, NPC_Toad_04, -185, -295, 15) + EVT_CALL(NpcMoveTo, NPC_Toad_04, -185, -295, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Toad_04, ANIM_Toad_Red_Idle) EVT_END_THREAD EVT_WAIT(2) EVT_CALL(PlayerMoveTo, -225, -300, 80) EVT_CALL(SetPlayerPos, -225, 0, -300) - EVT_WAIT(50) + EVT_WAIT(50 * DT) EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_Toad_04, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MAC_Gate_007E) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) diff --git a/src/world/area_mac/mac_00/mac_00_12_intro.c b/src/world/area_mac/mac_00/mac_00_12_intro.c index 1ab2f6a25f..4ce2ab22f7 100644 --- a/src/world/area_mac/mac_00/mac_00_12_intro.c +++ b/src/world/area_mac/mac_00/mac_00_12_intro.c @@ -54,38 +54,38 @@ EvtScript N(EVS_Scene_Intro) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD EVT_EXEC_WAIT(N(EVS_PlayerExitPipe_Intro)) - EVT_WAIT(10) - EVT_CALL(func_802D1270, -60, -320, EVT_FLOAT(4.0)) - EVT_WAIT(63) - EVT_CALL(func_802D1270, 80, -60, EVT_FLOAT(4.0)) - EVT_CALL(func_802D1270, 180, 0, EVT_FLOAT(4.0)) - EVT_CALL(func_802D1270, 650, 0, EVT_FLOAT(4.0)) + EVT_WAIT(10 * DT) + EVT_CALL(func_802D1270, -60, -320, EVT_FLOAT(4.0 / DT)) + EVT_WAIT(63 * DT) + EVT_CALL(func_802D1270, 80, -60, EVT_FLOAT(4.0 / DT)) + EVT_CALL(func_802D1270, 180, 0, EVT_FLOAT(4.0 / DT)) + EVT_CALL(func_802D1270, 650, 0, EVT_FLOAT(4.0 / DT)) EVT_END_THREAD EVT_THREAD - EVT_WAIT(70) + EVT_WAIT(70 * DT) EVT_EXEC_WAIT(N(EVS_LuigiExitPipe_Intro)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcFlagBits, NPC_Luigi_Intro, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcAnimation, NPC_Luigi_Intro, ANIM_Luigi_Run) - EVT_CALL(SetNpcSpeed, NPC_Luigi_Intro, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_Luigi_Intro, EVT_FLOAT(4.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Luigi_Intro, 80, -60, 0) EVT_CALL(NpcMoveTo, NPC_Luigi_Intro, 180, 0, 0) EVT_CALL(NpcMoveTo, NPC_Luigi_Intro, 650, 0, 0) EVT_END_THREAD - EVT_WAIT(70) + EVT_WAIT(70 * DT) EVT_CALL(SetPanTarget, CAM_DEFAULT, -60, 0, -320) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(600.0)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 400, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, 400, 0, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(450.0)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(GotoMap, EVT_PTR("mac_01"), mac_01_ENTRY_4) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_00/mac_00_2_main.c b/src/world/area_mac/mac_00/mac_00_2_main.c index b9773a98e4..442aa579ec 100644 --- a/src/world/area_mac/mac_00/mac_00_2_main.c +++ b/src/world/area_mac/mac_00/mac_00_2_main.c @@ -72,6 +72,10 @@ EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN) EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_SETUP_CAMERA_NO_LEAD() +#if VERSION_PAL + EVT_CALL(GetLanguage, LocalVar(0)) + EVT_CALL(SetModelTexVariant, 10, LocalVar(0)) +#endif EVT_IF_GE(GB_StoryProgress, STORY_CH0_KAMMY_RETURNED_TO_BOWSER) EVT_SET(GF_MAP_ToadTown, TRUE) EVT_END_IF diff --git a/src/world/area_mac/mac_01/mac_01_12_intro.c b/src/world/area_mac/mac_01/mac_01_12_intro.c index a6b50c0672..644158cd55 100644 --- a/src/world/area_mac/mac_01/mac_01_12_intro.c +++ b/src/world/area_mac/mac_01/mac_01_12_intro.c @@ -26,13 +26,13 @@ EvtScript N(EVS_Scene_IntroWalking) = { EVT_CALL(SetNpcPos, NPC_Luigi, -460, 0, 0) EVT_CALL(SetNpcYaw, NPC_Luigi, 90) EVT_THREAD - EVT_CALL(func_802D1270, -100, 0, EVT_FLOAT(4.0)) - EVT_CALL(func_802D1270, -25, -25, EVT_FLOAT(4.0)) - EVT_CALL(func_802D1270, 0, -100, EVT_FLOAT(4.0)) - EVT_CALL(func_802D1270, 0, -400, EVT_FLOAT(4.0)) + EVT_CALL(func_802D1270, -100, 0, EVT_FLOAT(4.0 / DT)) + EVT_CALL(func_802D1270, -25, -25, EVT_FLOAT(4.0 / DT)) + EVT_CALL(func_802D1270, 0, -100, EVT_FLOAT(4.0 / DT)) + EVT_CALL(func_802D1270, 0, -400, EVT_FLOAT(4.0 / DT)) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcSpeed, NPC_Luigi, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_Luigi, EVT_FLOAT(4.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_Luigi_Run) EVT_CALL(NpcMoveTo, NPC_Luigi, -100, 0, 0) EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_Luigi_RunBack) @@ -42,7 +42,7 @@ EvtScript N(EVS_Scene_IntroWalking) = { EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_Luigi_IdleBack) EVT_END_THREAD EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) - EVT_CALL(MakeLerp, 300, 400, 100, EASING_LINEAR) + EVT_CALL(MakeLerp, 300, 400, 100 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) @@ -54,9 +54,9 @@ EvtScript N(EVS_Scene_IntroWalking) = { EVT_END_IF EVT_END_LOOP EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_WAIT(75) + EVT_WAIT(75 * DT) EVT_CALL(GotoMap, EVT_PTR("osr_00"), osr_00_ENTRY_4) - EVT_WAIT(100) + EVT_WAIT(100 * DT) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_01/mac_01_2_main.c b/src/world/area_mac/mac_01/mac_01_2_main.c index bdd68c782d..54266e4593 100644 --- a/src/world/area_mac/mac_01/mac_01_2_main.c +++ b/src/world/area_mac/mac_01/mac_01_2_main.c @@ -117,6 +117,10 @@ EvtScript N(EVS_Main) = { EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) +#if VERSION_PAL + EVT_CALL(GetLanguage, LocalVar(0)) + EVT_CALL(SetModelTexVariant, 68, LocalVar(0)) +#endif EVT_SET(AF_MAC_0E, FALSE) EVT_SET(AF_MAC_0F, FALSE) EVT_SET(AF_MAC_10, FALSE) diff --git a/src/world/area_mac/mac_01/mac_01_9_npc.c b/src/world/area_mac/mac_01/mac_01_9_npc.c index 6c14b40a56..be6bd3a185 100644 --- a/src/world/area_mac/mac_01/mac_01_9_npc.c +++ b/src/world/area_mac/mac_01/mac_01_9_npc.c @@ -413,14 +413,14 @@ EvtScript N(EVS_MerlonBargeOut) = { EVT_WAIT(1) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Hurt) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) - EVT_CALL(PlayerJump1, -222, 20, -158, 8) - EVT_WAIT(5) + EVT_CALL(PlayerJump1, -222, 20, -158, 8 * DT) + EVT_WAIT(5 * DT) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) EVT_CALL(N(KnockDownPlayerB), 1, 37) EVT_CALL(N(KnockDownPlayerD), -215, 20, -158) EVT_WAIT(1) EVT_CALL(SetPlayerPos, -215, 1000, -158) - EVT_CALL(MakeLerp, 0, 90, 10, EASING_QUADRATIC_IN) + EVT_CALL(MakeLerp, 0, 90, 10 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(N(KnockDownPlayerE), LVar0, 0, 0) @@ -432,16 +432,16 @@ EvtScript N(EVS_MerlonBargeOut) = { EVT_CALL(N(KnockDownPlayerD), -215, 21, -158) EVT_CALL(PlaySoundAtPlayer, SOUND_162, SOUND_SPACE_MODE_0) EVT_END_THREAD - EVT_WAIT(50) + EVT_WAIT(50 * DT) EVT_CALL(SetNpcPos, NPC_Merlon, -241, 20, -270) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Walk) - EVT_CALL(NpcMoveTo, NPC_Merlon, -168, -198, 20) + EVT_CALL(NpcMoveTo, NPC_Merlon, -168, -198, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) EVT_CALL(GetAngleToPlayer, NPC_Merlon, LVar0) EVT_CALL(InterpNpcYaw, NPC_Merlon, LVar0, 5) EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_0021) EVT_CALL(N(KnockDownPlayerD), -215, 20, -158) - EVT_CALL(MakeLerp, 90, 0, 15, EASING_QUADRATIC_OUT) + EVT_CALL(MakeLerp, 90, 0, 15 * DT, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(N(KnockDownPlayerE), LVar0, 0, 0) @@ -456,21 +456,21 @@ EvtScript N(EVS_MerlonBargeOut) = { EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 15) + EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 15 * DT) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_0022) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Walk) - EVT_CALL(NpcMoveTo, NPC_Merlon, -275, -305, 30) + EVT_CALL(NpcMoveTo, NPC_Merlon, -275, -305, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) EVT_CALL(SetNpcPos, NPC_Merlon, -337, 20, -360) EVT_CALL(SetNpcYaw, NPC_Merlon, 135) EVT_END_THREAD - EVT_CALL(PlayerMoveTo, -168, -198, 20) - EVT_CALL(PlayerMoveTo, -275, -305, 30) + EVT_CALL(PlayerMoveTo, -168, -198, 20 * DT) + EVT_CALL(PlayerMoveTo, -275, -305, 30 * DT) EVT_EXEC(N(D_8024E7F0_80F070)) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetNpcPos, NPC_PARTNER, -240, 20, -284) EVT_CALL(N(func_802447E0_805060)) EVT_THREAD @@ -484,32 +484,32 @@ EvtScript N(EVS_MerlonBargeOut) = { EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -250, 20, -280) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(N(func_80244848_8050C8)) EVT_CALL(InterpNpcYaw, NPC_Merlon, 135, 5) EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_0023) EVT_CALL(N(func_802447E0_805060)) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_THREAD EVT_CALL(N(func_80244848_8050C8)) EVT_END_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(ContinueSpeech, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_0024) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_JoltAwake) EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_NodYesTwice) - EVT_WAIT(50) + EVT_WAIT(50 * DT) EVT_CALL(GetNpcPos, NPC_Merlon, LVar0, LVar1, LVar2) EVT_CALL(SetCamType, CAM_DEFAULT, 0, FALSE) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, 200) EVT_CALL(SetCamPitch, CAM_DEFAULT, 15, -10) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_0025) EVT_SET(GB_StoryProgress, STORY_CH1_SPOKE_WITH_MERLIN) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) EVT_THREAD EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o336, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o335, COLLIDER_FLAGS_UPPER_MASK) @@ -540,7 +540,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(func_802CF56C, 2) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Walk) - EVT_CALL(SetNpcSpeed, NPC_Merlon, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_Merlon, EVT_FLOAT(4.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Merlon, 410, 0, 0) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) EVT_CALL(InterpNpcYaw, NPC_Merlon, 90, 0) @@ -556,19 +556,19 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_END_LOOP EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(4.0), 410, 0, 0, 320, 15, -6) EVT_THREAD - EVT_WAIT(5) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_WAIT(5 * DT) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, 460, 0, 0) EVT_CALL(PlayerFaceNpc, NPC_Merlon, FALSE) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_002B) EVT_CALL(SetPanTarget, CAM_DEFAULT, 480, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_THREAD - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(PlayerFaceNpc, NPC_DarkToad_01, FALSE) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_DarkToad_03, ANIM_DarkToad_Yellow_Dismiss, ANIM_DarkToad_Yellow_Idle, 0, MSG_MAC_Plaza_002C) @@ -578,25 +578,25 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_THREAD - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(PlayerFaceNpc, NPC_Merlon, FALSE) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_002E) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PlaySoundAtNpc, NPC_Merlon, SOUND_209, SOUND_SPACE_MODE_0) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Gather1) EVT_CALL(GetNpcPos, NPC_Merlon, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 12, LVar0, LVar1, LVar2, 1, 50) - EVT_WAIT(60) + EVT_WAIT(60 * DT) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_RaiseArms) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 6, LVar0, LVar1, LVar2, 1, 20) EVT_ADD(LVar1, 180) EVT_CALL(PlayerFaceNpc, NPC_DarkToad_01, FALSE) - EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(4.0), 480, 0, 0, 320, 15, -6) + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(4.0 / DT), 480, 0, 0, 320, 15, -6) EVT_CALL(PushSong, SONG_KOOPA_BROS_THEME, 0) EVT_THREAD EVT_SET(MF_KoopaBrosSceneLock, FALSE) @@ -611,64 +611,64 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 2, 20) EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar3, LVar4, LVar5, 1, 30) EVT_CALL(SetNpcAnimation, NPC_DarkToad_01, ANIM_DarkToad_Red_Hurt) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_2049, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_DarkToad_01, LVar3, LVar4, LVar5) EVT_CALL(SetNpcPos, NPC_DarkToad_01, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, LVar3, LVar4, LVar5) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(1.0)) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Red_Anim0B) - EVT_CALL(NpcJump0, NPC_KoopaBros_01, LVar3, LVar4, LVar5, 10) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, LVar3, LVar4, LVar5, 10 * DT) EVT_END_THREAD EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_20A, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_DarkToad_02, LVar3, LVar4, LVar5) EVT_ADD(LVar5, 5) EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 2, 20) EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar3, LVar4, LVar5, 1, 30) EVT_CALL(SetNpcAnimation, NPC_DarkToad_02, ANIM_DarkToad_Black_Hurt) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_02, SOUND_2049, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_DarkToad_02, LVar3, LVar4, LVar5) EVT_CALL(SetNpcPos, NPC_DarkToad_02, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, LVar3, LVar4, LVar5) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_02, EVT_FLOAT(1.0)) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Black_Anim0B) - EVT_CALL(NpcJump0, NPC_KoopaBros_02, LVar3, LVar4, LVar5, 10) + EVT_CALL(NpcJump0, NPC_KoopaBros_02, LVar3, LVar4, LVar5, 10 * DT) EVT_END_THREAD EVT_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_20A, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_DarkToad_03, LVar3, LVar4, LVar5) EVT_ADD(LVar5, 5) EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 2, 20) EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar3, LVar4, LVar5, 1, 30) EVT_CALL(SetNpcAnimation, NPC_DarkToad_03, ANIM_DarkToad_Yellow_Hurt) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_03, SOUND_2049, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_DarkToad_03, LVar3, LVar4, LVar5) EVT_CALL(SetNpcPos, NPC_DarkToad_03, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_03, LVar3, LVar4, LVar5) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_03, EVT_FLOAT(1.0)) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim0B) - EVT_CALL(NpcJump0, NPC_KoopaBros_03, LVar3, LVar4, LVar5, 10) + EVT_CALL(NpcJump0, NPC_KoopaBros_03, LVar3, LVar4, LVar5, 10 * DT) EVT_END_THREAD - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_20A, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_DarkToad_04, LVar3, LVar4, LVar5) EVT_ADD(LVar5, 5) EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 2, 20) EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar3, LVar4, LVar5, 1, 30) EVT_CALL(SetNpcAnimation, NPC_DarkToad_04, ANIM_DarkToad_Green_Hurt) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_04, SOUND_2049, SOUND_SPACE_MODE_0) EVT_CALL(GetNpcPos, NPC_DarkToad_04, LVar3, LVar4, LVar5) EVT_CALL(SetNpcPos, NPC_DarkToad_04, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_04, LVar3, LVar4, LVar5) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_04, EVT_FLOAT(1.0)) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim0B) - EVT_CALL(NpcJump0, NPC_KoopaBros_04, LVar3, LVar4, LVar5, 10) + EVT_CALL(NpcJump0, NPC_KoopaBros_04, LVar3, LVar4, LVar5, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) EVT_LOOP(0) EVT_IF_EQ(MF_KoopaBrosSceneLock, TRUE) @@ -681,10 +681,10 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim04) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim04) EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_0030) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, MSG_MAC_Plaza_0031) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 90, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 5, MSG_MAC_Plaza_0032) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 90, 0) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_02, 90, 0) @@ -694,27 +694,27 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Black_Anim03) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim03) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim03) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_174, SOUND_SPACE_MODE_0) EVT_THREAD - EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(8.0)) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 700, 0, 0) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcSpeed, NPC_KoopaBros_02, EVT_FLOAT(8.0)) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros_02, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 700, 0, 0) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcSpeed, NPC_KoopaBros_03, EVT_FLOAT(8.0)) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros_03, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros_03, 700, 0, 0) EVT_END_THREAD EVT_WAIT(1) - EVT_CALL(SetNpcSpeed, NPC_KoopaBros_04, EVT_FLOAT(8.0)) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros_04, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros_04, 700, 0, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PopSong) EVT_CALL(SetPanTarget, CAM_DEFAULT, 410, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_THREAD @@ -722,21 +722,25 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(PlayerFaceNpc, NPC_Merlon, FALSE) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_0033) - EVT_CALL(SetNpcSpeed, NPC_Merlon, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_Merlon, EVT_FLOAT(3.0 / DT)) EVT_CALL(GetNpcPos, NPC_Merlon, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar0) EVT_ADD(LVar3, -50) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Walk) EVT_CALL(NpcMoveTo, NPC_Merlon, LVar3, LVar2, 0) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Walk) EVT_CALL(NpcMoveTo, NPC_Merlon, LVar0, LVar2, 0) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_0034) EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) +#if VERSION_PAL + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.6669921875)) +#else EVT_CALL(ResetCam, CAM_DEFAULT, 2) +#endif EVT_END_THREAD EVT_CALL(GetNpcPos, NPC_Merlon, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -150) @@ -777,7 +781,7 @@ EvtScript N(EVS_NpcInteract_Merlon) = { EVT_END_CHILD_THREAD EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Walk) - EVT_CALL(SetNpcSpeed, NPC_Merlon, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_Merlon, EVT_FLOAT(4.0 / DT)) EVT_CALL(NpcMoveTo, NPC_Merlon, -350, -280, 0) EVT_CALL(NpcMoveTo, NPC_Merlon, -230, -270, 0) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) @@ -927,13 +931,17 @@ EvtScript N(EVS_NpcInteract_DarkToad_01) = { EVT_CALL(SpeakToPlayer, NPC_DarkToad_03, ANIM_DarkToad_Yellow_Talk, ANIM_DarkToad_Yellow_Idle, 0, MSG_MAC_Plaza_004F) EVT_CALL(SpeakToPlayer, NPC_DarkToad_04, ANIM_DarkToad_Green_Talk, ANIM_DarkToad_Green_Idle, 0, MSG_MAC_Plaza_0050) EVT_CASE_LT(STORY_CH1_TOLD_MERLIN_ABOUT_DARK_TOADS) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 0, 300, EVT_FLOAT(15.0), EVT_FLOAT(-7.5)) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT), 0, 300, EVT_FLOAT(15.0), EVT_FLOAT(-7.5)) EVT_CALL(SpeakToPlayer, NPC_DarkToad_01, ANIM_DarkToad_Red_Talk, ANIM_DarkToad_Red_Idle, 0, MSG_MAC_Plaza_0051) EVT_CALL(SpeakToPlayer, NPC_DarkToad_02, ANIM_DarkToad_Black_Talk, ANIM_DarkToad_Black_Idle, 0, MSG_MAC_Plaza_0052) EVT_CALL(SpeakToPlayer, NPC_DarkToad_03, ANIM_DarkToad_Yellow_Talk, ANIM_DarkToad_Yellow_Idle, 0, MSG_MAC_Plaza_0053) EVT_CALL(SpeakToPlayer, NPC_DarkToad_04, ANIM_DarkToad_Green_Talk, ANIM_DarkToad_Green_Idle, 0, MSG_MAC_Plaza_0054) EVT_SET(GF_MAC01_Merlon_HintFromDarkToads, TRUE) +#if VERSION_PAL + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) +#else EVT_CALL(ResetCam, CAM_DEFAULT, 5) +#endif EVT_END_SWITCH EVT_RETURN EVT_END @@ -993,20 +1001,28 @@ EvtScript N(EVS_Scene_MerlonAndNinji) = { EVT_CALL(SetNpcPos, NPC_Ninji, -278, 20, -376) EVT_CALL(SetNpcYaw, NPC_Ninji, 0) EVT_WAIT(40) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, -276, -305, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_0047) EVT_CALL(NpcFacePlayer, NPC_Ninji, 5) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(GetNpcPos, NPC_Ninji, LVar0, LVar1, LVar2) +#if VERSION_PAL + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(4.0 / DT), LVar0, LVar1, LVar2, 250, 15, -9) +#else EVT_CALL(SetCamProperties, CAM_DEFAULT, 4, LVar0, LVar1, LVar2, 250, 15, -9) +#endif EVT_CALL(SpeakToPlayer, NPC_Ninji, ANIM_Ninji_Talk, ANIM_Ninji_Idle, 0, MSG_MAC_Plaza_0048) EVT_CALL(GetNpcPos, NPC_Merlon, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_0049) +#if VERSION_PAL + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) +#else EVT_CALL(ResetCam, CAM_DEFAULT, 5) +#endif EVT_CALL(SpeakToPlayer, NPC_Ninji, ANIM_Ninji_Talk, ANIM_Ninji_Idle, 0, MSG_MAC_Plaza_004A) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Ninji, ANIM_Ninji_Walk) @@ -1015,7 +1031,7 @@ EvtScript N(EVS_Scene_MerlonAndNinji) = { EVT_CALL(SetNpcPos, NPC_Ninji, NPC_DISPOSE_LOCATION) EVT_END_THREAD EVT_THREAD - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitud, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_SET(LVar0, 0) EVT_LOOP(10) @@ -1023,7 +1039,7 @@ EvtScript N(EVS_Scene_MerlonAndNinji) = { EVT_CALL(RotateModel, MODEL_door, LVar0, 0, -1, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_LOOP(10) EVT_ADD(LVar0, -8) EVT_CALL(RotateModel, MODEL_door, LVar0, 0, -1, 0) @@ -1031,7 +1047,7 @@ EvtScript N(EVS_Scene_MerlonAndNinji) = { EVT_END_LOOP EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitud, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_004B) EVT_SET(GB_StoryProgress, STORY_CH7_INVITED_TO_STARBORN_VALLEY) EVT_CALL(DisablePlayerInput, FALSE) @@ -1274,7 +1290,7 @@ EvtScript N(EVS_NpcIdle_Toad_04) = { EVT_CALL(WaitForPlayerInputEnabled) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10 * DT) EVT_CALL(SpeakToPlayer, NPC_Toad_04, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MAC_Plaza_007D) EVT_SET(GB_StoryProgress, STORY_CH0_RETURNED_TO_TOAD_TOWN) EVT_CALL(DisablePlayerInput, FALSE) @@ -1954,23 +1970,23 @@ EvtScript N(EVS_NpcIdle_Twink) = { EVT_END_LOOP EVT_CALL(SetMusicTrack, 0, SONG_TWINK_THEME, 0, 8) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, 500, -20, 0) EVT_CALL(WaitForPlayerMoveToComplete) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(ShowMessageAtScreenPos, MSG_MAC_Plaza_00DB, 160, 40) EVT_LOOP(2) EVT_CALL(InterpPlayerYaw, 90, 7) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 270, 7) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_END_LOOP - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(GetPlayerPos, LVar4, LVar5, LVar6) EVT_SUBF(LVar4, EVT_FLOAT(50.0)) EVT_ADDF(LVar5, EVT_FLOAT(40.0)) EVT_CALL(InterpNpcYaw, NPC_Twink, 90, 0) - EVT_CALL(LoadPath, 35, EVT_PTR(N(FlightPath_TwinkArrive)), ARRAY_COUNT(N(FlightPath_TwinkArrive)), EASING_COS_IN_OUT) + EVT_CALL(LoadPath, 35 * DT, EVT_PTR(N(FlightPath_TwinkArrive)), ARRAY_COUNT(N(FlightPath_TwinkArrive)), EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_ADDF(LVar1, LVar4) @@ -1982,28 +1998,28 @@ EvtScript N(EVS_NpcIdle_Twink) = { EVT_END_IF EVT_END_LOOP EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), -10, -300, 15, -9) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0/ DT), -10, -300, 15, -9) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Plaza_00DC) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcJumpscale, NPC_Twink, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_Twink, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_Twink, LVar0, LVar1, LVar2, 10) + EVT_CALL(NpcJump0, NPC_Twink, LVar0, LVar1, LVar2, 10 * DT) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Plaza_00DD) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Chuckle) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), -40, -200, 15, -15) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT), -40, -200, 15, -15) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Plaza_00DE) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(InterpNpcYaw, NPC_Twink, 270, 0) EVT_CALL(GetNpcPos, NPC_Twink, LVar4, LVar5, LVar6) - EVT_CALL(LoadPath, 35, EVT_PTR(N(FlightPath_TwinkDepart)), ARRAY_COUNT(N(FlightPath_TwinkDepart)), EASING_QUADRATIC_IN) + EVT_CALL(LoadPath, 35 * DT, EVT_PTR(N(FlightPath_TwinkDepart)), ARRAY_COUNT(N(FlightPath_TwinkDepart)), EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_ADD(LVar1, LVar4) diff --git a/src/world/area_mac/mac_01/npc/flower_gate.inc.c b/src/world/area_mac/mac_01/npc/flower_gate.inc.c index 38eff3c55a..f2ade2eabe 100644 --- a/src/world/area_mac/mac_01/npc/flower_gate.inc.c +++ b/src/world/area_mac/mac_01/npc/flower_gate.inc.c @@ -266,7 +266,11 @@ EvtScript N(EVS_FadeOutFlowerGateGlowAlpha) = { }; EvtScript N(EVS_Scene_FlowerGateAppears) = { +#if VERSION_PAL + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(1.0 / DT), 266, 27, 373, 300, 15, -6) +#else EVT_CALL(SetCamProperties, CAM_DEFAULT, 1, 266, 27, 373, 300, 15, -6) +#endif EVT_EXEC(N(EVS_PlayFlowerGateSong)) EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 0, 266, 50, 338, 1, LVar9) EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_2A2, SOUND_SPACE_MODE_0) @@ -281,7 +285,7 @@ EvtScript N(EVS_Scene_FlowerGateAppears) = { EVT_END_THREAD EVT_SET(LVar0, 3) EVT_EXEC_GET_TID(N(EVS_ModulateFlowerGateGlowAlpha), LVar2) - EVT_WAIT(30) + EVT_WAIT(30 / DT) EVT_CALL(EnableModel, MODEL_r_door, TRUE) EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitf, SOUND_2A3, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 3060, 80, EASING_LINEAR) @@ -309,7 +313,11 @@ EvtScript N(EVS_Scene_FlowerGateAppears) = { EVT_END_IF EVT_END_LOOP EVT_EXEC_WAIT(N(EVS_FadeOutFlowerGateGlowAlpha)) +#if VERSION_PAL + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1 * DT)) +#else EVT_CALL(ResetCam, CAM_DEFAULT, 1) +#endif EVT_EXEC(N(EVS_SetupMusic)) EVT_RETURN EVT_END @@ -331,10 +339,14 @@ s32 N(ItemList_MagicalSeeds)[] = { EvtScript N(EVS_MinhT_PlantSeed) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SpeakToPlayer, NPC_MinhT, ANIM_MinhT_Talk, ANIM_MinhT_Idle, 0, LVar4) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 266, 27, 373) EVT_CALL(SetPanTarget, CAM_DEFAULT, 266, 27, 373) +#if VERSION_PAL + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) +#else EVT_CALL(SetCamSpeed, CAM_DEFAULT, 1) +#endif EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MinhT_Run) @@ -354,7 +366,7 @@ EvtScript N(EVS_MinhT_PlantSeed) = { EVT_CALL(NpcMoveTo, NPC_SELF, 330, 407, 0) EVT_END_SWITCH EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MinhT_Cheer) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2A1, SOUND_SPACE_MODE_0) EVT_SWITCH(LVar5) EVT_CASE_EQ(0) diff --git a/src/world/area_mac/mac_02/npc/bootler.inc.c b/src/world/area_mac/mac_02/npc/bootler.inc.c index 782cf7427a..17f4be02b0 100644 --- a/src/world/area_mac/mac_02/npc/bootler.inc.c +++ b/src/world/area_mac/mac_02/npc/bootler.inc.c @@ -37,7 +37,7 @@ EvtScript N(EVS_NpcIdle_Bootler) = { EVT_THREAD EVT_CALL(SetNpcPos, NPC_SELF, 430, 60, -40) EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Walk) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_293, SOUND_SPACE_MODE_0) EVT_CALL(NpcMoveTo, NPC_SELF, 580, -40, 0) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) @@ -46,14 +46,14 @@ EvtScript N(EVS_NpcIdle_Bootler) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 430, 1, 35) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.5), EVT_FLOAT(-10.5)) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0 / DT)) EVT_CALL(PlayerMoveTo, 430, -40, 0) EVT_CALL(InterpPlayerYaw, 315, 0) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(NpcMoveTo, NPC_PARTNER, 455, -40, 20) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 455, -40, 20 * DT) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 315, 0) EVT_CALL(EnablePartnerAI) EVT_CALL(SpeakToPlayer, NPC_FiceT, ANIM_FiceT_Afraid, ANIM_FiceT_Afraid, 0, MSG_MAC_Bridge_0023) @@ -64,22 +64,22 @@ EvtScript N(EVS_NpcIdle_Bootler) = { EVT_SET(LVar1, MSG_MAC_Bridge_0025) EVT_END_IF EVT_CALL(ContinueSpeech, NPC_FiceT, ANIM_FiceT_Afraid, ANIM_FiceT_Afraid, 0, LVar1) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Spook) EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_7, 0, 0, 0, 0) EVT_CALL(SetNpcYaw, NPC_SELF, 270) EVT_CALL(SetNpcPos, NPC_SELF, 500, 50, 30) EVT_EXEC_WAIT(N(D_8024ACA4_82DF64)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_FiceT, ANIM_FiceT_Afraid, ANIM_FiceT_Afraid, 5, MSG_MAC_Bridge_0026) EVT_EXEC_WAIT(N(D_8024ACA4_82DF64)) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcScale, NPC_Bootler, EVT_FLOAT(2.0), EVT_FLOAT(2.0), EVT_FLOAT(2.0)) EVT_CALL(SetNpcYaw, NPC_SELF, 90) EVT_CALL(SetNpcPos, NPC_SELF, 360, 20, 30) @@ -88,31 +88,31 @@ EvtScript N(EVS_NpcIdle_Bootler) = { EVT_EXEC_WAIT(N(D_8024ACA4_82DF64)) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Walk) EVT_CALL(SetNpcScale, NPC_Bootler, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(SetNpcPos, NPC_SELF, 480, 70, 10) EVT_EXEC_WAIT(N(D_8024ACA4_82DF64)) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_293, SOUND_SPACE_MODE_0) - EVT_CALL(NpcFlyTo, NPC_SELF, 550, 40, 10, 40, 10, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_SELF, 550, 40, 10, 40 * DT, 10, EASING_LINEAR) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(SpeakToPlayer, NPC_FiceT, ANIM_FiceT_Afraid, ANIM_FiceT_Afraid, 5, MSG_MAC_Bridge_0028) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) - EVT_WAIT(25) + EVT_WAIT(25 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_CALL(SpeakToPlayer, NPC_FiceT, ANIM_FiceT_Afraid, ANIM_FiceT_Afraid, 0, MSG_MAC_Bridge_0029) EVT_EXEC(N(EVS_SetupMusicTriggers)) EVT_SET(GB_StoryProgress, STORY_CH3_SAW_BOO_ENTER_FOREST) - EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_02/npc/tayce_t.inc.c b/src/world/area_mac/mac_02/npc/tayce_t.inc.c index e0157491f9..e75936885b 100644 --- a/src/world/area_mac/mac_02/npc/tayce_t.inc.c +++ b/src/world/area_mac/mac_02/npc/tayce_t.inc.c @@ -547,18 +547,18 @@ API_CALLABLE(N(TayceT_MakeItemList)) { EvtScript N(EVS_Scene_TayceTCooking) = { EVT_CALL(SetNpcFlagBits, NPC_TayceT, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcAnimation, NPC_TayceT, ANIM_TayceT_Walk) - EVT_CALL(NpcMoveTo, NPC_TayceT, -186, -381, 20) - EVT_CALL(NpcMoveTo, NPC_TayceT, -220, -425, 30) + EVT_CALL(NpcMoveTo, NPC_TayceT, -186, -381, 20 * DT) + EVT_CALL(NpcMoveTo, NPC_TayceT, -220, -425, 30 * DT) EVT_CALL(SetNpcAnimation, NPC_TayceT, ANIM_TayceT_Cooking) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Cooking, ANIM_TayceT_Cooking, 5, MSG_MAC_Bridge_000E) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_TayceT, ANIM_TayceT_TurnBack) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcYaw, NPC_TayceT, 90) EVT_CALL(SetNpcAnimation, NPC_TayceT, ANIM_TayceT_Walk) - EVT_CALL(NpcMoveTo, NPC_TayceT, -186, -381, 20) - EVT_CALL(NpcMoveTo, NPC_TayceT, -236, -318, 20) + EVT_CALL(NpcMoveTo, NPC_TayceT, -186, -381, 20 * DT) + EVT_CALL(NpcMoveTo, NPC_TayceT, -236, -318, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_TayceT, ANIM_TayceT_Idle) EVT_CALL(SetNpcFlagBits, NPC_TayceT, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_RETURN diff --git a/src/world/area_mac/mac_03/mac_03_2_main.c b/src/world/area_mac/mac_03/mac_03_2_main.c index fc55004ead..f0b4ff3fe7 100644 --- a/src/world/area_mac/mac_03/mac_03_2_main.c +++ b/src/world/area_mac/mac_03/mac_03_2_main.c @@ -60,6 +60,10 @@ EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN) EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_SETUP_CAMERA_NO_LEAD() +#if VERSION_PAL + EVT_CALL(GetLanguage, LocalVar(0)) + EVT_CALL(SetModelTexVariant, 57, LocalVar(0)) +#endif EVT_SET(AF_MAC_20, FALSE) EVT_SET(AF_MAC_21, FALSE) EVT_SET(AF_MAC_22, FALSE) diff --git a/src/world/area_mac/mac_04/npc_muskular.inc.c b/src/world/area_mac/mac_04/npc_muskular.inc.c index c0d113c2f7..5a0fdd08e1 100644 --- a/src/world/area_mac/mac_04/npc_muskular.inc.c +++ b/src/world/area_mac/mac_04/npc_muskular.inc.c @@ -40,20 +40,24 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForPlayerInputEnabled) EVT_CALL(DisablePlayerInput, TRUE) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SpeakToPlayer, NPC_Muskular, ANIM_WorldMuskular_Talk, ANIM_WorldMuskular_Idle, 512, MSG_MAC_Housing_00C5) EVT_CALL(GetNpcPos, NPC_Muskular, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, -300) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.5), -9) +#if VERSION_PAL + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.6)) +#else EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) +#endif EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Muskular, ANIM_WorldMuskular_Talk, ANIM_WorldMuskular_Idle, 512, MSG_MAC_Housing_00C6) EVT_CALL(SetPanTarget, CAM_DEFAULT, -470, 20, 250) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR) + EVT_CALL(MakeLerp, 0, 360, 10 * DT, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(SetNpcRotation, NPC_Muskular, 0, LVar0, 0) @@ -64,7 +68,7 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_END_LOOP EVT_CALL(EnableNpcAI, NPC_Muskular, FALSE) EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Leap) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -75,22 +79,22 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_ADD(LVar3, 30) EVT_LOOP(5) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 20) - EVT_WAIT(6) + EVT_WAIT(6 * DT) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar0, LVar3, LVar2, 20) - EVT_WAIT(6) + EVT_WAIT(6 * DT) EVT_END_LOOP - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Idle) EVT_CALL(EnableNpcAI, NPC_Muskular, TRUE) EVT_CALL(N(UpgradeStarPowerCh4)) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0194, 160, 40) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Muskular, ANIM_WorldMuskular_Talk, ANIM_WorldMuskular_Idle, 512, MSG_MAC_Housing_00C7) EVT_CALL(ShowMessageAtScreenPos, MSG_MAC_Housing_00C8, 160, 40) EVT_CALL(SetPanTarget, CAM_DEFAULT, -470, 20, 250) @@ -103,8 +107,8 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Housing_00C9) EVT_CALL(InterpNpcYaw, NPC_Twink, 270, 0) - EVT_WAIT(20) - EVT_CALL(NpcJump1, NPC_Twink, -460, 45, 220, 10) + EVT_WAIT(20 * DT) + EVT_CALL(NpcJump1, NPC_Twink, -460, 45, 220, 10 * DT) EVT_CALL(SpeakToNpc, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 512, NPC_Muskular, MSG_MAC_Housing_00CA) EVT_CALL(SetCamDistance, CAM_DEFAULT, -300) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) @@ -117,27 +121,27 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamDistance, CAM_DEFAULT, -300) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.5), -9) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToNpc, NPC_Muskular, ANIM_WorldMuskular_Talk, ANIM_WorldMuskular_Idle, 512, NPC_Twink, MSG_MAC_Housing_00CF) EVT_CALL(SetPanTarget, CAM_DEFAULT, -450, 20, 250) EVT_CALL(SetCamDistance, CAM_DEFAULT, -400) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) EVT_THREAD EVT_LOOP(25) EVT_CALL(GetNpcPos, NPC_Muskular, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 20) - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 1800) - EVT_CALL(MakeLerp, LVar2, LVar3, 100, EASING_CUBIC_IN) + EVT_CALL(MakeLerp, LVar2, LVar3, 100 * DT, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(SetNpcRotation, NPC_Muskular, 0, LVar0, 0) @@ -151,7 +155,7 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_CALL(GetNpcPos, NPC_Muskular, LVar2, LVar3, LVar4) EVT_SET(LVar5, LVar3) EVT_ADD(LVar5, 180) - EVT_CALL(MakeLerp, LVar3, LVar5, 100, EASING_CUBIC_IN) + EVT_CALL(MakeLerp, LVar3, LVar5, 100 * DT, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(SetNpcPos, NPC_Muskular, LVar2, LVar0, LVar4) @@ -163,32 +167,36 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_CALL(SetNpcPos, NPC_Muskular, NPC_DISPOSE_LOCATION) EVT_END_THREAD EVT_THREAD - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Muskular, SOUND_2045, SOUND_SPACE_MODE_0) EVT_END_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) - EVT_WAIT(115) + EVT_WAIT(115 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetMusicTrack, 0, SONG_TWINK_THEME, 0, 8) EVT_CALL(SetPanTarget, CAM_DEFAULT, -450, 20, 250) EVT_CALL(SetCamDistance, CAM_DEFAULT, -350) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(SetNpcSpeed, NPC_Twink, 4) +#if VERSION_PAL + EVT_CALL(SetNpcSpeed, NPC_Twink, EVT_FLOAT(4.8)) +#else +EVT_CALL(SetNpcSpeed, NPC_Twink, 4) +#endif EVT_CALL(NpcFlyTo, NPC_Twink, -480, 40, 270, 0, 10, EASING_LINEAR) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Housing_00D0) EVT_CALL(InterpNpcYaw, NPC_Twink, 270, 0) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(NpcFacePlayer, NPC_Twink, 0) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Housing_00D1) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Question) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Housing_00D2) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Housing_00D3) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(NpcFlyTo, NPC_Twink, -600, 200, 350, 0, -10, EASING_LINEAR) diff --git a/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c b/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c index ed19299f56..a23e8b22f7 100644 --- a/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c +++ b/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c @@ -65,33 +65,33 @@ EvtScript N(D_80248298_84AE68) = { }; EvtScript N(D_802483B8_84AF88) = { - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SpeakToPlayer, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim11, ANIM_ShyGuy_Pink_Anim01, 5, MSG_MAC_Housing_00B3) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim02) - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim03) - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim04) - EVT_WAIT(4) - EVT_CALL(NpcMoveTo, NPC_ShyGuy_01, -440, 3, 50) + EVT_WAIT(4 * DT) + EVT_CALL(NpcMoveTo, NPC_ShyGuy_01, -440, 3, 50 * DT) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim01) - EVT_WAIT(8) + EVT_WAIT(8 * DT) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim00) - EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 180, 10) - EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 0, 10) - EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 180, 10) - EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 0, 10) + EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 180, 10 * DT) + EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 0, 10 * DT) + EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 180, 10 * DT) + EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 0, 10 * DT) EVT_CALL(SpeakToPlayer, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim11, ANIM_ShyGuy_Pink_Anim01, 5, MSG_MAC_Housing_00B4) - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim08) - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim09) - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim0A) EVT_EXEC(N(D_80248298_84AE68)) EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_01, EVT_FLOAT(0.5)) - EVT_CALL(NpcJump0, NPC_ShyGuy_01, -440, 20, -75, 20) + EVT_CALL(NpcJump0, NPC_ShyGuy_01, -440, 20, -75, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim00) EVT_IF_LT(GB_StoryProgress, STORY_CH4_FOUND_HIDDEN_DOOR) EVT_SET(GB_StoryProgress, STORY_CH4_FOUND_HIDDEN_DOOR) @@ -105,19 +105,19 @@ EvtScript N(D_80248624_84B1F4) = { EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_203E, SOUND_SPACE_MODE_0) EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_ShyGuy_01, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_WAIT(20) + EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim11, ANIM_ShyGuy_Pink_Anim01, 0, MSG_MAC_Housing_00B2) EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 180, 10) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim02) - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim03) - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim04) - EVT_WAIT(4) + EVT_WAIT(4 * DT) EVT_EXEC_WAIT(N(D_80248128_84ACF8)) EVT_SET(LVar0, 14) EVT_EXEC_GET_TID(N(D_802480E0_84ACB0), LVarA) - EVT_CALL(NpcMoveTo, NPC_ShyGuy_01, -501, 223, 15) + EVT_CALL(NpcMoveTo, NPC_ShyGuy_01, -501, 223, 15 * DT) EVT_KILL_THREAD(LVarA) EVT_EXEC_WAIT(N(D_802481E0_84ADB0)) EVT_RETURN @@ -129,7 +129,7 @@ EvtScript N(D_80248798_84B368) = { EVT_IF_NE(GB_StoryProgress, STORY_CH4_MET_WITH_TWINK) EVT_RETURN EVT_END_IF - EVT_LOOP(150) + EVT_LOOP(150 * DT) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_IF_GT(LVar2, 200) EVT_RETURN @@ -165,7 +165,7 @@ EvtScript N(D_80248798_84B368) = { EVT_EXEC_WAIT(N(D_80248624_84B1F4)) EVT_CALL(N(GetFloorCollider), LVar0) EVT_THREAD - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_EXEC(N(D_80248798_84B368)) EVT_END_THREAD EVT_END_IF diff --git a/src/world/area_mac/mac_04/npc_twink.inc.c b/src/world/area_mac/mac_04/npc_twink.inc.c index a3ae278974..86c1f7f1cb 100644 --- a/src/world/area_mac/mac_04/npc_twink.inc.c +++ b/src/world/area_mac/mac_04/npc_twink.inc.c @@ -28,7 +28,7 @@ EvtScript N(EVS_NpcIdle_TwinkStartCh4) = { EVT_SUBF(LVar4, EVT_FLOAT(50.0)) EVT_ADDF(LVar5, EVT_FLOAT(40.0)) EVT_CALL(InterpNpcYaw, NPC_Twink, 90, 0) - EVT_CALL(LoadPath, 35, EVT_PTR(N(FlightPath_TwinkArrive)), ARRAY_COUNT(N(FlightPath_TwinkArrive)), EASING_COS_IN_OUT) + EVT_CALL(LoadPath, 35 * DT, EVT_PTR(N(FlightPath_TwinkArrive)), ARRAY_COUNT(N(FlightPath_TwinkArrive)), EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_ADDF(LVar1, LVar4) @@ -40,32 +40,32 @@ EvtScript N(EVS_NpcIdle_TwinkStartCh4) = { EVT_END_IF EVT_END_LOOP EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), -10, -300, 15, -9) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT), -10, -300, 15, -9) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Bridge_0090) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) - EVT_WAIT(15) + EVT_WAIT(15 * DT) EVT_CALL(SetNpcJumpscale, NPC_Twink, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_Twink, LVar0, LVar1, LVar2) - EVT_CALL(NpcJump0, NPC_Twink, LVar0, LVar1, LVar2, 10) + EVT_CALL(NpcJump0, NPC_Twink, LVar0, LVar1, LVar2, 10 * DT) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Bridge_0091) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Chuckle) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Bridge_0092) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) - EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), -40, -200, 15, -15) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT), -40, -200, 15, -15) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Bridge_0093) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(InterpNpcYaw, NPC_Twink, 270, 0) EVT_CALL(GetNpcPos, NPC_Twink, LVar4, LVar5, LVar6) - EVT_CALL(LoadPath, 35, EVT_PTR(N(FlightPath_TwinkDepart)), ARRAY_COUNT(N(FlightPath_TwinkDepart)), EASING_QUADRATIC_IN) + EVT_CALL(LoadPath, 35 * DT, EVT_PTR(N(FlightPath_TwinkDepart)), ARRAY_COUNT(N(FlightPath_TwinkDepart)), EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(GetNextPathPos) EVT_ADD(LVar1, LVar4) diff --git a/src/world/area_mac/mac_05/mac_05_4_npc.c b/src/world/area_mac/mac_05/mac_05_4_npc.c index dff6986288..2e91035956 100644 --- a/src/world/area_mac/mac_05/mac_05_4_npc.c +++ b/src/world/area_mac/mac_05/mac_05_4_npc.c @@ -1114,16 +1114,16 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_00B3) EVT_THREAD - EVT_WAIT(15) - EVT_CALL(PlayerMoveTo, -340, 380, 20) + EVT_WAIT(15 * DT) + EVT_CALL(PlayerMoveTo, -340, 380, 20 * DT) EVT_CALL(InterpPlayerYaw, 45, 0) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Run) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, -280, 280, 0) EVT_CALL(NpcMoveTo, NPC_SELF, -340, 70, 0) EVT_CALL(NpcMoveTo, NPC_SELF, -260, -140, 0) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(7.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(7.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, 150, -140, 0) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_SET(GB_StoryProgress, STORY_CH5_RETURNED_TO_TOAD_TOWN) @@ -1852,18 +1852,18 @@ EvtScript N(EVS_NpcInteract_ArtistToad) = { EVT_CALL(SetMusicTrack, 0, SONG_POP_DIVA_SONG, 0, 8) EVT_CALL(SetNpcAnimation, NPC_Bartender, ANIM_Bartender_StrumGuitar) EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Idle) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Sing) - EVT_WAIT(150) - EVT_WAIT(150) - EVT_WAIT(150) + EVT_WAIT(150 * DT) + EVT_WAIT(150 * DT) + EVT_WAIT(150 * DT) EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Idle) EVT_CALL(SetNpcAnimation, NPC_Bartender, ANIM_Bartender_Idle) - EVT_WAIT(40) + EVT_WAIT(40 * DT) EVT_CALL(SetNpcAnimation, NPC_Toad_02, ANIM_Toad_Red_Idle) EVT_CALL(SetNpcAnimation, NPC_ArtistToad, ANIM_Musician_Poet_Idle) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_EXEC(N(EVS_802442E8)) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Bartender, ANIM_Bartender_Walk) diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index 14503bb85f..0f080419ff 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -31,6 +31,10 @@ extern s16 MessagePlural; extern s16 MessageSingular; +#if VERSION_PAL +extern u8 MessagePlural_de[]; +#endif + BSS s32 N(Quizmo_Worker); // needed for kmr_02 #ifndef QUIZMO_PRE_STATIC_PAD @@ -1112,7 +1116,16 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_IF_EQ(GB_CompletedQuizzes, 1) EVT_CALL(SetMessageText, EVT_PTR(MessageSingular), 1) EVT_ELSE +#if VERSION_PAL + EVT_CALL(GetLanguage, LocalVar(0)) + EVT_IF_EQ(LocalVar(0), 1) + EVT_CALL(SetMessageText, EVT_PTR(MessagePlural_de), 1) + EVT_ELSE + EVT_CALL(SetMessageText, EVT_PTR(MessagePlural), 1) + EVT_END_IF +#else EVT_CALL(SetMessageText, EVT_PTR(MessagePlural), 1) +#endif EVT_END_IF EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ChuckQuizmo_Talk, ANIM_ChuckQuizmo_Idle, 0, MSG_MGM_000F) EVT_END_IF diff --git a/src/world/common/entity/SuperBlock.inc.c b/src/world/common/entity/SuperBlock.inc.c index 83df177d54..36cab98d79 100644 --- a/src/world/common/entity/SuperBlock.inc.c +++ b/src/world/common/entity/SuperBlock.inc.c @@ -296,7 +296,7 @@ API_CALLABLE(N(SuperBlock_AnimateEnergyOrbs)) { userData = (EnergyOrbSet*)script->userData; switch (userData->scatterState) { case 0: - t1 = update_lerp(EASING_CUBIC_OUT, 0.0f, 50.0f, userData->scatterStateTime, 20); + t1 = update_lerp(EASING_CUBIC_OUT, 0.0f, 50.0f, userData->scatterStateTime, 20 * DT); for (i = 0; i < SUPER_BLOCK_NUM_ORBS; i++) { x = userData->posY[i] = 0.0f; add_vec2D_polar(&x, &userData->posY[i], t1, N(SuperBlock_UpgradeOrbAngles)[i]); @@ -305,7 +305,7 @@ API_CALLABLE(N(SuperBlock_AnimateEnergyOrbs)) { } userData->scatterStateTime++; - if (userData->scatterStateTime >= 21) { + if (userData->scatterStateTime >= (s32)(21 * DT)) { userData->scatterState = 1; userData->scatterStateTime = 0; } @@ -320,14 +320,14 @@ API_CALLABLE(N(SuperBlock_AnimateEnergyOrbs)) { } userData->scatterStateTime++; - if (userData->scatterStateTime > 15) { - userData->scatterStateTime = 15; + if (userData->scatterStateTime > (s32)(15 * DT)) { + userData->scatterStateTime = 15 * DT; userData->scatterState = 2; } break; case 2: userData->scatterStateTime++; - if (userData->scatterStateTime > 30) { + if (userData->scatterStateTime > (s32)(30 * DT)) { for (i = 0; i < SUPER_BLOCK_NUM_ORBS; i++) { userData->orbEffects[i]->flags |= EFFECT_INSTANCE_FLAG_10; } @@ -339,20 +339,20 @@ API_CALLABLE(N(SuperBlock_AnimateEnergyOrbs)) { switch (userData->gatherState) { case 0: userData->gatherStateTime++; - if (userData->gatherStateTime > 15) { + if (userData->gatherStateTime > (s32)(15 * DT)) { userData->gatherState = 1; userData->gatherStateTime = 0; } break; case 1: for (i = 0; i < SUPER_BLOCK_NUM_ORBS; i++) { - userData->posX[i] += update_lerp(EASING_QUADRATIC_IN, 0.0f, userData->partnerPosX[i], userData->gatherStateTime, 20); - userData->posY[i] += update_lerp(EASING_QUADRATIC_IN, 0.0f, userData->partnerPosY[i], userData->gatherStateTime, 20); - userData->posZ[i] += update_lerp(EASING_QUADRATIC_IN, 0.0f, userData->partnerPosZ[i], userData->gatherStateTime, 20); + userData->posX[i] += update_lerp(EASING_QUADRATIC_IN, 0.0f, userData->partnerPosX[i], userData->gatherStateTime, 20 * DT); + userData->posY[i] += update_lerp(EASING_QUADRATIC_IN, 0.0f, userData->partnerPosY[i], userData->gatherStateTime, 20 * DT); + userData->posZ[i] += update_lerp(EASING_QUADRATIC_IN, 0.0f, userData->partnerPosZ[i], userData->gatherStateTime, 20 * DT); } userData->gatherStateTime++; - if (userData->gatherStateTime > 20) { + if (userData->gatherStateTime > (s32)(20 * DT)) { userData->gatherState = 2; userData->gatherStateTime = 0; } @@ -436,14 +436,14 @@ API_CALLABLE(N(SuperBlock_WaitForPlayerToLand)) { } EvtScript N(SuperBlock_ShowUpgradeEffects) = { - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(PlaySound, SOUND_212D) EVT_CALL(N(SuperBlock_GatherEnergyFX), SUPER_BLOCK_MAPVAR) - EVT_WAIT(85) + EVT_WAIT(85 * DT) EVT_THREAD EVT_CALL(PlaySound, SOUND_212E) EVT_CALL(N(SuperBlock_WhiteScreenFlash), 70, 70) - EVT_WAIT(27) + EVT_WAIT(27 * DT) EVT_CALL(PlaySound, SOUND_208E) EVT_CALL(N(SuperBlock_WhiteScreenFlash), 50, 50) EVT_END_THREAD @@ -452,17 +452,17 @@ EvtScript N(SuperBlock_ShowUpgradeEffects) = { EVT_CALL(N(SuperBlock_HideBlockContent), SUPER_BLOCK_MAPVAR) EVT_END_THREAD EVT_THREAD - EVT_WAIT(47) + EVT_WAIT(47 * DT) EVT_CALL(N(SuperBlock_RadiateFaintEnergyFX)) EVT_CALL(N(SuperBlock_PartnerSparkles2)) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(N(SuperBlock_PartnerSparkles4)) - EVT_WAIT(5) + EVT_WAIT(5 * DT) EVT_CALL(N(SuperBlock_PartnerSparkles2)) EVT_END_THREAD EVT_WAIT(3) EVT_CALL(N(SuperBlock_AnimateEnergyOrbs), SUPER_BLOCK_MAPVAR) - EVT_WAIT(30) + EVT_WAIT(30 * DT) EVT_RETURN EVT_END }; @@ -521,7 +521,7 @@ EvtScript N(SuperBlock_OnHit) = { EVT_ELSE EVT_CALL(func_802CF56C, 2) EVT_END_IF - EVT_WAIT(10) + EVT_WAIT(10 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00DF, 160, 40) EVT_CALL(ShowChoice, MSG_Choice_000D) EVT_CALL(CloseMessage) diff --git a/tools/build/configure.py b/tools/build/configure.py index a364848683..3c0992497b 100755 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -10,7 +10,7 @@ import ninja_syntax from glob import glob # Configuration: -VERSIONS = ["us", "jp", "ique"] +VERSIONS = ["us", "jp", "ique", "pal"] DO_SHA1_CHECK = True # Paths: @@ -333,6 +333,7 @@ class Configure: def write_ninja(self, ninja: ninja_syntax.Writer, skip_outputs: Set[str], non_matching: bool, modern_gcc: bool): import segtypes import segtypes.common.data + import segtypes.common.asm import segtypes.n64.yay0 assert self.linker_entries is not None diff --git a/tools/splat_ext/msg_pal_en.yaml b/tools/splat_ext/msg_pal_en.yaml new file mode 100644 index 0000000000..b60b921b47 --- /dev/null +++ b/tools/splat_ext/msg_pal_en.yaml @@ -0,0 +1,8045 @@ +# This file describes what to name messages when splitting. + +- [0x00, 0x0000, NONE] +- [0x00, 0x0001, Intro_0001] +- [0x00, 0x0002, Intro_0002] +- [0x00, 0x0003, Intro_0003] +- [0x00, 0x0004, Intro_0004] +- [0x00, 0x0005, Intro_0005] +- [0x00, 0x0006, Intro_0006] +- [0x00, 0x0007, Intro_0007] +- [0x00, 0x0008, Intro_0008] +- [0x00, 0x0009, Intro_0009] +- [0x00, 0x000A, Intro_000A] +- [0x00, 0x000B, Intro_000B] +- [0x00, 0x000C, Intro_000C] +- [0x00, 0x000D, Intro_000D] +- [0x00, 0x000E, Intro_000E] +- [0x00, 0x000F, Intro_000F] +- [0x00, 0x0010, Intro_0010] +- [0x00, 0x0011, Intro_0011] +- [0x00, 0x0012, Intro_0012] +- [0x00, 0x0013, Intro_0013] +- [0x00, 0x0014, Intro_0014] +- [0x00, 0x0015, Intro_0015] +- [0x00, 0x0016, Intro_0016] +- [0x00, 0x0017, Intro_0017] +- [0x00, 0x0018, Intro_0018] +- [0x00, 0x0019, Intro_0019] +- [0x00, 0x001A, Intro_001A] +- [0x00, 0x001B, Intro_001B] +- [0x00, 0x001C, Intro_001C] +- [0x00, 0x001D, Intro_001D] +- [0x00, 0x001E, Intro_001E] +- [0x00, 0x001F, Intro_001F] +- [0x00, 0x0020, Intro_0020] +- [0x00, 0x0021, Intro_0021] +- [0x00, 0x0022, Intro_0022] +- [0x00, 0x0023, Intro_0023] +- [0x00, 0x0024, Intro_0024] +- [0x00, 0x0025, Intro_0025] +- [0x00, 0x0026, Intro_0026] +- [0x00, 0x0027, Intro_0027] +- [0x00, 0x0028, Intro_0028] +- [0x00, 0x0029, Intro_0029] +- [0x00, 0x002A, Intro_002A] +- [0x00, 0x002B, Intro_002B] +- [0x00, 0x002C, Intro_002C] +- [0x00, 0x002D, Intro_002D] +- [0x00, 0x002E, Intro_002E] +- [0x00, 0x002F, Intro_002F] +- [0x00, 0x0030, Intro_0030] +- [0x00, 0x0031, Intro_0031] +- [0x00, 0x0032, Intro_0032] +- [0x00, 0x0033, Intro_0033] +- [0x00, 0x0034, Intro_0034] +- [0x00, 0x0035, Intro_0035] +- [0x00, 0x0036, Intro_0036] +- [0x00, 0x0037, Intro_0037] +- [0x00, 0x0038, Intro_0038] +- [0x00, 0x0039, Intro_0039] +- [0x00, 0x003A, Intro_003A] +- [0x00, 0x003B, Intro_003B] +- [0x00, 0x003C, Intro_003C] +- [0x00, 0x003D, Intro_003D] +- [0x00, 0x003E, Intro_003E] +- [0x00, 0x003F, Intro_003F] +- [0x00, 0x0040, Intro_0040] +- [0x00, 0x0041, Intro_0041] +- [0x00, 0x0042, Intro_0042] +- [0x00, 0x0043, Intro_0043] +- [0x00, 0x0044, Intro_0044] +- [0x00, 0x0045, Intro_0045] +- [0x00, 0x0046, Intro_0046] +- [0x00, 0x0047, Intro_0047] +- [0x00, 0x0048, Intro_0048] +- [0x00, 0x0049, Intro_0049] +- [0x00, 0x004A, Intro_004A] +- [0x00, 0x004B, Intro_004B] +- [0x00, 0x004C, Intro_004C] +- [0x00, 0x004D, Intro_004D] +- [0x00, 0x004E, Intro_004E] +- [0x00, 0x004F, Intro_004F] +- [0x00, 0x0050, Intro_0050] +- [0x00, 0x0051, Intro_0051] +- [0x00, 0x0052, Intro_0052] +- [0x00, 0x0053, Intro_0053] +- [0x00, 0x0054, Intro_0054] +- [0x00, 0x0055, Intro_0055] +- [0x00, 0x0056, Intro_0056] +- [0x00, 0x0057, Intro_0057] +- [0x00, 0x0058, Intro_0058] +- [0x00, 0x0059, Intro_0059] +- [0x00, 0x005A, Intro_005A] +- [0x00, 0x005B, Intro_005B] +- [0x00, 0x005C, Intro_005C] +- [0x00, 0x005D, Intro_005D] +- [0x00, 0x005E, Intro_005E] +- [0x00, 0x005F, Intro_005F] +- [0x00, 0x0060, Intro_0060] +- [0x00, 0x0061, Intro_0061] +- [0x00, 0x0062, Intro_0062] +- [0x01, 0x0000, Outro_0000] +- [0x01, 0x0001, Outro_0001] +- [0x01, 0x0002, Outro_0002] +- [0x01, 0x0003, Outro_0003] +- [0x01, 0x0004, Outro_0004] +- [0x01, 0x0005, Outro_0005] +- [0x01, 0x0006, Outro_0006] +- [0x01, 0x0007, Outro_0007] +- [0x01, 0x0008, Outro_0008] +- [0x01, 0x0009, Outro_0009] +- [0x01, 0x000A, Outro_000A] +- [0x01, 0x000B, Outro_000B] +- [0x01, 0x000C, Outro_000C] +- [0x01, 0x000D, Outro_000D] +- [0x01, 0x000E, Outro_000E] +- [0x01, 0x000F, Outro_000F] +- [0x01, 0x0010, Outro_0010] +- [0x01, 0x0011, Outro_0011] +- [0x01, 0x0012, Outro_0012] +- [0x01, 0x0013, Outro_0013] +- [0x01, 0x0014, Outro_0014] +- [0x01, 0x0015, Outro_0015] +- [0x01, 0x0016, Outro_0016] +- [0x01, 0x0017, Outro_0017] +- [0x01, 0x0018, Outro_0018] +- [0x01, 0x0019, Outro_0019] +- [0x01, 0x001A, Outro_001A] +- [0x01, 0x001B, Outro_001B] +- [0x01, 0x001C, Outro_001C] +- [0x01, 0x001D, Outro_001D] +- [0x01, 0x001E, Outro_001E] +- [0x01, 0x001F, Outro_001F] +- [0x01, 0x0020, Outro_0020] +- [0x01, 0x0021, Outro_0021] +- [0x01, 0x0022, Outro_0022] +- [0x01, 0x0023, Outro_0023] +- [0x01, 0x0024, Outro_0024] +- [0x01, 0x0025, Outro_0025] +- [0x01, 0x0026, Outro_0026] +- [0x01, 0x0027, Outro_0027] +- [0x01, 0x0028, Outro_0028] +- [0x01, 0x0029, Outro_0029] +- [0x01, 0x002A, Outro_002A] +- [0x01, 0x002B, Outro_002B] +- [0x01, 0x002C, Outro_002C] +- [0x01, 0x002D, Outro_002D] +- [0x01, 0x002E, Outro_002E] +- [0x01, 0x002F, Outro_002F] +- [0x01, 0x0030, Outro_0030] +- [0x01, 0x0031, Outro_0031] +- [0x01, 0x0032, Outro_0032] +- [0x01, 0x0033, Outro_0033] +- [0x01, 0x0034, Outro_0034] +- [0x01, 0x0035, Outro_0035] +- [0x01, 0x0036, Outro_0036] +- [0x01, 0x0037, Outro_0037] +- [0x01, 0x0038, Outro_0038] +- [0x01, 0x0039, Outro_0039] +- [0x01, 0x003A, Outro_003A] +- [0x01, 0x003B, Outro_003B] +- [0x01, 0x003C, Outro_003C] +- [0x01, 0x003D, Outro_003D] +- [0x01, 0x003E, Outro_003E] +- [0x01, 0x003F, Outro_003F] +- [0x01, 0x0040, Outro_0040] +- [0x01, 0x0041, Outro_0041] +- [0x01, 0x0042, Outro_0042] +- [0x01, 0x0043, Outro_0043] +- [0x01, 0x0044, Outro_0044] +- [0x01, 0x0045, Outro_0045] +- [0x01, 0x0046, Outro_0046] +- [0x01, 0x0047, Outro_0047] +- [0x01, 0x0048, Outro_0048] +- [0x01, 0x0049, Outro_0049] +- [0x01, 0x004A, Outro_004A] +- [0x01, 0x004B, Outro_004B] +- [0x01, 0x004C, Outro_004C] +- [0x01, 0x004D, Outro_004D] +- [0x01, 0x004E, Outro_004E] +- [0x01, 0x004F, Outro_004F] +- [0x01, 0x0050, Outro_0050] +- [0x01, 0x0051, Outro_0051] +- [0x01, 0x0052, Outro_0052] +- [0x01, 0x0053, Outro_0053] +- [0x01, 0x0054, Outro_0054] +- [0x01, 0x0055, Outro_0055] +- [0x01, 0x0056, Outro_0056] +- [0x01, 0x0057, Outro_0057] +- [0x01, 0x0058, Outro_0058] +- [0x01, 0x0059, Outro_0059] +- [0x01, 0x005A, Outro_005A] +- [0x01, 0x005B, Outro_005B] +- [0x01, 0x005C, Outro_005C] +- [0x01, 0x005D, Outro_005D] +- [0x01, 0x005E, Outro_005E] +- [0x01, 0x005F, Outro_005F] +- [0x01, 0x0060, Outro_0060] +- [0x01, 0x0061, Outro_0061] +- [0x01, 0x0062, Outro_0062] +- [0x01, 0x0063, Outro_0063] +- [0x01, 0x0064, Outro_0064] +- [0x01, 0x0065, Outro_0065] +- [0x01, 0x0066, Outro_0066] +- [0x01, 0x0067, Outro_0067] +- [0x01, 0x0068, Outro_0068] +- [0x01, 0x0069, Outro_0069] +- [0x01, 0x006A, Outro_006A] +- [0x01, 0x006B, Outro_006B] +- [0x01, 0x006C, Outro_006C] +- [0x01, 0x006D, Outro_006D] +- [0x01, 0x006E, Outro_006E] +- [0x02, 0x0000, MAC_Gate_0000] +- [0x02, 0x0001, MAC_Gate_0001] +- [0x02, 0x0002, MAC_Gate_0002] +- [0x02, 0x0003, MAC_Gate_0003] +- [0x02, 0x0004, MAC_Gate_0004] +- [0x02, 0x0005, MAC_Gate_0005] +- [0x02, 0x0006, MAC_Gate_0006] +- [0x02, 0x0007, MAC_Gate_0007] +- [0x02, 0x0008, MAC_Gate_0008] +- [0x02, 0x0009, MAC_Gate_0009] +- [0x02, 0x000A, MAC_Gate_000A] +- [0x02, 0x000B, MAC_Gate_000B] +- [0x02, 0x000C, MAC_Gate_000C] +- [0x02, 0x000D, MAC_Gate_000D] +- [0x02, 0x000E, MAC_Gate_000E] +- [0x02, 0x000F, MAC_Gate_000F] +- [0x02, 0x0010, MAC_Gate_0010] +- [0x02, 0x0011, MAC_Gate_0011] +- [0x02, 0x0012, MAC_Gate_0012] +- [0x02, 0x0013, MAC_Gate_0013] +- [0x02, 0x0014, MAC_Gate_0014] +- [0x02, 0x0015, MAC_Gate_0015] +- [0x02, 0x0016, MAC_Gate_0016] +- [0x02, 0x0017, MAC_Gate_0017] +- [0x02, 0x0018, MAC_Gate_0018] +- [0x02, 0x0019, MAC_Gate_0019] +- [0x02, 0x001A, MAC_Gate_001A] +- [0x02, 0x001B, MAC_Gate_001B] +- [0x02, 0x001C, MAC_Gate_001C] +- [0x02, 0x001D, MAC_Gate_001D] +- [0x02, 0x001E, MAC_Gate_001E] +- [0x02, 0x001F, MAC_Gate_001F] +- [0x02, 0x0020, MAC_Gate_0020] +- [0x02, 0x0021, MAC_Gate_0021] +- [0x02, 0x0022, MAC_Gate_0022] +- [0x02, 0x0023, MAC_Gate_0023] +- [0x02, 0x0024, MAC_Gate_0024] +- [0x02, 0x0025, MAC_Gate_0025] +- [0x02, 0x0026, MAC_Gate_0026] +- [0x02, 0x0027, MAC_Gate_0027] +- [0x02, 0x0028, MAC_Gate_0028] +- [0x02, 0x0029, MAC_Gate_0029] +- [0x02, 0x002A, MAC_Gate_002A] +- [0x02, 0x002B, MAC_Gate_002B] +- [0x02, 0x002C, MAC_Gate_002C] +- [0x02, 0x002D, MAC_Gate_002D] +- [0x02, 0x002E, MAC_Gate_002E] +- [0x02, 0x002F, MAC_Gate_002F] +- [0x02, 0x0030, MAC_Gate_0030] +- [0x02, 0x0031, MAC_Gate_0031] +- [0x02, 0x0032, MAC_Gate_0032] +- [0x02, 0x0033, MAC_Gate_0033] +- [0x02, 0x0034, MAC_Gate_0034] +- [0x02, 0x0035, MAC_Gate_0035] +- [0x02, 0x0036, MAC_Gate_0036] +- [0x02, 0x0037, MAC_Gate_0037] +- [0x02, 0x0038, MAC_Gate_0038] +- [0x02, 0x0039, MAC_Gate_0039] +- [0x02, 0x003A, MAC_Gate_003A] +- [0x02, 0x003B, MAC_Gate_003B] +- [0x02, 0x003C, MAC_Gate_003C] +- [0x02, 0x003D, MAC_Gate_003D] +- [0x02, 0x003E, MAC_Gate_003E] +- [0x02, 0x003F, MAC_Gate_003F] +- [0x02, 0x0040, MAC_Gate_0040] +- [0x02, 0x0041, MAC_Gate_0041] +- [0x02, 0x0042, MAC_Gate_0042] +- [0x02, 0x0043, MAC_Gate_0043] +- [0x02, 0x0044, MAC_Gate_0044] +- [0x02, 0x0045, MAC_Gate_0045] +- [0x02, 0x0046, MAC_Gate_0046] +- [0x02, 0x0047, MAC_Gate_0047] +- [0x02, 0x0048, MAC_Gate_0048] +- [0x02, 0x0049, MAC_Gate_0049] +- [0x02, 0x004A, MAC_Gate_004A] +- [0x02, 0x004B, MAC_Gate_004B] +- [0x02, 0x004C, MAC_Gate_004C] +- [0x02, 0x004D, MAC_Gate_004D] +- [0x02, 0x004E, MAC_Gate_004E] +- [0x02, 0x004F, MAC_Gate_004F] +- [0x02, 0x0050, MAC_Gate_0050] +- [0x02, 0x0051, MAC_Gate_0051] +- [0x02, 0x0052, MAC_Gate_0052] +- [0x02, 0x0053, MAC_Gate_0053] +- [0x02, 0x0054, MAC_Gate_0054] +- [0x02, 0x0055, MAC_Gate_0055] +- [0x02, 0x0056, MAC_Gate_0056] +- [0x02, 0x0057, MAC_Gate_0057] +- [0x02, 0x0058, MAC_Gate_0058] +- [0x02, 0x0059, MAC_Gate_0059] +- [0x02, 0x005A, MAC_Gate_005A] +- [0x02, 0x005B, MAC_Gate_005B] +- [0x02, 0x005C, MAC_Gate_005C] +- [0x02, 0x005D, MAC_Gate_005D] +- [0x02, 0x005E, MAC_Gate_005E] +- [0x02, 0x005F, MAC_Gate_005F] +- [0x02, 0x0060, MAC_Gate_0060] +- [0x02, 0x0061, MAC_Gate_0061] +- [0x02, 0x0062, MAC_Gate_0062] +- [0x02, 0x0063, MAC_Gate_0063] +- [0x02, 0x0064, MAC_Gate_0064] +- [0x02, 0x0065, MAC_Gate_0065] +- [0x02, 0x0066, MAC_Gate_0066] +- [0x02, 0x0067, MAC_Gate_0067] +- [0x02, 0x0068, MAC_Gate_0068] +- [0x02, 0x0069, MAC_Gate_0069] +- [0x02, 0x006A, MAC_Gate_006A] +- [0x02, 0x006B, MAC_Gate_006B] +- [0x02, 0x006C, MAC_Gate_006C] +- [0x02, 0x006D, MAC_Gate_006D] +- [0x02, 0x006E, MAC_Gate_006E] +- [0x02, 0x006F, MAC_Gate_006F] +- [0x02, 0x0070, MAC_Gate_0070] +- [0x02, 0x0071, MAC_Gate_0071] +- [0x02, 0x0072, MAC_Gate_0072] +- [0x02, 0x0073, MAC_Gate_0073] +- [0x02, 0x0074, MAC_Gate_0074] +- [0x02, 0x0075, MAC_Gate_0075] +- [0x02, 0x0076, MAC_Gate_0076] +- [0x02, 0x0077, MAC_Gate_0077] +- [0x02, 0x0078, MAC_Gate_0078] +- [0x02, 0x0079, MAC_Gate_0079] +- [0x02, 0x007A, MAC_Gate_007A] +- [0x02, 0x007B, MAC_Gate_007B] +- [0x02, 0x007C, MAC_Gate_007C] +- [0x02, 0x007D, MAC_Gate_007D] +- [0x02, 0x007E, MAC_Gate_007E] +- [0x02, 0x007F, MAC_Gate_007F] +- [0x02, 0x0080, MAC_Gate_0080] +- [0x02, 0x0081, MAC_Gate_0081] +- [0x02, 0x0082, MAC_Gate_0082] +- [0x02, 0x0083, MAC_Gate_0083] +- [0x02, 0x0084, MAC_Gate_0084] +- [0x02, 0x0085, MAC_Gate_0085] +- [0x02, 0x0086, MAC_Gate_0086] +- [0x02, 0x0087, MAC_Gate_0087] +- [0x02, 0x0088, MAC_Gate_0088] +- [0x02, 0x0089, MAC_Gate_0089] +- [0x02, 0x008A, MAC_Gate_008A] +- [0x02, 0x008B, MAC_Gate_008B] +- [0x02, 0x008C, MAC_Gate_008C] +- [0x02, 0x008D, MAC_Gate_008D] +- [0x02, 0x008E, MAC_Gate_008E] +- [0x02, 0x008F, MAC_Gate_008F] +- [0x02, 0x0090, MAC_Gate_0090] +- [0x02, 0x0091, MAC_Gate_0091] +- [0x02, 0x0092, MAC_Gate_0092] +- [0x02, 0x0093, MAC_Gate_0093] +- [0x02, 0x0094, MAC_Gate_0094] +- [0x02, 0x0095, MAC_Gate_0095] +- [0x02, 0x0096, MAC_Gate_0096] +- [0x02, 0x0097, MAC_Gate_0097] +- [0x02, 0x0098, MAC_Gate_0098] +- [0x02, 0x0099, MAC_Gate_0099] +- [0x02, 0x009A, MAC_Gate_009A] +- [0x02, 0x009B, MAC_Gate_009B] +- [0x02, 0x009C, MAC_Gate_009C] +- [0x02, 0x009D, MAC_Gate_009D] +- [0x02, 0x009E, MAC_Gate_009E] +- [0x02, 0x009F, MAC_Gate_009F] +- [0x02, 0x00A0, MAC_Gate_00A0] +- [0x02, 0x00A1, MAC_Gate_00A1] +- [0x02, 0x00A2, MAC_Gate_00A2] +- [0x02, 0x00A3, MAC_Gate_00A3] +- [0x02, 0x00A4, MAC_Gate_00A4] +- [0x02, 0x00A5, MAC_Gate_00A5] +- [0x02, 0x00A6, MAC_Gate_00A6] +- [0x02, 0x00A7, MAC_Gate_00A7] +- [0x02, 0x00A8, MAC_Gate_00A8] +- [0x02, 0x00A9, MAC_Gate_00A9] +- [0x02, 0x00AA, MAC_Gate_00AA] +- [0x02, 0x00AB, MAC_Gate_00AB] +- [0x02, 0x00AC, MAC_Gate_00AC] +- [0x02, 0x00AD, MAC_Gate_00AD] +- [0x02, 0x00AE, MAC_Gate_00AE] +- [0x02, 0x00AF, MAC_Gate_00AF] +- [0x02, 0x00B0, MAC_Gate_00B0] +- [0x02, 0x00B1, MAC_Gate_00B1] +- [0x02, 0x00B2, MAC_Gate_00B2] +- [0x02, 0x00B3, MAC_Gate_00B3] +- [0x02, 0x00B4, MAC_Gate_00B4] +- [0x02, 0x00B5, MAC_Gate_00B5] +- [0x02, 0x00B6, MAC_Gate_00B6] +- [0x02, 0x00B7, MAC_Gate_00B7] +- [0x02, 0x00B8, MAC_Gate_00B8] +- [0x02, 0x00B9, MAC_Gate_00B9] +- [0x02, 0x00BA, MAC_Gate_00BA] +- [0x02, 0x00BB, MAC_Gate_00BB] +- [0x02, 0x00BC, MAC_Gate_00BC] +- [0x02, 0x00BD, MAC_Gate_00BD] +- [0x02, 0x00BE, MAC_Gate_00BE] +- [0x02, 0x00BF, MAC_Gate_00BF] +- [0x02, 0x00C0, MAC_Gate_00C0] +- [0x02, 0x00C1, MAC_Gate_00C1] +- [0x02, 0x00C2, MAC_Gate_00C2] +- [0x02, 0x00C3, MAC_Gate_00C3] +- [0x02, 0x00C4, MAC_Gate_00C4] +- [0x02, 0x00C5, MAC_Gate_00C5] +- [0x02, 0x00C6, MAC_Gate_00C6] +- [0x02, 0x00C7, MAC_Gate_00C7] +- [0x02, 0x00C8, MAC_Gate_00C8] +- [0x02, 0x00C9, MAC_Gate_00C9] +- [0x02, 0x00CA, MAC_Gate_00CA] +- [0x02, 0x00CB, MAC_Gate_00CB] +- [0x02, 0x00CC, MAC_Gate_00CC] +- [0x02, 0x00CD, MAC_Gate_00CD] +- [0x02, 0x00CE, MAC_Gate_00CE] +- [0x02, 0x00CF, MAC_Gate_00CF] +- [0x02, 0x00D0, MAC_Gate_00D0] +- [0x02, 0x00D1, MAC_Gate_00D1] +- [0x02, 0x00D2, MAC_Gate_00D2] +- [0x02, 0x00D3, MAC_Gate_00D3] +- [0x02, 0x00D4, MAC_Gate_00D4] +- [0x02, 0x00D5, MAC_Gate_00D5] +- [0x02, 0x00D6, MAC_Gate_00D6] +- [0x02, 0x00D7, MAC_Gate_00D7] +- [0x02, 0x00D8, MAC_Gate_00D8] +- [0x02, 0x00D9, MAC_Gate_00D9] +- [0x02, 0x00DA, MAC_Gate_00DA] +- [0x02, 0x00DB, MAC_Gate_00DB] +- [0x02, 0x00DC, MAC_Gate_00DC] +- [0x02, 0x00DD, MAC_Gate_00DD] +- [0x02, 0x00DE, MAC_Gate_00DE] +- [0x02, 0x00DF, MAC_Gate_00DF] +- [0x02, 0x00E0, MAC_Gate_00E0] +- [0x02, 0x00E1, MAC_Gate_00E1] +- [0x02, 0x00E2, MAC_Gate_00E2] +- [0x02, 0x00E3, MAC_Gate_00E3] +- [0x02, 0x00E4, MAC_Gate_00E4] +- [0x02, 0x00E5, MAC_Gate_00E5] +- [0x02, 0x00E6, MAC_Gate_00E6] +- [0x02, 0x00E7, MAC_Gate_00E7] +- [0x02, 0x00E8, MAC_Gate_00E8] +- [0x02, 0x00E9, MAC_Gate_00E9] +- [0x02, 0x00EA, MAC_Gate_00EA] +- [0x02, 0x00EB, MAC_Gate_00EB] +- [0x02, 0x00EC, MAC_Gate_00EC] +- [0x02, 0x00ED, MAC_Gate_00ED] +- [0x02, 0x00EE, MAC_Gate_00EE] +- [0x02, 0x00EF, MAC_Gate_00EF] +- [0x02, 0x00F0, MAC_Gate_00F0] +- [0x02, 0x00F1, MAC_Gate_00F1] +- [0x02, 0x00F2, MAC_Gate_00F2] +- [0x02, 0x00F3, MAC_Gate_00F3] +- [0x02, 0x00F4, MAC_Gate_00F4] +- [0x02, 0x00F5, MAC_Gate_00F5] +- [0x02, 0x00F6, MAC_Gate_00F6] +- [0x02, 0x00F7, MAC_Gate_00F7] +- [0x02, 0x00F8, MAC_Gate_00F8] +- [0x02, 0x00F9, MAC_Gate_00F9] +- [0x02, 0x00FA, MAC_Gate_00FA] +- [0x02, 0x00FB, MAC_Gate_00FB] +- [0x02, 0x00FC, MAC_Gate_00FC] +- [0x02, 0x00FD, MAC_Gate_00FD] +- [0x02, 0x00FE, MAC_Gate_00FE] +- [0x02, 0x00FF, MAC_Gate_00FF] +- [0x02, 0x0100, MAC_Gate_0100] +- [0x02, 0x0101, MAC_Gate_0101] +- [0x02, 0x0102, MAC_Gate_0102] +- [0x02, 0x0103, MAC_Gate_0103] +- [0x02, 0x0104, MAC_Gate_0104] +- [0x02, 0x0105, MAC_Gate_0105] +- [0x02, 0x0106, MAC_Gate_0106] +- [0x02, 0x0107, MAC_Gate_0107] +- [0x02, 0x0108, MAC_Gate_0108] +- [0x02, 0x0109, MAC_Gate_0109] +- [0x02, 0x010A, MAC_Gate_010A] +- [0x02, 0x010B, MAC_Gate_010B] +- [0x02, 0x010C, MAC_Gate_010C] +- [0x02, 0x010D, MAC_Gate_010D] +- [0x02, 0x010E, MAC_Gate_010E] +- [0x02, 0x010F, MAC_Gate_010F] +- [0x02, 0x0110, MAC_Gate_0110] +- [0x02, 0x0111, MAC_Gate_0111] +- [0x02, 0x0112, MAC_Gate_0112] +- [0x02, 0x0113, MAC_Gate_0113] +- [0x02, 0x0114, MAC_Gate_0114] +- [0x02, 0x0115, MAC_Gate_0115] +- [0x02, 0x0116, MAC_Gate_0116] +- [0x02, 0x0117, MAC_Gate_0117] +- [0x02, 0x0118, MAC_Gate_0118] +- [0x02, 0x0119, MAC_Gate_0119] +- [0x02, 0x011A, MAC_Gate_011A] +- [0x02, 0x011B, MAC_Gate_011B] +- [0x02, 0x011C, MAC_Gate_011C] +- [0x02, 0x011D, MAC_Gate_011D] +- [0x02, 0x011E, MAC_Gate_011E] +- [0x02, 0x011F, MAC_Gate_011F] +- [0x03, 0x0000, MAC_Plaza_0000] +- [0x03, 0x0001, MAC_Plaza_0001] +- [0x03, 0x0002, MAC_Plaza_0002] +- [0x03, 0x0003, MAC_Plaza_0003] +- [0x03, 0x0004, MAC_Plaza_0004] +- [0x03, 0x0005, MAC_Plaza_0005] +- [0x03, 0x0006, MAC_Plaza_0006] +- [0x03, 0x0007, MAC_Plaza_0007] +- [0x03, 0x0008, MAC_Plaza_0008] +- [0x03, 0x0009, MAC_Plaza_0009] +- [0x03, 0x000A, MAC_Plaza_000A] +- [0x03, 0x000B, MAC_Plaza_000B] +- [0x03, 0x000C, MAC_Plaza_000C] +- [0x03, 0x000D, MAC_Plaza_000D] +- [0x03, 0x000E, MAC_Plaza_000E] +- [0x03, 0x000F, MAC_Plaza_000F] +- [0x03, 0x0010, MAC_Plaza_0010] +- [0x03, 0x0011, MAC_Plaza_0011] +- [0x03, 0x0012, MAC_Plaza_0012] +- [0x03, 0x0013, MAC_Plaza_0013] +- [0x03, 0x0014, MAC_Plaza_0014] +- [0x03, 0x0015, MAC_Plaza_0015] +- [0x03, 0x0016, MAC_Plaza_0016] +- [0x03, 0x0017, MAC_Plaza_0017] +- [0x03, 0x0018, MAC_Plaza_0018] +- [0x03, 0x0019, MAC_Plaza_0019] +- [0x03, 0x001A, MAC_Plaza_001A] +- [0x03, 0x001B, MAC_Plaza_001B] +- [0x03, 0x001C, MAC_Plaza_001C] +- [0x03, 0x001D, MAC_Plaza_001D] +- [0x03, 0x001E, MAC_Plaza_001E] +- [0x03, 0x001F, MAC_Plaza_001F] +- [0x03, 0x0020, MAC_Plaza_0020] +- [0x03, 0x0021, MAC_Plaza_0021] +- [0x03, 0x0022, MAC_Plaza_0022] +- [0x03, 0x0023, MAC_Plaza_0023] +- [0x03, 0x0024, MAC_Plaza_0024] +- [0x03, 0x0025, MAC_Plaza_0025] +- [0x03, 0x0026, MAC_Plaza_0026] +- [0x03, 0x0027, MAC_Plaza_0027] +- [0x03, 0x0028, MAC_Plaza_0028] +- [0x03, 0x0029, MAC_Plaza_0029] +- [0x03, 0x002A, MAC_Plaza_002A] +- [0x03, 0x002B, MAC_Plaza_002B] +- [0x03, 0x002C, MAC_Plaza_002C] +- [0x03, 0x002D, MAC_Plaza_002D] +- [0x03, 0x002E, MAC_Plaza_002E] +- [0x03, 0x002F, MAC_Plaza_002F] +- [0x03, 0x0030, MAC_Plaza_0030] +- [0x03, 0x0031, MAC_Plaza_0031] +- [0x03, 0x0032, MAC_Plaza_0032] +- [0x03, 0x0033, MAC_Plaza_0033] +- [0x03, 0x0034, MAC_Plaza_0034] +- [0x03, 0x0035, MAC_Plaza_0035] +- [0x03, 0x0036, MAC_Plaza_0036] +- [0x03, 0x0037, MAC_Plaza_0037] +- [0x03, 0x0038, MAC_Plaza_0038] +- [0x03, 0x0039, MAC_Plaza_0039] +- [0x03, 0x003A, MAC_Plaza_003A] +- [0x03, 0x003B, MAC_Plaza_003B] +- [0x03, 0x003C, MAC_Plaza_003C] +- [0x03, 0x003D, MAC_Plaza_003D] +- [0x03, 0x003E, MAC_Plaza_003E] +- [0x03, 0x003F, MAC_Plaza_003F] +- [0x03, 0x0040, MAC_Plaza_0040] +- [0x03, 0x0041, MAC_Plaza_0041] +- [0x03, 0x0042, MAC_Plaza_0042] +- [0x03, 0x0043, MAC_Plaza_0043] +- [0x03, 0x0044, MAC_Plaza_0044] +- [0x03, 0x0045, MAC_Plaza_0045] +- [0x03, 0x0046, MAC_Plaza_0046] +- [0x03, 0x0047, MAC_Plaza_0047] +- [0x03, 0x0048, MAC_Plaza_0048] +- [0x03, 0x0049, MAC_Plaza_0049] +- [0x03, 0x004A, MAC_Plaza_004A] +- [0x03, 0x004B, MAC_Plaza_004B] +- [0x03, 0x004C, MAC_Plaza_004C] +- [0x03, 0x004D, MAC_Plaza_004D] +- [0x03, 0x004E, MAC_Plaza_004E] +- [0x03, 0x004F, MAC_Plaza_004F] +- [0x03, 0x0050, MAC_Plaza_0050] +- [0x03, 0x0051, MAC_Plaza_0051] +- [0x03, 0x0052, MAC_Plaza_0052] +- [0x03, 0x0053, MAC_Plaza_0053] +- [0x03, 0x0054, MAC_Plaza_0054] +- [0x03, 0x0055, MAC_Plaza_0055] +- [0x03, 0x0056, MAC_Plaza_0056] +- [0x03, 0x0057, MAC_Plaza_0057] +- [0x03, 0x0058, MAC_Plaza_0058] +- [0x03, 0x0059, MAC_Plaza_0059] +- [0x03, 0x005A, MAC_Plaza_005A] +- [0x03, 0x005B, MAC_Plaza_005B] +- [0x03, 0x005C, MAC_Plaza_005C] +- [0x03, 0x005D, MAC_Plaza_005D] +- [0x03, 0x005E, MAC_Plaza_005E] +- [0x03, 0x005F, MAC_Plaza_005F] +- [0x03, 0x0060, MAC_Plaza_0060] +- [0x03, 0x0061, MAC_Plaza_0061] +- [0x03, 0x0062, MAC_Plaza_0062] +- [0x03, 0x0063, MAC_Plaza_0063] +- [0x03, 0x0064, MAC_Plaza_0064] +- [0x03, 0x0065, MAC_Plaza_0065] +- [0x03, 0x0066, MAC_Plaza_0066] +- [0x03, 0x0067, MAC_Plaza_0067] +- [0x03, 0x0068, MAC_Plaza_0068] +- [0x03, 0x0069, MAC_Plaza_0069] +- [0x03, 0x006A, MAC_Plaza_006A] +- [0x03, 0x006B, MAC_Plaza_006B] +- [0x03, 0x006C, MAC_Plaza_006C] +- [0x03, 0x006D, MAC_Plaza_006D] +- [0x03, 0x006E, MAC_Plaza_006E] +- [0x03, 0x006F, MAC_Plaza_006F] +- [0x03, 0x0070, MAC_Plaza_0070] +- [0x03, 0x0071, MAC_Plaza_0071] +- [0x03, 0x0072, MAC_Plaza_0072] +- [0x03, 0x0073, MAC_Plaza_0073] +- [0x03, 0x0074, MAC_Plaza_0074] +- [0x03, 0x0075, MAC_Plaza_0075] +- [0x03, 0x0076, MAC_Plaza_0076] +- [0x03, 0x0077, MAC_Plaza_0077] +- [0x03, 0x0078, MAC_Plaza_0078] +- [0x03, 0x0079, MAC_Plaza_0079] +- [0x03, 0x007A, MAC_Plaza_007A] +- [0x03, 0x007B, MAC_Plaza_007B] +- [0x03, 0x007C, MAC_Plaza_007C] +- [0x03, 0x007D, MAC_Plaza_007D] +- [0x03, 0x007E, MAC_Plaza_007E] +- [0x03, 0x007F, MAC_Plaza_007F] +- [0x03, 0x0080, MAC_Plaza_0080] +- [0x03, 0x0081, MAC_Plaza_0081] +- [0x03, 0x0082, MAC_Plaza_0082] +- [0x03, 0x0083, MAC_Plaza_0083] +- [0x03, 0x0084, MAC_Plaza_0084] +- [0x03, 0x0085, MAC_Plaza_0085] +- [0x03, 0x0086, MAC_Plaza_0086] +- [0x03, 0x0087, MAC_Plaza_0087] +- [0x03, 0x0088, MAC_Plaza_0088] +- [0x03, 0x0089, MAC_Plaza_0089] +- [0x03, 0x008A, MAC_Plaza_008A] +- [0x03, 0x008B, MAC_Plaza_008B] +- [0x03, 0x008C, MAC_Plaza_008C] +- [0x03, 0x008D, MAC_Plaza_008D] +- [0x03, 0x008E, MAC_Plaza_008E] +- [0x03, 0x008F, MAC_Plaza_008F] +- [0x03, 0x0090, MAC_Plaza_0090] +- [0x03, 0x0091, MAC_Plaza_0091] +- [0x03, 0x0092, MAC_Plaza_0092] +- [0x03, 0x0093, MAC_Plaza_0093] +- [0x03, 0x0094, MAC_Plaza_0094] +- [0x03, 0x0095, MAC_Plaza_0095] +- [0x03, 0x0096, MAC_Plaza_0096] +- [0x03, 0x0097, MAC_Plaza_0097] +- [0x03, 0x0098, MAC_Plaza_0098] +- [0x03, 0x0099, MAC_Plaza_0099] +- [0x03, 0x009A, MAC_Plaza_009A] +- [0x03, 0x009B, MAC_Plaza_009B] +- [0x03, 0x009C, MAC_Plaza_009C] +- [0x03, 0x009D, MAC_Plaza_009D] +- [0x03, 0x009E, MAC_Plaza_009E] +- [0x03, 0x009F, MAC_Plaza_009F] +- [0x03, 0x00A0, MAC_Plaza_00A0] +- [0x03, 0x00A1, MAC_Plaza_00A1] +- [0x03, 0x00A2, MAC_Plaza_00A2] +- [0x03, 0x00A3, MAC_Plaza_00A3] +- [0x03, 0x00A4, MAC_Plaza_00A4] +- [0x03, 0x00A5, MAC_Plaza_00A5] +- [0x03, 0x00A6, MAC_Plaza_00A6] +- [0x03, 0x00A7, MAC_Plaza_00A7] +- [0x03, 0x00A8, MAC_Plaza_00A8] +- [0x03, 0x00A9, MAC_Plaza_00A9] +- [0x03, 0x00AA, MAC_Plaza_00AA] +- [0x03, 0x00AB, MAC_Plaza_00AB] +- [0x03, 0x00AC, MAC_Plaza_00AC] +- [0x03, 0x00AD, MAC_Plaza_00AD] +- [0x03, 0x00AE, MAC_Plaza_00AE] +- [0x03, 0x00AF, MAC_Plaza_00AF] +- [0x03, 0x00B0, MAC_Plaza_00B0] +- [0x03, 0x00B1, MAC_Plaza_00B1] +- [0x03, 0x00B2, MAC_Plaza_00B2] +- [0x03, 0x00B3, MAC_Plaza_00B3] +- [0x03, 0x00B4, MAC_Plaza_00B4] +- [0x03, 0x00B5, MAC_Plaza_00B5] +- [0x03, 0x00B6, MAC_Plaza_00B6] +- [0x03, 0x00B7, MAC_Plaza_00B7] +- [0x03, 0x00B8, MAC_Plaza_00B8] +- [0x03, 0x00B9, MAC_Plaza_00B9] +- [0x03, 0x00BA, MAC_Plaza_00BA] +- [0x03, 0x00BB, MAC_Plaza_00BB] +- [0x03, 0x00BC, MAC_Plaza_00BC] +- [0x03, 0x00BD, MAC_Plaza_00BD] +- [0x03, 0x00BE, MAC_Plaza_00BE] +- [0x03, 0x00BF, MAC_Plaza_00BF] +- [0x03, 0x00C0, MAC_Plaza_00C0] +- [0x03, 0x00C1, MAC_Plaza_00C1] +- [0x03, 0x00C2, MAC_Plaza_00C2] +- [0x03, 0x00C3, MAC_Plaza_00C3] +- [0x03, 0x00C4, MAC_Plaza_00C4] +- [0x03, 0x00C5, MAC_Plaza_00C5] +- [0x03, 0x00C6, MAC_Plaza_00C6] +- [0x03, 0x00C7, MAC_Plaza_00C7] +- [0x03, 0x00C8, MAC_Plaza_00C8] +- [0x03, 0x00C9, MAC_Plaza_00C9] +- [0x03, 0x00CA, MAC_Plaza_00CA] +- [0x03, 0x00CB, MAC_Plaza_00CB] +- [0x03, 0x00CC, MAC_Plaza_00CC] +- [0x03, 0x00CD, MAC_Plaza_00CD] +- [0x03, 0x00CE, MAC_Plaza_00CE] +- [0x03, 0x00CF, MAC_Plaza_00CF] +- [0x03, 0x00D0, MAC_Plaza_00D0] +- [0x03, 0x00D1, MAC_Plaza_00D1] +- [0x03, 0x00D2, MAC_Plaza_00D2] +- [0x03, 0x00D3, MAC_Plaza_00D3] +- [0x03, 0x00D4, MAC_Plaza_00D4] +- [0x03, 0x00D5, MAC_Plaza_00D5] +- [0x03, 0x00D6, MAC_Plaza_00D6] +- [0x03, 0x00D7, MAC_Plaza_00D7] +- [0x03, 0x00D8, MAC_Plaza_00D8] +- [0x03, 0x00D9, MAC_Plaza_00D9] +- [0x03, 0x00DA, MAC_Plaza_00DA] +- [0x03, 0x00DB, MAC_Plaza_00DB] +- [0x03, 0x00DC, MAC_Plaza_00DC] +- [0x03, 0x00DD, MAC_Plaza_00DD] +- [0x03, 0x00DE, MAC_Plaza_00DE] +- [0x03, 0x00DF, MAC_Plaza_00DF] +- [0x03, 0x00E0, MAC_Plaza_00E0] +- [0x03, 0x00E1, MAC_Plaza_00E1] +- [0x03, 0x00E2, MAC_Plaza_00E2] +- [0x03, 0x00E3, MAC_Plaza_00E3] +- [0x03, 0x00E4, MAC_Plaza_00E4] +- [0x03, 0x00E5, MAC_Plaza_00E5] +- [0x03, 0x00E6, MAC_Plaza_00E6] +- [0x03, 0x00E7, MAC_Plaza_00E7] +- [0x03, 0x00E8, MAC_Plaza_00E8] +- [0x03, 0x00E9, MAC_Plaza_00E9] +- [0x04, 0x0000, MAC_Bridge_0000] +- [0x04, 0x0001, MAC_Bridge_0001] +- [0x04, 0x0002, MAC_Bridge_0002] +- [0x04, 0x0003, MAC_Bridge_0003] +- [0x04, 0x0004, MAC_Bridge_0004] +- [0x04, 0x0005, MAC_Bridge_0005] +- [0x04, 0x0006, MAC_Bridge_0006] +- [0x04, 0x0007, MAC_Bridge_0007] +- [0x04, 0x0008, MAC_Bridge_0008] +- [0x04, 0x0009, MAC_Bridge_0009] +- [0x04, 0x000A, MAC_Bridge_000A] +- [0x04, 0x000B, MAC_Bridge_000B] +- [0x04, 0x000C, MAC_Bridge_000C] +- [0x04, 0x000D, MAC_Bridge_000D] +- [0x04, 0x000E, MAC_Bridge_000E] +- [0x04, 0x000F, MAC_Bridge_000F] +- [0x04, 0x0010, MAC_Bridge_0010] +- [0x04, 0x0011, MAC_Bridge_0011] +- [0x04, 0x0012, MAC_Bridge_0012] +- [0x04, 0x0013, MAC_Bridge_0013] +- [0x04, 0x0014, MAC_Bridge_0014] +- [0x04, 0x0015, MAC_Bridge_0015] +- [0x04, 0x0016, MAC_Bridge_0016] +- [0x04, 0x0017, MAC_Bridge_0017] +- [0x04, 0x0018, MAC_Bridge_0018] +- [0x04, 0x0019, MAC_Bridge_0019] +- [0x04, 0x001A, MAC_Bridge_001A] +- [0x04, 0x001B, MAC_Bridge_001B] +- [0x04, 0x001C, MAC_Bridge_001C] +- [0x04, 0x001D, MAC_Bridge_001D] +- [0x04, 0x001E, MAC_Bridge_001E] +- [0x04, 0x001F, MAC_Bridge_001F] +- [0x04, 0x0020, MAC_Bridge_0020] +- [0x04, 0x0021, MAC_Bridge_0021] +- [0x04, 0x0022, MAC_Bridge_0022] +- [0x04, 0x0023, MAC_Bridge_0023] +- [0x04, 0x0024, MAC_Bridge_0024] +- [0x04, 0x0025, MAC_Bridge_0025] +- [0x04, 0x0026, MAC_Bridge_0026] +- [0x04, 0x0027, MAC_Bridge_0027] +- [0x04, 0x0028, MAC_Bridge_0028] +- [0x04, 0x0029, MAC_Bridge_0029] +- [0x04, 0x002A, MAC_Bridge_002A] +- [0x04, 0x002B, MAC_Bridge_002B] +- [0x04, 0x002C, MAC_Bridge_002C] +- [0x04, 0x002D, MAC_Bridge_002D] +- [0x04, 0x002E, MAC_Bridge_002E] +- [0x04, 0x002F, MAC_Bridge_002F] +- [0x04, 0x0030, MAC_Bridge_0030] +- [0x04, 0x0031, MAC_Bridge_0031] +- [0x04, 0x0032, MAC_Bridge_0032] +- [0x04, 0x0033, MAC_Bridge_0033] +- [0x04, 0x0034, MAC_Bridge_0034] +- [0x04, 0x0035, MAC_Bridge_0035] +- [0x04, 0x0036, MAC_Bridge_0036] +- [0x04, 0x0037, MAC_Bridge_0037] +- [0x04, 0x0038, MAC_Bridge_0038] +- [0x04, 0x0039, MAC_Bridge_0039] +- [0x04, 0x003A, MAC_Bridge_003A] +- [0x04, 0x003B, MAC_Bridge_003B] +- [0x04, 0x003C, MAC_Bridge_003C] +- [0x04, 0x003D, MAC_Bridge_003D] +- [0x04, 0x003E, MAC_Bridge_003E] +- [0x04, 0x003F, MAC_Bridge_003F] +- [0x04, 0x0040, MAC_Bridge_0040] +- [0x04, 0x0041, MAC_Bridge_0041] +- [0x04, 0x0042, MAC_Bridge_0042] +- [0x04, 0x0043, MAC_Bridge_0043] +- [0x04, 0x0044, MAC_Bridge_0044] +- [0x04, 0x0045, MAC_Bridge_0045] +- [0x04, 0x0046, MAC_Bridge_0046] +- [0x04, 0x0047, MAC_Bridge_0047] +- [0x04, 0x0048, MAC_Bridge_0048] +- [0x04, 0x0049, MAC_Bridge_0049] +- [0x04, 0x004A, MAC_Bridge_004A] +- [0x04, 0x004B, MAC_Bridge_004B] +- [0x04, 0x004C, MAC_Bridge_004C] +- [0x04, 0x004D, MAC_Bridge_004D] +- [0x04, 0x004E, MAC_Bridge_004E] +- [0x04, 0x004F, MAC_Bridge_004F] +- [0x04, 0x0050, MAC_Bridge_0050] +- [0x04, 0x0051, MAC_Bridge_0051] +- [0x04, 0x0052, MAC_Bridge_0052] +- [0x04, 0x0053, MAC_Bridge_0053] +- [0x04, 0x0054, MAC_Bridge_0054] +- [0x04, 0x0055, MAC_Bridge_0055] +- [0x04, 0x0056, MAC_Bridge_0056] +- [0x04, 0x0057, MAC_Bridge_0057] +- [0x04, 0x0058, MAC_Bridge_0058] +- [0x04, 0x0059, MAC_Bridge_0059] +- [0x04, 0x005A, MAC_Bridge_005A] +- [0x04, 0x005B, MAC_Bridge_005B] +- [0x04, 0x005C, MAC_Bridge_005C] +- [0x04, 0x005D, MAC_Bridge_005D] +- [0x04, 0x005E, MAC_Bridge_005E] +- [0x04, 0x005F, MAC_Bridge_005F] +- [0x04, 0x0060, MAC_Bridge_0060] +- [0x04, 0x0061, MAC_Bridge_0061] +- [0x04, 0x0062, MAC_Bridge_0062] +- [0x04, 0x0063, MAC_Bridge_0063] +- [0x04, 0x0064, MAC_Bridge_0064] +- [0x04, 0x0065, MAC_Bridge_0065] +- [0x04, 0x0066, MAC_Bridge_0066] +- [0x04, 0x0067, MAC_Bridge_0067] +- [0x04, 0x0068, MAC_Bridge_0068] +- [0x04, 0x0069, MAC_Bridge_0069] +- [0x04, 0x006A, MAC_Bridge_006A] +- [0x04, 0x006B, MAC_Bridge_006B] +- [0x04, 0x006C, MAC_Bridge_006C] +- [0x04, 0x006D, MAC_Bridge_006D] +- [0x04, 0x006E, MAC_Bridge_006E] +- [0x04, 0x006F, MAC_Bridge_006F] +- [0x04, 0x0070, MAC_Bridge_0070] +- [0x04, 0x0071, MAC_Bridge_0071] +- [0x04, 0x0072, MAC_Bridge_0072] +- [0x04, 0x0073, MAC_Bridge_0073] +- [0x04, 0x0074, MAC_Bridge_0074] +- [0x04, 0x0075, MAC_Bridge_0075] +- [0x04, 0x0076, MAC_Bridge_0076] +- [0x04, 0x0077, MAC_Bridge_0077] +- [0x04, 0x0078, MAC_Bridge_0078] +- [0x04, 0x0079, MAC_Bridge_0079] +- [0x04, 0x007A, MAC_Bridge_007A] +- [0x04, 0x007B, MAC_Bridge_007B] +- [0x04, 0x007C, MAC_Bridge_007C] +- [0x04, 0x007D, MAC_Bridge_007D] +- [0x04, 0x007E, MAC_Bridge_007E] +- [0x04, 0x007F, MAC_Bridge_007F] +- [0x04, 0x0080, MAC_Bridge_0080] +- [0x04, 0x0081, MAC_Bridge_0081] +- [0x04, 0x0082, MAC_Bridge_0082] +- [0x04, 0x0083, MAC_Bridge_0083] +- [0x04, 0x0084, MAC_Bridge_0084] +- [0x04, 0x0085, MAC_Bridge_0085] +- [0x04, 0x0086, MAC_Bridge_0086] +- [0x04, 0x0087, MAC_Bridge_0087] +- [0x04, 0x0088, MAC_Bridge_0088] +- [0x04, 0x0089, MAC_Bridge_0089] +- [0x04, 0x008A, MAC_Bridge_008A] +- [0x04, 0x008B, MAC_Bridge_008B] +- [0x04, 0x008C, MAC_Bridge_008C] +- [0x04, 0x008D, MAC_Bridge_008D] +- [0x04, 0x008E, MAC_Bridge_008E] +- [0x04, 0x008F, MAC_Bridge_008F] +- [0x04, 0x0090, MAC_Bridge_0090] +- [0x04, 0x0091, MAC_Bridge_0091] +- [0x04, 0x0092, MAC_Bridge_0092] +- [0x04, 0x0093, MAC_Bridge_0093] +- [0x05, 0x0000, MAC_Station_0000] +- [0x05, 0x0001, MAC_Station_0001] +- [0x05, 0x0002, MAC_Station_0002] +- [0x05, 0x0003, MAC_Station_0003] +- [0x05, 0x0004, MAC_Station_0004] +- [0x05, 0x0005, MAC_Station_0005] +- [0x05, 0x0006, MAC_Station_0006] +- [0x05, 0x0007, MAC_Station_0007] +- [0x05, 0x0008, MAC_Station_0008] +- [0x05, 0x0009, MAC_Station_0009] +- [0x05, 0x000A, MAC_Station_000A] +- [0x05, 0x000B, MAC_Station_000B] +- [0x05, 0x000C, MAC_Station_000C] +- [0x05, 0x000D, MAC_Station_000D] +- [0x05, 0x000E, MAC_Station_000E] +- [0x05, 0x000F, MAC_Station_000F] +- [0x05, 0x0010, MAC_Station_0010] +- [0x05, 0x0011, MAC_Station_0011] +- [0x05, 0x0012, MAC_Station_0012] +- [0x05, 0x0013, MAC_Station_0013] +- [0x05, 0x0014, MAC_Station_0014] +- [0x05, 0x0015, MAC_Station_0015] +- [0x05, 0x0016, MAC_Station_0016] +- [0x05, 0x0017, MAC_Station_0017] +- [0x05, 0x0018, MAC_Station_0018] +- [0x05, 0x0019, MAC_Station_0019] +- [0x05, 0x001A, MAC_Station_001A] +- [0x05, 0x001B, MAC_Station_001B] +- [0x05, 0x001C, MAC_Station_001C] +- [0x05, 0x001D, MAC_Station_001D] +- [0x05, 0x001E, MAC_Station_001E] +- [0x05, 0x001F, MAC_Station_001F] +- [0x05, 0x0020, MAC_Station_0020] +- [0x05, 0x0021, MAC_Station_0021] +- [0x05, 0x0022, MAC_Station_0022] +- [0x05, 0x0023, MAC_Station_0023] +- [0x05, 0x0024, MAC_Station_0024] +- [0x05, 0x0025, MAC_Station_0025] +- [0x05, 0x0026, MAC_Station_0026] +- [0x05, 0x0027, MAC_Station_0027] +- [0x05, 0x0028, MAC_Station_0028] +- [0x05, 0x0029, MAC_Station_0029] +- [0x05, 0x002A, MAC_Station_002A] +- [0x05, 0x002B, MAC_Station_002B] +- [0x05, 0x002C, MAC_Station_002C] +- [0x05, 0x002D, MAC_Station_002D] +- [0x05, 0x002E, MAC_Station_002E] +- [0x05, 0x002F, MAC_Station_002F] +- [0x05, 0x0030, MAC_Station_0030] +- [0x05, 0x0031, MAC_Station_0031] +- [0x05, 0x0032, MAC_Station_0032] +- [0x05, 0x0033, MAC_Station_0033] +- [0x05, 0x0034, MAC_Station_0034] +- [0x05, 0x0035, MAC_Station_0035] +- [0x05, 0x0036, MAC_Station_0036] +- [0x05, 0x0037, MAC_Station_0037] +- [0x05, 0x0038, MAC_Station_0038] +- [0x05, 0x0039, MAC_Station_0039] +- [0x05, 0x003A, MAC_Station_003A] +- [0x05, 0x003B, MAC_Station_003B] +- [0x05, 0x003C, MAC_Station_003C] +- [0x05, 0x003D, MAC_Station_003D] +- [0x05, 0x003E, MAC_Station_003E] +- [0x05, 0x003F, MAC_Station_003F] +- [0x05, 0x0040, MAC_Station_0040] +- [0x05, 0x0041, MAC_Station_0041] +- [0x05, 0x0042, MAC_Station_0042] +- [0x05, 0x0043, MAC_Station_0043] +- [0x05, 0x0044, MAC_Station_0044] +- [0x05, 0x0045, MAC_Station_0045] +- [0x05, 0x0046, MAC_Station_0046] +- [0x05, 0x0047, MAC_Station_0047] +- [0x05, 0x0048, MAC_Station_0048] +- [0x05, 0x0049, MAC_Station_0049] +- [0x05, 0x004A, MAC_Station_004A] +- [0x05, 0x004B, MAC_Station_004B] +- [0x05, 0x004C, MAC_Station_004C] +- [0x05, 0x004D, MAC_Station_004D] +- [0x05, 0x004E, MAC_Station_004E] +- [0x05, 0x004F, MAC_Station_004F] +- [0x05, 0x0050, MAC_Station_0050] +- [0x05, 0x0051, MAC_Station_0051] +- [0x05, 0x0052, MAC_Station_0052] +- [0x05, 0x0053, MAC_Station_0053] +- [0x05, 0x0054, MAC_Station_0054] +- [0x05, 0x0055, MAC_Station_0055] +- [0x05, 0x0056, MAC_Station_0056] +- [0x05, 0x0057, MAC_Station_0057] +- [0x05, 0x0058, MAC_Station_0058] +- [0x05, 0x0059, MAC_Station_0059] +- [0x05, 0x005A, MAC_Station_005A] +- [0x05, 0x005B, MAC_Station_005B] +- [0x05, 0x005C, MAC_Station_005C] +- [0x05, 0x005D, MAC_Station_005D] +- [0x05, 0x005E, MAC_Station_005E] +- [0x05, 0x005F, MAC_Station_005F] +- [0x05, 0x0060, MAC_Station_0060] +- [0x05, 0x0061, MAC_Station_0061] +- [0x05, 0x0062, MAC_Station_0062] +- [0x05, 0x0063, MAC_Station_0063] +- [0x05, 0x0064, MAC_Station_0064] +- [0x05, 0x0065, MAC_Station_0065] +- [0x05, 0x0066, MAC_Station_0066] +- [0x06, 0x0000, MAC_Housing_0000] +- [0x06, 0x0001, MAC_Housing_0001] +- [0x06, 0x0002, MAC_Housing_0002] +- [0x06, 0x0003, MAC_Housing_0003] +- [0x06, 0x0004, MAC_Housing_0004] +- [0x06, 0x0005, MAC_Housing_0005] +- [0x06, 0x0006, MAC_Housing_0006] +- [0x06, 0x0007, MAC_Housing_0007] +- [0x06, 0x0008, MAC_Housing_0008] +- [0x06, 0x0009, MAC_Housing_0009] +- [0x06, 0x000A, MAC_Housing_000A] +- [0x06, 0x000B, MAC_Housing_000B] +- [0x06, 0x000C, MAC_Housing_000C] +- [0x06, 0x000D, MAC_Housing_000D] +- [0x06, 0x000E, MAC_Housing_000E] +- [0x06, 0x000F, MAC_Housing_000F] +- [0x06, 0x0010, MAC_Housing_0010] +- [0x06, 0x0011, MAC_Housing_0011] +- [0x06, 0x0012, MAC_Housing_0012] +- [0x06, 0x0013, MAC_Housing_0013] +- [0x06, 0x0014, MAC_Housing_0014] +- [0x06, 0x0015, MAC_Housing_0015] +- [0x06, 0x0016, MAC_Housing_0016] +- [0x06, 0x0017, MAC_Housing_0017] +- [0x06, 0x0018, MAC_Housing_0018] +- [0x06, 0x0019, MAC_Housing_0019] +- [0x06, 0x001A, MAC_Housing_001A] +- [0x06, 0x001B, MAC_Housing_001B] +- [0x06, 0x001C, MAC_Housing_001C] +- [0x06, 0x001D, MAC_Housing_001D] +- [0x06, 0x001E, MAC_Housing_001E] +- [0x06, 0x001F, MAC_Housing_001F] +- [0x06, 0x0020, MAC_Housing_0020] +- [0x06, 0x0021, MAC_Housing_0021] +- [0x06, 0x0022, MAC_Housing_0022] +- [0x06, 0x0023, MAC_Housing_0023] +- [0x06, 0x0024, MAC_Housing_0024] +- [0x06, 0x0025, MAC_Housing_0025] +- [0x06, 0x0026, MAC_Housing_0026] +- [0x06, 0x0027, MAC_Housing_0027] +- [0x06, 0x0028, MAC_Housing_0028] +- [0x06, 0x0029, MAC_Housing_0029] +- [0x06, 0x002A, MAC_Housing_002A] +- [0x06, 0x002B, MAC_Housing_002B] +- [0x06, 0x002C, MAC_Housing_002C] +- [0x06, 0x002D, MAC_Housing_002D] +- [0x06, 0x002E, MAC_Housing_002E] +- [0x06, 0x002F, MAC_Housing_002F] +- [0x06, 0x0030, MAC_Housing_0030] +- [0x06, 0x0031, MAC_Housing_0031] +- [0x06, 0x0032, MAC_Housing_0032] +- [0x06, 0x0033, MAC_Housing_0033] +- [0x06, 0x0034, MAC_Housing_0034] +- [0x06, 0x0035, MAC_Housing_0035] +- [0x06, 0x0036, MAC_Housing_0036] +- [0x06, 0x0037, MAC_Housing_0037] +- [0x06, 0x0038, MAC_Housing_0038] +- [0x06, 0x0039, MAC_Housing_0039] +- [0x06, 0x003A, MAC_Housing_003A] +- [0x06, 0x003B, MAC_Housing_003B] +- [0x06, 0x003C, MAC_Housing_003C] +- [0x06, 0x003D, MAC_Housing_003D] +- [0x06, 0x003E, MAC_Housing_003E] +- [0x06, 0x003F, MAC_Housing_003F] +- [0x06, 0x0040, MAC_Housing_0040] +- [0x06, 0x0041, MAC_Housing_0041] +- [0x06, 0x0042, MAC_Housing_0042] +- [0x06, 0x0043, MAC_Housing_0043] +- [0x06, 0x0044, MAC_Housing_0044] +- [0x06, 0x0045, MAC_Housing_0045] +- [0x06, 0x0046, MAC_Housing_0046] +- [0x06, 0x0047, MAC_Housing_0047] +- [0x06, 0x0048, MAC_Housing_0048] +- [0x06, 0x0049, MAC_Housing_0049] +- [0x06, 0x004A, MAC_Housing_004A] +- [0x06, 0x004B, MAC_Housing_004B] +- [0x06, 0x004C, MAC_Housing_004C] +- [0x06, 0x004D, MAC_Housing_004D] +- [0x06, 0x004E, MAC_Housing_004E] +- [0x06, 0x004F, MAC_Housing_004F] +- [0x06, 0x0050, MAC_Housing_0050] +- [0x06, 0x0051, MAC_Housing_0051] +- [0x06, 0x0052, MAC_Housing_0052] +- [0x06, 0x0053, MAC_Housing_0053] +- [0x06, 0x0054, MAC_Housing_0054] +- [0x06, 0x0055, MAC_Housing_0055] +- [0x06, 0x0056, MAC_Housing_0056] +- [0x06, 0x0057, MAC_Housing_0057] +- [0x06, 0x0058, MAC_Housing_0058] +- [0x06, 0x0059, MAC_Housing_0059] +- [0x06, 0x005A, MAC_Housing_005A] +- [0x06, 0x005B, MAC_Housing_005B] +- [0x06, 0x005C, MAC_Housing_005C] +- [0x06, 0x005D, MAC_Housing_005D] +- [0x06, 0x005E, MAC_Housing_005E] +- [0x06, 0x005F, MAC_Housing_005F] +- [0x06, 0x0060, MAC_Housing_0060] +- [0x06, 0x0061, MAC_Housing_0061] +- [0x06, 0x0062, MAC_Housing_0062] +- [0x06, 0x0063, MAC_Housing_0063] +- [0x06, 0x0064, MAC_Housing_0064] +- [0x06, 0x0065, MAC_Housing_0065] +- [0x06, 0x0066, MAC_Housing_0066] +- [0x06, 0x0067, MAC_Housing_0067] +- [0x06, 0x0068, MAC_Housing_0068] +- [0x06, 0x0069, MAC_Housing_0069] +- [0x06, 0x006A, MAC_Housing_006A] +- [0x06, 0x006B, MAC_Housing_006B] +- [0x06, 0x006C, MAC_Housing_006C] +- [0x06, 0x006D, MAC_Housing_006D] +- [0x06, 0x006E, MAC_Housing_006E] +- [0x06, 0x006F, MAC_Housing_006F] +- [0x06, 0x0070, MAC_Housing_0070] +- [0x06, 0x0071, MAC_Housing_0071] +- [0x06, 0x0072, MAC_Housing_0072] +- [0x06, 0x0073, MAC_Housing_0073] +- [0x06, 0x0074, MAC_Housing_0074] +- [0x06, 0x0075, MAC_Housing_0075] +- [0x06, 0x0076, MAC_Housing_0076] +- [0x06, 0x0077, MAC_Housing_0077] +- [0x06, 0x0078, MAC_Housing_0078] +- [0x06, 0x0079, MAC_Housing_0079] +- [0x06, 0x007A, MAC_Housing_007A] +- [0x06, 0x007B, MAC_Housing_007B] +- [0x06, 0x007C, MAC_Housing_007C] +- [0x06, 0x007D, MAC_Housing_007D] +- [0x06, 0x007E, MAC_Housing_007E] +- [0x06, 0x007F, MAC_Housing_007F] +- [0x06, 0x0080, MAC_Housing_0080] +- [0x06, 0x0081, MAC_Housing_0081] +- [0x06, 0x0082, MAC_Housing_0082] +- [0x06, 0x0083, MAC_Housing_0083] +- [0x06, 0x0084, MAC_Housing_0084] +- [0x06, 0x0085, MAC_Housing_0085] +- [0x06, 0x0086, MAC_Housing_0086] +- [0x06, 0x0087, MAC_Housing_0087] +- [0x06, 0x0088, MAC_Housing_0088] +- [0x06, 0x0089, MAC_Housing_0089] +- [0x06, 0x008A, MAC_Housing_008A] +- [0x06, 0x008B, MAC_Housing_008B] +- [0x06, 0x008C, MAC_Housing_008C] +- [0x06, 0x008D, MAC_Housing_008D] +- [0x06, 0x008E, MAC_Housing_008E] +- [0x06, 0x008F, MAC_Housing_008F] +- [0x06, 0x0090, MAC_Housing_0090] +- [0x06, 0x0091, MAC_Housing_0091] +- [0x06, 0x0092, MAC_Housing_0092] +- [0x06, 0x0093, MAC_Housing_0093] +- [0x06, 0x0094, MAC_Housing_0094] +- [0x06, 0x0095, MAC_Housing_0095] +- [0x06, 0x0096, MAC_Housing_0096] +- [0x06, 0x0097, MAC_Housing_0097] +- [0x06, 0x0098, MAC_Housing_0098] +- [0x06, 0x0099, MAC_Housing_0099] +- [0x06, 0x009A, MAC_Housing_009A] +- [0x06, 0x009B, MAC_Housing_009B] +- [0x06, 0x009C, MAC_Housing_009C] +- [0x06, 0x009D, MAC_Housing_009D] +- [0x06, 0x009E, MAC_Housing_009E] +- [0x06, 0x009F, MAC_Housing_009F] +- [0x06, 0x00A0, MAC_Housing_00A0] +- [0x06, 0x00A1, MAC_Housing_00A1] +- [0x06, 0x00A2, MAC_Housing_00A2] +- [0x06, 0x00A3, MAC_Housing_00A3] +- [0x06, 0x00A4, MAC_Housing_00A4] +- [0x06, 0x00A5, MAC_Housing_00A5] +- [0x06, 0x00A6, MAC_Housing_00A6] +- [0x06, 0x00A7, MAC_Housing_00A7] +- [0x06, 0x00A8, MAC_Housing_00A8] +- [0x06, 0x00A9, MAC_Housing_00A9] +- [0x06, 0x00AA, MAC_Housing_00AA] +- [0x06, 0x00AB, MAC_Housing_00AB] +- [0x06, 0x00AC, MAC_Housing_00AC] +- [0x06, 0x00AD, MAC_Housing_00AD] +- [0x06, 0x00AE, MAC_Housing_00AE] +- [0x06, 0x00AF, MAC_Housing_00AF] +- [0x06, 0x00B0, MAC_Housing_00B0] +- [0x06, 0x00B1, MAC_Housing_00B1] +- [0x06, 0x00B2, MAC_Housing_00B2] +- [0x06, 0x00B3, MAC_Housing_00B3] +- [0x06, 0x00B4, MAC_Housing_00B4] +- [0x06, 0x00B5, MAC_Housing_00B5] +- [0x06, 0x00B6, MAC_Housing_00B6] +- [0x06, 0x00B7, MAC_Housing_00B7] +- [0x06, 0x00B8, MAC_Housing_00B8] +- [0x06, 0x00B9, MAC_Housing_00B9] +- [0x06, 0x00BA, MAC_Housing_00BA] +- [0x06, 0x00BB, MAC_Housing_00BB] +- [0x06, 0x00BC, MAC_Housing_00BC] +- [0x06, 0x00BD, MAC_Housing_00BD] +- [0x06, 0x00BE, MAC_Housing_00BE] +- [0x06, 0x00BF, MAC_Housing_00BF] +- [0x06, 0x00C0, MAC_Housing_00C0] +- [0x06, 0x00C1, MAC_Housing_00C1] +- [0x06, 0x00C2, MAC_Housing_00C2] +- [0x06, 0x00C3, MAC_Housing_00C3] +- [0x06, 0x00C4, MAC_Housing_00C4] +- [0x06, 0x00C5, MAC_Housing_00C5] +- [0x06, 0x00C6, MAC_Housing_00C6] +- [0x06, 0x00C7, MAC_Housing_00C7] +- [0x06, 0x00C8, MAC_Housing_00C8] +- [0x06, 0x00C9, MAC_Housing_00C9] +- [0x06, 0x00CA, MAC_Housing_00CA] +- [0x06, 0x00CB, MAC_Housing_00CB] +- [0x06, 0x00CC, MAC_Housing_00CC] +- [0x06, 0x00CD, MAC_Housing_00CD] +- [0x06, 0x00CE, MAC_Housing_00CE] +- [0x06, 0x00CF, MAC_Housing_00CF] +- [0x06, 0x00D0, MAC_Housing_00D0] +- [0x06, 0x00D1, MAC_Housing_00D1] +- [0x06, 0x00D2, MAC_Housing_00D2] +- [0x06, 0x00D3, MAC_Housing_00D3] +- [0x07, 0x0000, MAC_Port_0000] +- [0x07, 0x0001, MAC_Port_0001] +- [0x07, 0x0002, MAC_Port_0002] +- [0x07, 0x0003, MAC_Port_0003] +- [0x07, 0x0004, MAC_Port_0004] +- [0x07, 0x0005, MAC_Port_0005] +- [0x07, 0x0006, MAC_Port_0006] +- [0x07, 0x0007, MAC_Port_0007] +- [0x07, 0x0008, MAC_Port_0008] +- [0x07, 0x0009, MAC_Port_0009] +- [0x07, 0x000A, MAC_Port_000A] +- [0x07, 0x000B, MAC_Port_000B] +- [0x07, 0x000C, MAC_Port_000C] +- [0x07, 0x000D, MAC_Port_000D] +- [0x07, 0x000E, MAC_Port_000E] +- [0x07, 0x000F, MAC_Port_000F] +- [0x07, 0x0010, MAC_Port_0010] +- [0x07, 0x0011, MAC_Port_0011] +- [0x07, 0x0012, MAC_Port_0012] +- [0x07, 0x0013, MAC_Port_0013] +- [0x07, 0x0014, MAC_Port_0014] +- [0x07, 0x0015, MAC_Port_0015] +- [0x07, 0x0016, MAC_Port_0016] +- [0x07, 0x0017, MAC_Port_0017] +- [0x07, 0x0018, MAC_Port_0018] +- [0x07, 0x0019, MAC_Port_0019] +- [0x07, 0x001A, MAC_Port_001A] +- [0x07, 0x001B, MAC_Port_001B] +- [0x07, 0x001C, MAC_Port_001C] +- [0x07, 0x001D, MAC_Port_001D] +- [0x07, 0x001E, MAC_Port_001E] +- [0x07, 0x001F, MAC_Port_001F] +- [0x07, 0x0020, MAC_Port_0020] +- [0x07, 0x0021, MAC_Port_0021] +- [0x07, 0x0022, MAC_Port_0022] +- [0x07, 0x0023, MAC_Port_0023] +- [0x07, 0x0024, MAC_Port_0024] +- [0x07, 0x0025, MAC_Port_0025] +- [0x07, 0x0026, MAC_Port_0026] +- [0x07, 0x0027, MAC_Port_0027] +- [0x07, 0x0028, MAC_Port_0028] +- [0x07, 0x0029, MAC_Port_0029] +- [0x07, 0x002A, MAC_Port_002A] +- [0x07, 0x002B, MAC_Port_002B] +- [0x07, 0x002C, MAC_Port_002C] +- [0x07, 0x002D, MAC_Port_002D] +- [0x07, 0x002E, MAC_Port_002E] +- [0x07, 0x002F, MAC_Port_002F] +- [0x07, 0x0030, MAC_Port_0030] +- [0x07, 0x0031, MAC_Port_0031] +- [0x07, 0x0032, MAC_Port_0032] +- [0x07, 0x0033, MAC_Port_0033] +- [0x07, 0x0034, MAC_Port_0034] +- [0x07, 0x0035, MAC_Port_0035] +- [0x07, 0x0036, MAC_Port_0036] +- [0x07, 0x0037, MAC_Port_0037] +- [0x07, 0x0038, MAC_Port_0038] +- [0x07, 0x0039, MAC_Port_0039] +- [0x07, 0x003A, MAC_Port_003A] +- [0x07, 0x003B, MAC_Port_003B] +- [0x07, 0x003C, MAC_Port_003C] +- [0x07, 0x003D, MAC_Port_003D] +- [0x07, 0x003E, MAC_Port_003E] +- [0x07, 0x003F, MAC_Port_003F] +- [0x07, 0x0040, MAC_Port_0040] +- [0x07, 0x0041, MAC_Port_0041] +- [0x07, 0x0042, MAC_Port_0042] +- [0x07, 0x0043, MAC_Port_0043] +- [0x07, 0x0044, MAC_Port_0044] +- [0x07, 0x0045, MAC_Port_0045] +- [0x07, 0x0046, MAC_Port_0046] +- [0x07, 0x0047, MAC_Port_0047] +- [0x07, 0x0048, MAC_Port_0048] +- [0x07, 0x0049, MAC_Port_0049] +- [0x07, 0x004A, MAC_Port_004A] +- [0x07, 0x004B, MAC_Port_004B] +- [0x07, 0x004C, MAC_Port_004C] +- [0x07, 0x004D, MAC_Port_004D] +- [0x07, 0x004E, MAC_Port_004E] +- [0x07, 0x004F, MAC_Port_004F] +- [0x07, 0x0050, MAC_Port_0050] +- [0x07, 0x0051, MAC_Port_0051] +- [0x07, 0x0052, MAC_Port_0052] +- [0x07, 0x0053, MAC_Port_0053] +- [0x07, 0x0054, MAC_Port_0054] +- [0x07, 0x0055, MAC_Port_0055] +- [0x07, 0x0056, MAC_Port_0056] +- [0x07, 0x0057, MAC_Port_0057] +- [0x07, 0x0058, MAC_Port_0058] +- [0x07, 0x0059, MAC_Port_0059] +- [0x07, 0x005A, MAC_Port_005A] +- [0x07, 0x005B, MAC_Port_005B] +- [0x07, 0x005C, MAC_Port_005C] +- [0x07, 0x005D, MAC_Port_005D] +- [0x07, 0x005E, MAC_Port_005E] +- [0x07, 0x005F, MAC_Port_005F] +- [0x07, 0x0060, MAC_Port_0060] +- [0x07, 0x0061, MAC_Port_0061] +- [0x07, 0x0062, MAC_Port_0062] +- [0x07, 0x0063, MAC_Port_0063] +- [0x07, 0x0064, MAC_Port_0064] +- [0x07, 0x0065, MAC_Port_0065] +- [0x07, 0x0066, MAC_Port_0066] +- [0x07, 0x0067, MAC_Port_0067] +- [0x07, 0x0068, MAC_Port_0068] +- [0x07, 0x0069, MAC_Port_0069] +- [0x07, 0x006A, MAC_Port_006A] +- [0x07, 0x006B, MAC_Port_006B] +- [0x07, 0x006C, MAC_Port_006C] +- [0x07, 0x006D, MAC_Port_006D] +- [0x07, 0x006E, MAC_Port_006E] +- [0x07, 0x006F, MAC_Port_006F] +- [0x07, 0x0070, MAC_Port_0070] +- [0x07, 0x0071, MAC_Port_0071] +- [0x07, 0x0072, MAC_Port_0072] +- [0x07, 0x0073, MAC_Port_0073] +- [0x07, 0x0074, MAC_Port_0074] +- [0x07, 0x0075, MAC_Port_0075] +- [0x07, 0x0076, MAC_Port_0076] +- [0x07, 0x0077, MAC_Port_0077] +- [0x07, 0x0078, MAC_Port_0078] +- [0x07, 0x0079, MAC_Port_0079] +- [0x07, 0x007A, MAC_Port_007A] +- [0x07, 0x007B, MAC_Port_007B] +- [0x07, 0x007C, MAC_Port_007C] +- [0x07, 0x007D, MAC_Port_007D] +- [0x07, 0x007E, MAC_Port_007E] +- [0x07, 0x007F, MAC_Port_007F] +- [0x07, 0x0080, MAC_Port_0080] +- [0x07, 0x0081, MAC_Port_0081] +- [0x07, 0x0082, MAC_Port_0082] +- [0x07, 0x0083, MAC_Port_0083] +- [0x07, 0x0084, MAC_Port_0084] +- [0x07, 0x0085, MAC_Port_0085] +- [0x07, 0x0086, MAC_Port_0086] +- [0x07, 0x0087, MAC_Port_0087] +- [0x07, 0x0088, MAC_Port_0088] +- [0x07, 0x0089, MAC_Port_0089] +- [0x07, 0x008A, MAC_Port_008A] +- [0x07, 0x008B, MAC_Port_008B] +- [0x07, 0x008C, MAC_Port_008C] +- [0x07, 0x008D, MAC_Port_008D] +- [0x07, 0x008E, MAC_Port_008E] +- [0x07, 0x008F, MAC_Port_008F] +- [0x07, 0x0090, MAC_Port_0090] +- [0x07, 0x0091, MAC_Port_0091] +- [0x07, 0x0092, MAC_Port_0092] +- [0x07, 0x0093, MAC_Port_0093] +- [0x07, 0x0094, MAC_Port_0094] +- [0x07, 0x0095, MAC_Port_0095] +- [0x07, 0x0096, MAC_Port_0096] +- [0x07, 0x0097, MAC_Port_0097] +- [0x07, 0x0098, MAC_Port_0098] +- [0x07, 0x0099, MAC_Port_0099] +- [0x07, 0x009A, MAC_Port_009A] +- [0x07, 0x009B, MAC_Port_009B] +- [0x07, 0x009C, MAC_Port_009C] +- [0x07, 0x009D, MAC_Port_009D] +- [0x07, 0x009E, MAC_Port_009E] +- [0x07, 0x009F, MAC_Port_009F] +- [0x07, 0x00A0, MAC_Port_00A0] +- [0x07, 0x00A1, MAC_Port_00A1] +- [0x07, 0x00A2, MAC_Port_00A2] +- [0x07, 0x00A3, MAC_Port_00A3] +- [0x07, 0x00A4, MAC_Port_00A4] +- [0x07, 0x00A5, MAC_Port_00A5] +- [0x07, 0x00A6, MAC_Port_00A6] +- [0x07, 0x00A7, MAC_Port_00A7] +- [0x07, 0x00A8, MAC_Port_00A8] +- [0x07, 0x00A9, MAC_Port_00A9] +- [0x07, 0x00AA, MAC_Port_00AA] +- [0x07, 0x00AB, MAC_Port_00AB] +- [0x07, 0x00AC, MAC_Port_00AC] +- [0x07, 0x00AD, MAC_Port_00AD] +- [0x07, 0x00AE, MAC_Port_00AE] +- [0x07, 0x00AF, MAC_Port_00AF] +- [0x07, 0x00B0, MAC_Port_00B0] +- [0x07, 0x00B1, MAC_Port_00B1] +- [0x07, 0x00B2, MAC_Port_00B2] +- [0x07, 0x00B3, MAC_Port_00B3] +- [0x07, 0x00B4, MAC_Port_00B4] +- [0x07, 0x00B5, MAC_Port_00B5] +- [0x07, 0x00B6, MAC_Port_00B6] +- [0x07, 0x00B7, MAC_Port_00B7] +- [0x07, 0x00B8, MAC_Port_00B8] +- [0x07, 0x00B9, MAC_Port_00B9] +- [0x07, 0x00BA, MAC_Port_00BA] +- [0x07, 0x00BB, MAC_Port_00BB] +- [0x07, 0x00BC, MAC_Port_00BC] +- [0x07, 0x00BD, MAC_Port_00BD] +- [0x07, 0x00BE, MAC_Port_00BE] +- [0x07, 0x00BF, MAC_Port_00BF] +- [0x07, 0x00C0, MAC_Port_00C0] +- [0x07, 0x00C1, MAC_Port_00C1] +- [0x07, 0x00C2, MAC_Port_00C2] +- [0x07, 0x00C3, MAC_Port_00C3] +- [0x07, 0x00C4, MAC_Port_00C4] +- [0x07, 0x00C5, MAC_Port_00C5] +- [0x08, 0x0000, MGM_0000] +- [0x08, 0x0001, MGM_0001] +- [0x08, 0x0002, MGM_0002] +- [0x08, 0x0003, MGM_0003] +- [0x08, 0x0004, MGM_0004] +- [0x08, 0x0005, MGM_0005] +- [0x08, 0x0006, MGM_0006] +- [0x08, 0x0007, MGM_0007] +- [0x08, 0x0008, MGM_0008] +- [0x08, 0x0009, MGM_0009] +- [0x08, 0x000A, MGM_000A] +- [0x08, 0x000B, MGM_000B] +- [0x08, 0x000C, MGM_000C] +- [0x08, 0x000D, MGM_000D] +- [0x08, 0x000E, MGM_000E] +- [0x08, 0x000F, MGM_000F] +- [0x08, 0x0010, MGM_0010] +- [0x08, 0x0011, MGM_0011] +- [0x08, 0x0012, MGM_0012] +- [0x08, 0x0013, MGM_0013] +- [0x08, 0x0014, MGM_0014] +- [0x08, 0x0015, MGM_0015] +- [0x08, 0x0016, MGM_0016] +- [0x08, 0x0017, MGM_0017] +- [0x08, 0x0018, MGM_0018] +- [0x08, 0x0019, MGM_0019] +- [0x08, 0x001A, MGM_001A] +- [0x08, 0x001B, MGM_001B] +- [0x08, 0x001C, MGM_001C] +- [0x08, 0x001D, MGM_001D] +- [0x08, 0x001E, MGM_001E] +- [0x08, 0x001F, MGM_001F] +- [0x08, 0x0020, MGM_0020] +- [0x08, 0x0021, PAL_MGM_0021] +- [0x08, 0x0022, MGM_0021] +- [0x08, 0x0023, MGM_0022] +- [0x08, 0x0024, PAL_MGM_0024] +- [0x08, 0x0025, MGM_0023] +- [0x08, 0x0026, MGM_0024] +- [0x08, 0x0027, MGM_0025] +- [0x08, 0x0028, MGM_0026] +- [0x08, 0x0029, MGM_0027] +- [0x08, 0x002A, MGM_0028] +- [0x08, 0x002B, MGM_0029] +- [0x08, 0x002C, MGM_002A] +- [0x08, 0x002D, MGM_002B] +- [0x08, 0x002E, MGM_002C] +- [0x08, 0x002F, MGM_002D] +- [0x08, 0x0030, MGM_002E] +- [0x08, 0x0031, MGM_002F] +- [0x08, 0x0032, MGM_0030] +- [0x08, 0x0033, MGM_0031] +- [0x08, 0x0034, MGM_0032] +- [0x08, 0x0035, MGM_0033] +- [0x08, 0x0036, PAL_MGM_0036] +- [0x08, 0x0037, MGM_0034] +- [0x08, 0x0038, MGM_0035] +- [0x08, 0x0039, MGM_0036] +- [0x08, 0x003A, MGM_0037] +- [0x08, 0x003B, MGM_0038] +- [0x08, 0x003C, MGM_0039] +- [0x08, 0x003D, MGM_003A] +- [0x08, 0x003E, MGM_003B] +- [0x08, 0x003F, MGM_003C] +- [0x08, 0x0040, MGM_003D] +- [0x08, 0x0041, MGM_003E] +- [0x08, 0x0042, MGM_003F] +- [0x08, 0x0043, MGM_0040] +- [0x08, 0x0044, MGM_0041] +- [0x08, 0x0045, MGM_0042] +- [0x08, 0x0046, PAL_MGM_0046] +- [0x08, 0x0047, MGM_0043] +- [0x08, 0x0048, MGM_0044] +- [0x08, 0x0049, MGM_0045] +- [0x08, 0x004A, MGM_0046] +- [0x08, 0x004B, MGM_0047] +- [0x08, 0x004C, MGM_0048] + +- [0x09, 0x0000, OSR_0000] +- [0x09, 0x0001, OSR_0001] +- [0x09, 0x0002, OSR_0002] +- [0x09, 0x0003, OSR_0003] +- [0x09, 0x0004, OSR_0004] +- [0x09, 0x0005, OSR_0005] +- [0x09, 0x0006, OSR_0006] +- [0x09, 0x0007, OSR_0007] +- [0x09, 0x0008, OSR_0008] +- [0x09, 0x0009, OSR_0009] +- [0x09, 0x000A, OSR_000A] +- [0x09, 0x000B, OSR_000B] +- [0x09, 0x000C, OSR_000C] +- [0x09, 0x000D, OSR_000D] +- [0x09, 0x000E, OSR_000E] +- [0x09, 0x000F, OSR_000F] +- [0x09, 0x0010, OSR_0010] +- [0x09, 0x0011, OSR_0011] +- [0x09, 0x0012, OSR_0012] +- [0x09, 0x0013, OSR_0013] +- [0x0A, 0x0000, HOS_0000] +- [0x0A, 0x0001, HOS_0001] +- [0x0A, 0x0002, HOS_0002] +- [0x0A, 0x0003, HOS_0003] +- [0x0A, 0x0004, HOS_0004] +- [0x0A, 0x0005, HOS_0005] +- [0x0A, 0x0006, HOS_0006] +- [0x0A, 0x0007, HOS_0007] +- [0x0A, 0x0008, HOS_0008] +- [0x0A, 0x0009, HOS_0009] +- [0x0A, 0x000A, HOS_000A] +- [0x0A, 0x000B, HOS_000B] +- [0x0A, 0x000C, HOS_000C] +- [0x0A, 0x000D, HOS_000D] +- [0x0A, 0x000E, HOS_000E] +- [0x0A, 0x000F, HOS_000F] +- [0x0A, 0x0010, HOS_0010] +- [0x0A, 0x0011, HOS_0011] +- [0x0A, 0x0012, HOS_0012] +- [0x0A, 0x0013, HOS_0013] +- [0x0A, 0x0014, HOS_0014] +- [0x0A, 0x0015, HOS_0015] +- [0x0A, 0x0016, HOS_0016] +- [0x0A, 0x0017, HOS_0017] +- [0x0A, 0x0018, HOS_0018] +- [0x0A, 0x0019, HOS_0019] +- [0x0A, 0x001A, HOS_001A] +- [0x0A, 0x001B, HOS_001B] +- [0x0A, 0x001C, HOS_001C] +- [0x0A, 0x001D, HOS_001D] +- [0x0A, 0x001E, HOS_001E] +- [0x0A, 0x001F, HOS_001F] +- [0x0A, 0x0020, HOS_0020] +- [0x0A, 0x0021, HOS_0021] +- [0x0A, 0x0022, HOS_0022] +- [0x0A, 0x0023, HOS_0023] +- [0x0A, 0x0024, HOS_0024] +- [0x0A, 0x0025, HOS_0025] +- [0x0A, 0x0026, HOS_0026] +- [0x0A, 0x0027, HOS_0027] +- [0x0A, 0x0028, HOS_0028] +- [0x0A, 0x0029, HOS_0029] +- [0x0A, 0x002A, HOS_002A] +- [0x0A, 0x002B, HOS_002B] +- [0x0A, 0x002C, HOS_002C] +- [0x0A, 0x002D, HOS_002D] +- [0x0A, 0x002E, HOS_002E] +- [0x0A, 0x002F, HOS_002F] +- [0x0A, 0x0030, HOS_0030] +- [0x0A, 0x0031, HOS_0031] +- [0x0A, 0x0032, HOS_0032] +- [0x0A, 0x0033, HOS_0033] +- [0x0A, 0x0034, HOS_0034] +- [0x0A, 0x0035, HOS_0035] +- [0x0A, 0x0036, HOS_0036] +- [0x0A, 0x0037, HOS_0037] +- [0x0A, 0x0038, HOS_0038] +- [0x0A, 0x0039, HOS_0039] +- [0x0A, 0x003A, HOS_003A] +- [0x0A, 0x003B, HOS_003B] +- [0x0A, 0x003C, HOS_003C] +- [0x0A, 0x003D, HOS_003D] +- [0x0A, 0x003E, HOS_003E] +- [0x0A, 0x003F, HOS_003F] +- [0x0A, 0x0040, HOS_0040] +- [0x0A, 0x0041, HOS_0041] +- [0x0A, 0x0042, HOS_0042] +- [0x0A, 0x0043, HOS_0043] +- [0x0A, 0x0044, HOS_0044] +- [0x0A, 0x0045, HOS_0045] +- [0x0A, 0x0046, HOS_0046] +- [0x0A, 0x0047, HOS_0047] +- [0x0A, 0x0048, HOS_0048] +- [0x0A, 0x0049, HOS_0049] +- [0x0A, 0x004A, HOS_004A] +- [0x0A, 0x004B, HOS_004B] +- [0x0A, 0x004C, HOS_004C] +- [0x0A, 0x004D, HOS_004D] +- [0x0A, 0x004E, HOS_004E] +- [0x0A, 0x004F, HOS_004F] +- [0x0A, 0x0050, HOS_0050] +- [0x0A, 0x0051, HOS_0051] +- [0x0A, 0x0052, HOS_0052] +- [0x0A, 0x0053, HOS_0053] +- [0x0A, 0x0054, HOS_0054] +- [0x0A, 0x0055, HOS_0055] +- [0x0A, 0x0056, HOS_0056] +- [0x0A, 0x0057, HOS_0057] +- [0x0A, 0x0058, HOS_0058] +- [0x0A, 0x0059, HOS_0059] +- [0x0A, 0x005A, HOS_005A] +- [0x0A, 0x005B, HOS_005B] +- [0x0A, 0x005C, HOS_005C] +- [0x0A, 0x005D, HOS_005D] +- [0x0A, 0x005E, HOS_005E] +- [0x0A, 0x005F, HOS_005F] +- [0x0A, 0x0060, HOS_0060] +- [0x0A, 0x0061, HOS_0061] +- [0x0A, 0x0062, HOS_0062] +- [0x0A, 0x0063, HOS_0063] +- [0x0A, 0x0064, HOS_0064] +- [0x0A, 0x0065, HOS_0065] +- [0x0A, 0x0066, HOS_0066] +- [0x0A, 0x0067, HOS_0067] +- [0x0A, 0x0068, HOS_0068] +- [0x0A, 0x0069, HOS_0069] +- [0x0A, 0x006A, HOS_006A] +- [0x0A, 0x006B, HOS_006B] +- [0x0A, 0x006C, HOS_006C] +- [0x0A, 0x006D, HOS_006D] +- [0x0A, 0x006E, HOS_006E] +- [0x0A, 0x006F, HOS_006F] +- [0x0A, 0x0070, HOS_0070] +- [0x0B, 0x0000, CH0_0000] +- [0x0B, 0x0001, CH0_0001] +- [0x0B, 0x0002, CH0_0002] +- [0x0B, 0x0003, CH0_0003] +- [0x0B, 0x0004, CH0_0004] +- [0x0B, 0x0005, CH0_0005] +- [0x0B, 0x0006, CH0_0006] +- [0x0B, 0x0007, CH0_0007] +- [0x0B, 0x0008, CH0_0008] +- [0x0B, 0x0009, CH0_0009] +- [0x0B, 0x000A, CH0_000A] +- [0x0B, 0x000B, CH0_000B] +- [0x0B, 0x000C, CH0_000C] +- [0x0B, 0x000D, CH0_000D] +- [0x0B, 0x000E, CH0_000E] +- [0x0B, 0x000F, CH0_000F] +- [0x0B, 0x0010, CH0_0010] +- [0x0B, 0x0011, CH0_0011] +- [0x0B, 0x0012, CH0_0012] +- [0x0B, 0x0013, CH0_0013] +- [0x0B, 0x0014, CH0_0014] +- [0x0B, 0x0015, CH0_0015] +- [0x0B, 0x0016, CH0_0016] +- [0x0B, 0x0017, CH0_0017] +- [0x0B, 0x0018, CH0_0018] +- [0x0B, 0x0019, CH0_0019] +- [0x0B, 0x001A, CH0_001A] +- [0x0B, 0x001B, CH0_001B] +- [0x0B, 0x001C, CH0_001C] +- [0x0B, 0x001D, CH0_001D] +- [0x0B, 0x001E, CH0_001E] +- [0x0B, 0x001F, CH0_001F] +- [0x0B, 0x0020, CH0_0020] +- [0x0B, 0x0021, CH0_0021] +- [0x0B, 0x0022, CH0_0022] +- [0x0B, 0x0023, CH0_0023] +- [0x0B, 0x0024, CH0_0024] +- [0x0B, 0x0025, CH0_0025] +- [0x0B, 0x0026, CH0_0026] +- [0x0B, 0x0027, CH0_0027] +- [0x0B, 0x0028, CH0_0028] +- [0x0B, 0x0029, CH0_0029] +- [0x0B, 0x002A, CH0_002A] +- [0x0B, 0x002B, CH0_002B] +- [0x0B, 0x002C, CH0_002C] +- [0x0B, 0x002D, CH0_002D] +- [0x0B, 0x002E, CH0_002E] +- [0x0B, 0x002F, CH0_002F] +- [0x0B, 0x0030, CH0_0030] +- [0x0B, 0x0031, CH0_0031] +- [0x0B, 0x0032, CH0_0032] +- [0x0B, 0x0033, CH0_0033] +- [0x0B, 0x0034, CH0_0034] +- [0x0B, 0x0035, CH0_0035] +- [0x0B, 0x0036, CH0_0036] +- [0x0B, 0x0037, CH0_0037] +- [0x0B, 0x0038, CH0_0038] +- [0x0B, 0x0039, CH0_0039] +- [0x0B, 0x003A, CH0_003A] +- [0x0B, 0x003B, CH0_003B] +- [0x0B, 0x003C, CH0_003C] +- [0x0B, 0x003D, CH0_003D] +- [0x0B, 0x003E, CH0_003E] +- [0x0B, 0x003F, CH0_003F] +- [0x0B, 0x0040, CH0_0040] +- [0x0B, 0x0041, CH0_0041] +- [0x0B, 0x0042, CH0_0042] +- [0x0B, 0x0043, CH0_0043] +- [0x0B, 0x0044, CH0_0044] +- [0x0B, 0x0045, CH0_0045] +- [0x0B, 0x0046, CH0_0046] +- [0x0B, 0x0047, CH0_0047] +- [0x0B, 0x0048, CH0_0048] +- [0x0B, 0x0049, CH0_0049] +- [0x0B, 0x004A, CH0_004A] +- [0x0B, 0x004B, CH0_004B] +- [0x0B, 0x004C, CH0_004C] +- [0x0B, 0x004D, CH0_004D] +- [0x0B, 0x004E, CH0_004E] +- [0x0B, 0x004F, CH0_004F] +- [0x0B, 0x0050, CH0_0050] +- [0x0B, 0x0051, CH0_0051] +- [0x0B, 0x0052, CH0_0052] +- [0x0B, 0x0053, CH0_0053] +- [0x0B, 0x0054, CH0_0054] +- [0x0B, 0x0055, CH0_0055] +- [0x0B, 0x0056, CH0_0056] +- [0x0B, 0x0057, CH0_0057] +- [0x0B, 0x0058, CH0_0058] +- [0x0B, 0x0059, CH0_0059] +- [0x0B, 0x005A, CH0_005A] +- [0x0B, 0x005B, CH0_005B] +- [0x0B, 0x005C, CH0_005C] +- [0x0B, 0x005D, CH0_005D] +- [0x0B, 0x005E, CH0_005E] +- [0x0B, 0x005F, CH0_005F] +- [0x0B, 0x0060, CH0_0060] +- [0x0B, 0x0061, CH0_0061] +- [0x0B, 0x0062, CH0_0062] +- [0x0B, 0x0063, CH0_0063] +- [0x0B, 0x0064, CH0_0064] +- [0x0B, 0x0065, CH0_0065] +- [0x0B, 0x0066, CH0_0066] +- [0x0B, 0x0067, CH0_0067] +- [0x0B, 0x0068, CH0_0068] +- [0x0B, 0x0069, CH0_0069] +- [0x0B, 0x006A, CH0_006A] +- [0x0B, 0x006B, CH0_006B] +- [0x0B, 0x006C, CH0_006C] +- [0x0B, 0x006D, CH0_006D] +- [0x0B, 0x006E, CH0_006E] +- [0x0B, 0x006F, CH0_006F] +- [0x0B, 0x0070, CH0_0070] +- [0x0B, 0x0071, CH0_0071] +- [0x0B, 0x0072, CH0_0072] +- [0x0B, 0x0073, CH0_0073] +- [0x0B, 0x0074, CH0_0074] +- [0x0B, 0x0075, CH0_0075] +- [0x0B, 0x0076, CH0_0076] +- [0x0B, 0x0077, CH0_0077] +- [0x0B, 0x0078, CH0_0078] +- [0x0B, 0x0079, CH0_0079] +- [0x0B, 0x007A, CH0_007A] +- [0x0B, 0x007B, CH0_007B] +- [0x0B, 0x007C, CH0_007C] +- [0x0B, 0x007D, CH0_007D] +- [0x0B, 0x007E, CH0_007E] +- [0x0B, 0x007F, CH0_007F] +- [0x0B, 0x0080, CH0_0080] +- [0x0B, 0x0081, CH0_0081] +- [0x0B, 0x0082, CH0_0082] +- [0x0B, 0x0083, CH0_0083] +- [0x0B, 0x0084, CH0_0084] +- [0x0B, 0x0085, CH0_0085] +- [0x0B, 0x0086, CH0_0086] +- [0x0B, 0x0087, CH0_0087] +- [0x0B, 0x0088, CH0_0088] +- [0x0B, 0x0089, CH0_0089] +- [0x0B, 0x008A, CH0_008A] +- [0x0B, 0x008B, CH0_008B] +- [0x0B, 0x008C, CH0_008C] +- [0x0B, 0x008D, CH0_008D] +- [0x0B, 0x008E, CH0_008E] +- [0x0B, 0x008F, CH0_008F] +- [0x0B, 0x0090, CH0_0090] +- [0x0B, 0x0091, CH0_0091] +- [0x0B, 0x0092, CH0_0092] +- [0x0B, 0x0093, CH0_0093] +- [0x0B, 0x0094, CH0_0094] +- [0x0B, 0x0095, CH0_0095] +- [0x0B, 0x0096, CH0_0096] +- [0x0B, 0x0097, CH0_0097] +- [0x0B, 0x0098, CH0_0098] +- [0x0B, 0x0099, CH0_0099] +- [0x0B, 0x009A, CH0_009A] +- [0x0B, 0x009B, CH0_009B] +- [0x0B, 0x009C, CH0_009C] +- [0x0B, 0x009D, CH0_009D] +- [0x0B, 0x009E, CH0_009E] +- [0x0B, 0x009F, CH0_009F] +- [0x0B, 0x00A0, CH0_00A0] +- [0x0B, 0x00A1, CH0_00A1] +- [0x0B, 0x00A2, CH0_00A2] +- [0x0B, 0x00A3, CH0_00A3] +- [0x0B, 0x00A4, CH0_00A4] +- [0x0B, 0x00A5, CH0_00A5] +- [0x0B, 0x00A6, CH0_00A6] +- [0x0B, 0x00A7, CH0_00A7] +- [0x0B, 0x00A8, CH0_00A8] +- [0x0B, 0x00A9, CH0_00A9] +- [0x0B, 0x00AA, CH0_00AA] +- [0x0B, 0x00AB, CH0_00AB] +- [0x0B, 0x00AC, CH0_00AC] +- [0x0B, 0x00AD, CH0_00AD] +- [0x0B, 0x00AE, CH0_00AE] +- [0x0B, 0x00AF, CH0_00AF] +- [0x0B, 0x00B0, CH0_00B0] +- [0x0B, 0x00B1, CH0_00B1] +- [0x0B, 0x00B2, CH0_00B2] +- [0x0B, 0x00B3, CH0_00B3] +- [0x0B, 0x00B4, CH0_00B4] +- [0x0B, 0x00B5, CH0_00B5] +- [0x0B, 0x00B6, CH0_00B6] +- [0x0B, 0x00B7, CH0_00B7] +- [0x0B, 0x00B8, CH0_00B8] +- [0x0B, 0x00B9, CH0_00B9] +- [0x0B, 0x00BA, CH0_00BA] +- [0x0B, 0x00BB, CH0_00BB] +- [0x0B, 0x00BC, CH0_00BC] +- [0x0B, 0x00BD, CH0_00BD] +- [0x0B, 0x00BE, CH0_00BE] +- [0x0B, 0x00BF, CH0_00BF] +- [0x0B, 0x00C0, CH0_00C0] +- [0x0B, 0x00C1, CH0_00C1] +- [0x0B, 0x00C2, CH0_00C2] +- [0x0B, 0x00C3, CH0_00C3] +- [0x0B, 0x00C4, CH0_00C4] +- [0x0B, 0x00C5, CH0_00C5] +- [0x0B, 0x00C6, CH0_00C6] +- [0x0B, 0x00C7, CH0_00C7] +- [0x0B, 0x00C8, CH0_00C8] +- [0x0B, 0x00C9, CH0_00C9] +- [0x0B, 0x00CA, CH0_00CA] +- [0x0B, 0x00CB, CH0_00CB] +- [0x0B, 0x00CC, CH0_00CC] +- [0x0B, 0x00CD, CH0_00CD] +- [0x0B, 0x00CE, CH0_00CE] +- [0x0B, 0x00CF, CH0_00CF] +- [0x0B, 0x00D0, CH0_00D0] +- [0x0B, 0x00D1, CH0_00D1] +- [0x0B, 0x00D2, CH0_00D2] +- [0x0B, 0x00D3, CH0_00D3] +- [0x0B, 0x00D4, CH0_00D4] +- [0x0B, 0x00D5, CH0_00D5] +- [0x0B, 0x00D6, CH0_00D6] +- [0x0B, 0x00D7, CH0_00D7] +- [0x0B, 0x00D8, CH0_00D8] +- [0x0B, 0x00D9, CH0_00D9] +- [0x0B, 0x00DA, CH0_00DA] +- [0x0B, 0x00DB, CH0_00DB] +- [0x0B, 0x00DC, CH0_00DC] +- [0x0B, 0x00DD, CH0_00DD] +- [0x0B, 0x00DE, CH0_00DE] +- [0x0B, 0x00DF, CH0_00DF] +- [0x0B, 0x00E0, CH0_00E0] +- [0x0B, 0x00E1, CH0_00E1] +- [0x0B, 0x00E2, CH0_00E2] +- [0x0B, 0x00E3, CH0_00E3] +- [0x0B, 0x00E4, CH0_00E4] +- [0x0B, 0x00E5, CH0_00E5] +- [0x0B, 0x00E6, CH0_00E6] +- [0x0B, 0x00E7, CH0_00E7] +- [0x0B, 0x00E8, CH0_00E8] +- [0x0B, 0x00E9, CH0_00E9] +- [0x0B, 0x00EA, CH0_00EA] +- [0x0B, 0x00EB, CH0_00EB] +- [0x0B, 0x00EC, CH0_00EC] +- [0x0B, 0x00ED, CH0_00ED] +- [0x0B, 0x00EE, CH0_00EE] +- [0x0B, 0x00EF, CH0_00EF] +- [0x0B, 0x00F0, CH0_00F0] +- [0x0B, 0x00F1, CH0_00F1] +- [0x0B, 0x00F2, CH0_00F2] +- [0x0B, 0x00F3, CH0_00F3] +- [0x0B, 0x00F4, CH0_00F4] +- [0x0B, 0x00F5, CH0_00F5] +- [0x0B, 0x00F6, CH0_00F6] +- [0x0B, 0x00F7, CH0_00F7] +- [0x0B, 0x00F8, CH0_00F8] +- [0x0B, 0x00F9, CH0_00F9] +- [0x0B, 0x00FA, CH0_00FA] +- [0x0B, 0x00FB, CH0_00FB] +- [0x0B, 0x00FC, CH0_00FC] +- [0x0B, 0x00FD, CH0_00FD] +- [0x0B, 0x00FE, CH0_00FE] +- [0x0B, 0x00FF, CH0_00FF] +- [0x0B, 0x0100, CH0_0100] +- [0x0B, 0x0101, CH0_0101] +- [0x0B, 0x0102, CH0_0102] +- [0x0B, 0x0103, CH0_0103] +- [0x0B, 0x0104, CH0_0104] +- [0x0B, 0x0105, CH0_0105] +- [0x0B, 0x0106, CH0_0106] +- [0x0B, 0x0107, CH0_0107] +- [0x0B, 0x0108, CH0_0108] +- [0x0C, 0x0000, CH1_0000] +- [0x0C, 0x0001, CH1_0001] +- [0x0C, 0x0002, CH1_0002] +- [0x0C, 0x0003, CH1_0003] +- [0x0C, 0x0004, CH1_0004] +- [0x0C, 0x0005, CH1_0005] +- [0x0C, 0x0006, CH1_0006] +- [0x0C, 0x0007, CH1_0007] +- [0x0C, 0x0008, CH1_0008] +- [0x0C, 0x0009, CH1_0009] +- [0x0C, 0x000A, CH1_000A] +- [0x0C, 0x000B, CH1_000B] +- [0x0C, 0x000C, CH1_000C] +- [0x0C, 0x000D, CH1_000D] +- [0x0C, 0x000E, CH1_000E] +- [0x0C, 0x000F, CH1_000F] +- [0x0C, 0x0010, CH1_0010] +- [0x0C, 0x0011, CH1_0011] +- [0x0C, 0x0012, CH1_0012] +- [0x0C, 0x0013, CH1_0013] +- [0x0C, 0x0014, CH1_0014] +- [0x0C, 0x0015, CH1_0015] +- [0x0C, 0x0016, CH1_0016] +- [0x0C, 0x0017, CH1_0017] +- [0x0C, 0x0018, CH1_0018] +- [0x0C, 0x0019, CH1_0019] +- [0x0C, 0x001A, CH1_001A] +- [0x0C, 0x001B, CH1_001B] +- [0x0C, 0x001C, CH1_001C] +- [0x0C, 0x001D, CH1_001D] +- [0x0C, 0x001E, CH1_001E] +- [0x0C, 0x001F, CH1_001F] +- [0x0C, 0x0020, CH1_0020] +- [0x0C, 0x0021, CH1_0021] +- [0x0C, 0x0022, CH1_0022] +- [0x0C, 0x0023, CH1_0023] +- [0x0C, 0x0024, CH1_0024] +- [0x0C, 0x0025, CH1_0025] +- [0x0C, 0x0026, CH1_0026] +- [0x0C, 0x0027, CH1_0027] +- [0x0C, 0x0028, CH1_0028] +- [0x0C, 0x0029, CH1_0029] +- [0x0C, 0x002A, CH1_002A] +- [0x0C, 0x002B, CH1_002B] +- [0x0C, 0x002C, CH1_002C] +- [0x0C, 0x002D, CH1_002D] +- [0x0C, 0x002E, CH1_002E] +- [0x0C, 0x002F, CH1_002F] +- [0x0C, 0x0030, CH1_0030] +- [0x0C, 0x0031, CH1_0031] +- [0x0C, 0x0032, CH1_0032] +- [0x0C, 0x0033, CH1_0033] +- [0x0C, 0x0034, CH1_0034] +- [0x0C, 0x0035, CH1_0035] +- [0x0C, 0x0036, CH1_0036] +- [0x0C, 0x0037, CH1_0037] +- [0x0C, 0x0038, CH1_0038] +- [0x0C, 0x0039, CH1_0039] +- [0x0C, 0x003A, CH1_003A] +- [0x0C, 0x003B, CH1_003B] +- [0x0C, 0x003C, CH1_003C] +- [0x0C, 0x003D, CH1_003D] +- [0x0C, 0x003E, CH1_003E] +- [0x0C, 0x003F, CH1_003F] +- [0x0C, 0x0040, CH1_0040] +- [0x0C, 0x0041, CH1_0041] +- [0x0C, 0x0042, CH1_0042] +- [0x0C, 0x0043, CH1_0043] +- [0x0C, 0x0044, CH1_0044] +- [0x0C, 0x0045, CH1_0045] +- [0x0C, 0x0046, CH1_0046] +- [0x0C, 0x0047, CH1_0047] +- [0x0C, 0x0048, CH1_0048] +- [0x0C, 0x0049, CH1_0049] +- [0x0C, 0x004A, CH1_004A] +- [0x0C, 0x004B, CH1_004B] +- [0x0C, 0x004C, CH1_004C] +- [0x0C, 0x004D, CH1_004D] +- [0x0C, 0x004E, CH1_004E] +- [0x0C, 0x004F, CH1_004F] +- [0x0C, 0x0050, CH1_0050] +- [0x0C, 0x0051, CH1_0051] +- [0x0C, 0x0052, CH1_0052] +- [0x0C, 0x0053, CH1_0053] +- [0x0C, 0x0054, CH1_0054] +- [0x0C, 0x0055, CH1_0055] +- [0x0C, 0x0056, CH1_0056] +- [0x0C, 0x0057, CH1_0057] +- [0x0C, 0x0058, CH1_0058] +- [0x0C, 0x0059, CH1_0059] +- [0x0C, 0x005A, CH1_005A] +- [0x0C, 0x005B, CH1_005B] +- [0x0C, 0x005C, CH1_005C] +- [0x0C, 0x005D, CH1_005D] +- [0x0C, 0x005E, CH1_005E] +- [0x0C, 0x005F, CH1_005F] +- [0x0C, 0x0060, CH1_0060] +- [0x0C, 0x0061, CH1_0061] +- [0x0C, 0x0062, CH1_0062] +- [0x0C, 0x0063, CH1_0063] +- [0x0C, 0x0064, CH1_0064] +- [0x0C, 0x0065, CH1_0065] +- [0x0C, 0x0066, CH1_0066] +- [0x0C, 0x0067, CH1_0067] +- [0x0C, 0x0068, CH1_0068] +- [0x0C, 0x0069, CH1_0069] +- [0x0C, 0x006A, CH1_006A] +- [0x0C, 0x006B, CH1_006B] +- [0x0C, 0x006C, CH1_006C] +- [0x0C, 0x006D, CH1_006D] +- [0x0C, 0x006E, CH1_006E] +- [0x0C, 0x006F, CH1_006F] +- [0x0C, 0x0070, CH1_0070] +- [0x0C, 0x0071, CH1_0071] +- [0x0C, 0x0072, CH1_0072] +- [0x0C, 0x0073, CH1_0073] +- [0x0C, 0x0074, CH1_0074] +- [0x0C, 0x0075, CH1_0075] +- [0x0C, 0x0076, CH1_0076] +- [0x0C, 0x0077, CH1_0077] +- [0x0C, 0x0078, CH1_0078] +- [0x0C, 0x0079, CH1_0079] +- [0x0C, 0x007A, CH1_007A] +- [0x0C, 0x007B, CH1_007B] +- [0x0C, 0x007C, CH1_007C] +- [0x0C, 0x007D, CH1_007D] +- [0x0C, 0x007E, CH1_007E] +- [0x0C, 0x007F, CH1_007F] +- [0x0C, 0x0080, CH1_0080] +- [0x0C, 0x0081, CH1_0081] +- [0x0C, 0x0082, CH1_0082] +- [0x0C, 0x0083, CH1_0083] +- [0x0C, 0x0084, CH1_0084] +- [0x0C, 0x0085, CH1_0085] +- [0x0C, 0x0086, CH1_0086] +- [0x0C, 0x0087, CH1_0087] +- [0x0C, 0x0088, CH1_0088] +- [0x0C, 0x0089, CH1_0089] +- [0x0C, 0x008A, CH1_008A] +- [0x0C, 0x008B, CH1_008B] +- [0x0C, 0x008C, CH1_008C] +- [0x0C, 0x008D, CH1_008D] +- [0x0C, 0x008E, CH1_008E] +- [0x0C, 0x008F, CH1_008F] +- [0x0C, 0x0090, CH1_0090] +- [0x0C, 0x0091, CH1_0091] +- [0x0C, 0x0092, CH1_0092] +- [0x0C, 0x0093, CH1_0093] +- [0x0C, 0x0094, CH1_0094] +- [0x0C, 0x0095, CH1_0095] +- [0x0C, 0x0096, CH1_0096] +- [0x0C, 0x0097, CH1_0097] +- [0x0C, 0x0098, CH1_0098] +- [0x0C, 0x0099, CH1_0099] +- [0x0C, 0x009A, CH1_009A] +- [0x0C, 0x009B, CH1_009B] +- [0x0C, 0x009C, CH1_009C] +- [0x0C, 0x009D, CH1_009D] +- [0x0C, 0x009E, CH1_009E] +- [0x0C, 0x009F, CH1_009F] +- [0x0C, 0x00A0, CH1_00A0] +- [0x0C, 0x00A1, CH1_00A1] +- [0x0C, 0x00A2, CH1_00A2] +- [0x0C, 0x00A3, CH1_00A3] +- [0x0C, 0x00A4, CH1_00A4] +- [0x0C, 0x00A5, CH1_00A5] +- [0x0C, 0x00A6, CH1_00A6] +- [0x0C, 0x00A7, CH1_00A7] +- [0x0C, 0x00A8, CH1_00A8] +- [0x0C, 0x00A9, CH1_00A9] +- [0x0C, 0x00AA, CH1_00AA] +- [0x0C, 0x00AB, CH1_00AB] +- [0x0C, 0x00AC, CH1_00AC] +- [0x0C, 0x00AD, CH1_00AD] +- [0x0C, 0x00AE, CH1_00AE] +- [0x0C, 0x00AF, CH1_00AF] +- [0x0C, 0x00B0, CH1_00B0] +- [0x0C, 0x00B1, CH1_00B1] +- [0x0C, 0x00B2, CH1_00B2] +- [0x0C, 0x00B3, CH1_00B3] +- [0x0C, 0x00B4, CH1_00B4] +- [0x0C, 0x00B5, CH1_00B5] +- [0x0C, 0x00B6, CH1_00B6] +- [0x0C, 0x00B7, CH1_00B7] +- [0x0C, 0x00B8, CH1_00B8] +- [0x0C, 0x00B9, CH1_00B9] +- [0x0C, 0x00BA, CH1_00BA] +- [0x0C, 0x00BB, CH1_00BB] +- [0x0C, 0x00BC, CH1_00BC] +- [0x0C, 0x00BD, CH1_00BD] +- [0x0C, 0x00BE, CH1_00BE] +- [0x0C, 0x00BF, CH1_00BF] +- [0x0C, 0x00C0, CH1_00C0] +- [0x0C, 0x00C1, CH1_00C1] +- [0x0C, 0x00C2, CH1_00C2] +- [0x0C, 0x00C3, CH1_00C3] +- [0x0C, 0x00C4, CH1_00C4] +- [0x0C, 0x00C5, CH1_00C5] +- [0x0C, 0x00C6, CH1_00C6] +- [0x0C, 0x00C7, CH1_00C7] +- [0x0C, 0x00C8, CH1_00C8] +- [0x0C, 0x00C9, CH1_00C9] +- [0x0C, 0x00CA, CH1_00CA] +- [0x0C, 0x00CB, CH1_00CB] +- [0x0C, 0x00CC, CH1_00CC] +- [0x0C, 0x00CD, CH1_00CD] +- [0x0C, 0x00CE, CH1_00CE] +- [0x0C, 0x00CF, CH1_00CF] +- [0x0C, 0x00D0, CH1_00D0] +- [0x0C, 0x00D1, CH1_00D1] +- [0x0C, 0x00D2, CH1_00D2] +- [0x0C, 0x00D3, CH1_00D3] +- [0x0C, 0x00D4, CH1_00D4] +- [0x0C, 0x00D5, CH1_00D5] +- [0x0C, 0x00D6, CH1_00D6] +- [0x0C, 0x00D7, CH1_00D7] +- [0x0C, 0x00D8, CH1_00D8] +- [0x0C, 0x00D9, CH1_00D9] +- [0x0C, 0x00DA, CH1_00DA] +- [0x0C, 0x00DB, CH1_00DB] +- [0x0C, 0x00DC, CH1_00DC] +- [0x0C, 0x00DD, CH1_00DD] +- [0x0C, 0x00DE, CH1_00DE] +- [0x0C, 0x00DF, CH1_00DF] +- [0x0C, 0x00E0, CH1_00E0] +- [0x0C, 0x00E1, CH1_00E1] +- [0x0C, 0x00E2, CH1_00E2] +- [0x0C, 0x00E3, CH1_00E3] +- [0x0C, 0x00E4, CH1_00E4] +- [0x0C, 0x00E5, CH1_00E5] +- [0x0C, 0x00E6, CH1_00E6] +- [0x0C, 0x00E7, CH1_00E7] +- [0x0C, 0x00E8, CH1_00E8] +- [0x0C, 0x00E9, CH1_00E9] +- [0x0C, 0x00EA, CH1_00EA] +- [0x0C, 0x00EB, CH1_00EB] +- [0x0C, 0x00EC, CH1_00EC] +- [0x0C, 0x00ED, CH1_00ED] +- [0x0C, 0x00EE, CH1_00EE] +- [0x0C, 0x00EF, CH1_00EF] +- [0x0C, 0x00F0, CH1_00F0] +- [0x0C, 0x00F1, CH1_00F1] +- [0x0C, 0x00F2, CH1_00F2] +- [0x0C, 0x00F3, CH1_00F3] +- [0x0C, 0x00F4, CH1_00F4] +- [0x0C, 0x00F5, CH1_00F5] +- [0x0C, 0x00F6, CH1_00F6] +- [0x0C, 0x00F7, CH1_00F7] +- [0x0C, 0x00F8, CH1_00F8] +- [0x0C, 0x00F9, CH1_00F9] +- [0x0C, 0x00FA, CH1_00FA] +- [0x0C, 0x00FB, CH1_00FB] +- [0x0C, 0x00FC, CH1_00FC] +- [0x0C, 0x00FD, CH1_00FD] +- [0x0C, 0x00FE, CH1_00FE] +- [0x0C, 0x00FF, CH1_00FF] +- [0x0C, 0x0100, CH1_0100] +- [0x0C, 0x0101, CH1_0101] +- [0x0C, 0x0102, CH1_0102] +- [0x0C, 0x0103, CH1_0103] +- [0x0C, 0x0104, CH1_0104] +- [0x0C, 0x0105, CH1_0105] +- [0x0C, 0x0106, CH1_0106] +- [0x0C, 0x0107, CH1_0107] +- [0x0C, 0x0108, CH1_0108] +- [0x0C, 0x0109, CH1_0109] +- [0x0C, 0x010A, CH1_010A] +- [0x0C, 0x010B, CH1_010B] +- [0x0C, 0x010C, CH1_010C] +- [0x0C, 0x010D, CH1_010D] +- [0x0C, 0x010E, CH1_010E] +- [0x0C, 0x010F, CH1_010F] +- [0x0C, 0x0110, CH1_0110] +- [0x0C, 0x0111, CH1_0111] +- [0x0C, 0x0112, CH1_0112] +- [0x0C, 0x0113, CH1_0113] +- [0x0C, 0x0114, CH1_0114] +- [0x0C, 0x0115, CH1_0115] +- [0x0C, 0x0116, CH1_0116] +- [0x0C, 0x0117, CH1_0117] +- [0x0C, 0x0118, CH1_0118] +- [0x0C, 0x0119, CH1_0119] +- [0x0C, 0x011A, CH1_011A] +- [0x0C, 0x011B, CH1_011B] +- [0x0C, 0x011C, CH1_011C] +- [0x0C, 0x011D, CH1_011D] +- [0x0C, 0x011E, CH1_011E] +- [0x0C, 0x011F, CH1_011F] +- [0x0C, 0x0120, CH1_0120] +- [0x0C, 0x0121, CH1_0121] +- [0x0C, 0x0122, CH1_0122] +- [0x0C, 0x0123, CH1_0123] +- [0x0C, 0x0124, CH1_0124] +- [0x0C, 0x0125, CH1_0125] +- [0x0C, 0x0126, CH1_0126] +- [0x0C, 0x0127, CH1_0127] +- [0x0C, 0x0128, CH1_0128] +- [0x0C, 0x0129, CH1_0129] +- [0x0C, 0x012A, CH1_012A] +- [0x0C, 0x012B, CH1_012B] +- [0x0C, 0x012C, CH1_012C] +- [0x0C, 0x012D, CH1_012D] +- [0x0C, 0x012E, CH1_012E] +- [0x0C, 0x012F, CH1_012F] +- [0x0C, 0x0130, CH1_0130] +- [0x0C, 0x0131, CH1_0131] +- [0x0C, 0x0132, CH1_0132] +- [0x0C, 0x0133, CH1_0133] +- [0x0C, 0x0134, CH1_0134] +- [0x0C, 0x0135, CH1_0135] +- [0x0C, 0x0136, CH1_0136] +- [0x0D, 0x0000, CH2_0000] +- [0x0D, 0x0001, CH2_0001] +- [0x0D, 0x0002, CH2_0002] +- [0x0D, 0x0003, CH2_0003] +- [0x0D, 0x0004, CH2_0004] +- [0x0D, 0x0005, CH2_0005] +- [0x0D, 0x0006, CH2_0006] +- [0x0D, 0x0007, CH2_0007] +- [0x0D, 0x0008, CH2_0008] +- [0x0D, 0x0009, CH2_0009] +- [0x0D, 0x000A, CH2_000A] +- [0x0D, 0x000B, CH2_000B] +- [0x0D, 0x000C, CH2_000C] +- [0x0D, 0x000D, CH2_000D] +- [0x0D, 0x000E, CH2_000E] +- [0x0D, 0x000F, CH2_000F] +- [0x0D, 0x0010, CH2_0010] +- [0x0D, 0x0011, CH2_0011] +- [0x0D, 0x0012, CH2_0012] +- [0x0D, 0x0013, CH2_0013] +- [0x0D, 0x0014, CH2_0014] +- [0x0D, 0x0015, CH2_0015] +- [0x0D, 0x0016, CH2_0016] +- [0x0D, 0x0017, CH2_0017] +- [0x0D, 0x0018, CH2_0018] +- [0x0D, 0x0019, CH2_0019] +- [0x0D, 0x001A, CH2_001A] +- [0x0D, 0x001B, CH2_001B] +- [0x0D, 0x001C, CH2_001C] +- [0x0D, 0x001D, CH2_001D] +- [0x0D, 0x001E, CH2_001E] +- [0x0D, 0x001F, CH2_001F] +- [0x0D, 0x0020, CH2_0020] +- [0x0D, 0x0021, CH2_0021] +- [0x0D, 0x0022, CH2_0022] +- [0x0D, 0x0023, CH2_0023] +- [0x0D, 0x0024, CH2_0024] +- [0x0D, 0x0025, CH2_0025] +- [0x0D, 0x0026, CH2_0026] +- [0x0D, 0x0027, CH2_0027] +- [0x0D, 0x0028, CH2_0028] +- [0x0D, 0x0029, CH2_0029] +- [0x0D, 0x002A, CH2_002A] +- [0x0D, 0x002B, CH2_002B] +- [0x0D, 0x002C, CH2_002C] +- [0x0D, 0x002D, CH2_002D] +- [0x0D, 0x002E, CH2_002E] +- [0x0D, 0x002F, CH2_002F] +- [0x0D, 0x0030, CH2_0030] +- [0x0D, 0x0031, CH2_0031] +- [0x0D, 0x0032, CH2_0032] +- [0x0D, 0x0033, CH2_0033] +- [0x0D, 0x0034, CH2_0034] +- [0x0D, 0x0035, CH2_0035] +- [0x0D, 0x0036, CH2_0036] +- [0x0D, 0x0037, CH2_0037] +- [0x0D, 0x0038, CH2_0038] +- [0x0D, 0x0039, CH2_0039] +- [0x0D, 0x003A, CH2_003A] +- [0x0D, 0x003B, CH2_003B] +- [0x0D, 0x003C, CH2_003C] +- [0x0D, 0x003D, CH2_003D] +- [0x0D, 0x003E, CH2_003E] +- [0x0D, 0x003F, CH2_003F] +- [0x0D, 0x0040, CH2_0040] +- [0x0D, 0x0041, CH2_0041] +- [0x0D, 0x0042, CH2_0042] +- [0x0D, 0x0043, CH2_0043] +- [0x0D, 0x0044, CH2_0044] +- [0x0D, 0x0045, CH2_0045] +- [0x0D, 0x0046, CH2_0046] +- [0x0D, 0x0047, CH2_0047] +- [0x0D, 0x0048, CH2_0048] +- [0x0D, 0x0049, CH2_0049] +- [0x0D, 0x004A, CH2_004A] +- [0x0D, 0x004B, CH2_004B] +- [0x0D, 0x004C, CH2_004C] +- [0x0D, 0x004D, CH2_004D] +- [0x0D, 0x004E, CH2_004E] +- [0x0D, 0x004F, CH2_004F] +- [0x0D, 0x0050, CH2_0050] +- [0x0D, 0x0051, CH2_0051] +- [0x0D, 0x0052, CH2_0052] +- [0x0D, 0x0053, CH2_0053] +- [0x0D, 0x0054, CH2_0054] +- [0x0D, 0x0055, CH2_0055] +- [0x0D, 0x0056, CH2_0056] +- [0x0D, 0x0057, CH2_0057] +- [0x0D, 0x0058, CH2_0058] +- [0x0D, 0x0059, CH2_0059] +- [0x0D, 0x005A, CH2_005A] +- [0x0D, 0x005B, CH2_005B] +- [0x0D, 0x005C, CH2_005C] +- [0x0D, 0x005D, CH2_005D] +- [0x0D, 0x005E, CH2_005E] +- [0x0D, 0x005F, CH2_005F] +- [0x0D, 0x0060, CH2_0060] +- [0x0D, 0x0061, CH2_0061] +- [0x0D, 0x0062, CH2_0062] +- [0x0D, 0x0063, CH2_0063] +- [0x0D, 0x0064, CH2_0064] +- [0x0D, 0x0065, CH2_0065] +- [0x0D, 0x0066, CH2_0066] +- [0x0D, 0x0067, CH2_0067] +- [0x0D, 0x0068, CH2_0068] +- [0x0D, 0x0069, CH2_0069] +- [0x0D, 0x006A, CH2_006A] +- [0x0D, 0x006B, CH2_006B] +- [0x0D, 0x006C, CH2_006C] +- [0x0D, 0x006D, CH2_006D] +- [0x0D, 0x006E, CH2_006E] +- [0x0D, 0x006F, CH2_006F] +- [0x0D, 0x0070, CH2_0070] +- [0x0D, 0x0071, CH2_0071] +- [0x0D, 0x0072, CH2_0072] +- [0x0D, 0x0073, CH2_0073] +- [0x0D, 0x0074, CH2_0074] +- [0x0D, 0x0075, CH2_0075] +- [0x0D, 0x0076, CH2_0076] +- [0x0D, 0x0077, CH2_0077] +- [0x0D, 0x0078, CH2_0078] +- [0x0D, 0x0079, CH2_0079] +- [0x0D, 0x007A, CH2_007A] +- [0x0D, 0x007B, CH2_007B] +- [0x0D, 0x007C, CH2_007C] +- [0x0D, 0x007D, CH2_007D] +- [0x0D, 0x007E, CH2_007E] +- [0x0D, 0x007F, CH2_007F] +- [0x0D, 0x0080, CH2_0080] +- [0x0D, 0x0081, CH2_0081] +- [0x0D, 0x0082, CH2_0082] +- [0x0D, 0x0083, CH2_0083] +- [0x0D, 0x0084, CH2_0084] +- [0x0D, 0x0085, CH2_0085] +- [0x0D, 0x0086, CH2_0086] +- [0x0D, 0x0087, CH2_0087] +- [0x0D, 0x0088, CH2_0088] +- [0x0D, 0x0089, CH2_0089] +- [0x0D, 0x008A, CH2_008A] +- [0x0D, 0x008B, CH2_008B] +- [0x0D, 0x008C, CH2_008C] +- [0x0D, 0x008D, CH2_008D] +- [0x0D, 0x008E, CH2_008E] +- [0x0D, 0x008F, CH2_008F] +- [0x0D, 0x0090, CH2_0090] +- [0x0D, 0x0091, CH2_0091] +- [0x0D, 0x0092, CH2_0092] +- [0x0D, 0x0093, CH2_0093] +- [0x0D, 0x0094, CH2_0094] +- [0x0D, 0x0095, CH2_0095] +- [0x0D, 0x0096, CH2_0096] +- [0x0D, 0x0097, CH2_0097] +- [0x0D, 0x0098, CH2_0098] +- [0x0D, 0x0099, CH2_0099] +- [0x0D, 0x009A, CH2_009A] +- [0x0D, 0x009B, CH2_009B] +- [0x0D, 0x009C, CH2_009C] +- [0x0D, 0x009D, CH2_009D] +- [0x0D, 0x009E, CH2_009E] +- [0x0D, 0x009F, CH2_009F] +- [0x0D, 0x00A0, CH2_00A0] +- [0x0D, 0x00A1, CH2_00A1] +- [0x0D, 0x00A2, CH2_00A2] +- [0x0D, 0x00A3, CH2_00A3] +- [0x0D, 0x00A4, CH2_00A4] +- [0x0D, 0x00A5, CH2_00A5] +- [0x0D, 0x00A6, CH2_00A6] +- [0x0D, 0x00A7, CH2_00A7] +- [0x0D, 0x00A8, CH2_00A8] +- [0x0D, 0x00A9, CH2_00A9] +- [0x0D, 0x00AA, CH2_00AA] +- [0x0D, 0x00AB, CH2_00AB] +- [0x0D, 0x00AC, CH2_00AC] +- [0x0D, 0x00AD, CH2_00AD] +- [0x0D, 0x00AE, CH2_00AE] +- [0x0D, 0x00AF, CH2_00AF] +- [0x0D, 0x00B0, CH2_00B0] +- [0x0D, 0x00B1, CH2_00B1] +- [0x0D, 0x00B2, CH2_00B2] +- [0x0D, 0x00B3, CH2_00B3] +- [0x0D, 0x00B4, CH2_00B4] +- [0x0D, 0x00B5, CH2_00B5] +- [0x0D, 0x00B6, CH2_00B6] +- [0x0D, 0x00B7, CH2_00B7] +- [0x0D, 0x00B8, CH2_00B8] +- [0x0D, 0x00B9, CH2_00B9] +- [0x0D, 0x00BA, CH2_00BA] +- [0x0D, 0x00BB, CH2_00BB] +- [0x0D, 0x00BC, CH2_00BC] +- [0x0D, 0x00BD, CH2_00BD] +- [0x0D, 0x00BE, CH2_00BE] +- [0x0D, 0x00BF, CH2_00BF] +- [0x0D, 0x00C0, CH2_00C0] +- [0x0D, 0x00C1, CH2_00C1] +- [0x0D, 0x00C2, CH2_00C2] +- [0x0D, 0x00C3, CH2_00C3] +- [0x0D, 0x00C4, CH2_00C4] +- [0x0D, 0x00C5, CH2_00C5] +- [0x0D, 0x00C6, CH2_00C6] +- [0x0D, 0x00C7, CH2_00C7] +- [0x0D, 0x00C8, CH2_00C8] +- [0x0D, 0x00C9, CH2_00C9] +- [0x0D, 0x00CA, CH2_00CA] +- [0x0D, 0x00CB, CH2_00CB] +- [0x0D, 0x00CC, CH2_00CC] +- [0x0D, 0x00CD, CH2_00CD] +- [0x0D, 0x00CE, CH2_00CE] +- [0x0D, 0x00CF, CH2_00CF] +- [0x0D, 0x00D0, CH2_00D0] +- [0x0D, 0x00D1, CH2_00D1] +- [0x0D, 0x00D2, CH2_00D2] +- [0x0D, 0x00D3, CH2_00D3] +- [0x0D, 0x00D4, CH2_00D4] +- [0x0D, 0x00D5, CH2_00D5] +- [0x0D, 0x00D6, CH2_00D6] +- [0x0D, 0x00D7, CH2_00D7] +- [0x0D, 0x00D8, CH2_00D8] +- [0x0D, 0x00D9, CH2_00D9] +- [0x0D, 0x00DA, CH2_00DA] +- [0x0D, 0x00DB, CH2_00DB] +- [0x0D, 0x00DC, CH2_00DC] +- [0x0D, 0x00DD, CH2_00DD] +- [0x0D, 0x00DE, CH2_00DE] +- [0x0D, 0x00DF, CH2_00DF] +- [0x0D, 0x00E0, CH2_00E0] +- [0x0D, 0x00E1, CH2_00E1] +- [0x0D, 0x00E2, CH2_00E2] +- [0x0D, 0x00E3, CH2_00E3] +- [0x0D, 0x00E4, CH2_00E4] +- [0x0D, 0x00E5, CH2_00E5] +- [0x0D, 0x00E6, CH2_00E6] +- [0x0D, 0x00E7, CH2_00E7] +- [0x0D, 0x00E8, CH2_00E8] +- [0x0D, 0x00E9, CH2_00E9] +- [0x0D, 0x00EA, CH2_00EA] +- [0x0D, 0x00EB, CH2_00EB] +- [0x0D, 0x00EC, CH2_00EC] +- [0x0D, 0x00ED, CH2_00ED] +- [0x0D, 0x00EE, CH2_00EE] +- [0x0D, 0x00EF, CH2_00EF] +- [0x0D, 0x00F0, CH2_00F0] +- [0x0D, 0x00F1, CH2_00F1] +- [0x0D, 0x00F2, CH2_00F2] +- [0x0D, 0x00F3, CH2_00F3] +- [0x0D, 0x00F4, CH2_00F4] +- [0x0E, 0x0000, CH3_0000] +- [0x0E, 0x0001, CH3_0001] +- [0x0E, 0x0002, CH3_0002] +- [0x0E, 0x0003, CH3_0003] +- [0x0E, 0x0004, CH3_0004] +- [0x0E, 0x0005, CH3_0005] +- [0x0E, 0x0006, CH3_0006] +- [0x0E, 0x0007, CH3_0007] +- [0x0E, 0x0008, CH3_0008] +- [0x0E, 0x0009, CH3_0009] +- [0x0E, 0x000A, CH3_000A] +- [0x0E, 0x000B, CH3_000B] +- [0x0E, 0x000C, CH3_000C] +- [0x0E, 0x000D, CH3_000D] +- [0x0E, 0x000E, CH3_000E] +- [0x0E, 0x000F, CH3_000F] +- [0x0E, 0x0010, CH3_0010] +- [0x0E, 0x0011, CH3_0011] +- [0x0E, 0x0012, CH3_0012] +- [0x0E, 0x0013, CH3_0013] +- [0x0E, 0x0014, CH3_0014] +- [0x0E, 0x0015, CH3_0015] +- [0x0E, 0x0016, CH3_0016] +- [0x0E, 0x0017, CH3_0017] +- [0x0E, 0x0018, CH3_0018] +- [0x0E, 0x0019, CH3_0019] +- [0x0E, 0x001A, CH3_001A] +- [0x0E, 0x001B, CH3_001B] +- [0x0E, 0x001C, CH3_001C] +- [0x0E, 0x001D, CH3_001D] +- [0x0E, 0x001E, CH3_001E] +- [0x0E, 0x001F, CH3_001F] +- [0x0E, 0x0020, CH3_0020] +- [0x0E, 0x0021, CH3_0021] +- [0x0E, 0x0022, CH3_0022] +- [0x0E, 0x0023, CH3_0023] +- [0x0E, 0x0024, CH3_0024] +- [0x0E, 0x0025, CH3_0025] +- [0x0E, 0x0026, CH3_0026] +- [0x0E, 0x0027, CH3_0027] +- [0x0E, 0x0028, CH3_0028] +- [0x0E, 0x0029, CH3_0029] +- [0x0E, 0x002A, CH3_002A] +- [0x0E, 0x002B, CH3_002B] +- [0x0E, 0x002C, CH3_002C] +- [0x0E, 0x002D, CH3_002D] +- [0x0E, 0x002E, CH3_002E] +- [0x0E, 0x002F, CH3_002F] +- [0x0E, 0x0030, CH3_0030] +- [0x0E, 0x0031, CH3_0031] +- [0x0E, 0x0032, CH3_0032] +- [0x0E, 0x0033, CH3_0033] +- [0x0E, 0x0034, CH3_0034] +- [0x0E, 0x0035, CH3_0035] +- [0x0E, 0x0036, CH3_0036] +- [0x0E, 0x0037, CH3_0037] +- [0x0E, 0x0038, CH3_0038] +- [0x0E, 0x0039, CH3_0039] +- [0x0E, 0x003A, CH3_003A] +- [0x0E, 0x003B, CH3_003B] +- [0x0E, 0x003C, CH3_003C] +- [0x0E, 0x003D, CH3_003D] +- [0x0E, 0x003E, CH3_003E] +- [0x0E, 0x003F, CH3_003F] +- [0x0E, 0x0040, CH3_0040] +- [0x0E, 0x0041, CH3_0041] +- [0x0E, 0x0042, CH3_0042] +- [0x0E, 0x0043, CH3_0043] +- [0x0E, 0x0044, CH3_0044] +- [0x0E, 0x0045, CH3_0045] +- [0x0E, 0x0046, CH3_0046] +- [0x0E, 0x0047, CH3_0047] +- [0x0E, 0x0048, CH3_0048] +- [0x0E, 0x0049, CH3_0049] +- [0x0E, 0x004A, CH3_004A] +- [0x0E, 0x004B, CH3_004B] +- [0x0E, 0x004C, CH3_004C] +- [0x0E, 0x004D, CH3_004D] +- [0x0E, 0x004E, CH3_004E] +- [0x0E, 0x004F, CH3_004F] +- [0x0E, 0x0050, CH3_0050] +- [0x0E, 0x0051, CH3_0051] +- [0x0E, 0x0052, CH3_0052] +- [0x0E, 0x0053, CH3_0053] +- [0x0E, 0x0054, CH3_0054] +- [0x0E, 0x0055, CH3_0055] +- [0x0E, 0x0056, CH3_0056] +- [0x0E, 0x0057, CH3_0057] +- [0x0E, 0x0058, CH3_0058] +- [0x0E, 0x0059, CH3_0059] +- [0x0E, 0x005A, CH3_005A] +- [0x0E, 0x005B, CH3_005B] +- [0x0E, 0x005C, CH3_005C] +- [0x0E, 0x005D, CH3_005D] +- [0x0E, 0x005E, CH3_005E] +- [0x0E, 0x005F, CH3_005F] +- [0x0E, 0x0060, CH3_0060] +- [0x0E, 0x0061, CH3_0061] +- [0x0E, 0x0062, CH3_0062] +- [0x0E, 0x0063, CH3_0063] +- [0x0E, 0x0064, CH3_0064] +- [0x0E, 0x0065, CH3_0065] +- [0x0E, 0x0066, CH3_0066] +- [0x0E, 0x0067, CH3_0067] +- [0x0E, 0x0068, CH3_0068] +- [0x0E, 0x0069, CH3_0069] +- [0x0E, 0x006A, CH3_006A] +- [0x0E, 0x006B, CH3_006B] +- [0x0E, 0x006C, CH3_006C] +- [0x0E, 0x006D, CH3_006D] +- [0x0E, 0x006E, CH3_006E] +- [0x0E, 0x006F, CH3_006F] +- [0x0E, 0x0070, CH3_0070] +- [0x0E, 0x0071, CH3_0071] +- [0x0E, 0x0072, CH3_0072] +- [0x0E, 0x0073, CH3_0073] +- [0x0E, 0x0074, CH3_0074] +- [0x0E, 0x0075, CH3_0075] +- [0x0E, 0x0076, CH3_0076] +- [0x0E, 0x0077, CH3_0077] +- [0x0E, 0x0078, CH3_0078] +- [0x0E, 0x0079, CH3_0079] +- [0x0E, 0x007A, CH3_007A] +- [0x0E, 0x007B, CH3_007B] +- [0x0E, 0x007C, CH3_007C] +- [0x0E, 0x007D, CH3_007D] +- [0x0E, 0x007E, CH3_007E] +- [0x0E, 0x007F, CH3_007F] +- [0x0E, 0x0080, CH3_0080] +- [0x0E, 0x0081, CH3_0081] +- [0x0E, 0x0082, CH3_0082] +- [0x0E, 0x0083, CH3_0083] +- [0x0E, 0x0084, CH3_0084] +- [0x0E, 0x0085, CH3_0085] +- [0x0E, 0x0086, CH3_0086] +- [0x0E, 0x0087, CH3_0087] +- [0x0E, 0x0088, CH3_0088] +- [0x0E, 0x0089, CH3_0089] +- [0x0E, 0x008A, CH3_008A] +- [0x0E, 0x008B, CH3_008B] +- [0x0E, 0x008C, CH3_008C] +- [0x0E, 0x008D, CH3_008D] +- [0x0E, 0x008E, CH3_008E] +- [0x0E, 0x008F, CH3_008F] +- [0x0E, 0x0090, CH3_0090] +- [0x0E, 0x0091, CH3_0091] +- [0x0E, 0x0092, CH3_0092] +- [0x0E, 0x0093, CH3_0093] +- [0x0E, 0x0094, CH3_0094] +- [0x0E, 0x0095, CH3_0095] +- [0x0E, 0x0096, CH3_0096] +- [0x0E, 0x0097, CH3_0097] +- [0x0E, 0x0098, CH3_0098] +- [0x0E, 0x0099, CH3_0099] +- [0x0E, 0x009A, CH3_009A] +- [0x0E, 0x009B, CH3_009B] +- [0x0E, 0x009C, CH3_009C] +- [0x0E, 0x009D, CH3_009D] +- [0x0E, 0x009E, CH3_009E] +- [0x0E, 0x009F, CH3_009F] +- [0x0E, 0x00A0, CH3_00A0] +- [0x0E, 0x00A1, CH3_00A1] +- [0x0E, 0x00A2, CH3_00A2] +- [0x0E, 0x00A3, CH3_00A3] +- [0x0E, 0x00A4, CH3_00A4] +- [0x0E, 0x00A5, CH3_00A5] +- [0x0E, 0x00A6, CH3_00A6] +- [0x0E, 0x00A7, CH3_00A7] +- [0x0E, 0x00A8, CH3_00A8] +- [0x0E, 0x00A9, CH3_00A9] +- [0x0E, 0x00AA, CH3_00AA] +- [0x0E, 0x00AB, CH3_00AB] +- [0x0E, 0x00AC, CH3_00AC] +- [0x0E, 0x00AD, CH3_00AD] +- [0x0E, 0x00AE, CH3_00AE] +- [0x0E, 0x00AF, CH3_00AF] +- [0x0E, 0x00B0, CH3_00B0] +- [0x0E, 0x00B1, CH3_00B1] +- [0x0E, 0x00B2, CH3_00B2] +- [0x0E, 0x00B3, CH3_00B3] +- [0x0E, 0x00B4, CH3_00B4] +- [0x0E, 0x00B5, CH3_00B5] +- [0x0E, 0x00B6, CH3_00B6] +- [0x0E, 0x00B7, CH3_00B7] +- [0x0E, 0x00B8, CH3_00B8] +- [0x0E, 0x00B9, CH3_00B9] +- [0x0E, 0x00BA, CH3_00BA] +- [0x0E, 0x00BB, CH3_00BB] +- [0x0E, 0x00BC, CH3_00BC] +- [0x0E, 0x00BD, CH3_00BD] +- [0x0E, 0x00BE, CH3_00BE] +- [0x0E, 0x00BF, CH3_00BF] +- [0x0E, 0x00C0, CH3_00C0] +- [0x0E, 0x00C1, CH3_00C1] +- [0x0E, 0x00C2, CH3_00C2] +- [0x0E, 0x00C3, CH3_00C3] +- [0x0E, 0x00C4, CH3_00C4] +- [0x0E, 0x00C5, CH3_00C5] +- [0x0E, 0x00C6, CH3_00C6] +- [0x0E, 0x00C7, CH3_00C7] +- [0x0E, 0x00C8, CH3_00C8] +- [0x0E, 0x00C9, CH3_00C9] +- [0x0E, 0x00CA, CH3_00CA] +- [0x0E, 0x00CB, CH3_00CB] +- [0x0E, 0x00CC, CH3_00CC] +- [0x0E, 0x00CD, CH3_00CD] +- [0x0E, 0x00CE, CH3_00CE] +- [0x0E, 0x00CF, CH3_00CF] +- [0x0E, 0x00D0, CH3_00D0] +- [0x0E, 0x00D1, CH3_00D1] +- [0x0E, 0x00D2, CH3_00D2] +- [0x0E, 0x00D3, CH3_00D3] +- [0x0E, 0x00D4, CH3_00D4] +- [0x0E, 0x00D5, CH3_00D5] +- [0x0E, 0x00D6, CH3_00D6] +- [0x0E, 0x00D7, CH3_00D7] +- [0x0E, 0x00D8, CH3_00D8] +- [0x0E, 0x00D9, CH3_00D9] +- [0x0E, 0x00DA, CH3_00DA] +- [0x0E, 0x00DB, CH3_00DB] +- [0x0E, 0x00DC, CH3_00DC] +- [0x0E, 0x00DD, CH3_00DD] +- [0x0E, 0x00DE, CH3_00DE] +- [0x0E, 0x00DF, CH3_00DF] +- [0x0E, 0x00E0, CH3_00E0] +- [0x0E, 0x00E1, CH3_00E1] +- [0x0E, 0x00E2, CH3_00E2] +- [0x0E, 0x00E3, CH3_00E3] +- [0x0E, 0x00E4, CH3_00E4] +- [0x0E, 0x00E5, CH3_00E5] +- [0x0E, 0x00E6, CH3_00E6] +- [0x0E, 0x00E7, CH3_00E7] +- [0x0E, 0x00E8, CH3_00E8] +- [0x0E, 0x00E9, CH3_00E9] +- [0x0E, 0x00EA, CH3_00EA] +- [0x0E, 0x00EB, CH3_00EB] +- [0x0E, 0x00EC, CH3_00EC] +- [0x0E, 0x00ED, CH3_00ED] +- [0x0E, 0x00EE, CH3_00EE] +- [0x0E, 0x00EF, CH3_00EF] +- [0x0E, 0x00F0, CH3_00F0] +- [0x0E, 0x00F1, CH3_00F1] +- [0x0E, 0x00F2, CH3_00F2] +- [0x0E, 0x00F3, CH3_00F3] +- [0x0E, 0x00F4, CH3_00F4] +- [0x0E, 0x00F5, CH3_00F5] +- [0x0E, 0x00F6, CH3_00F6] +- [0x0E, 0x00F7, CH3_00F7] +- [0x0E, 0x00F8, CH3_00F8] +- [0x0E, 0x00F9, CH3_00F9] +- [0x0E, 0x00FA, CH3_00FA] +- [0x0E, 0x00FB, CH3_00FB] +- [0x0E, 0x00FC, CH3_00FC] +- [0x0E, 0x00FD, CH3_00FD] +- [0x0E, 0x00FE, CH3_00FE] +- [0x0E, 0x00FF, CH3_00FF] +- [0x0E, 0x0100, CH3_0100] +- [0x0E, 0x0101, CH3_0101] +- [0x0E, 0x0102, CH3_0102] +- [0x0E, 0x0103, CH3_0103] +- [0x0F, 0x0000, CH4_0000] +- [0x0F, 0x0001, CH4_0001] +- [0x0F, 0x0002, CH4_0002] +- [0x0F, 0x0003, CH4_0003] +- [0x0F, 0x0004, CH4_0004] +- [0x0F, 0x0005, CH4_0005] +- [0x0F, 0x0006, CH4_0006] +- [0x0F, 0x0007, CH4_0007] +- [0x0F, 0x0008, CH4_0008] +- [0x0F, 0x0009, CH4_0009] +- [0x0F, 0x000A, CH4_000A] +- [0x0F, 0x000B, CH4_000B] +- [0x0F, 0x000C, CH4_000C] +- [0x0F, 0x000D, CH4_000D] +- [0x0F, 0x000E, CH4_000E] +- [0x0F, 0x000F, CH4_000F] +- [0x0F, 0x0010, CH4_0010] +- [0x0F, 0x0011, CH4_0011] +- [0x0F, 0x0012, CH4_0012] +- [0x0F, 0x0013, CH4_0013] +- [0x0F, 0x0014, CH4_0014] +- [0x0F, 0x0015, CH4_0015] +- [0x0F, 0x0016, CH4_0016] +- [0x0F, 0x0017, CH4_0017] +- [0x0F, 0x0018, CH4_0018] +- [0x0F, 0x0019, CH4_0019] +- [0x0F, 0x001A, CH4_001A] +- [0x0F, 0x001B, CH4_001B] +- [0x0F, 0x001C, CH4_001C] +- [0x0F, 0x001D, CH4_001D] +- [0x0F, 0x001E, CH4_001E] +- [0x0F, 0x001F, CH4_001F] +- [0x0F, 0x0020, CH4_0020] +- [0x0F, 0x0021, CH4_0021] +- [0x0F, 0x0022, CH4_0022] +- [0x0F, 0x0023, CH4_0023] +- [0x0F, 0x0024, CH4_0024] +- [0x0F, 0x0025, CH4_0025] +- [0x0F, 0x0026, CH4_0026] +- [0x0F, 0x0027, CH4_0027] +- [0x0F, 0x0028, CH4_0028] +- [0x0F, 0x0029, CH4_0029] +- [0x0F, 0x002A, CH4_002A] +- [0x0F, 0x002B, CH4_002B] +- [0x0F, 0x002C, CH4_002C] +- [0x0F, 0x002D, CH4_002D] +- [0x0F, 0x002E, CH4_002E] +- [0x0F, 0x002F, CH4_002F] +- [0x0F, 0x0030, CH4_0030] +- [0x0F, 0x0031, CH4_0031] +- [0x0F, 0x0032, CH4_0032] +- [0x0F, 0x0033, CH4_0033] +- [0x0F, 0x0034, CH4_0034] +- [0x0F, 0x0035, CH4_0035] +- [0x0F, 0x0036, CH4_0036] +- [0x0F, 0x0037, CH4_0037] +- [0x0F, 0x0038, CH4_0038] +- [0x0F, 0x0039, CH4_0039] +- [0x0F, 0x003A, CH4_003A] +- [0x0F, 0x003B, CH4_003B] +- [0x0F, 0x003C, CH4_003C] +- [0x0F, 0x003D, CH4_003D] +- [0x0F, 0x003E, CH4_003E] +- [0x0F, 0x003F, CH4_003F] +- [0x0F, 0x0040, CH4_0040] +- [0x0F, 0x0041, CH4_0041] +- [0x0F, 0x0042, CH4_0042] +- [0x0F, 0x0043, CH4_0043] +- [0x0F, 0x0044, CH4_0044] +- [0x0F, 0x0045, CH4_0045] +- [0x0F, 0x0046, CH4_0046] +- [0x0F, 0x0047, CH4_0047] +- [0x0F, 0x0048, CH4_0048] +- [0x0F, 0x0049, CH4_0049] +- [0x0F, 0x004A, CH4_004A] +- [0x0F, 0x004B, CH4_004B] +- [0x0F, 0x004C, CH4_004C] +- [0x0F, 0x004D, CH4_004D] +- [0x0F, 0x004E, CH4_004E] +- [0x0F, 0x004F, CH4_004F] +- [0x0F, 0x0050, CH4_0050] +- [0x0F, 0x0051, CH4_0051] +- [0x0F, 0x0052, CH4_0052] +- [0x0F, 0x0053, CH4_0053] +- [0x0F, 0x0054, CH4_0054] +- [0x0F, 0x0055, CH4_0055] +- [0x0F, 0x0056, CH4_0056] +- [0x0F, 0x0057, CH4_0057] +- [0x0F, 0x0058, CH4_0058] +- [0x0F, 0x0059, CH4_0059] +- [0x0F, 0x005A, CH4_005A] +- [0x0F, 0x005B, CH4_005B] +- [0x0F, 0x005C, CH4_005C] +- [0x0F, 0x005D, CH4_005D] +- [0x0F, 0x005E, CH4_005E] +- [0x0F, 0x005F, CH4_005F] +- [0x0F, 0x0060, CH4_0060] +- [0x0F, 0x0061, CH4_0061] +- [0x0F, 0x0062, CH4_0062] +- [0x0F, 0x0063, CH4_0063] +- [0x0F, 0x0064, CH4_0064] +- [0x0F, 0x0065, CH4_0065] +- [0x0F, 0x0066, CH4_0066] +- [0x0F, 0x0067, CH4_0067] +- [0x0F, 0x0068, CH4_0068] +- [0x0F, 0x0069, CH4_0069] +- [0x0F, 0x006A, CH4_006A] +- [0x0F, 0x006B, CH4_006B] +- [0x0F, 0x006C, CH4_006C] +- [0x0F, 0x006D, CH4_006D] +- [0x0F, 0x006E, CH4_006E] +- [0x0F, 0x006F, CH4_006F] +- [0x0F, 0x0070, CH4_0070] +- [0x0F, 0x0071, CH4_0071] +- [0x0F, 0x0072, CH4_0072] +- [0x0F, 0x0073, CH4_0073] +- [0x0F, 0x0074, CH4_0074] +- [0x0F, 0x0075, CH4_0075] +- [0x10, 0x0000, CH5_0000] +- [0x10, 0x0001, CH5_0001] +- [0x10, 0x0002, CH5_0002] +- [0x10, 0x0003, CH5_0003] +- [0x10, 0x0004, CH5_0004] +- [0x10, 0x0005, CH5_0005] +- [0x10, 0x0006, CH5_0006] +- [0x10, 0x0007, CH5_0007] +- [0x10, 0x0008, CH5_0008] +- [0x10, 0x0009, CH5_0009] +- [0x10, 0x000A, CH5_000A] +- [0x10, 0x000B, CH5_000B] +- [0x10, 0x000C, CH5_000C] +- [0x10, 0x000D, CH5_000D] +- [0x10, 0x000E, CH5_000E] +- [0x10, 0x000F, CH5_000F] +- [0x10, 0x0010, CH5_0010] +- [0x10, 0x0011, CH5_0011] +- [0x10, 0x0012, CH5_0012] +- [0x10, 0x0013, CH5_0013] +- [0x10, 0x0014, CH5_0014] +- [0x10, 0x0015, CH5_0015] +- [0x10, 0x0016, CH5_0016] +- [0x10, 0x0017, CH5_0017] +- [0x10, 0x0018, CH5_0018] +- [0x10, 0x0019, CH5_0019] +- [0x10, 0x001A, CH5_001A] +- [0x10, 0x001B, CH5_001B] +- [0x10, 0x001C, CH5_001C] +- [0x10, 0x001D, CH5_001D] +- [0x10, 0x001E, CH5_001E] +- [0x10, 0x001F, CH5_001F] +- [0x10, 0x0020, CH5_0020] +- [0x10, 0x0021, CH5_0021] +- [0x10, 0x0022, CH5_0022] +- [0x10, 0x0023, CH5_0023] +- [0x10, 0x0024, CH5_0024] +- [0x10, 0x0025, CH5_0025] +- [0x10, 0x0026, CH5_0026] +- [0x10, 0x0027, CH5_0027] +- [0x10, 0x0028, CH5_0028] +- [0x10, 0x0029, CH5_0029] +- [0x10, 0x002A, CH5_002A] +- [0x10, 0x002B, CH5_002B] +- [0x10, 0x002C, CH5_002C] +- [0x10, 0x002D, CH5_002D] +- [0x10, 0x002E, CH5_002E] +- [0x10, 0x002F, CH5_002F] +- [0x10, 0x0030, CH5_0030] +- [0x10, 0x0031, CH5_0031] +- [0x10, 0x0032, CH5_0032] +- [0x10, 0x0033, CH5_0033] +- [0x10, 0x0034, CH5_0034] +- [0x10, 0x0035, CH5_0035] +- [0x10, 0x0036, CH5_0036] +- [0x10, 0x0037, CH5_0037] +- [0x10, 0x0038, CH5_0038] +- [0x10, 0x0039, CH5_0039] +- [0x10, 0x003A, CH5_003A] +- [0x10, 0x003B, CH5_003B] +- [0x10, 0x003C, CH5_003C] +- [0x10, 0x003D, CH5_003D] +- [0x10, 0x003E, CH5_003E] +- [0x10, 0x003F, CH5_003F] +- [0x10, 0x0040, CH5_0040] +- [0x10, 0x0041, CH5_0041] +- [0x10, 0x0042, CH5_0042] +- [0x10, 0x0043, CH5_0043] +- [0x10, 0x0044, CH5_0044] +- [0x10, 0x0045, CH5_0045] +- [0x10, 0x0046, CH5_0046] +- [0x10, 0x0047, CH5_0047] +- [0x10, 0x0048, CH5_0048] +- [0x10, 0x0049, CH5_0049] +- [0x10, 0x004A, CH5_004A] +- [0x10, 0x004B, CH5_004B] +- [0x10, 0x004C, CH5_004C] +- [0x10, 0x004D, CH5_004D] +- [0x10, 0x004E, CH5_004E] +- [0x10, 0x004F, CH5_004F] +- [0x10, 0x0050, CH5_0050] +- [0x10, 0x0051, CH5_0051] +- [0x10, 0x0052, CH5_0052] +- [0x10, 0x0053, CH5_0053] +- [0x10, 0x0054, CH5_0054] +- [0x10, 0x0055, CH5_0055] +- [0x10, 0x0056, CH5_0056] +- [0x10, 0x0057, CH5_0057] +- [0x10, 0x0058, CH5_0058] +- [0x10, 0x0059, CH5_0059] +- [0x10, 0x005A, CH5_005A] +- [0x10, 0x005B, CH5_005B] +- [0x10, 0x005C, CH5_005C] +- [0x10, 0x005D, CH5_005D] +- [0x10, 0x005E, CH5_005E] +- [0x10, 0x005F, CH5_005F] +- [0x10, 0x0060, CH5_0060] +- [0x10, 0x0061, CH5_0061] +- [0x10, 0x0062, CH5_0062] +- [0x10, 0x0063, CH5_0063] +- [0x10, 0x0064, CH5_0064] +- [0x10, 0x0065, CH5_0065] +- [0x10, 0x0066, CH5_0066] +- [0x10, 0x0067, CH5_0067] +- [0x10, 0x0068, CH5_0068] +- [0x10, 0x0069, CH5_0069] +- [0x10, 0x006A, CH5_006A] +- [0x10, 0x006B, CH5_006B] +- [0x10, 0x006C, CH5_006C] +- [0x10, 0x006D, CH5_006D] +- [0x10, 0x006E, CH5_006E] +- [0x10, 0x006F, CH5_006F] +- [0x10, 0x0070, CH5_0070] +- [0x10, 0x0071, CH5_0071] +- [0x10, 0x0072, CH5_0072] +- [0x10, 0x0073, CH5_0073] +- [0x10, 0x0074, CH5_0074] +- [0x10, 0x0075, CH5_0075] +- [0x10, 0x0076, CH5_0076] +- [0x10, 0x0077, CH5_0077] +- [0x10, 0x0078, CH5_0078] +- [0x10, 0x0079, CH5_0079] +- [0x10, 0x007A, CH5_007A] +- [0x10, 0x007B, CH5_007B] +- [0x10, 0x007C, CH5_007C] +- [0x10, 0x007D, CH5_007D] +- [0x10, 0x007E, CH5_007E] +- [0x10, 0x007F, CH5_007F] +- [0x10, 0x0080, CH5_0080] +- [0x10, 0x0081, CH5_0081] +- [0x10, 0x0082, CH5_0082] +- [0x10, 0x0083, CH5_0083] +- [0x10, 0x0084, CH5_0084] +- [0x10, 0x0085, CH5_0085] +- [0x10, 0x0086, CH5_0086] +- [0x10, 0x0087, CH5_0087] +- [0x10, 0x0088, CH5_0088] +- [0x10, 0x0089, CH5_0089] +- [0x10, 0x008A, CH5_008A] +- [0x10, 0x008B, CH5_008B] +- [0x10, 0x008C, CH5_008C] +- [0x10, 0x008D, CH5_008D] +- [0x10, 0x008E, CH5_008E] +- [0x10, 0x008F, CH5_008F] +- [0x10, 0x0090, CH5_0090] +- [0x10, 0x0091, CH5_0091] +- [0x10, 0x0092, CH5_0092] +- [0x10, 0x0093, CH5_0093] +- [0x10, 0x0094, CH5_0094] +- [0x10, 0x0095, CH5_0095] +- [0x10, 0x0096, CH5_0096] +- [0x10, 0x0097, CH5_0097] +- [0x10, 0x0098, CH5_0098] +- [0x10, 0x0099, CH5_0099] +- [0x10, 0x009A, CH5_009A] +- [0x10, 0x009B, CH5_009B] +- [0x10, 0x009C, CH5_009C] +- [0x10, 0x009D, CH5_009D] +- [0x10, 0x009E, CH5_009E] +- [0x10, 0x009F, CH5_009F] +- [0x10, 0x00A0, CH5_00A0] +- [0x10, 0x00A1, CH5_00A1] +- [0x10, 0x00A2, CH5_00A2] +- [0x10, 0x00A3, CH5_00A3] +- [0x10, 0x00A4, CH5_00A4] +- [0x10, 0x00A5, CH5_00A5] +- [0x10, 0x00A6, CH5_00A6] +- [0x10, 0x00A7, CH5_00A7] +- [0x10, 0x00A8, CH5_00A8] +- [0x10, 0x00A9, CH5_00A9] +- [0x10, 0x00AA, CH5_00AA] +- [0x10, 0x00AB, CH5_00AB] +- [0x10, 0x00AC, CH5_00AC] +- [0x10, 0x00AD, CH5_00AD] +- [0x10, 0x00AE, CH5_00AE] +- [0x10, 0x00AF, CH5_00AF] +- [0x10, 0x00B0, CH5_00B0] +- [0x10, 0x00B1, CH5_00B1] +- [0x10, 0x00B2, CH5_00B2] +- [0x10, 0x00B3, CH5_00B3] +- [0x10, 0x00B4, CH5_00B4] +- [0x10, 0x00B5, CH5_00B5] +- [0x10, 0x00B6, CH5_00B6] +- [0x10, 0x00B7, CH5_00B7] +- [0x10, 0x00B8, CH5_00B8] +- [0x10, 0x00B9, CH5_00B9] +- [0x10, 0x00BA, CH5_00BA] +- [0x10, 0x00BB, CH5_00BB] +- [0x10, 0x00BC, CH5_00BC] +- [0x10, 0x00BD, CH5_00BD] +- [0x10, 0x00BE, CH5_00BE] +- [0x10, 0x00BF, CH5_00BF] +- [0x10, 0x00C0, CH5_00C0] +- [0x10, 0x00C1, CH5_00C1] +- [0x10, 0x00C2, CH5_00C2] +- [0x10, 0x00C3, CH5_00C3] +- [0x10, 0x00C4, CH5_00C4] +- [0x10, 0x00C5, CH5_00C5] +- [0x10, 0x00C6, CH5_00C6] +- [0x10, 0x00C7, CH5_00C7] +- [0x10, 0x00C8, CH5_00C8] +- [0x10, 0x00C9, CH5_00C9] +- [0x10, 0x00CA, CH5_00CA] +- [0x10, 0x00CB, CH5_00CB] +- [0x10, 0x00CC, CH5_00CC] +- [0x10, 0x00CD, CH5_00CD] +- [0x10, 0x00CE, CH5_00CE] +- [0x10, 0x00CF, CH5_00CF] +- [0x10, 0x00D0, CH5_00D0] +- [0x10, 0x00D1, CH5_00D1] +- [0x10, 0x00D2, CH5_00D2] +- [0x10, 0x00D3, CH5_00D3] +- [0x10, 0x00D4, CH5_00D4] +- [0x10, 0x00D5, CH5_00D5] +- [0x10, 0x00D6, CH5_00D6] +- [0x10, 0x00D7, CH5_00D7] +- [0x10, 0x00D8, CH5_00D8] +- [0x10, 0x00D9, CH5_00D9] +- [0x10, 0x00DA, CH5_00DA] +- [0x10, 0x00DB, CH5_00DB] +- [0x10, 0x00DC, CH5_00DC] +- [0x10, 0x00DD, CH5_00DD] +- [0x10, 0x00DE, CH5_00DE] +- [0x10, 0x00DF, CH5_00DF] +- [0x10, 0x00E0, CH5_00E0] +- [0x10, 0x00E1, CH5_00E1] +- [0x10, 0x00E2, CH5_00E2] +- [0x10, 0x00E3, CH5_00E3] +- [0x10, 0x00E4, CH5_00E4] +- [0x10, 0x00E5, CH5_00E5] +- [0x10, 0x00E6, CH5_00E6] +- [0x10, 0x00E7, CH5_00E7] +- [0x10, 0x00E8, CH5_00E8] +- [0x10, 0x00E9, CH5_00E9] +- [0x10, 0x00EA, CH5_00EA] +- [0x10, 0x00EB, CH5_00EB] +- [0x10, 0x00EC, CH5_00EC] +- [0x10, 0x00ED, CH5_00ED] +- [0x10, 0x00EE, CH5_00EE] +- [0x10, 0x00EF, CH5_00EF] +- [0x10, 0x00F0, CH5_00F0] +- [0x10, 0x00F1, CH5_00F1] +- [0x10, 0x00F2, CH5_00F2] +- [0x10, 0x00F3, CH5_00F3] +- [0x10, 0x00F4, CH5_00F4] +- [0x10, 0x00F5, CH5_00F5] +- [0x10, 0x00F6, CH5_00F6] +- [0x10, 0x00F7, CH5_00F7] +- [0x10, 0x00F8, CH5_00F8] +- [0x10, 0x00F9, CH5_00F9] +- [0x10, 0x00FA, CH5_00FA] +- [0x10, 0x00FB, CH5_00FB] +- [0x10, 0x00FC, CH5_00FC] +- [0x10, 0x00FD, CH5_00FD] +- [0x10, 0x00FE, CH5_00FE] +- [0x10, 0x00FF, CH5_00FF] +- [0x10, 0x0100, CH5_0100] +- [0x10, 0x0101, CH5_0101] +- [0x10, 0x0102, CH5_0102] +- [0x10, 0x0103, CH5_0103] +- [0x10, 0x0104, CH5_0104] +- [0x10, 0x0105, CH5_0105] +- [0x10, 0x0106, CH5_0106] +- [0x10, 0x0107, CH5_0107] +- [0x10, 0x0108, CH5_0108] +- [0x10, 0x0109, CH5_0109] +- [0x10, 0x010A, CH5_010A] +- [0x10, 0x010B, CH5_010B] +- [0x10, 0x010C, CH5_010C] +- [0x10, 0x010D, CH5_010D] +- [0x10, 0x010E, CH5_010E] +- [0x10, 0x010F, CH5_010F] +- [0x10, 0x0110, CH5_0110] +- [0x10, 0x0111, CH5_0111] +- [0x10, 0x0112, CH5_0112] +- [0x10, 0x0113, CH5_0113] +- [0x10, 0x0114, CH5_0114] +- [0x10, 0x0115, CH5_0115] +- [0x10, 0x0116, CH5_0116] +- [0x10, 0x0117, CH5_0117] +- [0x11, 0x0000, CH6_0000] +- [0x11, 0x0001, CH6_0001] +- [0x11, 0x0002, CH6_0002] +- [0x11, 0x0003, CH6_0003] +- [0x11, 0x0004, CH6_0004] +- [0x11, 0x0005, CH6_0005] +- [0x11, 0x0006, CH6_0006] +- [0x11, 0x0007, CH6_0007] +- [0x11, 0x0008, CH6_0008] +- [0x11, 0x0009, CH6_0009] +- [0x11, 0x000A, CH6_000A] +- [0x11, 0x000B, CH6_000B] +- [0x11, 0x000C, CH6_000C] +- [0x11, 0x000D, CH6_000D] +- [0x11, 0x000E, CH6_000E] +- [0x11, 0x000F, CH6_000F] +- [0x11, 0x0010, CH6_0010] +- [0x11, 0x0011, CH6_0011] +- [0x11, 0x0012, CH6_0012] +- [0x11, 0x0013, CH6_0013] +- [0x11, 0x0014, CH6_0014] +- [0x11, 0x0015, CH6_0015] +- [0x11, 0x0016, CH6_0016] +- [0x11, 0x0017, CH6_0017] +- [0x11, 0x0018, CH6_0018] +- [0x11, 0x0019, CH6_0019] +- [0x11, 0x001A, CH6_001A] +- [0x11, 0x001B, CH6_001B] +- [0x11, 0x001C, CH6_001C] +- [0x11, 0x001D, CH6_001D] +- [0x11, 0x001E, CH6_001E] +- [0x11, 0x001F, CH6_001F] +- [0x11, 0x0020, CH6_0020] +- [0x11, 0x0021, CH6_0021] +- [0x11, 0x0022, CH6_0022] +- [0x11, 0x0023, CH6_0023] +- [0x11, 0x0024, CH6_0024] +- [0x11, 0x0025, CH6_0025] +- [0x11, 0x0026, CH6_0026] +- [0x11, 0x0027, CH6_0027] +- [0x11, 0x0028, CH6_0028] +- [0x11, 0x0029, CH6_0029] +- [0x11, 0x002A, CH6_002A] +- [0x11, 0x002B, CH6_002B] +- [0x11, 0x002C, CH6_002C] +- [0x11, 0x002D, CH6_002D] +- [0x11, 0x002E, CH6_002E] +- [0x11, 0x002F, CH6_002F] +- [0x11, 0x0030, CH6_0030] +- [0x11, 0x0031, CH6_0031] +- [0x11, 0x0032, CH6_0032] +- [0x11, 0x0033, CH6_0033] +- [0x11, 0x0034, CH6_0034] +- [0x11, 0x0035, CH6_0035] +- [0x11, 0x0036, CH6_0036] +- [0x11, 0x0037, CH6_0037] +- [0x11, 0x0038, CH6_0038] +- [0x11, 0x0039, CH6_0039] +- [0x11, 0x003A, CH6_003A] +- [0x11, 0x003B, CH6_003B] +- [0x11, 0x003C, CH6_003C] +- [0x11, 0x003D, CH6_003D] +- [0x11, 0x003E, CH6_003E] +- [0x11, 0x003F, CH6_003F] +- [0x11, 0x0040, CH6_0040] +- [0x11, 0x0041, CH6_0041] +- [0x11, 0x0042, CH6_0042] +- [0x11, 0x0043, CH6_0043] +- [0x11, 0x0044, CH6_0044] +- [0x11, 0x0045, CH6_0045] +- [0x11, 0x0046, CH6_0046] +- [0x11, 0x0047, CH6_0047] +- [0x11, 0x0048, CH6_0048] +- [0x11, 0x0049, CH6_0049] +- [0x11, 0x004A, CH6_004A] +- [0x11, 0x004B, CH6_004B] +- [0x11, 0x004C, CH6_004C] +- [0x11, 0x004D, CH6_004D] +- [0x11, 0x004E, CH6_004E] +- [0x11, 0x004F, CH6_004F] +- [0x11, 0x0050, CH6_0050] +- [0x11, 0x0051, CH6_0051] +- [0x11, 0x0052, CH6_0052] +- [0x11, 0x0053, CH6_0053] +- [0x11, 0x0054, CH6_0054] +- [0x11, 0x0055, CH6_0055] +- [0x11, 0x0056, CH6_0056] +- [0x11, 0x0057, CH6_0057] +- [0x11, 0x0058, CH6_0058] +- [0x11, 0x0059, CH6_0059] +- [0x11, 0x005A, CH6_005A] +- [0x11, 0x005B, CH6_005B] +- [0x11, 0x005C, CH6_005C] +- [0x11, 0x005D, CH6_005D] +- [0x11, 0x005E, CH6_005E] +- [0x11, 0x005F, CH6_005F] +- [0x11, 0x0060, CH6_0060] +- [0x11, 0x0061, CH6_0061] +- [0x11, 0x0062, CH6_0062] +- [0x11, 0x0063, CH6_0063] +- [0x11, 0x0064, CH6_0064] +- [0x11, 0x0065, CH6_0065] +- [0x11, 0x0066, CH6_0066] +- [0x11, 0x0067, CH6_0067] +- [0x11, 0x0068, CH6_0068] +- [0x11, 0x0069, CH6_0069] +- [0x11, 0x006A, CH6_006A] +- [0x11, 0x006B, CH6_006B] +- [0x11, 0x006C, CH6_006C] +- [0x11, 0x006D, CH6_006D] +- [0x11, 0x006E, CH6_006E] +- [0x11, 0x006F, CH6_006F] +- [0x11, 0x0070, CH6_0070] +- [0x11, 0x0071, CH6_0071] +- [0x11, 0x0072, CH6_0072] +- [0x11, 0x0073, CH6_0073] +- [0x11, 0x0074, CH6_0074] +- [0x11, 0x0075, CH6_0075] +- [0x11, 0x0076, CH6_0076] +- [0x11, 0x0077, CH6_0077] +- [0x11, 0x0078, CH6_0078] +- [0x11, 0x0079, CH6_0079] +- [0x11, 0x007A, CH6_007A] +- [0x11, 0x007B, CH6_007B] +- [0x11, 0x007C, CH6_007C] +- [0x11, 0x007D, CH6_007D] +- [0x11, 0x007E, CH6_007E] +- [0x11, 0x007F, CH6_007F] +- [0x11, 0x0080, CH6_0080] +- [0x11, 0x0081, CH6_0081] +- [0x11, 0x0082, CH6_0082] +- [0x11, 0x0083, CH6_0083] +- [0x11, 0x0084, CH6_0084] +- [0x11, 0x0085, CH6_0085] +- [0x11, 0x0086, CH6_0086] +- [0x11, 0x0087, CH6_0087] +- [0x11, 0x0088, CH6_0088] +- [0x11, 0x0089, CH6_0089] +- [0x11, 0x008A, CH6_008A] +- [0x11, 0x008B, CH6_008B] +- [0x11, 0x008C, CH6_008C] +- [0x11, 0x008D, CH6_008D] +- [0x11, 0x008E, CH6_008E] +- [0x11, 0x008F, CH6_008F] +- [0x11, 0x0090, CH6_0090] +- [0x11, 0x0091, CH6_0091] +- [0x11, 0x0092, CH6_0092] +- [0x11, 0x0093, CH6_0093] +- [0x11, 0x0094, CH6_0094] +- [0x11, 0x0095, CH6_0095] +- [0x11, 0x0096, CH6_0096] +- [0x11, 0x0097, CH6_0097] +- [0x11, 0x0098, CH6_0098] +- [0x11, 0x0099, CH6_0099] +- [0x11, 0x009A, CH6_009A] +- [0x11, 0x009B, CH6_009B] +- [0x11, 0x009C, CH6_009C] +- [0x11, 0x009D, CH6_009D] +- [0x11, 0x009E, CH6_009E] +- [0x11, 0x009F, CH6_009F] +- [0x11, 0x00A0, CH6_00A0] +- [0x11, 0x00A1, CH6_00A1] +- [0x11, 0x00A2, CH6_00A2] +- [0x11, 0x00A3, CH6_00A3] +- [0x11, 0x00A4, CH6_00A4] +- [0x11, 0x00A5, CH6_00A5] +- [0x11, 0x00A6, CH6_00A6] +- [0x11, 0x00A7, CH6_00A7] +- [0x11, 0x00A8, CH6_00A8] +- [0x11, 0x00A9, CH6_00A9] +- [0x11, 0x00AA, CH6_00AA] +- [0x11, 0x00AB, CH6_00AB] +- [0x11, 0x00AC, CH6_00AC] +- [0x11, 0x00AD, CH6_00AD] +- [0x11, 0x00AE, CH6_00AE] +- [0x11, 0x00AF, CH6_00AF] +- [0x11, 0x00B0, CH6_00B0] +- [0x11, 0x00B1, CH6_00B1] +- [0x11, 0x00B2, CH6_00B2] +- [0x11, 0x00B3, CH6_00B3] +- [0x11, 0x00B4, CH6_00B4] +- [0x11, 0x00B5, CH6_00B5] +- [0x11, 0x00B6, CH6_00B6] +- [0x11, 0x00B7, CH6_00B7] +- [0x11, 0x00B8, CH6_00B8] +- [0x11, 0x00B9, CH6_00B9] +- [0x11, 0x00BA, CH6_00BA] +- [0x11, 0x00BB, CH6_00BB] +- [0x11, 0x00BC, CH6_00BC] +- [0x11, 0x00BD, CH6_00BD] +- [0x11, 0x00BE, CH6_00BE] +- [0x11, 0x00BF, CH6_00BF] +- [0x11, 0x00C0, CH6_00C0] +- [0x11, 0x00C1, CH6_00C1] +- [0x11, 0x00C2, CH6_00C2] +- [0x11, 0x00C3, CH6_00C3] +- [0x11, 0x00C4, CH6_00C4] +- [0x11, 0x00C5, CH6_00C5] +- [0x11, 0x00C6, CH6_00C6] +- [0x11, 0x00C7, CH6_00C7] +- [0x11, 0x00C8, CH6_00C8] +- [0x11, 0x00C9, CH6_00C9] +- [0x11, 0x00CA, CH6_00CA] +- [0x11, 0x00CB, CH6_00CB] +- [0x11, 0x00CC, CH6_00CC] +- [0x11, 0x00CD, CH6_00CD] +- [0x11, 0x00CE, CH6_00CE] +- [0x11, 0x00CF, CH6_00CF] +- [0x11, 0x00D0, CH6_00D0] +- [0x11, 0x00D1, CH6_00D1] +- [0x11, 0x00D2, CH6_00D2] +- [0x11, 0x00D3, CH6_00D3] +- [0x11, 0x00D4, CH6_00D4] +- [0x11, 0x00D5, CH6_00D5] +- [0x11, 0x00D6, CH6_00D6] +- [0x11, 0x00D7, CH6_00D7] +- [0x11, 0x00D8, CH6_00D8] +- [0x11, 0x00D9, CH6_00D9] +- [0x11, 0x00DA, CH6_00DA] +- [0x11, 0x00DB, CH6_00DB] +- [0x11, 0x00DC, CH6_00DC] +- [0x11, 0x00DD, CH6_00DD] +- [0x11, 0x00DE, CH6_00DE] +- [0x12, 0x0000, CH7_0000] +- [0x12, 0x0001, CH7_0001] +- [0x12, 0x0002, CH7_0002] +- [0x12, 0x0003, CH7_0003] +- [0x12, 0x0004, CH7_0004] +- [0x12, 0x0005, CH7_0005] +- [0x12, 0x0006, CH7_0006] +- [0x12, 0x0007, CH7_0007] +- [0x12, 0x0008, CH7_0008] +- [0x12, 0x0009, CH7_0009] +- [0x12, 0x000A, CH7_000A] +- [0x12, 0x000B, CH7_000B] +- [0x12, 0x000C, CH7_000C] +- [0x12, 0x000D, CH7_000D] +- [0x12, 0x000E, CH7_000E] +- [0x12, 0x000F, CH7_000F] +- [0x12, 0x0010, CH7_0010] +- [0x12, 0x0011, CH7_0011] +- [0x12, 0x0012, CH7_0012] +- [0x12, 0x0013, CH7_0013] +- [0x12, 0x0014, CH7_0014] +- [0x12, 0x0015, CH7_0015] +- [0x12, 0x0016, CH7_0016] +- [0x12, 0x0017, CH7_0017] +- [0x12, 0x0018, CH7_0018] +- [0x12, 0x0019, CH7_0019] +- [0x12, 0x001A, CH7_001A] +- [0x12, 0x001B, CH7_001B] +- [0x12, 0x001C, CH7_001C] +- [0x12, 0x001D, CH7_001D] +- [0x12, 0x001E, CH7_001E] +- [0x12, 0x001F, CH7_001F] +- [0x12, 0x0020, CH7_0020] +- [0x12, 0x0021, CH7_0021] +- [0x12, 0x0022, CH7_0022] +- [0x12, 0x0023, CH7_0023] +- [0x12, 0x0024, CH7_0024] +- [0x12, 0x0025, CH7_0025] +- [0x12, 0x0026, CH7_0026] +- [0x12, 0x0027, CH7_0027] +- [0x12, 0x0028, CH7_0028] +- [0x12, 0x0029, CH7_0029] +- [0x12, 0x002A, CH7_002A] +- [0x12, 0x002B, CH7_002B] +- [0x12, 0x002C, CH7_002C] +- [0x12, 0x002D, CH7_002D] +- [0x12, 0x002E, CH7_002E] +- [0x12, 0x002F, CH7_002F] +- [0x12, 0x0030, CH7_0030] +- [0x12, 0x0031, CH7_0031] +- [0x12, 0x0032, CH7_0032] +- [0x12, 0x0033, CH7_0033] +- [0x12, 0x0034, CH7_0034] +- [0x12, 0x0035, CH7_0035] +- [0x12, 0x0036, CH7_0036] +- [0x12, 0x0037, CH7_0037] +- [0x12, 0x0038, CH7_0038] +- [0x12, 0x0039, CH7_0039] +- [0x12, 0x003A, CH7_003A] +- [0x12, 0x003B, CH7_003B] +- [0x12, 0x003C, CH7_003C] +- [0x12, 0x003D, CH7_003D] +- [0x12, 0x003E, CH7_003E] +- [0x12, 0x003F, CH7_003F] +- [0x12, 0x0040, CH7_0040] +- [0x12, 0x0041, CH7_0041] +- [0x12, 0x0042, CH7_0042] +- [0x12, 0x0043, CH7_0043] +- [0x12, 0x0044, CH7_0044] +- [0x12, 0x0045, CH7_0045] +- [0x12, 0x0046, CH7_0046] +- [0x12, 0x0047, CH7_0047] +- [0x12, 0x0048, CH7_0048] +- [0x12, 0x0049, CH7_0049] +- [0x12, 0x004A, CH7_004A] +- [0x12, 0x004B, CH7_004B] +- [0x12, 0x004C, CH7_004C] +- [0x12, 0x004D, CH7_004D] +- [0x12, 0x004E, CH7_004E] +- [0x12, 0x004F, CH7_004F] +- [0x12, 0x0050, CH7_0050] +- [0x12, 0x0051, CH7_0051] +- [0x12, 0x0052, CH7_0052] +- [0x12, 0x0053, CH7_0053] +- [0x12, 0x0054, CH7_0054] +- [0x12, 0x0055, CH7_0055] +- [0x12, 0x0056, CH7_0056] +- [0x12, 0x0057, CH7_0057] +- [0x12, 0x0058, CH7_0058] +- [0x12, 0x0059, CH7_0059] +- [0x12, 0x005A, CH7_005A] +- [0x12, 0x005B, CH7_005B] +- [0x12, 0x005C, CH7_005C] +- [0x12, 0x005D, CH7_005D] +- [0x12, 0x005E, CH7_005E] +- [0x12, 0x005F, CH7_005F] +- [0x12, 0x0060, CH7_0060] +- [0x12, 0x0061, CH7_0061] +- [0x12, 0x0062, CH7_0062] +- [0x12, 0x0063, CH7_0063] +- [0x12, 0x0064, CH7_0064] +- [0x12, 0x0065, CH7_0065] +- [0x12, 0x0066, CH7_0066] +- [0x12, 0x0067, CH7_0067] +- [0x12, 0x0068, CH7_0068] +- [0x12, 0x0069, CH7_0069] +- [0x12, 0x006A, CH7_006A] +- [0x12, 0x006B, CH7_006B] +- [0x12, 0x006C, CH7_006C] +- [0x12, 0x006D, CH7_006D] +- [0x12, 0x006E, CH7_006E] +- [0x12, 0x006F, CH7_006F] +- [0x12, 0x0070, CH7_0070] +- [0x12, 0x0071, CH7_0071] +- [0x12, 0x0072, CH7_0072] +- [0x12, 0x0073, CH7_0073] +- [0x12, 0x0074, CH7_0074] +- [0x12, 0x0075, CH7_0075] +- [0x12, 0x0076, CH7_0076] +- [0x12, 0x0077, CH7_0077] +- [0x12, 0x0078, CH7_0078] +- [0x12, 0x0079, CH7_0079] +- [0x12, 0x007A, CH7_007A] +- [0x12, 0x007B, CH7_007B] +- [0x12, 0x007C, CH7_007C] +- [0x12, 0x007D, CH7_007D] +- [0x12, 0x007E, CH7_007E] +- [0x12, 0x007F, CH7_007F] +- [0x12, 0x0080, CH7_0080] +- [0x12, 0x0081, CH7_0081] +- [0x12, 0x0082, CH7_0082] +- [0x12, 0x0083, CH7_0083] +- [0x12, 0x0084, CH7_0084] +- [0x12, 0x0085, CH7_0085] +- [0x12, 0x0086, CH7_0086] +- [0x12, 0x0087, CH7_0087] +- [0x12, 0x0088, CH7_0088] +- [0x12, 0x0089, CH7_0089] +- [0x12, 0x008A, CH7_008A] +- [0x12, 0x008B, CH7_008B] +- [0x12, 0x008C, CH7_008C] +- [0x12, 0x008D, CH7_008D] +- [0x12, 0x008E, CH7_008E] +- [0x12, 0x008F, CH7_008F] +- [0x12, 0x0090, CH7_0090] +- [0x12, 0x0091, CH7_0091] +- [0x12, 0x0092, CH7_0092] +- [0x12, 0x0093, CH7_0093] +- [0x12, 0x0094, CH7_0094] +- [0x12, 0x0095, CH7_0095] +- [0x12, 0x0096, CH7_0096] +- [0x12, 0x0097, CH7_0097] +- [0x12, 0x0098, CH7_0098] +- [0x12, 0x0099, CH7_0099] +- [0x12, 0x009A, CH7_009A] +- [0x12, 0x009B, CH7_009B] +- [0x12, 0x009C, CH7_009C] +- [0x12, 0x009D, CH7_009D] +- [0x12, 0x009E, CH7_009E] +- [0x12, 0x009F, CH7_009F] +- [0x12, 0x00A0, CH7_00A0] +- [0x12, 0x00A1, CH7_00A1] +- [0x12, 0x00A2, CH7_00A2] +- [0x12, 0x00A3, CH7_00A3] +- [0x12, 0x00A4, CH7_00A4] +- [0x12, 0x00A5, CH7_00A5] +- [0x12, 0x00A6, CH7_00A6] +- [0x12, 0x00A7, CH7_00A7] +- [0x12, 0x00A8, CH7_00A8] +- [0x12, 0x00A9, CH7_00A9] +- [0x12, 0x00AA, CH7_00AA] +- [0x12, 0x00AB, CH7_00AB] +- [0x12, 0x00AC, CH7_00AC] +- [0x12, 0x00AD, CH7_00AD] +- [0x12, 0x00AE, CH7_00AE] +- [0x12, 0x00AF, CH7_00AF] +- [0x12, 0x00B0, CH7_00B0] +- [0x12, 0x00B1, CH7_00B1] +- [0x12, 0x00B2, CH7_00B2] +- [0x12, 0x00B3, CH7_00B3] +- [0x12, 0x00B4, CH7_00B4] +- [0x12, 0x00B5, CH7_00B5] +- [0x12, 0x00B6, CH7_00B6] +- [0x12, 0x00B7, CH7_00B7] +- [0x12, 0x00B8, CH7_00B8] +- [0x12, 0x00B9, CH7_00B9] +- [0x12, 0x00BA, CH7_00BA] +- [0x12, 0x00BB, CH7_00BB] +- [0x12, 0x00BC, CH7_00BC] +- [0x12, 0x00BD, CH7_00BD] +- [0x12, 0x00BE, CH7_00BE] +- [0x12, 0x00BF, CH7_00BF] +- [0x12, 0x00C0, CH7_00C0] +- [0x12, 0x00C1, CH7_00C1] +- [0x12, 0x00C2, CH7_00C2] +- [0x12, 0x00C3, CH7_00C3] +- [0x12, 0x00C4, CH7_00C4] +- [0x12, 0x00C5, CH7_00C5] +- [0x12, 0x00C6, CH7_00C6] +- [0x12, 0x00C7, CH7_00C7] +- [0x12, 0x00C8, CH7_00C8] +- [0x12, 0x00C9, CH7_00C9] +- [0x12, 0x00CA, CH7_00CA] +- [0x12, 0x00CB, CH7_00CB] +- [0x12, 0x00CC, CH7_00CC] +- [0x12, 0x00CD, CH7_00CD] +- [0x12, 0x00CE, CH7_00CE] +- [0x12, 0x00CF, CH7_00CF] +- [0x12, 0x00D0, CH7_00D0] +- [0x12, 0x00D1, CH7_00D1] +- [0x12, 0x00D2, CH7_00D2] +- [0x12, 0x00D3, CH7_00D3] +- [0x12, 0x00D4, CH7_00D4] +- [0x12, 0x00D5, CH7_00D5] +- [0x12, 0x00D6, CH7_00D6] +- [0x12, 0x00D7, CH7_00D7] +- [0x12, 0x00D8, CH7_00D8] +- [0x12, 0x00D9, CH7_00D9] +- [0x12, 0x00DA, CH7_00DA] +- [0x12, 0x00DB, CH7_00DB] +- [0x12, 0x00DC, CH7_00DC] +- [0x12, 0x00DD, CH7_00DD] +- [0x12, 0x00DE, CH7_00DE] +- [0x12, 0x00DF, CH7_00DF] +- [0x12, 0x00E0, CH7_00E0] +- [0x12, 0x00E1, CH7_00E1] +- [0x12, 0x00E2, CH7_00E2] +- [0x12, 0x00E3, CH7_00E3] +- [0x12, 0x00E4, CH7_00E4] +- [0x12, 0x00E5, CH7_00E5] +- [0x12, 0x00E6, CH7_00E6] +- [0x12, 0x00E7, CH7_00E7] +- [0x12, 0x00E8, CH7_00E8] +- [0x12, 0x00E9, CH7_00E9] +- [0x12, 0x00EA, CH7_00EA] +- [0x12, 0x00EB, CH7_00EB] +- [0x12, 0x00EC, CH7_00EC] +- [0x12, 0x00ED, CH7_00ED] +- [0x12, 0x00EE, CH7_00EE] +- [0x12, 0x00EF, CH7_00EF] +- [0x12, 0x00F0, CH7_00F0] +- [0x12, 0x00F1, CH7_00F1] +- [0x12, 0x00F2, CH7_00F2] +- [0x12, 0x00F3, CH7_00F3] +- [0x12, 0x00F4, CH7_00F4] +- [0x12, 0x00F5, CH7_00F5] +- [0x12, 0x00F6, CH7_00F6] +- [0x12, 0x00F7, CH7_00F7] +- [0x12, 0x00F8, CH7_00F8] +- [0x12, 0x00F9, CH7_00F9] +- [0x12, 0x00FA, CH7_00FA] +- [0x12, 0x00FB, CH7_00FB] +- [0x12, 0x00FC, CH7_00FC] +- [0x12, 0x00FD, CH7_00FD] +- [0x12, 0x00FE, CH7_00FE] +- [0x12, 0x00FF, CH7_00FF] +- [0x12, 0x0100, CH7_0100] +- [0x12, 0x0101, CH7_0101] +- [0x12, 0x0102, CH7_0102] +- [0x12, 0x0103, CH7_0103] +- [0x12, 0x0104, CH7_0104] +- [0x12, 0x0105, CH7_0105] +- [0x12, 0x0106, CH7_0106] +- [0x12, 0x0107, CH7_0107] +- [0x12, 0x0108, CH7_0108] +- [0x12, 0x0109, CH7_0109] +- [0x12, 0x010A, CH7_010A] +- [0x12, 0x010B, CH7_010B] +- [0x12, 0x010C, CH7_010C] +- [0x12, 0x010D, CH7_010D] +- [0x12, 0x010E, CH7_010E] +- [0x12, 0x010F, CH7_010F] +- [0x12, 0x0110, CH7_0110] +- [0x12, 0x0111, CH7_0111] +- [0x12, 0x0112, CH7_0112] +- [0x12, 0x0113, CH7_0113] +- [0x12, 0x0114, CH7_0114] +- [0x12, 0x0115, CH7_0115] +- [0x12, 0x0116, CH7_0116] +- [0x12, 0x0117, CH7_0117] +- [0x12, 0x0118, CH7_0118] +- [0x12, 0x0119, CH7_0119] +- [0x12, 0x011A, CH7_011A] +- [0x12, 0x011B, CH7_011B] +- [0x12, 0x011C, CH7_011C] +- [0x12, 0x011D, CH7_011D] +- [0x12, 0x011E, CH7_011E] +- [0x12, 0x011F, CH7_011F] +- [0x12, 0x0120, CH7_0120] +- [0x12, 0x0121, CH7_0121] +- [0x12, 0x0122, CH7_0122] +- [0x12, 0x0123, CH7_0123] +- [0x12, 0x0124, CH7_0124] +- [0x12, 0x0125, CH7_0125] +- [0x12, 0x0126, CH7_0126] +- [0x12, 0x0127, CH7_0127] +- [0x12, 0x0128, CH7_0128] +- [0x12, 0x0129, CH7_0129] +- [0x12, 0x012A, CH7_012A] +- [0x12, 0x012B, CH7_012B] +- [0x12, 0x012C, CH7_012C] +- [0x12, 0x012D, CH7_012D] +- [0x12, 0x012E, CH7_012E] +- [0x12, 0x012F, CH7_012F] +- [0x12, 0x0130, CH7_0130] +- [0x12, 0x0131, CH7_0131] +- [0x12, 0x0132, CH7_0132] +- [0x12, 0x0133, CH7_0133] +- [0x12, 0x0134, CH7_0134] +- [0x12, 0x0135, CH7_0135] +- [0x12, 0x0136, CH7_0136] +- [0x12, 0x0137, CH7_0137] +- [0x12, 0x0138, CH7_0138] +- [0x12, 0x0139, CH7_0139] +- [0x12, 0x013A, CH7_013A] +- [0x12, 0x013B, CH7_013B] +- [0x12, 0x013C, CH7_013C] +- [0x12, 0x013D, CH7_013D] +- [0x12, 0x013E, CH7_013E] +- [0x12, 0x013F, CH7_013F] +- [0x12, 0x0140, CH7_0140] +- [0x12, 0x0141, CH7_0141] +- [0x12, 0x0142, CH7_0142] +- [0x12, 0x0143, CH7_0143] +- [0x12, 0x0144, CH7_0144] +- [0x12, 0x0145, CH7_0145] +- [0x12, 0x0146, CH7_0146] +- [0x12, 0x0147, CH7_0147] +- [0x12, 0x0148, CH7_0148] +- [0x12, 0x0149, CH7_0149] +- [0x12, 0x014A, CH7_014A] +- [0x12, 0x014B, CH7_014B] +- [0x12, 0x014C, CH7_014C] +- [0x12, 0x014D, CH7_014D] +- [0x12, 0x014E, CH7_014E] +- [0x12, 0x014F, CH7_014F] +- [0x12, 0x0150, CH7_0150] +- [0x12, 0x0151, CH7_0151] +- [0x12, 0x0152, CH7_0152] +- [0x12, 0x0153, CH7_0153] +- [0x12, 0x0154, CH7_0154] +- [0x12, 0x0155, CH7_0155] +- [0x12, 0x0156, CH7_0156] +- [0x12, 0x0157, CH7_0157] +- [0x12, 0x0158, CH7_0158] +- [0x12, 0x0159, CH7_0159] +- [0x12, 0x015A, CH7_015A] +- [0x12, 0x015B, CH7_015B] +- [0x12, 0x015C, CH7_015C] +- [0x12, 0x015D, CH7_015D] +- [0x12, 0x015E, CH7_015E] +- [0x12, 0x015F, CH7_015F] +- [0x12, 0x0160, CH7_0160] +- [0x12, 0x0161, CH7_0161] +- [0x12, 0x0162, CH7_0162] +- [0x12, 0x0163, CH7_0163] +- [0x12, 0x0164, CH7_0164] +- [0x12, 0x0165, CH7_0165] +- [0x12, 0x0166, CH7_0166] +- [0x12, 0x0167, CH7_0167] +- [0x12, 0x0168, CH7_0168] +- [0x12, 0x0169, CH7_0169] +- [0x12, 0x016A, CH7_016A] +- [0x12, 0x016B, CH7_016B] +- [0x12, 0x016C, CH7_016C] +- [0x12, 0x016D, CH7_016D] +- [0x12, 0x016E, CH7_016E] +- [0x12, 0x016F, CH7_016F] +- [0x13, 0x0000, CH8_0000] +- [0x13, 0x0001, CH8_0001] +- [0x13, 0x0002, CH8_0002] +- [0x13, 0x0003, CH8_0003] +- [0x13, 0x0004, CH8_0004] +- [0x13, 0x0005, CH8_0005] +- [0x13, 0x0006, CH8_0006] +- [0x13, 0x0007, CH8_0007] +- [0x13, 0x0008, CH8_0008] +- [0x13, 0x0009, CH8_0009] +- [0x13, 0x000A, CH8_000A] +- [0x13, 0x000B, CH8_000B] +- [0x13, 0x000C, CH8_000C] +- [0x13, 0x000D, CH8_000D] +- [0x13, 0x000E, CH8_000E] +- [0x13, 0x000F, CH8_000F] +- [0x13, 0x0010, CH8_0010] +- [0x13, 0x0011, CH8_0011] +- [0x13, 0x0012, CH8_0012] +- [0x13, 0x0013, CH8_0013] +- [0x13, 0x0014, CH8_0014] +- [0x13, 0x0015, CH8_0015] +- [0x13, 0x0016, CH8_0016] +- [0x13, 0x0017, CH8_0017] +- [0x13, 0x0018, CH8_0018] +- [0x13, 0x0019, CH8_0019] +- [0x13, 0x001A, CH8_001A] +- [0x13, 0x001B, CH8_001B] +- [0x13, 0x001C, CH8_001C] +- [0x13, 0x001D, CH8_001D] +- [0x13, 0x001E, CH8_001E] +- [0x13, 0x001F, CH8_001F] +- [0x13, 0x0020, CH8_0020] +- [0x13, 0x0021, CH8_0021] +- [0x13, 0x0022, CH8_0022] +- [0x13, 0x0023, CH8_0023] +- [0x13, 0x0024, CH8_0024] +- [0x13, 0x0025, CH8_0025] +- [0x13, 0x0026, CH8_0026] +- [0x13, 0x0027, CH8_0027] +- [0x13, 0x0028, CH8_0028] +- [0x13, 0x0029, CH8_0029] +- [0x13, 0x002A, CH8_002A] +- [0x13, 0x002B, CH8_002B] +- [0x13, 0x002C, CH8_002C] +- [0x13, 0x002D, CH8_002D] +- [0x13, 0x002E, CH8_002E] +- [0x13, 0x002F, CH8_002F] +- [0x13, 0x0030, CH8_0030] +- [0x13, 0x0031, CH8_0031] +- [0x13, 0x0032, CH8_0032] +- [0x13, 0x0033, CH8_0033] +- [0x13, 0x0034, CH8_0034] +- [0x13, 0x0035, CH8_0035] +- [0x13, 0x0036, CH8_0036] +- [0x13, 0x0037, CH8_0037] +- [0x13, 0x0038, CH8_0038] +- [0x13, 0x0039, CH8_0039] +- [0x13, 0x003A, CH8_003A] +- [0x13, 0x003B, CH8_003B] +- [0x13, 0x003C, CH8_003C] +- [0x13, 0x003D, CH8_003D] +- [0x13, 0x003E, CH8_003E] +- [0x13, 0x003F, CH8_003F] +- [0x13, 0x0040, CH8_0040] +- [0x13, 0x0041, CH8_0041] +- [0x13, 0x0042, CH8_0042] +- [0x13, 0x0043, CH8_0043] +- [0x13, 0x0044, CH8_0044] +- [0x13, 0x0045, CH8_0045] +- [0x13, 0x0046, CH8_0046] +- [0x13, 0x0047, CH8_0047] +- [0x13, 0x0048, CH8_0048] +- [0x13, 0x0049, CH8_0049] +- [0x13, 0x004A, CH8_004A] +- [0x13, 0x004B, CH8_004B] +- [0x13, 0x004C, CH8_004C] +- [0x13, 0x004D, CH8_004D] +- [0x13, 0x004E, CH8_004E] +- [0x13, 0x004F, CH8_004F] +- [0x13, 0x0050, CH8_0050] +- [0x13, 0x0051, CH8_0051] +- [0x13, 0x0052, CH8_0052] +- [0x13, 0x0053, CH8_0053] +- [0x13, 0x0054, CH8_0054] +- [0x13, 0x0055, CH8_0055] +- [0x13, 0x0056, CH8_0056] +- [0x13, 0x0057, CH8_0057] +- [0x13, 0x0058, CH8_0058] +- [0x13, 0x0059, CH8_0059] +- [0x13, 0x005A, CH8_005A] +- [0x13, 0x005B, CH8_005B] +- [0x13, 0x005C, CH8_005C] +- [0x13, 0x005D, CH8_005D] +- [0x13, 0x005E, CH8_005E] +- [0x13, 0x005F, CH8_005F] +- [0x13, 0x0060, CH8_0060] +- [0x13, 0x0061, CH8_0061] +- [0x13, 0x0062, CH8_0062] +- [0x13, 0x0063, CH8_0063] +- [0x13, 0x0064, CH8_0064] +- [0x13, 0x0065, CH8_0065] +- [0x13, 0x0066, CH8_0066] +- [0x13, 0x0067, CH8_0067] +- [0x13, 0x0068, CH8_0068] +- [0x13, 0x0069, CH8_0069] +- [0x13, 0x006A, CH8_006A] +- [0x13, 0x006B, CH8_006B] +- [0x13, 0x006C, CH8_006C] +- [0x13, 0x006D, CH8_006D] +- [0x13, 0x006E, CH8_006E] +- [0x13, 0x006F, CH8_006F] +- [0x13, 0x0070, CH8_0070] +- [0x13, 0x0071, CH8_0071] +- [0x13, 0x0072, CH8_0072] +- [0x13, 0x0073, CH8_0073] +- [0x13, 0x0074, CH8_0074] +- [0x13, 0x0075, CH8_0075] +- [0x13, 0x0076, CH8_0076] +- [0x13, 0x0077, CH8_0077] +- [0x13, 0x0078, CH8_0078] +- [0x13, 0x0079, CH8_0079] +- [0x13, 0x007A, CH8_007A] +- [0x13, 0x007B, CH8_007B] +- [0x13, 0x007C, CH8_007C] +- [0x13, 0x007D, CH8_007D] +- [0x13, 0x007E, CH8_007E] +- [0x13, 0x007F, CH8_007F] +- [0x13, 0x0080, CH8_0080] +- [0x13, 0x0081, CH8_0081] +- [0x13, 0x0082, CH8_0082] +- [0x13, 0x0083, CH8_0083] +- [0x13, 0x0084, CH8_0084] +- [0x13, 0x0085, CH8_0085] +- [0x13, 0x0086, CH8_0086] +- [0x13, 0x0087, CH8_0087] +- [0x13, 0x0088, CH8_0088] +- [0x13, 0x0089, CH8_0089] +- [0x13, 0x008A, CH8_008A] +- [0x13, 0x008B, CH8_008B] +- [0x13, 0x008C, CH8_008C] +- [0x13, 0x008D, CH8_008D] +- [0x13, 0x008E, CH8_008E] +- [0x13, 0x008F, CH8_008F] +- [0x13, 0x0090, CH8_0090] +- [0x13, 0x0091, CH8_0091] +- [0x13, 0x0092, CH8_0092] +- [0x13, 0x0093, CH8_0093] +- [0x13, 0x0094, CH8_0094] +- [0x13, 0x0095, CH8_0095] +- [0x13, 0x0096, CH8_0096] +- [0x13, 0x0097, CH8_0097] +- [0x13, 0x0098, CH8_0098] +- [0x13, 0x0099, CH8_0099] +- [0x13, 0x009A, CH8_009A] +- [0x13, 0x009B, CH8_009B] +- [0x13, 0x009C, CH8_009C] +- [0x13, 0x009D, CH8_009D] +- [0x13, 0x009E, CH8_009E] +- [0x13, 0x009F, CH8_009F] +- [0x13, 0x00A0, CH8_00A0] +- [0x13, 0x00A1, CH8_00A1] +- [0x13, 0x00A2, CH8_00A2] +- [0x13, 0x00A3, CH8_00A3] +- [0x13, 0x00A4, CH8_00A4] +- [0x13, 0x00A5, CH8_00A5] +- [0x13, 0x00A6, CH8_00A6] +- [0x13, 0x00A7, CH8_00A7] +- [0x13, 0x00A8, CH8_00A8] +- [0x13, 0x00A9, CH8_00A9] +- [0x13, 0x00AA, CH8_00AA] +- [0x13, 0x00AB, CH8_00AB] +- [0x13, 0x00AC, CH8_00AC] +- [0x13, 0x00AD, CH8_00AD] +- [0x13, 0x00AE, CH8_00AE] +- [0x13, 0x00AF, CH8_00AF] +- [0x13, 0x00B0, CH8_00B0] +- [0x13, 0x00B1, CH8_00B1] +- [0x14, 0x0000, Peach_CH1_KoopaBros_0000] +- [0x14, 0x0001, Peach_CH1_KoopaBros_0001] +- [0x14, 0x0002, Peach_CH1_KoopaBros_0002] +- [0x14, 0x0003, Peach_CH1_KoopaBros_0003] +- [0x14, 0x0004, Peach_CH1_KoopaBros_0004] +- [0x14, 0x0005, Peach_CH1_KoopaBros_0005] +- [0x14, 0x0006, Peach_CH1_KoopaBros_0006] +- [0x14, 0x0007, Peach_CH1_KoopaBros_0007] +- [0x14, 0x0008, Peach_CH1_KoopaBros_0008] +- [0x14, 0x0009, Peach_CH1_KoopaBros_0009] +- [0x14, 0x000A, Peach_CH1_KoopaBros_000A] +- [0x14, 0x000B, Peach_CH1_KoopaBros_000B] +- [0x14, 0x000C, Peach_CH1_KoopaBros_000C] +- [0x14, 0x000D, Peach_CH1_KoopaBros_000D] +- [0x14, 0x000E, Peach_CH1_KoopaBros_000E] +- [0x14, 0x000F, Peach_CH1_KoopaBros_000F] +- [0x14, 0x0010, Peach_CH1_KoopaBros_0010] +- [0x14, 0x0011, Peach_CH1_KoopaBros_0011] +- [0x14, 0x0012, Peach_CH1_KoopaBros_0012] +- [0x14, 0x0013, Peach_CH1_KoopaBros_0013] +- [0x14, 0x0014, Peach_CH1_KoopaBros_0014] +- [0x14, 0x0015, Peach_CH1_KoopaBros_0015] +- [0x14, 0x0016, Peach_0016] +- [0x14, 0x0017, Peach_0017] +- [0x14, 0x0018, Peach_0018] +- [0x14, 0x0019, Peach_0019] +- [0x14, 0x001A, Peach_001A] +- [0x14, 0x001B, Peach_001B] +- [0x14, 0x001C, Peach_001C] +- [0x14, 0x001D, Peach_001D] +- [0x14, 0x001E, Peach_001E] +- [0x14, 0x001F, Peach_001F] +- [0x14, 0x0020, Peach_0020] +- [0x14, 0x0021, Peach_0021] +- [0x14, 0x0022, Peach_0022] +- [0x14, 0x0023, Peach_0023] +- [0x14, 0x0024, Peach_0024] +- [0x14, 0x0025, Peach_0025] +- [0x14, 0x0026, Peach_0026] +- [0x14, 0x0027, Peach_0027] +- [0x14, 0x0028, Peach_0028] +- [0x14, 0x0029, Peach_0029] +- [0x14, 0x002A, Peach_002A] +- [0x14, 0x002B, Peach_002B] +- [0x14, 0x002C, Peach_002C] +- [0x14, 0x002D, Peach_002D] +- [0x14, 0x002E, Peach_002E] +- [0x14, 0x002F, Peach_002F] +- [0x14, 0x0030, Peach_0030] +- [0x14, 0x0031, Peach_0031] +- [0x14, 0x0032, Peach_0032] +- [0x14, 0x0033, Peach_0033] +- [0x14, 0x0034, Peach_0034] +- [0x14, 0x0035, Peach_0035] +- [0x14, 0x0036, Peach_0036] +- [0x14, 0x0037, Peach_0037] +- [0x14, 0x0038, Peach_0038] +- [0x14, 0x0039, Peach_0039] +- [0x14, 0x003A, Peach_003A] +- [0x14, 0x003B, Peach_003B] +- [0x14, 0x003C, Peach_003C] +- [0x14, 0x003D, Peach_003D] +- [0x14, 0x003E, Peach_003E] +- [0x14, 0x003F, Peach_003F] +- [0x14, 0x0040, Peach_0040] +- [0x14, 0x0041, Peach_0041] +- [0x14, 0x0042, Peach_0042] +- [0x14, 0x0043, Peach_0043] +- [0x14, 0x0044, Peach_0044] +- [0x14, 0x0045, Peach_0045] +- [0x14, 0x0046, Peach_0046] +- [0x14, 0x0047, Peach_0047] +- [0x14, 0x0048, Peach_0048] +- [0x14, 0x0049, Peach_0049] +- [0x14, 0x004A, Peach_004A] +- [0x14, 0x004B, Peach_004B] +- [0x14, 0x004C, Peach_004C] +- [0x14, 0x004D, Peach_004D] +- [0x14, 0x004E, Peach_004E] +- [0x14, 0x004F, Peach_004F] +- [0x14, 0x0050, Peach_0050] +- [0x14, 0x0051, Peach_0051] +- [0x14, 0x0052, Peach_0052] +- [0x14, 0x0053, Peach_0053] +- [0x14, 0x0054, Peach_0054] +- [0x14, 0x0055, Peach_0055] +- [0x14, 0x0056, Peach_0056] +- [0x14, 0x0057, Peach_0057] +- [0x14, 0x0058, Peach_0058] +- [0x14, 0x0059, Peach_0059] +- [0x14, 0x005A, Peach_005A] +- [0x14, 0x005B, Peach_005B] +- [0x14, 0x005C, Peach_005C] +- [0x14, 0x005D, Peach_005D] +- [0x14, 0x005E, Peach_005E] +- [0x14, 0x005F, Peach_005F] +- [0x14, 0x0060, Peach_0060] +- [0x14, 0x0061, Peach_0061] +- [0x14, 0x0062, Peach_0062] +- [0x14, 0x0063, Peach_0063] +- [0x14, 0x0064, Peach_0064] +- [0x14, 0x0065, Peach_0065] +- [0x14, 0x0066, Peach_0066] +- [0x14, 0x0067, Peach_0067] +- [0x14, 0x0068, Peach_0068] +- [0x14, 0x0069, Peach_0069] +- [0x14, 0x006A, Peach_006A] +- [0x14, 0x006B, Peach_006B] +- [0x14, 0x006C, Peach_006C] +- [0x14, 0x006D, Peach_006D] +- [0x14, 0x006E, Peach_006E] +- [0x14, 0x006F, Peach_006F] +- [0x14, 0x0070, Peach_0070] +- [0x14, 0x0071, Peach_0071] +- [0x14, 0x0072, Peach_0072] +- [0x14, 0x0073, Peach_0073] +- [0x14, 0x0074, Peach_0074] +- [0x14, 0x0075, Peach_0075] +- [0x14, 0x0076, Peach_0076] +- [0x14, 0x0077, Peach_0077] +- [0x14, 0x0078, Peach_0078] +- [0x14, 0x0079, Peach_0079] +- [0x14, 0x007A, Peach_007A] +- [0x14, 0x007B, Peach_007B] +- [0x14, 0x007C, Peach_007C] +- [0x14, 0x007D, Peach_007D] +- [0x14, 0x007E, Peach_007E] +- [0x14, 0x007F, Peach_007F] +- [0x14, 0x0080, Peach_0080] +- [0x14, 0x0081, Peach_0081] +- [0x14, 0x0082, Peach_0082] +- [0x14, 0x0083, Peach_0083] +- [0x14, 0x0084, Peach_0084] +- [0x14, 0x0085, Peach_0085] +- [0x14, 0x0086, Peach_0086] +- [0x14, 0x0087, Peach_0087] +- [0x14, 0x0088, Peach_0088] +- [0x14, 0x0089, Peach_0089] +- [0x14, 0x008A, Peach_008A] +- [0x14, 0x008B, Peach_008B] +- [0x14, 0x008C, Peach_008C] +- [0x14, 0x008D, Peach_008D] +- [0x14, 0x008E, Peach_008E] +- [0x14, 0x008F, Peach_008F] +- [0x14, 0x0090, Peach_0090] +- [0x14, 0x0091, Peach_0091] +- [0x14, 0x0092, Peach_0092] +- [0x14, 0x0093, Peach_0093] +- [0x14, 0x0094, Peach_0094] +- [0x14, 0x0095, Peach_0095] +- [0x14, 0x0096, Peach_0096] +- [0x14, 0x0097, Peach_0097] +- [0x14, 0x0098, Peach_0098] +- [0x14, 0x0099, Peach_0099] +- [0x14, 0x009A, Peach_009A] +- [0x14, 0x009B, Peach_009B] +- [0x14, 0x009C, Peach_009C] +- [0x14, 0x009D, Peach_009D] +- [0x14, 0x009E, Peach_009E] +- [0x14, 0x009F, Peach_009F] +- [0x14, 0x00A0, Peach_00A0] +- [0x14, 0x00A1, Peach_00A1] +- [0x14, 0x00A2, Peach_00A2] +- [0x14, 0x00A3, Peach_00A3] +- [0x14, 0x00A4, Peach_00A4] +- [0x14, 0x00A5, Peach_00A5] +- [0x14, 0x00A6, Peach_00A6] +- [0x14, 0x00A7, Peach_00A7] +- [0x14, 0x00A8, Peach_00A8] +- [0x14, 0x00A9, Peach_00A9] +- [0x14, 0x00AA, Peach_00AA] +- [0x14, 0x00AB, Peach_00AB] +- [0x14, 0x00AC, Peach_00AC] +- [0x14, 0x00AD, Peach_00AD] +- [0x14, 0x00AE, Peach_00AE] +- [0x14, 0x00AF, Peach_00AF] +- [0x14, 0x00B0, Peach_00B0] +- [0x14, 0x00B1, Peach_00B1] +- [0x14, 0x00B2, Peach_00B2] +- [0x14, 0x00B3, Peach_00B3] +- [0x14, 0x00B4, Peach_00B4] +- [0x14, 0x00B5, Peach_00B5] +- [0x14, 0x00B6, Peach_00B6] +- [0x14, 0x00B7, Peach_00B7] +- [0x14, 0x00B8, Peach_00B8] +- [0x14, 0x00B9, Peach_00B9] +- [0x14, 0x00BA, Peach_00BA] +- [0x14, 0x00BB, Peach_00BB] +- [0x14, 0x00BC, Peach_00BC] +- [0x14, 0x00BD, Peach_00BD] +- [0x14, 0x00BE, Peach_00BE] +- [0x14, 0x00BF, Peach_00BF] +- [0x14, 0x00C0, Peach_00C0] +- [0x14, 0x00C1, Peach_00C1] +- [0x14, 0x00C2, Peach_00C2] +- [0x14, 0x00C3, Peach_00C3] +- [0x14, 0x00C4, Peach_00C4] +- [0x14, 0x00C5, Peach_00C5] +- [0x14, 0x00C6, Peach_00C6] +- [0x14, 0x00C7, Peach_00C7] +- [0x14, 0x00C8, Peach_00C8] +- [0x14, 0x00C9, Peach_00C9] +- [0x14, 0x00CA, Peach_00CA] +- [0x14, 0x00CB, Peach_00CB] +- [0x14, 0x00CC, Peach_00CC] +- [0x14, 0x00CD, Peach_00CD] +- [0x14, 0x00CE, Peach_00CE] +- [0x14, 0x00CF, Peach_00CF] +- [0x14, 0x00D0, Peach_00D0] +- [0x14, 0x00D1, Peach_00D1] +- [0x14, 0x00D2, Peach_00D2] +- [0x14, 0x00D3, Peach_00D3] +- [0x14, 0x00D4, Peach_00D4] +- [0x14, 0x00D5, Peach_00D5] +- [0x14, 0x00D6, Peach_00D6] +- [0x14, 0x00D7, Peach_00D7] +- [0x14, 0x00D8, Peach_00D8] +- [0x14, 0x00D9, Peach_00D9] +- [0x14, 0x00DA, Peach_00DA] +- [0x14, 0x00DB, Peach_00DB] +- [0x14, 0x00DC, Peach_00DC] +- [0x14, 0x00DD, Peach_00DD] +- [0x14, 0x00DE, Peach_00DE] +- [0x14, 0x00DF, Peach_00DF] +- [0x14, 0x00E0, Peach_00E0] +- [0x14, 0x00E1, Peach_00E1] +- [0x14, 0x00E2, Peach_00E2] +- [0x14, 0x00E3, Peach_00E3] +- [0x14, 0x00E4, Peach_00E4] +- [0x14, 0x00E5, Peach_00E5] +- [0x14, 0x00E6, Peach_00E6] +- [0x14, 0x00E7, Peach_00E7] +- [0x14, 0x00E8, Peach_00E8] +- [0x14, 0x00E9, Peach_00E9] +- [0x14, 0x00EA, Peach_00EA] +- [0x14, 0x00EB, Peach_00EB] +- [0x14, 0x00EC, Peach_00EC] +- [0x14, 0x00ED, Peach_00ED] +- [0x14, 0x00EE, Peach_00EE] +- [0x14, 0x00EF, Peach_00EF] +- [0x14, 0x00F0, Peach_00F0] +- [0x14, 0x00F1, Peach_00F1] +- [0x14, 0x00F2, Peach_00F2] +- [0x14, 0x00F3, Peach_00F3] +- [0x14, 0x00F4, Peach_00F4] +- [0x14, 0x00F5, Peach_00F5] +- [0x14, 0x00F6, Peach_00F6] +- [0x14, 0x00F7, Peach_00F7] +- [0x14, 0x00F8, Peach_00F8] +- [0x14, 0x00F9, Peach_00F9] +- [0x14, 0x00FA, Peach_00FA] +- [0x14, 0x00FB, Peach_00FB] +- [0x14, 0x00FC, Peach_00FC] +- [0x14, 0x00FD, Peach_00FD] +- [0x14, 0x00FE, Peach_00FE] +- [0x14, 0x00FF, Peach_00FF] +- [0x14, 0x0100, Peach_0100] +- [0x14, 0x0101, Peach_0101] +- [0x14, 0x0102, Peach_0102] +- [0x14, 0x0103, Peach_0103] +- [0x14, 0x0104, Peach_0104] +- [0x14, 0x0105, Peach_0105] +- [0x14, 0x0106, Peach_0106] +- [0x14, 0x0107, Peach_0107] +- [0x14, 0x0108, Peach_0108] +- [0x14, 0x0109, Peach_0109] +- [0x14, 0x010A, Peach_010A] +- [0x14, 0x010B, Peach_010B] +- [0x14, 0x010C, Peach_010C] +- [0x14, 0x010D, Peach_010D] +- [0x14, 0x010E, Peach_010E] +- [0x14, 0x010F, Peach_010F] +- [0x14, 0x0110, Peach_0110] +- [0x14, 0x0111, Peach_0111] +- [0x14, 0x0112, Peach_0112] +- [0x14, 0x0113, Peach_0113] +- [0x14, 0x0114, Peach_0114] +- [0x14, 0x0115, Peach_0115] +- [0x14, 0x0116, Peach_0116] +- [0x14, 0x0117, Peach_0117] +- [0x14, 0x0118, Peach_0118] +- [0x14, 0x0119, Peach_0119] +- [0x14, 0x011A, Peach_011A] +- [0x14, 0x011B, Peach_011B] +- [0x14, 0x011C, Peach_011C] +- [0x14, 0x011D, Peach_011D] +- [0x14, 0x011E, Peach_011E] +- [0x14, 0x011F, Peach_011F] +- [0x14, 0x0120, Peach_0120] +- [0x14, 0x0121, Peach_0121] +- [0x14, 0x0122, Peach_0122] +- [0x14, 0x0123, Peach_0123] +- [0x14, 0x0124, Peach_0124] +- [0x14, 0x0125, Peach_0125] +- [0x14, 0x0126, Peach_0126] +- [0x14, 0x0127, Peach_0127] +- [0x14, 0x0128, Peach_0128] +- [0x14, 0x0129, Peach_0129] +- [0x14, 0x012A, Peach_012A] +- [0x14, 0x012B, Peach_012B] +- [0x14, 0x012C, Peach_012C] +- [0x14, 0x012D, Peach_012D] +- [0x14, 0x012E, Peach_012E] +- [0x14, 0x012F, Peach_012F] +- [0x14, 0x0130, Peach_0130] +- [0x14, 0x0131, Peach_0131] +- [0x14, 0x0132, Peach_0132] +- [0x14, 0x0133, Peach_0133] +- [0x14, 0x0134, Peach_0134] +- [0x14, 0x0135, Peach_0135] +- [0x14, 0x0136, Peach_0136] +- [0x14, 0x0137, Peach_0137] +- [0x14, 0x0138, Peach_0138] +- [0x14, 0x0139, Peach_0139] +- [0x14, 0x013A, Peach_013A] +- [0x14, 0x013B, Peach_013B] +- [0x14, 0x013C, Peach_013C] +- [0x14, 0x013D, Peach_013D] +- [0x14, 0x013E, Peach_013E] +- [0x14, 0x013F, Peach_013F] +- [0x14, 0x0140, Peach_0140] +- [0x14, 0x0141, Peach_0141] +- [0x14, 0x0142, Peach_0142] +- [0x14, 0x0143, Peach_0143] +- [0x14, 0x0144, Peach_0144] +- [0x14, 0x0145, Peach_0145] +- [0x14, 0x0146, Peach_0146] +- [0x14, 0x0147, Peach_0147] +- [0x14, 0x0148, Peach_0148] +- [0x14, 0x0149, Peach_0149] +- [0x14, 0x014A, Peach_014A] +- [0x14, 0x014B, Peach_014B] +- [0x14, 0x014C, Peach_014C] +- [0x14, 0x014D, Peach_014D] +- [0x14, 0x014E, Peach_014E] +- [0x14, 0x014F, Peach_014F] +- [0x14, 0x0150, Peach_0150] +- [0x14, 0x0151, Peach_0151] +- [0x14, 0x0152, Peach_0152] +- [0x14, 0x0153, Peach_0153] +- [0x14, 0x0154, Peach_0154] +- [0x14, 0x0155, Peach_0155] +- [0x14, 0x0156, Peach_0156] +- [0x14, 0x0157, Peach_0157] +- [0x14, 0x0158, Peach_0158] +- [0x14, 0x0159, Peach_0159] +- [0x14, 0x015A, Peach_015A] +- [0x14, 0x015B, Peach_015B] +- [0x14, 0x015C, Peach_015C] +- [0x14, 0x015D, Peach_015D] +- [0x14, 0x015E, Peach_015E] +- [0x14, 0x015F, Peach_015F] +- [0x14, 0x0160, Peach_0160] +- [0x14, 0x0161, Peach_0161] +- [0x14, 0x0162, Peach_0162] +- [0x14, 0x0163, Peach_0163] +- [0x14, 0x0164, Peach_0164] +- [0x14, 0x0165, Peach_0165] +- [0x14, 0x0166, Peach_0166] +- [0x14, 0x0167, Peach_0167] +- [0x14, 0x0168, Peach_0168] +- [0x14, 0x0169, Peach_0169] +- [0x14, 0x016A, Peach_016A] +- [0x14, 0x016B, Peach_016B] +- [0x14, 0x016C, Peach_016C] +- [0x14, 0x016D, Peach_016D] +- [0x14, 0x016E, Peach_016E] +- [0x14, 0x016F, Peach_016F] +- [0x14, 0x0170, Peach_0170] +- [0x14, 0x0171, Peach_0171] +- [0x14, 0x0172, Peach_0172] +- [0x14, 0x0173, Peach_0173] +- [0x14, 0x0174, Peach_0174] +- [0x14, 0x0175, Peach_0175] +- [0x14, 0x0176, Peach_0176] +- [0x14, 0x0177, Peach_0177] +- [0x14, 0x0178, Peach_0178] +- [0x14, 0x0179, Peach_0179] +- [0x14, 0x017A, Peach_017A] +- [0x14, 0x017B, Peach_017B] +- [0x14, 0x017C, Peach_017C] +- [0x14, 0x017D, Peach_017D] +- [0x14, 0x017E, Peach_017E] +- [0x14, 0x017F, Peach_017F] +- [0x14, 0x0180, Peach_0180] +- [0x14, 0x0181, Peach_0181] +- [0x14, 0x0182, Peach_0182] +- [0x14, 0x0183, Peach_0183] +- [0x14, 0x0184, Peach_0184] +- [0x14, 0x0185, Peach_0185] +- [0x14, 0x0186, Peach_0186] +- [0x14, 0x0187, Peach_0187] +- [0x14, 0x0188, Peach_0188] +- [0x14, 0x0189, Peach_0189] +- [0x14, 0x018A, Peach_018A] +- [0x14, 0x018B, Peach_018B] +- [0x14, 0x018C, Peach_018C] +- [0x14, 0x018D, Peach_018D] +- [0x14, 0x018E, Peach_018E] +- [0x14, 0x018F, Peach_018F] +- [0x14, 0x0190, Peach_0190] +- [0x14, 0x0191, Peach_0191] +- [0x14, 0x0192, Peach_0192] +- [0x14, 0x0193, Peach_0193] +- [0x14, 0x0194, Peach_0194] +- [0x14, 0x0195, Peach_0195] +- [0x14, 0x0196, Peach_0196] +- [0x14, 0x0197, Peach_0197] +- [0x14, 0x0198, Peach_0198] +- [0x15, 0x0000, KootFavor_0000] +- [0x15, 0x0001, KootFavor_0001] +- [0x15, 0x0002, KootFavor_0002] +- [0x15, 0x0003, KootFavor_0003] +- [0x15, 0x0004, KootFavor_0004] +- [0x15, 0x0005, KootFavor_0005] +- [0x15, 0x0006, KootFavor_0006] +- [0x15, 0x0007, KootFavor_0007] +- [0x15, 0x0008, KootFavor_0008] +- [0x15, 0x0009, KootFavor_0009] +- [0x15, 0x000A, KootFavor_000A] +- [0x15, 0x000B, KootFavor_000B] +- [0x15, 0x000C, KootFavor_000C] +- [0x15, 0x000D, KootFavor_000D] +- [0x15, 0x000E, KootFavor_000E] +- [0x15, 0x000F, KootFavor_000F] +- [0x15, 0x0010, KootFavor_0010] +- [0x15, 0x0011, KootFavor_0011] +- [0x15, 0x0012, KootFavor_0012] +- [0x15, 0x0013, KootFavor_0013] +- [0x15, 0x0014, KootFavor_0014] +- [0x15, 0x0015, KootFavor_0015] +- [0x15, 0x0016, KootFavor_0016] +- [0x15, 0x0017, KootFavor_0017] +- [0x15, 0x0018, KootFavor_0018] +- [0x15, 0x0019, KootFavor_0019] +- [0x15, 0x001A, KootFavor_001A] +- [0x15, 0x001B, KootFavor_001B] +- [0x15, 0x001C, KootFavor_001C] +- [0x15, 0x001D, KootFavor_001D] +- [0x15, 0x001E, KootFavor_001E] +- [0x15, 0x001F, KootFavor_001F] +- [0x15, 0x0020, KootFavor_0020] +- [0x15, 0x0021, KootFavor_0021] +- [0x15, 0x0022, KootFavor_0022] +- [0x15, 0x0023, KootFavor_0023] +- [0x15, 0x0024, KootFavor_0024] +- [0x15, 0x0025, KootFavor_0025] +- [0x15, 0x0026, KootFavor_0026] +- [0x15, 0x0027, KootFavor_0027] +- [0x15, 0x0028, KootFavor_0028] +- [0x15, 0x0029, KootFavor_0029] +- [0x15, 0x002A, KootFavor_002A] +- [0x15, 0x002B, KootFavor_002B] +- [0x15, 0x002C, KootFavor_002C] +- [0x15, 0x002D, KootFavor_002D] +- [0x15, 0x002E, KootFavor_002E] +- [0x15, 0x002F, KootFavor_002F] +- [0x15, 0x0030, KootFavor_0030] +- [0x15, 0x0031, KootFavor_0031] +- [0x15, 0x0032, KootFavor_0032] +- [0x15, 0x0033, KootFavor_0033] +- [0x15, 0x0034, KootFavor_0034] +- [0x15, 0x0035, KootFavor_0035] +- [0x15, 0x0036, KootFavor_0036] +- [0x15, 0x0037, KootFavor_0037] +- [0x15, 0x0038, KootFavor_0038] +- [0x15, 0x0039, KootFavor_0039] +- [0x15, 0x003A, KootFavor_003A] +- [0x15, 0x003B, KootFavor_003B] +- [0x15, 0x003C, KootFavor_003C] +- [0x16, 0x0000, RussTHint_0000] +- [0x16, 0x0001, RussTHint_0001] +- [0x16, 0x0002, RussTHint_0002] +- [0x16, 0x0003, RussTHint_0003] +- [0x16, 0x0004, RussTHint_0004] +- [0x16, 0x0005, RussTHint_0005] +- [0x16, 0x0006, RussTHint_0006] +- [0x16, 0x0007, RussTHint_0007] +- [0x16, 0x0008, RussTHint_0008] +- [0x16, 0x0009, RussTHint_0009] +- [0x16, 0x000A, RussTHint_000A] +- [0x16, 0x000B, RussTHint_000B] +- [0x16, 0x000C, RussTHint_000C] +- [0x16, 0x000D, RussTHint_000D] +- [0x16, 0x000E, RussTHint_000E] +- [0x16, 0x000F, RussTHint_000F] +- [0x16, 0x0010, RussTHint_0010] +- [0x16, 0x0011, RussTHint_0011] +- [0x16, 0x0012, RussTHint_0012] +- [0x16, 0x0013, RussTHint_0013] +- [0x16, 0x0014, RussTHint_0014] +- [0x16, 0x0015, RussTHint_0015] +- [0x16, 0x0016, RussTHint_0016] +- [0x16, 0x0017, RussTHint_0017] +- [0x16, 0x0018, RussTHint_0018] +- [0x16, 0x0019, RussTHint_0019] +- [0x16, 0x001A, RussTHint_001A] +- [0x16, 0x001B, RussTHint_001B] +- [0x16, 0x001C, RussTHint_001C] +- [0x16, 0x001D, RussTHint_001D] +- [0x16, 0x001E, RussTHint_001E] +- [0x16, 0x001F, RussTHint_001F] +- [0x16, 0x0020, RussTHint_0020] +- [0x16, 0x0021, RussTHint_0021] +- [0x16, 0x0022, RussTHint_0022] +- [0x16, 0x0023, RussTHint_0023] +- [0x17, 0x0000, NewsBoard_0000] +- [0x17, 0x0001, NewsBoard_0001] +- [0x17, 0x0002, NewsBoard_0002] +- [0x17, 0x0003, NewsBoard_0003] +- [0x17, 0x0004, NewsBoard_0004] +- [0x17, 0x0005, NewsBoard_0005] +- [0x17, 0x0006, NewsBoard_0006] +- [0x17, 0x0007, NewsBoard_0007] +- [0x17, 0x0008, NewsBoard_0008] +- [0x17, 0x0009, NewsBoard_0009] +- [0x17, 0x000A, NewsBoard_000A] +- [0x17, 0x000B, NewsBoard_000B] +- [0x17, 0x000C, NewsBoard_000C] +- [0x17, 0x000D, NewsBoard_000D] +- [0x17, 0x000E, NewsBoard_000E] +- [0x17, 0x000F, NewsBoard_000F] +- [0x17, 0x0010, NewsBoard_0010] +- [0x17, 0x0011, NewsBoard_0011] +- [0x17, 0x0012, NewsBoard_0012] +- [0x17, 0x0013, NewsBoard_0013] +- [0x17, 0x0014, NewsBoard_0014] +- [0x17, 0x0015, NewsBoard_0015] +- [0x17, 0x0016, NewsBoard_0016] +- [0x17, 0x0017, NewsBoard_0017] +- [0x17, 0x0018, NewsBoard_0018] +- [0x17, 0x0019, NewsBoard_0019] +- [0x18, 0x0000, GossipBoard_0000] +- [0x18, 0x0001, GossipBoard_0001] +- [0x18, 0x0002, GossipBoard_0002] +- [0x18, 0x0003, GossipBoard_0003] +- [0x18, 0x0004, GossipBoard_0004] +- [0x18, 0x0005, GossipBoard_0005] +- [0x18, 0x0006, GossipBoard_0006] +- [0x18, 0x0007, GossipBoard_0007] +- [0x18, 0x0008, GossipBoard_0008] +- [0x18, 0x0009, GossipBoard_0009] +- [0x18, 0x000A, GossipBoard_000A] +- [0x18, 0x000B, GossipBoard_000B] +- [0x18, 0x000C, GossipBoard_000C] +- [0x18, 0x000D, GossipBoard_000D] +- [0x18, 0x000E, GossipBoard_000E] +- [0x18, 0x000F, GossipBoard_000F] +- [0x18, 0x0010, GossipBoard_0010] +- [0x18, 0x0011, GossipBoard_0011] +- [0x18, 0x0012, GossipBoard_0012] +- [0x18, 0x0013, GossipBoard_0013] +- [0x18, 0x0014, GossipBoard_0014] +- [0x18, 0x0015, GossipBoard_0015] +- [0x18, 0x0016, GossipBoard_0016] +- [0x18, 0x0017, GossipBoard_0017] +- [0x18, 0x0018, GossipBoard_0018] +- [0x18, 0x0019, GossipBoard_0019] +- [0x19, 0x0000, MapTattle_mac_00] +- [0x19, 0x0001, MapTattle_mac_01] +- [0x19, 0x0002, MapTattle_mac_02] +- [0x19, 0x0003, MapTattle_mac_03] +- [0x19, 0x0004, MapTattle_mac_04] +- [0x19, 0x0005, MapTattle_mac_05] +- [0x19, 0x0006, MapTattle_mgm_00] +- [0x19, 0x0007, MapTattle_mgm_01] +- [0x19, 0x0008, MapTattle_mgm_02] +- [0x19, 0x0009, MapTattle_osr_01] +- [0x19, 0x000A, MapTattle_osr_02] +- [0x19, 0x000B, MapTattle_kkj_10] +- [0x19, 0x000C, MapTattle_kkj_11] +- [0x19, 0x000D, MapTattle_kkj_12] +- [0x19, 0x000E, MapTattle_kkj_13] +- [0x19, 0x000F, MapTattle_kkj_14] +- [0x19, 0x0010, MapTattle_kkj_15] +- [0x19, 0x0011, MapTattle_kkj_16] +- [0x19, 0x0012, MapTattle_kkj_17] +- [0x19, 0x0013, MapTattle_kkj_18] +- [0x19, 0x0014, MapTattle_kkj_19] +- [0x19, 0x0015, MapTattle_kkj_20] +- [0x19, 0x0016, MapTattle_kkj_21] +- [0x19, 0x0017, MapTattle_kkj_22] +- [0x19, 0x0018, MapTattle_kkj_23] +- [0x19, 0x0019, MapTattle_kkj_24] +- [0x19, 0x001A, MapTattle_kkj_25] +- [0x19, 0x001B, MapTattle_kkj_26] +- [0x19, 0x001C, MapTattle_hos_00] +- [0x19, 0x001D, MapTattle_hos_01] +- [0x19, 0x001E, MapTattle_hos_02] +- [0x19, 0x001F, MapTattle_hos_03] +- [0x19, 0x0020, MapTattle_hos_04] +- [0x19, 0x0021, MapTattle_hos_05] +- [0x19, 0x0022, MapTattle_hos_06] +- [0x19, 0x0023, MapTattle_tik_01] +- [0x19, 0x0024, MapTattle_tik_02] +- [0x19, 0x0025, MapTattle_tik_03] +- [0x19, 0x0026, MapTattle_tik_04] +- [0x19, 0x0027, MapTattle_tik_05] +- [0x19, 0x0028, MapTattle_tik_06] +- [0x19, 0x0029, MapTattle_tik_07] +- [0x19, 0x002A, MapTattle_tik_08] +- [0x19, 0x002B, MapTattle_tik_09] +- [0x19, 0x002C, MapTattle_tik_10] +- [0x19, 0x002D, MapTattle_tik_12] +- [0x19, 0x002E, MapTattle_tik_14] +- [0x19, 0x002F, MapTattle_tik_15] +- [0x19, 0x0030, MapTattle_tik_17] +- [0x19, 0x0031, MapTattle_tik_18] +- [0x19, 0x0032, MapTattle_tik_19] +- [0x19, 0x0033, MapTattle_tik_20] +- [0x19, 0x0034, MapTattle_tik_21] +- [0x19, 0x0035, MapTattle_tik_22] +- [0x19, 0x0036, MapTattle_tik_23] +- [0x19, 0x0037, MapTattle_tik_24] +- [0x19, 0x0038, MapTattle_tik_25] +- [0x19, 0x0039, MapTattle_kmr_00] +- [0x19, 0x003A, MapTattle_kmr_02] +- [0x19, 0x003B, MapTattle_kmr_03] +- [0x19, 0x003C, MapTattle_kmr_04] +- [0x19, 0x003D, MapTattle_kmr_05] +- [0x19, 0x003E, MapTattle_kmr_06] +- [0x19, 0x003F, MapTattle_kmr_07] +- [0x19, 0x0040, MapTattle_kmr_12] +- [0x19, 0x0041, MapTattle_kmr_09] +- [0x19, 0x0042, MapTattle_kmr_11] +- [0x19, 0x0043, MapTattle_kmr_10] +- [0x19, 0x0044, MapTattle_kmr_20] +- [0x19, 0x0045, MapTattle_nok_11] +- [0x19, 0x0046, MapTattle_nok_12] +- [0x19, 0x0047, MapTattle_nok_13] +- [0x19, 0x0048, MapTattle_nok_01] +- [0x19, 0x0049, MapTattle_nok_02] +- [0x19, 0x004A, MapTattle_nok_03] +- [0x19, 0x004B, MapTattle_nok_04] +- [0x19, 0x004C, MapTattle_nok_14] +- [0x19, 0x004D, MapTattle_nok_15] +- [0x19, 0x004E, MapTattle_trd_00] +- [0x19, 0x004F, MapTattle_trd_01] +- [0x19, 0x0050, MapTattle_trd_02] +- [0x19, 0x0051, MapTattle_trd_03] +- [0x19, 0x0052, MapTattle_trd_04] +- [0x19, 0x0053, MapTattle_trd_05] +- [0x19, 0x0054, MapTattle_trd_06] +- [0x19, 0x0055, MapTattle_trd_07] +- [0x19, 0x0056, MapTattle_trd_08] +- [0x19, 0x0057, MapTattle_trd_09] +- [0x19, 0x0058, MapTattle_trd_10] +- [0x19, 0x0059, MapTattle_iwa_10] +- [0x19, 0x005A, MapTattle_iwa_00] +- [0x19, 0x005B, MapTattle_iwa_01] +- [0x19, 0x005C, MapTattle_iwa_02] +- [0x19, 0x005D, MapTattle_iwa_03] +- [0x19, 0x005E, MapTattle_iwa_04] +- [0x19, 0x005F, MapTattle_sbk_99] +- [0x19, 0x0060, MapTattle_sbk_00] +- [0x19, 0x0061, MapTattle_sbk_01] +- [0x19, 0x0062, MapTattle_sbk_02_before] +- [0x19, 0x0063, MapTattle_sbk_02_after] +- [0x19, 0x0064, MapTattle_sbk_03] +- [0x19, 0x0065, MapTattle_sbk_04] +- [0x19, 0x0066, MapTattle_sbk_05] +- [0x19, 0x0067, MapTattle_sbk_06] +- [0x19, 0x0068, MapTattle_sbk_10] +- [0x19, 0x0069, MapTattle_sbk_11] +- [0x19, 0x006A, MapTattle_sbk_12] +- [0x19, 0x006B, MapTattle_sbk_13] +- [0x19, 0x006C, MapTattle_sbk_14] +- [0x19, 0x006D, MapTattle_sbk_15] +- [0x19, 0x006E, MapTattle_sbk_16] +- [0x19, 0x006F, MapTattle_sbk_20] +- [0x19, 0x0070, MapTattle_sbk_21] +- [0x19, 0x0071, MapTattle_sbk_22] +- [0x19, 0x0072, MapTattle_sbk_23] +- [0x19, 0x0073, MapTattle_sbk_24] +- [0x19, 0x0074, MapTattle_sbk_25] +- [0x19, 0x0075, MapTattle_sbk_26] +- [0x19, 0x0076, MapTattle_sbk_30_before] +- [0x19, 0x0077, MapTattle_sbk_30_after] +- [0x19, 0x0078, MapTattle_sbk_31] +- [0x19, 0x0079, MapTattle_sbk_32] +- [0x19, 0x007A, MapTattle_sbk_33] +- [0x19, 0x007B, MapTattle_sbk_34] +- [0x19, 0x007C, MapTattle_sbk_35] +- [0x19, 0x007D, MapTattle_sbk_36] +- [0x19, 0x007E, MapTattle_sbk_40] +- [0x19, 0x007F, MapTattle_sbk_41] +- [0x19, 0x0080, MapTattle_sbk_42] +- [0x19, 0x0081, MapTattle_sbk_43] +- [0x19, 0x0082, MapTattle_sbk_44] +- [0x19, 0x0083, MapTattle_sbk_45] +- [0x19, 0x0084, MapTattle_sbk_46] +- [0x19, 0x0085, MapTattle_sbk_50] +- [0x19, 0x0086, MapTattle_sbk_51] +- [0x19, 0x0087, MapTattle_sbk_52] +- [0x19, 0x0088, MapTattle_sbk_53] +- [0x19, 0x0089, MapTattle_sbk_54] +- [0x19, 0x008A, MapTattle_sbk_55] +- [0x19, 0x008B, MapTattle_sbk_56] +- [0x19, 0x008C, MapTattle_sbk_60] +- [0x19, 0x008D, MapTattle_sbk_61] +- [0x19, 0x008E, MapTattle_sbk_62] +- [0x19, 0x008F, MapTattle_sbk_63] +- [0x19, 0x0090, MapTattle_sbk_64] +- [0x19, 0x0091, MapTattle_sbk_65] +- [0x19, 0x0092, MapTattle_sbk_66] +- [0x19, 0x0093, MapTattle_dro_01] +- [0x19, 0x0094, MapTattle_dro_02] +- [0x19, 0x0095, MapTattle_isk_01] +- [0x19, 0x0096, MapTattle_isk_02] +- [0x19, 0x0097, MapTattle_isk_03] +- [0x19, 0x0098, MapTattle_isk_04] +- [0x19, 0x0099, MapTattle_isk_05] +- [0x19, 0x009A, MapTattle_isk_06] +- [0x19, 0x009B, MapTattle_isk_07] +- [0x19, 0x009C, MapTattle_isk_08] +- [0x19, 0x009D, MapTattle_isk_09] +- [0x19, 0x009E, MapTattle_isk_10] +- [0x19, 0x009F, MapTattle_isk_11] +- [0x19, 0x00A0, MapTattle_isk_12] +- [0x19, 0x00A1, MapTattle_isk_13] +- [0x19, 0x00A2, MapTattle_isk_14] +- [0x19, 0x00A3, MapTattle_isk_16] +- [0x19, 0x00A4, MapTattle_isk_18] +- [0x19, 0x00A5, MapTattle_isk_19] +- [0x19, 0x00A6, MapTattle_mim_10] +- [0x19, 0x00A7, MapTattle_mim_01] +- [0x19, 0x00A8, MapTattle_mim_02] +- [0x19, 0x00A9, MapTattle_mim_03] +- [0x19, 0x00AA, MapTattle_mim_04] +- [0x19, 0x00AB, MapTattle_mim_05] +- [0x19, 0x00AC, MapTattle_mim_06] +- [0x19, 0x00AD, MapTattle_mim_07] +- [0x19, 0x00AE, MapTattle_mim_08] +- [0x19, 0x00AF, MapTattle_mim_09] +- [0x19, 0x00B0, MapTattle_mim_11] +- [0x19, 0x00B1, MapTattle_mim_12] +- [0x19, 0x00B2, MapTattle_obk_01] +- [0x19, 0x00B3, MapTattle_obk_02] +- [0x19, 0x00B4, MapTattle_obk_03] +- [0x19, 0x00B5, MapTattle_obk_04] +- [0x19, 0x00B6, MapTattle_obk_05] +- [0x19, 0x00B7, MapTattle_obk_06] +- [0x19, 0x00B8, MapTattle_obk_07] +- [0x19, 0x00B9, MapTattle_obk_08] +- [0x19, 0x00BA, MapTattle_obk_09] +- [0x19, 0x00BB, MapTattle_arn_07] +- [0x19, 0x00BC, MapTattle_arn_03] +- [0x19, 0x00BD, MapTattle_arn_05] +- [0x19, 0x00BE, MapTattle_arn_02] +- [0x19, 0x00BF, MapTattle_arn_04] +- [0x19, 0x00C0, MapTattle_dgb_00] +- [0x19, 0x00C1, MapTattle_dgb_01] +- [0x19, 0x00C2, MapTattle_dgb_02] +- [0x19, 0x00C3, MapTattle_dgb_03] +- [0x19, 0x00C4, MapTattle_dgb_04] +- [0x19, 0x00C5, MapTattle_dgb_05] +- [0x19, 0x00C6, MapTattle_dgb_06] +- [0x19, 0x00C7, MapTattle_dgb_07] +- [0x19, 0x00C8, MapTattle_dgb_08] +- [0x19, 0x00C9, MapTattle_dgb_09] +- [0x19, 0x00CA, MapTattle_dgb_10] +- [0x19, 0x00CB, MapTattle_dgb_11] +- [0x19, 0x00CC, MapTattle_dgb_12] +- [0x19, 0x00CD, MapTattle_dgb_13] +- [0x19, 0x00CE, MapTattle_dgb_14] +- [0x19, 0x00CF, MapTattle_dgb_15] +- [0x19, 0x00D0, MapTattle_dgb_16] +- [0x19, 0x00D1, MapTattle_dgb_17] +- [0x19, 0x00D2, MapTattle_dgb_18] +- [0x19, 0x00D3, MapTattle_arn_08] +- [0x19, 0x00D4, MapTattle_arn_09] +- [0x19, 0x00D5, MapTattle_arn_10] +- [0x19, 0x00D6, MapTattle_arn_12] +- [0x19, 0x00D7, MapTattle_arn_13] +- [0x19, 0x00D8, MapTattle_arn_11] +- [0x19, 0x00D9, MapTattle_omo_01] +- [0x19, 0x00DA, MapTattle_omo_02] +- [0x19, 0x00DB, MapTattle_omo_03] +- [0x19, 0x00DC, MapTattle_omo_04] +- [0x19, 0x00DD, MapTattle_omo_05] +- [0x19, 0x00DE, MapTattle_omo_06] +- [0x19, 0x00DF, MapTattle_omo_07] +- [0x19, 0x00E0, MapTattle_omo_08] +- [0x19, 0x00E1, MapTattle_omo_09] +- [0x19, 0x00E2, MapTattle_omo_10] +- [0x19, 0x00E3, MapTattle_omo_11] +- [0x19, 0x00E4, MapTattle_omo_12] +- [0x19, 0x00E5, MapTattle_omo_13] +- [0x19, 0x00E6, MapTattle_omo_14] +- [0x19, 0x00E7, MapTattle_omo_15] +- [0x19, 0x00E8, MapTattle_omo_17] +- [0x19, 0x00E9, MapTattle_kgr_01] +- [0x19, 0x00EA, MapTattle_kgr_02] +- [0x19, 0x00EB, MapTattle_jan_00] +- [0x19, 0x00EC, MapTattle_jan_01] +- [0x19, 0x00ED, MapTattle_jan_02] +- [0x19, 0x00EE, MapTattle_jan_03] +- [0x19, 0x00EF, MapTattle_jan_22] +- [0x19, 0x00F0, MapTattle_jan_04_before] +- [0x19, 0x00F1, MapTattle_jan_04_after] +- [0x19, 0x00F2, MapTattle_jan_05_before] +- [0x19, 0x00F3, MapTattle_jan_05_after] +- [0x19, 0x00F4, MapTattle_jan_08] +- [0x19, 0x00F5, MapTattle_jan_09] +- [0x19, 0x00F6, MapTattle_jan_10] +- [0x19, 0x00F7, MapTattle_jan_07] +- [0x19, 0x00F8, MapTattle_jan_06] +- [0x19, 0x00F9, MapTattle_jan_11] +- [0x19, 0x00FA, MapTattle_jan_12] +- [0x19, 0x00FB, MapTattle_jan_13] +- [0x19, 0x00FC, MapTattle_jan_14] +- [0x19, 0x00FD, MapTattle_jan_15] +- [0x19, 0x00FE, MapTattle_jan_16] +- [0x19, 0x00FF, MapTattle_jan_17] +- [0x19, 0x0100, MapTattle_jan_18] +- [0x19, 0x0101, MapTattle_jan_19] +- [0x19, 0x0102, MapTattle_jan_23] +- [0x19, 0x0103, MapTattle_kzn_01] +- [0x19, 0x0104, MapTattle_kzn_02] +- [0x19, 0x0105, MapTattle_kzn_03] +- [0x19, 0x0106, MapTattle_kzn_04] +- [0x19, 0x0107, MapTattle_kzn_05] +- [0x19, 0x0108, MapTattle_kzn_06] +- [0x19, 0x0109, MapTattle_kzn_07] +- [0x19, 0x010A, MapTattle_kzn_08] +- [0x19, 0x010B, MapTattle_kzn_09] +- [0x19, 0x010C, MapTattle_kzn_10] +- [0x19, 0x010D, MapTattle_kzn_11] +- [0x19, 0x010E, MapTattle_kzn_17] +- [0x19, 0x010F, MapTattle_kzn_18_before] +- [0x19, 0x0110, MapTattle_kzn_18_after] +- [0x19, 0x0111, MapTattle_kzn_19] +- [0x19, 0x0112, MapTattle_kzn_20] +- [0x19, 0x0113, MapTattle_kzn_22] +- [0x19, 0x0114, MapTattle_flo_00] +- [0x19, 0x0115, MapTattle_flo_03] +- [0x19, 0x0116, MapTattle_flo_07] +- [0x19, 0x0117, MapTattle_flo_08] +- [0x19, 0x0118, MapTattle_flo_09] +- [0x19, 0x0119, MapTattle_flo_10_before] +- [0x19, 0x011A, MapTattle_flo_10_after] +- [0x19, 0x011B, MapTattle_flo_11] +- [0x19, 0x011C, MapTattle_flo_12] +- [0x19, 0x011D, MapTattle_flo_13] +- [0x19, 0x011E, MapTattle_flo_14] +- [0x19, 0x011F, MapTattle_flo_15] +- [0x19, 0x0120, MapTattle_flo_16] +- [0x19, 0x0121, MapTattle_flo_17] +- [0x19, 0x0122, MapTattle_flo_18] +- [0x19, 0x0123, MapTattle_flo_19] +- [0x19, 0x0124, MapTattle_flo_21] +- [0x19, 0x0125, MapTattle_flo_22] +- [0x19, 0x0126, MapTattle_flo_23] +- [0x19, 0x0127, MapTattle_flo_24] +- [0x19, 0x0128, MapTattle_flo_25] +- [0x19, 0x0129, MapTattle_sam_01] +- [0x19, 0x012A, MapTattle_sam_02] +- [0x19, 0x012B, MapTattle_sam_11_before] +- [0x19, 0x012C, MapTattle_sam_11_after] +- [0x19, 0x012D, MapTattle_sam_03] +- [0x19, 0x012E, MapTattle_sam_04] +- [0x19, 0x012F, MapTattle_sam_05] +- [0x19, 0x0130, MapTattle_sam_06] +- [0x19, 0x0131, MapTattle_sam_07] +- [0x19, 0x0132, MapTattle_sam_08] +- [0x19, 0x0133, MapTattle_sam_09] +- [0x19, 0x0134, MapTattle_sam_10] +- [0x19, 0x0135, MapTattle_sam_12] +- [0x19, 0x0136, MapTattle_pra_01] +- [0x19, 0x0137, MapTattle_pra_02] +- [0x19, 0x0138, MapTattle_pra_03] +- [0x19, 0x0139, MapTattle_pra_04] +- [0x19, 0x013A, MapTattle_pra_05] +- [0x19, 0x013B, MapTattle_pra_06] +- [0x19, 0x013C, MapTattle_pra_09] +- [0x19, 0x013D, MapTattle_pra_10] +- [0x19, 0x013E, MapTattle_pra_11] +- [0x19, 0x013F, MapTattle_pra_12] +- [0x19, 0x0140, MapTattle_pra_13] +- [0x19, 0x0141, MapTattle_pra_14] +- [0x19, 0x0142, MapTattle_pra_15] +- [0x19, 0x0143, MapTattle_pra_16] +- [0x19, 0x0144, MapTattle_pra_18] +- [0x19, 0x0145, MapTattle_pra_19] +- [0x19, 0x0146, MapTattle_pra_20] +- [0x19, 0x0147, MapTattle_pra_21] +- [0x19, 0x0148, MapTattle_pra_22] +- [0x19, 0x0149, MapTattle_pra_27] +- [0x19, 0x014A, MapTattle_pra_28] +- [0x19, 0x014B, MapTattle_pra_29] +- [0x19, 0x014C, MapTattle_pra_31] +- [0x19, 0x014D, MapTattle_pra_32] +- [0x19, 0x014E, MapTattle_pra_33] +- [0x19, 0x014F, MapTattle_pra_34] +- [0x19, 0x0150, MapTattle_pra_35] +- [0x19, 0x0151, MapTattle_pra_36] +- [0x19, 0x0152, MapTattle_pra_37] +- [0x19, 0x0153, MapTattle_pra_38] +- [0x19, 0x0154, MapTattle_pra_39] +- [0x19, 0x0155, MapTattle_pra_40] +- [0x19, 0x0156, MapTattle_kpa_63] +- [0x19, 0x0157, MapTattle_kpa_62] +- [0x19, 0x0158, MapTattle_kpa_10] +- [0x19, 0x0159, MapTattle_kpa_70] +- [0x19, 0x015A, MapTattle_kpa_50] +- [0x19, 0x015B, MapTattle_kpa_90] +- [0x19, 0x015C, MapTattle_kpa_91] +- [0x19, 0x015D, MapTattle_kpa_51] +- [0x19, 0x015E, MapTattle_kpa_81] +- [0x19, 0x015F, MapTattle_kpa_17] +- [0x19, 0x0160, MapTattle_kpa_12_before] +- [0x19, 0x0161, MapTattle_kpa_12_after] +- [0x19, 0x0162, MapTattle_kpa_13_before] +- [0x19, 0x0163, MapTattle_kpa_13_after] +- [0x19, 0x0164, MapTattle_kpa_14_before] +- [0x19, 0x0165, MapTattle_kpa_14_after] +- [0x19, 0x0166, MapTattle_kpa_15] +- [0x19, 0x0167, MapTattle_kpa_16] +- [0x19, 0x0168, MapTattle_kpa_01] +- [0x19, 0x0169, MapTattle_kpa_03] +- [0x19, 0x016A, MapTattle_kpa_04] +- [0x19, 0x016B, MapTattle_kpa_32] +- [0x19, 0x016C, MapTattle_kpa_96] +- [0x19, 0x016D, MapTattle_kpa_130] +- [0x19, 0x016E, MapTattle_kpa_133] +- [0x19, 0x016F, MapTattle_kpa_134] +- [0x19, 0x0170, MapTattle_kpa_83] +- [0x19, 0x0171, MapTattle_kpa_52] +- [0x19, 0x0172, MapTattle_kpa_08] +- [0x19, 0x0173, MapTattle_kpa_100] +- [0x19, 0x0174, MapTattle_kpa_40] +- [0x19, 0x0175, MapTattle_kpa_41] +- [0x19, 0x0176, MapTattle_kpa_82] +- [0x19, 0x0177, MapTattle_kpa_61] +- [0x19, 0x0178, MapTattle_kpa_33] +- [0x19, 0x0179, MapTattle_kpa_94] +- [0x19, 0x017A, MapTattle_kpa_95] +- [0x19, 0x017B, MapTattle_kpa_09] +- [0x19, 0x017C, MapTattle_kpa_101] +- [0x19, 0x017D, MapTattle_kpa_102] +- [0x19, 0x017E, MapTattle_kpa_53] +- [0x19, 0x017F, MapTattle_kpa_111] +- [0x19, 0x0180, MapTattle_kpa_112] +- [0x19, 0x0181, MapTattle_kpa_113] +- [0x19, 0x0182, MapTattle_kpa_114] +- [0x19, 0x0183, MapTattle_kpa_115] +- [0x19, 0x0184, MapTattle_kpa_116] +- [0x19, 0x0185, MapTattle_kpa_117] +- [0x19, 0x0186, MapTattle_kpa_118] +- [0x19, 0x0187, MapTattle_kpa_119] +- [0x19, 0x0188, MapTattle_kpa_121] +- [0x1A, 0x0000, NpcTattle_Kolorado] +- [0x1A, 0x0001, NpcTattle_Archeologist] +- [0x1A, 0x0002, NpcTattle_ChuckQuizmo] +- [0x1A, 0x0003, NpcTattle_TravelingMaidA] +- [0x1A, 0x0004, NpcTattle_TravelingMaidB] +- [0x1A, 0x0005, NpcTattle_TravelingMaidC] +- [0x1A, 0x0006, NpcTattle_JrTroopa] +- [0x1A, 0x0007, NpcTattle_PrizeToad] +- [0x1A, 0x0008, NpcTattle_Merluvlee] +- [0x1A, 0x0009, NpcTattle_Merlow] +- [0x1A, 0x000A, NpcTattle_Eldstar] +- [0x1A, 0x000B, NpcTattle_Misstar] +- [0x1A, 0x000C, NpcTattle_OSR_LovesToClean] +- [0x1A, 0x000D, NpcTattle_RipCheato] +- [0x1A, 0x000E, NpcTattle_RussT] +- [0x1A, 0x000F, NpcTattle_TheMaster] +- [0x1A, 0x0010, NpcTattle_Chan] +- [0x1A, 0x0011, NpcTattle_Lee] +- [0x1A, 0x0012, NpcTattle_MAC00_ShopOwner] +- [0x1A, 0x0013, NpcTattle_MAC_GateGuardian] +- [0x1A, 0x0014, NpcTattle_MAC_ShopLoiterer] +- [0x1A, 0x0015, NpcTattle_MAC_NewsEnthusiast] +- [0x1A, 0x0016, NpcTattle_MAC_FickleLovers] +- [0x1A, 0x0017, NpcTattle_MAC_ShamelessLover] +- [0x1A, 0x0018, NpcTattle_MAC_ThreeSisters_Eldest] +- [0x1A, 0x0019, NpcTattle_MAC_ThreeSisters_Middle] +- [0x1A, 0x001A, NpcTattle_MAC_ThreeSisters_Youngest] +- [0x1A, 0x001B, NpcTattle_MAC_DojoSpectator] +- [0x1A, 0x001C, NpcTattle_MAC_LuckyCastleWorker] +- [0x1A, 0x001D, NpcTattle_MAC_Homemaker] +- [0x1A, 0x001E, NpcTattle_MAC_FriendlyToadKid] +- [0x1A, 0x001F, NpcTattle_MAC_PowerHungryToadKid] +- [0x1A, 0x0020, NpcTattle_MAC_DojoFanToad] +- [0x1A, 0x0021, NpcTattle_Merlon] +- [0x1A, 0x0022, NpcTattle_Postmaster] +- [0x1A, 0x0023, NpcTattle_MAC_Parakarry] +- [0x1A, 0x0024, NpcTattle_Rowf] +- [0x1A, 0x0025, NpcTattle_Rhuff] +- [0x1A, 0x0026, NpcTattle_MinhT] +- [0x1A, 0x0027, NpcTattle_DarkToadA] +- [0x1A, 0x0028, NpcTattle_DarkToadB] +- [0x1A, 0x0029, NpcTattle_DarkToadC] +- [0x1A, 0x002A, NpcTattle_DarkToadD] +- [0x1A, 0x002B, NpcTattle_MAC_RunsHisMouth] +- [0x1A, 0x002C, NpcTattle_MAC_KnowsTheGossip] +- [0x1A, 0x002D, NpcTattle_MAC_PrincessFan] +- [0x1A, 0x002E, NpcTattle_MAC_KnowsTheRumors] +- [0x1A, 0x002F, NpcTattle_MAC_CrushingOnMinhT] +- [0x1A, 0x0030, NpcTattle_MAC_SeeksTheSouth] +- [0x1A, 0x0031, NpcTattle_MAC_ToadHouseToad] +- [0x1A, 0x0032, NpcTattle_MAC_FlowerGateBubulb] +- [0x1A, 0x0033, NpcTattle_TayceT] +- [0x1A, 0x0034, NpcTattle_FiceT] +- [0x1A, 0x0035, NpcTattle_MAC_HardWorker] +- [0x1A, 0x0036, NpcTattle_MAC_CookingApprentice] +- [0x1A, 0x0037, NpcTattle_MAC_CantKeepQuiet] +- [0x1A, 0x0038, NpcTattle_MAC_FickleDreamer] +- [0x1A, 0x0039, NpcTattle_MAC_PrettySmart] +- [0x1A, 0x003A, NpcTattle_MAC_PetBoaster] +- [0x1A, 0x003B, NpcTattle_MAC_Bubulb_Hidden] +- [0x1A, 0x003C, NpcTattle_MAC_Bubulb_Revealed] +- [0x1A, 0x003D, NpcTattle_MAC_StationMaster] +- [0x1A, 0x003E, NpcTattle_MAC_TrainLover] +- [0x1A, 0x003F, NpcTattle_MAC_CaringToad] +- [0x1A, 0x0040, NpcTattle_MAC_DesertTraveler] +- [0x1A, 0x0041, NpcTattle_MAC_TravelFan] +- [0x1A, 0x0042, NpcTattle_MAC_GoodFriends] +- [0x1A, 0x0043, NpcTattle_MAC_LilOinkFan] +- [0x1A, 0x0044, NpcTattle_HarryT_ShopOwner] +- [0x1A, 0x0045, NpcTattle_MAC_TalksAlot] +- [0x1A, 0x0046, NpcTattle_MAC_WaryListener] +- [0x1A, 0x0047, NpcTattle_MAC_CarefreeKids] +- [0x1A, 0x0048, NpcTattle_MAC_OutdoorKids] +- [0x1A, 0x0049, NpcTattle_MAC_ShyKid] +- [0x1A, 0x004A, NpcTattle_ToadWhoWalks] +- [0x1A, 0x004B, NpcTattle_GuideToad] +- [0x1A, 0x004C, NpcTattle_GreatGossipTrioA] +- [0x1A, 0x004D, NpcTattle_GreatGossipTrioB] +- [0x1A, 0x004E, NpcTattle_GreatGossipTrioC] +- [0x1A, 0x004F, NpcTattle_MAC_NewResidentA] +- [0x1A, 0x0050, NpcTattle_MAC_NewResidentB] +- [0x1A, 0x0051, NpcTattle_ChetRippo] +- [0x1A, 0x0052, NpcTattle_Club64_Bartender] +- [0x1A, 0x0053, NpcTattle_Fishmael] +- [0x1A, 0x0054, NpcTattle_Fuzzipede] +- [0x1A, 0x0055, NpcTattle_Whale] +- [0x1A, 0x0056, NpcTattle_Club64_Waiter] +- [0x1A, 0x0057, NpcTattle_PopDiva_CantSing] +- [0x1A, 0x0058, NpcTattle_PopDiva_CanSing] +- [0x1A, 0x0059, NpcTattle_MasterPoet] +- [0x1A, 0x005A, NpcTattle_MAC_PortGuide] +- [0x1A, 0x005B, NpcTattle_MAC_SeaLover] +- [0x1A, 0x005C, NpcTattle_MAC_WellTraveledToad] +- [0x1A, 0x005D, NpcTattle_MAC_SingsOffKey] +- [0x1A, 0x005E, NpcTattle_MGM_PlayroomReceptionist] +- [0x1A, 0x005F, NpcTattle_MGM_PlayroomCustomer] +- [0x1A, 0x0060, NpcTattle_MGM_BestPlayroomCustomer] +- [0x1A, 0x0061, NpcTattle_MGM_JumpAttackGuide] +- [0x1A, 0x0062, NpcTattle_MGM_SmashAttackGuide] +- [0x1A, 0x0063, NpcTattle_Goompa] +- [0x1A, 0x0064, NpcTattle_Gooma] +- [0x1A, 0x0065, NpcTattle_Goompapa] +- [0x1A, 0x0066, NpcTattle_Goomama] +- [0x1A, 0x0067, NpcTattle_Goombaria] +- [0x1A, 0x0068, NpcTattle_KMR_ToadHouseToad] +- [0x1A, 0x0069, NpcTattle_Luigi] +- [0x1A, 0x006A, NpcTattle_NOK_ToadHouseToad] +- [0x1A, 0x006B, NpcTattle_NOK_ShopOwner] +- [0x1A, 0x006C, NpcTattle_NOK_Greeter] +- [0x1A, 0x006D, NpcTattle_NOK_GenericKoopaA] +- [0x1A, 0x006E, NpcTattle_NOK_GenericKoopaB] +- [0x1A, 0x006F, NpcTattle_NOK_RadioLover] +- [0x1A, 0x0070, NpcTattle_NOK_BobombA] +- [0x1A, 0x0071, NpcTattle_NOK_BobombB] +- [0x1A, 0x0072, NpcTattle_NOK_BobombC] +- [0x1A, 0x0073, NpcTattle_KoloradoWife] +- [0x1A, 0x0074, NpcTattle_NOK_Kooper] +- [0x1A, 0x0075, NpcTattle_KoopaKoot] +- [0x1A, 0x0076, NpcTattle_NOK_GenericKoopaC] +- [0x1A, 0x0077, NpcTattle_NOK_GenericKoopaD] +- [0x1A, 0x0078, NpcTattle_NOK_SenseOfJustice] +- [0x1A, 0x0079, NpcTattle_NOK_PrettyMellow] +- [0x1A, 0x007A, NpcTattle_NOK_BobombD] +- [0x1A, 0x007B, NpcTattle_NOK_BobombE] +- [0x1A, 0x007C, NpcTattle_NOK_BobombF] +- [0x1A, 0x007D, NpcTattle_TRD_Bombette] +- [0x1A, 0x007E, NpcTattle_TRD_BobombA] +- [0x1A, 0x007F, NpcTattle_TRD_BobombB] +- [0x1A, 0x0080, NpcTattle_TRD_BobombC] +- [0x1A, 0x0081, NpcTattle_TRD_BobombD] +- [0x1A, 0x0082, NpcTattle_KentCKoopa] +- [0x1A, 0x0083, NpcTattle_IWA_StationMaster] +- [0x1A, 0x0084, NpcTattle_IWA_Parakarry] +- [0x1A, 0x0085, NpcTattle_IWA_TravelAgent] +- [0x1A, 0x0086, NpcTattle_IWA_StationLoiterer] +- [0x1A, 0x0087, NpcTattle_IWA_Bubulb_Hidden] +- [0x1A, 0x0088, NpcTattle_IWA_Bubulb_Revealed] +- [0x1A, 0x0089, NpcTattle_Whacka] +- [0x1A, 0x008A, NpcTattle_IWA_Conservationist] +- [0x1A, 0x008B, NpcTattle_SBK_Kolorado] +- [0x1A, 0x008C, NpcTattle_SBK_ExcavatorA] +- [0x1A, 0x008D, NpcTattle_SBK_ExcavatorB] +- [0x1A, 0x008E, NpcTattle_SBK_Nomadimouse] +- [0x1A, 0x008F, NpcTattle_DRO_ShopOwner] +- [0x1A, 0x0090, NpcTattle_DRO_Greeter] +- [0x1A, 0x0091, NpcTattle_DRO_DryiteA] +- [0x1A, 0x0092, NpcTattle_DRO_DryiteB] +- [0x1A, 0x0093, NpcTattle_DRO_DryiteC] +- [0x1A, 0x0094, NpcTattle_DRO_DryiteD] +- [0x1A, 0x0095, NpcTattle_Composer] +- [0x1A, 0x0096, NpcTattle_DRO_DojoGraduate] +- [0x1A, 0x0097, NpcTattle_DRO_WorriedDryite] +- [0x1A, 0x0098, NpcTattle_Sheek] +- [0x1A, 0x0099, NpcTattle_Moustafa] +- [0x1A, 0x009A, NpcTattle_DRO_ToadHouseToad] +- [0x1A, 0x009B, NpcTattle_Merlee] +- [0x1A, 0x009C, NpcTattle_DRO_DryiteE] +- [0x1A, 0x009D, NpcTattle_DRO_DryiteF] +- [0x1A, 0x009E, NpcTattle_DRO_CrushingOnMerlee] +- [0x1A, 0x009F, NpcTattle_DRO_TellsTales] +- [0x1A, 0x00A0, NpcTattle_DRO_VisitedShootingStarSummit] +- [0x1A, 0x00A1, NpcTattle_Oaklie] +- [0x1A, 0x00A2, NpcTattle_MIM_Bubulb_Hidden] +- [0x1A, 0x00A3, NpcTattle_MIM_Bubulb_Revealed] +- [0x1A, 0x00A4, NpcTattle_Bootler] +- [0x1A, 0x00A5, NpcTattle_OBK_ShopOwner] +- [0x1A, 0x00A6, NpcTattle_OBK_BooA] +- [0x1A, 0x00A7, NpcTattle_OBK_BooB] +- [0x1A, 0x00A8, NpcTattle_OBK_GuardingChest] +- [0x1A, 0x00A9, NpcTattle_OBK_BootsTutor] +- [0x1A, 0x00AA, NpcTattle_ARN_LovesBow] +- [0x1A, 0x00AB, NpcTattle_ARN_BooA] +- [0x1A, 0x00AC, NpcTattle_ARN_BooB] +- [0x1A, 0x00AD, NpcTattle_ARN_BooC] +- [0x1A, 0x00AE, NpcTattle_ARN_BooD] +- [0x1A, 0x00AF, NpcTattle_ARN_BooE] +- [0x1A, 0x00B0, NpcTattle_ARN_BooF] +- [0x1A, 0x00B1, NpcTattle_ARN_BooG] +- [0x1A, 0x00B2, NpcTattle_ARN_BooH] +- [0x1A, 0x00B3, NpcTattle_HidingBoo] +- [0x1A, 0x00B4, NpcTattle_Yakkey] +- [0x1A, 0x00B5, NpcTattle_BraveBoo] +- [0x1A, 0x00B6, NpcTattle_LastClubba] +- [0x1A, 0x00B7, NpcTattle_GourmetGuy] +- [0x1A, 0x00B8, NpcTattle_OMO_TrainConductor] +- [0x1A, 0x00B9, NpcTattle_OMO_Lantern] +- [0x1A, 0x00BA, NpcTattle_AntiGuy] +- [0x1A, 0x00BB, NpcTattle_MAC_ShyGuyShopOwner] +- [0x1A, 0x00BC, NpcTattle_VillageLeader] +- [0x1A, 0x00BD, NpcTattle_LeadersFriend] +- [0x1A, 0x00BE, NpcTattle_BlueYoshi] +- [0x1A, 0x00BF, NpcTattle_LikeableYoshi] +- [0x1A, 0x00C0, NpcTattle_EntranceYoshi] +- [0x1A, 0x00C1, NpcTattle_GenericYoshi] +- [0x1A, 0x00C2, NpcTattle_FoodLovingYoshi] +- [0x1A, 0x00C3, NpcTattle_GreenYoshiKid] +- [0x1A, 0x00C4, NpcTattle_BlueYoshiKid] +- [0x1A, 0x00C5, NpcTattle_PurpleYoshiKid] +- [0x1A, 0x00C6, NpcTattle_YellowYoshiKid] +- [0x1A, 0x00C7, NpcTattle_RedYoshiKid] +- [0x1A, 0x00C8, NpcTattle_JAN_ShopOwner] +- [0x1A, 0x00C9, NpcTattle_RavenA] +- [0x1A, 0x00CA, NpcTattle_RavenB] +- [0x1A, 0x00CB, NpcTattle_RavenC] +- [0x1A, 0x00CC, NpcTattle_RavenD] +- [0x1A, 0x00CD, NpcTattle_RavenE] +- [0x1A, 0x00CE, NpcTattle_JAN_ToadHouseToad] +- [0x1A, 0x00CF, NpcTattle_Sushie] +- [0x1A, 0x00D0, NpcTattle_RaphaelRaven] +- [0x1A, 0x00D1, NpcTattle_JAN_Bubulb_Hidden] +- [0x1A, 0x00D2, NpcTattle_JAN_Bubulb_Revealed] +- [0x1A, 0x00D3, NpcTattle_HeartPlant] +- [0x1A, 0x00D4, NpcTattle_MBush] +- [0x1A, 0x00D5, NpcTattle_FLO_BubulbA] +- [0x1A, 0x00D6, NpcTattle_FLO_BubulbB] +- [0x1A, 0x00D7, NpcTattle_FLO_BubulbC] +- [0x1A, 0x00D8, NpcTattle_FLO_BubulbD] +- [0x1A, 0x00D9, NpcTattle_Tolielup] +- [0x1A, 0x00DA, NpcTattle_RedGateFlower] +- [0x1A, 0x00DB, NpcTattle_YellowGateFlower] +- [0x1A, 0x00DC, NpcTattle_BlueGateFlower] +- [0x1A, 0x00DD, NpcTattle_Petunia] +- [0x1A, 0x00DE, NpcTattle_Posie] +- [0x1A, 0x00DF, NpcTattle_Lily] +- [0x1A, 0x00E0, NpcTattle_Rosie] +- [0x1A, 0x00E1, NpcTattle_TheSun] +- [0x1A, 0x00E2, NpcTattle_Lakilulu] +- [0x1A, 0x00E3, NpcTattle_BubblePlant] +- [0x1A, 0x00E4, NpcTattle_PuffPuffOperator] +- [0x1A, 0x00E5, NpcTattle_MayorPenguinWife] +- [0x1A, 0x00E6, NpcTattle_MayorPenguin] +- [0x1A, 0x00E7, NpcTattle_SAM_GossipPenguin] +- [0x1A, 0x00E8, NpcTattle_SAM_FriendlyPenguin] +- [0x1A, 0x00E9, NpcTattle_SAM_CheerfulPenguin] +- [0x1A, 0x00EA, NpcTattle_SAM_GenericPenguin] +- [0x1A, 0x00EB, NpcTattle_SAM_ShopOwner] +- [0x1A, 0x00EC, NpcTattle_SAM02_ToadHouseToad] +- [0x1A, 0x00ED, NpcTattle_SAM_RumorLovingPenguins] +- [0x1A, 0x00EE, NpcTattle_SAM_NotAdventurous] +- [0x1A, 0x00EF, NpcTattle_SAM_CorroboratesRumors] +- [0x1A, 0x00F0, NpcTattle_SAM_EasyGoing] +- [0x1A, 0x00F1, NpcTattle_SAM_NeverLeavesTown] +- [0x1A, 0x00F2, NpcTattle_SAM_VisitedTheDojo] +- [0x1A, 0x00F3, NpcTattle_SAM_Patrol] +- [0x1A, 0x00F4, NpcTattle_SAM_Gatekeeper] +- [0x1A, 0x00F5, NpcTattle_Herringway] +- [0x1A, 0x00F6, NpcTattle_SAM_SnowMaster] +- [0x1A, 0x00F7, NpcTattle_SAM_Skater] +- [0x1A, 0x00F8, NpcTattle_SAM_WarehouseGuard] +- [0x1A, 0x00F9, NpcTattle_SAM_HerringwayLoiterer] +- [0x1A, 0x00FA, NpcTattle_SAM_TimidPenguin] +- [0x1A, 0x00FB, NpcTattle_Merle] +- [0x1A, 0x00FC, NpcTattle_SAM_ShiverToadA] +- [0x1A, 0x00FD, NpcTattle_SAM_ShiverToadB] +- [0x1A, 0x00FE, NpcTattle_SAM_ShiverToadC] +- [0x1A, 0x00FF, NpcTattle_SAM_NinjiA] +- [0x1A, 0x0100, NpcTattle_SAM_NinjiB] +- [0x1A, 0x0101, NpcTattle_SAM_NinjiC] +- [0x1A, 0x0102, NpcTattle_SAM_StarKidA] +- [0x1A, 0x0103, NpcTattle_SAM_StarKidB] +- [0x1A, 0x0104, NpcTattle_SAM_PranksterStarKid] +- [0x1A, 0x0105, NpcTattle_SAM06_ToadHouseToad] +- [0x1A, 0x0106, NpcTattle_SAM_NinjiD] +- [0x1A, 0x0107, NpcTattle_SAM_BabyStarKid] +- [0x1A, 0x0108, NpcTattle_SAM_StarKidC] +- [0x1A, 0x0109, NpcTattle_SAM_StarKidD] +- [0x1A, 0x010A, NpcTattle_Snowman] +- [0x1A, 0x010B, NpcTattle_AlbinoDino] +- [0x1A, 0x010C, NpcTattle_HOS_ShopOwner] +- [0x1A, 0x010D, NpcTattle_HOS_ToadHouseStarKid] +- [0x1A, 0x010E, NpcTattle_HOS_StarKidA] +- [0x1A, 0x010F, NpcTattle_HOS_StarKidB] +- [0x1A, 0x0110, NpcTattle_HOS_StarKidC] +- [0x1A, 0x0111, NpcTattle_HOS_StarKidD] +- [0x1A, 0x0112, NpcTattle_HOS_StarKidE] +- [0x1A, 0x0113, NpcTattle_KPA_CaptiveToadA] +- [0x1A, 0x0114, NpcTattle_KPA_CaptiveToadB] +- [0x1A, 0x0115, NpcTattle_KPA_CaptiveSoldierA] +- [0x1A, 0x0116, NpcTattle_KPA_ToadMinister] +- [0x1A, 0x0117, NpcTattle_KPA_ToadHouseToadA] +- [0x1A, 0x0118, NpcTattle_KPA_CaptiveToadC] +- [0x1A, 0x0119, NpcTattle_KPA_CaptiveSoldierB] +- [0x1A, 0x011A, NpcTattle_KPA_CaptiveDryite] +- [0x1A, 0x011B, NpcTattle_KPA_ToadHouseToadB] +- [0x1A, 0x011C, NpcTattle_KPA_CaptiveToadD] +- [0x1A, 0x011D, NpcTattle_KPA_CaptiveSoldierC] +- [0x1A, 0x011E, NpcTattle_KPA_CaptivePenguin] +- [0x1A, 0x011F, NpcTattle_KPA_ShopOwner] +- [0x1A, 0x0120, NpcTattle_KPA_FakePrincessPeach] +- [0x1A, 0x0121, NpcTattle_KKJ_ToadHouseToad] +- [0x1B, 0x0000, EntityTattle_HammerBlock1_CanBreak] +- [0x1B, 0x0001, EntityTattle_HammerBlock2_CantBreak] +- [0x1B, 0x0002, EntityTattle_HammerBlock2_CanBreak] +- [0x1B, 0x0003, EntityTattle_HammerBlock3_CantBreak] +- [0x1B, 0x0004, EntityTattle_HammerBlock3_CanBreak] +- [0x1B, 0x0005, EntityTattle_BrickBlock] +- [0x1B, 0x0006, EntityTattle_ItemBlock] +- [0x1B, 0x0007, EntityTattle_InertBlock] +- [0x1B, 0x0008, EntityTattle_PushBlock] +- [0x1B, 0x0009, EntityTattle_BadgeBlock] +- [0x1B, 0x000A, EntityTattle_Spring] +- [0x1B, 0x000B, EntityTattle_Switch] +- [0x1B, 0x000C, EntityTattle_BigSwitch_SpinJump] +- [0x1B, 0x000D, EntityTattle_BigSwitch_TornadoJump] +- [0x1B, 0x000E, EntityTattle_FloorSwitch_SpinJump] +- [0x1B, 0x000F, EntityTattle_FloorSwitch_TornadoJump] +- [0x1B, 0x0010, EntityTattle_Pipe] +- [0x1B, 0x0011, EntityTattle_PadLock] +- [0x1B, 0x0012, EntityTattle_0012] +- [0x1B, 0x0013, EntityTattle_Sign] +- [0x1B, 0x0014, EntityTattle_BombableRock] +- [0x1B, 0x0015, EntityTattle_Chest] +- [0x1B, 0x0016, EntityTattle_EmptyChest] +- [0x1B, 0x0017, EntityTattle_WoodenCrate_CantBreak] +- [0x1B, 0x0018, EntityTattle_WoodenCrate_SpinJump] +- [0x1B, 0x0019, EntityTattle_WoodenCrate_TornadoJump] +- [0x1B, 0x001A, EntityTattle_BoardedFloor_CantBreak] +- [0x1B, 0x001B, EntityTattle_BoardedFloor_SpinJump] +- [0x1B, 0x001C, EntityTattle_BoardedFloor_TornadoJump] +- [0x1B, 0x001D, EntityTattle_JackInTheBox_SpinJump] +- [0x1B, 0x001E, EntityTattle_JackInTheBox_TornadoJump] +- [0x1B, 0x001F, EntityTattle_BellbellPlant] +- [0x1B, 0x0020, EntityTattle_TrumpetPlant] +- [0x1B, 0x0021, EntityTattle_CymbalBush] +- [0x1B, 0x0022, EntityTattle_Munchlesia] +- [0x1B, 0x0023, EntityTattle_SpinningFlower] +- [0x1B, 0x0024, EntityTattle_BulbBush] +- [0x1B, 0x0025, EntityTattle_25] +- [0x1C, 0x0000, EnemyTattle_Goomba] +- [0x1C, 0x0001, EnemyTattle_SpikedGoomba] +- [0x1C, 0x0002, EnemyTattle_Paragoomba] +- [0x1C, 0x0003, EnemyTattle_RedGoombaBoss] +- [0x1C, 0x0004, EnemyTattle_BlueGoombaBoss] +- [0x1C, 0x0005, EnemyTattle_GoombaKing] +- [0x1C, 0x0006, EnemyTattle_GoomnutTree] +- [0x1C, 0x0007, EnemyTattle_KoopaTroopa] +- [0x1C, 0x0008, EnemyTattle_Paratroopa] +- [0x1C, 0x0009, EnemyTattle_Fuzzy] +- [0x1C, 0x000A, EnemyTattle_BobOmb] +- [0x1C, 0x000B, EnemyTattle_BulletBill] +- [0x1C, 0x000C, EnemyTattle_BillBlaster] +- [0x1C, 0x000D, EnemyTattle_FakeBowser] +- [0x1C, 0x000E, EnemyTattle_RedNinjakoopa] +- [0x1C, 0x000F, EnemyTattle_BlueNinjakoopa] +- [0x1C, 0x0010, EnemyTattle_YellowNinjakoopa] +- [0x1C, 0x0011, EnemyTattle_GreenNinjakoopa] +- [0x1C, 0x0012, EnemyTattle_KoopaBros] +- [0x1C, 0x0013, EnemyTattle_JrTroopa1] +- [0x1C, 0x0014, EnemyTattle_MontyMole] +- [0x1C, 0x0015, EnemyTattle_Cleft] +- [0x1C, 0x0016, EnemyTattle_Pokey] +- [0x1C, 0x0017, EnemyTattle_Bandit] +- [0x1C, 0x0018, EnemyTattle_PokeyMummy] +- [0x1C, 0x0019, EnemyTattle_BuzzyBeetle] +- [0x1C, 0x001A, EnemyTattle_Swooper] +- [0x1C, 0x001B, EnemyTattle_Buzzar] +- [0x1C, 0x001C, EnemyTattle_Tutankoopa] +- [0x1C, 0x001D, EnemyTattle_Chomp] +- [0x1C, 0x001E, EnemyTattle_StoneChomp] +- [0x1C, 0x001F, EnemyTattle_PiranhaPlant] +- [0x1C, 0x0020, EnemyTattle_ForestFuzzy] +- [0x1C, 0x0021, EnemyTattle_HyperGoomba] +- [0x1C, 0x0022, EnemyTattle_HyperParagoomba] +- [0x1C, 0x0023, EnemyTattle_HyperCleft] +- [0x1C, 0x0024, EnemyTattle_Clubba] +- [0x1C, 0x0025, EnemyTattle_TubbaBlubbaInvincible] +- [0x1C, 0x0026, EnemyTattle_TubbaHeart] +- [0x1C, 0x0027, EnemyTattle_TubbaBlubba] +- [0x1C, 0x0028, EnemyTattle_JrTroopa2] +- [0x1C, 0x0029, EnemyTattle_ShyGuy] +- [0x1C, 0x002A, EnemyTattle_GrooveGuy] +- [0x1C, 0x002B, EnemyTattle_SpyGuy] +- [0x1C, 0x002C, EnemyTattle_PyroGuy] +- [0x1C, 0x002D, EnemyTattle_SkyGuy] +- [0x1C, 0x002E, EnemyTattle_MediGuy] +- [0x1C, 0x002F, EnemyTattle_AntiGuy] +- [0x1C, 0x0030, EnemyTattle_BigLanternGhost] +- [0x1C, 0x0031, EnemyTattle_GeneralGuy] +- [0x1C, 0x0032, EnemyTattle_ShySquad] +- [0x1C, 0x0033, EnemyTattle_ShyStack] +- [0x1C, 0x0034, EnemyTattle_StiltGuy] +- [0x1C, 0x0035, EnemyTattle_HurtPlant] +- [0x1C, 0x0036, EnemyTattle_MBush] +- [0x1C, 0x0037, EnemyTattle_JungleFuzzy] +- [0x1C, 0x0038, EnemyTattle_SpearGuy] +- [0x1C, 0x0039, EnemyTattle_PutridPiranha] +- [0x1C, 0x003A, EnemyTattle_LavaBubble] +- [0x1C, 0x003B, EnemyTattle_SpikeTop] +- [0x1C, 0x003C, EnemyTattle_LavaPiranhaPhase1] +- [0x1C, 0x003D, EnemyTattle_LavaPiranhaPhase2] +- [0x1C, 0x003E, EnemyTattle_LavaBudPhase1] +- [0x1C, 0x003F, EnemyTattle_LavaBudPhase2] +- [0x1C, 0x0040, EnemyTattle_PetitPiranha] +- [0x1C, 0x0041, EnemyTattle_JrTroopa3] +- [0x1C, 0x0042, EnemyTattle_Lakitu] +- [0x1C, 0x0043, EnemyTattle_Spiny] +- [0x1C, 0x0044, EnemyTattle_Bzzap] +- [0x1C, 0x0045, EnemyTattle_CrazeeDayzee] +- [0x1C, 0x0046, EnemyTattle_AmazyDayzee] +- [0x1C, 0x0047, EnemyTattle_MontyMoleBoss] +- [0x1C, 0x0048, EnemyTattle_Spike] +- [0x1C, 0x0049, EnemyTattle_RuffPuff] +- [0x1C, 0x004A, EnemyTattle_HuffNPuff] +- [0x1C, 0x004B, EnemyTattle_TuffPuff] +- [0x1C, 0x004C, EnemyTattle_JrTroopa4] +- [0x1C, 0x004D, EnemyTattle_Gulpit] +- [0x1C, 0x004E, EnemyTattle_GulpitRocks] +- [0x1C, 0x004F, EnemyTattle_Monstar] +- [0x1C, 0x0050, EnemyTattle_FrostPiranha] +- [0x1C, 0x0051, EnemyTattle_WhiteClubba] +- [0x1C, 0x0052, EnemyTattle_Duplighost] +- [0x1C, 0x0053, EnemyTattle_GhostWatt] +- [0x1C, 0x0054, EnemyTattle_GhostKooper] +- [0x1C, 0x0055, EnemyTattle_GhostGoombario] +- [0x1C, 0x0056, EnemyTattle_GhostSushie] +- [0x1C, 0x0057, EnemyTattle_GhostLakilester] +- [0x1C, 0x0058, EnemyTattle_GhostParakarry] +- [0x1C, 0x0059, EnemyTattle_GhostBombette] +- [0x1C, 0x005A, EnemyTattle_GhostBow] +- [0x1C, 0x005B, EnemyTattle_AlbinoDino] +- [0x1C, 0x005C, EnemyTattle_Swoopula] +- [0x1C, 0x005D, EnemyTattle_CrystalKing] +- [0x1C, 0x005E, EnemyTattle_CrystalClone] +- [0x1C, 0x005F, EnemyTattle_CrystalBit] +- [0x1C, 0x0060, EnemyTattle_Ember] +- [0x1C, 0x0061, EnemyTattle_DryBones] +- [0x1C, 0x0062, EnemyTattle_BonyBeetle] +- [0x1C, 0x0063, EnemyTattle_Magikoopa] +- [0x1C, 0x0064, EnemyTattle_Magiclone] +- [0x1C, 0x0065, EnemyTattle_MagikoopaDup] +- [0x1C, 0x0066, EnemyTattle_MagicloneDup] +- [0x1C, 0x0067, EnemyTattle_Koopatrol] +- [0x1C, 0x0068, EnemyTattle_HammerBros] +- [0x1C, 0x0069, EnemyTattle_BombshellBill] +- [0x1C, 0x006A, EnemyTattle_BombshellBlaster] +- [0x1C, 0x006B, EnemyTattle_JrTroopa5] +- [0x1C, 0x006C, EnemyTattle_BowserPhase1] +- [0x1C, 0x006D, EnemyTattle_BowserPhase2] +- [0x1C, 0x006E, EnemyTattle_BowserPhase3] +- [0x1C, 0x006F, EnemyTattle_KentCKoopa] +- [0x1C, 0x0070, EnemyTattle_Blooper] +- [0x1C, 0x0071, EnemyTattle_ElectroBlooper] +- [0x1C, 0x0072, EnemyTattle_SuperBlooper] +- [0x1C, 0x0073, EnemyTattle_BlooperBaby] +- [0x1C, 0x0074, EnemyTattle_TheMaster1] +- [0x1C, 0x0075, EnemyTattle_TheMaster2] +- [0x1C, 0x0076, EnemyTattle_TheMaster3] +- [0x1C, 0x0077, EnemyTattle_Chan] +- [0x1C, 0x0078, EnemyTattle_Lee] +- [0x1C, 0x0079, EnemyTattle_Gloomba] +- [0x1C, 0x007A, EnemyTattle_Paragloomba] +- [0x1C, 0x007B, EnemyTattle_SpikedGloomba] +- [0x1C, 0x007C, EnemyTattle_DarkKoopa] +- [0x1C, 0x007D, EnemyTattle_DarkParatroopa] +- [0x1C, 0x007E, EnemyTattle_RedMagikoopa] +- [0x1C, 0x007F, EnemyTattle_FlyingRedMagikoopa] +- [0x1C, 0x0080, EnemyTattle_GreenMagikoopa] +- [0x1C, 0x0081, EnemyTattle_FlyingGreenMagikoopa] +- [0x1C, 0x0082, EnemyTattle_YellowMagikoopa] +- [0x1C, 0x0083, EnemyTattle_FlyingYellowMagikoopa] +- [0x1C, 0x0084, EnemyTattle_GrayMagikoopa] +- [0x1C, 0x0085, EnemyTattle_FlyingGrayMagikoopa] +- [0x1C, 0x0086, EnemyTattle_FlyingWhiteMagikoopa] +- [0x1C, 0x0087, EnemyTattle_WhiteMagikoopa] +- [0x1C, 0x0088, EnemyTattle_MagikoopaBoss] +- [0x1C, 0x0089, EnemyTattle_MagikoopaBossDup] +- [0x1C, 0x008A, EnemyTattle_LeeWatt] +- [0x1C, 0x008B, EnemyTattle_LeeKooper] +- [0x1C, 0x008C, EnemyTattle_LeeGoombario] +- [0x1C, 0x008D, EnemyTattle_LeeSushie] +- [0x1C, 0x008E, EnemyTattle_LeeLakilester] +- [0x1C, 0x008F, EnemyTattle_LeeParakarry] +- [0x1C, 0x0090, EnemyTattle_LeeBombette] +- [0x1C, 0x0091, EnemyTattle_LeeBow] +- [0x1C, 0x0092, EnemyTattle_Mario] +- [0x1C, 0x0093, EnemyTattle_SlotMachineStart] +- [0x1C, 0x0094, EnemyTattle_SlotMachineStop] +- [0x1C, 0x0095, EnemyTattle_Whacka] +- [0x1D, 0x0000, Menus_Tutorial_SaveBlock] +- [0x1D, 0x0001, Menus_Tutorial_HeartBlock] +- [0x1D, 0x0002, Menus_Tutorial_GotItem] +- [0x1D, 0x0003, Menus_Tutorial_GotStarPiece] +- [0x1D, 0x0004, Menus_SavePrompt] +- [0x1D, 0x0005, Menus_SaveComplete] +- [0x1D, 0x0006, Menus_GotKooperShell] +- [0x1D, 0x0007, Menus_Party_Goombario] +- [0x1D, 0x0008, Menus_Party_Kooper] +- [0x1D, 0x0009, Menus_Party_Bombette] +- [0x1D, 0x000A, Menus_Party_Parakarry] +- [0x1D, 0x000B, Menus_Party_Goompa] +- [0x1D, 0x000C, Menus_Party_Watt] +- [0x1D, 0x000D, Menus_Party_Sushie] +- [0x1D, 0x000E, Menus_Party_Lakilester] +- [0x1D, 0x000F, Menus_Party_Bow] +- [0x1D, 0x0010, Menus_Party_Goombaria] +- [0x1D, 0x0011, Menus_Party_Twink] +- [0x1D, 0x0012, Menus_Party_Peach] +- [0x1D, 0x0013, Menus_Party_Mario] +- [0x1D, 0x0014, Menus_StarPower_Focus] +- [0x1D, 0x0015, Menus_StarPower_Refresh] +- [0x1D, 0x0016, Menus_StarPower_Lullaby] +- [0x1D, 0x0017, Menus_StarPower_StarStorm] +- [0x1D, 0x0018, Menus_StarPower_ChillOut] +- [0x1D, 0x0019, Menus_StarPower_Smooch] +- [0x1D, 0x001A, Menus_StarPower_TimeOut] +- [0x1D, 0x001B, Menus_StarPower_UpAndAway] +- [0x1D, 0x001C, Menus_StarPower_StarBeam] +- [0x1D, 0x001D, Menus_StarPower_PeachBeam] +- [0x1D, 0x001E, Menus_StarPower_Peach_Focus] +- [0x1D, 0x001F, Menus_StarPower_Twink_Dash] +- [0x1D, 0x0020, Menus_StarPowerDesc_Focus] +- [0x1D, 0x0021, Menus_StarPowerDesc_Refresh] +- [0x1D, 0x0022, Menus_StarPowerDesc_Lullaby] +- [0x1D, 0x0023, Menus_StarPowerDesc_StarStorm] +- [0x1D, 0x0024, Menus_StarPowerDesc_ChillOut] +- [0x1D, 0x0025, Menus_StarPowerDesc_Smooch] +- [0x1D, 0x0026, Menus_StarPowerDesc_TimeOut] +- [0x1D, 0x0027, Menus_StarPowerDesc_UpAndAway] +- [0x1D, 0x0028, Menus_StarPowerDesc_StarBeam] +- [0x1D, 0x0029, Menus_StarPowerDesc_PeachBeam] +- [0x1D, 0x002A, Menus_SpiritName_Eldstar] +- [0x1D, 0x002B, Menus_SpiritName_Mamar] +- [0x1D, 0x002C, Menus_SpiritName_Skolar] +- [0x1D, 0x002D, Menus_SpiritName_Muskular] +- [0x1D, 0x002E, Menus_SpiritName_Misstar] +- [0x1D, 0x002F, Menus_SpiritName_Klevar] +- [0x1D, 0x0030, Menus_SpiritName_Kalmar] +- [0x1D, 0x0031, Menus_SpiritDesc_Eldstar] +- [0x1D, 0x0032, Menus_SpiritDesc_Mamar] +- [0x1D, 0x0033, Menus_SpiritDesc_Skolar] +- [0x1D, 0x0034, Menus_SpiritDesc_Muskular] +- [0x1D, 0x0035, Menus_SpiritDesc_Misstar] +- [0x1D, 0x0036, Menus_SpiritDesc_Klevar] +- [0x1D, 0x0037, Menus_SpiritDesc_Kalmar] +- [0x1D, 0x0038, Menus_Hammer] +- [0x1D, 0x0039, Menus_Jump] +- [0x1D, 0x003A, Menus_StarSpirits] +- [0x1D, 0x003B, Menus_RunAway] +- [0x1D, 0x003C, Menus_DoNothing] +- [0x1D, 0x003D, Menus_PartyMember] +- [0x1D, 0x003E, Menus_ChangeMember] +- [0x1D, 0x003F, Menus_Items] +- [0x1D, 0x0040, Menus_KeyItems] +- [0x1D, 0x0041, Menus_DoubleDip] +- [0x1D, 0x0042, Menus_TripleDip] +- [0x1D, 0x0043, Menus_Strategies] +- [0x1D, 0x0044, Menus_Defense] +- [0x1D, 0x0045, Menus_Abilities] +- [0x1D, 0x0046, Menus_ActLater] +- [0x1D, 0x0047, Menus_EndTraining] +- [0x1D, 0x0048, Menus_Focus] +- [0x1D, 0x0049, Menus_Dash] +- [0x1D, 0x004A, Menus_Hammer_Centered] +- [0x1D, 0x004B, Menus_Jump_Centered] +- [0x1D, 0x004C, Menus_StarSpirits_Centered] +- [0x1D, 0x004D, Menus_RunAway_Centered] +- [0x1D, 0x004E, Menus_DoNothing_Centered] +- [0x1D, 0x004F, Menus_ChangeMember_Centered] +- [0x1D, 0x0050, Menus_Items_Centered] +- [0x1D, 0x0051, Menus_Strategies_Centered] +- [0x1D, 0x0052, Menus_Defense_Centered] +- [0x1D, 0x0053, Menus_Abilities_Centered] +- [0x1D, 0x0054, Menus_EndTraining_Centered] +- [0x1D, 0x0055, Menus_Focus_Centered] +- [0x1D, 0x0056, Menus_ActLater_Centered] +- [0x1D, 0x0057, Menus_Dash_Centered] +- [0x1D, 0x0058, Menus_0058] +- [0x1D, 0x0059, Menus_0059] +- [0x1D, 0x005A, Menus_005A] +- [0x1D, 0x005B, Menus_005B] +- [0x1D, 0x005C, Menus_005C] +- [0x1D, 0x005D, Menus_005D] +- [0x1D, 0x005E, Menus_005E] +- [0x1D, 0x005F, Menus_005F] +- [0x1D, 0x0060, Menus_0060] +- [0x1D, 0x0061, Menus_0061] +- [0x1D, 0x0062, Menus_0062] +- [0x1D, 0x0063, Menus_0063] +- [0x1D, 0x0064, Menus_0064] +- [0x1D, 0x0065, Menus_0065] +- [0x1D, 0x0066, Menus_0066] +- [0x1D, 0x0067, Menus_0067] +- [0x1D, 0x0068, Menus_0068] +- [0x1D, 0x0069, Menus_0069] +- [0x1D, 0x006A, Menus_006A] +- [0x1D, 0x006B, Menus_006B] +- [0x1D, 0x006C, Menus_006C] +- [0x1D, 0x006D, Menus_006D] +- [0x1D, 0x006E, Menus_006E] +- [0x1D, 0x006F, Menus_006F] +- [0x1D, 0x0070, Menus_0070] +- [0x1D, 0x0071, Menus_Merlee_IncreaseAttack] +- [0x1D, 0x0072, Menus_Merlee_DecreaseDamage] +- [0x1D, 0x0073, Menus_Merlee_IncreaseStarPoints] +- [0x1D, 0x0074, Menus_Merlee_IncreaseCoins] +- [0x1D, 0x0075, Menus_Merlee_Exhausted] +- [0x1D, 0x0076, Menus_ChargeHammer] +- [0x1D, 0x0077, Menus_ChargeHammerMore] +- [0x1D, 0x0078, Menus_ChargeJump] +- [0x1D, 0x0079, Menus_ChargeJumpMore] +- [0x1D, 0x007A, Menus_ChargeMaxedOut] +- [0x1D, 0x007B, Menus_EnemyMissed] +- [0x1D, 0x007C, Menus_PartnerInjured] +- [0x1D, 0x007D, Menus_ChargeGoombario] +- [0x1D, 0x007E, Menus_ChargeGoombarioMore] +- [0x1D, 0x007F, Menus_StarEnergyRecharged] +- [0x1D, 0x0080, Menus_StarEnergyFilled] +- [0x1D, 0x0081, Menus_StarEnergyMaxedOut] +- [0x1D, 0x0082, Menus_AttackUp] +- [0x1D, 0x0083, Menus_DefenseUp] +- [0x1D, 0x0084, Menus_0084] # possibly unused AttackDown +- [0x1D, 0x0085, Menus_0085] # possibly unused DefenseDown +- [0x1D, 0x0086, Menus_EnemyTransparent] +- [0x1D, 0x0087, Menus_EnemyElectricCharge] +- [0x1D, 0x0088, Menus_PlayerDazed] +- [0x1D, 0x0089, Menus_PlayerPoisoned] +- [0x1D, 0x008A, Menus_PlayerFrozen] +- [0x1D, 0x008B, Menus_PlayerAsleep] +- [0x1D, 0x008C, Menus_PlayerShrunk] +- [0x1D, 0x008D, Menus_PlayerParalyzed] +- [0x1D, 0x008E, Menus_PlayerElectricCharge] +- [0x1D, 0x008F, Menus_PlayerTransparent] +- [0x1D, 0x0090, Menus_EnemyDazed] +- [0x1D, 0x0091, Menus_EnemyPoisoned] +- [0x1D, 0x0092, Menus_EnemyFrozen] +- [0x1D, 0x0093, Menus_EnemyAsleep] +- [0x1D, 0x0094, Menus_EnemyShrunk] +- [0x1D, 0x0095, Menus_EnemyParalyzed] +- [0x1D, 0x0096, Menus_EnemyElectrified] +- [0x1D, 0x0097, Menus_EnemyCantMove] +- [0x1D, 0x0098, Menus_WaterBlockBegin] +- [0x1D, 0x0099, Menus_WaterBlockEnd] +- [0x1D, 0x009A, Menus_CloudNineBegin] +- [0x1D, 0x009B, Menus_CloudNineEnd] +- [0x1D, 0x009C, Menus_TurboChargeBegin] +- [0x1D, 0x009D, Menus_TurboChargeEnd] +- [0x1D, 0x009E, Menus_ChillOutBegin] +- [0x1D, 0x009F, Menus_NotEnoughFP] +- [0x1D, 0x00A0, Menus_NotEnoughStarPower] +- [0x1D, 0x00A1, Menus_Action_ChangePartner] +- [0x1D, 0x00A2, Menus_Action_DoNothing] +- [0x1D, 0x00A3, Menus_Action_RunAway] +- [0x1D, 0x00A4, Menus_Action_UseItem] +- [0x1D, 0x00A5, Menus_LevelUp_HP] +- [0x1D, 0x00A6, Menus_LevelUp_FP] +- [0x1D, 0x00A7, Menus_LevelUp_BP] +- [0x1D, 0x00A8, Menus_LevelUp_MaxedHP] +- [0x1D, 0x00A9, Menus_LevelUp_MaxedFP] +- [0x1D, 0x00AA, Menus_LevelUp_MaxedBP] +- [0x1D, 0x00AB, Menus_CantIncrease] +- [0x1D, 0x00AC, Menus_PlayerFirstStrike] +- [0x1D, 0x00AD, Menus_PartnerFirstStrike] +- [0x1D, 0x00AE, Menus_EnemyFirstStrike] +- [0x1D, 0x00AF, Menus_MoveTip_PressBeforeLanding] +- [0x1D, 0x00B0, Menus_MoveTip_PushLeftWithTiming] +- [0x1D, 0x00B1, Menus_MoveTip_PressBeforeStriking] +- [0x1D, 0x00B2, Menus_MoveTip_PressRepeatedly] +- [0x1D, 0x00B3, Menus_MoveTip_PushLeftRepeatedly] +- [0x1D, 0x00B4, Menus_MoveTip_PushLeftToAim] +- [0x1D, 0x00B5, Menus_MoveTip_PressAsShown] +- [0x1D, 0x00B6, Menus_MoveTip_NOT_USED_1] +- [0x1D, 0x00B7, Menus_MoveTip_PressAsLightsUp] +- [0x1D, 0x00B8, Menus_MoveTip_NOT_USED_2] +- [0x1D, 0x00B9, Menus_MoveTip_PressBothRepeatedly] +- [0x1D, 0x00BA, Menus_MoveTip_HoldThenTap] +- [0x1D, 0x00BB, Menus_MoveTip_HoldThenRelease] +- [0x1D, 0x00BC, Menus_MoveTip_MoveToAim] +- [0x1D, 0x00BD, Menus_MoveTip_PressToRunAway] +- [0x1D, 0x00BE, Menus_MoveTip_PressToReduceDamage] +- [0x1D, 0x00BF, Menus_MoveTip_NOT_USED_3] +- [0x1D, 0x00C0, Menus_Battle_NoTarget_Jump] +- [0x1D, 0x00C1, Menus_Battle_NoTarget_Hammer] +- [0x1D, 0x00C2, Menus_Battle_NoTarget_Item] +- [0x1D, 0x00C3, Menus_Battle_CantSelectNow] +- [0x1D, 0x00C4, Menus_Battle_TargetMario] +- [0x1D, 0x00C5, Menus_Battle_TargetAllEnemies] +- [0x1D, 0x00C6, Menus_Battle_CantUseHammer] +- [0x1D, 0x00C7, Menus_Battle_CantUseJump] +- [0x1D, 0x00C8, Menus_Battle_CantUseItems] +- [0x1D, 0x00C9, Menus_Battle_CantSwitch] +- [0x1D, 0x00CA, Menus_Battle_CantMove] +- [0x1D, 0x00CB, Menus_Battle_CantSwitch2] +- [0x1D, 0x00CC, Menus_Battle_CantRunAway] +- [0x1D, 0x00CD, Menus_00CD] +- [0x1D, 0x00CE, Menus_00CE] +- [0x1D, 0x00CF, Menus_00CF] +- [0x1D, 0x00D0, Menus_00D0] +- [0x1D, 0x00D1, Menus_00D1] +- [0x1D, 0x00D2, Menus_00D2] +- [0x1D, 0x00D3, Menus_00D3] +- [0x1D, 0x00D4, Menus_00D4] +- [0x1D, 0x00D5, Menus_00D5] +- [0x1D, 0x00D6, Menus_00D6] +- [0x1D, 0x00D7, Menus_00D7] +- [0x1D, 0x00D8, Menus_00D8] +- [0x1D, 0x00D9, Menus_00D9] +- [0x1D, 0x00DA, Menus_00DA] +- [0x1D, 0x00DB, Menus_00DB] +- [0x1D, 0x00DC, Menus_00DC] +- [0x1D, 0x00DD, Menus_00DD] +- [0x1D, 0x00DE, Menus_00DE] +- [0x1D, 0x00DF, Menus_00DF] +- [0x1D, 0x00E0, Menus_00E0] +- [0x1D, 0x00E1, Menus_00E1] +- [0x1D, 0x00E2, Menus_00E2] +- [0x1D, 0x00E3, Menus_00E3] +- [0x1D, 0x00E4, Menus_00E4] +- [0x1D, 0x00E5, Menus_00E5] +- [0x1D, 0x00E6, Menus_00E6] +- [0x1D, 0x00E7, Menus_00E7] +- [0x1D, 0x00E8, Menus_00E8] +- [0x1D, 0x00E9, Menus_00E9] +- [0x1D, 0x00EA, Menus_00EA] +- [0x1D, 0x00EB, Menus_00EB] +- [0x1D, 0x00EC, Menus_00EC] +- [0x1D, 0x00ED, Menus_00ED] +- [0x1D, 0x00EE, Menus_00EE] +- [0x1D, 0x00EF, Menus_00EF] +- [0x1D, 0x00F0, Menus_00F0] +- [0x1D, 0x00F1, Menus_00F1] +- [0x1D, 0x00F2, Menus_00F2] +- [0x1D, 0x00F3, Menus_00F3] +- [0x1D, 0x00F4, Menus_00F4] +- [0x1D, 0x00F5, Map_PeachsCastleGrounds_Name] +- [0x1D, 0x00F6, Map_PeachsCastleGrounds_DescBefore] +- [0x1D, 0x00F7, Map_PeachsCastleGrounds_DescAfter] +- [0x1D, 0x00F8, Map_ShootingStarSummit_Name] +- [0x1D, 0x00F9, Map_ShootingStarSummit_DescBefore] +- [0x1D, 0x00FA, Map_ShootingStarSummit_DescAfter] +- [0x1D, 0x00FB, Map_ToadTownTunnels_Name] +- [0x1D, 0x00FC, Map_ToadTownTunnels_DescBefore] +- [0x1D, 0x00FD, Map_ToadTownTunnels_DescAfter] +- [0x1D, 0x00FE, Map_GoombaVillage_Name] +- [0x1D, 0x00FF, Map_GoombaVillage_DescBefore] +- [0x1D, 0x0100, Map_GoombaVillage_DescAfter] +- [0x1D, 0x0101, Map_GoombaRoad_Name] +- [0x1D, 0x0102, Map_GoombaRoad_DescBefore] +- [0x1D, 0x0103, Map_GoombaRoad_DescAfter] +- [0x1D, 0x0104, Map_PleasantPath_Name] +- [0x1D, 0x0105, Map_PleasantPath_DescBefore] +- [0x1D, 0x0106, Map_PleasantPath_DescAfter] +- [0x1D, 0x0107, Map_KoopaVillage_Name] +- [0x1D, 0x0108, Map_KoopaVillage_DescBefore] +- [0x1D, 0x0109, Map_KoopaVillage_DescAfter] +- [0x1D, 0x010A, Map_KoopaBrosFortress_Name] +- [0x1D, 0x010B, Map_KoopaBrosFortress_DescBefore] +- [0x1D, 0x010C, Map_KoopaBrosFortress_DescAfter] +- [0x1D, 0x010D, Map_MtRugged_Name] +- [0x1D, 0x010E, Map_MtRugged_DescBefore] +- [0x1D, 0x010F, Map_MtRugged_DescAfter] +- [0x1D, 0x0110, Map_DryDryDesert_Name] +- [0x1D, 0x0111, Map_DryDryDesert_DescBefore] +- [0x1D, 0x0112, Map_DryDryDesert_DescAfter] +- [0x1D, 0x0113, Map_DryDryOutpost_Name] +- [0x1D, 0x0114, Map_DryDryOutpost_DescBefore] +- [0x1D, 0x0115, Map_DryDryOutpost_DescAfter] +- [0x1D, 0x0116, Map_DryDryRuins_Name] +- [0x1D, 0x0117, Map_DryDryRuins_DescBefore] +- [0x1D, 0x0118, Map_DryDryRuins_DescAfter] +- [0x1D, 0x0119, Map_ForeverForest_Name] +- [0x1D, 0x011A, Map_ForeverForest_DescBefore] +- [0x1D, 0x011B, Map_ForeverForest_DescAfter] +- [0x1D, 0x011C, Map_BoosMansion_Name] +- [0x1D, 0x011D, Map_BoosMansion_DescBefore] +- [0x1D, 0x011E, Map_BoosMansion_DescAfter] +- [0x1D, 0x011F, Map_GustyGulch_Name] +- [0x1D, 0x0120, Map_GustyGulch_DescBefore] +- [0x1D, 0x0121, Map_GustyGulch_DescAfter] +- [0x1D, 0x0122, Map_TubbaBlubbasCastle_Name] +- [0x1D, 0x0123, Map_TubbaBlubbasCastle_DescBefore] +- [0x1D, 0x0124, Map_TubbaBlubbasCastle_DescAfter] +- [0x1D, 0x0125, Map_WindyMill_Name] +- [0x1D, 0x0126, Map_WindyMill_DescBefore] +- [0x1D, 0x0127, Map_WindyMill_DescAfter] +- [0x1D, 0x0128, Map_ShyGuysToyBox_Name] +- [0x1D, 0x0129, Map_ShyGuysToyBox_DescBefore] +- [0x1D, 0x012A, Map_ShyGuysToyBox_DescAfter] +- [0x1D, 0x012B, Map_JadeJungle_Name] +- [0x1D, 0x012C, Map_JadeJungle_DescBefore] +- [0x1D, 0x012D, Map_JadeJungle_DescAfter] +- [0x1D, 0x012E, Map_YoshisVillage_Name] +- [0x1D, 0x012F, Map_YoshisVillage_DescBefore] +- [0x1D, 0x0130, Map_YoshisVillage_DescAfter] +- [0x1D, 0x0131, Map_MtLavalava_Name] +- [0x1D, 0x0132, Map_MtLavalava_DescBefore] +- [0x1D, 0x0133, Map_MtLavalava_DescAfter] +- [0x1D, 0x0134, Map_FlowerFields_Name] +- [0x1D, 0x0135, Map_FlowerFields_DescBefore] +- [0x1D, 0x0136, Map_FlowerFields_DescAfter] +- [0x1D, 0x0137, Map_CloudyClimb_Name] +- [0x1D, 0x0138, Map_CloudyClimb_DescBefore] +- [0x1D, 0x0139, Map_CloudyClimb_DescAfter] +- [0x1D, 0x013A, Map_ShiverCity_Name] +- [0x1D, 0x013B, Map_ShiverCity_DescBefore] +- [0x1D, 0x013C, Map_ShiverCity_DescAfter] +- [0x1D, 0x013D, Map_ShiverSnowfield_Name] +- [0x1D, 0x013E, Map_ShiverSnowfield_DescBefore] +- [0x1D, 0x013F, Map_ShiverSnowfield_DescAfter] +- [0x1D, 0x0140, Map_StarbornValley_Name] +- [0x1D, 0x0141, Map_StarbornValley_DescBefore] +- [0x1D, 0x0142, Map_StarbornValley_DescAfter] +- [0x1D, 0x0143, Map_ShiverMountain_Name] +- [0x1D, 0x0144, Map_ShiverMountain_DescBefore] +- [0x1D, 0x0145, Map_ShiverMountain_DescAfter] +- [0x1D, 0x0146, Map_CrystalPalace_Name] +- [0x1D, 0x0147, Map_CrystalPalace_DescBefore] +- [0x1D, 0x0148, Map_CrystalPalace_DescAfter] +- [0x1D, 0x0149, Map_StarWay_Name] +- [0x1D, 0x014A, Map_StarWay_DescBefore] +- [0x1D, 0x014B, Map_StarWay_DescAfter] +- [0x1D, 0x014C, Map_StarHaven_Name] +- [0x1D, 0x014D, Map_StarHaven_DescBefore] +- [0x1D, 0x014E, Map_StarHaven_DescAfter] +- [0x1D, 0x014F, Map_BowsersCastle_Name] +- [0x1D, 0x0150, Map_BowsersCastle_DescBefore] +- [0x1D, 0x0151, Map_BowsersCastle_DescAfter] +- [0x1D, 0x0152, Map_PeachsCastle_Name] +- [0x1D, 0x0153, Map_PeachsCastle_DescBefore] +- [0x1D, 0x0154, Map_PeachsCastle_DescAfter] +- [0x1D, 0x0155, Map_MariosHouse_Name] +- [0x1D, 0x0156, Map_MariosHouse_DescBefore] +- [0x1D, 0x0157, Map_MariosHouse_DescAfter] +- [0x1D, 0x0158, Menus_Inspect_Toybox] +- [0x1D, 0x0159, Menus_Inspect_ChompStatue] +- [0x1D, 0x015A, Menus_Inspect_Phonograph] +- [0x1D, 0x015B, Menus_Inspect_RaphaelStatue] +- [0x1D, 0x015C, Menus_Inspect_Well] +- [0x1D, 0x015D, Menus_Inspect_Snowman] +- [0x1D, 0x015E, Menus_SAM09_PlaceItemTip] +- [0x1D, 0x015F, Menus_Inspect_PickUpPrompt] +- [0x1D, 0x0160, Menus_Inspect_CantCarryMore] +- [0x1D, 0x0161, Menus_SAM10_PlaceItemTip] +- [0x1D, 0x0162, Menus_ISK11_TakeItemPrompt] +- [0x1D, 0x0163, Menus_Inspect_DoesntOpen] +- [0x1D, 0x0164, Menus_Inspect_FoundHammer] +- [0x1D, 0x0165, Menus_Sign_BewareOfGoombas] +- [0x1D, 0x0166, Menus_Sign_EatMushroomsTip] +- [0x1D, 0x0167, Menus_Sign_EatMushroomsTrap] +- [0x1D, 0x0168, Menus_Sign_GoombaKingsFortress] +- [0x1D, 0x0169, Menus_Inspect_DangerSealed] +- [0x1D, 0x016A, Menus_Inspect_LockedFromInside] +- [0x1D, 0x016B, Menus_016B] +- [0x1D, 0x016C, Menus_016C] +- [0x1D, 0x016D, Menus_016D] +- [0x1D, 0x016E, Menus_016E] +- [0x1D, 0x016F, Menus_016F] +- [0x1D, 0x0170, Menus_0170] +- [0x1D, 0x0171, Menus_0171] +- [0x1D, 0x0172, Menus_0172] +- [0x1D, 0x0173, Menus_0173] +- [0x1D, 0x0174, Menus_0174] +- [0x1D, 0x0175, Menus_0175] +- [0x1D, 0x0176, Menus_0176] +- [0x1D, 0x0177, Menus_0177] +- [0x1D, 0x0178, Menus_0178] +- [0x1D, 0x0179, Menus_0179] +- [0x1D, 0x017A, Menus_017A] +- [0x1D, 0x017B, Menus_017B] +- [0x1D, 0x017C, Menus_017C] +- [0x1D, 0x017D, Menus_017D] +- [0x1D, 0x017E, Menus_017E] +- [0x1D, 0x017F, Menus_017F] +- [0x1D, 0x0180, Menus_0180] +- [0x1D, 0x0181, Menus_0181] +- [0x1D, 0x0182, Menus_0182] +- [0x1D, 0x0183, Menus_0183] +- [0x1D, 0x0184, Menus_0184] +- [0x1D, 0x0185, Menus_0185] +- [0x1D, 0x0186, Menus_0186] +- [0x1D, 0x0187, Menus_0187] +- [0x1D, 0x0188, Menus_0188] +- [0x1D, 0x0189, Menus_0189] +- [0x1D, 0x018A, Menus_018A] +- [0x1D, 0x018B, Menus_018B] +- [0x1D, 0x018C, Menus_018C] +- [0x1D, 0x018D, Menus_018D] +- [0x1D, 0x018E, Menus_018E] +- [0x1D, 0x018F, Menus_018F] +- [0x1D, 0x0190, Menus_0190] +- [0x1D, 0x0191, Menus_0191] +- [0x1D, 0x0192, Menus_0192] +- [0x1D, 0x0193, Menus_0193] +- [0x1D, 0x0194, Menus_0194] +- [0x1D, 0x0195, Menus_0195] +- [0x1D, 0x0196, Menus_0196] +- [0x1D, 0x0197, Menus_0197] +- [0x1D, 0x0198, Menus_0198] +- [0x1D, 0x0199, Menus_0199] +- [0x1D, 0x019A, Menus_019A] +- [0x1D, 0x019B, Menus_019B] +- [0x1D, 0x019C, Menus_019C] +- [0x1D, 0x019D, Menus_019D] +- [0x1D, 0x019E, Menus_019E] +- [0x1D, 0x019F, Menus_019F] +- [0x1D, 0x01A0, Menus_01A0] +- [0x1D, 0x01A1, Menus_01A1] +- [0x1D, 0x01A2, Menus_01A2] +- [0x1D, 0x01A3, Menus_01A3] +- [0x1D, 0x01A4, Menus_01A4] +- [0x1D, 0x01A5, Menus_01A5] +- [0x1D, 0x01A6, Menus_01A6] +- [0x1D, 0x01A7, Menus_01A7] +- [0x1D, 0x01A8, Menus_01A8] +- [0x1D, 0x01A9, Menus_01A9] +- [0x1D, 0x01AA, Menus_01AA] +- [0x1D, 0x01AB, Menus_01AB] +- [0x1E, 0x0000, Choice_0000] +- [0x1E, 0x0001, Choice_0001] +- [0x1E, 0x0002, Choice_0002] +- [0x1E, 0x0003, Choice_0003] +- [0x1E, 0x0004, Choice_0004] +- [0x1E, 0x0005, Choice_0005] +- [0x1E, 0x0006, Choice_0006] +- [0x1E, 0x0007, Choice_0007] +- [0x1E, 0x0008, Choice_0008] +- [0x1E, 0x0009, Choice_0009] +- [0x1E, 0x000A, Choice_000A] +- [0x1E, 0x000B, Choice_000B] +- [0x1E, 0x000C, Choice_000C] +- [0x1E, 0x000D, Choice_000D] +- [0x1E, 0x000E, Choice_000E] +- [0x1E, 0x000F, Choice_000F] +- [0x1E, 0x0010, Choice_0010] +- [0x1E, 0x0011, Choice_0011] +- [0x1E, 0x0012, Choice_0012] +- [0x1E, 0x0013, Choice_0013] +- [0x1E, 0x0014, Choice_0014] +- [0x1E, 0x0015, Choice_0015] +- [0x1E, 0x0016, Choice_0016] +- [0x1E, 0x0017, Choice_0017] +- [0x1E, 0x0018, Choice_0018] +- [0x1E, 0x0019, Choice_0019] +- [0x1E, 0x001A, Choice_001A] +- [0x1E, 0x001B, Choice_001B] +- [0x1E, 0x001C, Choice_001C] +- [0x1E, 0x001D, Choice_001D] +- [0x1E, 0x001E, Choice_001E] +- [0x1E, 0x001F, Choice_001F] +- [0x1E, 0x0020, Choice_0020] +- [0x1E, 0x0021, Choice_0021] +- [0x1E, 0x0022, Choice_0022] +- [0x1E, 0x0023, Choice_0023] +- [0x1E, 0x0024, Choice_0024] +- [0x1E, 0x0025, Choice_0025] +- [0x1E, 0x0026, Choice_0026] +- [0x1E, 0x0027, Choice_0027] +- [0x1E, 0x0028, Choice_0028] +- [0x1E, 0x0029, Choice_0029] +- [0x1E, 0x002A, Choice_002A] +- [0x1E, 0x002B, Choice_002B] +- [0x1E, 0x002C, Choice_002C] +- [0x1E, 0x002D, Choice_002D] +- [0x1E, 0x002E, Choice_002E] +- [0x1E, 0x002F, Choice_002F] +- [0x1E, 0x0030, Choice_0030] +- [0x1E, 0x0031, Choice_0031] +- [0x1E, 0x0032, Choice_0032] +- [0x1E, 0x0033, Choice_0033] +- [0x1E, 0x0034, Choice_0034] +- [0x1E, 0x0035, Choice_0035] +- [0x1E, 0x0036, Choice_0036] +- [0x1E, 0x0037, Choice_0037] +- [0x1E, 0x0038, Choice_0038] +- [0x1E, 0x0039, Choice_0039] +- [0x1E, 0x003A, Choice_003A] +- [0x1E, 0x003B, Choice_003B] +- [0x1E, 0x003C, Choice_003C] +- [0x1E, 0x003D, Choice_003D] +- [0x1E, 0x003E, Choice_003E] +- [0x1E, 0x003F, Choice_003F] +- [0x1E, 0x0040, Choice_0040] +- [0x1E, 0x0041, Choice_0041] +- [0x1E, 0x0042, Choice_0042] +- [0x1E, 0x0043, Choice_0043] +- [0x1E, 0x0044, Choice_0044] +- [0x1E, 0x0045, Choice_0045] +- [0x1E, 0x0046, Choice_0046] +- [0x1E, 0x0047, Choice_0047] +- [0x1E, 0x0048, Choice_0048] +- [0x1E, 0x0049, Choice_0049] +- [0x1E, 0x004A, Choice_004A] +- [0x1E, 0x004B, Choice_004B] +- [0x1E, 0x004C, Choice_004C] +- [0x1E, 0x004D, Choice_004D] +- [0x1E, 0x004E, Choice_004E] +- [0x1E, 0x004F, Choice_004F] +- [0x1F, 0x0000, MenuTip_None] +- [0x1F, 0x0001, MenuTip_StatsTab] +- [0x1F, 0x0002, MenuTip_BadgesTab] +- [0x1F, 0x0003, MenuTip_ItemsTab] +- [0x1F, 0x0004, MenuTip_PartyTab] +- [0x1F, 0x0005, MenuTip_SpiritsTab] +- [0x1F, 0x0006, MenuTip_MapTab] +- [0x1F, 0x0007, MenuTip_ControllingMario] +- [0x1F, 0x0008, MenuTip_HeartPoints] +- [0x1F, 0x0009, MenuTip_FlowerPoints] +- [0x1F, 0x000A, MenuTip_BadgePoints] +- [0x1F, 0x000B, MenuTip_Boots1] +- [0x1F, 0x000C, MenuTip_Boots2] +- [0x1F, 0x000D, MenuTip_Boots3] +- [0x1F, 0x000E, MenuTip_Hammer0] +- [0x1F, 0x000F, MenuTip_Hammer1] +- [0x1F, 0x0010, MenuTip_Hammer2] +- [0x1F, 0x0011, MenuTip_Hammer3] +- [0x1F, 0x0012, MenuTip_StarPower] +- [0x1F, 0x0013, MenuTip_StarPoints] +- [0x1F, 0x0014, MenuTip_Coins] +- [0x1F, 0x0015, MenuTip_Secrets] +- [0x1F, 0x0016, MenuTip_StarPieces] +- [0x1F, 0x0017, MenuTip_Time] +- [0x1F, 0x0018, MenuTip_ItemTab_KeyItems] +- [0x1F, 0x0019, MenuTip_ItemTab_Consumables] +- [0x1F, 0x001A, MenuTip_BadgeTab_All] +- [0x1F, 0x001B, MenuTip_BadgeTab_Equipped] +- [0x1F, 0x001C, MenuTip_BadgeTutorial_01] +- [0x1F, 0x001D, MenuTip_BadgeTutorial_02] +- [0x1F, 0x001E, MenuTip_BadgeTutorial_03] +- [0x1F, 0x001F, MenuTip_BadgeTutorial_04] +- [0x1F, 0x0020, MenuTip_BadgeTutorial_05] +- [0x1F, 0x0021, MenuTip_BadgeTutorial_06] +- [0x1F, 0x0022, MenuTip_BadgeTutorial_07] +- [0x1F, 0x0023, MenuTip_BadgeTutorial_08] +- [0x1F, 0x0024, MenuTip_BadgeTutorial_09] +- [0x1F, 0x0025, MenuTip_BadgeTutorial_10] +- [0x1F, 0x0026, MenuTip_BadgeTutorial_11] +- [0x1F, 0x0027, MenuTip_BadgeTutorial_12] +- [0x1F, 0x0028, MenuTip_BadgeTutorial_13] +- [0x1F, 0x0029, MenuTip_BadgeTutorial_14] +- [0x1F, 0x002A, MenuTip_BadgeTutorial_15] +- [0x1F, 0x002B, MenuTip_002B] +- [0x1F, 0x002C, MenuTip_002C] +- [0x1F, 0x002D, MenuTip_002D] +- [0x1F, 0x002E, MenuTip_002E] +- [0x1F, 0x002F, MenuTip_002F] +- [0x1F, 0x0030, MenuTip_0030] +- [0x1F, 0x0031, MenuTip_0031] +- [0x1F, 0x0032, MenuTip_0032] +- [0x1F, 0x0033, MenuTip_0033] +- [0x1F, 0x0034, MenuTip_0034] +- [0x20, 0x0000, Document_Letter_Mario01_Body] +- [0x20, 0x0001, Document_Letter_Mario01_From] +- [0x20, 0x0002, Document_Letter_Mario02_Body] +- [0x20, 0x0003, Document_Letter_Mario02_From] +- [0x20, 0x0004, Document_Letter_Mario03_Body] +- [0x20, 0x0005, Document_Letter_Mario03_From] +- [0x20, 0x0006, Document_Letter_Mario04_Body] +- [0x20, 0x0007, Document_Letter_Mario04_From] +- [0x20, 0x0008, Document_Letter_Mario05_Body] +- [0x20, 0x0009, Document_Letter_Mario05_From] +- [0x20, 0x000A, Document_Letter_Mario06_Body] +- [0x20, 0x000B, Document_Letter_Mario06_From] +- [0x20, 0x000C, Document_Letter_Mario07_Body] +- [0x20, 0x000D, Document_Letter_Mario07_From] +- [0x20, 0x000E, Document_Letter_Mario08_Body] +- [0x20, 0x000F, Document_Letter_Mario08_From] +- [0x20, 0x0010, Document_Letter_Mario09_Body] +- [0x20, 0x0011, Document_Letter_Mario09_From] +- [0x20, 0x0012, Document_Letter_Mario10_Body] +- [0x20, 0x0013, Document_Letter_Mario10_From] +- [0x20, 0x0014, Document_Letter_Mario11_Body] +- [0x20, 0x0015, Document_Letter_Mario11_From] +- [0x20, 0x0016, Document_Letter_Mario12_Body] +- [0x20, 0x0017, Document_Letter_Mario12_From] +- [0x20, 0x0018, Document_Letter_Goombario1_From] +- [0x20, 0x0019, Document_Letter_Goombario1_Desc] +- [0x20, 0x001A, Document_Letter_Goombario1_Body] +- [0x20, 0x001B, Document_Letter_Goombario2_From] +- [0x20, 0x001C, Document_Letter_Goombario2_Desc] +- [0x20, 0x001D, Document_Letter_Goombario2_Body] +- [0x20, 0x001E, Document_Letter_Goombario3_From] +- [0x20, 0x001F, Document_Letter_Goombario3_Desc] +- [0x20, 0x0020, Document_Letter_Goombario3_Body] +- [0x20, 0x0021, Document_Letter_Kooper1_From] +- [0x20, 0x0022, Document_Letter_Kooper1_Desc] +- [0x20, 0x0023, Document_Letter_Kooper1_Body] +- [0x20, 0x0024, Document_Letter_Kooper2_From] +- [0x20, 0x0025, Document_Letter_Kooper2_Desc] +- [0x20, 0x0026, Document_Letter_Kooper2_Body] +- [0x20, 0x0027, Document_Letter_Kooper3_From] +- [0x20, 0x0028, Document_Letter_Kooper3_Desc] +- [0x20, 0x0029, Document_Letter_Kooper3_Body] +- [0x20, 0x002A, Document_Letter_Bombette1_From] +- [0x20, 0x002B, Document_Letter_Bombette1_Desc] +- [0x20, 0x002C, Document_Letter_Bombette1_Body] +- [0x20, 0x002D, Document_Letter_Bombette2_From] +- [0x20, 0x002E, Document_Letter_Bombette2_Desc] +- [0x20, 0x002F, Document_Letter_Bombette2_Body] +- [0x20, 0x0030, Document_Letter_Bombette3_From] +- [0x20, 0x0031, Document_Letter_Bombette3_Desc] +- [0x20, 0x0032, Document_Letter_Bombette3_Body] +- [0x20, 0x0033, Document_Letter_Parakarry1_From] +- [0x20, 0x0034, Document_Letter_Parakarry1_Desc] +- [0x20, 0x0035, Document_Letter_Parakarry1_Body] +- [0x20, 0x0036, Document_Letter_Parakarry2_From] +- [0x20, 0x0037, Document_Letter_Parakarry2_Desc] +- [0x20, 0x0038, Document_Letter_Parakarry2_Body] +- [0x20, 0x0039, Document_Letter_Bow1_From] +- [0x20, 0x003A, Document_Letter_Bow1_Desc] +- [0x20, 0x003B, Document_Letter_Bow1_Body] +- [0x20, 0x003C, Document_Letter_Bow2_From] +- [0x20, 0x003D, Document_Letter_Bow2_Desc] +- [0x20, 0x003E, Document_Letter_Bow2_Body] +- [0x20, 0x003F, Document_Letter_Watt1_From] +- [0x20, 0x0040, Document_Letter_Watt1_Desc] +- [0x20, 0x0041, Document_Letter_Watt1_Body] +- [0x20, 0x0042, Document_Letter_Watt2_From] +- [0x20, 0x0043, Document_Letter_Watt2_Desc] +- [0x20, 0x0044, Document_Letter_Watt2_Body] +- [0x20, 0x0045, Document_Letter_Sushie1_From] +- [0x20, 0x0046, Document_Letter_Sushie1_Desc] +- [0x20, 0x0047, Document_Letter_Sushie1_Body] +- [0x20, 0x0048, Document_Letter_Sushie2_From] +- [0x20, 0x0049, Document_Letter_Sushie2_Desc] +- [0x20, 0x004A, Document_Letter_Sushie2_Body] +- [0x20, 0x004B, Document_Letter_Lakilester1_From] +- [0x20, 0x004C, Document_Letter_Lakilester1_Desc] +- [0x20, 0x004D, Document_Letter_Lakilester1_Body] +- [0x20, 0x004E, Document_Letter_Lakilester2_From] +- [0x20, 0x004F, Document_Letter_Lakilester2_Desc] +- [0x20, 0x0050, Document_Letter_Lakilester2_Body] +- [0x20, 0x0051, Document_LuigisDiary_01] +- [0x20, 0x0052, Document_LuigisDiary_02] +- [0x20, 0x0053, Document_LuigisDiary_03] +- [0x20, 0x0054, Document_LuigisDiary_04] +- [0x20, 0x0055, Document_LuigisDiary_05] +- [0x20, 0x0056, Document_LuigisDiary_06] +- [0x20, 0x0057, Document_LuigisDiary_07] +- [0x20, 0x0058, Document_LuigisDiary_08] +- [0x20, 0x0059, Document_LuigisDiary_09] +- [0x20, 0x005A, Document_LuigisDiary_10] +- [0x20, 0x005B, Document_LuigisDiary_11] +- [0x20, 0x005C, Document_LuigisDiary_12] +- [0x21, 0x0000, MerlonHint_0000] +- [0x21, 0x0001, MerlonHint_0001] +- [0x21, 0x0002, MerlonHint_0002] +- [0x21, 0x0003, MerlonHint_0003] +- [0x21, 0x0004, MerlonHint_0004] +- [0x21, 0x0005, MerlonHint_0005] +- [0x21, 0x0006, MerlonHint_0006] +- [0x21, 0x0007, MerlonHint_0007] +- [0x21, 0x0008, MerlonHint_0008] +- [0x21, 0x0009, MerlonHint_0009] +- [0x21, 0x000A, MerlonHint_000A] +- [0x21, 0x000B, MerlonHint_000B] +- [0x21, 0x000C, MerlonHint_000C] +- [0x21, 0x000D, MerlonHint_000D] +- [0x21, 0x000E, MerlonHint_000E] +- [0x21, 0x000F, MerlonHint_000F] +- [0x21, 0x0010, MerlonHint_0010] +- [0x21, 0x0011, MerlonHint_0011] +- [0x21, 0x0012, MerlonHint_0012] +- [0x21, 0x0013, MerlonHint_0013] +- [0x21, 0x0014, MerlonHint_0014] +- [0x21, 0x0015, MerlonHint_0015] +- [0x21, 0x0016, MerlonHint_0016] +- [0x21, 0x0017, MerlonHint_0017] +- [0x21, 0x0018, MerlonHint_0018] +- [0x21, 0x0019, MerlonHint_0019] +- [0x21, 0x001A, MerlonHint_001A] +- [0x21, 0x001B, MerlonHint_001B] +- [0x21, 0x001C, MerlonHint_001C] +- [0x21, 0x001D, MerlonHint_001D] +- [0x21, 0x001E, MerlonHint_001E] +- [0x21, 0x001F, MerlonHint_001F] +- [0x21, 0x0020, MerlonHint_0020] +- [0x21, 0x0021, MerlonHint_0021] +- [0x21, 0x0022, MerlonHint_0022] +- [0x21, 0x0023, MerlonHint_0023] +- [0x21, 0x0024, MerlonHint_0024] +- [0x21, 0x0025, MerlonHint_0025] +- [0x21, 0x0026, MerlonHint_0026] +- [0x21, 0x0027, MerlonHint_0027] +- [0x21, 0x0028, MerlonHint_0028] +- [0x21, 0x0029, MerlonHint_0029] +- [0x21, 0x002A, MerlonHint_002A] +- [0x21, 0x002B, MerlonHint_002B] +- [0x21, 0x002C, MerlonHint_002C] +- [0x21, 0x002D, MerlonHint_002D] +- [0x21, 0x002E, MerlonHint_002E] +- [0x21, 0x002F, MerlonHint_002F] +- [0x21, 0x0030, MerlonHint_0030] +- [0x21, 0x0031, MerlonHint_0031] +- [0x21, 0x0032, MerlonHint_0032] +- [0x21, 0x0033, MerlonHint_0033] +- [0x21, 0x0034, MerlonHint_0034] +- [0x21, 0x0035, MerlonHint_0035] +- [0x21, 0x0036, MerlonHint_0036] +- [0x21, 0x0037, MerlonHint_0037] +- [0x21, 0x0038, MerlonHint_0038] +- [0x21, 0x0039, MerlonHint_0039] +- [0x21, 0x003A, MerlonHint_003A] +- [0x21, 0x003B, MerlonHint_003B] +- [0x21, 0x003C, MerlonHint_003C] +- [0x21, 0x003D, MerlonHint_003D] +- [0x21, 0x003E, MerlonHint_003E] +- [0x21, 0x003F, MerlonHint_003F] +- [0x21, 0x0040, MerlonHint_0040] +- [0x21, 0x0041, MerlonHint_0041] +- [0x21, 0x0042, MerlonHint_0042] +- [0x21, 0x0043, MerlonHint_0043] +- [0x21, 0x0044, MerlonHint_0044] +- [0x21, 0x0045, MerlonHint_0045] +- [0x21, 0x0046, MerlonHint_0046] +- [0x21, 0x0047, MerlonHint_0047] +- [0x21, 0x0048, MerlonHint_0048] +- [0x21, 0x0049, MerlonHint_0049] +- [0x21, 0x004A, MerlonHint_004A] +- [0x21, 0x004B, MerlonHint_004B] +- [0x21, 0x004C, MerlonHint_004C] +- [0x21, 0x004D, MerlonHint_004D] +- [0x21, 0x004E, MerlonHint_004E] +- [0x22, 0x0000, MerluvleeHint_MegaJump] +- [0x22, 0x0001, MerluvleeHint_JumpCharge] +- [0x22, 0x0002, MerluvleeHint_SuperJumpCharge] +- [0x22, 0x0003, MerluvleeHint_Multibounce] +- [0x22, 0x0004, MerluvleeHint_ShrinkStomp] +- [0x22, 0x0005, MerluvleeHint_SleepStomp] +- [0x22, 0x0006, MerluvleeHint_DizzyStomp] +- [0x22, 0x0007, MerluvleeHint_DDownJump] +- [0x22, 0x0008, MerluvleeHint_PowerBounce] +- [0x22, 0x0009, MerluvleeHint_PowerSmash] +- [0x22, 0x000A, MerluvleeHint_MegaSmash] +- [0x22, 0x000B, MerluvleeHint_SmashCharge] +- [0x22, 0x000C, MerluvleeHint_SuperSmashCharge] +- [0x22, 0x000D, MerluvleeHint_SpinSmash] +- [0x22, 0x000E, MerluvleeHint_QuakeHammer] +- [0x22, 0x000F, MerluvleeHint_PowerQuake] +- [0x22, 0x0010, MerluvleeHint_MegaQuake] +- [0x22, 0x0011, MerluvleeHint_HammerThrow] +- [0x22, 0x0012, MerluvleeHint_DDownPound] +- [0x22, 0x0013, MerluvleeHint_DoubleDip] +- [0x22, 0x0014, MerluvleeHint_TripleDip] +- [0x22, 0x0015, MerluvleeHint_GroupFocus] +- [0x22, 0x0016, MerluvleeHint_QuickChange] +- [0x22, 0x0017, MerluvleeHint_DeepFocus1] +- [0x22, 0x0018, MerluvleeHint_DeepFocus2] +- [0x22, 0x0019, MerluvleeHint_DeepFocus3] +- [0x22, 0x001A, MerluvleeHint_HPPlus1] +- [0x22, 0x001B, MerluvleeHint_HPPlus2] +- [0x22, 0x001C, MerluvleeHint_HPPlus3] +- [0x22, 0x001D, MerluvleeHint_FPPlus1] +- [0x22, 0x001E, MerluvleeHint_FPPlus2] +- [0x22, 0x001F, MerluvleeHint_FPPlus3] +- [0x22, 0x0020, MerluvleeHint_HappyHeart1] +- [0x22, 0x0021, MerluvleeHint_HappyHeart2] +- [0x22, 0x0022, MerluvleeHint_HappyFlower1] +- [0x22, 0x0023, MerluvleeHint_HappyFlower2] +- [0x22, 0x0024, MerluvleeHint_FlowerSaver1] +- [0x22, 0x0025, MerluvleeHint_FlowerSaver2] +- [0x22, 0x0026, MerluvleeHint_DodgeMaster] +- [0x22, 0x0027, MerluvleeHint_PdownDup] +- [0x22, 0x0028, MerluvleeHint_PupDdown] +- [0x22, 0x0029, MerluvleeHint_AllorNothing] +- [0x22, 0x002A, MerluvleeHint_PowerPlus1] +- [0x22, 0x002B, MerluvleeHint_PowerPlus2] +- [0x22, 0x002C, MerluvleeHint_HPDrain] +- [0x22, 0x002D, MerluvleeHint_LastStand] +- [0x22, 0x002E, MerluvleeHint_PowerRush] +- [0x22, 0x002F, MerluvleeHint_CloseCall] +- [0x22, 0x0030, MerluvleeHint_MegaRush] +- [0x22, 0x0031, MerluvleeHint_DamageDodge1] +- [0x22, 0x0032, MerluvleeHint_DamageDodge2] +- [0x22, 0x0033, MerluvleeHint_DefendPlus] +- [0x22, 0x0034, MerluvleeHint_IcePower] +- [0x22, 0x0035, MerluvleeHint_FireShield] +- [0x22, 0x0036, MerluvleeHint_SpikeShield] +- [0x22, 0x0037, MerluvleeHint_FeelingFine] +- [0x22, 0x0038, MerluvleeHint_ZapTap] +- [0x22, 0x0039, MerluvleeHint_PrettyLucky] +- [0x22, 0x003A, MerluvleeHint_LuckyDay] +- [0x22, 0x003B, MerluvleeHint_SlowGo] +- [0x22, 0x003C, MerluvleeHint_AttackFXA] +- [0x22, 0x003D, MerluvleeHint_AttackFXD] +- [0x22, 0x003E, MerluvleeHint_AttackFXB] +- [0x22, 0x003F, MerluvleeHint_AttackFXE] +- [0x22, 0x0040, MerluvleeHint_AttackFXC] +- [0x22, 0x0041, MerluvleeHint_Refund] +- [0x22, 0x0042, MerluvleeHint_PayOff] +- [0x22, 0x0043, MerluvleeHint_RunawayPay] +- [0x22, 0x0044, MerluvleeHint_HeartFinder] +- [0x22, 0x0045, MerluvleeHint_FlowerFinder] +- [0x22, 0x0046, MerluvleeHint_MoneyMoney] +- [0x22, 0x0047, MerluvleeHint_Peekaboo] +- [0x22, 0x0048, MerluvleeHint_ISpy] +- [0x22, 0x0049, MerluvleeHint_ChillOut] +- [0x22, 0x004A, MerluvleeHint_SpeedySpin] +- [0x22, 0x004B, MerluvleeHint_DizzyAttack] +- [0x22, 0x004C, MerluvleeHint_SpinAttack] +- [0x22, 0x004D, MerluvleeHint_BumpAttack] +- [0x22, 0x004E, MerluvleeHint_FirstAttack] +- [0x22, 0x004F, MerluvleeHint_SuperBlock_01] +- [0x22, 0x0050, MerluvleeHint_SuperBlock_02] +- [0x22, 0x0051, MerluvleeHint_SuperBlock_03] +- [0x22, 0x0052, MerluvleeHint_SuperBlock_04] +- [0x22, 0x0053, MerluvleeHint_SuperBlock_05] +- [0x22, 0x0054, MerluvleeHint_SuperBlock_06] +- [0x22, 0x0055, MerluvleeHint_SuperBlock_07] +- [0x22, 0x0056, MerluvleeHint_SuperBlock_08] +- [0x22, 0x0057, MerluvleeHint_SuperBlock_09] +- [0x22, 0x0058, MerluvleeHint_SuperBlock_10] +- [0x22, 0x0059, MerluvleeHint_SuperBlock_11] +- [0x22, 0x005A, MerluvleeHint_SuperBlock_12] +- [0x22, 0x005B, MerluvleeHint_SuperBlock_13] +- [0x22, 0x005C, MerluvleeHint_SuperBlock_14] +- [0x22, 0x005D, MerluvleeHint_SuperBlock_15] +- [0x22, 0x005E, MerluvleeHint_SuperBlock_16] +- [0x22, 0x005F, MerluvleeHint_StarPiece_01] +- [0x22, 0x0060, MerluvleeHint_StarPiece_02] +- [0x22, 0x0061, MerluvleeHint_StarPiece_03] +- [0x22, 0x0062, MerluvleeHint_StarPiece_04] +- [0x22, 0x0063, MerluvleeHint_StarPiece_05] +- [0x22, 0x0064, MerluvleeHint_StarPiece_06] +- [0x22, 0x0065, MerluvleeHint_StarPiece_07] +- [0x22, 0x0066, MerluvleeHint_StarPiece_08] +- [0x22, 0x0067, MerluvleeHint_StarPiece_09] +- [0x22, 0x0068, MerluvleeHint_StarPiece_10] +- [0x22, 0x0069, MerluvleeHint_StarPiece_11] +- [0x22, 0x006A, MerluvleeHint_StarPiece_12] +- [0x22, 0x006B, MerluvleeHint_StarPiece_13] +- [0x22, 0x006C, MerluvleeHint_StarPiece_14] +- [0x22, 0x006D, MerluvleeHint_StarPiece_15] +- [0x22, 0x006E, MerluvleeHint_StarPiece_16] +- [0x22, 0x006F, MerluvleeHint_StarPiece_17] +- [0x22, 0x0070, MerluvleeHint_StarPiece_18] +- [0x22, 0x0071, MerluvleeHint_StarPiece_19] +- [0x22, 0x0072, MerluvleeHint_StarPiece_20] +- [0x22, 0x0073, MerluvleeHint_StarPiece_21] +- [0x22, 0x0074, MerluvleeHint_StarPiece_22] +- [0x22, 0x0075, MerluvleeHint_StarPiece_23] +- [0x22, 0x0076, MerluvleeHint_StarPiece_24] +- [0x22, 0x0077, MerluvleeHint_StarPiece_25] +- [0x22, 0x0078, MerluvleeHint_StarPiece_26] +- [0x22, 0x0079, MerluvleeHint_StarPiece_27] +- [0x22, 0x007A, MerluvleeHint_StarPiece_28] +- [0x22, 0x007B, MerluvleeHint_StarPiece_29] +- [0x22, 0x007C, MerluvleeHint_StarPiece_30] +- [0x22, 0x007D, MerluvleeHint_StarPiece_31] +- [0x22, 0x007E, MerluvleeHint_StarPiece_32] +- [0x22, 0x007F, MerluvleeHint_StarPiece_33] +- [0x22, 0x0080, MerluvleeHint_StarPiece_34] +- [0x22, 0x0081, MerluvleeHint_StarPiece_35] +- [0x22, 0x0082, MerluvleeHint_StarPiece_36] +- [0x22, 0x0083, MerluvleeHint_StarPiece_37] +- [0x22, 0x0084, MerluvleeHint_StarPiece_38] +- [0x22, 0x0085, MerluvleeHint_StarPiece_39] +- [0x22, 0x0086, MerluvleeHint_StarPiece_40] +- [0x22, 0x0087, MerluvleeHint_StarPiece_41] +- [0x22, 0x0088, MerluvleeHint_StarPiece_42] +- [0x22, 0x0089, MerluvleeHint_StarPiece_43] +- [0x22, 0x008A, MerluvleeHint_StarPiece_44] +- [0x22, 0x008B, MerluvleeHint_StarPiece_45] +- [0x22, 0x008C, MerluvleeHint_StarPiece_46] +- [0x22, 0x008D, MerluvleeHint_StarPiece_47] +- [0x22, 0x008E, MerluvleeHint_StarPiece_48] +- [0x22, 0x008F, MerluvleeHint_StarPiece_49] +- [0x22, 0x0090, MerluvleeHint_StarPiece_50] +- [0x22, 0x0091, MerluvleeHint_StarPiece_51] +- [0x22, 0x0092, MerluvleeHint_StarPiece_52] +- [0x22, 0x0093, MerluvleeHint_StarPiece_53] +- [0x22, 0x0094, MerluvleeHint_StarPiece_54] +- [0x22, 0x0095, MerluvleeHint_StarPiece_55] +- [0x22, 0x0096, MerluvleeHint_StarPiece_56] +- [0x22, 0x0097, MerluvleeHint_StarPiece_57] +- [0x22, 0x0098, MerluvleeHint_StarPiece_58] +- [0x22, 0x0099, MerluvleeHint_StarPiece_59] +- [0x22, 0x009A, MerluvleeHint_StarPiece_60] +- [0x22, 0x009B, MerluvleeHint_StarPiece_61] +- [0x22, 0x009C, MerluvleeHint_StarPiece_62] +- [0x22, 0x009D, MerluvleeHint_StarPiece_63] +- [0x23, 0x0000, ItemShortDesc_FireFlower] +- [0x23, 0x0001, ItemShortDesc_SnowmanDoll] +- [0x23, 0x0002, ItemShortDesc_ThunderRage] +- [0x23, 0x0003, ItemShortDesc_ThunderBolt] +- [0x23, 0x0004, ItemShortDesc_ShootingStar] +- [0x23, 0x0005, ItemShortDesc_DustyHammer] +- [0x23, 0x0006, ItemShortDesc_Pebble] +- [0x23, 0x0007, ItemShortDesc_StoneCap] +- [0x23, 0x0008, ItemShortDesc_VoltShroom] +- [0x23, 0x0009, ItemShortDesc_Mushroom] +- [0x23, 0x000A, ItemShortDesc_SuperShroom] +- [0x23, 0x000B, ItemShortDesc_UltraShroom] +- [0x23, 0x000C, ItemShortDesc_LifeShroom] +- [0x23, 0x000D, ItemShortDesc_DriedShroom] +- [0x23, 0x000E, ItemShortDesc_TastyTonic] +- [0x23, 0x000F, ItemShortDesc_SuperSoda] +- [0x23, 0x0010, ItemShortDesc_BlueBerry] +- [0x23, 0x0011, ItemShortDesc_RedBerry] +- [0x23, 0x0012, ItemShortDesc_YellowBerry] +- [0x23, 0x0013, ItemShortDesc_BubbleBerry] +- [0x23, 0x0014, ItemShortDesc_Lime] +- [0x23, 0x0015, ItemShortDesc_Lemon] +- [0x23, 0x0016, ItemShortDesc_HoneySyrup] +- [0x23, 0x0017, ItemShortDesc_MapleSyrup] +- [0x23, 0x0018, ItemShortDesc_JamminJelly] +- [0x23, 0x0019, ItemShortDesc_WhackasBump] +- [0x23, 0x001A, ItemShortDesc_Apple] +- [0x23, 0x001B, ItemShortDesc_Goomnut] +- [0x23, 0x001C, ItemShortDesc_KoopaLeaf] +- [0x23, 0x001D, ItemShortDesc_DriedPasta] +- [0x23, 0x001E, ItemShortDesc_DriedFruit] +- [0x23, 0x001F, ItemShortDesc_StrangeLeaf] +- [0x23, 0x0020, ItemShortDesc_CakeMix] +- [0x23, 0x0021, ItemShortDesc_Egg] +- [0x23, 0x0022, ItemShortDesc_Coconut] +- [0x23, 0x0023, ItemShortDesc_Melon] +- [0x23, 0x0024, ItemShortDesc_StinkyHerb] +- [0x23, 0x0025, ItemShortDesc_IcedPotato] +- [0x23, 0x0026, ItemShortDesc_SleepySheep] +- [0x23, 0x0027, ItemShortDesc_POWBlock] +- [0x23, 0x0028, ItemShortDesc_StopWatch] +- [0x23, 0x0029, ItemShortDesc_DizzyDial] +- [0x23, 0x002A, ItemShortDesc_FrightJar] +- [0x23, 0x002B, ItemShortDesc_Mystery] +- [0x23, 0x002C, ItemShortDesc_RepelGel] +- [0x23, 0x002D, ItemShortDesc_SpicySoup] +- [0x23, 0x002E, ItemShortDesc_ApplePie] +- [0x23, 0x002F, ItemShortDesc_HoneyShroom] +- [0x23, 0x0030, ItemShortDesc_MapleShroom] +- [0x23, 0x0031, ItemShortDesc_JellyShroom] +- [0x23, 0x0032, ItemShortDesc_HoneySuper] +- [0x23, 0x0033, ItemShortDesc_MapleSuper] +- [0x23, 0x0034, ItemShortDesc_JellySuper] +- [0x23, 0x0035, ItemShortDesc_HoneyUltra] +- [0x23, 0x0036, ItemShortDesc_MapleUltra] +- [0x23, 0x0037, ItemShortDesc_JellyUltra] +- [0x23, 0x0038, ItemShortDesc_Koopasta] +- [0x23, 0x0039, ItemShortDesc_FriedShroom] +- [0x23, 0x003A, ItemShortDesc_HotShroom] +- [0x23, 0x003B, ItemShortDesc_ShroomSteak] +- [0x23, 0x003C, ItemShortDesc_ShroomCake] +- [0x23, 0x003D, ItemShortDesc_SweetShroom] +- [0x23, 0x003E, ItemShortDesc_BlandMeal] +- [0x23, 0x003F, ItemShortDesc_YummyMeal] +- [0x23, 0x0040, ItemShortDesc_DeluxeFeast] +- [0x23, 0x0041, ItemShortDesc_SpecialShake] +- [0x23, 0x0042, ItemShortDesc_HealthyJuice] +- [0x23, 0x0043, ItemShortDesc_BigCookie] +- [0x23, 0x0044, ItemShortDesc_Cake] +- [0x23, 0x0045, ItemShortDesc_Mistake] +- [0x23, 0x0046, ItemShortDesc_KoopaTea] +- [0x23, 0x0047, ItemShortDesc_Spaghetti] +- [0x23, 0x0048, ItemShortDesc_EggMissile] +- [0x23, 0x0049, ItemShortDesc_FriedEgg] +- [0x23, 0x004A, ItemShortDesc_HoneyCandy] +- [0x23, 0x004B, ItemShortDesc_ElectroPop] +- [0x23, 0x004C, ItemShortDesc_FirePop] +- [0x23, 0x004D, ItemShortDesc_LimeCandy] +- [0x23, 0x004E, ItemShortDesc_CocoPop] +- [0x23, 0x004F, ItemShortDesc_LemonCandy] +- [0x23, 0x0050, ItemShortDesc_JellyPop] +- [0x23, 0x0051, ItemShortDesc_StrangeCake] +- [0x23, 0x0052, ItemShortDesc_KookyCookie] +- [0x23, 0x0053, ItemShortDesc_FrozenFries] +- [0x23, 0x0054, ItemShortDesc_PotatoSalad] +- [0x23, 0x0055, ItemShortDesc_NuttyCake] +- [0x23, 0x0056, ItemShortDesc_BoiledEgg] +- [0x23, 0x0057, ItemShortDesc_YoshiCookie] +- [0x23, 0x0058, ItemShortDesc_PowerJump] +- [0x23, 0x0059, ItemShortDesc_MegaJump] +- [0x23, 0x005A, ItemShortDesc_JumpCharge] +- [0x23, 0x005B, ItemShortDesc_SJumpChg] +- [0x23, 0x005C, ItemShortDesc_SleepStomp] +- [0x23, 0x005D, ItemShortDesc_DizzyStomp] +- [0x23, 0x005E, ItemShortDesc_Multibounce] +- [0x23, 0x005F, ItemShortDesc_ShrinkStomp] +- [0x23, 0x0060, ItemShortDesc_DDownJump] +- [0x23, 0x0061, ItemShortDesc_PowerBounce] +- [0x23, 0x0062, ItemShortDesc_PowerSmash] +- [0x23, 0x0063, ItemShortDesc_MegaSmash] +- [0x23, 0x0064, ItemShortDesc_SmashCharge] +- [0x23, 0x0065, ItemShortDesc_SSmashChg] +- [0x23, 0x0066, ItemShortDesc_HammerThrow] +- [0x23, 0x0067, ItemShortDesc_ShrinkSmash] +- [0x23, 0x0068, ItemShortDesc_SpinSmash] +- [0x23, 0x0069, ItemShortDesc_DDownPound] +- [0x23, 0x006A, ItemShortDesc_QuakeHammer] +- [0x23, 0x006B, ItemShortDesc_PowerQuake] +- [0x23, 0x006C, ItemShortDesc_MegaQuake] +- [0x23, 0x006D, ItemShortDesc_DoubleDip] +- [0x23, 0x006E, ItemShortDesc_TripleDip] +- [0x23, 0x006F, ItemShortDesc_GroupFocus] +- [0x23, 0x0070, ItemShortDesc_QuickChange] +- [0x23, 0x0071, ItemShortDesc_HPPlus] +- [0x23, 0x0072, ItemShortDesc_FPPlus] +- [0x23, 0x0073, ItemShortDesc_PowerPlus] +- [0x23, 0x0074, ItemShortDesc_DefendPlus] +- [0x23, 0x0075, ItemShortDesc_DamageDodge] +- [0x23, 0x0076, ItemShortDesc_PUpDDown] +- [0x23, 0x0077, ItemShortDesc_PDownDUp] +- [0x23, 0x0078, ItemShortDesc_HPDrain] +- [0x23, 0x0079, ItemShortDesc_HappyHeart] +- [0x23, 0x007A, ItemShortDesc_HappyFlower] +- [0x23, 0x007B, ItemShortDesc_FlowerSaver] +- [0x23, 0x007C, ItemShortDesc_HeartFinder] +- [0x23, 0x007D, ItemShortDesc_FlowerFinder] +- [0x23, 0x007E, ItemShortDesc_DeepFocus] +- [0x23, 0x007F, ItemShortDesc_SpikeShield] +- [0x23, 0x0080, ItemShortDesc_DodgeMaster] +- [0x23, 0x0081, ItemShortDesc_PrettyLucky] +- [0x23, 0x0082, ItemShortDesc_LuckyDay] +- [0x23, 0x0083, ItemShortDesc_CloseCall] +- [0x23, 0x0084, ItemShortDesc_PowerRush] +- [0x23, 0x0085, ItemShortDesc_LastStand] +- [0x23, 0x0086, ItemShortDesc_MegaRush] +- [0x23, 0x0087, ItemShortDesc_FirstAttack] +- [0x23, 0x0088, ItemShortDesc_BumpAttack] +- [0x23, 0x0089, ItemShortDesc_SpinAttack] +- [0x23, 0x008A, ItemShortDesc_DizzyAttack] +- [0x23, 0x008B, ItemShortDesc_SpeedySpin] +- [0x23, 0x008C, ItemShortDesc_FeelingFine] +- [0x23, 0x008D, ItemShortDesc_AttackFXA] +- [0x23, 0x008E, ItemShortDesc_AttackFXD] +- [0x23, 0x008F, ItemShortDesc_AttackFXB] +- [0x23, 0x0090, ItemShortDesc_AttackFXE] +- [0x23, 0x0091, ItemShortDesc_AttackFXC] +- [0x23, 0x0092, ItemShortDesc_AttackFXF] +- [0x23, 0x0093, ItemShortDesc_AllorNothing] +- [0x23, 0x0094, ItemShortDesc_SlowGo] +- [0x23, 0x0095, ItemShortDesc_IcePower] +- [0x23, 0x0096, ItemShortDesc_PayOff] +- [0x23, 0x0097, ItemShortDesc_FireShield] +- [0x23, 0x0098, ItemShortDesc_ChillOut] +- [0x23, 0x0099, ItemShortDesc_ZapTap] +- [0x23, 0x009A, ItemShortDesc_MoneyMoney] +- [0x23, 0x009B, ItemShortDesc_RightOn] +- [0x23, 0x009C, ItemShortDesc_RunawayPay] +- [0x23, 0x009D, ItemShortDesc_Refund] +- [0x23, 0x009E, ItemShortDesc_ISpy] +- [0x23, 0x009F, ItemShortDesc_Peekaboo] +- [0x23, 0x00A0, ItemShortDesc_Jump] +- [0x23, 0x00A1, ItemShortDesc_SpinJump] +- [0x23, 0x00A2, ItemShortDesc_TornadoJump] +- [0x23, 0x00A3, ItemShortDesc_Hammer] +- [0x23, 0x00A4, ItemShortDesc_SuperHammer] +- [0x23, 0x00A5, ItemShortDesc_UltraHammer] +- [0x23, 0x00A6, ItemShortDesc_LuckyStar] +- [0x23, 0x00A7, ItemShortDesc_KoopaFortressKey] +- [0x23, 0x00A8, ItemShortDesc_RuinsKey] +- [0x23, 0x00A9, ItemShortDesc_TubbaCastleKey] +- [0x23, 0x00AA, ItemShortDesc_CrystalPalaceKey] +- [0x23, 0x00AB, ItemShortDesc_BowserCastleKey] +- [0x23, 0x00AC, ItemShortDesc_PeachKey] +- [0x23, 0x00AD, ItemShortDesc_OddKey] +- [0x23, 0x00AE, ItemShortDesc_Dolly] +- [0x23, 0x00AF, ItemShortDesc_KooperShell] +- [0x23, 0x00B0, ItemShortDesc_PulseStone] +- [0x23, 0x00B1, ItemShortDesc_Artifact] +- [0x23, 0x00B2, ItemShortDesc_GoldenJar] +- [0x23, 0x00B3, ItemShortDesc_LunarStone] +- [0x23, 0x00B4, ItemShortDesc_PyramidStone] +- [0x23, 0x00B5, ItemShortDesc_DiamondStone] +- [0x23, 0x00B6, ItemShortDesc_BooRecord] +- [0x23, 0x00B7, ItemShortDesc_BooWeight] +- [0x23, 0x00B8, ItemShortDesc_BooPortrait] +- [0x23, 0x00B9, ItemShortDesc_MysticalKey] +- [0x23, 0x00BA, ItemShortDesc_StoreroomKey] +- [0x23, 0x00BB, ItemShortDesc_ToyTrain] +- [0x23, 0x00BC, ItemShortDesc_FryingPan] +- [0x23, 0x00BD, ItemShortDesc_Dictionary] +- [0x23, 0x00BE, ItemShortDesc_MysteryNote] +- [0x23, 0x00BF, ItemShortDesc_Mailbag] +- [0x23, 0x00C0, ItemShortDesc_MagicalSeed1] +- [0x23, 0x00C1, ItemShortDesc_MagicalSeed2] +- [0x23, 0x00C2, ItemShortDesc_MagicalSeed3] +- [0x23, 0x00C3, ItemShortDesc_MagicalSeed4] +- [0x23, 0x00C4, ItemShortDesc_CrystalBerry] +- [0x23, 0x00C5, ItemShortDesc_WaterStone] +- [0x23, 0x00C6, ItemShortDesc_MagicalBean] +- [0x23, 0x00C7, ItemShortDesc_FertileSoil] +- [0x23, 0x00C8, ItemShortDesc_MiracleWater] +- [0x23, 0x00C9, ItemShortDesc_CrystalBall] +- [0x23, 0x00CA, ItemShortDesc_Calculator] +- [0x23, 0x00CB, ItemShortDesc_Cookbook] +- [0x23, 0x00CC, ItemShortDesc_JadeRaven] +- [0x23, 0x00CD, ItemShortDesc_VolcanoVase] +- [0x23, 0x00CE, ItemShortDesc_WarehouseKey] +- [0x23, 0x00CF, ItemShortDesc_SnowmanBucket] +- [0x23, 0x00D0, ItemShortDesc_SnowmanScarf] +- [0x23, 0x00D1, ItemShortDesc_StarStone] +- [0x23, 0x00D2, ItemShortDesc_RedKey] +- [0x23, 0x00D3, ItemShortDesc_BlueKey] +- [0x23, 0x00D4, ItemShortDesc_SneakyParasol] +- [0x23, 0x00D5, ItemShortDesc_PrisonKey] +- [0x23, 0x00D6, ItemShortDesc_Lyrics] +- [0x23, 0x00D7, ItemShortDesc_Melody] +- [0x23, 0x00D8, ItemShortDesc_BakingSugar] +- [0x23, 0x00D9, ItemShortDesc_BakingSalt] +- [0x23, 0x00DA, ItemShortDesc_BakingEgg] +- [0x23, 0x00DB, ItemShortDesc_BakingCream] +- [0x23, 0x00DC, ItemShortDesc_BakingStrawberry] +- [0x23, 0x00DD, ItemShortDesc_BakingButter] +- [0x23, 0x00DE, ItemShortDesc_BakingCleanser] +- [0x23, 0x00DF, ItemShortDesc_BakingWater] +- [0x23, 0x00E0, ItemShortDesc_BakingFlour] +- [0x23, 0x00E1, ItemShortDesc_BakingMilk] +- [0x23, 0x00E2, ItemShortDesc_FirstDegreeCard] +- [0x23, 0x00E3, ItemShortDesc_SecondDegreeCard] +- [0x23, 0x00E4, ItemShortDesc_ThirdDegreeCard] +- [0x23, 0x00E5, ItemShortDesc_FourthDegreeCard] +- [0x23, 0x00E6, ItemShortDesc_Diploma] +- [0x23, 0x00E7, ItemShortDesc_UltraStone] +- [0x23, 0x00E8, ItemShortDesc_SilverCredit] +- [0x23, 0x00E9, ItemShortDesc_GoldCredit] +- [0x23, 0x00EA, ItemShortDesc_Letter25] +- [0x23, 0x00EB, ItemShortDesc_Letter01] +- [0x23, 0x00EC, ItemShortDesc_Letter02] +- [0x23, 0x00ED, ItemShortDesc_Letter03] +- [0x23, 0x00EE, ItemShortDesc_Letter04] +- [0x23, 0x00EF, ItemShortDesc_Letter05] +- [0x23, 0x00F0, ItemShortDesc_Letter06] +- [0x23, 0x00F1, ItemShortDesc_Letter07] +- [0x23, 0x00F2, ItemShortDesc_Letter08] +- [0x23, 0x00F3, ItemShortDesc_Letter09] +- [0x23, 0x00F4, ItemShortDesc_Letter10] +- [0x23, 0x00F5, ItemShortDesc_Letter11] +- [0x23, 0x00F6, ItemShortDesc_Letter12] +- [0x23, 0x00F7, ItemShortDesc_Letter13] +- [0x23, 0x00F8, ItemShortDesc_Letter14] +- [0x23, 0x00F9, ItemShortDesc_Letter15] +- [0x23, 0x00FA, ItemShortDesc_Letter16] +- [0x23, 0x00FB, ItemShortDesc_Letter17] +- [0x23, 0x00FC, ItemShortDesc_Letter18] +- [0x23, 0x00FD, ItemShortDesc_Letter19] +- [0x23, 0x00FE, ItemShortDesc_Letter20] +- [0x23, 0x00FF, ItemShortDesc_Letter21] +- [0x23, 0x0100, ItemShortDesc_Letter22] +- [0x23, 0x0101, ItemShortDesc_Letter23] +- [0x23, 0x0102, ItemShortDesc_Letter24] +- [0x23, 0x0103, ItemShortDesc_KootKoopaLegends] +- [0x23, 0x0104, ItemShortDesc_KootTheTape] +- [0x23, 0x0105, ItemShortDesc_KootLuigiAutograph] +- [0x23, 0x0106, ItemShortDesc_KootEmptyWallet] +- [0x23, 0x0107, ItemShortDesc_KootMerluvleeAutograph] +- [0x23, 0x0108, ItemShortDesc_KootOldPhoto] +- [0x23, 0x0109, ItemShortDesc_KootGlasses] +- [0x23, 0x010A, ItemShortDesc_KootPackage] +- [0x23, 0x010B, ItemShortDesc_KootRedJar] +- [0x24, 0x0000, ItemShopDesc_FireFlower] +- [0x24, 0x0001, ItemShopDesc_SnowmanDoll] +- [0x24, 0x0002, ItemShopDesc_ThunderRage] +- [0x24, 0x0003, ItemShopDesc_ThunderBolt] +- [0x24, 0x0004, ItemShopDesc_ShootingStar] +- [0x24, 0x0005, ItemShopDesc_DustyHammer] +- [0x24, 0x0006, ItemShopDesc_Pebble] +- [0x24, 0x0007, ItemShopDesc_StoneCap] +- [0x24, 0x0008, ItemShopDesc_VoltShroom] +- [0x24, 0x0009, ItemShopDesc_Mushroom] +- [0x24, 0x000A, ItemShopDesc_SuperShroom] +- [0x24, 0x000B, ItemShopDesc_UltraShroom] +- [0x24, 0x000C, ItemShopDesc_LifeShroom] +- [0x24, 0x000D, ItemShopDesc_DriedShroom] +- [0x24, 0x000E, ItemShopDesc_TastyTonic] +- [0x24, 0x000F, ItemShopDesc_SuperSoda] +- [0x24, 0x0010, ItemShopDesc_BlueBerry] +- [0x24, 0x0011, ItemShopDesc_RedBerry] +- [0x24, 0x0012, ItemShopDesc_YellowBerry] +- [0x24, 0x0013, ItemShopDesc_BubbleBerry] +- [0x24, 0x0014, ItemShopDesc_Lime] +- [0x24, 0x0015, ItemShopDesc_Lemon] +- [0x24, 0x0016, ItemShopDesc_HoneySyrup] +- [0x24, 0x0017, ItemShopDesc_MapleSyrup] +- [0x24, 0x0018, ItemShopDesc_JamminJelly] +- [0x24, 0x0019, ItemShopDesc_WhackasBump] +- [0x24, 0x001A, ItemShopDesc_Apple] +- [0x24, 0x001B, ItemShopDesc_Goomnut] +- [0x24, 0x001C, ItemShopDesc_KoopaLeaf] +- [0x24, 0x001D, ItemShopDesc_DriedPasta] +- [0x24, 0x001E, ItemShopDesc_DriedFruit] +- [0x24, 0x001F, ItemShopDesc_StrangeLeaf] +- [0x24, 0x0020, ItemShopDesc_CakeMix] +- [0x24, 0x0021, ItemShopDesc_Egg] +- [0x24, 0x0022, ItemShopDesc_Coconut] +- [0x24, 0x0023, ItemShopDesc_Melon] +- [0x24, 0x0024, ItemShopDesc_StinkyHerb] +- [0x24, 0x0025, ItemShopDesc_IcedPotato] +- [0x24, 0x0026, ItemShopDesc_SleepySheep] +- [0x24, 0x0027, ItemShopDesc_POWBlock] +- [0x24, 0x0028, ItemShopDesc_StopWatch] +- [0x24, 0x0029, ItemShopDesc_DizzyDial] +- [0x24, 0x002A, ItemShopDesc_FrightJar] +- [0x24, 0x002B, ItemShopDesc_Mystery] +- [0x24, 0x002C, ItemShopDesc_RepelGel] +- [0x24, 0x002D, ItemShopDesc_SpicySoup] +- [0x24, 0x002E, ItemShopDesc_ApplePie] +- [0x24, 0x002F, ItemShopDesc_HoneyShroom] +- [0x24, 0x0030, ItemShopDesc_MapleShroom] +- [0x24, 0x0031, ItemShopDesc_JellyShroom] +- [0x24, 0x0032, ItemShopDesc_HoneySuper] +- [0x24, 0x0033, ItemShopDesc_MapleSuper] +- [0x24, 0x0034, ItemShopDesc_JellySuper] +- [0x24, 0x0035, ItemShopDesc_HoneyUltra] +- [0x24, 0x0036, ItemShopDesc_MapleUltra] +- [0x24, 0x0037, ItemShopDesc_JellyUltra] +- [0x24, 0x0038, ItemShopDesc_Koopasta] +- [0x24, 0x0039, ItemShopDesc_FriedShroom] +- [0x24, 0x003A, ItemShopDesc_HotShroom] +- [0x24, 0x003B, ItemShopDesc_ShroomSteak] +- [0x24, 0x003C, ItemShopDesc_ShroomCake] +- [0x24, 0x003D, ItemShopDesc_SweetShroom] +- [0x24, 0x003E, ItemShopDesc_BlandMeal] +- [0x24, 0x003F, ItemShopDesc_YummyMeal] +- [0x24, 0x0040, ItemShopDesc_DeluxeFeast] +- [0x24, 0x0041, ItemShopDesc_SpecialShake] +- [0x24, 0x0042, ItemShopDesc_HealthyJuice] +- [0x24, 0x0043, ItemShopDesc_BigCookie] +- [0x24, 0x0044, ItemShopDesc_Cake] +- [0x24, 0x0045, ItemShopDesc_Mistake] +- [0x24, 0x0046, ItemShopDesc_KoopaTea] +- [0x24, 0x0047, ItemShopDesc_Spaghetti] +- [0x24, 0x0048, ItemShopDesc_EggMissile] +- [0x24, 0x0049, ItemShopDesc_FriedEgg] +- [0x24, 0x004A, ItemShopDesc_HoneyCandy] +- [0x24, 0x004B, ItemShopDesc_ElectroPop] +- [0x24, 0x004C, ItemShopDesc_FirePop] +- [0x24, 0x004D, ItemShopDesc_LimeCandy] +- [0x24, 0x004E, ItemShopDesc_CocoPop] +- [0x24, 0x004F, ItemShopDesc_LemonCandy] +- [0x24, 0x0050, ItemShopDesc_JellyPop] +- [0x24, 0x0051, ItemShopDesc_StrangeCake] +- [0x24, 0x0052, ItemShopDesc_KookyCookie] +- [0x24, 0x0053, ItemShopDesc_FrozenFries] +- [0x24, 0x0054, ItemShopDesc_PotatoSalad] +- [0x24, 0x0055, ItemShopDesc_NuttyCake] +- [0x24, 0x0056, ItemShopDesc_BoiledEgg] +- [0x24, 0x0057, ItemShopDesc_YoshiCookie] +- [0x24, 0x0058, ItemShopDesc_PowerJump] +- [0x24, 0x0059, ItemShopDesc_MegaJump] +- [0x24, 0x005A, ItemShopDesc_JumpCharge] +- [0x24, 0x005B, ItemShopDesc_SJumpChg] +- [0x24, 0x005C, ItemShopDesc_SleepStomp] +- [0x24, 0x005D, ItemShopDesc_DizzyStomp] +- [0x24, 0x005E, ItemShopDesc_Multibounce] +- [0x24, 0x005F, ItemShopDesc_ShrinkStomp] +- [0x24, 0x0060, ItemShopDesc_DDownJump] +- [0x24, 0x0061, ItemShopDesc_PowerBounce] +- [0x24, 0x0062, ItemShopDesc_PowerSmash] +- [0x24, 0x0063, ItemShopDesc_MegaSmash] +- [0x24, 0x0064, ItemShopDesc_SmashCharge] +- [0x24, 0x0065, ItemShopDesc_SSmashChg] +- [0x24, 0x0066, ItemShopDesc_HammerThrow] +- [0x24, 0x0067, ItemShopDesc_ShrinkSmash] +- [0x24, 0x0068, ItemShopDesc_SpinSmash] +- [0x24, 0x0069, ItemShopDesc_DDownPound] +- [0x24, 0x006A, ItemShopDesc_QuakeHammer] +- [0x24, 0x006B, ItemShopDesc_PowerQuake] +- [0x24, 0x006C, ItemShopDesc_MegaQuake] +- [0x24, 0x006D, ItemShopDesc_DoubleDip] +- [0x24, 0x006E, ItemShopDesc_TripleDip] +- [0x24, 0x006F, ItemShopDesc_GroupFocus] +- [0x24, 0x0070, ItemShopDesc_QuickChange] +- [0x24, 0x0071, ItemShopDesc_HPPlus] +- [0x24, 0x0072, ItemShopDesc_FPPlus] +- [0x24, 0x0073, ItemShopDesc_PowerPlus] +- [0x24, 0x0074, ItemShopDesc_DefendPlus] +- [0x24, 0x0075, ItemShopDesc_DamageDodge] +- [0x24, 0x0076, ItemShopDesc_PUpDDown] +- [0x24, 0x0077, ItemShopDesc_PDownDUp] +- [0x24, 0x0078, ItemShopDesc_HPDrain] +- [0x24, 0x0079, ItemShopDesc_HappyHeart] +- [0x24, 0x007A, ItemShopDesc_HappyFlower] +- [0x24, 0x007B, ItemShopDesc_FlowerSaver] +- [0x24, 0x007C, ItemShopDesc_HeartFinder] +- [0x24, 0x007D, ItemShopDesc_FlowerFinder] +- [0x24, 0x007E, ItemShopDesc_DeepFocus] +- [0x24, 0x007F, ItemShopDesc_SpikeShield] +- [0x24, 0x0080, ItemShopDesc_DodgeMaster] +- [0x24, 0x0081, ItemShopDesc_PrettyLucky] +- [0x24, 0x0082, ItemShopDesc_LuckyDay] +- [0x24, 0x0083, ItemShopDesc_CloseCall] +- [0x24, 0x0084, ItemShopDesc_PowerRush] +- [0x24, 0x0085, ItemShopDesc_LastStand] +- [0x24, 0x0086, ItemShopDesc_MegaRush] +- [0x24, 0x0087, ItemShopDesc_FirstAttack] +- [0x24, 0x0088, ItemShopDesc_BumpAttack] +- [0x24, 0x0089, ItemShopDesc_SpinAttack] +- [0x24, 0x008A, ItemShopDesc_DizzyAttack] +- [0x24, 0x008B, ItemShopDesc_SpeedySpin] +- [0x24, 0x008C, ItemShopDesc_FeelingFine] +- [0x24, 0x008D, ItemShopDesc_AttackFXA] +- [0x24, 0x008E, ItemShopDesc_AttackFXD] +- [0x24, 0x008F, ItemShopDesc_AttackFXB] +- [0x24, 0x0090, ItemShopDesc_AttackFXE] +- [0x24, 0x0091, ItemShopDesc_AttackFXC] +- [0x24, 0x0092, ItemShopDesc_AttackFXF] +- [0x24, 0x0093, ItemShopDesc_AllorNothing] +- [0x24, 0x0094, ItemShopDesc_SlowGo] +- [0x24, 0x0095, ItemShopDesc_IcePower] +- [0x24, 0x0096, ItemShopDesc_PayOff] +- [0x24, 0x0097, ItemShopDesc_FireShield] +- [0x24, 0x0098, ItemShopDesc_ChillOut] +- [0x24, 0x0099, ItemShopDesc_ZapTap] +- [0x24, 0x009A, ItemShopDesc_MoneyMoney] +- [0x24, 0x009B, ItemShopDesc_RightOn] +- [0x24, 0x009C, ItemShopDesc_RunawayPay] +- [0x24, 0x009D, ItemShopDesc_Refund] +- [0x24, 0x009E, ItemShopDesc_ISpy] +- [0x24, 0x009F, ItemShopDesc_Peekaboo] +- [0x24, 0x00A0, ItemShopDesc_Jump] +- [0x24, 0x00A1, ItemShopDesc_SpinJump] +- [0x24, 0x00A2, ItemShopDesc_TornadoJump] +- [0x24, 0x00A3, ItemShopDesc_Hammer] +- [0x24, 0x00A4, ItemShopDesc_SuperHammer] +- [0x24, 0x00A5, ItemShopDesc_UltraHammer] +- [0x24, 0x00A6, ItemShopDesc_LuckyStar] +- [0x24, 0x00A7, ItemShopDesc_KoopaFortressKey] +- [0x24, 0x00A8, ItemShopDesc_RuinsKey] +- [0x24, 0x00A9, ItemShopDesc_TubbaCastleKey] +- [0x24, 0x00AA, ItemShopDesc_CrystalPalaceKey] +- [0x24, 0x00AB, ItemShopDesc_BowserCastleKey] +- [0x24, 0x00AC, ItemShopDesc_PeachKey] +- [0x24, 0x00AD, ItemShopDesc_OddKey] +- [0x24, 0x00AE, ItemShopDesc_Dolly] +- [0x24, 0x00AF, ItemShopDesc_KooperShell] +- [0x24, 0x00B0, ItemShopDesc_PulseStone] +- [0x24, 0x00B1, ItemShopDesc_Artifact] +- [0x24, 0x00B2, ItemShopDesc_GoldenJar] +- [0x24, 0x00B3, ItemShopDesc_LunarStone] +- [0x24, 0x00B4, ItemShopDesc_PyramidStone] +- [0x24, 0x00B5, ItemShopDesc_DiamondStone] +- [0x24, 0x00B6, ItemShopDesc_BooRecord] +- [0x24, 0x00B7, ItemShopDesc_BooWeight] +- [0x24, 0x00B8, ItemShopDesc_BooPortrait] +- [0x24, 0x00B9, ItemShopDesc_MysticalKey] +- [0x24, 0x00BA, ItemShopDesc_StoreroomKey] +- [0x24, 0x00BB, ItemShopDesc_ToyTrain] +- [0x24, 0x00BC, ItemShopDesc_FryingPan] +- [0x24, 0x00BD, ItemShopDesc_Dictionary] +- [0x24, 0x00BE, ItemShopDesc_MysteryNote] +- [0x24, 0x00BF, ItemShopDesc_Mailbag] +- [0x24, 0x00C0, ItemShopDesc_MagicalSeed1] +- [0x24, 0x00C1, ItemShopDesc_MagicalSeed2] +- [0x24, 0x00C2, ItemShopDesc_MagicalSeed3] +- [0x24, 0x00C3, ItemShopDesc_MagicalSeed4] +- [0x24, 0x00C4, ItemShopDesc_CrystalBerry] +- [0x24, 0x00C5, ItemShopDesc_WaterStone] +- [0x24, 0x00C6, ItemShopDesc_MagicalBean] +- [0x24, 0x00C7, ItemShopDesc_FertileSoil] +- [0x24, 0x00C8, ItemShopDesc_MiracleWater] +- [0x24, 0x00C9, ItemShopDesc_CrystalBall] +- [0x24, 0x00CA, ItemShopDesc_Calculator] +- [0x24, 0x00CB, ItemShopDesc_Cookbook] +- [0x24, 0x00CC, ItemShopDesc_JadeRaven] +- [0x24, 0x00CD, ItemShopDesc_VolcanoVase] +- [0x24, 0x00CE, ItemShopDesc_WarehouseKey] +- [0x24, 0x00CF, ItemShopDesc_SnowmanBucket] +- [0x24, 0x00D0, ItemShopDesc_SnowmanScarf] +- [0x24, 0x00D1, ItemShopDesc_StarStone] +- [0x24, 0x00D2, ItemShopDesc_RedKey] +- [0x24, 0x00D3, ItemShopDesc_BlueKey] +- [0x24, 0x00D4, ItemShopDesc_SneakyParasol] +- [0x24, 0x00D5, ItemShopDesc_PrisonKey] +- [0x24, 0x00D6, ItemShopDesc_Lyrics] +- [0x24, 0x00D7, ItemShopDesc_Melody] +- [0x24, 0x00D8, ItemShopDesc_BakingSugar] +- [0x24, 0x00D9, ItemShopDesc_BakingSalt] +- [0x24, 0x00DA, ItemShopDesc_BakingEgg] +- [0x24, 0x00DB, ItemShopDesc_BakingCream] +- [0x24, 0x00DC, ItemShopDesc_BakingStrawberry] +- [0x24, 0x00DD, ItemShopDesc_BakingButter] +- [0x24, 0x00DE, ItemShopDesc_BakingCleanser] +- [0x24, 0x00DF, ItemShopDesc_BakingWater] +- [0x24, 0x00E0, ItemShopDesc_BakingFlour] +- [0x24, 0x00E1, ItemShopDesc_BakingMilk] +- [0x24, 0x00E2, ItemShopDesc_FirstDegreeCard] +- [0x24, 0x00E3, ItemShopDesc_SecondDegreeCard] +- [0x24, 0x00E4, ItemShopDesc_ThirdDegreeCard] +- [0x24, 0x00E5, ItemShopDesc_FourthDegreeCard] +- [0x24, 0x00E6, ItemShopDesc_Diploma] +- [0x24, 0x00E7, ItemShopDesc_UltraStone] +- [0x24, 0x00E8, ItemShopDesc_SilverCredit] +- [0x24, 0x00E9, ItemShopDesc_GoldCredit] +- [0x24, 0x00EA, ItemShopDesc_Letter25] +- [0x24, 0x00EB, ItemShopDesc_Letter01] +- [0x24, 0x00EC, ItemShopDesc_Letter02] +- [0x24, 0x00ED, ItemShopDesc_Letter03] +- [0x24, 0x00EE, ItemShopDesc_Letter04] +- [0x24, 0x00EF, ItemShopDesc_Letter05] +- [0x24, 0x00F0, ItemShopDesc_Letter06] +- [0x24, 0x00F1, ItemShopDesc_Letter07] +- [0x24, 0x00F2, ItemShopDesc_Letter08] +- [0x24, 0x00F3, ItemShopDesc_Letter09] +- [0x24, 0x00F4, ItemShopDesc_Letter10] +- [0x24, 0x00F5, ItemShopDesc_Letter11] +- [0x24, 0x00F6, ItemShopDesc_Letter12] +- [0x24, 0x00F7, ItemShopDesc_Letter13] +- [0x24, 0x00F8, ItemShopDesc_Letter14] +- [0x24, 0x00F9, ItemShopDesc_Letter15] +- [0x24, 0x00FA, ItemShopDesc_Letter16] +- [0x24, 0x00FB, ItemShopDesc_Letter17] +- [0x24, 0x00FC, ItemShopDesc_Letter18] +- [0x24, 0x00FD, ItemShopDesc_Letter19] +- [0x24, 0x00FE, ItemShopDesc_Letter20] +- [0x24, 0x00FF, ItemShopDesc_Letter21] +- [0x24, 0x0100, ItemShopDesc_Letter22] +- [0x24, 0x0101, ItemShopDesc_Letter23] +- [0x24, 0x0102, ItemShopDesc_Letter24] +- [0x24, 0x0103, ItemShopDesc_KootKoopaLegends] +- [0x24, 0x0104, ItemShopDesc_KootTheTape] +- [0x24, 0x0105, ItemShopDesc_KootLuigiAutograph] +- [0x24, 0x0106, ItemShopDesc_KootEmptyWallet] +- [0x24, 0x0107, ItemShopDesc_KootMerluvleeAutograph] +- [0x24, 0x0108, ItemShopDesc_KootOldPhoto] +- [0x24, 0x0109, ItemShopDesc_KootGlasses] +- [0x24, 0x010A, ItemShopDesc_KootPackage] +- [0x24, 0x010B, ItemShopDesc_KootRedJar] +- [0x25, 0x0000, ItemFullDesc_FireFlower] +- [0x25, 0x0001, ItemFullDesc_SnowmanDoll] +- [0x25, 0x0002, ItemFullDesc_ThunderRage] +- [0x25, 0x0003, ItemFullDesc_ThunderBolt] +- [0x25, 0x0004, ItemFullDesc_ShootingStar] +- [0x25, 0x0005, ItemFullDesc_DustyHammer] +- [0x25, 0x0006, ItemFullDesc_Pebble] +- [0x25, 0x0007, ItemFullDesc_StoneCap] +- [0x25, 0x0008, ItemFullDesc_VoltShroom] +- [0x25, 0x0009, ItemFullDesc_Mushroom] +- [0x25, 0x000A, ItemFullDesc_SuperShroom] +- [0x25, 0x000B, ItemFullDesc_UltraShroom] +- [0x25, 0x000C, ItemFullDesc_LifeShroom] +- [0x25, 0x000D, ItemFullDesc_DriedShroom] +- [0x25, 0x000E, ItemFullDesc_TastyTonic] +- [0x25, 0x000F, ItemFullDesc_SuperSoda] +- [0x25, 0x0010, ItemFullDesc_BlueBerry] +- [0x25, 0x0011, ItemFullDesc_RedBerry] +- [0x25, 0x0012, ItemFullDesc_YellowBerry] +- [0x25, 0x0013, ItemFullDesc_BubbleBerry] +- [0x25, 0x0014, ItemFullDesc_Lime] +- [0x25, 0x0015, ItemFullDesc_Lemon] +- [0x25, 0x0016, ItemFullDesc_HoneySyrup] +- [0x25, 0x0017, ItemFullDesc_MapleSyrup] +- [0x25, 0x0018, ItemFullDesc_JamminJelly] +- [0x25, 0x0019, ItemFullDesc_WhackasBump] +- [0x25, 0x001A, ItemFullDesc_Apple] +- [0x25, 0x001B, ItemFullDesc_Goomnut] +- [0x25, 0x001C, ItemFullDesc_KoopaLeaf] +- [0x25, 0x001D, ItemFullDesc_DriedPasta] +- [0x25, 0x001E, ItemFullDesc_DriedFruit] +- [0x25, 0x001F, ItemFullDesc_StrangeLeaf] +- [0x25, 0x0020, ItemFullDesc_CakeMix] +- [0x25, 0x0021, ItemFullDesc_Egg] +- [0x25, 0x0022, ItemFullDesc_Coconut] +- [0x25, 0x0023, ItemFullDesc_Melon] +- [0x25, 0x0024, ItemFullDesc_StinkyHerb] +- [0x25, 0x0025, ItemFullDesc_IcedPotato] +- [0x25, 0x0026, ItemFullDesc_SleepySheep] +- [0x25, 0x0027, ItemFullDesc_POWBlock] +- [0x25, 0x0028, ItemFullDesc_StopWatch] +- [0x25, 0x0029, ItemFullDesc_DizzyDial] +- [0x25, 0x002A, ItemFullDesc_FrightJar] +- [0x25, 0x002B, ItemFullDesc_Mystery] +- [0x25, 0x002C, ItemFullDesc_RepelGel] +- [0x25, 0x002D, ItemFullDesc_SpicySoup] +- [0x25, 0x002E, ItemFullDesc_ApplePie] +- [0x25, 0x002F, ItemFullDesc_HoneyShroom] +- [0x25, 0x0030, ItemFullDesc_MapleShroom] +- [0x25, 0x0031, ItemFullDesc_JellyShroom] +- [0x25, 0x0032, ItemFullDesc_HoneySuper] +- [0x25, 0x0033, ItemFullDesc_MapleSuper] +- [0x25, 0x0034, ItemFullDesc_JellySuper] +- [0x25, 0x0035, ItemFullDesc_HoneyUltra] +- [0x25, 0x0036, ItemFullDesc_MapleUltra] +- [0x25, 0x0037, ItemFullDesc_JellyUltra] +- [0x25, 0x0038, ItemFullDesc_Koopasta] +- [0x25, 0x0039, ItemFullDesc_FriedShroom] +- [0x25, 0x003A, ItemFullDesc_HotShroom] +- [0x25, 0x003B, ItemFullDesc_ShroomSteak] +- [0x25, 0x003C, ItemFullDesc_ShroomCake] +- [0x25, 0x003D, ItemFullDesc_SweetShroom] +- [0x25, 0x003E, ItemFullDesc_BlandMeal] +- [0x25, 0x003F, ItemFullDesc_YummyMeal] +- [0x25, 0x0040, ItemFullDesc_DeluxeFeast] +- [0x25, 0x0041, ItemFullDesc_SpecialShake] +- [0x25, 0x0042, ItemFullDesc_HealthyJuice] +- [0x25, 0x0043, ItemFullDesc_BigCookie] +- [0x25, 0x0044, ItemFullDesc_Cake] +- [0x25, 0x0045, ItemFullDesc_Mistake] +- [0x25, 0x0046, ItemFullDesc_KoopaTea] +- [0x25, 0x0047, ItemFullDesc_Spaghetti] +- [0x25, 0x0048, ItemFullDesc_EggMissile] +- [0x25, 0x0049, ItemFullDesc_FriedEgg] +- [0x25, 0x004A, ItemFullDesc_HoneyCandy] +- [0x25, 0x004B, ItemFullDesc_ElectroPop] +- [0x25, 0x004C, ItemFullDesc_FirePop] +- [0x25, 0x004D, ItemFullDesc_LimeCandy] +- [0x25, 0x004E, ItemFullDesc_CocoPop] +- [0x25, 0x004F, ItemFullDesc_LemonCandy] +- [0x25, 0x0050, ItemFullDesc_JellyPop] +- [0x25, 0x0051, ItemFullDesc_StrangeCake] +- [0x25, 0x0052, ItemFullDesc_KookyCookie] +- [0x25, 0x0053, ItemFullDesc_FrozenFries] +- [0x25, 0x0054, ItemFullDesc_PotatoSalad] +- [0x25, 0x0055, ItemFullDesc_NuttyCake] +- [0x25, 0x0056, ItemFullDesc_BoiledEgg] +- [0x25, 0x0057, ItemFullDesc_YoshiCookie] +- [0x25, 0x0058, ItemFullDesc_PowerJump] +- [0x25, 0x0059, ItemFullDesc_MegaJump] +- [0x25, 0x005A, ItemFullDesc_JumpCharge] +- [0x25, 0x005B, ItemFullDesc_SJumpChg] +- [0x25, 0x005C, ItemFullDesc_SleepStomp] +- [0x25, 0x005D, ItemFullDesc_DizzyStomp] +- [0x25, 0x005E, ItemFullDesc_Multibounce] +- [0x25, 0x005F, ItemFullDesc_ShrinkStomp] +- [0x25, 0x0060, ItemFullDesc_DDownJump] +- [0x25, 0x0061, ItemFullDesc_PowerBounce] +- [0x25, 0x0062, ItemFullDesc_PowerSmash] +- [0x25, 0x0063, ItemFullDesc_MegaSmash] +- [0x25, 0x0064, ItemFullDesc_SmashCharge] +- [0x25, 0x0065, ItemFullDesc_SSmashChg] +- [0x25, 0x0066, ItemFullDesc_HammerThrow] +- [0x25, 0x0067, ItemFullDesc_ShrinkSmash] +- [0x25, 0x0068, ItemFullDesc_SpinSmash] +- [0x25, 0x0069, ItemFullDesc_DDownPound] +- [0x25, 0x006A, ItemFullDesc_QuakeHammer] +- [0x25, 0x006B, ItemFullDesc_PowerQuake] +- [0x25, 0x006C, ItemFullDesc_MegaQuake] +- [0x25, 0x006D, ItemFullDesc_DoubleDip] +- [0x25, 0x006E, ItemFullDesc_TripleDip] +- [0x25, 0x006F, ItemFullDesc_GroupFocus] +- [0x25, 0x0070, ItemFullDesc_QuickChange] +- [0x25, 0x0071, ItemFullDesc_HPPlus] +- [0x25, 0x0072, ItemFullDesc_FPPlus] +- [0x25, 0x0073, ItemFullDesc_PowerPlus] +- [0x25, 0x0074, ItemFullDesc_DefendPlus] +- [0x25, 0x0075, ItemFullDesc_DamageDodge] +- [0x25, 0x0076, ItemFullDesc_PUpDDown] +- [0x25, 0x0077, ItemFullDesc_PDownDUp] +- [0x25, 0x0078, ItemFullDesc_HPDrain] +- [0x25, 0x0079, ItemFullDesc_HappyHeart] +- [0x25, 0x007A, ItemFullDesc_HappyFlower] +- [0x25, 0x007B, ItemFullDesc_FlowerSaver] +- [0x25, 0x007C, ItemFullDesc_HeartFinder] +- [0x25, 0x007D, ItemFullDesc_FlowerFinder] +- [0x25, 0x007E, ItemFullDesc_DeepFocus] +- [0x25, 0x007F, ItemFullDesc_SpikeShield] +- [0x25, 0x0080, ItemFullDesc_DodgeMaster] +- [0x25, 0x0081, ItemFullDesc_PrettyLucky] +- [0x25, 0x0082, ItemFullDesc_LuckyDay] +- [0x25, 0x0083, ItemFullDesc_CloseCall] +- [0x25, 0x0084, ItemFullDesc_PowerRush] +- [0x25, 0x0085, ItemFullDesc_LastStand] +- [0x25, 0x0086, ItemFullDesc_MegaRush] +- [0x25, 0x0087, ItemFullDesc_FirstAttack] +- [0x25, 0x0088, ItemFullDesc_BumpAttack] +- [0x25, 0x0089, ItemFullDesc_SpinAttack] +- [0x25, 0x008A, ItemFullDesc_DizzyAttack] +- [0x25, 0x008B, ItemFullDesc_SpeedySpin] +- [0x25, 0x008C, ItemFullDesc_FeelingFine] +- [0x25, 0x008D, ItemFullDesc_AttackFXA] +- [0x25, 0x008E, ItemFullDesc_AttackFXD] +- [0x25, 0x008F, ItemFullDesc_AttackFXB] +- [0x25, 0x0090, ItemFullDesc_AttackFXE] +- [0x25, 0x0091, ItemFullDesc_AttackFXC] +- [0x25, 0x0092, ItemFullDesc_AttackFXF] +- [0x25, 0x0093, ItemFullDesc_AllorNothing] +- [0x25, 0x0094, ItemFullDesc_SlowGo] +- [0x25, 0x0095, ItemFullDesc_IcePower] +- [0x25, 0x0096, ItemFullDesc_PayOff] +- [0x25, 0x0097, ItemFullDesc_FireShield] +- [0x25, 0x0098, ItemFullDesc_ChillOut] +- [0x25, 0x0099, ItemFullDesc_ZapTap] +- [0x25, 0x009A, ItemFullDesc_MoneyMoney] +- [0x25, 0x009B, ItemFullDesc_RightOn] +- [0x25, 0x009C, ItemFullDesc_RunawayPay] +- [0x25, 0x009D, ItemFullDesc_Refund] +- [0x25, 0x009E, ItemFullDesc_ISpy] +- [0x25, 0x009F, ItemFullDesc_Peekaboo] +- [0x25, 0x00A0, ItemFullDesc_Jump] +- [0x25, 0x00A1, ItemFullDesc_SpinJump] +- [0x25, 0x00A2, ItemFullDesc_TornadoJump] +- [0x25, 0x00A3, ItemFullDesc_Hammer] +- [0x25, 0x00A4, ItemFullDesc_SuperHammer] +- [0x25, 0x00A5, ItemFullDesc_UltraHammer] +- [0x25, 0x00A6, ItemFullDesc_LuckyStar] +- [0x25, 0x00A7, ItemFullDesc_KoopaFortressKey] +- [0x25, 0x00A8, ItemFullDesc_RuinsKey] +- [0x25, 0x00A9, ItemFullDesc_TubbaCastleKey] +- [0x25, 0x00AA, ItemFullDesc_CrystalPalaceKey] +- [0x25, 0x00AB, ItemFullDesc_BowserCastleKey] +- [0x25, 0x00AC, ItemFullDesc_PeachKey] +- [0x25, 0x00AD, ItemFullDesc_OddKey] +- [0x25, 0x00AE, ItemFullDesc_Dolly] +- [0x25, 0x00AF, ItemFullDesc_KooperShell] +- [0x25, 0x00B0, ItemFullDesc_PulseStone] +- [0x25, 0x00B1, ItemFullDesc_Artifact] +- [0x25, 0x00B2, ItemFullDesc_GoldenJar] +- [0x25, 0x00B3, ItemFullDesc_LunarStone] +- [0x25, 0x00B4, ItemFullDesc_PyramidStone] +- [0x25, 0x00B5, ItemFullDesc_DiamondStone] +- [0x25, 0x00B6, ItemFullDesc_BooRecord] +- [0x25, 0x00B7, ItemFullDesc_BooWeight] +- [0x25, 0x00B8, ItemFullDesc_BooPortrait] +- [0x25, 0x00B9, ItemFullDesc_MysticalKey] +- [0x25, 0x00BA, ItemFullDesc_StoreroomKey] +- [0x25, 0x00BB, ItemFullDesc_ToyTrain] +- [0x25, 0x00BC, ItemFullDesc_FryingPan] +- [0x25, 0x00BD, ItemFullDesc_Dictionary] +- [0x25, 0x00BE, ItemFullDesc_MysteryNote] +- [0x25, 0x00BF, ItemFullDesc_Mailbag] +- [0x25, 0x00C0, ItemFullDesc_MagicalSeed1] +- [0x25, 0x00C1, ItemFullDesc_MagicalSeed2] +- [0x25, 0x00C2, ItemFullDesc_MagicalSeed3] +- [0x25, 0x00C3, ItemFullDesc_MagicalSeed4] +- [0x25, 0x00C4, ItemFullDesc_CrystalBerry] +- [0x25, 0x00C5, ItemFullDesc_WaterStone] +- [0x25, 0x00C6, ItemFullDesc_MagicalBean] +- [0x25, 0x00C7, ItemFullDesc_FertileSoil] +- [0x25, 0x00C8, ItemFullDesc_MiracleWater] +- [0x25, 0x00C9, ItemFullDesc_CrystalBall] +- [0x25, 0x00CA, ItemFullDesc_Calculator] +- [0x25, 0x00CB, ItemFullDesc_Cookbook] +- [0x25, 0x00CC, ItemFullDesc_JadeRaven] +- [0x25, 0x00CD, ItemFullDesc_VolcanoVase] +- [0x25, 0x00CE, ItemFullDesc_WarehouseKey] +- [0x25, 0x00CF, ItemFullDesc_SnowmanBucket] +- [0x25, 0x00D0, ItemFullDesc_SnowmanScarf] +- [0x25, 0x00D1, ItemFullDesc_StarStone] +- [0x25, 0x00D2, ItemFullDesc_RedKey] +- [0x25, 0x00D3, ItemFullDesc_BlueKey] +- [0x25, 0x00D4, ItemFullDesc_SneakyParasol] +- [0x25, 0x00D5, ItemFullDesc_PrisonKey] +- [0x25, 0x00D6, ItemFullDesc_Lyrics] +- [0x25, 0x00D7, ItemFullDesc_Melody] +- [0x25, 0x00D8, ItemFullDesc_BakingSugar] +- [0x25, 0x00D9, ItemFullDesc_BakingSalt] +- [0x25, 0x00DA, ItemFullDesc_BakingEgg] +- [0x25, 0x00DB, ItemFullDesc_BakingCream] +- [0x25, 0x00DC, ItemFullDesc_BakingStrawberry] +- [0x25, 0x00DD, ItemFullDesc_BakingButter] +- [0x25, 0x00DE, ItemFullDesc_BakingCleanser] +- [0x25, 0x00DF, ItemFullDesc_BakingWater] +- [0x25, 0x00E0, ItemFullDesc_BakingFlour] +- [0x25, 0x00E1, ItemFullDesc_BakingMilk] +- [0x25, 0x00E2, ItemFullDesc_FirstDegreeCard] +- [0x25, 0x00E3, ItemFullDesc_SecondDegreeCard] +- [0x25, 0x00E4, ItemFullDesc_ThirdDegreeCard] +- [0x25, 0x00E5, ItemFullDesc_FourthDegreeCard] +- [0x25, 0x00E6, ItemFullDesc_Diploma] +- [0x25, 0x00E7, ItemFullDesc_UltraStone] +- [0x25, 0x00E8, ItemFullDesc_SilverCredit] +- [0x25, 0x00E9, ItemFullDesc_GoldCredit] +- [0x25, 0x00EA, ItemFullDesc_Letter25] +- [0x25, 0x00EB, ItemFullDesc_Letter01] +- [0x25, 0x00EC, ItemFullDesc_Letter02] +- [0x25, 0x00ED, ItemFullDesc_Letter03] +- [0x25, 0x00EE, ItemFullDesc_Letter04] +- [0x25, 0x00EF, ItemFullDesc_Letter05] +- [0x25, 0x00F0, ItemFullDesc_Letter06] +- [0x25, 0x00F1, ItemFullDesc_Letter07] +- [0x25, 0x00F2, ItemFullDesc_Letter08] +- [0x25, 0x00F3, ItemFullDesc_Letter09] +- [0x25, 0x00F4, ItemFullDesc_Letter10] +- [0x25, 0x00F5, ItemFullDesc_Letter11] +- [0x25, 0x00F6, ItemFullDesc_Letter12] +- [0x25, 0x00F7, ItemFullDesc_Letter13] +- [0x25, 0x00F8, ItemFullDesc_Letter14] +- [0x25, 0x00F9, ItemFullDesc_Letter15] +- [0x25, 0x00FA, ItemFullDesc_Letter16] +- [0x25, 0x00FB, ItemFullDesc_Letter17] +- [0x25, 0x00FC, ItemFullDesc_Letter18] +- [0x25, 0x00FD, ItemFullDesc_Letter19] +- [0x25, 0x00FE, ItemFullDesc_Letter20] +- [0x25, 0x00FF, ItemFullDesc_Letter21] +- [0x25, 0x0100, ItemFullDesc_Letter22] +- [0x25, 0x0101, ItemFullDesc_Letter23] +- [0x25, 0x0102, ItemFullDesc_Letter24] +- [0x25, 0x0103, ItemFullDesc_KootKoopaLegends] +- [0x25, 0x0104, ItemFullDesc_KootTheTape] +- [0x25, 0x0105, ItemFullDesc_KootLuigiAutograph] +- [0x25, 0x0106, ItemFullDesc_KootEmptyWallet] +- [0x25, 0x0107, ItemFullDesc_KootMerluvleeAutograph] +- [0x25, 0x0108, ItemFullDesc_KootOldPhoto] +- [0x25, 0x0109, ItemFullDesc_KootGlasses] +- [0x25, 0x010A, ItemFullDesc_KootPackage] +- [0x25, 0x010B, ItemFullDesc_KootRedJar] +- [0x26, 0x0000, ItemName_FireFlower] +- [0x26, 0x0001, ItemName_SnowmanDoll] +- [0x26, 0x0002, ItemName_ThunderRage] +- [0x26, 0x0003, ItemName_ThunderBolt] +- [0x26, 0x0004, ItemName_ShootingStar] +- [0x26, 0x0005, ItemName_DustyHammer] +- [0x26, 0x0006, ItemName_Pebble] +- [0x26, 0x0007, ItemName_StoneCap] +- [0x26, 0x0008, ItemName_VoltShroom] +- [0x26, 0x0009, ItemName_Mushroom] +- [0x26, 0x000A, ItemName_SuperShroom] +- [0x26, 0x000B, ItemName_UltraShroom] +- [0x26, 0x000C, ItemName_LifeShroom] +- [0x26, 0x000D, ItemName_DriedShroom] +- [0x26, 0x000E, ItemName_TastyTonic] +- [0x26, 0x000F, ItemName_SuperSoda] +- [0x26, 0x0010, ItemName_BlueBerry] +- [0x26, 0x0011, ItemName_RedBerry] +- [0x26, 0x0012, ItemName_YellowBerry] +- [0x26, 0x0013, ItemName_BubbleBerry] +- [0x26, 0x0014, ItemName_Lime] +- [0x26, 0x0015, ItemName_Lemon] +- [0x26, 0x0016, ItemName_HoneySyrup] +- [0x26, 0x0017, ItemName_MapleSyrup] +- [0x26, 0x0018, ItemName_JamminJelly] +- [0x26, 0x0019, ItemName_WhackasBump] +- [0x26, 0x001A, ItemName_Apple] +- [0x26, 0x001B, ItemName_Goomnut] +- [0x26, 0x001C, ItemName_KoopaLeaf] +- [0x26, 0x001D, ItemName_DriedPasta] +- [0x26, 0x001E, ItemName_DriedFruit] +- [0x26, 0x001F, ItemName_StrangeLeaf] +- [0x26, 0x0020, ItemName_CakeMix] +- [0x26, 0x0021, ItemName_Egg] +- [0x26, 0x0022, ItemName_Coconut] +- [0x26, 0x0023, ItemName_Melon] +- [0x26, 0x0024, ItemName_StinkyHerb] +- [0x26, 0x0025, ItemName_IcedPotato] +- [0x26, 0x0026, ItemName_SleepySheep] +- [0x26, 0x0027, ItemName_POWBlock] +- [0x26, 0x0028, ItemName_StopWatch] +- [0x26, 0x0029, ItemName_DizzyDial] +- [0x26, 0x002A, ItemName_FrightJar] +- [0x26, 0x002B, ItemName_Mystery] +- [0x26, 0x002C, ItemName_RepelGel] +- [0x26, 0x002D, ItemName_SpicySoup] +- [0x26, 0x002E, ItemName_ApplePie] +- [0x26, 0x002F, ItemName_HoneyShroom] +- [0x26, 0x0030, ItemName_MapleShroom] +- [0x26, 0x0031, ItemName_JellyShroom] +- [0x26, 0x0032, ItemName_HoneySuper] +- [0x26, 0x0033, ItemName_MapleSuper] +- [0x26, 0x0034, ItemName_JellySuper] +- [0x26, 0x0035, ItemName_HoneyUltra] +- [0x26, 0x0036, ItemName_MapleUltra] +- [0x26, 0x0037, ItemName_JellyUltra] +- [0x26, 0x0038, ItemName_Koopasta] +- [0x26, 0x0039, ItemName_FriedShroom] +- [0x26, 0x003A, ItemName_HotShroom] +- [0x26, 0x003B, ItemName_ShroomSteak] +- [0x26, 0x003C, ItemName_ShroomCake] +- [0x26, 0x003D, ItemName_SweetShroom] +- [0x26, 0x003E, ItemName_BlandMeal] +- [0x26, 0x003F, ItemName_YummyMeal] +- [0x26, 0x0040, ItemName_DeluxeFeast] +- [0x26, 0x0041, ItemName_SpecialShake] +- [0x26, 0x0042, ItemName_HealthyJuice] +- [0x26, 0x0043, ItemName_BigCookie] +- [0x26, 0x0044, ItemName_Cake] +- [0x26, 0x0045, ItemName_Mistake] +- [0x26, 0x0046, ItemName_KoopaTea] +- [0x26, 0x0047, ItemName_Spaghetti] +- [0x26, 0x0048, ItemName_EggMissile] +- [0x26, 0x0049, ItemName_FriedEgg] +- [0x26, 0x004A, ItemName_HoneyCandy] +- [0x26, 0x004B, ItemName_ElectroPop] +- [0x26, 0x004C, ItemName_FirePop] +- [0x26, 0x004D, ItemName_LimeCandy] +- [0x26, 0x004E, ItemName_CocoPop] +- [0x26, 0x004F, ItemName_LemonCandy] +- [0x26, 0x0050, ItemName_JellyPop] +- [0x26, 0x0051, ItemName_StrangeCake] +- [0x26, 0x0052, ItemName_KookyCookie] +- [0x26, 0x0053, ItemName_FrozenFries] +- [0x26, 0x0054, ItemName_PotatoSalad] +- [0x26, 0x0055, ItemName_NuttyCake] +- [0x26, 0x0056, ItemName_BoiledEgg] +- [0x26, 0x0057, ItemName_YoshiCookie] +- [0x26, 0x0058, ItemName_PowerJump] +- [0x26, 0x0059, ItemName_MegaJump] +- [0x26, 0x005A, ItemName_JumpCharge] +- [0x26, 0x005B, ItemName_SJumpChg] +- [0x26, 0x005C, ItemName_SleepStomp] +- [0x26, 0x005D, ItemName_DizzyStomp] +- [0x26, 0x005E, ItemName_Multibounce] +- [0x26, 0x005F, ItemName_ShrinkStomp] +- [0x26, 0x0060, ItemName_DDownJump] +- [0x26, 0x0061, ItemName_PowerBounce] +- [0x26, 0x0062, ItemName_PowerSmash] +- [0x26, 0x0063, ItemName_MegaSmash] +- [0x26, 0x0064, ItemName_SmashCharge] +- [0x26, 0x0065, ItemName_SSmashChg] +- [0x26, 0x0066, ItemName_HammerThrow] +- [0x26, 0x0067, ItemName_ShrinkSmash] +- [0x26, 0x0068, ItemName_SpinSmash] +- [0x26, 0x0069, ItemName_DDownPound] +- [0x26, 0x006A, ItemName_QuakeHammer] +- [0x26, 0x006B, ItemName_PowerQuake] +- [0x26, 0x006C, ItemName_MegaQuake] +- [0x26, 0x006D, ItemName_DoubleDip] +- [0x26, 0x006E, ItemName_TripleDip] +- [0x26, 0x006F, ItemName_GroupFocus] +- [0x26, 0x0070, ItemName_QuickChange] +- [0x26, 0x0071, ItemName_HPPlus] +- [0x26, 0x0072, ItemName_FPPlus] +- [0x26, 0x0073, ItemName_PowerPlus] +- [0x26, 0x0074, ItemName_DefendPlus] +- [0x26, 0x0075, ItemName_DamageDodge] +- [0x26, 0x0076, ItemName_PUpDDown] +- [0x26, 0x0077, ItemName_PDownDUp] +- [0x26, 0x0078, ItemName_HPDrain] +- [0x26, 0x0079, ItemName_HappyHeart] +- [0x26, 0x007A, ItemName_HappyFlower] +- [0x26, 0x007B, ItemName_FlowerSaver] +- [0x26, 0x007C, ItemName_HeartFinder] +- [0x26, 0x007D, ItemName_FlowerFinder] +- [0x26, 0x007E, ItemName_DeepFocus] +- [0x26, 0x007F, ItemName_SpikeShield] +- [0x26, 0x0080, ItemName_DodgeMaster] +- [0x26, 0x0081, ItemName_PrettyLucky] +- [0x26, 0x0082, ItemName_LuckyDay] +- [0x26, 0x0083, ItemName_CloseCall] +- [0x26, 0x0084, ItemName_PowerRush] +- [0x26, 0x0085, ItemName_LastStand] +- [0x26, 0x0086, ItemName_MegaRush] +- [0x26, 0x0087, ItemName_FirstAttack] +- [0x26, 0x0088, ItemName_BumpAttack] +- [0x26, 0x0089, ItemName_SpinAttack] +- [0x26, 0x008A, ItemName_DizzyAttack] +- [0x26, 0x008B, ItemName_SpeedySpin] +- [0x26, 0x008C, ItemName_FeelingFine] +- [0x26, 0x008D, ItemName_AttackFXA] +- [0x26, 0x008E, ItemName_AttackFXD] +- [0x26, 0x008F, ItemName_AttackFXB] +- [0x26, 0x0090, ItemName_AttackFXE] +- [0x26, 0x0091, ItemName_AttackFXC] +- [0x26, 0x0092, ItemName_AttackFXF] +- [0x26, 0x0093, ItemName_AllorNothing] +- [0x26, 0x0094, ItemName_SlowGo] +- [0x26, 0x0095, ItemName_IcePower] +- [0x26, 0x0096, ItemName_PayOff] +- [0x26, 0x0097, ItemName_FireShield] +- [0x26, 0x0098, ItemName_ChillOut] +- [0x26, 0x0099, ItemName_ZapTap] +- [0x26, 0x009A, ItemName_MoneyMoney] +- [0x26, 0x009B, ItemName_RightOn] +- [0x26, 0x009C, ItemName_RunawayPay] +- [0x26, 0x009D, ItemName_Refund] +- [0x26, 0x009E, ItemName_ISpy] +- [0x26, 0x009F, ItemName_Peekaboo] +- [0x26, 0x00A0, ItemName_Jump] +- [0x26, 0x00A1, ItemName_SpinJump] +- [0x26, 0x00A2, ItemName_TornadoJump] +- [0x26, 0x00A3, ItemName_Hammer] +- [0x26, 0x00A4, ItemName_SuperHammer] +- [0x26, 0x00A5, ItemName_UltraHammer] +- [0x26, 0x00A6, ItemName_LuckyStar] +- [0x26, 0x00A7, ItemName_KoopaFortressKey] +- [0x26, 0x00A8, ItemName_RuinsKey] +- [0x26, 0x00A9, ItemName_TubbaCastleKey] +- [0x26, 0x00AA, ItemName_CrystalPalaceKey] +- [0x26, 0x00AB, ItemName_BowserCastleKey] +- [0x26, 0x00AC, ItemName_PeachKey] +- [0x26, 0x00AD, ItemName_OddKey] +- [0x26, 0x00AE, ItemName_Dolly] +- [0x26, 0x00AF, ItemName_KooperShell] +- [0x26, 0x00B0, ItemName_PulseStone] +- [0x26, 0x00B1, ItemName_Artifact] +- [0x26, 0x00B2, ItemName_GoldenJar] +- [0x26, 0x00B3, ItemName_LunarStone] +- [0x26, 0x00B4, ItemName_PyramidStone] +- [0x26, 0x00B5, ItemName_DiamondStone] +- [0x26, 0x00B6, ItemName_BooRecord] +- [0x26, 0x00B7, ItemName_BooWeight] +- [0x26, 0x00B8, ItemName_BooPortrait] +- [0x26, 0x00B9, ItemName_MysticalKey] +- [0x26, 0x00BA, ItemName_StoreroomKey] +- [0x26, 0x00BB, ItemName_ToyTrain] +- [0x26, 0x00BC, ItemName_FryingPan] +- [0x26, 0x00BD, ItemName_Dictionary] +- [0x26, 0x00BE, ItemName_MysteryNote] +- [0x26, 0x00BF, ItemName_Mailbag] +- [0x26, 0x00C0, ItemName_MagicalSeed1] +- [0x26, 0x00C1, ItemName_MagicalSeed2] +- [0x26, 0x00C2, ItemName_MagicalSeed3] +- [0x26, 0x00C3, ItemName_MagicalSeed4] +- [0x26, 0x00C4, ItemName_CrystalBerry] +- [0x26, 0x00C5, ItemName_WaterStone] +- [0x26, 0x00C6, ItemName_MagicalBean] +- [0x26, 0x00C7, ItemName_FertileSoil] +- [0x26, 0x00C8, ItemName_MiracleWater] +- [0x26, 0x00C9, ItemName_CrystalBall] +- [0x26, 0x00CA, ItemName_Calculator] +- [0x26, 0x00CB, ItemName_Cookbook] +- [0x26, 0x00CC, ItemName_JadeRaven] +- [0x26, 0x00CD, ItemName_VolcanoVase] +- [0x26, 0x00CE, ItemName_WarehouseKey] +- [0x26, 0x00CF, ItemName_SnowmanBucket] +- [0x26, 0x00D0, ItemName_SnowmanScarf] +- [0x26, 0x00D1, ItemName_StarStone] +- [0x26, 0x00D2, ItemName_RedKey] +- [0x26, 0x00D3, ItemName_BlueKey] +- [0x26, 0x00D4, ItemName_SneakyParasol] +- [0x26, 0x00D5, ItemName_PrisonKey] +- [0x26, 0x00D6, ItemName_Lyrics] +- [0x26, 0x00D7, ItemName_Melody] +- [0x26, 0x00D8, ItemName_BakingSugar] +- [0x26, 0x00D9, ItemName_BakingSalt] +- [0x26, 0x00DA, ItemName_BakingEgg] +- [0x26, 0x00DB, ItemName_BakingCream] +- [0x26, 0x00DC, ItemName_BakingStrawberry] +- [0x26, 0x00DD, ItemName_BakingButter] +- [0x26, 0x00DE, ItemName_BakingCleanser] +- [0x26, 0x00DF, ItemName_BakingWater] +- [0x26, 0x00E0, ItemName_BakingFlour] +- [0x26, 0x00E1, ItemName_BakingMilk] +- [0x26, 0x00E2, ItemName_FirstDegreeCard] +- [0x26, 0x00E3, ItemName_SecondDegreeCard] +- [0x26, 0x00E4, ItemName_ThirdDegreeCard] +- [0x26, 0x00E5, ItemName_FourthDegreeCard] +- [0x26, 0x00E6, ItemName_Diploma] +- [0x26, 0x00E7, ItemName_UltraStone] +- [0x26, 0x00E8, ItemName_SilverCredit] +- [0x26, 0x00E9, ItemName_GoldCredit] +- [0x26, 0x00EA, ItemName_Letter25] +- [0x26, 0x00EB, ItemName_Letter01] +- [0x26, 0x00EC, ItemName_Letter02] +- [0x26, 0x00ED, ItemName_Letter03] +- [0x26, 0x00EE, ItemName_Letter04] +- [0x26, 0x00EF, ItemName_Letter05] +- [0x26, 0x00F0, ItemName_Letter06] +- [0x26, 0x00F1, ItemName_Letter07] +- [0x26, 0x00F2, ItemName_Letter08] +- [0x26, 0x00F3, ItemName_Letter09] +- [0x26, 0x00F4, ItemName_Letter10] +- [0x26, 0x00F5, ItemName_Letter11] +- [0x26, 0x00F6, ItemName_Letter12] +- [0x26, 0x00F7, ItemName_Letter13] +- [0x26, 0x00F8, ItemName_Letter14] +- [0x26, 0x00F9, ItemName_Letter15] +- [0x26, 0x00FA, ItemName_Letter16] +- [0x26, 0x00FB, ItemName_Letter17] +- [0x26, 0x00FC, ItemName_Letter18] +- [0x26, 0x00FD, ItemName_Letter19] +- [0x26, 0x00FE, ItemName_Letter20] +- [0x26, 0x00FF, ItemName_Letter21] +- [0x26, 0x0100, ItemName_Letter22] +- [0x26, 0x0101, ItemName_Letter23] +- [0x26, 0x0102, ItemName_Letter24] +- [0x26, 0x0103, ItemName_KootKoopaLegends] +- [0x26, 0x0104, ItemName_KootTheTape] +- [0x26, 0x0105, ItemName_KootLuigiAutograph] +- [0x26, 0x0106, ItemName_KootEmptyWallet] +- [0x26, 0x0107, ItemName_KootMerluvleeAutograph] +- [0x26, 0x0108, ItemName_KootOldPhoto] +- [0x26, 0x0109, ItemName_KootGlasses] +- [0x26, 0x010A, ItemName_KootPackage] +- [0x26, 0x010B, ItemName_KootRedJar] +- [0x26, 0x010C, ItemName_StarPiece] +- [0x27, 0x0000, Shop_00_MAC00] +- [0x27, 0x0001, Shop_01_MAC00] +- [0x27, 0x0002, Shop_02_MAC00] +- [0x27, 0x0003, Shop_03_MAC00] +- [0x27, 0x0004, Shop_04_MAC00] +- [0x27, 0x0005, Shop_05_MAC00] +- [0x27, 0x0006, Shop_06_MAC00] +- [0x27, 0x0007, Shop_07_MAC00] +- [0x27, 0x0008, Shop_08_MAC00] +- [0x27, 0x0009, Shop_09_MAC00] +- [0x27, 0x000A, Shop_0A_MAC00] +- [0x27, 0x000B, Shop_0B_MAC00] +- [0x27, 0x000C, Shop_0C_MAC00] +- [0x27, 0x000D, Shop_0D_MAC00] +- [0x27, 0x000E, Shop_0E_MAC00] +- [0x27, 0x000F, Shop_0F_MAC00] +- [0x27, 0x0010, Shop_10_MAC00] +- [0x27, 0x0011, Shop_11_MAC00] +- [0x27, 0x0012, Shop_12_MAC00] +- [0x27, 0x0013, Shop_13_MAC00] +- [0x27, 0x0014, Shop_14_MAC00] +- [0x27, 0x0015, Shop_15_MAC00] +- [0x27, 0x0016, Shop_16_MAC00] +- [0x27, 0x0017, Shop_00_MAC01] +- [0x27, 0x0018, Shop_01_MAC01] +- [0x27, 0x0019, Shop_03_MAC01] +- [0x27, 0x001A, Shop_16_MAC01] +- [0x27, 0x001B, Shop_00_MAC04] +- [0x27, 0x001C, Shop_01_MAC04] +- [0x27, 0x001D, Shop_02_MAC04] +- [0x27, 0x001E, Shop_03_MAC04] +- [0x27, 0x001F, Shop_04_MAC04] +- [0x27, 0x0020, Shop_05_MAC04] +- [0x27, 0x0021, Shop_06_MAC04] +- [0x27, 0x0022, Shop_07_MAC04] +- [0x27, 0x0023, Shop_08_MAC04] +- [0x27, 0x0024, Shop_09_MAC04] +- [0x27, 0x0025, Shop_0A_MAC04] +- [0x27, 0x0026, Shop_0B_MAC04] +- [0x27, 0x0027, Shop_0C_MAC04] +- [0x27, 0x0028, Shop_0D_MAC04] +- [0x27, 0x0029, Shop_0E_MAC04] +- [0x27, 0x002A, Shop_0F_MAC04] +- [0x27, 0x002B, Shop_10_MAC04] +- [0x27, 0x002C, Shop_11_MAC04] +- [0x27, 0x002D, Shop_12_MAC04] +- [0x27, 0x002E, Shop_13_MAC04] +- [0x27, 0x002F, Shop_14_MAC04] +- [0x27, 0x0030, Shop_15_MAC04] +- [0x27, 0x0031, Shop_16_MAC04] +- [0x27, 0x0032, Shop_00_NOK01] +- [0x27, 0x0033, Shop_01_NOK01] +- [0x27, 0x0034, Shop_02_NOK01] +- [0x27, 0x0035, Shop_03_NOK01] +- [0x27, 0x0036, Shop_04_NOK01] +- [0x27, 0x0037, Shop_05_NOK01] +- [0x27, 0x0038, Shop_06_NOK01] +- [0x27, 0x0039, Shop_07_NOK01] +- [0x27, 0x003A, Shop_08_NOK01] +- [0x27, 0x003B, Shop_09_NOK01] +- [0x27, 0x003C, Shop_0A_NOK01] +- [0x27, 0x003D, Shop_0B_NOK01] +- [0x27, 0x003E, Shop_0C_NOK01] +- [0x27, 0x003F, Shop_0D_NOK01] +- [0x27, 0x0040, Shop_0E_NOK01] +- [0x27, 0x0041, Shop_0F_NOK01] +- [0x27, 0x0042, Shop_10_NOK01] +- [0x27, 0x0043, Shop_11_NOK01] +- [0x27, 0x0044, Shop_12_NOK01] +- [0x27, 0x0045, Shop_13_NOK01] +- [0x27, 0x0046, Shop_14_NOK01] +- [0x27, 0x0047, Shop_15_NOK01] +- [0x27, 0x0048, Shop_16_NOK01] +- [0x27, 0x0049, Shop_00_DR001] +- [0x27, 0x004A, Shop_01_DR001] +- [0x27, 0x004B, Shop_02_DR001] +- [0x27, 0x004C, Shop_03_DR001] +- [0x27, 0x004D, Shop_04_DR001] +- [0x27, 0x004E, Shop_05_DR001] +- [0x27, 0x004F, Shop_06_DR001] +- [0x27, 0x0050, Shop_07_DR001] +- [0x27, 0x0051, Shop_08_DR001] +- [0x27, 0x0052, Shop_09_DR001] +- [0x27, 0x0053, Shop_0A_DR001] +- [0x27, 0x0054, Shop_0B_DR001] +- [0x27, 0x0055, Shop_0C_DR001] +- [0x27, 0x0056, Shop_0D_DR001] +- [0x27, 0x0057, Shop_0E_DR001] +- [0x27, 0x0058, Shop_0F_DR001] +- [0x27, 0x0059, Shop_10_DR001] +- [0x27, 0x005A, Shop_11_DR001] +- [0x27, 0x005B, Shop_12_DR001] +- [0x27, 0x005C, Shop_13_DR001] +- [0x27, 0x005D, Shop_14_DR001] +- [0x27, 0x005E, Shop_15_DR001] +- [0x27, 0x005F, Shop_16_DR001] +- [0x27, 0x0060, Shop_00_OBK03] +- [0x27, 0x0061, Shop_01_OBK03] +- [0x27, 0x0062, Shop_02_OBK03] +- [0x27, 0x0063, Shop_03_OBK03] +- [0x27, 0x0064, Shop_04_OBK03] +- [0x27, 0x0065, Shop_05_OBK03] +- [0x27, 0x0066, Shop_06_OBK03] +- [0x27, 0x0067, Shop_07_OBK03] +- [0x27, 0x0068, Shop_08_OBK03] +- [0x27, 0x0069, Shop_09_OBK03] +- [0x27, 0x006A, Shop_0A_OBK03] +- [0x27, 0x006B, Shop_0B_OBK03] +- [0x27, 0x006C, Shop_0C_OBK03] +- [0x27, 0x006D, Shop_0D_OBK03] +- [0x27, 0x006E, Shop_0E_OBK03] +- [0x27, 0x006F, Shop_0F_OBK03] +- [0x27, 0x0070, Shop_10_OBK03] +- [0x27, 0x0071, Shop_11_OBK03] +- [0x27, 0x0072, Shop_12_OBK03] +- [0x27, 0x0073, Shop_13_OBK03] +- [0x27, 0x0074, Shop_14_OBK03] +- [0x27, 0x0075, Shop_15_OBK03] +- [0x27, 0x0076, Shop_16_OBK03] +- [0x27, 0x0077, Shop_00_JAN03] +- [0x27, 0x0078, Shop_01_JAN03] +- [0x27, 0x0079, Shop_02_JAN03] +- [0x27, 0x007A, Shop_03_JAN03] +- [0x27, 0x007B, Shop_04_JAN03] +- [0x27, 0x007C, Shop_05_JAN03] +- [0x27, 0x007D, Shop_06_JAN03] +- [0x27, 0x007E, Shop_07_JAN03] +- [0x27, 0x007F, Shop_08_JAN03] +- [0x27, 0x0080, Shop_09_JAN03] +- [0x27, 0x0081, Shop_0A_JAN03] +- [0x27, 0x0082, Shop_0B_JAN03] +- [0x27, 0x0083, Shop_0C_JAN03] +- [0x27, 0x0084, Shop_0D_JAN03] +- [0x27, 0x0085, Shop_0E_JAN03] +- [0x27, 0x0086, Shop_0F_JAN03] +- [0x27, 0x0087, Shop_10_JAN03] +- [0x27, 0x0088, Shop_11_JAN03] +- [0x27, 0x0089, Shop_12_JAN03] +- [0x27, 0x008A, Shop_13_JAN03] +- [0x27, 0x008B, Shop_14_JAN03] +- [0x27, 0x008C, Shop_15_JAN03] +- [0x27, 0x008D, Shop_16_JAN03] +- [0x27, 0x008E, Shop_00_SAM02] +- [0x27, 0x008F, Shop_01_SAM02] +- [0x27, 0x0090, Shop_02_SAM02] +- [0x27, 0x0091, Shop_03_SAM02] +- [0x27, 0x0092, Shop_04_SAM02] +- [0x27, 0x0093, Shop_05_SAM02] +- [0x27, 0x0094, Shop_06_SAM02] +- [0x27, 0x0095, Shop_07_SAM02] +- [0x27, 0x0096, Shop_08_SAM02] +- [0x27, 0x0097, Shop_09_SAM02] +- [0x27, 0x0098, Shop_0A_SAM02] +- [0x27, 0x0099, Shop_0B_SAM02] +- [0x27, 0x009A, Shop_0C_SAM02] +- [0x27, 0x009B, Shop_0D_SAM02] +- [0x27, 0x009C, Shop_0E_SAM02] +- [0x27, 0x009D, Shop_0F_SAM02] +- [0x27, 0x009E, Shop_10_SAM02] +- [0x27, 0x009F, Shop_11_SAM02] +- [0x27, 0x00A0, Shop_12_SAM02] +- [0x27, 0x00A1, Shop_13_SAM02] +- [0x27, 0x00A2, Shop_14_SAM02] +- [0x27, 0x00A3, Shop_15_SAM02] +- [0x27, 0x00A4, Shop_16_SAM02] +- [0x27, 0x00A5, Shop_00_HOS03] +- [0x27, 0x00A6, Shop_01_HOS03] +- [0x27, 0x00A7, Shop_02_HOS03] +- [0x27, 0x00A8, Shop_03_HOS03] +- [0x27, 0x00A9, Shop_04_HOS03] +- [0x27, 0x00AA, Shop_05_HOS03] +- [0x27, 0x00AB, Shop_06_HOS03] +- [0x27, 0x00AC, Shop_07_HOS03] +- [0x27, 0x00AD, Shop_08_HOS03] +- [0x27, 0x00AE, Shop_09_HOS03] +- [0x27, 0x00AF, Shop_0A_HOS03] +- [0x27, 0x00B0, Shop_0B_HOS03] +- [0x27, 0x00B1, Shop_0C_HOS03] +- [0x27, 0x00B2, Shop_0D_HOS03] +- [0x27, 0x00B3, Shop_0E_HOS03] +- [0x27, 0x00B4, Shop_0F_HOS03] +- [0x27, 0x00B5, Shop_10_HOS03] +- [0x27, 0x00B6, Shop_11_HOS03] +- [0x27, 0x00B7, Shop_12_HOS03] +- [0x27, 0x00B8, Shop_13_HOS03] +- [0x27, 0x00B9, Shop_14_HOS03] +- [0x27, 0x00BA, Shop_15_HOS03] +- [0x27, 0x00BB, Shop_16_HOS03] +- [0x27, 0x00BC, Shop_00_KPA96] +- [0x27, 0x00BD, Shop_01_KPA96] +- [0x27, 0x00BE, Shop_02_KPA96] +- [0x27, 0x00BF, Shop_03_KPA96] +- [0x27, 0x00C0, Shop_04_KPA96] +- [0x27, 0x00C1, Shop_05_KPA96] +- [0x27, 0x00C2, Shop_06_KPA96] +- [0x27, 0x00C3, Shop_07_KPA96] +- [0x27, 0x00C4, Shop_08_KPA96] +- [0x27, 0x00C5, Shop_09_KPA96] +- [0x27, 0x00C6, Shop_0A_KPA96] +- [0x27, 0x00C7, Shop_0B_KPA96] +- [0x27, 0x00C8, Shop_0C_KPA96] +- [0x27, 0x00C9, Shop_0D_KPA96] +- [0x27, 0x00CA, Shop_0E_KPA96] +- [0x27, 0x00CB, Shop_0F_KPA96] +- [0x27, 0x00CC, Shop_10_KPA96] +- [0x27, 0x00CD, Shop_11_KPA96] +- [0x27, 0x00CE, Shop_12_KPA96] +- [0x27, 0x00CF, Shop_13_KPA96] +- [0x27, 0x00D0, Shop_14_KPA96] +- [0x27, 0x00D1, Shop_15_KPA96] +- [0x27, 0x00D2, Shop_16_KPA96] +- [0x28, 0x0000, PartnerDesc_Goombario_World] +- [0x28, 0x0001, PartnerDesc_Goombario_Battle] +- [0x28, 0x0002, PartnerDesc_Goombario_Battle_Headbonk] +- [0x28, 0x0003, PartnerDesc_Goombario_Battle_Tattle] +- [0x28, 0x0004, PartnerDesc_Goombario_Battle_Charge] +- [0x28, 0x0005, PartnerDesc_Goombario_Battle_Multibonk] +- [0x28, 0x0006, PartnerDesc_Goombario_Pause] +- [0x28, 0x0007, PartnerDesc_Goombario_Pause_Headbonk1] +- [0x28, 0x0008, PartnerDesc_Goombario_Pause_Headbonk2] +- [0x28, 0x0009, PartnerDesc_Goombario_Pause_Headbonk3] +- [0x28, 0x000A, PartnerDesc_Goombario_Pause_Tattle] +- [0x28, 0x000B, PartnerDesc_Goombario_Pause_Charge] +- [0x28, 0x000C, PartnerDesc_Goombario_Pause_Multibonk] +- [0x28, 0x000D, PartnerDesc_Kooper_World] +- [0x28, 0x000E, PartnerDesc_Kooper_Battle] +- [0x28, 0x000F, PartnerDesc_Kooper_Battle_ShellToss] +- [0x28, 0x0010, PartnerDesc_Kooper_Battle_PowerShell] +- [0x28, 0x0011, PartnerDesc_Kooper_Battle_DizzyShell] +- [0x28, 0x0012, PartnerDesc_Kooper_Battle_FireShell] +- [0x28, 0x0013, PartnerDesc_Kooper_Pause] +- [0x28, 0x0014, PartnerDesc_Kooper_Pause_ShellToss1] +- [0x28, 0x0015, PartnerDesc_Kooper_Pause_ShellToss2] +- [0x28, 0x0016, PartnerDesc_Kooper_Pause_ShellToss3] +- [0x28, 0x0017, PartnerDesc_Kooper_Pause_PowerShell] +- [0x28, 0x0018, PartnerDesc_Kooper_Pause_DizzyShell] +- [0x28, 0x0019, PartnerDesc_Kooper_Pause_FireShell] +- [0x28, 0x001A, PartnerDesc_Bombette_World] +- [0x28, 0x001B, PartnerDesc_Bombette_Battle] +- [0x28, 0x001C, PartnerDesc_Bombette_Battle_BodySlam] +- [0x28, 0x001D, PartnerDesc_Bombette_Battle_Bomb] +- [0x28, 0x001E, PartnerDesc_Bombette_Battle_PowerBomb] +- [0x28, 0x001F, PartnerDesc_Bombette_Battle_MegaBomb] +- [0x28, 0x0020, PartnerDesc_Bombette_Pause] +- [0x28, 0x0021, PartnerDesc_Bombette_Pause_BodySlam1] +- [0x28, 0x0022, PartnerDesc_Bombette_Pause_BodySlam2] +- [0x28, 0x0023, PartnerDesc_Bombette_Pause_BodySlam3] +- [0x28, 0x0024, PartnerDesc_Bombette_Pause_Bomb] +- [0x28, 0x0025, PartnerDesc_Bombette_Pause_PowerBomb] +- [0x28, 0x0026, PartnerDesc_Bombette_Pause_MegaBomb] +- [0x28, 0x0027, PartnerDesc_Parakarry_World] +- [0x28, 0x0028, PartnerDesc_Parakarry_Battle] +- [0x28, 0x0029, PartnerDesc_Parakarry_Battle_SkyDive] +- [0x28, 0x002A, PartnerDesc_Parakarry_Battle_ShellShot] +- [0x28, 0x002B, PartnerDesc_Parakarry_Battle_AirLift] +- [0x28, 0x002C, PartnerDesc_Parakarry_Battle_AirRaid] +- [0x28, 0x002D, PartnerDesc_Parakarry_Pause] +- [0x28, 0x002E, PartnerDesc_Parakarry_Pause_SkyDive1] +- [0x28, 0x002F, PartnerDesc_Parakarry_Pause_SkyDive2] +- [0x28, 0x0030, PartnerDesc_Parakarry_Pause_SkyDive3] +- [0x28, 0x0031, PartnerDesc_Parakarry_Pause_ShellShot] +- [0x28, 0x0032, PartnerDesc_Parakarry_Pause_AirLift] +- [0x28, 0x0033, PartnerDesc_Parakarry_Pause_AirRaid] +- [0x28, 0x0034, PartnerDesc_Bow_World] +- [0x28, 0x0035, PartnerDesc_Bow_Battle] +- [0x28, 0x0036, PartnerDesc_Bow_Battle_Smack] +- [0x28, 0x0037, PartnerDesc_Bow_Battle_OuttaSight] +- [0x28, 0x0038, PartnerDesc_Bow_Battle_Spook] +- [0x28, 0x0039, PartnerDesc_Bow_Battle_FanSmack] +- [0x28, 0x003A, PartnerDesc_Bow_Pause] +- [0x28, 0x003B, PartnerDesc_Bow_Pause_Smack1] +- [0x28, 0x003C, PartnerDesc_Bow_Pause_Smack2] +- [0x28, 0x003D, PartnerDesc_Bow_Pause_Smack3] +- [0x28, 0x003E, PartnerDesc_Bow_Pause_OuttaSight] +- [0x28, 0x003F, PartnerDesc_Bow_Pause_Spook] +- [0x28, 0x0040, PartnerDesc_Bow_Pause_FanSmack] +- [0x28, 0x0041, PartnerDesc_Watt_World] +- [0x28, 0x0042, PartnerDesc_Watt_Battle] +- [0x28, 0x0043, PartnerDesc_Watt_Battle_ElectroDash] +- [0x28, 0x0044, PartnerDesc_Watt_Battle_PowerShock] +- [0x28, 0x0045, PartnerDesc_Watt_Battle_TurboCharge] +- [0x28, 0x0046, PartnerDesc_Watt_Battle_MegaShock] +- [0x28, 0x0047, PartnerDesc_Watt_Pause] +- [0x28, 0x0048, PartnerDesc_Watt_Pause_ElectroDash1] +- [0x28, 0x0049, PartnerDesc_Watt_Pause_ElectroDash2] +- [0x28, 0x004A, PartnerDesc_Watt_Pause_ElectroDash3] +- [0x28, 0x004B, PartnerDesc_Watt_Pause_PowerShock] +- [0x28, 0x004C, PartnerDesc_Watt_Pause_TurboCharge] +- [0x28, 0x004D, PartnerDesc_Watt_Pause_MegaShock] +- [0x28, 0x004E, PartnerDesc_Sushie_World] +- [0x28, 0x004F, PartnerDesc_Sushie_Battle] +- [0x28, 0x0050, PartnerDesc_Sushie_Battle_BellyFlop] +- [0x28, 0x0051, PartnerDesc_Sushie_Battle_Squirt] +- [0x28, 0x0052, PartnerDesc_Sushie_Battle_WaterBlock] +- [0x28, 0x0053, PartnerDesc_Sushie_Battle_TidalWave] +- [0x28, 0x0054, PartnerDesc_Sushie_Pause] +- [0x28, 0x0055, PartnerDesc_Sushie_Pause_BellyFlop1] +- [0x28, 0x0056, PartnerDesc_Sushie_Pause_BellyFlop2] +- [0x28, 0x0057, PartnerDesc_Sushie_Pause_BellyFlop3] +- [0x28, 0x0058, PartnerDesc_Sushie_Pause_Squirt] +- [0x28, 0x0059, PartnerDesc_Sushie_Pause_WaterBlock] +- [0x28, 0x005A, PartnerDesc_Sushie_Pause_TidalWave] +- [0x28, 0x005B, PartnerDesc_Lakilester_World] +- [0x28, 0x005C, PartnerDesc_Lakilester_Battle] +- [0x28, 0x005D, PartnerDesc_Lakilester_Battle_SpinyFlip] +- [0x28, 0x005E, PartnerDesc_Lakilester_Battle_SpinySurge] +- [0x28, 0x005F, PartnerDesc_Lakilester_Battle_CloudNine] +- [0x28, 0x0060, PartnerDesc_Lakilester_Battle_Hurricane] +- [0x28, 0x0061, PartnerDesc_Lakilester_Pause] +- [0x28, 0x0062, PartnerDesc_Lakilester_Pause_SpinyFlip1] +- [0x28, 0x0063, PartnerDesc_Lakilester_Pause_SpinyFlip2] +- [0x28, 0x0064, PartnerDesc_Lakilester_Pause_SpinyFlip3] +- [0x28, 0x0065, PartnerDesc_Lakilester_Pause_SpinySurge] +- [0x28, 0x0066, PartnerDesc_Lakilester_Pause_CloudNine] +- [0x28, 0x0067, PartnerDesc_Lakilester_Pause_Hurricane] +- [0x29, 0x0000, EnemyName_Goomba] +- [0x29, 0x0001, EnemyName_SpikedGoomba] +- [0x29, 0x0002, EnemyName_Paragoomba] +- [0x29, 0x0003, EnemyName_RedGoombaBoss] +- [0x29, 0x0004, EnemyName_BlueGoombaBoss] +- [0x29, 0x0005, EnemyName_GoombaKing] +- [0x29, 0x0006, EnemyName_GoomnutTree] +- [0x29, 0x0007, EnemyName_KoopaTroopa] +- [0x29, 0x0008, EnemyName_Paratroopa] +- [0x29, 0x0009, EnemyName_Fuzzy] +- [0x29, 0x000A, EnemyName_BobOmb] +- [0x29, 0x000B, EnemyName_BulletBill] +- [0x29, 0x000C, EnemyName_BillBlaster] +- [0x29, 0x000D, EnemyName_FakeBowser] +- [0x29, 0x000E, EnemyName_RedNinjakoopa] +- [0x29, 0x000F, EnemyName_BlueNinjakoopa] +- [0x29, 0x0010, EnemyName_YellowNinjakoopa] +- [0x29, 0x0011, EnemyName_GreenNinjakoopa] +- [0x29, 0x0012, EnemyName_KoopaBros] +- [0x29, 0x0013, EnemyName_JrTroopa] +- [0x29, 0x0014, EnemyName_MontyMole] +- [0x29, 0x0015, EnemyName_Cleft] +- [0x29, 0x0016, EnemyName_Pokey] +- [0x29, 0x0017, EnemyName_Bandit] +- [0x29, 0x0018, EnemyName_PokeyMummy] +- [0x29, 0x0019, EnemyName_BuzzyBeetle] +- [0x29, 0x001A, EnemyName_Swooper] +- [0x29, 0x001B, EnemyName_Buzzar] +- [0x29, 0x001C, EnemyName_Tutankoopa] +- [0x29, 0x001D, EnemyName_Chomp] +- [0x29, 0x001E, EnemyName_StoneChomp] +- [0x29, 0x001F, EnemyName_PiranhaPlant] +- [0x29, 0x0020, EnemyName_ForestFuzzy] +- [0x29, 0x0021, EnemyName_HyperGoomba] +- [0x29, 0x0022, EnemyName_HyperParagoomba] +- [0x29, 0x0023, EnemyName_HyperCleft] +- [0x29, 0x0024, EnemyName_Clubba] +- [0x29, 0x0025, EnemyName_TubbaBlubba] +- [0x29, 0x0026, EnemyName_TubbaHeart] +- [0x29, 0x0027, EnemyName_ShyGuy] +- [0x29, 0x0028, EnemyName_GrooveGuy] +- [0x29, 0x0029, EnemyName_SpyGuy] +- [0x29, 0x002A, EnemyName_PyroGuy] +- [0x29, 0x002B, EnemyName_SkyGuy] +- [0x29, 0x002C, EnemyName_MediGuy] +- [0x29, 0x002D, EnemyName_AntiGuy] +- [0x29, 0x002E, EnemyName_BigLanternGhost] +- [0x29, 0x002F, EnemyName_GeneralGuy] +- [0x29, 0x0030, EnemyName_ShySquad] +- [0x29, 0x0031, EnemyName_ShyStack] +- [0x29, 0x0032, EnemyName_StiltGuy] +- [0x29, 0x0033, EnemyName_HurtPlant] +- [0x29, 0x0034, EnemyName_MBush] +- [0x29, 0x0035, EnemyName_JungleFuzzy] +- [0x29, 0x0036, EnemyName_SpearGuy] +- [0x29, 0x0037, EnemyName_PutridPiranha] +- [0x29, 0x0038, EnemyName_LavaBubble] +- [0x29, 0x0039, EnemyName_SpikeTop] +- [0x29, 0x003A, EnemyName_LavaPiranha] +- [0x29, 0x003B, EnemyName_LavaBud] +- [0x29, 0x003C, EnemyName_PetitPiranha] +- [0x29, 0x003D, EnemyName_Lakitu] +- [0x29, 0x003E, EnemyName_Spiny] +- [0x29, 0x003F, EnemyName_Bzzap] +- [0x29, 0x0040, EnemyName_CrazeeDayzee] +- [0x29, 0x0041, EnemyName_AmazyDayzee] +- [0x29, 0x0042, EnemyName_MontyMoleBoss] +- [0x29, 0x0043, EnemyName_Spike] +- [0x29, 0x0044, EnemyName_RuffPuff] +- [0x29, 0x0045, EnemyName_HuffNPuff] +- [0x29, 0x0046, EnemyName_TuffPuff] +- [0x29, 0x0047, EnemyName_Gulpit] +- [0x29, 0x0048, EnemyName_GulpitRocks] +- [0x29, 0x0049, EnemyName_Monstar] +- [0x29, 0x004A, EnemyName_FrostPiranha] +- [0x29, 0x004B, EnemyName_WhiteClubba] +- [0x29, 0x004C, EnemyName_Duplighost] +- [0x29, 0x004D, EnemyName_GhostWatt] +- [0x29, 0x004E, EnemyName_GhostKooper] +- [0x29, 0x004F, EnemyName_GhostGoombario] +- [0x29, 0x0050, EnemyName_GhostSushie] +- [0x29, 0x0051, EnemyName_GhostLakilester] +- [0x29, 0x0052, EnemyName_GhostParakarry] +- [0x29, 0x0053, EnemyName_GhostBombette] +- [0x29, 0x0054, EnemyName_GhostBow] +- [0x29, 0x0055, EnemyName_AlbinoDino] +- [0x29, 0x0056, EnemyName_Swoopula] +- [0x29, 0x0057, EnemyName_CrystalKing] +- [0x29, 0x0058, EnemyName_CrystalBit] +- [0x29, 0x0059, EnemyName_Ember] +- [0x29, 0x005A, EnemyName_DryBones] +- [0x29, 0x005B, EnemyName_BonyBeetle] +- [0x29, 0x005C, EnemyName_Magikoopa] +- [0x29, 0x005D, EnemyName_Koopatrol] +- [0x29, 0x005E, EnemyName_HammerBros] +- [0x29, 0x005F, EnemyName_BombshellBill] +- [0x29, 0x0060, EnemyName_BombshellBlaster] +- [0x29, 0x0061, EnemyName_Bowser] +- [0x29, 0x0062, EnemyName_KammyKoopa] +- [0x29, 0x0063, EnemyName_KentCKoopa] +- [0x29, 0x0064, EnemyName_Blooper] +- [0x29, 0x0065, EnemyName_ElectroBlooper] +- [0x29, 0x0066, EnemyName_SuperBlooper] +- [0x29, 0x0067, EnemyName_BlooperBaby] +- [0x29, 0x0068, EnemyName_TheMaster] +- [0x29, 0x0069, EnemyName_Chan] +- [0x29, 0x006A, EnemyName_Lee] +- [0x29, 0x006B, EnemyName_Gloomba] +- [0x29, 0x006C, EnemyName_Paragloomba] +- [0x29, 0x006D, EnemyName_SpikedGloomba] +- [0x29, 0x006E, EnemyName_DarkKoopa] +- [0x29, 0x006F, EnemyName_DarkParatroopa] +- [0x29, 0x0070, EnemyName_RedMagikoopa] +- [0x29, 0x0071, EnemyName_GreenMagikoopa] +- [0x29, 0x0072, EnemyName_YellowMagikoopa] +- [0x29, 0x0073, EnemyName_GrayMagikoopa] +- [0x29, 0x0074, EnemyName_WhiteMagikoopa] +- [0x29, 0x0075, EnemyName_Mario] +- [0x29, 0x0076, EnemyName_SlotMachineStart] +- [0x29, 0x0077, EnemyName_SlotMachineStop] +- [0x29, 0x0078, EnemyName_Whacka] +- [0x29, 0x0079, EnemyName_GeneralGuyDup] +- [0x29, 0x007A, EnemyName_Bulb] +- [0x29, 0x007B, EnemyName_ShySquadDup] +- [0x29, 0x007C, EnemyName_Fuzzipede] +- [0x29, 0x007D, EnemyName_MontyHole] +- [0x29, 0x007E, EnemyName_Balloon] +- [0x29, 0x007F, EnemyName_Lantern] +- [0x29, 0x0080, EnemyName_AquaFuzzy] +- [0x29, 0x0081, EnemyName_RedGoomba] +- [0x29, 0x0082, EnemyName_RedParagoomba] +- [0x2A, 0x0000, PlayerMoveName_PowerJump] +- [0x2A, 0x0001, PlayerMoveName_MegaJump] +- [0x2A, 0x0002, PlayerMoveName_JumpCharge] +- [0x2A, 0x0003, PlayerMoveName_SuperJumpCharge] +- [0x2A, 0x0004, PlayerMoveName_SleepStomp] +- [0x2A, 0x0005, PlayerMoveName_DizzyStomp] +- [0x2A, 0x0006, PlayerMoveName_Multibounce] +- [0x2A, 0x0007, PlayerMoveName_ShrinkStomp] +- [0x2A, 0x0008, PlayerMoveName_DDownJump] +- [0x2A, 0x0009, PlayerMoveName_PowerBounce] +- [0x2A, 0x000A, PlayerMoveName_PowerSmash] +- [0x2A, 0x000B, PlayerMoveName_MegaSmash] +- [0x2A, 0x000C, PlayerMoveName_SmashCharge] +- [0x2A, 0x000D, PlayerMoveName_SuperSmashCharge] +- [0x2A, 0x000E, PlayerMoveName_HammerThrow] +- [0x2A, 0x000F, PlayerMoveName_ShrinkSmash] +- [0x2A, 0x0010, PlayerMoveName_SpinSmash] +- [0x2A, 0x0011, PlayerMoveName_DDownPound] +- [0x2A, 0x0012, PlayerMoveName_QuakeHammer] +- [0x2A, 0x0013, PlayerMoveName_PowerQuake] +- [0x2A, 0x0014, PlayerMoveName_MegaQuake] +- [0x2A, 0x0015, PlayerMoveName_DoubleDip] +- [0x2A, 0x0016, PlayerMoveName_TripleDip] +- [0x2A, 0x0017, PlayerMoveName_GroupFocus] +- [0x2A, 0x0018, PlayerMoveName_QuickChange] +- [0x2A, 0x0019, PlayerMoveName_PUpDDown] +- [0x2A, 0x001A, PlayerMoveName_PDownDUp] +- [0x2B, 0x0000, PartnerMoveName_Headbonk] +- [0x2B, 0x0001, PartnerMoveName_Tattle] +- [0x2B, 0x0002, PartnerMoveName_Charge] +- [0x2B, 0x0003, PartnerMoveName_Multibonk] +- [0x2B, 0x0004, PartnerMoveName_ShellToss] +- [0x2B, 0x0005, PartnerMoveName_PowerShell] +- [0x2B, 0x0006, PartnerMoveName_DizzyShell] +- [0x2B, 0x0007, PartnerMoveName_FireShell] +- [0x2B, 0x0008, PartnerMoveName_BodySlam] +- [0x2B, 0x0009, PartnerMoveName_Bomb] +- [0x2B, 0x000A, PartnerMoveName_PowerBomb] +- [0x2B, 0x000B, PartnerMoveName_MegaBomb] +- [0x2B, 0x000C, PartnerMoveName_SkyDive] +- [0x2B, 0x000D, PartnerMoveName_ShellShot] +- [0x2B, 0x000E, PartnerMoveName_AirLift] +- [0x2B, 0x000F, PartnerMoveName_AirRaid] +- [0x2B, 0x0010, PartnerMoveName_Smack] +- [0x2B, 0x0011, PartnerMoveName_OuttaSight] +- [0x2B, 0x0012, PartnerMoveName_Spook] +- [0x2B, 0x0013, PartnerMoveName_FanSmack] +- [0x2B, 0x0014, PartnerMoveName_ElectroDash] +- [0x2B, 0x0015, PartnerMoveName_PowerShock] +- [0x2B, 0x0016, PartnerMoveName_TurboCharge] +- [0x2B, 0x0017, PartnerMoveName_MegaShock] +- [0x2B, 0x0018, PartnerMoveName_BellyFlop] +- [0x2B, 0x0019, PartnerMoveName_Squirt] +- [0x2B, 0x001A, PartnerMoveName_WaterBlock] +- [0x2B, 0x001B, PartnerMoveName_TidalWave] +- [0x2B, 0x001C, PartnerMoveName_SpinyFlip] +- [0x2B, 0x001D, PartnerMoveName_SpinySurge] +- [0x2B, 0x001E, PartnerMoveName_CloudNine] +- [0x2B, 0x001F, PartnerMoveName_Hurricane] +- [0x2C, 0x0000, QuizQuestion_01] +- [0x2C, 0x0001, QuizQuestion_02] +- [0x2C, 0x0002, QuizQuestion_03] +- [0x2C, 0x0003, QuizQuestion_04] +- [0x2C, 0x0004, QuizQuestion_05] +- [0x2C, 0x0005, QuizQuestion_06] +- [0x2C, 0x0006, QuizQuestion_07] +- [0x2C, 0x0007, QuizQuestion_08] +- [0x2C, 0x0008, QuizQuestion_09] +- [0x2C, 0x0009, QuizQuestion_10] +- [0x2C, 0x000A, QuizQuestion_11] +- [0x2C, 0x000B, QuizQuestion_12] +- [0x2C, 0x000C, QuizQuestion_13] +- [0x2C, 0x000D, QuizQuestion_14] +- [0x2C, 0x000E, QuizQuestion_15] +- [0x2C, 0x000F, QuizQuestion_16] +- [0x2C, 0x0010, QuizQuestion_17] +- [0x2C, 0x0011, QuizQuestion_18] +- [0x2C, 0x0012, QuizQuestion_19] +- [0x2C, 0x0013, QuizQuestion_20] +- [0x2C, 0x0014, QuizQuestion_21] +- [0x2C, 0x0015, QuizQuestion_22] +- [0x2C, 0x0016, QuizQuestion_23] +- [0x2C, 0x0017, QuizQuestion_24] +- [0x2C, 0x0018, QuizQuestion_25] +- [0x2C, 0x0019, QuizQuestion_26] +- [0x2C, 0x001A, QuizQuestion_27] +- [0x2C, 0x001B, QuizQuestion_28] +- [0x2C, 0x001C, QuizQuestion_29] +- [0x2C, 0x001D, QuizQuestion_30] +- [0x2C, 0x001E, QuizQuestion_31] +- [0x2C, 0x001F, QuizQuestion_32] +- [0x2C, 0x0020, QuizQuestion_33] +- [0x2C, 0x0021, QuizQuestion_34] +- [0x2C, 0x0022, QuizQuestion_35] +- [0x2C, 0x0023, QuizQuestion_36] +- [0x2C, 0x0024, QuizQuestion_37] +- [0x2C, 0x0025, QuizQuestion_38] +- [0x2C, 0x0026, QuizQuestion_39] +- [0x2C, 0x0027, QuizQuestion_40] +- [0x2C, 0x0028, QuizQuestion_41] +- [0x2C, 0x0029, QuizQuestion_42] +- [0x2C, 0x002A, QuizQuestion_43] +- [0x2C, 0x002B, QuizQuestion_44] +- [0x2C, 0x002C, QuizQuestion_45] +- [0x2C, 0x002D, QuizQuestion_46] +- [0x2C, 0x002E, QuizQuestion_47] +- [0x2C, 0x002F, QuizQuestion_48] +- [0x2C, 0x0030, QuizQuestion_49] +- [0x2C, 0x0031, QuizQuestion_50] +- [0x2C, 0x0032, QuizQuestion_51] +- [0x2C, 0x0033, QuizQuestion_52] +- [0x2C, 0x0034, QuizQuestion_53] +- [0x2C, 0x0035, QuizQuestion_54] +- [0x2C, 0x0036, QuizQuestion_55] +- [0x2C, 0x0037, QuizQuestion_56] +- [0x2C, 0x0038, QuizQuestion_57] +- [0x2C, 0x0039, QuizQuestion_58] +- [0x2C, 0x003A, QuizQuestion_59] +- [0x2C, 0x003B, QuizQuestion_60] +- [0x2C, 0x003C, QuizQuestion_61] +- [0x2C, 0x003D, QuizQuestion_62] +- [0x2C, 0x003E, QuizQuestion_63] +- [0x2C, 0x003F, QuizQuestion_64] +- [0x2D, 0x0000, QuizChoice_01] +- [0x2D, 0x0001, QuizChoice_02] +- [0x2D, 0x0002, QuizChoice_03] +- [0x2D, 0x0003, QuizChoice_04] +- [0x2D, 0x0004, QuizChoice_05] +- [0x2D, 0x0005, QuizChoice_06] +- [0x2D, 0x0006, QuizChoice_07] +- [0x2D, 0x0007, QuizChoice_08] +- [0x2D, 0x0008, QuizChoice_09] +- [0x2D, 0x0009, QuizChoice_10] +- [0x2D, 0x000A, QuizChoice_11] +- [0x2D, 0x000B, QuizChoice_12] +- [0x2D, 0x000C, QuizChoice_13] +- [0x2D, 0x000D, QuizChoice_14] +- [0x2D, 0x000E, QuizChoice_15] +- [0x2D, 0x000F, QuizChoice_16] +- [0x2D, 0x0010, QuizChoice_17] +- [0x2D, 0x0011, QuizChoice_18] +- [0x2D, 0x0012, QuizChoice_19] +- [0x2D, 0x0013, QuizChoice_20] +- [0x2D, 0x0014, QuizChoice_21] +- [0x2D, 0x0015, QuizChoice_22] +- [0x2D, 0x0016, QuizChoice_23] +- [0x2D, 0x0017, QuizChoice_24] +- [0x2D, 0x0018, QuizChoice_25] +- [0x2D, 0x0019, QuizChoice_26] +- [0x2D, 0x001A, QuizChoice_27] +- [0x2D, 0x001B, QuizChoice_28] +- [0x2D, 0x001C, QuizChoice_29] +- [0x2D, 0x001D, QuizChoice_30] +- [0x2D, 0x001E, QuizChoice_31] +- [0x2D, 0x001F, QuizChoice_32] +- [0x2D, 0x0020, QuizChoice_33] +- [0x2D, 0x0021, QuizChoice_34] +- [0x2D, 0x0022, QuizChoice_35] +- [0x2D, 0x0023, QuizChoice_36] +- [0x2D, 0x0024, QuizChoice_37] +- [0x2D, 0x0025, QuizChoice_38] +- [0x2D, 0x0026, QuizChoice_39] +- [0x2D, 0x0027, QuizChoice_40] +- [0x2D, 0x0028, QuizChoice_41] +- [0x2D, 0x0029, QuizChoice_42] +- [0x2D, 0x002A, QuizChoice_43] +- [0x2D, 0x002B, QuizChoice_44] +- [0x2D, 0x002C, QuizChoice_45] +- [0x2D, 0x002D, QuizChoice_46] +- [0x2D, 0x002E, QuizChoice_47] +- [0x2D, 0x002F, QuizChoice_48] +- [0x2D, 0x0030, QuizChoice_49] +- [0x2D, 0x0031, QuizChoice_50] +- [0x2D, 0x0032, QuizChoice_51] +- [0x2D, 0x0033, QuizChoice_52] +- [0x2D, 0x0034, QuizChoice_53] +- [0x2D, 0x0035, QuizChoice_54] +- [0x2D, 0x0036, QuizChoice_55] +- [0x2D, 0x0037, QuizChoice_56] +- [0x2D, 0x0038, QuizChoice_57] +- [0x2D, 0x0039, QuizChoice_58] +- [0x2D, 0x003A, QuizChoice_59] +- [0x2D, 0x003B, QuizChoice_60] +- [0x2D, 0x003C, QuizChoice_61] +- [0x2D, 0x003D, QuizChoice_62] +- [0x2D, 0x003E, QuizChoice_63] +- [0x2D, 0x003F, QuizChoice_64] +- [0x2E, 0x0000, Credits_0000] +- [0x2E, 0x0001, Credits_0001] +- [0x2E, 0x0002, Credits_0002] +- [0x2E, 0x0003, Credits_0003] +- [0x2E, 0x0004, Credits_0004] +- [0x2E, 0x0005, Credits_0005] +- [0x2E, 0x0006, Credits_0006] +- [0x2E, 0x0007, Credits_0007] +- [0x2E, 0x0008, Credits_0008] +- [0x2E, 0x0009, Credits_0009] +- [0x2E, 0x000A, Credits_000A] +- [0x2E, 0x000B, Credits_000B] +- [0x2E, 0x000C, Credits_000C] +- [0x2E, 0x000D, Credits_000D] +- [0x2E, 0x000E, Credits_000E] +- [0x2E, 0x000F, Credits_000F] +- [0x2E, 0x0010, Credits_0010] +- [0x2E, 0x0011, Credits_0011] +- [0x2E, 0x0012, Credits_0012] +- [0x2E, 0x0013, Credits_0013] +- [0x2E, 0x0014, Credits_0014] +- [0x2E, 0x0015, Credits_0015] +- [0x2E, 0x0016, Credits_0016] +- [0x2E, 0x0017, Credits_0017] +- [0x2E, 0x0018, Credits_0018] +- [0x2E, 0x0019, Credits_0019] +- [0x2E, 0x001A, Credits_001A] +- [0x2E, 0x001B, Credits_001B] +- [0x2E, 0x001C, Credits_001C] +- [0x2E, 0x001D, Credits_001D] +- [0x2E, 0x001E, Credits_001E] +- [0x2E, 0x001F, Credits_001F] +- [0x2E, 0x0020, Credits_0020] +- [0x2E, 0x0021, Credits_0021] +- [0x2E, 0x0022, Credits_0022] +- [0x2E, 0x0023, Credits_0023] +- [0x2E, 0x0024, Credits_0024] +- [0x2E, 0x0025, Credits_0025] +- [0x2E, 0x0026, Credits_0026] +- [0x2E, 0x0027, Credits_0027] +- [0x2E, 0x0028, Credits_0028] +- [0x2E, 0x0029, Credits_0029] +- [0x2E, 0x002A, Credits_002A] +- [0x2E, 0x002B, Credits_002B] +- [0x2E, 0x002C, Credits_002C] +- [0x2E, 0x002D, PAL_Credits_002D] +- [0x2E, 0x002E, PAL_Credits_002E] +- [0x2E, 0x002F, PAL_Credits_002F] +- [0x2E, 0x0030, PAL_Credits_0030] +- [0x2E, 0x0031, PAL_Credits_0031] +- [0x2E, 0x0032, PAL_Credits_0032] +- [0x2E, 0x0033, PAL_Credits_0033] + +- [0x2E, 0x0034, Credits_002D] +- [0x2E, 0x0035, Credits_002E] +- [0x2E, 0x0036, Credits_002F] +- [0x2E, 0x0037, Credits_0030] +- [0x2E, 0x0038, Credits_0031] +- [0x2E, 0x0039, Credits_0032] +- [0x2E, 0x003A, Credits_0033] +- [0x2E, 0x003B, Credits_0034] +- [0x2E, 0x003C, Credits_0035] +- [0x2E, 0x003D, Credits_0036] +- [0x2E, 0x003E, Credits_0037] +- [0x2E, 0x003F, Credits_0038] +- [0x2E, 0x0040, Credits_0039] +- [0x2E, 0x0041, Credits_003A] +- [0x2E, 0x0042, Credits_003B] +- [0x2E, 0x0043, Credits_003C] +- [0x2E, 0x0044, Credits_003D] +- [0x2E, 0x0045, Credits_003E] +- [0x2E, 0x0046, Credits_003F] +- [0x2E, 0x0047, Credits_0040] +- [0x2E, 0x0048, Credits_0041] +- [0x2E, 0x0049, Credits_0042] +- [0x2E, 0x004A, Credits_0043] +- [0x2E, 0x004B, Credits_0044] +- [0x2E, 0x004C, Credits_0045] +- [0x2E, 0x004D, Credits_0046] +- [0x2E, 0x004E, Credits_0047] +- [0x2E, 0x004F, Credits_0048] +- [0x2E, 0x0050, Credits_0049] +- [0x2E, 0x0051, Credits_004A] +- [0x2E, 0x0052, Credits_004B] +- [0x2E, 0x0053, Credits_004C] +- [0x2E, 0x0054, Credits_004D] +- [0x2E, 0x0055, Credits_004E] +- [0x2E, 0x0056, Credits_004F] +- [0x2E, 0x0057, Credits_0050] +- [0x2E, 0x0058, Credits_0051] +- [0x2E, 0x0059, Credits_0052] +- [0x2E, 0x005A, Credits_0053] +- [0x2E, 0x005B, Credits_0054] +- [0x2E, 0x005C, Credits_0055] +- [0x2E, 0x005D, Credits_0056] +- [0x2E, 0x005E, Credits_0057] +- [0x2E, 0x005F, Credits_0058] +- [0x2E, 0x0060, Credits_0059] +- [0x2E, 0x0061, Credits_005A] +- [0x2E, 0x0062, Credits_005B] +- [0x2E, 0x0063, Credits_005C] +- [0x2E, 0x0064, Credits_005D] +- [0x2E, 0x0065, Credits_005E] +- [0x2E, 0x0066, Credits_005F] +- [0x2E, 0x0067, Credits_0060] +- [0x2E, 0x0068, Credits_0061] +- [0x2E, 0x0069, Credits_0062] +- [0x2E, 0x006A, Credits_0063] +- [0x2E, 0x006B, Credits_0064] +- [0x2E, 0x006C, Credits_0065] +- [0x2E, 0x006D, Credits_0066] +- [0x2E, 0x006E, Credits_0067] +- [0x2E, 0x006F, Credits_0068] +- [0x2E, 0x0070, Credits_0069] +- [0x2E, 0x0071, Credits_006A] +- [0x2E, 0x0072, Credits_006B] +- [0x2E, 0x0073, Credits_006C] +- [0x2E, 0x0074, Credits_006D] +- [0x2E, 0x0075, Credits_006E] +- [0x2E, 0x0076, Credits_006F] +- [0x2E, 0x0077, Credits_0070] +- [0x2E, 0x0078, Credits_0071] +- [0x2E, 0x0079, Credits_0072] +- [0x2E, 0x007A, Credits_0073] +- [0x2E, 0x007B, Credits_0074] +- [0x2E, 0x007C, Credits_0075] +- [0x2E, 0x007D, Credits_0076] +- [0x2E, 0x007E, Credits_0077] +- [0x2E, 0x007F, Credits_0078] +- [0x2E, 0x0080, Credits_0079] +- [0x2E, 0x0081, Credits_007A] +- [0x2E, 0x0082, Credits_007B] +- [0x2E, 0x0083, Credits_007C] +- [0x2E, 0x0084, Credits_007D] +- [0x2E, 0x0085, Credits_007E] +- [0x2E, 0x0086, Credits_007F] +- [0x2E, 0x0087, Credits_0080] +- [0x2E, 0x0088, Credits_0081] +- [0x2E, 0x0089, Credits_0082] +- [0x2E, 0x008A, Credits_0083] +- [0x2E, 0x008b, Credits_0084] +- [0x2E, 0x008C, Credits_0085] +- [0x2E, 0x008D, Credits_0086] +- [0x2E, 0x008E, Credits_0087] + +- [0x2E, 0x008F, PAL_Credits_008F] +- [0x2E, 0x0090, PAL_Credits_0090] +- [0x2E, 0x0091, PAL_Credits_0091] +- [0x2E, 0x0092, PAL_Credits_0092] +- [0x2E, 0x0093, PAL_Credits_0093] +- [0x2E, 0x0094, PAL_Credits_0094] +- [0x2E, 0x0095, PAL_Credits_0095] +- [0x2E, 0x0096, PAL_Credits_0096] +- [0x2E, 0x0097, PAL_Credits_0097] +- [0x2E, 0x0098, PAL_Credits_0098] +- [0x2E, 0x0099, PAL_Credits_0099] +- [0x2E, 0x009A, PAL_Credits_009A] +- [0x2E, 0x009B, PAL_Credits_009B] +- [0x2E, 0x009C, PAL_Credits_009C] +- [0x2E, 0x009D, PAL_Credits_009D] +- [0x2E, 0x009E, PAL_Credits_009E] +- [0x2E, 0x009F, PAL_Credits_009F] +- [0x2E, 0x00A0, PAL_Credits_00A0] +- [0x2E, 0x00A1, PAL_Credits_00A1] +- [0x2E, 0x00A2, PAL_Credits_00A2] diff --git a/ver/pal/asm/header.s b/ver/pal/asm/header.s new file mode 100644 index 0000000000..c119a9266b --- /dev/null +++ b/ver/pal/asm/header.s @@ -0,0 +1,16 @@ +.section .data + +.word 0x80371240 /* PI BSB Domain 1 register */ +.word 0x0000000F /* Clockrate setting */ +.word 0x80125C00 /* Entrypoint address */ +.word 0x00000144 /* Revision */ +.word 0x19AB29AF /* Checksum 1 */ +.word 0xC71BCD28 /* Checksum 2 */ +.word 0x00000000 /* Unknown 1 */ +.word 0x00000000 /* Unknown 2 */ +.ascii "PAPER MARIO " /* Internal name */ +.word 0x00000000 /* Unknown 3 */ +.word 0x0000004E /* Cartridge */ +.ascii "MQ" /* Cartridge ID */ +.ascii "P" /* Country code */ +.byte 0x00 /* Version */ diff --git a/ver/pal/checksum.sha1 b/ver/pal/checksum.sha1 new file mode 100644 index 0000000000..b858ca1206 --- /dev/null +++ b/ver/pal/checksum.sha1 @@ -0,0 +1 @@ +2111d39265a317414d359e35a7d971c4dfa5f9e1 ver/pal/build/papermario.z64 diff --git a/ver/pal/splat.yaml b/ver/pal/splat.yaml new file mode 100644 index 0000000000..097da0fff3 --- /dev/null +++ b/ver/pal/splat.yaml @@ -0,0 +1,1368 @@ +name: Paper Mario (PAL) +sha1: 2111d39265a317414d359e35a7d971c4dfa5f9e1 +options: + basename: papermario + find_file_boundaries: True + compiler: GCC + mnemonic_ljust: 10 + platform: n64 + subalign: 8 + asm_data_macro: "dlabel" + + base_path: ../.. + target_path: ver/pal/baserom.z64 + extensions_path: tools/splat_ext + symbol_addrs_path: ver/pal/symbol_addrs.txt + ld_script_path: ver/pal/papermario.ld + ld_symbol_header_path: ver/pal/build/include/ld_addrs.h + src_path: src + asm_path: ver/pal/asm + asset_path: assets/pal + build_path: ver/pal/build + cache_path: ver/pal/.splat_cache + create_undefined_funcs_auto: False + create_undefined_syms_auto: False + undefined_funcs_auto_path: ver/us/undefined_funcs_auto.txt + undefined_syms_auto_path: ver/us/undefined_syms_auto.txt + symbol_name_format: PAL_$VRAM + symbol_name_format_no_rom: PAL_$VRAM_$SEG +asset_stack: + - pal +segments: + - name: header + type: header + start: 0 + - [0x40, bin] + + - type: group + dir: charset + vram: 0 + start: 0x110CB0 + subsegments: + - [0x110CB0, linker_offset, standard] + - [0x110CB0, pm_charset, standard, 16, 16, 0xA6] + - [0x115FB0, linker_offset, standard_pal] + - [0x115FB0, pm_charset_palettes, standard, 0x50] + - [0x1164B0, linker_offset, title] + - [0x1164B0, pm_charset, title, 12, 15, 0x29] + - [0x117410, linker_offset, subtitle] + - [0x117410, pm_charset, subtitle, 12, 12, 0x29] + - [0x117F98, linker_offset, credits_pal] + - [0x117F98, pm_charset_palettes, subtitle, 1] + - [0x117FA8, pm_charset_palettes, title, 1] + - [0x117FB8, ci8, peach_letter, 150, 105] + - [0x11BD40, palette, peach_letter] + - [0x11BF40, linker_offset, postcard] + - [0x11BF40, ci4, postcard, 150, 105] + - [0x11DE08, linker_offset, postcard_pal] + - [0x11DE08, palette, postcard] + - [0x11DE28, linker_offset, letter_content_1] + - [0x11DE28, ci8, letter_content_1, 70, 95] + - [0x11F828, linker_offset, letter_content_1_pal] + - [0x11F828, palette, letter_content_1] + - [0x11FA28, linker_offset, letter_content_2] + - [0x11FA28, ci8, letter_content_2, 70, 95] + - [0x121428, linker_offset, letter_content_2_pal] + - [0x121428, palette, letter_content_2] + - [0x121628, linker_offset, letter_content_3] + - [0x121628, ci8, letter_content_3, 70, 95] + - [0x123028, linker_offset, letter_content_3_pal] + - [0x123028, palette, letter_content_3] + - [0x123228, linker_offset, letter_content_4] + - [0x123228, ci8, letter_content_4, 70, 95] + - [0x124C28, linker_offset, letter_content_4_pal] + - [0x124C28, palette, letter_content_4] + - [0x124E28, linker_offset, letter_content_5] + - [0x124E28, ci8, letter_content_5, 70, 95] + - [0x126828, linker_offset, letter_content_5_pal] + - [0x126828, palette, letter_content_5] + - [0x126A28, linker_offset, letter_content_6] + - [0x126A28, ci8, letter_content_6, 70, 95] + - [0x128428, linker_offset, letter_content_6_pal] + - [0x128428, palette, letter_content_6] + - [0x128628, linker_offset, letter_content_7] + - [0x128628, ci8, letter_content_7, 70, 95] + - [0x12A028, linker_offset, letter_content_7_pal] + - [0x12A028, palette, letter_content_7] + - [0x12A228, linker_offset, letter_content_8] + - [0x12A228, ci8, letter_content_8, 70, 95] + - [0x12BC28, linker_offset, letter_content_8_pal] + - [0x12BC28, palette, letter_content_8] + - [0x12BE28, linker_offset, letter_content_9] + - [0x12BE28, ci8, letter_content_9, 70, 95] + - [0x12D828, linker_offset, letter_content_9_pal] + - [0x12D828, palette, letter_content_9] + - [0x12DA28, linker_offset, letter_content_10] + - [0x12DA28, ci8, letter_content_10, 70, 95] + - [0x12F428, linker_offset, letter_content_10_pal] + - [0x12F428, palette, letter_content_10] + - [0x12F628, linker_offset, letter_content_11] + - [0x12F628, ci8, letter_content_11, 70, 95] + - [0x131028, linker_offset, letter_content_11_pal] + - [0x131028, palette, letter_content_11] + - [0x131228, linker_offset, letter_content_12] + - [0x131228, ci8, letter_content_12, 70, 95] + - [0x132C28, linker_offset, letter_content_12_pal] + - [0x132C28, palette, letter_content_12] + - [0x132E28, bin] # length 0x18, non zero + + - [0x132E40, bin] + + - [0x1DA1E0, ci4, icon/present, 32, 32] + - [0x1DA3E0, palette, icon/present] + + - [0x1DA400, bin] + + - name: world_model_anim_kzn_01 + dir: world/model_anim/kzn + type: code + start: 0x8219F0 + vram: 0x80234000 + subsegments: + - [0x8219F0, c, "01"] + - name: world_model_anim_kzn_00 + dir: world/model_anim/kzn + type: code + start: 0x822720 + vram: 0x80234000 + subsegments: + - [0x822720, c, "00"] + - name: world_model_anim_kzn_04 + dir: world/model_anim/kzn + type: code + start: 0x823170 + vram: 0x80234000 + subsegments: + - [0x823170, c, "04"] + - name: world_model_anim_kzn_05 + dir: world/model_anim/kzn + type: code + start: 0x8240C0 + vram: 0x80234000 + subsegments: + - [0x8240C0, c, "05"] + - name: world_model_anim_kzn_06 + dir: world/model_anim/kzn + type: code + start: 0x824DC0 + vram: 0x80234000 + subsegments: + - [0x824DC0, c, "06"] + - name: world_model_anim_kzn_07 + dir: world/model_anim/kzn + type: code + start: 0x825870 + vram: 0x80234000 + subsegments: + - [0x825870, c, "07"] + - name: world_model_anim_kzn_08 + dir: world/model_anim/kzn + type: code + start: 0x826310 + vram: 0x80234000 + subsegments: + - [0x826310, c, "08"] + - name: world_model_anim_kzn_09 + dir: world/model_anim/kzn + type: code + start: 0x8270E0 + vram: 0x80234000 + subsegments: + - [0x8270E0, c, "09"] + - name: world_model_anim_kzn_0A + dir: world/model_anim/kzn + type: code + start: 0x827E10 + vram: 0x80234000 + subsegments: + - [0x827E10, c, "0A"] + - name: world_model_anim_kzn_0B + dir: world/model_anim/kzn + type: code + start: 0x82AE60 + vram: 0x80234000 + subsegments: + - [0x82AE60, c, "0B"] + - name: world_model_anim_kzn_0C + dir: world/model_anim/kzn + type: code + start: 0x82D750 + vram: 0x80234000 + subsegments: + - [0x82D750, c, "0C"] + - name: world_model_anim_kzn_0D + dir: world/model_anim/kzn + type: code + start: 0x82FA90 + vram: 0x80234000 + subsegments: + - [0x82FA90, c, "0D"] + - name: world_model_anim_kzn_0E + dir: world/model_anim/kzn + type: code + start: 0x830560 + vram: 0x80234000 + subsegments: + - [0x830560, c, "0E"] + - name: world_model_anim_kzn_02 + dir: world/model_anim/kzn + type: code + start: 0x830FE0 + vram: 0x80234000 + subsegments: + - [0x830FE0, c, "02"] + - name: world_model_anim_kzn_03 + dir: world/model_anim/kzn + type: code + start: 0x8334A0 + vram: 0x80234000 + subsegments: + - [0x8334A0, c, "03"] + - name: world_model_anim_kzn_0F + dir: world/model_anim/kzn + type: code + start: 0x833EE0 + vram: 0x80234000 + subsegments: + - [0x833EE0, c, "0F"] + - name: world_model_anim_kzn_10 + dir: world/model_anim/kzn + type: code + start: 0x8368E0 + vram: 0x80234000 + subsegments: + - [0x8368E0, c, "10"] + - name: world_model_anim_kzn_11 + dir: world/model_anim/kzn + type: code + start: 0x839680 + vram: 0x80234000 + subsegments: + - [0x839680, c, "11"] + - name: world_model_anim_kzn_12 + dir: world/model_anim/kzn + type: code + start: 0x839BC0 + vram: 0x80234000 + subsegments: + - [0x839BC0, c, "12"] + - name: world_model_anim_kzn_13 + dir: world/model_anim/kzn + type: code + start: 0x83B080 + vram: 0x80234000 + subsegments: + - [0x83B080, c, "13"] + - name: world_model_anim_kzn_14 + dir: world/model_anim/kzn + type: code + start: 0x83BD50 + vram: 0x80234000 + subsegments: + - [0x83BD50, c, "14"] + - name: world_model_anim_kzn_15 + dir: world/model_anim/kzn + type: code + start: 0x83C8F0 + vram: 0x80234000 + subsegments: + - [0x83C8F0, c, "15"] + - name: world_model_anim_kzn_16 + dir: world/model_anim/kzn + type: code + start: 0x83D570 + vram: 0x80234000 + subsegments: + - [0x83D570, c, "16"] + - name: world_model_anim_kzn_17 + dir: world/model_anim/kzn + type: code + start: 0x83E110 + vram: 0x80234000 + subsegments: + - [0x83E110, c, "17"] + - name: world_model_anim_kzn_18 + dir: world/model_anim/kzn + type: code + start: 0x83E9F0 + vram: 0x80234000 + subsegments: + - [0x83E9F0, c, "18"] + - name: world_model_anim_kzn_19 + dir: world/model_anim/kzn + type: code + start: 0x83F2F0 + vram: 0x80234000 + subsegments: + - [0x83F2F0, c, "19"] + - name: world_model_anim_kzn_1A + dir: world/model_anim/kzn + type: code + start: 0x841600 + vram: 0x80234000 + subsegments: + - [0x841600, c, "1A"] + - name: world_model_anim_kzn_1B + dir: world/model_anim/kzn + type: code + start: 0x843010 + vram: 0x80234000 + subsegments: + - [0x843010, c, "1B"] + - name: world_model_anim_kzn_1C + dir: world/model_anim/kzn + type: code + start: 0x843740 + vram: 0x80234000 + subsegments: + - [0x843740, c, "1C"] + - name: world_model_anim_kzn_1D + dir: world/model_anim/kzn + type: code + start: 0x845080 + vram: 0x80234000 + subsegments: + - [0x845080, c, "1D"] + - name: world_model_anim_kzn_1E + dir: world/model_anim/kzn + type: code + start: 0x845770 + vram: 0x80234000 + subsegments: + - [0x845770, c, "1E"] + - name: world_model_anim_kzn_1F + dir: world/model_anim/kzn + type: code + start: 0x845970 + vram: 0x80234000 + subsegments: + - [0x845970, c, "1F"] + - name: world_model_anim_kzn_20 + dir: world/model_anim/kzn + type: code + start: 0x8461D0 + vram: 0x80234000 + subsegments: + - [0x8461D0, c, "20"] + - name: world_model_anim_kzn_21 + dir: world/model_anim/kzn + type: code + start: 0x848210 + vram: 0x80234000 + subsegments: + - [0x848210, c, "21"] + - name: world_model_anim_kzn_22 + dir: world/model_anim/kzn + type: code + start: 0x84AA00 + vram: 0x80234000 + subsegments: + - [0x84AA00, c, "22"] + - name: world_model_anim_kzn_23 + dir: world/model_anim/kzn + type: code + start: 0x84B340 + vram: 0x80234000 + subsegments: + - [0x84B340, c, "23"] + - name: world_model_anim_kzn_24 + dir: world/model_anim/kzn + type: code + start: 0x84C440 + vram: 0x80234000 + subsegments: + - [0x84C440, c, "24"] + + - [0x84CF10, bin] + +############ +### Maps ### +############ + - name: machi + dir: world/area_mac/machi + type: code + start: 0x853440 + vram: 0x80240000 + subsegments: + - [0x853440, c, machi_0_header] + - [0x853440, c, machi_1_tables] + - [0x853440, c, machi_2_main] + - [0x853470, c, machi_3_entity] + - [0x8535F0, c, machi_4_goomba_king] + - [0x8535F0, c, machi_5_npc] + - [0x8538F0, c, machi_6_misstar] + - [0x853AD0, c, machi_7_partner] + - name: mac_00 + dir: world/area_mac/mac_00 + type: code + start: 0x856DB0 + vram: 0x80240000 + subsegments: + - [0x856DB0, c, mac_00_0_header] + - [0x856DB0, c, mac_00_1_music] + - [0x856DB0, c, mac_00_2_main] + - [0x8573E0, c, mac_00_3_entity] + - [0x8573E0, c, mac_00_4_rooms] + - [0x8573E0, c, mac_00_5_npc] + - [0x859070, c, mac_00_6_shop] + - [0x859070, c, mac_00_7_music_mix] + - [0x8591A0, c, mac_00_8_demo] + - [0x8591A0, c, mac_00_9_water_gfx] + - [0x859320, c, mac_00_10_shared_npc] + - [0x85A910, c, mac_00_11_intro_npc] + - [0x85A910, c, mac_00_12_intro] + - [0x85A910, c, mac_00_13_epilogue_npc] + - [0x85A910, c, mac_00_14_epilogue] + - name: mac_01 + dir: world/area_mac/mac_01 + type: code + start: 0x86C990 + vram: 0x80240000 + subsegments: + - [0x86C990, c, mac_01_0_header] + - [0x86C990, c, mac_01_1_music] + - [0x86C990, c, mac_01_2_main] + - [0x86C990, c, mac_01_3_entity] + - [0x86C990, c, mac_01_4_rooms] + - [0x86C990, c, mac_01_5_shop] + - [0x86CD50, c, mac_01_6_crystal_ball_gfx] + - [0x86D810, c, mac_01_7_bulletin] + - [0x86D8E0, c, mac_01_8_music_mix] + - [0x86DA10, c, mac_01_9_npc] + - [0x871EE0, c, mac_01_10_intro_npc] + - [0x872D70, c, mac_01_11_epilogue_npc] + - [0x872D70, c, mac_01_12_intro] + - [0x872E20, c, mac_01_13_foliage] + - [0x873060, .data, mac_01_0_header] + - [0x873100, .data, mac_01_1_music] + - [0x8732E0, .data, mac_01_2_main] + - [0x873D30, .data, mac_01_3_entity] + - [0x873DE0, .data, mac_01_4_rooms] + - [0x8747B0, .data, mac_01_5_shop] + - [0x874DD0, .data, mac_01_6_crystal_ball_gfx] + - [0x874EA0, .data, mac_01_7_bulletin] + - [0x875210, .data, mac_01_8_music_mix] + - start: 0x875320 + type: .data + name: mac_01_9_npc + subsegments: + - [0x875320] + - [0x877F80, vtx_common, ../../toad_house/blanket] + - [0x879560, gfx_common, ../../toad_house/blanket] + - [0x8796C8, rgba16, ../../toad_house/blanket, 16, 32, namespaced] + - [0x879AC8] + - [0x88BB30, .data, mac_01_10_intro_npc] + - [0x88C440, .data, mac_01_11_epilogue_npc] + - [0x88E270, .data, mac_01_12_intro] + - [0x88E5D0, .data, mac_01_13_foliage] + - name: mac_02 + dir: world/area_mac/mac_02 + type: code + start: 0x88F430 + vram: 0x80240000 + subsegments: + - [0x88F430, c, mac_02_0_header] + - [0x88F430, c, mac_02_1_music] + - [0x88F430, c, mac_02_2_main] + - [0x88FA20, c, mac_02_3_rooms] + - [0x88FAE0, c, mac_02_4_foliage] + - [0x88FD20, c, mac_02_5_entity] + - [0x88FD60, c, mac_02_6_npc] + - [0x892820, c, mac_02_7_music_mix] + - name: mac_03 + dir: world/area_mac/mac_03 + type: code + start: 0x89D9B0 + vram: 0x80240000 + subsegments: + - [0x89D9B0, c, mac_03_0_header] + - [0x89D9B0, c, mac_03_1_music] + - [0x89D9B0, c, mac_03_2_main] + - [0x89DCD0, c, mac_03_3_train] + - [0x89DE60, c, mac_03_4_npc] + - [0x89F6B0, c, mac_03_5_entity] + - [0x89F6B0, c, mac_03_6_foliage] + - [0x89F8F0, c, mac_03_7_oinks] + - [0x8A0220, c, mac_03_8_demo] + - name: mac_04 + dir: world/area_mac/mac_04 + type: code + start: 0x8AEDE0 + vram: 0x80240000 + subsegments: + - [0x8AEDE0, c, mac_04_0_header] + - [0x8AEE30, c, mac_04_1_music] + - [0x8AEE30, c, mac_04_2_main] + - [0x8AEFA0, c, mac_04_3_rooms] + - [0x8AF000, c, mac_04_4_foliage] + - [0x8AF240, c, mac_04_5_shop] + - [0x8AF240, c, mac_04_6_npc] + - [0x8B0A70, c, mac_04_7_wish_scene] + - [0x8B0A70, c, mac_04_8_entity] + - [0x8B0CD0, c, mac_04_9_music_mix] + - name: mac_05 + dir: world/area_mac/mac_05 + type: code + start: 0x8BE3C0 + vram: 0x80240000 + subsegments: + - [0x8BE3C0, c, mac_05_0_header] + - [0x8BE3C0, c, mac_05_1_music] + - [0x8BE3C0, c, mac_05_2_entity] + - [0x8BE3C0, c, mac_05_3_main] + - [0x8BE850, c, mac_05_4_npc] + - [0x8C17B0, c, mac_05_5_whale] + - [0x8C2170, c, mac_05_6_rooms] + - [0x8C2170, c, mac_05_7_club64_sign] + - name: mac_06 + dir: world/area_mac/mac_06 + type: code + start: 0x8D0DD0 + vram: 0x80240000 + subsegments: + - [0x8D0DD0, c, mac_06_0_header] + - [0x8D0DD0, c, mac_06_1_main] + - [0x8D1290, c, mac_06_2_whale] + - [0x8D1C50, c, mac_06_3_npc] + - name: tik_01 + dir: world/area_tik/tik_01 + type: code + start: 0x8D5740 + vram: 0x80240000 + subsegments: + - [0x8D5740, c, tik_01_0_header] + - [0x8D5740, c, tik_01_1_music] + - [0x8D5740, c, tik_01_2_main] + - [0x8D5D30, c, tik_01_3_drips] + - [0x8D60A0, c, tik_01_4_entity] + - [0x8D6170, c, tik_01_5_npc] + - name: tik_02 + dir: world/area_tik/tik_02 + type: code + start: 0x8D89D0 + vram: 0x80240000 + subsegments: + - [0x8D89D0, c, tik_02_0_header] + - [0x8D89D0, c, tik_02_1_music] + - [0x8D89D0, c, tik_02_2_main] + - [0x8D8CE0, c, tik_02_3_entity] + - [0x8D8FA0, c, tik_02_4_drips] + - [0x8D9310, c, tik_02_5_npc] + - name: tik_03 + dir: world/area_tik/tik_03 + type: code + start: 0x8DAD90 + vram: 0x80240000 + subsegments: + - [0x8DAD90, c, tik_03_0_header] + - [0x8DAD90, c, tik_03_1_music] + - [0x8DAD90, c, tik_03_2_main] + - [0x8DB380, c, tik_03_3_drips] + - [0x8DB6F0, c, tik_03_4_platforms] + - [0x8DB750, c, tik_03_5_entity] + - [0x8DB750, c, tik_03_6_demo] + - name: tik_04 + dir: world/area_tik/tik_04 + type: code + start: 0x8DDCC0 + vram: 0x80240000 + subsegments: + - [0x8DDCC0, c, tik_04_0_header] + - [0x8DDCC0, c, tik_04_1_music] + - [0x8DDCC0, c, tik_04_2_main] + - [0x8DE2B0, c, tik_04_3_drips] + - [0x8DE620, c, tik_04_4_platforms] + - [0x8DE930, c, tik_04_5_npc] + - name: tik_05 + dir: world/area_tik/tik_05 + type: code + start: 0x8E1050 + vram: 0x80240000 + subsegments: + - [0x8E1050, c, tik_05_0_header] + - [0x8E1050, c, tik_05_1_music] + - [0x8E1050, c, tik_05_2_main] + - [0x8E1360, c, tik_05_3_drips] + - [0x8E16D0, c, tik_05_4_entity] + - [0x8E1AA0, c, tik_05_5_npc] + - name: tik_06 + dir: world/area_tik/tik_06 + type: code + start: 0x8E3170 + vram: 0x80240000 + subsegments: + - [0x8E3170, c, tik_06_0_header] + - [0x8E3170, c, tik_06_1_music] + - [0x8E3170, c, tik_06_2_main] + - [0x8E3760, c, tik_06_3_drips] + - [0x8E3AD0, c, tik_06_4_entity] + - name: tik_07 + dir: world/area_tik/tik_07 + type: code + start: 0x8E5E70 + vram: 0x80240000 + subsegments: + - [0x8E5E70, c, tik_07_0_header] + - [0x8E5E70, c, tik_07_1_music] + - [0x8E5E70, c, tik_07_2_main] + - [0x8E6150, c, tik_07_3_entity] + - [0x8E6E90, c, tik_07_4_drips] + - [0x8E7200, c, tik_07_5_platforms] + - [0x8E7260, c, tik_07_6_npc] + - name: tik_08 + dir: world/area_tik/tik_08 + type: code + start: 0x8EB080 + vram: 0x80240000 + subsegments: + - [0x8EB080, c, tik_08_0_header] + - [0x8EB080, c, tik_08_1_music] + - [0x8EB080, c, tik_08_2_main] + - [0x8EB670, c, tik_08_3_drips] + - [0x8EB9E0, c, tik_08_4_entity] + - [0x8EBAB0, c, tik_08_5_npc] + - name: tik_09 + dir: world/area_tik/tik_09 + type: code + start: 0x8EE450 + vram: 0x80240000 + subsegments: + - [0x8EE450, c, tik_09_0_header] + - [0x8EE450, c, tik_09_1_music] + - [0x8EE450, c, tik_09_2_main] + - [0x8EEA40, c, tik_09_3_drips] + - [0x8EEDB0, c, tik_09_4_entity] + - [0x8EEE80, c, tik_09_5_npc] + - name: tik_10 + dir: world/area_tik/tik_10 + type: code + start: 0x8F2650 + vram: 0x80240000 + subsegments: + - [0x8F2650, c, tik_10_0_header] + - [0x8F2650, c, tik_10_1_music] + - [0x8F2650, c, tik_10_2_main] + - [0x8F2960, c, tik_10_3_drips] + - [0x8F2CD0, c, tik_10_4_entity] + - name: tik_12 + dir: world/area_tik/tik_12 + type: code + start: 0x8F4E60 + vram: 0x80240000 + subsegments: + - [0x8F4E60, c, tik_12_0_header] + - [0x8F4E60, c, tik_12_1_music] + - [0x8F4E60, c, tik_12_2_main] + - [0x8F5450, c, tik_12_3_drips] + - [0x8F57C0, c, tik_12_4_entity] + - [0x8F67C0, c, tik_12_5_npc] + - name: tik_14 + dir: world/area_tik/tik_14 + type: code + start: 0x8F9890 + vram: 0x80240000 + subsegments: + - [0x8F9890, c, tik_14_0_header] + - [0x8F9890, c, tik_14_1_music] + - [0x8F9890, c, tik_14_2_main] + - [0x8F9E80, c, tik_14_3_drips] + - [0x8FA1F0, c, tik_14_4_entity] + - name: tik_15 + dir: world/area_tik/tik_15 + type: code + start: 0x8FBE30 + vram: 0x80240000 + subsegments: + - [0x8FBE30, c, tik_15_0_header] + - [0x8FBE30, c, tik_15_1_music] + - [0x8FBE30, c, tik_15_2_main] + - [0x8FC420, c, tik_15_3_entity] + - [0x8FC420, c, tik_15_4_drips] + - [0x8FC790, c, tik_15_5_npc] + - name: tik_17 + dir: world/area_tik/tik_17 + type: code + start: 0x8FECB0 + vram: 0x80240000 + subsegments: + - [0x8FECB0, c, tik_17_0_header] + - [0x8FECB0, c, tik_17_1_music] + - [0x8FECE0, c, tik_17_2_entity] + - [0x8FFA20, c, tik_17_3_main] + - name: tik_18 + dir: world/area_tik/tik_18 + type: code + start: 0x901970 + vram: 0x80240000 + subsegments: + - [0x901970, c, tik_18_0_header] + - [0x901970, c, tik_18_1_music] + - [0x901970, c, tik_18_2_main] + - [0x901C80, c, tik_18_3_drips] + - [0x901FF0, c, tik_18_4_npc] + - [0x901FF0, c, tik_18_5_entity] + - name: tik_19 + dir: world/area_tik/tik_19 + type: code + start: 0x903870 + vram: 0x80240000 + subsegments: + - [0x903870, c, tik_19_0_header] + - [0x903870, c, tik_19_1_music] + - [0x903870, c, tik_19_2_main] + - [0x903E60, c, tik_19_3_entity] + - name: tik_20 + dir: world/area_tik/tik_20 + type: code + start: 0x9065E0 + vram: 0x80240000 + subsegments: + - [0x9065E0, c, tik_20_0_header] + - [0x9065E0, c, tik_20_1_music] + - [0x9065E0, c, tik_20_2_main] + - [0x906F40, c, tik_20_3_npc] + - [0x907720, c, tik_20_4_entity] + - name: tik_21 + dir: world/area_tik/tik_21 + type: code + start: 0x909A30 + vram: 0x80240000 + subsegments: + - [0x909A30, c, tik_21_0_header] + - [0x909A30, c, tik_21_1_music] + - [0x909A30, c, tik_21_2_main] + - [0x90A390, c, tik_21_3_entity] + - name: tik_22 + dir: world/area_tik/tik_22 + type: code + start: 0x90C150 + vram: 0x80240000 + subsegments: + - [0x90C150, c, tik_22_0_header] + - [0x90C150, c, tik_22_1_music] + - [0x90C180, c, tik_22_2_main] + - name: tik_23 + dir: world/area_tik/tik_23 + type: code + start: 0x90E660 + vram: 0x80240000 + subsegments: + - [0x90E660, c, tik_23_0_header] + - [0x90E660, c, tik_23_1_music] + - [0x90E660, c, tik_23_2_main] + - [0x90EFC0, c, tik_23_3_entity] + - [0x90EFC0, c, tik_23_4_npc] + - name: tik_24 + dir: world/area_tik/tik_24 + type: code + start: 0x911D10 + vram: 0x80240000 + subsegments: + - [0x911D10, c, tik_24_0_header] + - [0x911D60, c, tik_24_1_music] + - [0x911D60, c, tik_24_2_main] + - [0x912070, c, tik_24_3_drips] + - [0x9123E0, c, tik_24_4_entity] + - [0x9123E0, c, tik_24_5_npc] + - name: tik_25 + dir: world/area_tik/tik_25 + type: code + start: 0x914210 + vram: 0x80240000 + subsegments: + - [0x914210, c, tik_25_0_header] + - [0x914210, c, tik_25_1_music] + - [0x914210, c, tik_25_2_main] + - [0x914890, c, tik_25_3_entity] + - name: kgr_01 + dir: world/area_kgr/kgr_01 + type: code + start: 0x915CA0 + vram: 0x80240000 + subsegments: + - [0x915CA0, c, kgr_01_1_main] + - [0x915E00, c, kgr_01_2_wiggle] + - [0x9161A0, c, kgr_01_3_extra] + - name: kgr_02 + dir: world/area_kgr/kgr_02 + type: code + start: 0x9166E0 + vram: 0x80240000 + subsegments: + - [0x9166E0, c, kgr_02_1_main] + - [0x916840, c, kgr_02_2_unused] + - [0x916E10, c, kgr_02_3_npc] + - [0x916E40, c, kgr_02_4_extra] + - name: kmr_00 + dir: world/area_kmr/kmr_00 + type: code + start: 0x918220 + vram: 0x80240000 + subsegments: + - [0x918220, c, kmr_00_0_header] + - [0x918220, c, kmr_00_1_music] + - [0x918220, c, kmr_00_2_main] + - [0x918220, c, kmr_00_3_revival] + - [0x918F60, c, kmr_00_4_npc] + - [0x919020, c, kmr_00_5_entity] + - name: kmr_02 + dir: world/area_kmr/kmr_02 + type: code + start: 0x91C3B0 + vram: 0x80240000 + subsegments: + - [0x91C3B0, c, kmr_02_0_header] + - [0x91C3B0, c, kmr_02_1_music] + - [0x91C3B0, c, kmr_02_2_main] + - [0x91C740, c, kmr_02_3_npc] + - [0x91F420, c, kmr_02_4_rooms_1] + - [0x91F720, c, kmr_02_5_entity] + - [0x91F9F0, c, kmr_02_6_rooms_2] + - [0x91F9F0, c, kmr_02_7_kammy] + - [0x91FB10, c, kmr_02_8_foliage] + - [0x91FD50, c, kmr_02_9_images] + - [0x91FDF0, .data, kmr_02_0_header] + - [0x91FEE0, .data, kmr_02_1_music] + - [0x920050, .data, kmr_02_2_main] + - [0x921980, .data, kmr_02_3_npc] + - [0x92D7F0, .data, kmr_02_4_rooms_1] + - [0x930DD0, .data, kmr_02_5_entity] + - [0x931560, .data, kmr_02_6_rooms_2] + - [0x931A30, .data, kmr_02_7_kammy] + - [0x9333A0, .data, kmr_02_8_foliage] + - start: 0x933F00 + type: .data + name: kmr_02_9_images + subsegments: + - [0x933F00, ci4, heart_block, 32, 32] + - [0x934100, palette, heart_block] + - [0x934120] + - name: kmr_03 + dir: world/area_kmr/kmr_03 + type: code + start: 0x934320 + vram: 0x80240000 + subsegments: + - [0x934320, c, kmr_03_0_header] + - [0x934320, c, kmr_03_1_music] + - [0x934320, c, kmr_03_2_main] + - [0x934320, c, kmr_03_3_npc] + - [0x934640, c, kmr_03_4_entity] + - [0x934730, c, kmr_03_5_foliage] + - [0x934970, c, kmr_03_6_fall_down] + - name: kmr_04 + dir: world/area_kmr/kmr_04 + type: code + start: 0x936C90 + vram: 0x80240000 + subsegments: + - [0x936C90, c, kmr_04_0_header] + - [0x936C90, c, kmr_04_1_music] + - [0x936C90, c, kmr_04_2_main] + - [0x936C90, c, kmr_04_3_npc] + - [0x936CF0, c, kmr_04_4_entity] + - [0x936CF0, c, kmr_04_5_foliage] + - [0x937100, .data, kmr_04_0_header] + - [0x9371F0, .data, kmr_04_1_music] + - [0x937290, .data, kmr_04_2_main] + - [0x9374F0, .data, kmr_04_3_npc] + - [0x938710, .data, kmr_04_4_entity] + - start: 0x938880 + type: .data + name: kmr_04_5_foliage + subsegments: + - [0x938880, ci4, hammer_block_message, 48, 48] + - [0x938D00, palette, hammer_block_message] + - [0x938D20] + - name: kmr_05 + dir: world/area_kmr/kmr_05 + type: code + start: 0x93A400 + vram: 0x80240000 + subsegments: + - [0x93A400, c, kmr_05_0_header] + - [0x93A400, c, kmr_05_1_music] + - [0x93A400, c, kmr_05_2_main] + - [0x93A400, c, kmr_05_3_npc] + - [0x93B900, c, kmr_05_4_entity] + - [0x93B900, c, kmr_05_5_foliage] + - name: kmr_06 + dir: world/area_kmr/kmr_06 + type: code + start: 0x93D8A0 + vram: 0x80240000 + subsegments: + - [0x93D8A0, c, kmr_06_0_header] + - [0x93D8A0, c, kmr_06_1_music] + - [0x93D8A0, c, kmr_06_2_main] + - [0x93D8A0, c, kmr_06_3_npc] + - [0x93EDA0, c, kmr_06_4_entity] + - [0x93EDA0, c, kmr_06_5_sticker_sign] + - name: kmr_07 + dir: world/area_kmr/kmr_07 + type: code + start: 0x940150 + vram: 0x80240000 + subsegments: + - [0x940150, c, kmr_07_0_header] + - [0x940150, c, kmr_07_1_music] + - [0x940150, c, kmr_07_2_main] + - [0x940150, c, kmr_07_3_npc] + - [0x940C10, c, kmr_07_4_entity] + - name: kmr_09 + dir: world/area_kmr/kmr_09 + type: code + start: 0x942190 + vram: 0x80240000 + subsegments: + - [0x942190, c, kmr_09_0_header] + - [0x942190, c, kmr_09_1_music] + - [0x942190, c, kmr_09_2_main] + - [0x942190, c, kmr_09_3_npc] + - [0x9436C0, c, kmr_09_4_entity] + - name: kmr_10 + dir: world/area_kmr/kmr_10 + type: code + start: 0x944860 + vram: 0x80240000 + subsegments: + - [0x944860, c, kmr_10_0_header] + - [0x944860, c, kmr_10_1_music] + - [0x944860, c, kmr_10_2_main] + - [0x944860, c, kmr_10_3_npc] + - [0x944860, c, kmr_10_4_entity] + - [0x944C30, c, kmr_10_5_foliage] + - name: kmr_11 + dir: world/area_kmr/kmr_11 + type: code + start: 0x946490 + vram: 0x80240000 + subsegments: + - [0x946490, c, kmr_11_0_header] + - [0x946490, c, kmr_11_1_music] + - [0x946490, c, kmr_11_2_main] + - [0x946730, c, kmr_11_3_scenes] + - [0x946800, c, kmr_11_4_npc] + - [0x947350, c, kmr_11_5_entity] + - [0x9473B0, c, kmr_11_6_kammy] + - [0x9473B0, c, kmr_11_7_foliage] + - [0x9475F0, c, kmr_11_8_fortress_skeleton] + - [0x9475F0, c, kmr_11_9_fortress_animation] + - [0x9475F0, c, kmr_11_10_bridge_skeleton] + - [0x9475F0, c, kmr_11_11_bridge_animation] + - name: kmr_12 + dir: world/area_kmr/kmr_12 + type: code + start: 0x9576F0 + vram: 0x80240000 + subsegments: + - [0x9576F0, c, kmr_12_0_header] + - [0x9576F0, c, kmr_12_1_music] + - [0x9576F0, c, kmr_12_2_main] + - [0x9576F0, c, kmr_12_3_npc] + - [0x957720, c, kmr_12_4_entity] + - name: kmr_20 + dir: world/area_kmr/kmr_20 + type: code + start: 0x9581B0 + vram: 0x80240000 + subsegments: + - [0x9581B0, c, kmr_20_0_header] + - [0x9581B0, c, kmr_20_1_music] + - [0x9581E0, c, kmr_20_2_main] + - [0x9584E0, c, kmr_20_3_rooms] + - [0x958530, c, kmr_20_4_documents] + - [0x958F80, c, kmr_20_5_entity] + - [0x958FD0, c, kmr_20_6_trees] + - [0x959210, c, kmr_20_7_bushes] + - [0x959450, c, kmr_20_8_bed] + - [0x9597D0, c, kmr_20_9_npc_scenes] + - [0x9597D0, c, kmr_20_10_npc] + - [0x959930, c, kmr_20_11_npc_intro] + - [0x959F00, c, kmr_20_12_npc_epilogue] + - [0x95A350, c, kmr_20_13_records] + - [0x95AD60, .data, kmr_20_0_header] + - [0x95ADF0, .data, kmr_20_1_music] + - [0x95AF50, .data, kmr_20_2_main] + - [0x95C130, .data, kmr_20_3_rooms] + - [0x95C570, .data, kmr_20_4_documents] + - [0x95D890, .data, kmr_20_5_entity] + - [0x95DF90, .data, kmr_20_6_trees] + - [0x95E9A0, .data, kmr_20_7_bushes] + - [0x95F4C0, .data, kmr_20_8_bed] + - [0x962580, .data, kmr_20_9_npc_scenes] + - [0x962A60, .data, kmr_20_10_npc] + - [0x9660C0, .data, kmr_20_11_npc_intro] + - [0x969170, .data, kmr_20_12_npc_epilogue] + - start: 0x96AF00 + type: .data + name: kmr_20_13_records + subsegments: + - [0x96AF00, gfx, records_screen] + - [0x96AF70] + - name: kmr_21 + dir: world/area_kmr/kmr_21 + type: code + start: 0x96B210 + vram: 0x80240000 + subsegments: + - [0x96B210, c, kmr_21_0_header] + - [0x96B220, c, kmr_21_1_main] + - name: kmr_22 + dir: world/area_kmr/kmr_22 + type: code + start: 0x96B9E0 + vram: 0x80240000 + subsegments: + - [0x96B9E0, c, kmr_22_0_header] + - [0x96B9F0, c, kmr_22_1_main] + - [0x96BC20, c, kmr_22_2_npc] + - [0x96C6F0, .data, kmr_22_0_header] + - [0x96C7C0, .data, kmr_22_1_main] + - start: 0x96CDF0 + type: .data + name: kmr_22_2_npc + subsegments: + - [0x96C7C0] + - [0x96D2E0, ci4, lava_piranha_vine, 64, 32] + - [0x96D6E0, palette, lava_piranha_vine] + - [0x96D8E0, gfx, lava_piranha_vine] + - [0x96D9C0] + - name: kmr_23 + dir: world/area_kmr/kmr_23 + type: code + start: 0x973DA0 + vram: 0x80240000 + subsegments: + - [0x973DA0, c, kmr_23_0_header] + - [0x973DB0, c, kmr_23_1_main] + - [0x973DE0, c, kmr_23_2_npc] + - [0x974E70, .data, kmr_23_0_header] + - [0x974F30, .data, kmr_23_1_main] + - start: 0x975400 + type: .data + name: kmr_23_2_npc + subsegments: + - [0x975400] + - [0x975468, ia8, window_ul, 8, 8] + - [0x9754A8, ia8, window_ur, 8, 8] + - [0x9754E8, ia8, window_ll, 8, 8] + - [0x975528, ia8, window_lr, 8, 8] + - [0x975568] + - name: kmr_24 + dir: world/area_kmr/kmr_24 + type: code + start: 0x9775B0 + vram: 0x80240000 + subsegments: + - [0x9775B0, c, kmr_24_0_header] + - [0x9775C0, c, kmr_24_1_main] + - name: kmr_30 + dir: world/area_kmr/kmr_30 + type: code + start: 0x977A40 + vram: 0x80240000 + subsegments: + - [0x977A40, c, kmr_30_0_header] + - [0x977A40, c, kmr_30_1_main] + - [0x977D50, c, kmr_30_2_npc] + - [0x977D50, c, kmr_30_3_the_end] + + - [0x978FB0, bin] + + - start: 0x1e937b8 + align: 8 + type: pm_npc_sprites + dir: sprite + name: npc + files: + - WorldGoombario + - WorldKooper + - WorldBombette + - WorldParakarry + - WorldBow + - WorldWatt + - WorldSushie + - WorldLakilester + - BattleGoombario + - BattleKooper + - BattleBombette + - BattleParakarry + - BattleBow + - BattleWatt + - BattleSushie + - BattleLakilester + - KooperWithoutShell + - WorldEldstar + - WorldMamar + - WorldSkolar + - WorldMuskular + - WorldMisstar + - WorldKlevar + - WorldKalmar + - BattleEldstar + - BattleMamar + - BattleSkolar + - BattleMuskular + - BattleMisstar + - BattleKlevar + - BattleKalmar + - Twink + - JrTroopa + - SpikedJrTroopa + - SpikedParaJrTroopa + - MageJrTroopa + - ParaJrTroopa + - Goomba + - SpikedGoomba + - Paragoomba + - KoopaTroopa + - ParaTroopa + - Fuzzy + - Bobomb + - BulletBill + - BillBlaster + - MontyMole + - Cleft + - Pokey + - Bandit + - BuzzyBeetle + - Swooper + - StoneChomp + - LargePiranha + - SmallPiranha + - Sentinel + - WorldClubba + - BattleClubba + - ShyGuy + - GrooveGuy + - SkyGuy + - PyroGuy + - SpyGuy + - MediGuy + - Fuzzipede + - SpearGuy + - HeartPlant + - HurtPlant + - MBush + - LavaBubble + - KentCKoopa + - Dayzee + - Lakitu + - Spiny + - Bzzap + - RuffPuff + - SpikeTop + - Duplighost + - AlbinoDino + - Blooper + - BabyBlooper + - Gulpit + - DryBones + - ThrownBone + - BonyBeetle + - Magikoopa + - FlyingMagikoopa + - WorldKoopatrol + - Koopatrol + - HammerBros + - BushBasic + - BushBlocky + - BushDry + - BushLeafy + - BushMatted + - WorldKammy + - BattleKammy + - GoombaBros + - GoombaKing + - SpikyGoomnut + - DarkToad + - KoopaBros + - Buzzar + - Tutankoopa + - ChainChomp + - WorldTubba + - BattleTubba + - TubbasHeart + - BigLanternGhost + - ShySquadGuy + - MarshalGuy + - StiltGuy + - StiltGuyUnfold + - ShyStackGuy + - ShyStackUnfold + - ShyStackDamage + - ShyStackRock + - GeneralGuy + - GeneralGuyBomb + - TankGuy + - LavaPiranha + - PetitPiranha + - LavaBud + - HuffNPuff + - TuffPuff + - Monstar + - CrystalKing + - WorldBowser + - BattleBowser + - Luigi + - Toad + - Toadette + - VannaT + - ToadKid + - ToadGuard + - HarryT + - ToadMinister + - Postmaster + - ConductorToad + - TrainToad + - Fishmael + - Musician + - Koopa + - KoopaWithoutShell + - WorldBobomb + - Whacka + - Dryite + - Mouser + - Boo + - Yoshi + - YoshiKid + - Raven + - Bubulb + - Penguin + - ShiverToad + - AltBandit + - Goompa + - Goombaria + - Gooma + - Goompapa + - Goomama + - TheMaster + - Chan + - Lee + - Merlon + - ChetRippo + - Rowf + - MinhT + - RussT + - TayceT + - FiceT + - Bartender + - Chanterelle + - RipCheato + - ChuckQuizmo + - Merluvlee + - Merlar + - Merlow + - StarMan + - KoloradoWife + - KoopaKoot + - Kolorado + - BattleKolorado + - Archeologist + - Nomadimouse + - WorldMerlee + - BattleMerlee + - DisguisedMoustafa + - Moustafa + - Oaklie + - Bootler + - Yakkey + - GourmetGuy + - VillageLeader + - LeadersFriend + - RaphaelRaven + - Tolielup + - GateFlower + - Petunia + - Posie + - Lily + - Rosie + - Sun + - Lakilulu + - Ninji + - MayorPenguin + - MayorPenguinWife + - PenguinPatrol + - Herringway + - Merle + - StarRod + - Fire + - Coin + - ParadePeach + - ParadeKoopas + - ParadeBurntBowser + - ParadeLuigi + - ParadePartner + - ParadeYoshi + - ParadeKolorado + - ParadeChick + - ParadeIceShow + - ParadeToad + - ParadeTwirler + - ParadeDrummer + - ParadeBanner + - ParadeHorn + - ParadeTubba + - ParadeWizard + - ParadeMario + - ParadeShyGuy + - ParadeTwink + - Leaf + + - [0x202f208, bin] # end of sprite data - todo: figure out what this is + + - start: 0x2030000 + name: msg_pal_en + type: pm_msg + files: + - 00_Intro + - 01_Outro + - 02_ToadTownGate + - 03_ToadTownPlaza + - 04_ToadTownBridge + - 05_ToadTownStation + - 06_ToadTownHousing + - 07_ToadTownPort + - 08_Minigame + - 09_CastleGrounds + - 0A_ShootingStarSummit + - 0B_Prologue + - 0C_Chapter1 + - 0D_Chapter2 + - 0E_Chapter3 + - 0F_Chapter4 + - 10_Chapter5 + - 11_Chapter6 + - 12_Chapter7 + - 13_Chapter8 + - 14_Peach + - 15_KootFavors + - 16_RussTHints + - 17_NewsBoard + - 18_GossipBoard + - 19_MapTattles + - 1A_NpcTattles + - 1B_EntityTattles + - 1C_EnemyTattles + - 1D_Menus + - 1E_Choices + - 1F_MenuTips + - 20_Documents + - 21_MerlonHints + - 22_MerluvleeHints + - 23_ShortItemDesc + - 24_ShopItemDesc + - 25_FullItemDesc + - 26_ItemNames + - 27_Shops + - 28_PartnerDesc + - 29_EnemyNames + - 2A_PlayerMoves + - 2B_PartnerMoves + - 2C_QuizQuestions + - 2D_QuizChoices + - 2E_Credits + - [0x2132440, bin] + + - [0x4000000] diff --git a/ver/pal/symbol_addrs.txt b/ver/pal/symbol_addrs.txt new file mode 100644 index 0000000000..37be4d3b10 --- /dev/null +++ b/ver/pal/symbol_addrs.txt @@ -0,0 +1,15 @@ +mac_01_toad_house_blanket_vtx = 0x8024B5F0; // rom:0x877F80 size:0x15E0 +mac_01_toad_house_blanket_gfx = 0x8024CBD0; // rom:0x879560 +mac_01_toad_house_blanket_img = 0x8024CD38; // rom:0x8796C8 +kmr_02_heart_block_img = 0x80257B50; // rom:0x933F00 +kmr_02_heart_block_pal = 0x80257D50; // rom:0x934100 +kmr_04_hammer_block_message_img = 0x80241BF0; // rom:0x938880 +kmr_04_hammer_block_message_pal = 0x80242070; // rom:0x938D00 +kmr_20_records_screen_gfx = 0x80252D50; // rom:0x96AF00 +D_80241900 = 0x80241900; // rom:0x96D2E0 +D_80241D00 = 0x80241D00; // rom:0x96D6E0 +kmr_22_lava_piranha_vine_gfx = 0x80241F00; // rom:0x96D8E0 +kmr_23_window_ul_img = 0x802416C8; // rom:0x975468 +kmr_23_window_ur_img = 0x80241708; // rom:0x9754A8 +kmr_23_window_ll_img = 0x80241748; // rom:0x9754E8 +kmr_23_window_lr_img = 0x80241788; // rom:0x975528 diff --git a/ver/pal/undefined_funcs_auto.txt b/ver/pal/undefined_funcs_auto.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ver/pal/undefined_syms.txt b/ver/pal/undefined_syms.txt new file mode 100644 index 0000000000..e1bbae4dca --- /dev/null +++ b/ver/pal/undefined_syms.txt @@ -0,0 +1,519 @@ +Entity_ScriptSpring_AnimLaunch = 0x1E4; +Entity_SimpleSpring_AnimLaunch = 0x1E4; +transform_point = 0x800295A0; +dma_copy = 0x800296BC; +rand_int = 0x8002997C; +clamp_angle = 0x80029AA4; +get_clamped_angle_diff = 0x80029BA8; +atan2 = 0x80029C00; +dist2D = 0x80029E54; +add_vec2D_polar = 0x80029F1C; +sin_rad = 0x8002A0EC; +cos_rad = 0x8002A150; +sin_cos_deg = 0x8002A1B4; +sin_deg = 0x8002A26C; +cos_deg = 0x8002A2D0; +update_lerp = 0x8002A334; +general_heap_malloc = 0x8002ABA8; +general_heap_free = 0x8002ABF8; +heap_malloc = 0x8002AC64; +heap_free = 0x8002ACAC; +fio_save_game = 0x8002B41C; +set_curtain_scale_goal = 0x8002C1EC; +set_curtain_draw_callback = 0x8002C214; +get_screen_coords = 0x8002E858; +set_game_mode = 0x80033810; +set_map_change_fade_rate = 0x80035CF0; +get_npc_by_index = 0x80038FCC; +npc_move_heading = 0x8003AF44; +get_npc_unsafe = 0x8003AFDC; +get_npc_safe = 0x8003B038; +disable_npc_shadow = 0x8003B0EC; +enable_npc_blur = 0x8003B214; +set_npc_yaw = 0x8003B830; +npc_set_palswap_mode_A = 0x8003B8C0; +npc_set_palswap_1 = 0x8003B93C; +npc_set_palswap_2 = 0x8003B954; +spawn_surface_effects = 0x8003DB50; +spawn_surface_effects = 0x8003DB50; +kill_enemy = 0x8003EC9C; +get_enemy = 0x8003F1D8; +get_enemy_safe = 0x8003F258; +SetEncounterStatusFlags = 0x80044670; +IsStartingConversation = 0x800446E0; +MakeNpcs = 0x80044788; +RemoveNpc = 0x80044830; +RemoveEncounter = 0x80044968; +GetBattleOutcome = 0x80044A6C; +func_800445D4 = 0x80044AC4; +GetOwnerEncounterTrigger = 0x80044AF0; +DoNpcDefeat = 0x80044B1C; +StartBattle = 0x80044D30; +StartBattleWith = 0x80044D50; +StartBossBattle = 0x80044D8C; +BindNpcAI = 0x80044F68; +BindNpcIdle = 0x8004509C; +RestartNpcAI = 0x8004511C; +EnableNpcAI = 0x800451E0; +SetNpcAux = 0x80045294; +BindNpcAux = 0x800453A8; +BindNpcInteract = 0x80045594; +BindNpcHit = 0x80045630; +BindNpcDefeat = 0x800456CC; +SetSelfVar = 0x8004574C; +GetSelfVar = 0x800457B0; +SetNpcVar = 0x80045810; +GetNpcVar = 0x800458AC; +SetSelfEnemyFlagBits = 0x80045A14; +SelfEnemyOverrideSyncPos = 0x80045A70; +GetSelfNpcID = 0x80045B04; +ClearDefeatedEnemies = 0x80045B30; +SetEnemyFlagBits = 0x80045B78; +SetTattleMessage = 0x80045F48; +is_point_within_region = 0x800495B4; +basic_ai_check_player_dist = 0x80049694; +ai_enemy_play_sound = 0x80049AA0; +basic_ai_wander_init = 0x80049B80; +basic_ai_wander = 0x80049C98; +basic_ai_loiter_init = 0x8004A124; +basic_ai_loiter = 0x8004A1E4; +BasicAI_Main = 0x8004AA5C; +basic_ai_suspend = 0x8004AD1C; +snd_start_sound = 0x800557C0; +snd_ambient_stop_slow = 0x80055AC8; +snd_ambient_pause = 0x80055B1C; +snd_ambient_resume = 0x80055B70; +snd_ambient_set_volume = 0x80055C4C; +remove_effect = 0x8005AA30; +get_current_map_settings = 0x8005B308; +get_map_IDs_by_name = 0x8005B318; +load_asset_by_name = 0x8005B408; +get_collider_center = 0x8005C530; +npc_follow_init = 0x8005E5EC; +npc_update_npc_tracking = 0x8005E6F4; +npc_follow_npc = 0x8005E84C; +osVirtualToPhysical = 0x80062D00; +sqrtf = 0x80062D60; +guLookAtHiliteF = 0x80063730; +sprintf = 0x80066360; +guMtxIdentF = 0x80068320; +guMtxF2L = 0x80068380; +guMtxCatF = 0x80068480; +guScaleF = 0x80068640; +guTranslateF = 0x80068780; +guRotateF = 0x800689A0; +decode_yay0 = 0x8006FD90; +gGameStatusPtr = 0x800714AC; +gMatrixListPos = 0x80071500; +gCurrentCameraID = 0x80073730; +EnemyNpcHit = 0x80074310; +EnemyNpcDefeat = 0x8007443C; +HES_Item_Unused_08B = 0x8007E698; +HES_Item_Unused_08B_disabled = 0x8007E6C8; +HES_Item_Unused_08C = 0x8007E6F8; +HES_Item_Unused_08C_disabled = 0x8007E728; +gItemTable = 0x80083C80; +gItemHudScripts = 0x80086A20; +gItemIconRasterOffsets = 0x8008A778; +gItemIconPaletteOffsets = 0x8008ACEC; +D_8008EEC0 = 0x8008B260; +gPartnerPopupProperties = 0x8008B2C0; +gMoveTable = 0x8008B400; +nuGfxZBuffer = 0x800969B0; +gCurrentCamID = 0x80096A0C; +nuGfxCfb_ptr = 0x80096A24; +gOverrideFlags = 0x80096A28; +gMainGfxPos = 0x80096A44; +gDisplayContext = 0x80096A4C; +gCurrentEncounter = 0x800AF5E0; +gCameras = 0x800B0460; +wMapHitName = 0x800D5938; +wMapShapeName = 0x800D5988; +wMapBgName = 0x800D5DD8; +npc_raycast_down_around = 0x800D8EE8; +npc_raycast_down_sides = 0x800D92EC; +npc_test_move_simple_with_slipping = 0x800DA3B4; +get_xz_dist_to_player = 0x800DC7F8; +get_player_data = 0x800E3CD4; +get_item_count = 0x800E3D5C; +get_item_empty_count = 0x800E3D90; +enforce_hpfp_limits = 0x800E3FDC; +hide_coin_counter_immediately = 0x800E5F20; +ShowCoinCounter = 0x800E5F50; +open_status_menu_long = 0x800E5FB8; +close_status_menu = 0x800E6010; +status_menu_ignore_changes = 0x800E60EC; +status_menu_respond_to_changes = 0x800E611C; +sync_status_menu = 0x800E63C4; +set_max_SP = 0x800E6A30; +switch_to_partner = 0x800E79B8; +func_800EB2A4 = 0x800E7AF4; +partner_suspend_ability_script = 0x800E8068; +partner_resume_ability_script = 0x800E80B0; +func_800EF300 = 0x800EBB50; +partner_set_tether_distance = 0x800EBBE4; +partner_reset_tether_distance = 0x800EBBF4; +partner_set_goal_pos = 0x800EBC10; +func_800EF3D4 = 0x800EBC24; +partner_clear_player_tracking = 0x800EBCAC; +hide_popup_menu = 0x800EDC00; +destroy_popup_menu = 0x800EDD88; +create_standard_popup_menu = 0x800F1270; +draw_box = 0x800F1710; +gPlayerStatusPtr = 0x800F3F60; +wPartnerHudScripts = 0x800F4330; +wDisabledPartnerHudScripts = 0x800F4370; +wPartnerNpc = 0x8010B420; +NpcHitQueryColliderID = 0x8010B468; +gPartnerActionStatus = 0x8010D6B0; +gPlayerStatus = 0x8010DAC8; +gPlayerData = 0x8010DD90; +exec_entity_commandlist = 0x8010E868; +get_entity_by_index = 0x8010F0E8; +get_shadow_by_index = 0x8010F104; +MakeEntity = 0x80110838; +SetEntityCullMode = 0x8011099C; +UseDynamicShadow = 0x80110A2C; +AssignScript = 0x80110AB0; +AssignSwitchFlag = 0x80110AF8; +AssignBlockFlag = 0x80110B6C; +AssignChestFlag = 0x80110BB8; +AssignPanelFlag = 0x80110C14; +create_shadow_type = 0x80110D60; +entity_raycast_down = 0x801110E8; +set_standard_shadow_scale = 0x8011135C; +get_model_from_list_index = 0x80119830; +get_model_list_index_from_tree_index = 0x80119B10; +func_8011B950 = 0x8011A450; +enable_world_fog = 0x8011A650; +set_world_fog_dist = 0x8011A674; +set_world_fog_color = 0x8011A688; +set_main_pan_u = 0x8011A71C; +set_main_pan_v = 0x8011A734; +set_aux_pan_u = 0x8011A74C; +set_aux_pan_v = 0x8011A764; +set_mdl_custom_gfx_set = 0x8011A77C; +set_background_color_blend = 0x8011A95C; +get_background_color_blend = 0x8011A980; +set_model_fog_color_parameters = 0x8011A9B4; +set_model_env_color_parameters = 0x8011AA98; +get_model_env_color_parameters = 0x8011AAD4; +mdl_get_copied_vertices = 0x8011ADB0; +mdl_get_copied_gfx = 0x8011ADEC; +mdl_draw_hidden_panel_surface = 0x8011C22C; +mdl_set_all_fog_mode = 0x8011C32C; +queue_render_task = 0x8011C410; +play_model_animation = 0x8011EC48; +create_worker_world = 0x80121C58; +create_worker_frontUI = 0x80121D3C; +free_worker = 0x801220C0; +set_message_images = 0x8012464C; +set_message_msg = 0x8012465C; +get_msg_width = 0x80124F94; +draw_msg = 0x8012500C; +draw_number = 0x801261BC; +msg_draw_frame = 0x8012C6F8; +draw_ci_image_with_clipping = 0x8012D540; +get_item_entity = 0x8012FAF8; +set_item_entity_flags = 0x80132CE8; +clear_item_entity_flags = 0x80132D28; +set_item_entity_position = 0x80132DAC; +set_screen_overlay_params_front = 0x80136928; +set_screen_overlay_params_back = 0x80136944; +set_screen_overlay_color = 0x801369B0; +set_screen_overlay_center = 0x801369EC; +set_screen_overlay_center_worldpos = 0x80136A60; +set_screen_overlay_alpha = 0x80136C74; +set_map_transition_effect = 0x80136E40; +update_exit_map_screen_overlay = 0x80136E4C; +func_8013A704 = 0x801392A4; +func_8013A854 = 0x801393F4; +fold_update = 0x8013963C; +fold_appendGfx_component = 0x80139B10; +set_global_byte = 0x801440D0; +get_global_byte = 0x801440E8; +sfx_adjust_env_sound_pos = 0x8014859C; +sfx_play_sound = 0x80148864; +sfx_play_sound_at_position = 0x8014890C; +bgm_adjust_proximity = 0x80149604; +bgm_set_track_volumes = 0x801496BC; +bgm_clear_track_volumes = 0x80149710; +func_8014AD40 = 0x801498F0; +MessagePlural = 0x8014AE40; +MessagePlural_de = 0x8014AE44; +MessageSingular = 0x8014AE48; +gBackgroundFogModePtr = 0x8014FEC0; +gEntityHideMode = 0x8014FEE0; +gCollisionStatus = 0x80159110; +gBackgroundImage = 0x80200000; +MakeShop = 0x80281878; +MakeShopOwner = 0x80281BF0; +CreateMapRoom = 0x80281CBC; +CreatePushBlockGrid = 0x802832F0; +SetPushBlock = 0x8028348C; +ItemShopInteract = 0x80284064; +EnterWalk = 0x80285970; +EnterPostPipe = 0x80285C60; +EnterSavePoint = 0x80285CC0; +ExitWalk = 0x80285D04; +ExitDoubleDoor = 0x80285E5C; +EnterDoubleDoor = 0x80285E84; +BaseExitDoor = 0x80285EFC; +Entity_Padlock = 0x802BCD68; +Entity_BoardedFloor = 0x802BCE84; +Entity_BombableRock = 0x802BCF00; +does_script_exist = 0x802C7164; +evt_get_variable = 0x802CAABC; +evt_set_variable = 0x802CB098; +evt_get_float_variable = 0x802CB42C; +evt_set_float_variable = 0x802CB640; +TranslateModel = 0x802CBB60; +RotateModel = 0x802CBC64; +ScaleModel = 0x802CBD88; +CloneModel = 0x802CBF28; +GetModelCenter = 0x802CBF80; +SetTexPanner = 0x802CC000; +SetModelCustomGfx = 0x802CC0FC; +SetModelTexVariant = 0x802CC1A4; +EnableTexPanning = 0x802CC208; +EnableModel = 0x802CC288; +SetGroupVisibility = 0x802CC308; +SetTexPanOffset = 0x802CC364; +SetCustomGfxBuilders = 0x802CC4A0; +SetModelFlags = 0x802CC518; +TranslateGroup = 0x802CC7B4; +RotateGroup = 0x802CC8D8; +ScaleGroup = 0x802CCA1C; +EnableGroup = 0x802CCB98; +MakeLocalVertexCopy = 0x802CCC70; +ModifyColliderFlags = 0x802CCDCC; +ResetFromLava = 0x802CCED8; +ParentColliderToModel = 0x802CD114; +UpdateColliderTransform = 0x802CD188; +GotoMap = 0x802CD400; +GotoMapSpecial = 0x802CD420; +GetEntryID = 0x802CD460; +GetLoadType = 0x802CD4C0; +SetRenderMode = 0x802CD4F4; +PlaySoundAtModel = 0x802CD558; +PlaySoundAtCollider = 0x802CD614; +SetCamEnabled = 0x802CD6C0; +SetCamPerspective = 0x802CD828; +func_802CA988 = 0x802CD988; +SetCamBGColor = 0x802CDD98; +SetCamTarget = 0x802CDF2C; +InterpCamTargetPos = 0x802CE008; +ShakeCam = 0x802CE2A8; +SetCamLeadPlayer = 0x802CE680; +PanToTarget = 0x802CE79C; +UseSettingsFrom = 0x802CE860; +SetCamType = 0x802CEAB4; +SetCamPitch = 0x802CEB48; +SetCamDistance = 0x802CEBE4; +SetCamPosA = 0x802CEC58; +SetCamPosB = 0x802CECF4; +SetCamPosC = 0x802CED90; +SetPanTarget = 0x802CEE2C; +SetCamSpeed = 0x802CEEF0; +GetCamType = 0x802CEF64; +GetCamPitch = 0x802CEFF4; +GetCamDistance = 0x802CF084; +GetCamPosition = 0x802CF2A4; +WaitForCam = 0x802CF354; +SetCamProperties = 0x802CF3EC; +AdjustCam = 0x802CF660; +ResetCam = 0x802CF8C8; +InitAnimatedModels = 0x802CFCB0; +LoadAnimatedModel = 0x802CFCEC; +PlayModelAnimation = 0x802CFE6C; +SetAnimatedModelRootPosition = 0x802CFFE4; +SetAnimatedModelRenderMode = 0x802D0348; +DeleteAnimatedModel = 0x802D03C0; +SetAnimatorFlags = 0x802D0418; +GetAnimatedPositionByTreeIndex = 0x802D07D8; +GetAnimatedRotationByTreeIndex = 0x802D08F8; +resolve_npc = 0x802D0AC0; +GetNpcPointer = 0x802D0C58; +SetNpcPos = 0x802D0CB0; +SetNpcRotation = 0x802D0DB0; +SetNpcRotationPivot = 0x802D0E68; +SetNpcScale = 0x802D0ED4; +SetNpcCollisionSize = 0x802D0F8C; +SetNpcSpeed = 0x802D101C; +SetNpcJumpscale = 0x802D1088; +SetNpcAnimation = 0x802D10F4; +GetNpcAnimation = 0x802D1160; +NpcMoveTo = 0x802D122C; +NpcJump0 = 0x802D16C4; +NpcJump1 = 0x802D16E0; +NpcFlyTo = 0x802D16FC; +GetNpcYaw = 0x802D1A10; +SetNpcYaw = 0x802D1A84; +InterpNpcYaw = 0x802D1B04; +NpcFacePlayer = 0x802D1CC8; +NpcFaceNpc = 0x802D1E80; +SetNpcFlagBits = 0x802D2060; +GetNpcPos = 0x802D20F4; +SetNpcSprite = 0x802D2208; +EnableNpcShadow = 0x802D2268; +EnableNpcBlur = 0x802D22EC; +ClearPartnerMoveHistory = 0x802D2370; +DisablePartnerAI = 0x802D24E8; +EnablePartnerAI = 0x802D252C; +func_802CF56C = 0x802D256C; +BringPartnerOut = 0x802D25B8; +PutPartnerAway = 0x802D2988; +GetCurrentPartnerID = 0x802D2C74; +PartnerCanUseAbility = 0x802D2CA0; +func_802CFD30 = 0x802D2D30; +func_802CFE2C = 0x802D2E2C; +PlaySoundAtNpc = 0x802D31AC; +SpeakToPlayer = 0x802D32B0; +EndSpeech = 0x802D32CC; +ContinueSpeech = 0x802D32E8; +SpeakToNpc = 0x802D3304; +ShowMessageAtScreenPos = 0x802D3894; +CloseMessage = 0x802D3A98; +ShowChoice = 0x802D3B6C; +CloseChoice = 0x802D3BF8; +SetMessageText = 0x802D3CEC; +SetMessageValue = 0x802D3D44; +HidePlayerShadow = 0x802D3DA0; +DisablePlayerPhysics = 0x802D3DE4; +DisablePlayerInput = 0x802D3E28; +SetPlayerPos = 0x802D3EF0; +SetPlayerSpeed = 0x802D4024; +SetPlayerJumpscale = 0x802D4054; +SetPlayerAnimation = 0x802D4084; +SetPlayerActionState = 0x802D40D8; +PlayerMoveTo = 0x802D4134; +func_802D1270 = 0x802D4270; +PlayerJump = 0x802D48E8; +PlayerJump1 = 0x802D4904; +InterpPlayerYaw = 0x802D493C; +PlayerFaceNpc = 0x802D4B04; +GetPlayerTargetYaw = 0x802D4D28; +SetPlayerFlagBits = 0x802D4D60; +GetPlayerActionState = 0x802D4DD0; +GetPlayerPos = 0x802D4DFC; +FullyRestoreHPandFP = 0x802D4EC0; +FullyRestoreSP = 0x802D4EE0; +UseExitHeading = 0x802D516C; +IsPlayerOnValidFloor = 0x802D549C; +WaitForPlayerMoveToComplete = 0x802D54F4; +WaitForPlayerInputEnabled = 0x802D5508; +func_802D2520 = 0x802D5520; +func_802D286C = 0x802D586C; +FacePlayerTowardPoint = 0x802D5884; +GetPartnerInUse = 0x802D5B0C; +InterruptUsePartner = 0x802D5B6C; +func_802D2C14 = 0x802D5C14; +PlaySoundAtPlayer = 0x802D5CD8; +MakeLerp = 0x802D75B0; +UpdateLerp = 0x802D762C; +RandInt = 0x802D76B0; +GetAngleBetweenNPCs = 0x802D7708; +GetAngleToNPC = 0x802D77B4; +GetAngleToPlayer = 0x802D7830; +AwaitPlayerApproach = 0x802D78AC; +AwaitPlayerLeave = 0x802D7A5C; +AddVectorPolar = 0x802D7B14; +func_802D4D14 = 0x802D7D14; +func_802D4D88 = 0x802D7D88; +LoadPath = 0x802D8430; +GetNextPathPos = 0x802D8524; +SetTimeFreezeMode = 0x802D8830; +ModifyGlobalOverrideFlags = 0x802D885C; +SetValueByRef = 0x802D88E0; +GetValueByRef = 0x802D893C; +EnableStatusMenu = 0x802D8998; +GetLanguage = 0x802D8B04; +FadeOutMusic = 0x802D8D00; +SetMusicTrack = 0x802D8D6C; +FadeInMusic = 0x802D8E14; +EnableMusicProximityMix = 0x802D8F00; +AdjustMusicProximityMix = 0x802D8F48; +PopSong = 0x802D8FF8; +PushSong = 0x802D9018; +ClearAmbientSounds = 0x802D9108; +PlayAmbientSounds = 0x802D913C; +PlaySound = 0x802D9170; +PlaySoundWithVolume = 0x802D919C; +PlaySoundAt = 0x802D91FC; +StopSound = 0x802D92D8; +func_802D62E4 = 0x802D9304; +UseDoorSounds = 0x802D9334; +UseRoomDoorSounds = 0x802D9360; +PlaySoundAtF = 0x802D938C; +ShowKeyChoicePopup = 0x802D9440; +ShowConsumableChoicePopup = 0x802D965C; +RemoveKeyItemAt = 0x802D9878; +RemoveItemAt = 0x802D98AC; +AddKeyItem = 0x802D98E8; +CloseChoicePopup = 0x802D9974; +HasKeyItem = 0x802D99BC; +FindKeyItem = 0x802D9A34; +AddItem = 0x802D9AB8; +RemoveItem = 0x802D9BBC; +MakeItemEntity = 0x802D9CE0; +DropItemEntity = 0x802D9DE0; +DropResizableItemEntity = 0x802D9EE0; +RemoveItemEntity = 0x802D9FEC; +AddBadge = 0x802DA018; +SetItemPos = 0x802DA0F0; +AddCoin = 0x802DA298; +AddStarPieces = 0x802DA310; +ShowGotItem = 0x802DA3C4; +ShowEmote = 0x802DA8C0; +func_802D7B10 = 0x802DAB30; +func_802D7B44 = 0x802DAB64; +ShowSweat = 0x802DAE28; +PlayEffect = 0x802DB2BC; +SetSpriteShading = 0x802DC720; +GetDemoState = 0x802DCAB0; +DemoSetButtons = 0x802DCB54; +DemoJoystickXY = 0x802DCC30; +fx_emote = 0x802DD2C0; +fx_sparkles = 0x802DD320; +fx_lens_flare = 0x802DD680; +fx_rising_bubble = 0x802DD9E0; +fx_radial_shimmer = 0x802DDFE0; +fx_3D = 0x802DE3A0; +fx_quizmo_stage = 0x802DEA00; +fx_quizmo_answer = 0x802DEAC0; +fx_motion_blur_flame = 0x802DEB20; +fx_energy_orb_wave = 0x802DEB80; +fx_quizmo_audience = 0x802DEC40; +fx_misc_particles = 0x802DF780; +fx_chapter_change = 0x802DFA20; +fx_spirit_card = 0x802DFAE0; +fx_lil_oink = 0x802DFB40; +fx_quizmo_assistant = 0x802DFCC0; +fx_sun = 0x802DFD80; +spr_update_player_sprite = 0x802E3D6C; +spr_draw_player_sprite = 0x802E3F20; +spr_get_player_raster_info = 0x802E4324; +entity_upgrade_block_hide_content = 0x802EB990; +Entity_SavePoint = 0x802EFD18; +Entity_RedSwitch = 0x802EFEB0; +Entity_BlueSwitch = 0x802EFED4; +Entity_HugeBlueSwitch = 0x802EFEF8; +Entity_GreenStompSwitch = 0x802EFF1C; +Entity_BrickBlock = 0x802F03C4; +Entity_MulticoinBlock = 0x802F03E8; +Entity_Hammer1Block = 0x802F040C; +Entity_Hammer1Block_WideX = 0x802F0430; +Entity_Hammer2Block = 0x802F049C; +Entity_Hammer3Block = 0x802F052C; +Entity_YellowBlock = 0x802F0864; +Entity_HiddenYellowBlock = 0x802F0888; +Entity_RedBlock = 0x802F08AC; +Entity_HeartBlock = 0x802F0AE0; +Entity_SuperBlock = 0x802F0C10; +Entity_ScriptSpring = 0x802F0D30; +Entity_SimpleSpring = 0x802F0D54; +Entity_HiddenPanel = 0x802F0E04; +Entity_GiantChest = 0x802F110C; +Entity_Chest = 0x802F1130; +Entity_BlueWarpPipe = 0x802F1280; +Entity_Signpost = 0x802F12DC; diff --git a/ver/pal/undefined_syms_auto.txt b/ver/pal/undefined_syms_auto.txt new file mode 100644 index 0000000000..e69de29bb2