diff --git a/include/mapfs/kpa_08_hit.h b/include/mapfs/kpa_08_hit.h index 250e239c9dd..5d15fffcfc2 100644 --- a/include/mapfs/kpa_08_hit.h +++ b/include/mapfs/kpa_08_hit.h @@ -1,3 +1,9 @@ +#if VERSION_JP +#define COLLIDER_o90 0x12 +#define COLLIDER_o19 0x10 +#define COLLIDER_ttw 0x6 +#define COLLIDER_deilie 0x0 +#else #define COLLIDER_Root 0x13 #define COLLIDER_move2 0x12 #define COLLIDER_o90 0x11 @@ -18,6 +24,7 @@ #define COLLIDER_ne 0x2 #define COLLIDER_deilite 0x1 #define COLLIDER_deilie 0x0 +#endif #define ZONE_Root 0x4 #define ZONE_g14 0x3 diff --git a/include/mapfs/kpa_09_hit.h b/include/mapfs/kpa_09_hit.h index 1a7ec6f06b7..48a7360337f 100644 --- a/include/mapfs/kpa_09_hit.h +++ b/include/mapfs/kpa_09_hit.h @@ -1,3 +1,10 @@ +#if VERSION_JP +#define COLLIDER_o106 0x13 +#define COLLIDER_o19 0x11 +#define COLLIDER_tte 0x7 +#define COLLIDER_deilie 0x5 +#define COLLIDER_ttw 0x2 +#else #define COLLIDER_Root 0x14 #define COLLIDER_move2 0x13 #define COLLIDER_o106 0x12 @@ -19,6 +26,7 @@ #define COLLIDER_ttw 0x2 #define COLLIDER_deilitw 0x1 #define COLLIDER_deiliw 0x0 +#endif #define ZONE_Root 0x4 #define ZONE_g14 0x3 diff --git a/include/mapfs/kpa_130_shape.h b/include/mapfs/kpa_130_shape.h index 14781abafc0..80b6964eb81 100644 --- a/include/mapfs/kpa_130_shape.h +++ b/include/mapfs/kpa_130_shape.h @@ -1,3 +1,9 @@ +#if VERSION_JP +#define MODEL_o455 0x13 +#define MODEL_o454 0x11 +#define MODEL_o11 0xF +#define MODEL_o9 0xD +#else #define MODEL_Root 0xB5 #define MODEL_g128 0xB4 #define MODEL_o464 0xB3 @@ -180,4 +186,5 @@ #define MODEL_ew_hisi 0x2 #define MODEL_ew_sai 0x1 #define MODEL_ew_yuka 0x0 +#endif diff --git a/include/mapfs/kpa_41_hit.h b/include/mapfs/kpa_41_hit.h index 3728d025126..fc1270f4cc9 100644 --- a/include/mapfs/kpa_41_hit.h +++ b/include/mapfs/kpa_41_hit.h @@ -1,3 +1,9 @@ +#if VERSION_JP +#define COLLIDER_deili4 0x1C +#define COLLIDER_deili3 0x17 +#define COLLIDER_deilie 0x12 +#define COLLIDER_deiliw 0xD +#else #define COLLIDER_Root 0x1F #define COLLIDER_exit4 0x1E #define COLLIDER_tt4 0x1D @@ -30,6 +36,7 @@ #define COLLIDER_kaidann 0x2 #define COLLIDER_k_sokumen2 0x1 #define COLLIDER_k_sokumen 0x0 +#endif #define ZONE_Root 0x4 #define ZONE_yuka 0x3 diff --git a/include/mapfs/kpa_50_hit.h b/include/mapfs/kpa_50_hit.h index 6d104022aed..4ed61842c8d 100644 --- a/include/mapfs/kpa_50_hit.h +++ b/include/mapfs/kpa_50_hit.h @@ -1,3 +1,8 @@ +#if VERSION_JP +#define COLLIDER_tte 0xF +#define COLLIDER_ttw 0xA +#define COLLIDER_deiliw 0x9 +#else #define COLLIDER_Root 0x11 #define COLLIDER_exit 0x10 #define COLLIDER_e2 0xF @@ -16,6 +21,7 @@ #define COLLIDER_1_isi 0x2 #define COLLIDER_e1_sai 0x1 #define COLLIDER_e2_sai 0x0 +#endif #define ZONE_Root 0x5 #define ZONE_exit 0x4 diff --git a/include/mapfs/kpa_52_hit.h b/include/mapfs/kpa_52_hit.h index 1d98a593318..a96ff9cc490 100644 --- a/include/mapfs/kpa_52_hit.h +++ b/include/mapfs/kpa_52_hit.h @@ -1,3 +1,8 @@ +#if VERSION_JP +#define COLLIDER_tte2 0x1A +#define COLLIDER_ttw 0x15 +#define COLLIDER_tte1 0x10 +#else #define COLLIDER_Root 0x1C #define COLLIDER_exit3 0x1B #define COLLIDER_ne2 0x1A @@ -27,6 +32,7 @@ #define COLLIDER_kaidann 0x2 #define COLLIDER_o159 0x1 #define COLLIDER_o158 0x0 +#endif #define ZONE_Root 0x4 #define ZONE_g9 0x3 diff --git a/src/battle/popup_messages.c b/src/battle/popup_messages.c index 66ba39b9b30..877555e5ad0 100644 --- a/src/battle/popup_messages.c +++ b/src/battle/popup_messages.c @@ -164,8 +164,8 @@ s32 BattleMessages[] = { [BTL_MSG_NO_HAMMER_TARGET] MSG_Menus_Battle_NoTarget_Hammer, [BTL_MSG_NO_ITEM_TARGET] MSG_Menus_Battle_NoTarget_Item, #if VERSION_JP - [BTL_MSG_46] MSG_MENUS_00DB, - [BTL_MSG_47] MSG_MENUS_00DC, + [BTL_MSG_46] MSG_Menus_JP_00DB, + [BTL_MSG_47] MSG_Menus_JP_00DC, #else [BTL_MSG_46] MSG_NONE, [BTL_MSG_47] MSG_NONE, diff --git a/src/world/area_hos/common/FallingStars.inc.c b/src/world/area_hos/common/FallingStars.inc.c index ad9007277e9..d93ecf44009 100644 --- a/src/world/area_hos/common/FallingStars.inc.c +++ b/src/world/area_hos/common/FallingStars.inc.c @@ -126,7 +126,11 @@ EvtScript N(EVS_Starfall_Directed) = { #define LV_Dz LVarC #define LV_Time LVarD #define LV_SoundDelay LVarE +#if VERSION_JP + SetGroup(EVT_GROUP_00) +#else SetGroup(EVT_GROUP_0B) +#endif Set(LV_Time, 0) Set(LV_SoundDelay, 0) Label(0) diff --git a/src/world/area_hos/common/Narrator.inc.c b/src/world/area_hos/common/Narrator.inc.c index 5e05d674028..a8e64e2b3d8 100644 --- a/src/world/area_hos/common/Narrator.inc.c +++ b/src/world/area_hos/common/Narrator.inc.c @@ -86,11 +86,15 @@ void N(UpdateIntroMessages)(IntroMessage** introMessageLists) { if (opacity > 0) { messageID = N(CurMessageList)->messageID; if (messageID != 0) { +#if VERSION_JP + draw_msg(N(CurMessageList)->messageID, 0, 200, opacity, -1, 0); +#else yOffset = 0; if (get_msg_lines(messageID) >= 2) { yOffset = -7; } draw_msg(N(CurMessageList)->messageID, 0, yOffset + 196, opacity, -1, 0); +#endif } } } diff --git a/src/world/area_hos/hos_04/intro.c b/src/world/area_hos/hos_04/intro.c index 89693c069fc..2aa84c103fa 100644 --- a/src/world/area_hos/hos_04/intro.c +++ b/src/world/area_hos/hos_04/intro.c @@ -134,7 +134,11 @@ EvtScript N(EVS_ControlTwink) = { Call(SetNpcAnimation, NPC_Twink, ANIM_Twink_Back) Call(SetNpcYaw, NPC_Twink, 180) Call(N(AnimateBoomLengthPostHeist)) +#if VERSION_JP + Wait(30 * DT) +#else Wait(15 * DT) +#endif Thread Wait(10 * DT) Call(InterpNpcYaw, NPC_Twink, 0, 0) @@ -189,6 +193,9 @@ EvtScript N(EVS_Intro_PreHeist_Unused) = { End }; +// TODO: this has moved to starship.c in JP. This is a possible indication that +// file spitting in other versions might be off. +#if !VERSION_JP #include "world/common/npc/StarSpirit.inc.c" #include "world/common/npc/Twink.h" @@ -212,3 +219,4 @@ NpcGroupList N(DefaultNPCs) = { NPC_GROUP(N(NpcData_Twink)), {} }; +#endif diff --git a/src/world/area_hos/hos_04/main.c b/src/world/area_hos/hos_04/main.c index 9c7dfc61477..6559bd2ac24 100644 --- a/src/world/area_hos/hos_04/main.c +++ b/src/world/area_hos/hos_04/main.c @@ -1,7 +1,21 @@ #include "hos_04.h" EvtScript N(EVS_ExitWalk_hos_03_1) = EVT_EXIT_WALK(60, hos_04_ENTRY_0, "hos_03", hos_03_ENTRY_1); + +#if VERSION_JP +EvtScript N(EVS_ExitWalk_hos_05_0) = { + SetGroup(EVT_GROUP_1B) + Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o162, COLLIDER_FLAGS_UPPER_MASK) + Call(UseExitHeading, 60, hos_04_ENTRY_1) + Exec(ExitWalk) + Call(GotoMap, Ref("hos_05"), hos_05_ENTRY_0) + Wait(100) + Return + End +}; +#else EvtScript N(EVS_ExitWalk_hos_05_0) = EVT_EXIT_WALK(60, hos_04_ENTRY_1, "hos_05", hos_05_ENTRY_0); +#endif EvtScript N(EVS_BindExitTriggers) = { BindTrigger(Ref(N(EVS_ExitWalk_hos_03_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilinw, 1, 0) @@ -17,8 +31,13 @@ EvtScript N(EVS_EnterMap) = { CaseEq(hos_04_ENTRY_0) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitnw, COLLIDER_FLAGS_UPPER_MASK) IfEq(GF_HOS04_Visited, FALSE) +#if VERSION_JP + Call(SetPlayerPos, -630, 0, 0) + Call(SetNpcPos, NPC_PARTNER, -630, 0, 0) +#endif Thread Call(DisablePlayerInput, TRUE) +#if !VERSION_JP Call(SetPlayerPos, -630, 0, 0) Call(GetPartnerInUse, LVar0) IfEq(LVar0, PARTNER_NONE) @@ -27,6 +46,7 @@ EvtScript N(EVS_EnterMap) = { Wait(1) Call(EnablePartnerAI) EndIf +#endif Call(UseSettingsFrom, CAM_DEFAULT, -565, 0, 0) Call(SetPanTarget, CAM_DEFAULT, -565, 0, 0) Call(SetCamDistance, CAM_DEFAULT, 1350) diff --git a/src/world/area_hos/hos_04/narrator.c b/src/world/area_hos/hos_04/narrator.c index 9018ab13982..40dbd82fdba 100644 --- a/src/world/area_hos/hos_04/narrator.c +++ b/src/world/area_hos/hos_04/narrator.c @@ -5,11 +5,51 @@ #if VERSION_PAL #define DURATION_INTRO_MSG (35) #define DURATION_BLANK (73) +#elif VERSION_JP +#define DURATION_INTRO_MSG (50) +#define DURATION_BLANK (95) #else #define DURATION_INTRO_MSG (44) #define DURATION_BLANK (89) #endif +#if VERSION_JP +IntroMessage N(D_80241EFC_A321EC)[] = { + { MSG_Intro_JP_0022, DURATION_INTRO_MSG }, + { MSG_Intro_JP_0023, DURATION_INTRO_MSG }, + { MSG_Intro_JP_0024, DURATION_INTRO_MSG }, + {}, // end of list +}; + +IntroMessage N(D_80241F1C_A3220C)[] = { + { MSG_Intro_JP_0035, DURATION_INTRO_MSG }, + { MSG_Intro_JP_0036, DURATION_INTRO_MSG }, + { MSG_Intro_JP_0037, DURATION_INTRO_MSG }, + {}, // end of list +}; + +IntroMessage N(D_80241F3C_A3222C)[] = { + { MSG_Intro_JP_0048, DURATION_INTRO_MSG }, + { MSG_Intro_JP_0049, DURATION_INTRO_MSG }, + { MSG_Intro_JP_004A, DURATION_INTRO_MSG }, + {}, // end of list +}; + +IntroMessage N(D_80241F5C_A3224C)[] = { + { MSG_Intro_JP_005B, DURATION_INTRO_MSG }, + { MSG_Intro_JP_005C, DURATION_INTRO_MSG }, + { MSG_Intro_JP_005D, DURATION_INTRO_MSG }, + {}, // end of list +}; + +IntroMessage* N(func_80241F7C_A3226C)[] = { + N(D_80241EFC_A321EC), + N(D_80241F1C_A3220C), + N(D_80241F3C_A3222C), + N(D_80241F5C_A3224C) +}; +#endif + IntroMessage N(HeistMessageList)[] = { { INTRO_MSG_BLANK, DURATION_BLANK }, { MSG_Intro_001B, DURATION_INTRO_MSG }, @@ -25,6 +65,12 @@ IntroMessage* N(IntroMessages)[] = { N(HeistMessageList), }; +#if VERSION_JP +void N(func_80240DC8_A310B8)(void) { + N(UpdateIntroMessages)(N(func_80241F7C_A3226C)); +} +#endif + void N(curtain_callback_narration)(void) { N(UpdateIntroMessages)(N(IntroMessages)); } @@ -32,6 +78,10 @@ void N(curtain_callback_narration)(void) { EvtScript N(EVS_SetupNarrator) = { Call(GetEntryID, LVar0) Switch(LVar0) +#if VERSION_JP + CaseEq(hos_04_ENTRY_3) + Call(N(SetCurtainCallback), Ref(N(func_80240DC8_A310B8))) +#endif CaseEq(hos_04_ENTRY_4) Call(N(SetCurtainCallback), Ref(N(curtain_callback_narration))) EndSwitch diff --git a/src/world/area_hos/hos_04/starship.c b/src/world/area_hos/hos_04/starship.c index f09ffd66ab1..ea82d02991a 100644 --- a/src/world/area_hos/hos_04/starship.c +++ b/src/world/area_hos/hos_04/starship.c @@ -20,6 +20,37 @@ API_CALLABLE(N(ScreenOverlayFadeIn)) { } } +// TODO: this was moved from the end of intro.c. This is a possible indication that +// file spitting in other versions might be off. +#if VERSION_JP +#include "world/common/npc/StarSpirit.inc.c" +#include "world/common/npc/Twink.h" + +EvtScript N(EVS_NpcInit_Twink) = { + Return + End +}; + +NpcData N(NpcData_Twink) = { + .id = NPC_Twink, + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .init = &N(EVS_NpcInit_Twink), + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_FLYING, + .drops = NO_DROPS, + .animations = TWINK_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Twink)), + {} +}; + +// TODO: required. File splitting? +u8 N(D_802422CC)[4] = { 0 }; +#endif + EvtScript N(EVS_Starship_FlyingAway) = { Call(DisablePlayerInput, TRUE) Call(DisablePlayerPhysics, TRUE) diff --git a/src/world/area_hos/hos_05/intro.c b/src/world/area_hos/hos_05/intro.c index 20c30fa9301..cd95969e055 100644 --- a/src/world/area_hos/hos_05/intro.c +++ b/src/world/area_hos/hos_05/intro.c @@ -2046,7 +2046,9 @@ EvtScript N(EVS_Scene_IntroStory) = { Call(SetNpcRotation, NPC_Bowser_Body, 0, LVar0, 0) Wait(1) EndLoop +#if !VERSION_JP Call(SetNpcRotation, NPC_Bowser_Body, 0, 0, 0) +#endif Call(InterpNpcYaw, NPC_Bowser_Body, 90, 0) EndThread Thread @@ -2519,7 +2521,11 @@ EvtScript N(EVS_Scene_IntroStory) = { EndThread Wait(10 * DT) Call(N(AnimKammy_FlyOff)) +#if VERSION_JP + Wait(28 * DT) +#else Wait(20 * DT) +#endif Call(N(ResumeIntro)) Return End diff --git a/src/world/area_hos/hos_06/merlow.c b/src/world/area_hos/hos_06/merlow.c index 2eba36b9a4f..180254102e0 100644 --- a/src/world/area_hos/hos_06/merlow.c +++ b/src/world/area_hos/hos_06/merlow.c @@ -196,11 +196,15 @@ EvtScript N(EVS_NpcInteract_Merlow) = { Call(SetMessageText, LVar4, 0) Call(SetMessageValue, LVar1, 1) Call(SetMessageValue, LVar5, 2) +#if VERSION_JP + Call(SpeakToPlayer, NPC_Merlow, ANIM_Merlow_Talk, ANIM_Merlow_Idle, 0, MSG_HOS_0052) +#else IfEq(LVar1, 1) Call(SpeakToPlayer, NPC_Merlow, ANIM_Merlow_Talk, ANIM_Merlow_Idle, 0, MSG_HOS_0053) Else Call(SpeakToPlayer, NPC_Merlow, ANIM_Merlow_Talk, ANIM_Merlow_Idle, 0, MSG_HOS_0052) EndIf +#endif Set(LVar3, LVar0) Call(ShowChoice, MSG_Choice_000D) IfEq(LVar0, 1) diff --git a/src/world/area_hos/hos_10/hos_10.h b/src/world/area_hos/hos_10/hos_10.h index 3210d3d6ebd..07ffac24164 100644 --- a/src/world/area_hos/hos_10/hos_10.h +++ b/src/world/area_hos/hos_10/hos_10.h @@ -37,5 +37,8 @@ extern EvtScript N(EVS_Scene_SpiritsFlyingAway); extern EvtScript N(EVS_Scene_RisingAboveClouds); extern EvtScript N(EVS_Scene_UnusedWhiteScreen); extern EvtScript N(EVS_Scene_PreTitle); +#if VERSION_JP +extern EvtScript N(EVS_SetupNarrator); +#endif extern NpcGroupList N(NpcGroup_Descent); extern NpcGroupList N(NpcGroup_FlyAway); diff --git a/src/world/area_hos/hos_10/main.c b/src/world/area_hos/hos_10/main.c index 39ae22e87de..d1807c0ae90 100644 --- a/src/world/area_hos/hos_10/main.c +++ b/src/world/area_hos/hos_10/main.c @@ -34,6 +34,9 @@ EvtScript N(EVS_Main) = { Wait(30) Exec(N(EVS_Scene_PreTitle)) EndSwitch +#if VERSION_JP + Exec(N(EVS_SetupNarrator)) +#endif Return End }; diff --git a/src/world/area_hos/hos_10/narrator.c b/src/world/area_hos/hos_10/narrator.c new file mode 100644 index 00000000000..6c345d3e318 --- /dev/null +++ b/src/world/area_hos/hos_10/narrator.c @@ -0,0 +1,70 @@ +#include "hos_10.h" + +#include "../common/Narrator.inc.c" + +#define DURATION_INTRO_MSG (50) + +IntroMessage N(D_80244BDC)[] = { + { INTRO_MSG_BLANK, 155 }, + { MSG_Intro_JP_001E, DURATION_INTRO_MSG }, + { MSG_Intro_JP_006A, 5 }, + { MSG_Intro_JP_001F, DURATION_INTRO_MSG }, + { MSG_Intro_JP_006A, 30 }, + { MSG_Intro_JP_0020, DURATION_INTRO_MSG }, + { MSG_Intro_JP_0021, DURATION_INTRO_MSG }, + {}, // end of list +}; + +IntroMessage N(D_80244C1C)[] = { + { MSG_Intro_JP_006A, 155 }, + { MSG_Intro_JP_0031, DURATION_INTRO_MSG }, + { MSG_Intro_JP_006A, 5 }, + { MSG_Intro_JP_0032, DURATION_INTRO_MSG }, + { MSG_Intro_JP_006A, 30 }, + { MSG_Intro_JP_0033, DURATION_INTRO_MSG }, + { MSG_Intro_JP_0034, DURATION_INTRO_MSG }, + {}, // end of list +}; + +IntroMessage N(D_80244C5C)[] = { + { MSG_Intro_JP_006A, 155 }, + { MSG_Intro_JP_0044, DURATION_INTRO_MSG }, + { MSG_Intro_JP_006A, 5 }, + { MSG_Intro_JP_0045, DURATION_INTRO_MSG }, + { MSG_Intro_JP_006A, 30 }, + { MSG_Intro_JP_0046, DURATION_INTRO_MSG }, + { MSG_Intro_JP_0047, DURATION_INTRO_MSG }, + {}, // end of list +}; + +IntroMessage N(D_80244C9C)[] = { + { MSG_Intro_JP_006A, 155 }, + { MSG_Intro_JP_0057, DURATION_INTRO_MSG }, + { MSG_Intro_JP_006A, 5 }, + { MSG_Intro_JP_0058, DURATION_INTRO_MSG }, + { MSG_Intro_JP_006A, 30 }, + { MSG_Intro_JP_0059, DURATION_INTRO_MSG }, + { MSG_Intro_JP_005A, DURATION_INTRO_MSG }, + {}, // end of list +}; + +IntroMessage* N(IntroMessages)[] = { + N(D_80244BDC), + N(D_80244C1C), + N(D_80244C5C), + N(D_80244C9C) +}; + +void N(func_80240DEC)(void) { + N(UpdateIntroMessages)(N(IntroMessages)); +} + +EvtScript N(EVS_SetupNarrator) = { + Call(GetEntryID, LVar0) + Switch(LVar0) + CaseEq(hos_10_ENTRY_3) + Call(N(SetCurtainCallback), Ref(N(func_80240DEC))) + EndSwitch + Return + End +}; diff --git a/src/world/common/todo/UnkScriptJP00.inc.c b/src/world/area_iwa/common/UnkScriptJP00.inc.c similarity index 97% rename from src/world/common/todo/UnkScriptJP00.inc.c rename to src/world/area_iwa/common/UnkScriptJP00.inc.c index 1f704a391eb..ff40e727f96 100644 --- a/src/world/common/todo/UnkScriptJP00.inc.c +++ b/src/world/area_iwa/common/UnkScriptJP00.inc.c @@ -48,7 +48,7 @@ EvtScript N(EVS_UnkJP00) = { End }; -EvtScript N(EVS_UnkJP01) = { +EvtScript N(EVS_Chest_ShowGotItem) = { SetGroup(EVT_GROUP_00) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Wait(40) diff --git a/src/world/area_iwa/iwa_00/npc.c b/src/world/area_iwa/iwa_00/npc.c index 78bd5d71fd4..46db5d8a91b 100644 --- a/src/world/area_iwa/iwa_00/npc.c +++ b/src/world/area_iwa/iwa_00/npc.c @@ -9,7 +9,7 @@ #if VERSION_JP #include "world/common/todo/SomeItemEntityFunc.inc.c" #include "world/common/todo/IsItemBadge.inc.c" -#include "world/common/todo/UnkScriptJP00.inc.c" +#include "world/area_iwa/common/UnkScriptJP00.inc.c" #endif API_CALLABLE(N(func_80240118_90CD58)) { diff --git a/src/world/area_iwa/iwa_02/npc.c b/src/world/area_iwa/iwa_02/npc.c index f16fea0bed4..eac9f14b09d 100644 --- a/src/world/area_iwa/iwa_02/npc.c +++ b/src/world/area_iwa/iwa_02/npc.c @@ -9,7 +9,7 @@ #if VERSION_JP #include "world/common/todo/SomeItemEntityFunc.inc.c" #include "world/common/todo/IsItemBadge.inc.c" -#include "world/common/todo/UnkScriptJP00.inc.c" +#include "world/area_iwa/common/UnkScriptJP00.inc.c" #endif NpcData N(NpcData_Cleft_01) = { diff --git a/src/world/area_iwa/iwa_10/npc.c b/src/world/area_iwa/iwa_10/npc.c index e46b7829e21..1b4b3d4567e 100644 --- a/src/world/area_iwa/iwa_10/npc.c +++ b/src/world/area_iwa/iwa_10/npc.c @@ -8,7 +8,7 @@ #if VERSION_JP #include "world/common/todo/SomeItemEntityFunc.inc.c" #include "world/common/todo/IsItemBadge.inc.c" -#include "world/common/todo/UnkScriptJP00.inc.c" +#include "world/area_iwa/common/UnkScriptJP00.inc.c" #endif EvtScript N(EVS_NpcInteract_TrainToad_01) = { diff --git a/src/world/area_jan/jan_03/npc.c b/src/world/area_jan/jan_03/npc.c index ea3c19fe45a..7a1bddb244d 100644 --- a/src/world/area_jan/jan_03/npc.c +++ b/src/world/area_jan/jan_03/npc.c @@ -377,7 +377,11 @@ EvtScript N(EVS_NpcInteract_Yoshi_03) = { EvtScript N(EVS_NpcIdle_Yoshi_03) = { Loop(0) +#if VERSION_JP + Call(NpcMoveTo, NPC_SELF, -100, -80, 50) +#else Call(NpcMoveTo, NPC_SELF, -105, -20, 50) +#endif Call(NpcMoveTo, NPC_SELF, -190, -80, 50) EndLoop Return @@ -548,7 +552,11 @@ EvtScript N(EVS_NpcInit_YoshiKid_04) = { Call(RemoveNpc, NPC_SELF) Return Else +#if VERSION_JP + Call(SetNpcPos, NPC_SELF, -120, 0, -110) +#else Call(SetNpcPos, NPC_SELF, -135, 0, -70) +#endif Call(InterpNpcYaw, NPC_SELF, 270, 0) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_YoshiKid_04))) EndIf @@ -1048,6 +1056,9 @@ NpcData N(NpcData_Ravens)[] = { .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = RAVEN_ANIMS, +#if VERSION_JP + .tattle = MSG_NpcTattle_0121, +#endif }, { .id = NPC_Raven_03, diff --git a/src/world/area_jan/jan_04/scenes.c b/src/world/area_jan/jan_04/scenes.c index 34657d24397..d80ffa6a900 100644 --- a/src/world/area_jan/jan_04/scenes.c +++ b/src/world/area_jan/jan_04/scenes.c @@ -83,10 +83,15 @@ EvtScript N(EVS_Scene_Epilogue) = { Call(SetNpcAnimation, NPC_YoshiKid_01, ANIM_YoshiKid_Green_Talk) Call(SetNpcFlagBits, NPC_YoshiKid_03, NPC_FLAG_GRAVITY, TRUE) Call(SetNpcPos, NPC_YoshiKid_03, -350, 0, 15) +#if VERSION_JP + Call(SetNpcSpeed, NPC_YoshiKid_03, Float(3.0)) + Call(NpcMoveTo, NPC_YoshiKid_03, -100, 0, 15) +#else Call(SetNpcAnimation, NPC_YoshiKid_03, ANIM_YoshiKid_Blue_Run) Call(SetNpcSpeed, NPC_YoshiKid_03, Float(5.0)) Call(NpcMoveTo, NPC_YoshiKid_03, -100, 0, 0) Call(SetNpcAnimation, NPC_YoshiKid_03, ANIM_YoshiKid_Blue_Idle) +#endif ChildThread Wait(20) Call(SetNpcJumpscale, NPC_YoshiKid_03, Float(2.0)) diff --git a/src/world/area_jan/jan_07/npc.c b/src/world/area_jan/jan_07/npc.c index 247c7a2b4e1..9951e3d15f0 100644 --- a/src/world/area_jan/jan_07/npc.c +++ b/src/world/area_jan/jan_07/npc.c @@ -147,7 +147,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { #if VERSION_PAL Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 1) Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, 1) -#else +#elif VERSION_US || VERSION_IQUE ChildThread Loop(0) Call(GetPlayerPos, LVar0, LVar1, LVar2) diff --git a/src/world/area_jan/jan_16/npc.c b/src/world/area_jan/jan_16/npc.c index ca1d0905df1..fdd613b9132 100644 --- a/src/world/area_jan/jan_16/npc.c +++ b/src/world/area_jan/jan_16/npc.c @@ -305,7 +305,11 @@ NpcData N(NpcData_RaphaelRaven)[] = { .anim_E = ANIM_Raven_Idle, .anim_F = ANIM_Raven_Idle, }, +#if VERSION_JP + .tattle = MSG_NpcTattle_0121, +#else .tattle = MSG_NpcTattle_RavenB, +#endif }, { .id = NPC_Raven_03, diff --git a/src/world/area_jan/jan_22/npc.c b/src/world/area_jan/jan_22/npc.c index df1acf7b24b..a1ba4fa7578 100644 --- a/src/world/area_jan/jan_22/npc.c +++ b/src/world/area_jan/jan_22/npc.c @@ -1525,6 +1525,9 @@ NpcData N(NpcData_RaphaelRaven)[] = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, +#if VERSION_JP + .tattle = MSG_NpcTattle_0121, +#endif }, { .id = NPC_Raven_03, diff --git a/src/world/area_jan/jan_23/npc.c b/src/world/area_jan/jan_23/npc.c index 90a6f8afd5c..aa79380e6bc 100644 --- a/src/world/area_jan/jan_23/npc.c +++ b/src/world/area_jan/jan_23/npc.c @@ -621,6 +621,9 @@ NpcData N(NpcData_Ravens)[] = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, +#if VERSION_JP + .tattle = MSG_NpcTattle_0121, +#endif }, { .id = NPC_Raven_03, diff --git a/src/world/area_kkj/kkj_13/npcs_finale.c b/src/world/area_kkj/kkj_13/npcs_finale.c index 0da8b71604e..8b8fd177918 100644 --- a/src/world/area_kkj/kkj_13/npcs_finale.c +++ b/src/world/area_kkj/kkj_13/npcs_finale.c @@ -142,6 +142,9 @@ EvtScript N(EVS_Scene_MarioConfrontsBowser) = { Call(SetNpcVar, NPC_Bowser_Body, 0, 1) Wait(10) Thread +#if VERSION_JP + Call(DisablePartnerAI, 0) +#endif Call(PlayerMoveTo, 580, 0, 25) EndThread Thread @@ -244,6 +247,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { Call(DisablePartnerAI, 1) Call(EnableGroup, MODEL_g153, FALSE) Call(SetPlayerPos, 525, 0, 0) +#if !VERSION_JP Call(PartnerIsFlying, LVar0) IfEq(LVar0, FALSE) Set(LVar1, 10) @@ -252,6 +256,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EndIf Call(SetNpcPos, NPC_PARTNER, 490, LVar1, 0) Call(SetNpcYaw, NPC_PARTNER, 90) +#endif Call(SetNpcPos, NPC_Bowser_Body, 675, 0, 0) Call(AdjustCam, CAM_DEFAULT, Float(90.0), 75, 450, Float(17.0), Float(-7.0)) Call(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Tantrum) diff --git a/src/world/area_kkj/kkj_19/main.c b/src/world/area_kkj/kkj_19/main.c index 08bc8ca59d1..cf88129a90d 100644 --- a/src/world/area_kkj/kkj_19/main.c +++ b/src/world/area_kkj/kkj_19/main.c @@ -125,8 +125,13 @@ MenuWindowBP N(IngredientWindows)[] = { }, { .windowID = WINDOW_ID_ITEM_INFO_DESC, +#if VERSION_JP + .pos = { 39, 184 }, + .width = 242, +#else .pos = { 32, 184 }, .width = 256, +#endif .height = 32, .priority = WINDOW_PRIORITY_0, .fpDrawContents = &N(draw_content_ingredient_desc), diff --git a/src/world/area_kkj/kkj_25/main.c b/src/world/area_kkj/kkj_25/main.c index 4f5f0ee8c32..fbe79efedb7 100644 --- a/src/world/area_kkj/kkj_25/main.c +++ b/src/world/area_kkj/kkj_25/main.c @@ -15,6 +15,9 @@ EvtScript N(EVS_EnterMap) = { IfEq(GF_KKJ25_Visited, FALSE) Call(DisablePlayerInput, TRUE) Call(SetPlayerPos, -645, 0, 0) +#if VERSION_JP + Call(SetNpcPos, NPC_PARTNER, -645, 0, 0) +#else Call(GetPartnerInUse, LVar0) IfEq(LVar0, 0) Call(DisablePartnerAI, 0) @@ -22,6 +25,7 @@ EvtScript N(EVS_EnterMap) = { Wait(1) Call(EnablePartnerAI) EndIf +#endif Wait(150) Call(PlaySoundAtCollider, COLLIDER_ttw, SOUND_LARGE_DOOR_OPEN, 0) Call(MakeLerp, 0, 80, 10, EASING_LINEAR) @@ -35,6 +39,9 @@ EvtScript N(EVS_EnterMap) = { EndIf EndLoop Call(SetPlayerPos, -605, 0, 0) +#if VERSION_JP + Call(SetNpcPos, NPC_PARTNER, -605, 0, 0) +#endif Call(DisablePlayerInput, FALSE) Call(SetZoneEnabled, ZONE_o15, FALSE) Call(ResetCam, CAM_DEFAULT, Float(90.0)) diff --git a/src/world/area_kkj/kkj_27/settings.c b/src/world/area_kkj/kkj_27/settings.c index fde26c3296f..369fff5a8c6 100644 --- a/src/world/area_kkj/kkj_27/settings.c +++ b/src/world/area_kkj/kkj_27/settings.c @@ -9,4 +9,7 @@ MapSettings N(settings) = { .main = &N(EVS_Main), .entryList = &N(Entrances), .entryCount = ENTRY_COUNT(N(Entrances)), +#if VERSION_JP + .tattle = { MSG_MapTattle_018A }, +#endif }; diff --git a/src/world/area_kkj/kkj_28/settings.c b/src/world/area_kkj/kkj_28/settings.c index fb9959282ad..d98b2c8d418 100644 --- a/src/world/area_kkj/kkj_28/settings.c +++ b/src/world/area_kkj/kkj_28/settings.c @@ -8,4 +8,7 @@ MapSettings N(settings) = { .main = &N(EVS_Main), .entryList = &N(Entrances), .entryCount = ENTRY_COUNT(N(Entrances)), +#if VERSION_JP + .tattle = { MSG_MapTattle_018B }, +#endif }; diff --git a/src/world/area_kkj/kkj_29/settings.c b/src/world/area_kkj/kkj_29/settings.c index 2083a778b47..ef14a9f8b2e 100644 --- a/src/world/area_kkj/kkj_29/settings.c +++ b/src/world/area_kkj/kkj_29/settings.c @@ -8,4 +8,7 @@ MapSettings N(settings) = { .main = &N(EVS_Main), .entryList = &N(Entrances), .entryCount = ENTRY_COUNT(N(Entrances)), +#if VERSION_JP + .tattle = { MSG_MapTattle_018B }, +#endif }; diff --git a/src/world/area_kpa/kpa_04/statues.c b/src/world/area_kpa/kpa_04/statues.c index 735aa318398..aeabbee8495 100644 --- a/src/world/area_kpa/kpa_04/statues.c +++ b/src/world/area_kpa/kpa_04/statues.c @@ -5,11 +5,13 @@ EvtScript N(EVS_PushStatue_Impl) = { Loop(20) +#if !VERSION_JP Call(GetPartnerInUse, LVarA) IfNe(LVarA, 0) Set(LVar9, 0) Return EndIf +#endif Call(N(UnkFunc11), 25) IfEq(LVar0, 0) Set(LVar9, 0) @@ -19,11 +21,13 @@ EvtScript N(EVS_PushStatue_Impl) = { EndIf Wait(1) EndLoop +#if !VERSION_JP Call(GetPartnerInUse, LVarA) IfNe(LVarA, 0) Set(LVar9, 0) Return EndIf +#endif Call(DisablePlayerInput, TRUE) Call(PlaySoundAtCollider, COLLIDER_o160, SOUND_LOOP_MOVE_STATUE, SOUND_SPACE_DEFAULT) Thread @@ -48,7 +52,11 @@ EvtScript N(EVS_PushStatue_Impl) = { Call(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) Call(GetPlayerPos, LVar0, LVar1, LVar2) Set(LVar1, LVar0) +#if VERSION_JP + Add(LVar1, LVarA) +#else Add(LVar1, LVarB) +#endif Call(MakeLerp, LVar0, LVar1, 100, EASING_LINEAR) Loop(0) Call(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) @@ -62,7 +70,11 @@ EvtScript N(EVS_PushStatue_Impl) = { Call(SetPlayerActionState, ACTION_STATE_IDLE) Call(DisablePlayerInput, FALSE) EndThread +#if VERSION_JP + Call(MakeLerp, 0, LVarA, 100, EASING_LINEAR) +#else Call(MakeLerp, 0, LVarB, 100, EASING_LINEAR) +#endif Loop(0) Call(UpdateLerp) Call(TranslateGroup, MODEL_g20, LVar0, 0, 0) @@ -93,11 +105,19 @@ EvtScript N(EVS_PushStatue_FromRight) = { EndIf IfGe(LVar0, 0) Set(LVar9, 1) +#if VERSION_JP + Set(LVarA, -50) +#else Set(LVarB, -50) +#endif ExecWait(N(EVS_PushStatue_Impl)) Else Set(LVar9, 2) +#if VERSION_JP + Set(LVarA, 50) +#else Set(LVarB, 50) +#endif ExecWait(N(EVS_PushStatue_Impl)) EndIf Set(GB_KPA04_StatuePosition, LVar9) diff --git a/src/world/area_kpa/kpa_08/entity.c b/src/world/area_kpa/kpa_08/entity.c index 304271112d5..f2ef4c78ddb 100644 --- a/src/world/area_kpa/kpa_08/entity.c +++ b/src/world/area_kpa/kpa_08/entity.c @@ -27,7 +27,7 @@ EvtScript N(EVS_ActivateSwitch) = { Call(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) Loop(0) Call(UpdateLerp) - Call(N(ElevatePlayer), 15, 100) + Call(N(ElevatePlayer), COLLIDER_o19, 100) Call(TranslateGroup, MODEL_move, 0, LVar0, 0) Call(UpdateColliderTransform, COLLIDER_o19) Wait(1) @@ -40,7 +40,7 @@ EvtScript N(EVS_ActivateSwitch) = { Call(MakeLerp, 0, -50, 20, EASING_COS_IN_OUT) Loop(0) Call(UpdateLerp) - Call(N(ElevatePlayer), 15, 100) + Call(N(ElevatePlayer), COLLIDER_o19, 100) Call(TranslateGroup, MODEL_move, 0, LVar0, 0) Call(UpdateColliderTransform, COLLIDER_o19) Wait(1) @@ -56,7 +56,7 @@ EvtScript N(EVS_ActivateSwitch) = { Call(MakeLerp, -99, 0, 15, EASING_COS_IN_OUT) Loop(0) Call(UpdateLerp) - Call(N(ElevatePlayer), 17, 100) + Call(N(ElevatePlayer), COLLIDER_o90, 100) Call(TranslateGroup, MODEL_move2, 0, LVar0, 0) Call(UpdateColliderTransform, COLLIDER_o90) Wait(1) @@ -70,7 +70,7 @@ EvtScript N(EVS_ActivateSwitch) = { Call(MakeLerp, 0, -99, 15, EASING_COS_IN_OUT) Loop(0) Call(UpdateLerp) - Call(N(ElevatePlayer), 17, 100) + Call(N(ElevatePlayer), COLLIDER_o90, 100) Call(TranslateGroup, MODEL_move2, 0, LVar0, 0) Call(UpdateColliderTransform, COLLIDER_o90) Wait(1) diff --git a/src/world/area_kpa/kpa_09/entity.c b/src/world/area_kpa/kpa_09/entity.c index 4b51f2abbca..600d5781afa 100644 --- a/src/world/area_kpa/kpa_09/entity.c +++ b/src/world/area_kpa/kpa_09/entity.c @@ -27,7 +27,7 @@ EvtScript N(EVS_ActivateSwitch) = { Call(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) Loop(0) Call(UpdateLerp) - Call(N(ElevatePlayer), 16, 100) + Call(N(ElevatePlayer), COLLIDER_o19, 100) Call(TranslateGroup, MODEL_move, 0, LVar0, 0) Call(UpdateColliderTransform, COLLIDER_o19) Wait(1) @@ -40,7 +40,7 @@ EvtScript N(EVS_ActivateSwitch) = { Call(MakeLerp, 0, -50, 15, EASING_COS_IN_OUT) Loop(0) Call(UpdateLerp) - Call(N(ElevatePlayer), 16, 100) + Call(N(ElevatePlayer), COLLIDER_o19, 100) Call(TranslateGroup, MODEL_move, 0, LVar0, 0) Call(UpdateColliderTransform, COLLIDER_o19) Wait(1) @@ -57,7 +57,7 @@ EvtScript N(EVS_ActivateSwitch) = { Call(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) Loop(0) Call(UpdateLerp) - Call(N(ElevatePlayer), 18, 100) + Call(N(ElevatePlayer), COLLIDER_o106, 100) Call(TranslateGroup, MODEL_move2, 0, LVar0, 0) Call(UpdateColliderTransform, COLLIDER_o106) Wait(1) @@ -71,7 +71,7 @@ EvtScript N(EVS_ActivateSwitch) = { Call(MakeLerp, 0, -50, 15, EASING_COS_IN_OUT) Loop(0) Call(UpdateLerp) - Call(N(ElevatePlayer), 18, 100) + Call(N(ElevatePlayer), COLLIDER_o106, 100) Call(TranslateGroup, MODEL_move2, 0, LVar0, 0) Call(UpdateColliderTransform, COLLIDER_o106) Wait(1) diff --git a/src/world/area_kpa/kpa_10/npc.c b/src/world/area_kpa/kpa_10/npc.c index 922fb7c4aa6..7a81d9e8e41 100644 --- a/src/world/area_kpa/kpa_10/npc.c +++ b/src/world/area_kpa/kpa_10/npc.c @@ -5,7 +5,11 @@ NpcData N(NpcData_Prisoners)[] = { { .id = NPC_Toad_01, +#if VERSION_JP + .pos = { 840.0f, 30.0f, -260.0f }, +#else .pos = { 845.0f, 30.0f, -285.0f }, +#endif .yaw = 0, .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, @@ -15,7 +19,11 @@ NpcData N(NpcData_Prisoners)[] = { }, { .id = NPC_Toad_02, +#if VERSION_JP + .pos = { 870.0f, 30.0f, -310.0f }, +#else .pos = { 872.0f, 30.0f, -315.0f }, +#endif .yaw = 0, .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, @@ -25,7 +33,11 @@ NpcData N(NpcData_Prisoners)[] = { }, { .id = NPC_ToadGuard, +#if VERSION_JP + .pos = { 900.0f, 30.0f, -260.0f }, +#else .pos = { 900.0f, 30.0f, -285.0f }, +#endif .yaw = 0, .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, diff --git a/src/world/area_kpa/kpa_11/npc.c b/src/world/area_kpa/kpa_11/npc.c index 83d0bd1ca81..33e67411c15 100644 --- a/src/world/area_kpa/kpa_11/npc.c +++ b/src/world/area_kpa/kpa_11/npc.c @@ -64,7 +64,11 @@ EvtScript N(EVS_NpcInit_Prisoner) = { NpcData N(NpcData_Prisoners)[] = { { .id = NPC_Toad_01, +#if VERSION_JP + .pos = { 840.0f, 30.0f, -260.0f }, +#else .pos = { 845.0f, 30.0f, -285.0f }, +#endif .yaw = 0, .init = &N(EVS_NpcInit_Prisoner), .settings = &N(NpcSettings_Toad_Stationary), @@ -75,7 +79,11 @@ NpcData N(NpcData_Prisoners)[] = { }, { .id = NPC_Toad_02, +#if VERSION_JP + .pos = { 870.0f, 30.0f, -310.0f }, +#else .pos = { 872.0f, 30.0f, -315.0f }, +#endif .yaw = 0, .init = &N(EVS_NpcInit_Prisoner), .settings = &N(NpcSettings_Toad_Stationary), @@ -86,7 +94,11 @@ NpcData N(NpcData_Prisoners)[] = { }, { .id = NPC_ToadGuard, +#if VERSION_JP + .pos = { 900.0f, 30.0f, -260.0f }, +#else .pos = { 900.0f, 30.0f, -285.0f }, +#endif .yaw = 0, .init = &N(EVS_NpcInit_Prisoner), .settings = &N(NpcSettings_Toad_Stationary), diff --git a/src/world/area_kpa/kpa_111/statues.c b/src/world/area_kpa/kpa_111/statues.c index 2fadaf52823..ff5bd413290 100644 --- a/src/world/area_kpa/kpa_111/statues.c +++ b/src/world/area_kpa/kpa_111/statues.c @@ -4,13 +4,17 @@ #include "world/common/todo/UnkFunc12.inc.c" EvtScript N(EVS_PushRightStatue_Impl) = { +#if !VERSION_JP SetGroup(EVT_GROUP_00) +#endif Loop(20) +#if !VERSION_JP Call(GetPartnerInUse, LVarA) IfNe(LVarA, 0) Set(LVar8, -1) Return EndIf +#endif Call(N(UnkFunc11), LVar9) IfEq(LVar0, 0) Set(LVar8, -1) @@ -20,11 +24,13 @@ EvtScript N(EVS_PushRightStatue_Impl) = { EndIf Wait(1) EndLoop +#if !VERSION_JP Call(GetPartnerInUse, LVarA) IfNe(LVarA, 0) Set(LVar8, -1) Return EndIf +#endif Call(DisablePlayerInput, TRUE) Thread Call(ShakeCam, CAM_DEFAULT, 0, 100, Float(0.6)) diff --git a/src/world/area_kpa/kpa_113/statues.c b/src/world/area_kpa/kpa_113/statues.c index b0fa1adca5c..a5905b48cfb 100644 --- a/src/world/area_kpa/kpa_113/statues.c +++ b/src/world/area_kpa/kpa_113/statues.c @@ -4,13 +4,17 @@ #include "world/common/todo/UnkFunc12.inc.c" EvtScript N(EVS_PushLeftStatue_Impl) = { +#if !VERSION_JP SetGroup(EVT_GROUP_00) +#endif Loop(20) +#if !VERSION_JP Call(GetPartnerInUse, LVarA) IfNe(LVarA, 0) Set(LVar8, -1) Return EndIf +#endif Call(N(UnkFunc11), LVar9) IfEq(LVar0, 0) Set(LVar8, -1) @@ -20,11 +24,13 @@ EvtScript N(EVS_PushLeftStatue_Impl) = { EndIf Wait(1) EndLoop +#if !VERSION_JP Call(GetPartnerInUse, LVarA) IfNe(LVarA, 0) Set(LVar8, -1) Return EndIf +#endif Call(DisablePlayerInput, TRUE) Call(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) Thread diff --git a/src/world/area_kpa/kpa_115/statues.c b/src/world/area_kpa/kpa_115/statues.c index e01fe8da7e5..69963773b0e 100644 --- a/src/world/area_kpa/kpa_115/statues.c +++ b/src/world/area_kpa/kpa_115/statues.c @@ -4,13 +4,17 @@ #include "world/common/todo/UnkFunc12.inc.c" EvtScript N(EVS_PushMiddleStatue_Impl) = { +#if !VERSION_JP SetGroup(EVT_GROUP_00) +#endif Loop(20) +#if !VERSION_JP Call(GetPartnerInUse, LVarA) IfNe(LVarA, 0) Set(LVar8, -1) Return EndIf +#endif Call(N(UnkFunc11), LVar9) IfEq(LVar0, 0) Set(LVar8, -1) @@ -20,11 +24,13 @@ EvtScript N(EVS_PushMiddleStatue_Impl) = { EndIf Wait(1) EndLoop +#if !VERSION_JP Call(GetPartnerInUse, LVarA) IfNe(LVarA, 0) Set(LVar8, -1) Return EndIf +#endif Call(DisablePlayerInput, TRUE) Thread Call(ShakeCam, CAM_DEFAULT, 0, 100, Float(0.6)) diff --git a/src/world/area_kpa/kpa_13/platforms.c b/src/world/area_kpa/kpa_13/platforms.c index 6fc5ac1e39e..4d6d3d3ca7c 100644 --- a/src/world/area_kpa/kpa_13/platforms.c +++ b/src/world/area_kpa/kpa_13/platforms.c @@ -119,8 +119,10 @@ EvtScript N(EVS_SetupPlatforms) = { Wait(1) Goto(12) EndIf +#if !VERSION_JP Wait(20) Call(ShakeCam, CAM_DEFAULT, 0, 30, Float(0.5)) +#endif Set(GF_KPA13_BlueSwitchB, TRUE) EndIf Set(LVar0, 75) diff --git a/src/world/area_kpa/kpa_15/settings.c b/src/world/area_kpa/kpa_15/settings.c index f26f8781c5b..480925f2627 100644 --- a/src/world/area_kpa/kpa_15/settings.c +++ b/src/world/area_kpa/kpa_15/settings.c @@ -1,5 +1,15 @@ #include "kpa_15.h" +#if VERSION_JP +s32 N(get_tattle)(void) { + if (!evt_get_variable(NULL, GF_KPA16_ShutOffLava)) { + return MSG_MapTattle_kpa_15_before; + } else { + return MSG_MapTattle_kpa_15_after; + } +} +#endif + EntryList N(Entrances) = { [kpa_15_ENTRY_0] { 12.0, 0.0, -97.0, 90.0 }, }; @@ -8,5 +18,9 @@ MapSettings N(settings) = { .main = &N(EVS_Main), .entryList = &N(Entrances), .entryCount = ENTRY_COUNT(N(Entrances)), +#if VERSION_JP + .tattle = { .get = &N(get_tattle) }, +#else .tattle = { MSG_MapTattle_kpa_15 }, +#endif }; diff --git a/src/world/area_kpa/kpa_81/npc.c b/src/world/area_kpa/kpa_81/npc.c index 3ad41e78af7..99fee0fff2a 100644 --- a/src/world/area_kpa/kpa_81/npc.c +++ b/src/world/area_kpa/kpa_81/npc.c @@ -101,7 +101,9 @@ EvtScript N(EVS_NpcIdle_Door) = { Goto(100) EndIf Call(DisablePlayerInput, TRUE) +#if !VERSION_JP ExecWait(N(EVS_EnsurePartnerNeutral)) +#endif Call(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0004) Call(DisablePlayerInput, FALSE) Call(AwaitPlayerApproach, 120, 150, 30) @@ -115,7 +117,9 @@ EvtScript N(EVS_NpcIdle_Door) = { EndIf Label(2) Call(DisablePlayerInput, TRUE) +#if !VERSION_JP ExecWait(N(EVS_EnsurePartnerNeutral)) +#endif Call(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0001) Call(ShowChoice, MSG_Choice_0013) IfEq(LVar0, 0) diff --git a/src/world/area_kpa/kpa_82/npc.c b/src/world/area_kpa/kpa_82/npc.c index 66a69eaee69..4495b6a5d3a 100644 --- a/src/world/area_kpa/kpa_82/npc.c +++ b/src/world/area_kpa/kpa_82/npc.c @@ -162,6 +162,15 @@ EvtScript N(EVS_SetCam_ViewRoom) = { }; EvtScript N(EVS_SetCam_BeforeBattle) = { +#if VERSION_JP + Call(UseSettingsFrom, CAM_DEFAULT, LVar3, LVar4, LVar5) + Call(SetCamSpeed, CAM_DEFAULT, LVar6) + Call(SetCamPitch, CAM_DEFAULT, Float(16.5), Float(-9.0)) + Call(SetCamDistance, CAM_DEFAULT, Float(445.0)) + Call(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) + Call(WaitForCam, CAM_DEFAULT, Float(1.0)) + Wait(20) +#else Call(SetCamType, CAM_DEFAULT, 4, FALSE) Call(SetCamSpeed, CAM_DEFAULT, LVar6) Call(SetCamDistance, CAM_DEFAULT, Float(470.0)) @@ -171,6 +180,7 @@ EvtScript N(EVS_SetCam_BeforeBattle) = { Call(SetCamPosC, CAM_DEFAULT, Float(0.0), Float(0.0)) Call(PanToTarget, CAM_DEFAULT, 0, 1) Call(WaitForCam, CAM_DEFAULT, Float(1.0)) +#endif Return End }; diff --git a/src/world/area_mim/mim_07/npc.c b/src/world/area_mim/mim_07/npc.c index 9e72ba6630b..d314a6e5a97 100644 --- a/src/world/area_mim/mim_07/npc.c +++ b/src/world/area_mim/mim_07/npc.c @@ -66,11 +66,13 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { Goto(10) EndIf Call(DisablePlayerInput, TRUE) +#if !VERSION_JP Call(GetPartnerInUse, LVar0) IfNe(LVar0, PARTNER_NONE) Call(InterruptUsePartner) Wait(20) EndIf +#endif ExecWait(N(EVS_JrTroopaMusic)) Call(GetPlayerPos, LVar1, LVar2, LVar3) Call(GetEntryID, LVar0) diff --git a/src/world/area_nok/nok.h b/src/world/area_nok/nok.h index 17e56cbcefc..ef457b1456b 100644 --- a/src/world/area_nok/nok.h +++ b/src/world/area_nok/nok.h @@ -39,6 +39,7 @@ enum { AF_NOK_11 = AreaFlag(17), AF_NOK_12 = AreaFlag(18), AF_NOK_13 = AreaFlag(19), + AF_NOK_14 = AreaFlag(20), AF_NOK_15 = AreaFlag(21), }; diff --git a/src/world/area_nok/nok_01/npc.c b/src/world/area_nok/nok_01/npc.c index 8aa875957af..434bac8f817 100644 --- a/src/world/area_nok/nok_01/npc.c +++ b/src/world/area_nok/nok_01/npc.c @@ -405,6 +405,10 @@ EvtScript N(EVS_NpcInteract_RelaxedKoopa) = { Call(SpeakToPlayer, NPC_RelaxedKoopa, ANIM_Koopa_LeanBackTalk, ANIM_Koopa_LeanBack, 5, MSG_CH1_0026) CaseEq(3) Call(SpeakToPlayer, NPC_RelaxedKoopa, ANIM_Koopa_LeanBackTalk, ANIM_Koopa_LeanBack, 5, MSG_CH1_0027) +#if VERSION_JP + CaseEq(4) + Call(SpeakToPlayer, NPC_RelaxedKoopa, ANIM_Koopa_LeanBackTalk, ANIM_Koopa_LeanBack, 5, MSG_CH1_0137) +#endif EndSwitch Return End diff --git a/src/world/area_nok/nok_02/bookshelf.c b/src/world/area_nok/nok_02/bookshelf.c index 9eb2a11a771..255c2cfbcbe 100644 --- a/src/world/area_nok/nok_02/bookshelf.c +++ b/src/world/area_nok/nok_02/bookshelf.c @@ -1,5 +1,15 @@ #include "nok_02.h" +#if VERSION_JP +EvtScript N(EVS_80246E20_9E7260) = { + Call(DisablePlayerInput, TRUE) + Call(ShowMessageAtScreenPos, MSG_CH1_0138, 160, 40) + Call(DisablePlayerInput, FALSE) + Return + End +}; +#endif + EvtScript N(EVS_Setup_Bookshelf) = { Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_CH1_00A1, 160, 40) diff --git a/src/world/area_nok/nok_11/npc.c b/src/world/area_nok/nok_11/npc.c index 5a52846b4e3..43b13a7e8b0 100644 --- a/src/world/area_nok/nok_11/npc.c +++ b/src/world/area_nok/nok_11/npc.c @@ -296,7 +296,15 @@ EvtScript N(EVS_NpcIdle_KentCKoopa_01) = { Else Set(LVar0, -20) EndIf +#if VERSION_JP + IfEq(AF_NOK_14, 0) + Call(SpeakToPlayer, NPC_KentCKoopa_02, ANIM_KentCKoopa_Anim02, ANIM_KentCKoopa_Anim01, 0, MSG_CH1_0136) + Else + Call(SpeakToPlayer, NPC_KentCKoopa_02, ANIM_KentCKoopa_Anim02, ANIM_KentCKoopa_Anim01, 0, MSG_CH1_0139) + EndIf +#else Call(SpeakToPlayer, NPC_KentCKoopa_02, ANIM_KentCKoopa_Anim02, ANIM_KentCKoopa_Anim01, 0, MSG_CH1_0136) +#endif Call(SetNpcAnimation, NPC_KentCKoopa_02, ANIM_KentCKoopa_Anim05) IfEq(AB_NOK_2, 0) Set(LVar0, 90) diff --git a/src/world/area_obk/obk_07/phonograph.c b/src/world/area_obk/obk_07/phonograph.c index 7a8b7c1b6d4..1c4452ae4c8 100644 --- a/src/world/area_obk/obk_07/phonograph.c +++ b/src/world/area_obk/obk_07/phonograph.c @@ -1112,6 +1112,14 @@ EvtScript N(EVS_NpcInteract_GuardBoo) = { Else Call(SpeakToPlayer, NPC_GuardBoo, ANIM_Boo_Talk, ANIM_Boo_Idle, 0, MSG_CH3_0038) EndIf +#if VERSION_JP + CaseEq(STORY_CH3_GOT_WEIGHT) + Call(SpeakToPlayer, NPC_GuardBoo, ANIM_Boo_Talk, ANIM_Boo_Idle, 0, MSG_CH3_0105) + ExecWait(N(EVS_GuardBooVanish)) + CaseGe(STORY_CH3_WEIGHED_DOWN_CHANDELIER) + Call(SpeakToPlayer, NPC_GuardBoo, ANIM_Boo_Talk, ANIM_Boo_Idle, 0, MSG_CH3_0106) + ExecWait(N(EVS_GuardBooVanish)) +#endif EndSwitch Return End diff --git a/src/world/area_osr/osr_00/settings.c b/src/world/area_osr/osr_00/settings.c index c1bceeadc05..69ed075636c 100644 --- a/src/world/area_osr/osr_00/settings.c +++ b/src/world/area_osr/osr_00/settings.c @@ -13,4 +13,7 @@ MapSettings N(settings) = { .entryList = &N(Entrances), .entryCount = ENTRY_COUNT(N(Entrances)), .background = &gBackgroundImage, +#if VERSION_JP + .tattle = { MSG_MapTattle_0189 }, +#endif }; diff --git a/src/world/area_trd/trd_06/main.c b/src/world/area_trd/trd_06/main.c index 8708a52ef13..0723ad5ec97 100644 --- a/src/world/area_trd/trd_06/main.c +++ b/src/world/area_trd/trd_06/main.c @@ -45,7 +45,9 @@ BombTrigger N(BombPos_CellWall) = { }; EvtScript N(EVS_BombWall_Cell) = { +#if !VERSION_JP Call(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, TRUE) +#endif PlayEffect(EFFECT_BOMBETTE_BREAKING, 0, 19, 19, 1, 10, 30) Call(SetGroupVisibility, MODEL_ana, MODEL_GROUP_VISIBLE) Loop(10) @@ -93,7 +95,9 @@ EvtScript N(EVS_BombWall_Cell) = { Call(InterpNpcYaw, NPC_PARTNER, 270, 0) Wait(10 * DT) Call(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00E3) +#if !VERSION_JP Call(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, FALSE) +#endif Call(EnablePartnerAI) Call(DisablePlayerInput, FALSE) Thread diff --git a/src/world/area_trd/trd_06/npc_prisoners.c b/src/world/area_trd/trd_06/npc_prisoners.c index aae678cb871..d0db6865776 100644 --- a/src/world/area_trd/trd_06/npc_prisoners.c +++ b/src/world/area_trd/trd_06/npc_prisoners.c @@ -228,6 +228,30 @@ EvtScript N(EVS_NpcDefeat_KoopaTroopa) = { Set(GB_StoryProgress, STORY_CH1_DEFEATED_DUNGEON_GUARDS) Call(DoNpcDefeat) CaseEq(OUTCOME_PLAYER_LOST) +#if VERSION_JP + CaseEq(OUTCOME_PLAYER_FLED) + Call(DisablePlayerInput, TRUE) + Call(SetPlayerAnimation, ANIM_Mario1_Run) + Call(PlayerMoveTo, 82, 264, 20) + Call(SetPlayerAnimation, ANIM_Mario1_Idle) + Call(SpeakToPlayer, NPC_Jailer_KoopaTroopa, ANIM_KoopaTroopa_Run, ANIM_KoopaTroopa_Idle, 0, MSG_CH1_013A) + Thread + Label(10) + Call(GetPlayerPos, LVar0, LVar1, LVar2) + Wait(1) + IfLt(LVar2, 200) + Goto(10) + EndIf + IfGt(LVar0, -120) + Goto(10) + EndIf + Call(DisablePlayerInput, TRUE) + Call(SpeakToPlayer, NPC_Jailer_KoopaTroopa, ANIM_KoopaTroopa_Run, ANIM_KoopaTroopa_Idle, 0, MSG_CH1_013B) + Call(DisablePlayerInput, FALSE) + Call(StartBossBattle, SONG_SPECIAL_BATTLE) + EndThread + Call(DisablePlayerInput, FALSE) +#endif EndSwitch Return End diff --git a/src/world/common/npc/KoopaWithoutShell_Patrol.inc.c b/src/world/common/npc/KoopaWithoutShell_Patrol.inc.c index 84b05c345bf..58606f242a8 100644 --- a/src/world/common/npc/KoopaWithoutShell_Patrol.inc.c +++ b/src/world/common/npc/KoopaWithoutShell_Patrol.inc.c @@ -25,7 +25,9 @@ NpcSettings N(NpcSettings_KoopaWithoutShell_Patrol) = { .actionFlags = AI_ACTION_LOOK_AROUND_DURING_LOITER, }; -s32 N(missing_80246F94_6F94)[] = { - 0x00000000, 0x002A0018, 0x00000000, 0x00000000, 0x80246F48, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00630000, +NpcSettings N(missing_80246F94_6F94) = { + .height = 42, + .radius = 24, + .level = ACTOR_LEVEL_NONE, + .ai = &N(EVS_NpcAI_KoopaWithoutShell_Patrol), }; diff --git a/src/world/common/todo/UnkFunc11.inc.c b/src/world/common/todo/UnkFunc11.inc.c index 8c085201f74..e902c2230bf 100644 --- a/src/world/common/todo/UnkFunc11.inc.c +++ b/src/world/common/todo/UnkFunc11.inc.c @@ -6,8 +6,12 @@ API_CALLABLE(N(UnkFunc11)) { PlayerStatus* playerStatus = &gPlayerStatus; CollisionStatus* collisionStatus = &gCollisionStatus; +#if VERSION_JP + if (collisionStatus->pushingAgainstWall != pushableColliderID && playerStatus->actionState == ACTION_STATE_PUSHING_BLOCK) { +#else if ((collisionStatus->pushingAgainstWall != pushableColliderID && playerStatus->actionState == ACTION_STATE_PUSHING_BLOCK) || playerStatus->enableCollisionOverlapsCheck || playerStatus->inputDisabledCount != 0) { +#endif set_action_state(ACTION_STATE_IDLE); script->varTable[0] = 0; return ApiStatus_DONE2; diff --git a/tools/splat_ext/msg_jp.yaml b/tools/splat_ext/msg_jp.yaml index 5aacbf7c53b..f9b5045b6c3 100644 --- a/tools/splat_ext/msg_jp.yaml +++ b/tools/splat_ext/msg_jp.yaml @@ -1,16 +1,146 @@ # 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_JP_001E] +- [0x00, 0x001F, Intro_JP_001F] +- [0x00, 0x0020, Intro_JP_0020] +- [0x00, 0x0021, Intro_JP_0021] +- [0x00, 0x0022, Intro_JP_0022] +- [0x00, 0x0023, Intro_JP_0023] +- [0x00, 0x0024, Intro_JP_0024] +- [0x00, 0x0031, Intro_JP_0031] +- [0x00, 0x0032, Intro_JP_0032] +- [0x00, 0x0033, Intro_JP_0033] +- [0x00, 0x0034, Intro_JP_0034] +- [0x00, 0x0035, Intro_JP_0035] +- [0x00, 0x0036, Intro_JP_0036] +- [0x00, 0x0037, Intro_JP_0037] +- [0x00, 0x0044, Intro_JP_0044] +- [0x00, 0x0045, Intro_JP_0045] +- [0x00, 0x0046, Intro_JP_0046] +- [0x00, 0x0047, Intro_JP_0047] +- [0x00, 0x0048, Intro_JP_0048] +- [0x00, 0x0049, Intro_JP_0049] +- [0x00, 0x004A, Intro_JP_004A] +- [0x00, 0x0057, Intro_JP_0057] +- [0x00, 0x0058, Intro_JP_0058] +- [0x00, 0x0059, Intro_JP_0059] +- [0x00, 0x005A, Intro_JP_005A] +- [0x00, 0x005B, Intro_JP_005B] +- [0x00, 0x005C, Intro_JP_005C] +- [0x00, 0x005D, Intro_JP_005D] +- [0x00, 0x006A, Intro_JP_006A] - [0x00, 0x006B, Intro_001E] - [0x00, 0x006C, Intro_001F] - [0x00, 0x006D, Intro_0020] - [0x00, 0x006E, Intro_0021] +- [0x00, 0x006F, Intro_0022] +- [0x00, 0x0070, Intro_0023] +- [0x00, 0x0071, Intro_0024] +- [0x00, 0x0072, Intro_0025] +- [0x00, 0x0073, Intro_0026] +- [0x00, 0x0074, Intro_0027] +- [0x00, 0x0075, Intro_0028] +- [0x00, 0x0076, Intro_0029] +- [0x00, 0x0077, Intro_002A] +- [0x00, 0x0078, Intro_002B] +- [0x00, 0x0079, Intro_002C] +- [0x00, 0x007A, Intro_002D] +- [0x00, 0x007B, Intro_002E] +- [0x00, 0x007C, Intro_002F] +- [0x00, 0x007D, Intro_0030] +- [0x00, 0x007E, Intro_0031] +- [0x00, 0x007F, Intro_0032] +- [0x00, 0x0080, Intro_0033] +- [0x00, 0x0081, Intro_0034] +- [0x00, 0x0082, Intro_0035] +- [0x00, 0x0083, Intro_0036] +- [0x00, 0x0084, Intro_0037] +- [0x00, 0x0085, Intro_0038] +- [0x00, 0x0086, Intro_0039] +- [0x00, 0x0087, Intro_003A] +- [0x00, 0x0088, Intro_003B] +- [0x00, 0x0089, Intro_003C] +- [0x00, 0x008A, Intro_003D] +- [0x00, 0x008B, Intro_003E] +- [0x00, 0x008C, Intro_003F] +- [0x00, 0x008D, Intro_0040] +- [0x00, 0x008E, Intro_0041] +- [0x00, 0x008F, Intro_0042] +- [0x00, 0x0090, Intro_0043] +- [0x00, 0x0091, Intro_0044] +- [0x00, 0x0092, Intro_0045] +- [0x00, 0x0093, Intro_0046] +- [0x00, 0x0094, Intro_0047] +- [0x00, 0x0095, Intro_0048] +- [0x00, 0x0096, Intro_0049] +- [0x00, 0x0097, Intro_004A] +- [0x00, 0x0098, Intro_004B] +- [0x00, 0x0099, Intro_004C] +- [0x00, 0x009A, Intro_004D] +- [0x00, 0x009B, Intro_004E] +- [0x00, 0x009C, Intro_004F] +- [0x00, 0x009D, Intro_0050] +- [0x00, 0x009E, Intro_0051] +- [0x00, 0x009F, Intro_0052] +- [0x00, 0x00A0, Intro_0053] +- [0x00, 0x00A1, Intro_0054] +- [0x00, 0x00A2, Intro_0055] +- [0x00, 0x00A3, Intro_0056] - [0x00, 0x00A4, Intro_0057] - [0x00, 0x00A5, Intro_0058] - [0x00, 0x00A6, Intro_0059] - [0x00, 0x00A7, Intro_005A] - [0x00, 0x00A8, Intro_005B] - [0x00, 0x00A9, Intro_005C] +- [0x00, 0x00AA, Intro_005D] +- [0x00, 0x00AB, Intro_005E] +- [0x00, 0x00AC, Intro_005F] +- [0x00, 0x00AD, Intro_0060] +- [0x00, 0x00AE, Intro_0061] +- [0x00, 0x00AF, 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, 0x000E, Outro_000D] - [0x01, 0x000F, Outro_000E] - [0x01, 0x0010, Outro_000F] @@ -73,6 +203,32 @@ - [0x01, 0x0053, Outro_0052] - [0x01, 0x0054, Outro_0053] - [0x01, 0x0055, Outro_0054] +- [0x01, 0x0056, Outro_0055] +- [0x01, 0x0057, Outro_0056] +- [0x01, 0x0058, Outro_0057] +- [0x01, 0x0059, Outro_0058] +- [0x01, 0x005A, Outro_0059] +- [0x01, 0x005B, Outro_005A] +- [0x01, 0x005C, Outro_005B] +- [0x01, 0x005D, Outro_005C] +- [0x01, 0x005E, Outro_005D] +- [0x01, 0x005F, Outro_005E] +- [0x01, 0x0060, Outro_005F] +- [0x01, 0x0061, Outro_0060] +- [0x01, 0x0062, Outro_0061] +- [0x01, 0x0063, Outro_0062] +- [0x01, 0x0064, Outro_0063] +- [0x01, 0x0065, Outro_0064] +- [0x01, 0x0066, Outro_0065] +- [0x01, 0x0067, Outro_0066] +- [0x01, 0x0068, Outro_0067] +- [0x01, 0x0069, Outro_0068] +- [0x01, 0x006A, Outro_0069] +- [0x01, 0x006B, Outro_006A] +- [0x01, 0x006C, Outro_006B] +- [0x01, 0x006D, Outro_006C] +- [0x01, 0x006E, Outro_006D] +- [0x01, 0x006F, Outro_006E] - [0x02, 0x0000, MAC_Gate_0000] - [0x02, 0x0001, MAC_Gate_0001] - [0x02, 0x0002, MAC_Gate_0002] @@ -1379,6 +1535,51 @@ - [0x08, 0x000F, MGM_000F] - [0x08, 0x0010, MGM_0010] - [0x08, 0x0011, MGM_0011] +- [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] @@ -1398,6 +1599,69 @@ - [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, 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_0054] +- [0x0A, 0x0054, HOS_0055] +- [0x0A, 0x0055, HOS_0056] +- [0x0A, 0x0056, HOS_0057] +- [0x0A, 0x0057, HOS_0058] +- [0x0A, 0x0058, HOS_0059] +- [0x0A, 0x0059, HOS_005A] +- [0x0A, 0x005A, HOS_005B] +- [0x0A, 0x005B, HOS_005C] +- [0x0A, 0x005C, HOS_005D] +- [0x0A, 0x005D, HOS_005E] +- [0x0A, 0x005E, HOS_005F] +- [0x0A, 0x005F, HOS_0060] +- [0x0A, 0x0060, HOS_0061] +- [0x0A, 0x0061, HOS_0062] +- [0x0A, 0x0062, HOS_0063] +- [0x0A, 0x0063, HOS_0064] +- [0x0A, 0x0064, HOS_0065] +- [0x0A, 0x0065, HOS_0066] +- [0x0A, 0x0066, HOS_0067] +- [0x0A, 0x0067, HOS_0068] +- [0x0A, 0x0068, HOS_0069] +- [0x0A, 0x0069, HOS_006A] +- [0x0A, 0x006A, HOS_006B] +- [0x0A, 0x006B, HOS_006C] +- [0x0A, 0x006C, HOS_006D] +- [0x0A, 0x006D, HOS_006E] +- [0x0A, 0x006E, HOS_006F] - [0x0A, 0x006F, HOS_0070] - [0x0B, 0x0000, CH0_0000] - [0x0B, 0x0001, CH0_0001] @@ -1660,6 +1924,259 @@ - [0x0B, 0x0105, CH0_0105] - [0x0B, 0x0106, CH0_0106] - [0x0B, 0x0107, CH0_0107] +- [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] @@ -1674,6 +2191,15 @@ - [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] @@ -1684,9 +2210,36 @@ - [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] +- [0x0C, 0x0137, CH1_0137] +- [0x0C, 0x0138, CH1_0138] +- [0x0C, 0x0139, CH1_0139] +- [0x0C, 0x013A, CH1_013A] +- [0x0C, 0x013B, CH1_013B] - [0x0D, 0x0000, CH2_0000] - [0x0D, 0x0001, CH2_0001] - [0x0D, 0x0002, CH2_0002] @@ -1782,10 +2335,146 @@ - [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] @@ -1796,15 +2485,224 @@ - [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, 0x0102, CH3_0102] - [0x0E, 0x0103, CH3_0103] +- [0x0E, 0x0105, CH3_0105] +- [0x0E, 0x0106, CH3_0106] - [0x0F, 0x0051, CH4_0051] - [0x0F, 0x0052, CH4_0052] - [0x0F, 0x0053, CH4_0053] @@ -1824,6 +2722,232 @@ - [0x0F, 0x0072, CH4_0072] - [0x0F, 0x0073, CH4_0073] - [0x0F, 0x0074, CH4_0074] +- [0x10, 0x0000, CH5_0000] +- [0x10, 0x0001, CH5_0001] +- [0x10, 0x0002, CH5_0002] +- [0x10, 0x0003, CH5_0003] +- [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, 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, 0x0104, CH5_0104] - [0x10, 0x0105, CH5_0105] - [0x10, 0x0106, CH5_0106] @@ -1843,15 +2967,137 @@ - [0x12, 0x00E5, CH7_00E5] - [0x12, 0x00E6, CH7_00E6] - [0x12, 0x00E7, CH7_00E7] +- [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, 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] @@ -1862,6 +3108,11 @@ - [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] @@ -1871,10 +3122,492 @@ - [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, 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, 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, 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, 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] - [0x16, 0x0000, RussTHint_0000] - [0x16, 0x0001, RussTHint_0001] - [0x16, 0x0002, RussTHint_0002] @@ -1969,6 +3702,32 @@ - [0x1B, 0x0003, MapTattle_mac_03] - [0x1B, 0x0004, MapTattle_mac_04] - [0x1B, 0x0005, MapTattle_mac_05] +- [0x1B, 0x0009, MapTattle_osr_01] +- [0x1B, 0x000A, MapTattle_osr_02] +- [0x1B, 0x000B, MapTattle_kkj_10] +- [0x1B, 0x000C, MapTattle_kkj_11] +- [0x1B, 0x000D, MapTattle_kkj_12] +- [0x1B, 0x000E, MapTattle_kkj_13] +- [0x1B, 0x000F, MapTattle_kkj_14] +- [0x1B, 0x0010, MapTattle_kkj_15] +- [0x1B, 0x0011, MapTattle_kkj_16] +- [0x1B, 0x0012, MapTattle_kkj_17] +- [0x1B, 0x0013, MapTattle_kkj_18] +- [0x1B, 0x0014, MapTattle_kkj_19] +- [0x1B, 0x0015, MapTattle_kkj_20] +- [0x1B, 0x0016, MapTattle_kkj_21] +- [0x1B, 0x0017, MapTattle_kkj_22] +- [0x1B, 0x0018, MapTattle_kkj_23] +- [0x1B, 0x0019, MapTattle_kkj_24] +- [0x1B, 0x001A, MapTattle_kkj_25] +- [0x1B, 0x001B, MapTattle_kkj_26] +- [0x1B, 0x001C, MapTattle_hos_00] +- [0x1B, 0x001D, MapTattle_hos_01] +- [0x1B, 0x001E, MapTattle_hos_02] +- [0x1B, 0x001F, MapTattle_hos_03] +- [0x1B, 0x0020, MapTattle_hos_04] +- [0x1B, 0x0021, MapTattle_hos_05] +- [0x1B, 0x0022, MapTattle_hos_06] - [0x1B, 0x0023, MapTattle_tik_01] - [0x1B, 0x0024, MapTattle_tik_02] - [0x1B, 0x0025, MapTattle_tik_03] @@ -2003,6 +3762,26 @@ - [0x1B, 0x0042, MapTattle_kmr_11] - [0x1B, 0x0043, MapTattle_kmr_10] - [0x1B, 0x0044, MapTattle_kmr_20] +- [0x1B, 0x0045, MapTattle_nok_11] +- [0x1B, 0x0046, MapTattle_nok_12] +- [0x1B, 0x0047, MapTattle_nok_13] +- [0x1B, 0x0048, MapTattle_nok_01] +- [0x1B, 0x0049, MapTattle_nok_02] +- [0x1B, 0x004A, MapTattle_nok_03] +- [0x1B, 0x004B, MapTattle_nok_04] +- [0x1B, 0x004C, MapTattle_nok_14] +- [0x1B, 0x004D, MapTattle_nok_15] +- [0x1B, 0x004E, MapTattle_trd_00] +- [0x1B, 0x004F, MapTattle_trd_01] +- [0x1B, 0x0050, MapTattle_trd_02] +- [0x1B, 0x0051, MapTattle_trd_03] +- [0x1B, 0x0052, MapTattle_trd_04] +- [0x1B, 0x0053, MapTattle_trd_05] +- [0x1B, 0x0054, MapTattle_trd_06] +- [0x1B, 0x0055, MapTattle_trd_07] +- [0x1B, 0x0056, MapTattle_trd_08] +- [0x1B, 0x0057, MapTattle_trd_09] +- [0x1B, 0x0058, MapTattle_trd_10] - [0x1B, 0x0059, MapTattle_iwa_10] - [0x1B, 0x005A, MapTattle_iwa_00] - [0x1B, 0x005B, MapTattle_iwa_01] @@ -2061,16 +3840,151 @@ - [0x1B, 0x0090, MapTattle_sbk_64] - [0x1B, 0x0091, MapTattle_sbk_65] - [0x1B, 0x0092, MapTattle_sbk_66] +- [0x1B, 0x0093, MapTattle_dro_01] +- [0x1B, 0x0094, MapTattle_dro_02] +- [0x1B, 0x0095, MapTattle_isk_01] +- [0x1B, 0x0096, MapTattle_isk_02] +- [0x1B, 0x0097, MapTattle_isk_03] +- [0x1B, 0x0098, MapTattle_isk_04] +- [0x1B, 0x0099, MapTattle_isk_05] +- [0x1B, 0x009A, MapTattle_isk_06] +- [0x1B, 0x009B, MapTattle_isk_07] +- [0x1B, 0x009C, MapTattle_isk_08] +- [0x1B, 0x009D, MapTattle_isk_09] +- [0x1B, 0x009E, MapTattle_isk_10] +- [0x1B, 0x009F, MapTattle_isk_11] +- [0x1B, 0x00A0, MapTattle_isk_12] +- [0x1B, 0x00A1, MapTattle_isk_13] +- [0x1B, 0x00A2, MapTattle_isk_14] +- [0x1B, 0x00A3, MapTattle_isk_16] +- [0x1B, 0x00A4, MapTattle_isk_18] +- [0x1B, 0x00A5, MapTattle_isk_19] +- [0x1B, 0x00A6, MapTattle_mim_10] +- [0x1B, 0x00A7, MapTattle_mim_01] +- [0x1B, 0x00A8, MapTattle_mim_02] +- [0x1B, 0x00A9, MapTattle_mim_03] +- [0x1B, 0x00AA, MapTattle_mim_04] +- [0x1B, 0x00AB, MapTattle_mim_05] +- [0x1B, 0x00AC, MapTattle_mim_06] +- [0x1B, 0x00AD, MapTattle_mim_07] +- [0x1B, 0x00AE, MapTattle_mim_08] +- [0x1B, 0x00AF, MapTattle_mim_09] +- [0x1B, 0x00B0, MapTattle_mim_11] +- [0x1B, 0x00B1, MapTattle_mim_12] +- [0x1B, 0x00B2, MapTattle_obk_01] +- [0x1B, 0x00B3, MapTattle_obk_02] +- [0x1B, 0x00B4, MapTattle_obk_03] +- [0x1B, 0x00B5, MapTattle_obk_04] +- [0x1B, 0x00B6, MapTattle_obk_05] +- [0x1B, 0x00B7, MapTattle_obk_06] +- [0x1B, 0x00B8, MapTattle_obk_07] +- [0x1B, 0x00B9, MapTattle_obk_08] +- [0x1B, 0x00BA, MapTattle_obk_09] +- [0x1B, 0x00BB, MapTattle_arn_07] +- [0x1B, 0x00BC, MapTattle_arn_03] +- [0x1B, 0x00BD, MapTattle_arn_05] +- [0x1B, 0x00BE, MapTattle_arn_02] +- [0x1B, 0x00BF, MapTattle_arn_04] +- [0x1B, 0x00D3, MapTattle_arn_08] +- [0x1B, 0x00D4, MapTattle_arn_09] +- [0x1B, 0x00D5, MapTattle_arn_10] +- [0x1B, 0x00D6, MapTattle_arn_12] +- [0x1B, 0x00D7, MapTattle_arn_13] +- [0x1B, 0x00D8, MapTattle_arn_11] - [0x1B, 0x00E9, MapTattle_kgr_01] - [0x1B, 0x00EA, MapTattle_kgr_02] +- [0x1B, 0x00EB, MapTattle_jan_00] +- [0x1B, 0x00EC, MapTattle_jan_01] +- [0x1B, 0x00ED, MapTattle_jan_02] +- [0x1B, 0x00EE, MapTattle_jan_03] +- [0x1B, 0x00EF, MapTattle_jan_22] +- [0x1B, 0x00F0, MapTattle_jan_04_before] +- [0x1B, 0x00F1, MapTattle_jan_04_after] +- [0x1B, 0x00F2, MapTattle_jan_05_before] +- [0x1B, 0x00F3, MapTattle_jan_05_after] +- [0x1B, 0x00F4, MapTattle_jan_08] +- [0x1B, 0x00F5, MapTattle_jan_09] +- [0x1B, 0x00F6, MapTattle_jan_10] +- [0x1B, 0x00F7, MapTattle_jan_07] +- [0x1B, 0x00F8, MapTattle_jan_06] +- [0x1B, 0x00F9, MapTattle_jan_11] +- [0x1B, 0x00FA, MapTattle_jan_12] +- [0x1B, 0x00FB, MapTattle_jan_13] +- [0x1B, 0x00FC, MapTattle_jan_14] +- [0x1B, 0x00FD, MapTattle_jan_15] +- [0x1B, 0x00FE, MapTattle_jan_16] +- [0x1B, 0x00FF, MapTattle_jan_17] +- [0x1B, 0x0100, MapTattle_jan_18] +- [0x1B, 0x0101, MapTattle_jan_19] +- [0x1B, 0x0102, MapTattle_jan_23] +- [0x1B, 0x0156, MapTattle_kpa_63] +- [0x1B, 0x0157, MapTattle_kpa_62] +- [0x1B, 0x0158, MapTattle_kpa_10] +- [0x1B, 0x0159, MapTattle_kpa_70] +- [0x1B, 0x015A, MapTattle_kpa_50] +- [0x1B, 0x015B, MapTattle_kpa_90] +- [0x1B, 0x015C, MapTattle_kpa_91] +- [0x1B, 0x015D, MapTattle_kpa_51] +- [0x1B, 0x015E, MapTattle_kpa_81] +- [0x1B, 0x015F, MapTattle_kpa_17] +- [0x1B, 0x0160, MapTattle_kpa_12_before] +- [0x1B, 0x0161, MapTattle_kpa_12_after] +- [0x1B, 0x0162, MapTattle_kpa_13_before] +- [0x1B, 0x0163, MapTattle_kpa_13_after] +- [0x1B, 0x0164, MapTattle_kpa_14_before] +- [0x1B, 0x0165, MapTattle_kpa_14_after] +- [0x1B, 0x0166, MapTattle_kpa_15_after] +- [0x1B, 0x0167, MapTattle_kpa_16] +- [0x1B, 0x0168, MapTattle_kpa_01] +- [0x1B, 0x0169, MapTattle_kpa_03] +- [0x1B, 0x016A, MapTattle_kpa_04] +- [0x1B, 0x016B, MapTattle_kpa_32] +- [0x1B, 0x016C, MapTattle_kpa_96] +- [0x1B, 0x016D, MapTattle_kpa_130] +- [0x1B, 0x016E, MapTattle_kpa_133] +- [0x1B, 0x016F, MapTattle_kpa_134] +- [0x1B, 0x0170, MapTattle_kpa_83] +- [0x1B, 0x0171, MapTattle_kpa_52] +- [0x1B, 0x0172, MapTattle_kpa_08] +- [0x1B, 0x0173, MapTattle_kpa_100] +- [0x1B, 0x0174, MapTattle_kpa_40] +- [0x1B, 0x0175, MapTattle_kpa_41] +- [0x1B, 0x0176, MapTattle_kpa_82] +- [0x1B, 0x0177, MapTattle_kpa_61] +- [0x1B, 0x0178, MapTattle_kpa_33] +- [0x1B, 0x0179, MapTattle_kpa_94] +- [0x1B, 0x017A, MapTattle_kpa_95] +- [0x1B, 0x017B, MapTattle_kpa_09] +- [0x1B, 0x017C, MapTattle_kpa_101] +- [0x1B, 0x017D, MapTattle_kpa_102] +- [0x1B, 0x017E, MapTattle_kpa_53] +- [0x1B, 0x017F, MapTattle_kpa_111] +- [0x1B, 0x0180, MapTattle_kpa_112] +- [0x1B, 0x0181, MapTattle_kpa_113] +- [0x1B, 0x0182, MapTattle_kpa_114] +- [0x1B, 0x0183, MapTattle_kpa_115] +- [0x1B, 0x0184, MapTattle_kpa_116] +- [0x1B, 0x0185, MapTattle_kpa_117] +- [0x1B, 0x0186, MapTattle_kpa_118] +- [0x1B, 0x0187, MapTattle_kpa_119] +- [0x1B, 0x0188, MapTattle_kpa_121] +- [0x1B, 0x0189, MapTattle_0189] +- [0x1B, 0x018A, MapTattle_018A] +- [0x1B, 0x018B, MapTattle_018B] - [0x1B, 0x018C, MapTattle_018C] +- [0x1B, 0x018F, MapTattle_kpa_15_before] - [0x1C, 0x0000, NpcTattle_Kolorado] +- [0x1C, 0x0001, NpcTattle_Archeologist] - [0x1C, 0x0002, NpcTattle_ChuckQuizmo] - [0x1C, 0x0003, NpcTattle_TravelingMaidA] - [0x1C, 0x0004, NpcTattle_TravelingMaidB] - [0x1C, 0x0005, NpcTattle_TravelingMaidC] - [0x1C, 0x0006, NpcTattle_JrTroopa] - [0x1C, 0x0007, NpcTattle_PrizeToad] +- [0x1C, 0x0008, NpcTattle_Merluvlee] +- [0x1C, 0x0009, NpcTattle_Merlow] +- [0x1C, 0x000A, NpcTattle_Eldstar] +- [0x1C, 0x000C, NpcTattle_OSR_LovesToClean] - [0x1C, 0x000D, NpcTattle_RipCheato] - [0x1C, 0x000E, NpcTattle_RussT] - [0x1C, 0x000F, NpcTattle_TheMaster] @@ -2159,6 +4073,31 @@ - [0x1C, 0x0067, NpcTattle_Goombaria] - [0x1C, 0x0068, NpcTattle_KMR_ToadHouseToad] - [0x1C, 0x0069, NpcTattle_Luigi] +- [0x1C, 0x006A, NpcTattle_NOK_ToadHouseToad] +- [0x1C, 0x006B, NpcTattle_NOK_ShopOwner] +- [0x1C, 0x006C, NpcTattle_NOK_Greeter] +- [0x1C, 0x006D, NpcTattle_NOK_GenericKoopaA] +- [0x1C, 0x006E, NpcTattle_NOK_GenericKoopaB] +- [0x1C, 0x006F, NpcTattle_NOK_RadioLover] +- [0x1C, 0x0070, NpcTattle_NOK_BobombA] +- [0x1C, 0x0071, NpcTattle_NOK_BobombB] +- [0x1C, 0x0072, NpcTattle_NOK_BobombC] +- [0x1C, 0x0073, NpcTattle_KoloradoWife] +- [0x1C, 0x0074, NpcTattle_NOK_Kooper] +- [0x1C, 0x0075, NpcTattle_KoopaKoot] +- [0x1C, 0x0076, NpcTattle_NOK_GenericKoopaC] +- [0x1C, 0x0077, NpcTattle_NOK_GenericKoopaD] +- [0x1C, 0x0078, NpcTattle_NOK_SenseOfJustice] +- [0x1C, 0x0079, NpcTattle_NOK_PrettyMellow] +- [0x1C, 0x007A, NpcTattle_NOK_BobombD] +- [0x1C, 0x007B, NpcTattle_NOK_BobombE] +- [0x1C, 0x007C, NpcTattle_NOK_BobombF] +- [0x1C, 0x007D, NpcTattle_TRD_Bombette] +- [0x1C, 0x007E, NpcTattle_TRD_BobombA] +- [0x1C, 0x007F, NpcTattle_TRD_BobombB] +- [0x1C, 0x0080, NpcTattle_TRD_BobombC] +- [0x1C, 0x0081, NpcTattle_TRD_BobombD] +- [0x1C, 0x0082, NpcTattle_KentCKoopa] - [0x1C, 0x0083, NpcTattle_IWA_StationMaster] - [0x1C, 0x0084, NpcTattle_IWA_Parakarry] - [0x1C, 0x0085, NpcTattle_IWA_TravelAgent] @@ -2171,8 +4110,92 @@ - [0x1C, 0x008C, NpcTattle_SBK_ExcavatorA] - [0x1C, 0x008D, NpcTattle_SBK_ExcavatorB] - [0x1C, 0x008E, NpcTattle_SBK_Nomadimouse] +- [0x1C, 0x008F, NpcTattle_DRO_ShopOwner] +- [0x1C, 0x0090, NpcTattle_DRO_Greeter] +- [0x1C, 0x0091, NpcTattle_DRO_DryiteA] +- [0x1C, 0x0092, NpcTattle_DRO_DryiteB] +- [0x1C, 0x0093, NpcTattle_DRO_DryiteC] +- [0x1C, 0x0094, NpcTattle_DRO_DryiteD] - [0x1C, 0x0095, NpcTattle_Composer] +- [0x1C, 0x0096, NpcTattle_DRO_DojoGraduate] +- [0x1C, 0x0097, NpcTattle_DRO_WorriedDryite] +- [0x1C, 0x0098, NpcTattle_Sheek] +- [0x1C, 0x0099, NpcTattle_Moustafa] +- [0x1C, 0x009A, NpcTattle_DRO_ToadHouseToad] +- [0x1C, 0x009B, NpcTattle_Merlee] +- [0x1C, 0x009C, NpcTattle_DRO_DryiteE] +- [0x1C, 0x009D, NpcTattle_DRO_DryiteF] +- [0x1C, 0x009E, NpcTattle_DRO_CrushingOnMerlee] +- [0x1C, 0x009F, NpcTattle_DRO_TellsTales] +- [0x1C, 0x00A0, NpcTattle_DRO_VisitedShootingStarSummit] +- [0x1C, 0x00A1, NpcTattle_Oaklie] +- [0x1C, 0x00A2, NpcTattle_MIM_Bubulb_Hidden] +- [0x1C, 0x00A3, NpcTattle_MIM_Bubulb_Revealed] +- [0x1C, 0x00A4, NpcTattle_Bootler] +- [0x1C, 0x00A5, NpcTattle_OBK_ShopOwner] +- [0x1C, 0x00A6, NpcTattle_OBK_BooA] +- [0x1C, 0x00A7, NpcTattle_OBK_BooB] +- [0x1C, 0x00A8, NpcTattle_OBK_GuardingChest] +- [0x1C, 0x00A9, NpcTattle_OBK_BootsTutor] +- [0x1C, 0x00AA, NpcTattle_ARN_LovesBow] +- [0x1C, 0x00AB, NpcTattle_ARN_BooA] +- [0x1C, 0x00AC, NpcTattle_ARN_BooB] +- [0x1C, 0x00AD, NpcTattle_ARN_BooC] +- [0x1C, 0x00AE, NpcTattle_ARN_BooD] +- [0x1C, 0x00AF, NpcTattle_ARN_BooE] +- [0x1C, 0x00B0, NpcTattle_ARN_BooF] +- [0x1C, 0x00B1, NpcTattle_ARN_BooG] +- [0x1C, 0x00B2, NpcTattle_ARN_BooH] +- [0x1C, 0x00B4, NpcTattle_Yakkey] - [0x1C, 0x00BB, NpcTattle_MAC_ShyGuyShopOwner] +- [0x1C, 0x00BC, NpcTattle_VillageLeader] +- [0x1C, 0x00BD, NpcTattle_LeadersFriend] +- [0x1C, 0x00BE, NpcTattle_BlueYoshi] +- [0x1C, 0x00BF, NpcTattle_LikeableYoshi] +- [0x1C, 0x00C0, NpcTattle_EntranceYoshi] +- [0x1C, 0x00C1, NpcTattle_GenericYoshi] +- [0x1C, 0x00C2, NpcTattle_FoodLovingYoshi] +- [0x1C, 0x00C3, NpcTattle_GreenYoshiKid] +- [0x1C, 0x00C4, NpcTattle_BlueYoshiKid] +- [0x1C, 0x00C5, NpcTattle_PurpleYoshiKid] +- [0x1C, 0x00C6, NpcTattle_YellowYoshiKid] +- [0x1C, 0x00C7, NpcTattle_RedYoshiKid] +- [0x1C, 0x00C8, NpcTattle_JAN_ShopOwner] +- [0x1C, 0x00C9, NpcTattle_RavenA] +- [0x1C, 0x00CA, NpcTattle_RavenC] +- [0x1C, 0x00CB, NpcTattle_RavenD] +- [0x1C, 0x00CC, NpcTattle_RavenE] +- [0x1C, 0x00CD, NpcTattle_JAN_ToadHouseToad] +- [0x1C, 0x00CE, NpcTattle_Sushie] +- [0x1C, 0x00CF, NpcTattle_RaphaelRaven] +- [0x1C, 0x00D1, NpcTattle_JAN_Bubulb_Revealed] +- [0x1C, 0x00D2, NpcTattle_HeartPlant] +- [0x1C, 0x00D3, NpcTattle_MBush] +- [0x1C, 0x00E4, NpcTattle_MayorPenguinWife] +- [0x1C, 0x00E5, NpcTattle_MayorPenguin] +- [0x1C, 0x010B, NpcTattle_HOS_ShopOwner] +- [0x1C, 0x010C, NpcTattle_HOS_ToadHouseStarKid] +- [0x1C, 0x010D, NpcTattle_HOS_StarKidA] +- [0x1C, 0x010E, NpcTattle_HOS_StarKidB] +- [0x1C, 0x010F, NpcTattle_HOS_StarKidC] +- [0x1C, 0x0110, NpcTattle_HOS_StarKidD] +- [0x1C, 0x0111, NpcTattle_HOS_StarKidE] +- [0x1C, 0x0112, NpcTattle_KPA_CaptiveToadA] +- [0x1C, 0x0113, NpcTattle_KPA_CaptiveToadB] +- [0x1C, 0x0114, NpcTattle_KPA_CaptiveSoldierA] +- [0x1C, 0x0115, NpcTattle_KPA_ToadMinister] +- [0x1C, 0x0116, NpcTattle_KPA_ToadHouseToadA] +- [0x1C, 0x0117, NpcTattle_KPA_CaptiveToadC] +- [0x1C, 0x0118, NpcTattle_KPA_CaptiveSoldierB] +- [0x1C, 0x0119, NpcTattle_KPA_CaptiveDryite] +- [0x1C, 0x011A, NpcTattle_KPA_ToadHouseToadB] +- [0x1C, 0x011B, NpcTattle_KPA_CaptiveToadD] +- [0x1C, 0x011C, NpcTattle_KPA_CaptiveSoldierC] +- [0x1C, 0x011D, NpcTattle_KPA_CaptivePenguin] +- [0x1C, 0x011E, NpcTattle_KPA_ShopOwner] +- [0x1C, 0x011F, NpcTattle_KPA_FakePrincessPeach] +- [0x1C, 0x0120, NpcTattle_KKJ_ToadHouseToad] +- [0x1C, 0x0121, NpcTattle_0121] - [0x1D, 0x0000, EntityTattle_HammerBlock1_CanBreak] - [0x1D, 0x0001, EntityTattle_HammerBlock2_CantBreak] - [0x1D, 0x0002, EntityTattle_HammerBlock2_CanBreak] @@ -2380,6 +4403,7 @@ - [0x20, 0x0004, Menus_SavePrompt] - [0x20, 0x0005, Menus_SaveComplete] - [0x20, 0x0009, Menus_JP_0009] +- [0x20, 0x000D, Menus_GotKooperShell] - [0x20, 0x000E, Menus_Party_Goombario] - [0x20, 0x000F, Menus_Party_Kooper] - [0x20, 0x0010, Menus_Party_Bombette] @@ -2526,8 +4550,8 @@ - [0x20, 0x00D8, Menus_Battle_NoTarget_Jump] - [0x20, 0x00D9, Menus_Battle_NoTarget_Hammer] - [0x20, 0x00DA, Menus_Battle_NoTarget_Item] -- [0x20, 0x00DB, MENUS_00DB] -- [0x20, 0x00DC, MENUS_00DC] +- [0x20, 0x00DB, Menus_JP_00DB] +- [0x20, 0x00DC, Menus_JP_00DC] - [0x20, 0x00DD, Menus_Battle_CantSelectNow] - [0x20, 0x00E0, Menus_Battle_CantUseHammer] - [0x20, 0x00E1, Menus_Battle_CantUseJump] @@ -2540,9 +4564,12 @@ - [0x20, 0x00EB, Menus_00D1] - [0x20, 0x00EC, Menus_00D2] - [0x20, 0x00ED, Menus_00D3] +- [0x20, 0x00EE, Menus_00D4] +- [0x20, 0x00EF, Menus_00D5] - [0x20, 0x00F0, Menus_00D6] - [0x20, 0x00F1, Menus_00D7] - [0x20, 0x00F2, Menus_00D8] +- [0x20, 0x00F3, Menus_00D9] - [0x20, 0x00F4, Menus_00DA] - [0x20, 0x00F5, Menus_00DB] - [0x20, 0x00F6, Menus_00DC] @@ -2568,6 +4595,11 @@ - [0x20, 0x010A, Menus_00F0] - [0x20, 0x010B, Menus_00F1] - [0x20, 0x0172, Menus_Inspect_Toybox] +- [0x20, 0x0173, Menus_Inspect_ChompStatue] +- [0x20, 0x0174, Menus_Inspect_Phonograph] +- [0x20, 0x0175, Menus_Inspect_RaphaelStatue] +- [0x20, 0x017C, Menus_ISK11_TakeItemPrompt] +- [0x20, 0x017E, Menus_Inspect_DoesntOpen] - [0x20, 0x017F, Menus_Inspect_FoundHammer] - [0x20, 0x0180, Menus_Sign_BewareOfGoombas] - [0x20, 0x0181, Menus_Sign_EatMushroomsTip] @@ -2577,6 +4609,8 @@ - [0x20, 0x0186, Menus_Inspect_LockedFromInside] - [0x20, 0x0187, Menus_016B] - [0x20, 0x0188, Menus_016C] +- [0x20, 0x0189, Menus_016D] +- [0x20, 0x018A, Menus_016E] - [0x20, 0x018B, Menus_016F] - [0x20, 0x018C, Menus_0170] - [0x20, 0x018D, Menus_0171] @@ -2585,12 +4619,34 @@ - [0x20, 0x0190, Menus_0174] - [0x20, 0x0191, Menus_0175] - [0x20, 0x0193, Menus_0177] +- [0x20, 0x0194, Menus_0178] +- [0x20, 0x0195, Menus_0179] - [0x20, 0x0196, Menus_017A] +- [0x20, 0x0197, Menus_017B] +- [0x20, 0x0198, Menus_017C] +- [0x20, 0x0199, Menus_017D] +- [0x20, 0x019A, Menus_017E] +- [0x20, 0x019B, Menus_017F] +- [0x20, 0x019C, Menus_0180] +- [0x20, 0x019D, Menus_0181] +- [0x20, 0x019E, Menus_0182] +- [0x20, 0x019F, Menus_0183] +- [0x20, 0x01A0, Menus_0184] - [0x20, 0x01A3, Menus_0187] +- [0x20, 0x01A4, Menus_0188] - [0x20, 0x01A5, Menus_0189] +- [0x20, 0x01A6, Menus_018A] +- [0x20, 0x01A7, Menus_018B] - [0x20, 0x01A8, Menus_018C] +- [0x20, 0x01A9, Menus_018D] +- [0x20, 0x01AB, Menus_018F] +- [0x20, 0x01AD, Menus_0191] - [0x20, 0x01AE, Menus_0192] +- [0x20, 0x01AF, Menus_0193] - [0x20, 0x01B0, Menus_0194] +- [0x20, 0x01B1, Menus_0195] +- [0x20, 0x01B4, Menus_0198] +- [0x20, 0x01B5, Menus_0199] - [0x20, 0x01B6, Menus_019A] - [0x20, 0x01B7, Menus_019B] - [0x20, 0x01BE, Menus_019C] @@ -2610,6 +4666,7 @@ - [0x20, 0x01CC, Menus_01A9] - [0x20, 0x01CD, Menus_01AA] - [0x20, 0x01CE, Menus_01AB] +- [0x21, 0x0000, Choice_0000] - [0x21, 0x0002, Choice_0001] - [0x21, 0x0003, Choice_0002] - [0x21, 0x0004, Choice_0003] @@ -2626,11 +4683,47 @@ - [0x21, 0x000F, Choice_000F] - [0x21, 0x0010, Choice_0010] - [0x21, 0x0011, Choice_0011] +- [0x21, 0x0012, Choice_0012] - [0x21, 0x0013, Choice_0013] +- [0x21, 0x0014, Choice_0014] - [0x21, 0x0016, Choice_0016] - [0x21, 0x0017, Choice_0017] +- [0x21, 0x0018, Choice_0018] +- [0x21, 0x0019, Choice_0019] +- [0x21, 0x001A, Choice_001A] +- [0x21, 0x001B, Choice_001B] +- [0x21, 0x001C, Choice_001C] - [0x21, 0x001D, Choice_001D] +- [0x21, 0x001E, Choice_001E] +- [0x21, 0x0022, Choice_0022] +- [0x21, 0x0023, Choice_0023] +- [0x21, 0x0024, Choice_0024] +- [0x21, 0x0025, Choice_0025] +- [0x21, 0x0026, Choice_0026] +- [0x21, 0x0027, Choice_0027] +- [0x21, 0x0028, Choice_0028] +- [0x21, 0x0029, Choice_0029] +- [0x21, 0x002A, Choice_002A] +- [0x21, 0x002B, Choice_002B] +- [0x21, 0x002C, Choice_002C] +- [0x21, 0x002D, Choice_002D] +- [0x21, 0x002E, Choice_002E] +- [0x21, 0x002F, Choice_002F] +- [0x21, 0x0030, Choice_0030] +- [0x21, 0x0031, Choice_0031] +- [0x21, 0x0032, Choice_0032] +- [0x21, 0x0033, Choice_0033] +- [0x21, 0x0034, Choice_0034] +- [0x21, 0x0035, Choice_0035] - [0x21, 0x0036, Choice_0036] +- [0x21, 0x0045, Choice_0045] +- [0x21, 0x0046, Choice_0046] +- [0x21, 0x0047, Choice_0047] +- [0x21, 0x0048, Choice_0048] +- [0x21, 0x0049, Choice_0049] +- [0x21, 0x004A, Choice_004A] +- [0x21, 0x004B, Choice_004B] +- [0x21, 0x004C, Choice_004C] - [0x21, 0x004D, Choice_004D] - [0x22, 0x0001, MenuTip_0032] - [0x22, 0x000B, MenuTip_0034] @@ -2809,6 +4902,164 @@ - [0x26, 0x004C, MerlonHint_004C] - [0x26, 0x004D, MerlonHint_004D] - [0x26, 0x004E, MerlonHint_004E] +- [0x27, 0x0000, MerluvleeHint_MegaJump] +- [0x27, 0x0001, MerluvleeHint_JumpCharge] +- [0x27, 0x0002, MerluvleeHint_SuperJumpCharge] +- [0x27, 0x0003, MerluvleeHint_Multibounce] +- [0x27, 0x0004, MerluvleeHint_ShrinkStomp] +- [0x27, 0x0005, MerluvleeHint_SleepStomp] +- [0x27, 0x0006, MerluvleeHint_DizzyStomp] +- [0x27, 0x0007, MerluvleeHint_DDownJump] +- [0x27, 0x0008, MerluvleeHint_PowerBounce] +- [0x27, 0x0009, MerluvleeHint_PowerSmash] +- [0x27, 0x000A, MerluvleeHint_MegaSmash] +- [0x27, 0x000B, MerluvleeHint_SmashCharge] +- [0x27, 0x000C, MerluvleeHint_SuperSmashCharge] +- [0x27, 0x000D, MerluvleeHint_SpinSmash] +- [0x27, 0x000E, MerluvleeHint_QuakeHammer] +- [0x27, 0x000F, MerluvleeHint_PowerQuake] +- [0x27, 0x0010, MerluvleeHint_MegaQuake] +- [0x27, 0x0011, MerluvleeHint_HammerThrow] +- [0x27, 0x0012, MerluvleeHint_DDownPound] +- [0x27, 0x0013, MerluvleeHint_DoubleDip] +- [0x27, 0x0014, MerluvleeHint_TripleDip] +- [0x27, 0x0015, MerluvleeHint_GroupFocus] +- [0x27, 0x0016, MerluvleeHint_QuickChange] +- [0x27, 0x0017, MerluvleeHint_DeepFocus1] +- [0x27, 0x0018, MerluvleeHint_DeepFocus2] +- [0x27, 0x0019, MerluvleeHint_DeepFocus3] +- [0x27, 0x001A, MerluvleeHint_HPPlus1] +- [0x27, 0x001B, MerluvleeHint_HPPlus2] +- [0x27, 0x001C, MerluvleeHint_HPPlus3] +- [0x27, 0x001D, MerluvleeHint_FPPlus1] +- [0x27, 0x001E, MerluvleeHint_FPPlus2] +- [0x27, 0x001F, MerluvleeHint_FPPlus3] +- [0x27, 0x0020, MerluvleeHint_HappyHeart1] +- [0x27, 0x0021, MerluvleeHint_HappyHeart2] +- [0x27, 0x0022, MerluvleeHint_HappyFlower1] +- [0x27, 0x0023, MerluvleeHint_HappyFlower2] +- [0x27, 0x0024, MerluvleeHint_FlowerSaver1] +- [0x27, 0x0025, MerluvleeHint_FlowerSaver2] +- [0x27, 0x0026, MerluvleeHint_DodgeMaster] +- [0x27, 0x0027, MerluvleeHint_PdownDup] +- [0x27, 0x0028, MerluvleeHint_PupDdown] +- [0x27, 0x0029, MerluvleeHint_AllorNothing] +- [0x27, 0x002A, MerluvleeHint_PowerPlus1] +- [0x27, 0x002B, MerluvleeHint_PowerPlus2] +- [0x27, 0x002C, MerluvleeHint_HPDrain] +- [0x27, 0x002D, MerluvleeHint_LastStand] +- [0x27, 0x002E, MerluvleeHint_PowerRush] +- [0x27, 0x002F, MerluvleeHint_CloseCall] +- [0x27, 0x0030, MerluvleeHint_MegaRush] +- [0x27, 0x0031, MerluvleeHint_DamageDodge1] +- [0x27, 0x0032, MerluvleeHint_DamageDodge2] +- [0x27, 0x0033, MerluvleeHint_DefendPlus] +- [0x27, 0x0034, MerluvleeHint_IcePower] +- [0x27, 0x0035, MerluvleeHint_FireShield] +- [0x27, 0x0036, MerluvleeHint_SpikeShield] +- [0x27, 0x0037, MerluvleeHint_FeelingFine] +- [0x27, 0x0038, MerluvleeHint_ZapTap] +- [0x27, 0x0039, MerluvleeHint_PrettyLucky] +- [0x27, 0x003A, MerluvleeHint_LuckyDay] +- [0x27, 0x003B, MerluvleeHint_SlowGo] +- [0x27, 0x003C, MerluvleeHint_AttackFXA] +- [0x27, 0x003D, MerluvleeHint_AttackFXD] +- [0x27, 0x003E, MerluvleeHint_AttackFXB] +- [0x27, 0x003F, MerluvleeHint_AttackFXE] +- [0x27, 0x0040, MerluvleeHint_AttackFXC] +- [0x27, 0x0041, MerluvleeHint_Refund] +- [0x27, 0x0042, MerluvleeHint_PayOff] +- [0x27, 0x0043, MerluvleeHint_RunawayPay] +- [0x27, 0x0044, MerluvleeHint_HeartFinder] +- [0x27, 0x0045, MerluvleeHint_FlowerFinder] +- [0x27, 0x0046, MerluvleeHint_MoneyMoney] +- [0x27, 0x0047, MerluvleeHint_Peekaboo] +- [0x27, 0x0048, MerluvleeHint_ISpy] +- [0x27, 0x0049, MerluvleeHint_ChillOut] +- [0x27, 0x004A, MerluvleeHint_SpeedySpin] +- [0x27, 0x004B, MerluvleeHint_DizzyAttack] +- [0x27, 0x004C, MerluvleeHint_SpinAttack] +- [0x27, 0x004D, MerluvleeHint_BumpAttack] +- [0x27, 0x004E, MerluvleeHint_FirstAttack] +- [0x27, 0x004F, MerluvleeHint_SuperBlock_01] +- [0x27, 0x0050, MerluvleeHint_SuperBlock_02] +- [0x27, 0x0051, MerluvleeHint_SuperBlock_03] +- [0x27, 0x0052, MerluvleeHint_SuperBlock_04] +- [0x27, 0x0053, MerluvleeHint_SuperBlock_05] +- [0x27, 0x0054, MerluvleeHint_SuperBlock_06] +- [0x27, 0x0055, MerluvleeHint_SuperBlock_07] +- [0x27, 0x0056, MerluvleeHint_SuperBlock_08] +- [0x27, 0x0057, MerluvleeHint_SuperBlock_09] +- [0x27, 0x0058, MerluvleeHint_SuperBlock_10] +- [0x27, 0x0059, MerluvleeHint_SuperBlock_11] +- [0x27, 0x005A, MerluvleeHint_SuperBlock_12] +- [0x27, 0x005B, MerluvleeHint_SuperBlock_13] +- [0x27, 0x005C, MerluvleeHint_SuperBlock_14] +- [0x27, 0x005D, MerluvleeHint_SuperBlock_15] +- [0x27, 0x005E, MerluvleeHint_SuperBlock_16] +- [0x27, 0x005F, MerluvleeHint_StarPiece_01] +- [0x27, 0x0060, MerluvleeHint_StarPiece_02] +- [0x27, 0x0061, MerluvleeHint_StarPiece_03] +- [0x27, 0x0062, MerluvleeHint_StarPiece_04] +- [0x27, 0x0063, MerluvleeHint_StarPiece_05] +- [0x27, 0x0064, MerluvleeHint_StarPiece_06] +- [0x27, 0x0065, MerluvleeHint_StarPiece_07] +- [0x27, 0x0066, MerluvleeHint_StarPiece_08] +- [0x27, 0x0067, MerluvleeHint_StarPiece_09] +- [0x27, 0x0068, MerluvleeHint_StarPiece_10] +- [0x27, 0x0069, MerluvleeHint_StarPiece_11] +- [0x27, 0x006A, MerluvleeHint_StarPiece_12] +- [0x27, 0x006B, MerluvleeHint_StarPiece_13] +- [0x27, 0x006C, MerluvleeHint_StarPiece_14] +- [0x27, 0x006D, MerluvleeHint_StarPiece_15] +- [0x27, 0x006E, MerluvleeHint_StarPiece_16] +- [0x27, 0x006F, MerluvleeHint_StarPiece_17] +- [0x27, 0x0070, MerluvleeHint_StarPiece_18] +- [0x27, 0x0071, MerluvleeHint_StarPiece_19] +- [0x27, 0x0072, MerluvleeHint_StarPiece_20] +- [0x27, 0x0073, MerluvleeHint_StarPiece_21] +- [0x27, 0x0074, MerluvleeHint_StarPiece_22] +- [0x27, 0x0075, MerluvleeHint_StarPiece_23] +- [0x27, 0x0076, MerluvleeHint_StarPiece_24] +- [0x27, 0x0077, MerluvleeHint_StarPiece_25] +- [0x27, 0x0078, MerluvleeHint_StarPiece_26] +- [0x27, 0x0079, MerluvleeHint_StarPiece_27] +- [0x27, 0x007A, MerluvleeHint_StarPiece_28] +- [0x27, 0x007B, MerluvleeHint_StarPiece_29] +- [0x27, 0x007C, MerluvleeHint_StarPiece_30] +- [0x27, 0x007D, MerluvleeHint_StarPiece_31] +- [0x27, 0x007E, MerluvleeHint_StarPiece_32] +- [0x27, 0x007F, MerluvleeHint_StarPiece_33] +- [0x27, 0x0080, MerluvleeHint_StarPiece_34] +- [0x27, 0x0081, MerluvleeHint_StarPiece_35] +- [0x27, 0x0082, MerluvleeHint_StarPiece_36] +- [0x27, 0x0083, MerluvleeHint_StarPiece_37] +- [0x27, 0x0084, MerluvleeHint_StarPiece_38] +- [0x27, 0x0085, MerluvleeHint_StarPiece_39] +- [0x27, 0x0086, MerluvleeHint_StarPiece_40] +- [0x27, 0x0087, MerluvleeHint_StarPiece_41] +- [0x27, 0x0088, MerluvleeHint_StarPiece_42] +- [0x27, 0x0089, MerluvleeHint_StarPiece_43] +- [0x27, 0x008A, MerluvleeHint_StarPiece_44] +- [0x27, 0x008B, MerluvleeHint_StarPiece_45] +- [0x27, 0x008C, MerluvleeHint_StarPiece_46] +- [0x27, 0x008D, MerluvleeHint_StarPiece_47] +- [0x27, 0x008E, MerluvleeHint_StarPiece_48] +- [0x27, 0x008F, MerluvleeHint_StarPiece_49] +- [0x27, 0x0090, MerluvleeHint_StarPiece_50] +- [0x27, 0x0091, MerluvleeHint_StarPiece_51] +- [0x27, 0x0092, MerluvleeHint_StarPiece_52] +- [0x27, 0x0093, MerluvleeHint_StarPiece_53] +- [0x27, 0x0094, MerluvleeHint_StarPiece_54] +- [0x27, 0x0095, MerluvleeHint_StarPiece_55] +- [0x27, 0x0096, MerluvleeHint_StarPiece_56] +- [0x27, 0x0097, MerluvleeHint_StarPiece_57] +- [0x27, 0x0098, MerluvleeHint_StarPiece_58] +- [0x27, 0x0099, MerluvleeHint_StarPiece_59] +- [0x27, 0x009A, MerluvleeHint_StarPiece_60] +- [0x27, 0x009B, MerluvleeHint_StarPiece_61] +- [0x27, 0x009C, MerluvleeHint_StarPiece_62] +- [0x27, 0x009D, MerluvleeHint_StarPiece_63] - [0x28, 0x0000, ItemShortDesc_FireFlower] - [0x28, 0x0001, ItemShortDesc_SnowmanDoll] - [0x28, 0x0002, ItemShortDesc_ThunderRage] @@ -3111,17 +5362,28 @@ - [0x28, 0x013E, ItemShortDesc_KootPackage] - [0x28, 0x013F, ItemShortDesc_KootRedJar] - [0x29, 0x0000, ItemShopDesc_FireFlower] +- [0x29, 0x0001, ItemShopDesc_SnowmanDoll] - [0x29, 0x0002, ItemShopDesc_ThunderRage] +- [0x29, 0x0003, ItemShopDesc_ThunderBolt] +- [0x29, 0x0004, ItemShopDesc_ShootingStar] +- [0x29, 0x0005, ItemShopDesc_DustyHammer] - [0x29, 0x0007, ItemShopDesc_StoneCap] - [0x29, 0x0008, ItemShopDesc_VoltShroom] - [0x29, 0x000C, ItemShopDesc_Mushroom] - [0x29, 0x000D, ItemShopDesc_SuperShroom] +- [0x29, 0x000F, ItemShopDesc_LifeShroom] +- [0x29, 0x0010, ItemShopDesc_DriedShroom] - [0x29, 0x0011, ItemShopDesc_TastyTonic] +- [0x29, 0x0012, ItemShopDesc_SuperSoda] - [0x29, 0x0019, ItemShopDesc_HoneySyrup] +- [0x29, 0x001A, ItemShopDesc_MapleSyrup] +- [0x29, 0x0020, ItemShopDesc_DriedPasta] - [0x29, 0x0029, ItemShopDesc_SleepySheep] - [0x29, 0x002B, ItemShopDesc_POWBlock] +- [0x29, 0x002D, ItemShopDesc_StopWatch] - [0x29, 0x002E, ItemShopDesc_DizzyDial] - [0x29, 0x0031, ItemShopDesc_FrightJar] +- [0x29, 0x0032, ItemShopDesc_Mystery] - [0x29, 0x0065, ItemShopDesc_JumpCharge] - [0x29, 0x0067, ItemShopDesc_SleepStomp] - [0x29, 0x0069, ItemShopDesc_Multibounce] @@ -3133,11 +5395,26 @@ - [0x29, 0x0080, ItemShopDesc_GroupFocus] - [0x29, 0x0082, ItemShopDesc_HPPlus] - [0x29, 0x0083, ItemShopDesc_FPPlus] +- [0x29, 0x0084, ItemShopDesc_PowerPlus] - [0x29, 0x0086, ItemShopDesc_DamageDodge] +- [0x29, 0x0089, ItemShopDesc_HPDrain] +- [0x29, 0x008B, ItemShopDesc_HappyHeart] +- [0x29, 0x008D, ItemShopDesc_HappyFlower] +- [0x29, 0x008E, ItemShopDesc_FlowerSaver] +- [0x29, 0x0090, ItemShopDesc_HeartFinder] +- [0x29, 0x0091, ItemShopDesc_FlowerFinder] - [0x29, 0x0095, ItemShopDesc_DodgeMaster] +- [0x29, 0x0096, ItemShopDesc_PrettyLucky] - [0x29, 0x009C, ItemShopDesc_FirstAttack] - [0x29, 0x00A0, ItemShopDesc_SpeedySpin] +- [0x29, 0x00A1, ItemShopDesc_FeelingFine] +- [0x29, 0x00A2, ItemShopDesc_AttackFXA] - [0x29, 0x00A8, ItemShopDesc_AllorNothing] +- [0x29, 0x00AB, ItemShopDesc_PayOff] +- [0x29, 0x00AD, ItemShopDesc_ChillOut] +- [0x29, 0x00AE, ItemShopDesc_ZapTap] +- [0x29, 0x00AF, ItemShopDesc_MoneyMoney] +- [0x29, 0x00B5, ItemShopDesc_Peekaboo] - [0x2A, 0x0000, ItemFullDesc_FireFlower] - [0x2A, 0x0001, ItemFullDesc_SnowmanDoll] - [0x2A, 0x0002, ItemFullDesc_ThunderRage] @@ -3844,6 +6121,144 @@ - [0x2D, 0x002F, Shop_14_MAC04] - [0x2D, 0x0030, Shop_15_MAC04] - [0x2D, 0x0031, Shop_16_MAC04] +- [0x2D, 0x0032, Shop_00_NOK01] +- [0x2D, 0x0033, Shop_01_NOK01] +- [0x2D, 0x0034, Shop_02_NOK01] +- [0x2D, 0x0035, Shop_03_NOK01] +- [0x2D, 0x0036, Shop_04_NOK01] +- [0x2D, 0x0037, Shop_05_NOK01] +- [0x2D, 0x0038, Shop_06_NOK01] +- [0x2D, 0x0039, Shop_07_NOK01] +- [0x2D, 0x003A, Shop_08_NOK01] +- [0x2D, 0x003B, Shop_09_NOK01] +- [0x2D, 0x003C, Shop_0A_NOK01] +- [0x2D, 0x003D, Shop_0B_NOK01] +- [0x2D, 0x003E, Shop_0C_NOK01] +- [0x2D, 0x003F, Shop_0D_NOK01] +- [0x2D, 0x0040, Shop_0E_NOK01] +- [0x2D, 0x0041, Shop_0F_NOK01] +- [0x2D, 0x0042, Shop_10_NOK01] +- [0x2D, 0x0043, Shop_11_NOK01] +- [0x2D, 0x0044, Shop_12_NOK01] +- [0x2D, 0x0045, Shop_13_NOK01] +- [0x2D, 0x0046, Shop_14_NOK01] +- [0x2D, 0x0047, Shop_15_NOK01] +- [0x2D, 0x0048, Shop_16_NOK01] +- [0x2D, 0x0049, Shop_00_DR001] +- [0x2D, 0x004A, Shop_01_DR001] +- [0x2D, 0x004B, Shop_02_DR001] +- [0x2D, 0x004C, Shop_03_DR001] +- [0x2D, 0x004D, Shop_04_DR001] +- [0x2D, 0x004E, Shop_05_DR001] +- [0x2D, 0x004F, Shop_06_DR001] +- [0x2D, 0x0050, Shop_07_DR001] +- [0x2D, 0x0051, Shop_08_DR001] +- [0x2D, 0x0052, Shop_09_DR001] +- [0x2D, 0x0053, Shop_0A_DR001] +- [0x2D, 0x0054, Shop_0B_DR001] +- [0x2D, 0x0055, Shop_0C_DR001] +- [0x2D, 0x0056, Shop_0D_DR001] +- [0x2D, 0x0057, Shop_0E_DR001] +- [0x2D, 0x0058, Shop_0F_DR001] +- [0x2D, 0x0059, Shop_10_DR001] +- [0x2D, 0x005A, Shop_11_DR001] +- [0x2D, 0x005B, Shop_12_DR001] +- [0x2D, 0x005C, Shop_13_DR001] +- [0x2D, 0x005D, Shop_14_DR001] +- [0x2D, 0x005E, Shop_15_DR001] +- [0x2D, 0x005F, Shop_16_DR001] +- [0x2D, 0x0060, Shop_00_OBK03] +- [0x2D, 0x0061, Shop_01_OBK03] +- [0x2D, 0x0062, Shop_02_OBK03] +- [0x2D, 0x0063, Shop_03_OBK03] +- [0x2D, 0x0064, Shop_04_OBK03] +- [0x2D, 0x0065, Shop_05_OBK03] +- [0x2D, 0x0066, Shop_06_OBK03] +- [0x2D, 0x0067, Shop_07_OBK03] +- [0x2D, 0x0068, Shop_08_OBK03] +- [0x2D, 0x0069, Shop_09_OBK03] +- [0x2D, 0x006A, Shop_0A_OBK03] +- [0x2D, 0x006B, Shop_0B_OBK03] +- [0x2D, 0x006C, Shop_0C_OBK03] +- [0x2D, 0x006D, Shop_0D_OBK03] +- [0x2D, 0x006E, Shop_0E_OBK03] +- [0x2D, 0x006F, Shop_0F_OBK03] +- [0x2D, 0x0070, Shop_10_OBK03] +- [0x2D, 0x0071, Shop_11_OBK03] +- [0x2D, 0x0072, Shop_12_OBK03] +- [0x2D, 0x0073, Shop_13_OBK03] +- [0x2D, 0x0074, Shop_14_OBK03] +- [0x2D, 0x0075, Shop_15_OBK03] +- [0x2D, 0x0076, Shop_16_OBK03] +- [0x2D, 0x0077, Shop_00_JAN03] +- [0x2D, 0x0078, Shop_01_JAN03] +- [0x2D, 0x0079, Shop_02_JAN03] +- [0x2D, 0x007A, Shop_03_JAN03] +- [0x2D, 0x007B, Shop_04_JAN03] +- [0x2D, 0x007C, Shop_05_JAN03] +- [0x2D, 0x007D, Shop_06_JAN03] +- [0x2D, 0x007E, Shop_07_JAN03] +- [0x2D, 0x007F, Shop_08_JAN03] +- [0x2D, 0x0080, Shop_09_JAN03] +- [0x2D, 0x0081, Shop_0A_JAN03] +- [0x2D, 0x0082, Shop_0B_JAN03] +- [0x2D, 0x0083, Shop_0C_JAN03] +- [0x2D, 0x0084, Shop_0D_JAN03] +- [0x2D, 0x0085, Shop_0E_JAN03] +- [0x2D, 0x0086, Shop_0F_JAN03] +- [0x2D, 0x0087, Shop_10_JAN03] +- [0x2D, 0x0088, Shop_11_JAN03] +- [0x2D, 0x0089, Shop_12_JAN03] +- [0x2D, 0x008A, Shop_13_JAN03] +- [0x2D, 0x008B, Shop_14_JAN03] +- [0x2D, 0x008C, Shop_15_JAN03] +- [0x2D, 0x008D, Shop_16_JAN03] +- [0x2D, 0x00A5, Shop_00_HOS03] +- [0x2D, 0x00A6, Shop_01_HOS03] +- [0x2D, 0x00A7, Shop_02_HOS03] +- [0x2D, 0x00A8, Shop_03_HOS03] +- [0x2D, 0x00A9, Shop_04_HOS03] +- [0x2D, 0x00AA, Shop_05_HOS03] +- [0x2D, 0x00AB, Shop_06_HOS03] +- [0x2D, 0x00AC, Shop_07_HOS03] +- [0x2D, 0x00AD, Shop_08_HOS03] +- [0x2D, 0x00AE, Shop_09_HOS03] +- [0x2D, 0x00AF, Shop_0A_HOS03] +- [0x2D, 0x00B0, Shop_0B_HOS03] +- [0x2D, 0x00B1, Shop_0C_HOS03] +- [0x2D, 0x00B2, Shop_0D_HOS03] +- [0x2D, 0x00B3, Shop_0E_HOS03] +- [0x2D, 0x00B4, Shop_0F_HOS03] +- [0x2D, 0x00B5, Shop_10_HOS03] +- [0x2D, 0x00B6, Shop_11_HOS03] +- [0x2D, 0x00B7, Shop_12_HOS03] +- [0x2D, 0x00B8, Shop_13_HOS03] +- [0x2D, 0x00B9, Shop_14_HOS03] +- [0x2D, 0x00BA, Shop_15_HOS03] +- [0x2D, 0x00BB, Shop_16_HOS03] +- [0x2D, 0x00BC, Shop_00_KPA96] +- [0x2D, 0x00BD, Shop_01_KPA96] +- [0x2D, 0x00BE, Shop_02_KPA96] +- [0x2D, 0x00BF, Shop_03_KPA96] +- [0x2D, 0x00C0, Shop_04_KPA96] +- [0x2D, 0x00C1, Shop_05_KPA96] +- [0x2D, 0x00C2, Shop_06_KPA96] +- [0x2D, 0x00C3, Shop_07_KPA96] +- [0x2D, 0x00C4, Shop_08_KPA96] +- [0x2D, 0x00C5, Shop_09_KPA96] +- [0x2D, 0x00C6, Shop_0A_KPA96] +- [0x2D, 0x00C7, Shop_0B_KPA96] +- [0x2D, 0x00C8, Shop_0C_KPA96] +- [0x2D, 0x00C9, Shop_0D_KPA96] +- [0x2D, 0x00CA, Shop_0E_KPA96] +- [0x2D, 0x00CB, Shop_0F_KPA96] +- [0x2D, 0x00CC, Shop_10_KPA96] +- [0x2D, 0x00CD, Shop_11_KPA96] +- [0x2D, 0x00CE, Shop_12_KPA96] +- [0x2D, 0x00CF, Shop_13_KPA96] +- [0x2D, 0x00D0, Shop_14_KPA96] +- [0x2D, 0x00D1, Shop_15_KPA96] +- [0x2D, 0x00D2, Shop_16_KPA96] - [0x2E, 0x0000, PartnerDesc_Goombario_World] - [0x2E, 0x0001, PartnerDesc_Goombario_Battle] - [0x2E, 0x0002, PartnerDesc_Goombario_Battle_Headbonk] diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml index c4cda72a16a..947184f20f9 100644 --- a/ver/jp/splat.yaml +++ b/ver/jp/splat.yaml @@ -8904,766 +8904,2181 @@ segments: subsegments: - [auto, c, main] - [auto, c, entity] - - type: bin - name: dro_01 + - name: dro_01 + dir: world/area_dro/dro_01 + type: code start: 0x964580 vram: 0x80240000 - - type: bin - name: dro_02 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, shop] + - [auto, c, rooms] + - [auto, c, entity] + - [auto, c, foliage] + - name: dro_02 + dir: world/area_dro/dro_02 + type: code start: 0x972500 vram: 0x80240000 - - type: bin - name: isk_01 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, entity] + - [auto, c, main] + - [auto, c, rooms] + - [auto, c, npc] + - start: 0x977298 + type: .data + name: npc + subsegments: + - [0x977298] + - [0x979AA0, ci4, card, 32, 32] + - [0x979CA0, palette, card] + - [0x979CC0, vtx, card_1] + - [0x979D40, vtx, card_2] + - [0x979D80, gfx, card_setup] + - [0x979E70, gfx, card_1] + - [0x979EF0, gfx, card_2] + - [0x979F38] + - [0x97B290] # unmapped vtx/gfx for toad house blanket + - [0x97CDD8] + - [0x9813C8] + - name: isk_01 + dir: world/area_isk/isk_01 + type: code start: 0x981440 vram: 0x80240000 - - type: bin - name: isk_02 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, haze] + - [auto, c, entity] + - name: isk_02 + dir: world/area_isk/isk_02 + type: code start: 0x981A10 vram: 0x80240000 - - type: bin - name: isk_03 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, lock] + - [auto, c, ambush] + - [auto, c, entity] + - [auto, c, npc] + - name: isk_03 + dir: world/area_isk/isk_03 + type: code start: 0x983150 vram: 0x80240000 - - type: bin - name: isk_04 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, sand] + - [auto, c, entity] + - [auto, c, switch] + - name: isk_04 + dir: world/area_isk/isk_04 + type: code start: 0x984930 vram: 0x80240000 - - type: bin - name: isk_05 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, obstructions] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, demo] + - name: isk_05 + dir: world/area_isk/isk_05 + type: code start: 0x986DD0 vram: 0x80240000 - - type: bin - name: isk_06 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: isk_06 + dir: world/area_isk/isk_06 + type: code start: 0x989D20 vram: 0x80240000 - - type: bin - name: isk_07 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, sand] + - [auto, c, switch] + - name: isk_07 + dir: world/area_isk/isk_07 + type: code start: 0x98B740 vram: 0x80240000 - - type: bin - name: isk_08 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, stairs] + - [auto, c, lock] + - [auto, c, switch] + - [auto, c, ambush] + - name: isk_08 + dir: world/area_isk/isk_08 + type: code start: 0x98E130 vram: 0x80240000 - - type: bin - name: isk_09 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: isk_09 + dir: world/area_isk/isk_09 + type: code start: 0x98F7E0 vram: 0x80240000 - - type: bin - name: isk_10 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, stairs] + - [auto, c, switch] + - name: isk_10 + dir: world/area_isk/isk_10 + type: code start: 0x991E60 vram: 0x80240000 - - type: bin - name: isk_11 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, bombable] + - name: isk_11 + dir: world/area_isk/isk_11 + type: code start: 0x993D10 vram: 0x80240000 - - type: bin - name: isk_12 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, scene] + - [auto, c, puzzle] + - [auto, c, lock] + - name: isk_12 + dir: world/area_isk/isk_12 + type: code start: 0x996940 vram: 0x80240000 - - type: bin - name: isk_13 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, sand] + - [auto, c, switch] + - name: isk_13 + dir: world/area_isk/isk_13 + type: code start: 0x998AE0 vram: 0x80240000 - - type: bin - name: isk_14 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: isk_14 + dir: world/area_isk/isk_14 + type: code start: 0x99BA30 vram: 0x80240000 - - type: bin - name: isk_16 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: isk_16 + dir: world/area_isk/isk_16 + type: code start: 0x99E4F0 vram: 0x80240000 - - type: bin - name: isk_18 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, boss] + - [auto, c, entity] + - name: isk_18 + dir: world/area_isk/isk_18 + type: code start: 0x9A1270 vram: 0x80240000 - - type: bin - name: isk_19 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: isk_19 + dir: world/area_isk/isk_19 + type: code start: 0x9A2A40 vram: 0x80240000 - - type: bin - name: trd_00 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - name: trd_00 + dir: world/area_trd/trd_00 + type: code start: 0x9A2F70 vram: 0x80240000 - - type: bin - name: trd_01 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: trd_01 + dir: world/area_trd/trd_01 + type: code start: 0x9A5C90 vram: 0x80240000 - - type: bin - name: trd_02 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: trd_02 + dir: world/area_trd/trd_02 + type: code start: 0x9AA2E0 vram: 0x80240000 - - type: bin - name: trd_03 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: trd_03 + dir: world/area_trd/trd_03 + type: code start: 0x9AD950 vram: 0x80240000 - - type: bin - name: trd_04 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, puzzle] + - name: trd_04 + dir: world/area_trd/trd_04 + type: code start: 0x9B16F0 vram: 0x80240000 - - type: bin - name: trd_05 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: trd_05 + dir: world/area_trd/trd_05 + type: code start: 0x9B7A00 vram: 0x80240000 - - type: bin - name: trd_06 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, trap] + - [auto, c, npc] + - name: trd_06 + dir: world/area_trd/trd_06 + type: code start: 0x9BAA90 vram: 0x80240000 - - type: bin - name: trd_07 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, falling] + - [auto, c, npc_prisoners] + - [auto, c, npc_koopa_bros] + - [auto, c, entity] + - name: trd_07 + dir: world/area_trd/trd_07 + type: code start: 0x9BFDC0 vram: 0x80240000 - - type: bin - name: trd_08 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, magic_doors] + - name: trd_08 + dir: world/area_trd/trd_08 + type: code start: 0x9C46E0 vram: 0x80240000 - - type: bin - name: trd_09 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: trd_09 + dir: world/area_trd/trd_09 + type: code start: 0x9C6AA0 vram: 0x80240000 - - type: bin - name: trd_10 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, demo] + - name: trd_10 + dir: world/area_trd/trd_10 + type: code start: 0x9CBD50 vram: 0x80240000 - - type: bin - name: nok_01 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, fake_bowser] + - name: nok_01 + dir: world/area_nok/nok_01 + type: code start: 0x9CE820 vram: 0x80240000 - - type: bin - name: nok_02 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, shop] + - [auto, c, rooms] + - [auto, c, radio] + - [auto, c, foliage] + - name: nok_02 + dir: world/area_nok/nok_02 + type: code start: 0x9E0440 vram: 0x80240000 - - type: bin - name: nok_03 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, rooms] + - [auto, c, bookshelf] + - [auto, c, npc] + - [auto, c, demo] + - [auto, c, koot_favors] + - [auto, c, foliage] + - [auto, c, epilogue] + - name: nok_03 + dir: world/area_nok/nok_03 + type: code start: 0x9F4C10 vram: 0x80240000 - - type: bin - name: nok_04 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: nok_04 + dir: world/area_nok/nok_04 + type: code start: 0x9F7010 vram: 0x80240000 - - type: bin - name: nok_11 - start: 0x9FDE60 - vram: 0x80240000 - - type: bin - name: nok_12 - start: 0xA03C50 - vram: 0x80240000 - - type: bin - name: nok_13 - start: 0xA09A60 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, new_partner] + - name: nok_11 + dir: world/area_nok/nok_11 + type: code + start: 0x9FDE60 vram: 0x80240000 - - type: bin - name: nok_14 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: nok_12 + dir: world/area_nok/nok_12 + type: code + start: 0xA03C50 + vram: 0x80240000 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, bridge] + - [auto, c, foliage] + - [auto, c, npc] + - [auto, c, demo] + - name: nok_13 + dir: world/area_nok/nok_13 + type: code + start: 0xA09A60 + vram: 0x80240000 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, musical_hill] + - name: nok_14 + dir: world/area_nok/nok_14 + type: code start: 0xA0BCA0 vram: 0x80240000 - - type: bin - name: nok_15 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, bridge] + - [auto, c, npc] + - name: nok_15 + dir: world/area_nok/nok_15 + type: code start: 0xA10360 vram: 0x80240000 - - type: bin - name: hos_00 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, foliage] + - name: hos_00 + dir: world/area_hos/hos_00 + type: code start: 0xA15150 vram: 0x80240000 - - type: bin - name: hos_01 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, unused] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, scenes] + - [auto, c, shade_gfx] + - name: hos_01 + dir: world/area_hos/hos_01 + type: code start: 0xA19CE0 vram: 0x80240000 - - type: bin - name: hos_02 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, model_fx] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, star_way] + - name: hos_02 + dir: world/area_hos/hos_02 + type: code start: 0xA1F680 vram: 0x80240000 - - type: bin - name: hos_03 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, model_fx] + - [auto, c, unused] + - [auto, c, npc] + - [auto, c, descent] + - name: hos_03 + dir: world/area_hos/hos_03 + type: code start: 0xA24560 vram: 0x80240000 - - type: bin - name: hos_04 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, model_fx] + - [auto, c, rooms] + - [auto, c, foliage] + - [auto, c, npc] + - [auto, c, shop] + - [auto, c, entity] + - name: hos_04 + dir: world/area_hos/hos_04 + type: code start: 0xA302F0 vram: 0x80240000 - - type: bin - name: hos_05 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, fountains] + - [auto, c, unused] + - [auto, c, intro] + - [auto, c, narrator] + - [auto, c, starship] # comes before narrator in other versions + - name: hos_05 + dir: world/area_hos/hos_05 + type: code start: 0xA336B0 vram: 0x80240000 - - type: bin - name: hos_06 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, misc] + - [auto, c, npc] + - [auto, c, intro] + - [auto, c, narrator] + - [auto, c, model_fx] + - [auto, c, star_ship] + - name: hos_06 + dir: world/area_hos/hos_06 + type: code start: 0xA428F0 vram: 0x80240000 - - type: bin - name: hos_10 + subsegments: + - [auto, c, settings] + - [auto, c, entity] + - [auto, c, main] + - [auto, c, merlow] + - [auto, c, rooms] + - [auto, c, merluvlee] + - [auto, c, chest] + - name: hos_10 + dir: world/area_hos/hos_10 + type: code start: 0xA48B10 vram: 0x80240000 - - type: bin - name: hos_20 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, npc1] + - [auto, c, npc2] + - [auto, c, main] + - [auto, c, intro] + - [auto, c, pre_title] + - [auto, c, narrator] # JP exclusive + - [auto, c, ending] + - name: hos_20 + dir: world/area_hos/hos_20 + type: code start: 0xA4F120 vram: 0x80240000 - - type: bin - name: kpa_01 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, starship] + - name: kpa_01 + dir: world/area_kpa/kpa_01 + type: code start: 0xA50750 vram: 0x80240000 - - type: bin - name: kpa_03 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: kpa_03 + dir: world/area_kpa/kpa_03 + type: code start: 0xA51DB0 vram: 0x80240000 - - type: bin - name: kpa_04 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: kpa_04 + dir: world/area_kpa/kpa_04 + type: code start: 0xA55750 vram: 0x80240000 - - type: bin - name: kpa_08 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, statues] + - name: kpa_08 + dir: world/area_kpa/kpa_08 + type: code start: 0xA56170 vram: 0x80240000 - - type: bin - name: kpa_09 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: kpa_09 + dir: world/area_kpa/kpa_09 + type: code start: 0xA58750 vram: 0x80240000 - - type: bin - name: kpa_10 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: kpa_10 + dir: world/area_kpa/kpa_10 + type: code start: 0xA5B0D0 vram: 0x80240000 - - type: bin - name: kpa_11 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: kpa_11 + dir: world/area_kpa/kpa_11 + type: code start: 0xA5C010 vram: 0x80240000 - - type: bin - name: kpa_12 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: kpa_12 + dir: world/area_kpa/kpa_12 + type: code start: 0xA5E0A0 vram: 0x80240000 - - type: bin - name: kpa_13 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, platforms] + - name: kpa_13 + dir: world/area_kpa/kpa_13 + type: code start: 0xA5F670 vram: 0x80240000 - - type: bin - name: kpa_14 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, platforms] + - name: kpa_14 + dir: world/area_kpa/kpa_14 + type: code start: 0xA60BE0 vram: 0x80240000 - - type: bin - name: kpa_15 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, platforms] + - name: kpa_15 + dir: world/area_kpa/kpa_15 + type: code start: 0xA62AC0 vram: 0x80240000 - - type: bin - name: kpa_16 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - name: kpa_16 + dir: world/area_kpa/kpa_16 + type: code start: 0xA637A0 vram: 0x80240000 - - type: bin - name: kpa_17 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: kpa_17 + dir: world/area_kpa/kpa_17 + type: code start: 0xA66190 vram: 0x80240000 - - type: bin - name: kpa_32 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, entity] + - [auto, c, main] + - [auto, c, npc] + - name: kpa_32 + dir: world/area_kpa/kpa_32 + type: code start: 0xA67830 vram: 0x80240000 - - type: bin - name: kpa_33 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, entity] + - [auto, c, main] + - name: kpa_33 + dir: world/area_kpa/kpa_33 + type: code start: 0xA687F0 vram: 0x80240000 - - type: bin - name: kpa_40 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, entity] + - [auto, c, main] + - name: kpa_40 + dir: world/area_kpa/kpa_40 + type: code start: 0xA697B0 vram: 0x80240000 - - type: bin - name: kpa_41 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - name: kpa_41 + dir: world/area_kpa/kpa_41 + type: code start: 0xA69BE0 vram: 0x80240000 - - type: bin - name: kpa_50 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - name: kpa_50 + dir: world/area_kpa/kpa_50 + type: code start: 0xA6A140 vram: 0x80240000 - - type: bin - name: kpa_51 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - name: kpa_51 + dir: world/area_kpa/kpa_51 + type: code start: 0xA6D800 vram: 0x80240000 - - type: bin - name: kpa_52 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - name: kpa_52 + dir: world/area_kpa/kpa_52 + type: code start: 0xA70870 vram: 0x80240000 - - type: bin - name: kpa_53 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, entity] + - [auto, c, main] + - [auto, c, npc] + - name: kpa_53 + dir: world/area_kpa/kpa_53 + type: code start: 0xA74410 vram: 0x80240000 - - type: bin - name: kpa_60 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: kpa_60 + dir: world/area_kpa/kpa_60 + type: code start: 0xA76270 vram: 0x80240000 - - type: bin - name: kpa_61 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, entity] + - [auto, c, main] + - [auto, c, scenes] + - name: kpa_61 + dir: world/area_kpa/kpa_61 + type: code start: 0xA77B50 vram: 0x80240000 - - type: bin - name: kpa_62 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: kpa_62 + dir: world/area_kpa/kpa_62 + type: code start: 0xA7B990 vram: 0x80240000 - - type: bin - name: kpa_63 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, entity] + - [auto, c, main] + - name: kpa_63 + dir: world/area_kpa/kpa_63 + type: code start: 0xA7CD20 vram: 0x80240000 - - type: bin - name: kpa_70 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, entity] + - [auto, c, main] + - [auto, c, scenes] + - name: kpa_70 + dir: world/area_kpa/kpa_70 + type: code start: 0xA7DFE0 vram: 0x80240000 - - type: bin - name: kpa_81 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, chain_skele] + - [auto, c, chain_anim] + - name: kpa_81 + dir: world/area_kpa/kpa_81 + type: code start: 0xA81C30 vram: 0x80240000 - - type: bin - name: kpa_82 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - name: kpa_82 + dir: world/area_kpa/kpa_82 + type: code start: 0xA83C50 vram: 0x80240000 - - type: bin - name: kpa_83 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - name: kpa_83 + dir: world/area_kpa/kpa_83 + type: code start: 0xA8CBB0 vram: 0x80240000 - - type: bin - name: kpa_90 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - name: kpa_90 + dir: world/area_kpa/kpa_90 + type: code start: 0xA8FED0 vram: 0x80240000 - - type: bin + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - name: kpa_91 + dir: world/area_kpa/kpa_91 + type: code name: kpa_91 start: 0xA90170 vram: 0x80240000 - - type: bin - name: kpa_94 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: kpa_94 + dir: world/area_kpa/kpa_94 + type: code start: 0xA95EE0 vram: 0x80240000 - - type: bin - name: kpa_95 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - name: kpa_95 + dir: world/area_kpa/kpa_95 + type: code start: 0xA961A0 vram: 0x80240000 - - type: bin - name: kpa_96 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, entity] + - [auto, c, main] + - [auto, c, npc] + - name: kpa_96 + dir: world/area_kpa/kpa_96 + type: code start: 0xA9BEE0 vram: 0x80240000 - - type: bin - name: kpa_100 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - name: kpa_100 + dir: world/area_kpa/kpa_100 + type: code start: 0xA9C880 vram: 0x80240000 - - type: bin - name: kpa_101 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - name: kpa_101 + dir: world/area_kpa/kpa_101 + type: code start: 0xA9CB60 vram: 0x80240000 - - type: bin - name: kpa_102 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - name: kpa_102 + dir: world/area_kpa/kpa_102 + type: code start: 0xA9CE60 vram: 0x80240000 - - type: bin - name: kpa_111 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - name: kpa_111 + dir: world/area_kpa/kpa_111 + type: code start: 0xAA2CB0 vram: 0x80240000 - - type: bin - name: kpa_112 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, statues] + - [auto, c, npc] + - [auto, c, entity] + - name: kpa_112 + dir: world/area_kpa/kpa_112 + type: code start: 0xAA6010 vram: 0x80240000 - - type: bin - name: kpa_113 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - name: kpa_113 + dir: world/area_kpa/kpa_113 + type: code start: 0xAA62B0 vram: 0x80240000 - - type: bin - name: kpa_114 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, statues] + - [auto, c, npc] + - name: kpa_114 + dir: world/area_kpa/kpa_114 + type: code start: 0xAA7F60 vram: 0x80240000 - - type: bin - name: kpa_115 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - name: kpa_115 + dir: world/area_kpa/kpa_115 + type: code start: 0xAA8320 vram: 0x80240000 - - type: bin - name: kpa_116 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, statues] + - [auto, c, npc] + - name: kpa_116 + dir: world/area_kpa/kpa_116 + type: code start: 0xAAB410 vram: 0x80240000 - - type: bin - name: kpa_117 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - name: kpa_117 + dir: world/area_kpa/kpa_117 + type: code start: 0xAAB6B0 vram: 0x80240000 - - type: bin - name: kpa_118 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - name: kpa_118 + dir: world/area_kpa/kpa_118 + type: code start: 0xAAB8F0 vram: 0x80240000 - - type: bin - name: kpa_119 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - name: kpa_119 + dir: world/area_kpa/kpa_119 + type: code start: 0xAABB90 vram: 0x80240000 - - type: bin - name: kpa_121 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, entity] + - [auto, c, main] + - name: kpa_121 + dir: world/area_kpa/kpa_121 + type: code start: 0xAABE20 vram: 0x80240000 - - type: bin - name: kpa_130 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - name: kpa_130 + dir: world/area_kpa/kpa_130 + type: code start: 0xAAC250 vram: 0x80240000 - - type: bin - name: kpa_133 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - name: kpa_133 + dir: world/area_kpa/kpa_133 + type: code start: 0xAB09B0 vram: 0x80240000 - - type: bin - name: kpa_134 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, water] + - [auto, c, ease] + - name: kpa_134 + dir: world/area_kpa/kpa_134 + type: code start: 0xAB24D0 vram: 0x80240000 - - type: bin - name: osr_00 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, chains] + - [auto, c, npc] + - [auto, c, panels] + - [auto, c, entity] + - name: osr_00 + dir: world/area_osr/osr_00 + type: code start: 0xAB5D60 vram: 0x80240000 - - type: bin - name: osr_01 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc_intro] + - [auto, c, npc_epilogue] + - [auto, c, scenes] + - name: osr_01 + dir: world/area_osr/osr_01 + type: code start: 0xAB9520 vram: 0x80240000 - - type: bin - name: osr_02 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - name: osr_02 + dir: world/area_osr/osr_02 + type: code start: 0xABB6A0 vram: 0x80240000 - - type: bin - name: osr_03 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, npc_peach] + - name: osr_03 + dir: world/area_osr/osr_03 + type: code start: 0xABF7C0 vram: 0x80240000 - - type: bin - name: osr_04 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, intro] + - [auto, c, starship] + - [auto, c, interlude] + - [auto, c, ending] + - name: osr_04 + dir: world/area_osr/osr_04 + type: code start: 0xAC27E0 vram: 0x80240000 - - type: bin - name: kkj_00 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, assault] + - name: kkj_00 + dir: world/area_kkj/kkj_00 + type: code start: 0xAC47C0 vram: 0x80240000 - - type: bin - name: kkj_01 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc_intro] + - [auto, c, scene_intro] + - [auto, c, npc_ending] + - [auto, c, scene_ending] + - name: kkj_01 + dir: world/area_kkj/kkj_01 + type: code start: 0xACE6A0 vram: 0x80240000 - - type: bin - name: kkj_02 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - name: kkj_02 + dir: world/area_kkj/kkj_02 + type: code start: 0xAD2250 vram: 0x80240000 - - type: bin - name: kkj_03 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - name: kkj_03 + dir: world/area_kkj/kkj_03 + type: code start: 0xAD2C40 vram: 0x80240000 - - type: bin - name: kkj_10 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, scenes] + - name: kkj_10 + dir: world/area_kkj/kkj_10 + type: code start: 0xAD4050 vram: 0x80240000 - - type: bin - name: kkj_11 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npcs_early] + - [auto, c, npcs_later] + - name: kkj_11 + dir: world/area_kkj/kkj_11 + type: code start: 0xAD7670 vram: 0x80240000 - - type: bin - name: kkj_12 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, scene] + - [auto, c, demo] + - [auto, c, npcs_early] + - [auto, c, npcs_later] + - name: kkj_12 + dir: world/area_kkj/kkj_12 + type: code start: 0xADD5C0 vram: 0x80240000 - - type: bin - name: kkj_13 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npc] + - name: kkj_13 + dir: world/area_kkj/kkj_13 + type: code start: 0xADF400 vram: 0x80240000 - - type: bin - name: kkj_14 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npcs_finale] + - [auto, c, npcs_intro] + - [auto, c, intro_scenes] + - name: kkj_14 + dir: world/area_kkj/kkj_14 + type: code start: 0xAE4360 vram: 0x80240000 - - type: bin - name: kkj_15 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, interactables] + - [auto, c, npc_guards] + - [auto, c, npc_ch0] + - [auto, c, npc_ch2] + - [auto, c, npc_ch7] + - [auto, c, chapter0] + - [auto, c, chapter1] + - [auto, c, chapter2] + - [auto, c, chapter3] + - [auto, c, chapter4] + - [auto, c, chapter5] + - [auto, c, chapter6] + - [auto, c, chapter7] + - name: kkj_15 + dir: world/area_kkj/kkj_15 + type: code start: 0xAEEA50 vram: 0x80240000 - - type: bin - name: kkj_16 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, rotating_wall] + - [auto, c, chapter0] + - [auto, c, chapter1] + - [auto, c, chapter2] + - [auto, c, chapter3] + - [auto, c, npc_chapter0] + - [auto, c, npc_chapter1] + - [auto, c, npc_chapter3] + - name: kkj_16 + dir: world/area_kkj/kkj_16 + type: code start: 0xAF68D0 vram: 0x80240000 - - type: bin - name: kkj_17 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npcs_early] + - [auto, c, npcs_later] + - [auto, c, stealth] + - [auto, c, entity] + - name: kkj_17 + dir: world/area_kkj/kkj_17 + type: code start: 0xAFB120 vram: 0x80240000 - - type: bin - name: kkj_18 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, chest] + - name: kkj_18 + dir: world/area_kkj/kkj_18 + type: code start: 0xAFC160 vram: 0x80240000 - - type: bin - name: kkj_19 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, gourmet] + - name: kkj_19 + dir: world/area_kkj/kkj_19 + type: code start: 0xB00E10 vram: 0x80240000 - - type: bin - name: kkj_20 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npcs_intro] + - [auto, c, npcs_peach] + - [auto, c, baking] + - name: kkj_20 + dir: world/area_kkj/kkj_20 + type: code start: 0xB07000 vram: 0x80240000 - - type: bin - name: kkj_21 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: kkj_21 + dir: world/area_kkj/kkj_21 + type: code start: 0xB0B760 vram: 0x80240000 - - type: bin - name: kkj_22 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - name: kkj_22 + dir: world/area_kkj/kkj_22 + type: code start: 0xB0B9B0 vram: 0x80240000 - - type: bin - name: kkj_23 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - name: kkj_23 + dir: world/area_kkj/kkj_23 + type: code start: 0xB0BD40 vram: 0x80240000 - - type: bin - name: kkj_24 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npcs_finale] + - [auto, c, npcs_peach] + - [auto, c, scene] + - name: kkj_24 + dir: world/area_kkj/kkj_24 + type: code start: 0xB0FA30 vram: 0x80240000 - - type: bin - name: kkj_25 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - name: kkj_25 + dir: world/area_kkj/kkj_25 + type: code start: 0xB0FEC0 vram: 0x80240000 - - type: bin - name: kkj_26 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npc_initial] + - [auto, c, npc_midpoint] + - [auto, c, npc_final] + - [auto, c, arena] + - [auto, c, peach_free] + - [auto, c, kammy_defeated] + - [auto, c, bowser_defeated] + - [auto, c, entity] + - name: kkj_26 + dir: world/area_kkj/kkj_26 + type: code start: 0xB1C5B0 vram: 0x80240000 - - type: bin - name: kkj_27 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, scenes] + - [auto, c, demo] + - name: kkj_27 + dir: world/area_kkj/kkj_27 + type: code start: 0xB1D200 vram: 0x80240000 - - type: bin - name: kkj_28 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, rotating_wall] + - name: kkj_28 + dir: world/area_kkj/kkj_28 + type: code start: 0xB1E330 vram: 0x80240000 - - type: bin - name: kkj_29 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - name: kkj_29 + dir: world/area_kkj/kkj_29 + type: code start: 0xB1E540 vram: 0x80240000 - - type: bin - name: tst_01 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, quiz] + - name: tst_01 + dir: world/area_tst/tst_01 + type: code start: 0xB23D90 vram: 0x80240000 - - type: bin - name: tst_02 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - name: tst_02 + dir: world/area_tst/tst_02 + type: code start: 0xB240C0 vram: 0x80240000 - - type: bin - name: tst_03 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - name: tst_03 + dir: world/area_tst/tst_03 + type: code start: 0xB24410 vram: 0x80240000 - - type: bin - name: tst_04 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - name: tst_04 + dir: world/area_tst/tst_04 + type: code start: 0xB24A00 vram: 0x80240000 - - type: bin - name: tst_10 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - [auto, c, reflection] + - [auto, c, npc] + - name: tst_10 + dir: world/area_tst/tst_10 + type: code start: 0xB259D0 vram: 0x80240000 - - type: bin - name: tst_11 + subsegments: + - [auto, c, main] + - name: tst_11 + dir: world/area_tst/tst_11 + type: code start: 0xB25EE0 vram: 0x80240000 - - type: bin - name: tst_12 + subsegments: + - [auto, c, main] + - [auto, c, extra] + - name: tst_12 + dir: world/area_tst/tst_12 + type: code start: 0xB26780 vram: 0x80240000 - - type: bin - name: tst_13 + subsegments: + - [auto, c, main] + - name: tst_13 + dir: world/area_tst/tst_13 + type: code start: 0xB26BF0 vram: 0x80240000 - - type: bin - name: tst_20 + subsegments: + - [auto, c, main] + - start: 0xB26FB0 + type: .data + name: main + subsegments: + - [0xB26FB0] + - [0xB28EA0, vtx, shockwave] + - [0xB29450, gfx, shockwave] + - [0xB297E0] + - name: tst_20 + dir: world/area_tst/tst_20 + type: code start: 0xB29900 vram: 0x80240000 - - type: bin - name: jan_00 + subsegments: + - [auto, c, main] + - name: jan_00 + dir: world/area_jan/jan_00 + type: code start: 0xB299D0 vram: 0x80240000 - - type: bin - name: jan_01 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, whale] + - [auto, c, foliage] + - name: jan_01 + dir: world/area_jan/jan_01 + type: code start: 0xB314C0 vram: 0x80240000 - - type: bin - name: jan_02 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, foliage] + - name: jan_02 + dir: world/area_jan/jan_02 + type: code start: 0xB35900 vram: 0x80240000 - - type: bin - name: jan_03 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, foliage] + - name: jan_03 + dir: world/area_jan/jan_03 + type: code start: 0xB3E010 vram: 0x80240000 - - type: bin - name: jan_04 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, shop] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, rooms] + - [auto, c, foliage] + - name: jan_04 + dir: world/area_jan/jan_04 + type: code start: 0xB4DB70 vram: 0x80240000 - - type: bin - name: jan_05 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, unused] + - [auto, c, trees] + - [auto, c, scenes] + - [auto, c, treasure] + - [auto, c, bushes] + - [auto, c, demo] + - name: jan_05 + dir: world/area_jan/jan_05 + type: code start: 0xB53E40 vram: 0x80240000 - - type: bin - name: jan_06 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, log] + - [auto, c, bushes] + - [auto, c, npc] + - [auto, c, trees] + - [auto, c, entity] + - name: jan_06 + dir: world/area_jan/jan_06 + type: code start: 0xB5BC00 vram: 0x80240000 - - type: bin - name: jan_07 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, statue] + - [auto, c, log] + - [auto, c, trees] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, bushes] + - name: jan_07 + dir: world/area_jan/jan_07 + type: code start: 0xB62C40 vram: 0x80240000 - - type: bin - name: jan_08 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, trees] + - [auto, c, bushes] + - name: jan_08 + dir: world/area_jan/jan_08 + type: code start: 0xB675C0 vram: 0x80240000 - - type: bin - name: jan_09 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, bushes] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, trees] + - name: jan_09 + dir: world/area_jan/jan_09 + type: code start: 0xB6EDC0 vram: 0x80240000 - - type: bin - name: jan_10 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, bushes] + - [auto, c, npc] + - [auto, c, trees] + - [auto, c, entity] + - name: jan_10 + dir: world/area_jan/jan_10 + type: code start: 0xB756A0 vram: 0x80240000 - - type: bin - name: jan_11 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, log] + - [auto, c, trees] + - [auto, c, bushes] + - [auto, c, entity] + - name: jan_11 + dir: world/area_jan/jan_11 + type: code start: 0xB79B70 vram: 0x80240000 - - type: bin - name: jan_12 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - name: jan_12 + dir: world/area_jan/jan_12 + type: code start: 0xB7C3C0 vram: 0x80240000 - - type: bin - name: jan_13 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, vines] + - [auto, c, trees] + - [auto, c, entity] + - [auto, c, npc] + - name: jan_13 + dir: world/area_jan/jan_13 + type: code start: 0xB7FAC0 vram: 0x80240000 - - type: bin - name: jan_14 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, puzzle] + - [auto, c, trees] + - [auto, c, entity] + - name: jan_14 + dir: world/area_jan/jan_14 + type: code start: 0xB83360 vram: 0x80240000 - - type: bin - name: jan_15 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, vines] + - [auto, c, trees] + - [auto, c, npc] + - name: jan_15 + dir: world/area_jan/jan_15 + type: code start: 0xB86C30 vram: 0x80240000 - - type: bin - name: jan_16 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, trees] + - [auto, c, entity] + - name: jan_16 + dir: world/area_jan/jan_16 + type: code start: 0xB89310 vram: 0x80240000 - - type: bin - name: jan_17 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, bushes] + - name: jan_17 + dir: world/area_jan/jan_17 + type: code start: 0xB8CAD0 vram: 0x80240000 - - type: bin - name: jan_18 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - name: jan_18 + dir: world/area_jan/jan_18 + type: code start: 0xB8CEA0 vram: 0x80240000 - - type: bin - name: jan_19 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - name: jan_19 + dir: world/area_jan/jan_19 + type: code start: 0xB8D170 vram: 0x80240000 - - type: bin - name: jan_22 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - name: jan_22 + dir: world/area_jan/jan_22 + type: code start: 0xB8D490 vram: 0x80240000 - - type: bin - name: jan_23 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, zipline] + - [auto, c, bushes] + - [auto, c, trees] + - name: jan_23 + dir: world/area_jan/jan_23 + type: code start: 0xB98FE0 vram: 0x80240000 - - type: bin - name: mim_01 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - name: mim_01 + dir: world/area_mim/mim_01 + type: code start: 0xB9C750 vram: 0x80240000 - - type: bin - name: mim_02 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, hint] + - [auto, c, gate] + - [auto, c, npc] + - name: mim_02 + dir: world/area_mim/mim_02 + type: code start: 0xBA0F10 vram: 0x80240000 - - type: bin - name: mim_03 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, gate] + - [auto, c, hint] + - name: mim_03 + dir: world/area_mim/mim_03 + type: code start: 0xBA4790 vram: 0x80240000 - - type: bin - name: mim_04 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, hint] + - [auto, c, gate] + - [auto, c, npc] + - name: mim_04 + dir: world/area_mim/mim_04 + type: code start: 0xBA6C70 vram: 0x80240000 - - type: bin - name: mim_05 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, hint] + - [auto, c, gate] + - [auto, c, npc] + - name: mim_05 + dir: world/area_mim/mim_05 + type: code start: 0xBA9A40 vram: 0x80240000 - - type: bin - name: mim_06 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, hint] + - [auto, c, gate] + - [auto, c, npc] + - name: mim_06 + dir: world/area_mim/mim_06 + type: code start: 0xBADA90 vram: 0x80240000 - - type: bin - name: mim_07 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, hint] + - [auto, c, gate] + - [auto, c, npc] + - name: mim_07 + dir: world/area_mim/mim_07 + type: code start: 0xBB3450 vram: 0x80240000 - - type: bin - name: mim_08 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, hint] + - [auto, c, gate] + - [auto, c, npc] + - name: mim_08 + dir: world/area_mim/mim_08 + type: code start: 0xBB6C10 vram: 0x80240000 - - type: bin - name: mim_09 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, gate] + - [auto, c, npc] + - name: mim_09 + dir: world/area_mim/mim_09 + type: code start: 0xBBC0D0 vram: 0x80240000 - - type: bin - name: mim_10 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, hint] + - [auto, c, gate] + - [auto, c, npc] + - name: mim_10 + dir: world/area_mim/mim_10 + type: code start: 0xBBECB0 vram: 0x80240000 - - type: bin - name: mim_11 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, entity] + - [auto, c, main] + - [auto, c, npc] + - name: mim_11 + dir: world/area_mim/mim_11 + type: code start: 0xBC0340 vram: 0x80240000 - - type: bin - name: mim_12 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, gate] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, foliage] + - name: mim_12 + dir: world/area_mim/mim_12 + type: code start: 0xBC4650 vram: 0x80240000 - - type: bin - name: obk_01 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, entity] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, gate] + - name: obk_01 + dir: world/area_obk/obk_01 + type: code start: 0xBC6470 vram: 0x80240000 - - type: bin - name: obk_02 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, chandelier] + - [auto, c, portrait] + - [auto, c, jump_scare] + - [auto, c, npc] + - [auto, c, entity] + - name: obk_02 + dir: world/area_obk/obk_02 + type: code start: 0xBCBD60 vram: 0x80240000 - - type: bin - name: obk_03 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, bombable] + - [auto, c, clock] + - [auto, c, entity] + - name: obk_03 + dir: world/area_obk/obk_03 + type: code start: 0xBCD550 vram: 0x80240000 - - type: bin - name: obk_04 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, shop] + - [auto, c, entity] + - [auto, c, stairs] + - [auto, c, npc] + - [auto, c, rocking_chair] + - name: obk_04 + dir: world/area_obk/obk_04 + type: code start: 0xBD1130 vram: 0x80240000 - - type: bin - name: obk_05 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, main] + - [auto, c, hole] + - [auto, c, game] + - name: obk_05 + dir: world/area_obk/obk_05 + type: code start: 0xBD6330 vram: 0x80240000 - - type: bin - name: obk_06 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, rocking_chair] + - [auto, c, hole] + - [auto, c, npc] + - [auto, c, entity] + - name: obk_06 + dir: world/area_obk/obk_06 + type: code start: 0xBD7960 vram: 0x80240000 - - type: bin - name: obk_07 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, bombable] + - [auto, c, entity] + - name: obk_07 + dir: world/area_obk/obk_07 + type: code start: 0xBD7EC0 vram: 0x80240000 - - type: bin - name: obk_08 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, fireplace] + - [auto, c, npc] + - [auto, c, phonograph] + - name: obk_08 + dir: world/area_obk/obk_08 + type: code start: 0xBDCBB0 vram: 0x80240000 - - type: bin - name: obk_09 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, cabinets] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, game] + - name: obk_09 + dir: world/area_obk/obk_09 + type: code start: 0xBE3AF0 vram: 0x80240000 - - type: bin - name: arn_02 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, meet_bow] + - [auto, c, npc] + - [auto, c, new_partner] + - [auto, c, epilogue] + - name: arn_02 + dir: world/area_arn/arn_02 + type: code start: 0xBE64F0 vram: 0x80240000 - - type: bin - name: arn_03 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: arn_03 + dir: world/area_arn/arn_03 + type: code start: 0xBE80D0 vram: 0x80240000 - - type: bin - name: arn_04 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: arn_04 + dir: world/area_arn/arn_04 + type: code start: 0xBECAF0 vram: 0x80240000 - - type: bin - name: arn_05 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: arn_05 + dir: world/area_arn/arn_05 + type: code start: 0xBF0F20 vram: 0x80240000 - - type: bin - name: arn_07 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: arn_07 + dir: world/area_arn/arn_07 + type: code start: 0xBF6130 vram: 0x80240000 - - type: bin - name: arn_08 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, windmill] + - [auto, c, entity] + - [auto, c, npc] + - name: arn_08 + dir: world/area_arn/arn_08 + type: code start: 0xBFDAE0 vram: 0x80240000 - - type: bin - name: arn_09 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, well] + - [auto, c, gears] + - [auto, c, demo] + - [auto, c, npc] + - [auto, c, entity] + - name: arn_09 + dir: world/area_arn/arn_09 + type: code start: 0xBFF3A0 vram: 0x80240000 - - type: bin - name: arn_10 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, launch] + - [auto, c, npc] + - name: arn_10 + dir: world/area_arn/arn_10 + type: code start: 0xBFFD40 vram: 0x80240000 - - type: bin - name: arn_11 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: arn_11 + dir: world/area_arn/arn_11 + type: code start: 0xC009C0 vram: 0x80240000 - - type: bin - name: arn_12 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - name: arn_12 + dir: world/area_arn/arn_12 + type: code start: 0xC01AD0 vram: 0x80240000 - - type: bin - name: arn_13 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: arn_13 + dir: world/area_arn/arn_13 + type: code start: 0xC02750 vram: 0x80240000 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] - type: bin name: dgb_00 start: 0xC033E0 diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index 6468fd2d4a4..19d0aeec7de 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -4744,6 +4744,15 @@ D_80241D00 = 0x80241D00; // rom:0x909690 kmr_22_lava_piranha_vine_gfx = 0x80241F00; // rom:0x909890 iwa_01_splash_img = 0x802439C0; // type:func rom:0x91B910 iwa_01_splash_gfx = 0x80243E00; // type:func rom:0x91BD50 +dro_02_card = 0x802475A0; // segment:dro_02 rom:0x979AA0 +dro_02_card_pal = 0x802477A0; // segment:dro_02 rom:0x979CA0 +dro_02_card_1_vtx = 0x802477C0; // segment:dro_02 rom:0x979CC0 size:0x80 +dro_02_card_2_vtx = 0x80247840; // segment:dro_02 rom:0x979D40 size:0x40 +dro_02_card_setup_gfx = 0x80247880; // rom:0x979D80 +dro_02_card_1_gfx = 0x80247970; // rom:0x979E70 +dro_02_card_2_gfx = 0x802479F0; // rom:0x979EF0 +tst_13_shockwave_vtx = 0x802422B0; // rom:0xB28EA0 segment:tst_13 size:0x5B0 +tst_13_shockwave_gfx = 0x80242860; // rom:0xB29450 segment:tst_13 inspect_icon_img = 0x802B7A20; // rom:0xE299C0 inspect_icon_gfx = 0x802B7C40; // rom:0xE29BE0 diff --git a/ver/jp/undefined_syms.txt b/ver/jp/undefined_syms.txt index 754ce6b5e08..85a3aee40f8 100644 --- a/ver/jp/undefined_syms.txt +++ b/ver/jp/undefined_syms.txt @@ -1,3 +1,5 @@ +fx_sun_undeclared = fx_sun; + // boot D_A0000000 = 0xA0000000; D_A4000000 = 0xA4000000; @@ -75,216 +77,6 @@ gFrameBuf1 = 0x803B5000; heap_battleHead = 0x803DA800; gFrameBuf2 = 0x803DA800; -dro_01_settings = 0x80243B70; // segment:dro_01 -dro_02_settings = 0x80243AB0; // segment:dro_02 -isk_01_settings = 0x80240020; // segment:isk_01 -isk_02_settings = 0x80240140; // segment:isk_02 -isk_03_settings = 0x80240030; // segment:isk_03 -isk_04_settings = 0x80240AD0; // segment:isk_04 -isk_05_settings = 0x80241ED0; // segment:isk_05 -isk_06_settings = 0x80240020; // segment:isk_06 -isk_07_settings = 0x80240130; // segment:isk_07 -isk_08_settings = 0x80240930; // segment:isk_08 -isk_09_settings = 0x80240340; // segment:isk_09 -isk_10_settings = 0x80240DE0; // segment:isk_10 -isk_11_settings = 0x802401A0; // segment:isk_11 -isk_12_settings = 0x80240040; // segment:isk_12 -isk_13_settings = 0x80242080; // segment:isk_13 -isk_14_settings = 0x80241D70; // segment:isk_14 -isk_16_settings = 0x80240B20; // segment:isk_16 -isk_18_settings = 0x80240910; // segment:isk_18 -isk_19_settings = 0x80240020; // segment:isk_19 -trd_00_settings = 0x80240690; // segment:trd_00 -trd_01_settings = 0x80241700; // segment:trd_01 -trd_02_settings = 0x80241AA0; // segment:trd_02 -trd_03_settings = 0x80240A40; // segment:trd_03 -trd_04_settings = 0x80243900; // segment:trd_04 -trd_05_settings = 0x802407B0; // segment:trd_05 -trd_06_settings = 0x80240D60; // segment:trd_06 -trd_07_settings = 0x80242910; // segment:trd_07 -trd_08_settings = 0x80240A30; // segment:trd_08 -trd_09_settings = 0x80240200; // segment:trd_09 -trd_10_settings = 0x80240870; // segment:trd_10 -nok_01_settings = 0x80242B90; // segment:nok_01 -nok_02_settings = 0x802445F0; // segment:nok_02 -nok_03_settings = 0x80240E40; // segment:nok_03 -nok_04_settings = 0x80240F40; // segment:nok_04 -nok_11_settings = 0x80241F70; // segment:nok_11 -nok_12_settings = 0x80242100; // segment:nok_12 -nok_13_settings = 0x802414C0; // segment:nok_13 -nok_14_settings = 0x80242440; // segment:nok_14 -nok_15_settings = 0x802427D0; // segment:nok_15 -hos_00_settings = 0x80240D50; // segment:hos_00 -hos_00_map_init = 0x80240000; // segment:hos_00 -hos_01_settings = 0x80240E40; // segment:hos_01 -hos_02_settings = 0x80242B90; // segment:hos_02 -hos_03_settings = 0x802435F0; // segment:hos_03 -hos_04_settings = 0x80240ED0; // segment:hos_04 -hos_05_settings = 0x802458D0; // segment:hos_05 -hos_06_settings = 0x80242570; // segment:hos_06 -hos_10_settings = 0x80240F70; // segment:hos_10 -hos_10_map_init = 0x80240000; // segment:hos_10 -hos_20_settings = 0x80240390; // segment:hos_20 -kpa_01_settings = 0x80240A70; // segment:kpa_01 -kpa_03_settings = 0x80241EE0; // segment:kpa_03 -kpa_04_settings = 0x80240170; // segment:kpa_04 -kpa_08_settings = 0x802414C0; // segment:kpa_08 -kpa_09_settings = 0x80241310; // segment:kpa_09 -kpa_10_settings = 0x80240360; // segment:kpa_10 -kpa_11_settings = 0x80240B40; // segment:kpa_11 -kpa_12_settings = 0x802404A0; // segment:kpa_12 -kpa_13_settings = 0x802404A0; // segment:kpa_13 -kpa_14_settings = 0x802408A0; // segment:kpa_14 -kpa_15_settings = 0x80240620; // segment:kpa_15 -kpa_16_settings = 0x802403B0; // segment:kpa_16 -kpa_17_settings = 0x80240020; // segment:kpa_17 -kpa_32_settings = 0x80240350; // segment:kpa_32 -kpa_33_settings = 0x80240350; // segment:kpa_33 -kpa_40_settings = 0x80240040; // segment:kpa_40 -kpa_41_settings = 0x80240040; // segment:kpa_41 -kpa_50_settings = 0x80241A40; // segment:kpa_50 -kpa_51_settings = 0x80241C40; // segment:kpa_51 -kpa_51_map_init = 0x80240000; // segment:kpa_51 -kpa_52_settings = 0x80241360; // segment:kpa_52 -kpa_53_settings = 0x80240190; // segment:kpa_53 -kpa_53_map_init = 0x80240000; // segment:kpa_53 -kpa_60_settings = 0x80240450; // segment:kpa_60 -kpa_61_settings = 0x80242360; // segment:kpa_61 -kpa_62_settings = 0x80240430; // segment:kpa_62 -kpa_63_settings = 0x802401B0; // segment:kpa_63 -kpa_70_settings = 0x80240B10; // segment:kpa_70 -kpa_81_settings = 0x80240480; // segment:kpa_81 -kpa_81_map_init = 0x80240000; // segment:kpa_81 -kpa_82_settings = 0x80240460; // segment:kpa_82 -kpa_82_map_init = 0x80240000; // segment:kpa_82 -kpa_83_settings = 0x80240090; // segment:kpa_83 -kpa_83_map_init = 0x80240000; // segment:kpa_83 -kpa_90_settings = 0x80240020; // segment:kpa_90 -kpa_91_settings = 0x80241920; // segment:kpa_91 -kpa_94_settings = 0x80240020; // segment:kpa_94 -kpa_95_settings = 0x80241920; // segment:kpa_95 -kpa_96_settings = 0x80240040; // segment:kpa_96 -kpa_100_settings = 0x80240060; // segment:kpa_100 -kpa_100_map_init = 0x80240000; // segment:kpa_100 -kpa_101_settings = 0x80240060; // segment:kpa_101 -kpa_101_map_init = 0x80240000; // segment:kpa_101 -kpa_102_settings = 0x802435B0; // segment:kpa_102 -kpa_111_settings = 0x802413C0; // segment:kpa_111 -kpa_112_settings = 0x80240020; // segment:kpa_112 -kpa_113_settings = 0x80240AB0; // segment:kpa_113 -kpa_114_settings = 0x80240070; // segment:kpa_114 -kpa_114_map_init = 0x80240000; // segment:kpa_114 -kpa_115_settings = 0x802413D0; // segment:kpa_115 -kpa_116_settings = 0x80240020; // segment:kpa_116 -kpa_117_settings = 0x80240010; // segment:kpa_117 -kpa_118_settings = 0x80240020; // segment:kpa_118 -kpa_119_settings = 0x80240010; // segment:kpa_119 -kpa_121_settings = 0x80240020; // segment:kpa_121 -kpa_130_settings = 0x80240760; // segment:kpa_130 -kpa_133_settings = 0x802404B0; // segment:kpa_133 -kpa_134_settings = 0x80240740; // segment:kpa_134 -osr_00_settings = 0x802407E0; // segment:osr_00 -osr_01_settings = 0x80240B00; // segment:osr_01 -osr_01_map_init = 0x80240000; // segment:osr_01 -osr_02_settings = 0x80240170; // segment:osr_02 -osr_02_map_init = 0x80240000; // segment:osr_02 -osr_03_settings = 0x802403F0; // segment:osr_03 -osr_03_map_init = 0x80240000; // segment:osr_03 -osr_04_settings = 0x802400D0; // segment:osr_04 -osr_04_map_init = 0x80240000; // segment:osr_04 -kkj_00_settings = 0x80241030; // segment:kkj_00 -kkj_00_map_init = 0x80240000; // segment:kkj_00 -kkj_01_settings = 0x80240F10; // segment:kkj_01 -kkj_02_settings = 0x80240030; // segment:kkj_02 -kkj_03_settings = 0x80240360; // segment:kkj_03 -kkj_03_map_init = 0x80240000; // segment:kkj_03 -kkj_10_settings = 0x80241120; // segment:kkj_10 -kkj_11_settings = 0x80241160; // segment:kkj_11 -kkj_12_settings = 0x802408D0; // segment:kkj_12 -kkj_13_settings = 0x802407A0; // segment:kkj_13 -kkj_13_map_init = 0x80240000; // segment:kkj_13 -kkj_14_settings = 0x80240580; // segment:kkj_14 -kkj_14_map_init = 0x80240000; // segment:kkj_14 -kkj_15_settings = 0x80240640; // segment:kkj_15 -kkj_16_settings = 0x80241090; // segment:kkj_16 -kkj_17_settings = 0x802405B0; // segment:kkj_17 -kkj_18_settings = 0x80240830; // segment:kkj_18 -kkj_19_settings = 0x80240D20; // segment:kkj_19 -kkj_20_settings = 0x80240600; // segment:kkj_20 -kkj_21_settings = 0x80240010; // segment:kkj_21 -kkj_22_settings = 0x80240020; // segment:kkj_22 -kkj_23_settings = 0x802409F0; // segment:kkj_23 -kkj_23_map_init = 0x80240000; // segment:kkj_23 -kkj_24_settings = 0x80240040; // segment:kkj_24 -kkj_25_settings = 0x80240F50; // segment:kkj_25 -kkj_25_map_init = 0x80240000; // segment:kkj_25 -kkj_26_settings = 0x80240070; // segment:kkj_26 -kkj_27_settings = 0x802404C0; // segment:kkj_27 -kkj_28_settings = 0x80240010; // segment:kkj_28 -kkj_29_settings = 0x80240080; // segment:kkj_29 -tst_01_settings = 0x802400B0; // segment:tst_01 -tst_02_settings = 0x802400B0; // segment:tst_02 -tst_03_settings = 0x802400B0; // segment:tst_03 -tst_04_settings = 0x80240740; // segment:tst_04 -tst_10_settings = 0x80240040; // segment:tst_10 -tst_11_settings = 0x80240780; // segment:tst_11 -tst_12_settings = 0x80240010; // segment:tst_12 -tst_13_settings = 0x802403D0; // segment:tst_13 -tst_20_settings = 0x80240010; // segment:tst_20 -jan_00_settings = 0x80241BD0; // segment:jan_00 -jan_01_settings = 0x802413F0; // segment:jan_01 -jan_02_settings = 0x80242940; // segment:jan_02 -jan_03_settings = 0x802432D0; // segment:jan_03 -jan_04_settings = 0x80241140; // segment:jan_04 -jan_05_settings = 0x80242710; // segment:jan_05 -jan_06_settings = 0x80242620; // segment:jan_06 -jan_07_settings = 0x80241230; // segment:jan_07 -jan_08_settings = 0x80242460; // segment:jan_08 -jan_09_settings = 0x80241960; // segment:jan_09 -jan_10_settings = 0x80241750; // segment:jan_10 -jan_11_settings = 0x80240810; // segment:jan_11 -jan_12_settings = 0x80241280; // segment:jan_12 -jan_13_settings = 0x802405F0; // segment:jan_13 -jan_14_settings = 0x80241300; // segment:jan_14 -jan_15_settings = 0x80240320; // segment:jan_15 -jan_16_settings = 0x80240590; // segment:jan_16 -jan_17_settings = 0x80240040; // segment:jan_17 -jan_18_settings = 0x80240020; // segment:jan_18 -jan_19_settings = 0x80240040; // segment:jan_19 -jan_22_settings = 0x802419A0; // segment:jan_22 -jan_23_settings = 0x80240010; // segment:jan_23 -mim_01_settings = 0x80241EF0; // segment:mim_01 -mim_02_settings = 0x80241220; // segment:mim_02 -mim_03_settings = 0x80240570; // segment:mim_03 -mim_04_settings = 0x80241170; // segment:mim_04 -mim_05_settings = 0x80241A60; // segment:mim_05 -mim_06_settings = 0x80242D70; // segment:mim_06 -mim_07_settings = 0x802410D0; // segment:mim_07 -mim_08_settings = 0x80242F80; // segment:mim_08 -mim_09_settings = 0x80240F00; // segment:mim_09 -mim_10_settings = 0x802401B0; // segment:mim_10 -mim_11_settings = 0x80240C20; // segment:mim_11 -mim_12_settings = 0x80240600; // segment:mim_12 -obk_01_settings = 0x802411B0; // segment:obk_01 -obk_02_settings = 0x802402E0; // segment:obk_02 -obk_03_settings = 0x80241020; // segment:obk_03 -obk_04_settings = 0x80240E90; // segment:obk_04 -obk_05_settings = 0x802409F0; // segment:obk_05 -obk_06_settings = 0x80240020; // segment:obk_06 -obk_07_settings = 0x80241BA0; // segment:obk_07 -obk_08_settings = 0x802417B0; // segment:obk_08 -obk_09_settings = 0x80240460; // segment:obk_09 -arn_02_settings = 0x80241000; // segment:arn_02 -arn_03_settings = 0x80241740; // segment:arn_03 -arn_04_settings = 0x80243390; // segment:arn_04 -arn_05_settings = 0x80241320; // segment:arn_05 -arn_07_settings = 0x80241ED0; // segment:arn_07 -arn_08_settings = 0x802402C0; // segment:arn_08 -arn_09_settings = 0x80240060; // segment:arn_09 -arn_10_settings = 0x80240020; // segment:arn_10 -arn_11_settings = 0x80240010; // segment:arn_11 -arn_12_settings = 0x80240020; // segment:arn_12 -arn_13_settings = 0x80240020; // segment:arn_13 dgb_00_settings = 0x802400D0; // segment:dgb_00 dgb_00_map_init = 0x80240000; // segment:dgb_00 dgb_01_settings = 0x80243460; // segment:dgb_01