diff --git a/include/mapfs/mac_00_hit.h b/include/mapfs/mac_00_hit.h index 4df7a78ab5..f4981883be 100644 --- a/include/mapfs/mac_00_hit.h +++ b/include/mapfs/mac_00_hit.h @@ -1,3 +1,31 @@ +#if VERSION_JP +#define COLLIDER_tt 0x70 +#define COLLIDER_deilim 0x6F +#define COLLIDER_op3 0x67 +#define COLLIDER_op2 0x66 +#define COLLIDER_op_1 0x65 +#define COLLIDER_deilit5u 0x57 +#define COLLIDER_deilit5 0x56 +#define COLLIDER_dummy 0x41 +#define COLLIDER_mono6 0x40 +#define COLLIDER_mono5 0x3F +#define COLLIDER_mono4 0x3E +#define COLLIDER_mono3 0x3D +#define COLLIDER_mono2 0x3C +#define COLLIDER_mono1 0x3B +#define COLLIDER_deilinw 0x39 +#define COLLIDER_o484 0x33 +#define COLLIDER_sign 0x32 +#define COLLIDER_deilit3u 0x2D +#define COLLIDER_deilit3 0x2C +#define COLLIDER_deilit6u 0x23 +#define COLLIDER_deilit6 0x22 +#define COLLIDER_deilit 0x1E +#define COLLIDER_water 0x13 +#define COLLIDER_deilie 0x10 +#define COLLIDER_deilit4u 0x8 +#define COLLIDER_deilit4 0x7 +#else #define COLLIDER_Root 0x6E #define COLLIDER_g74 0x6D #define COLLIDER_tt 0x6C @@ -109,6 +137,7 @@ #define COLLIDER_min2mawari 0x2 #define COLLIDER_o259 0x1 #define COLLIDER_o258 0x0 +#endif #define ZONE_Root 0x12 #define ZONE_g64 0x11 diff --git a/src/recipes_jp.yaml b/src/recipes_jp.yaml new file mode 100644 index 0000000000..50ece5938c --- /dev/null +++ b/src/recipes_jp.yaml @@ -0,0 +1,359 @@ +# All cooking outputs must be listed here, except when cooking a Mystery +Products: + - [ ITEM_MISTAKE, QUALITY_BAD ] + - [ ITEM_FRIED_SHROOM, QUALITY_OK ] + - [ ITEM_SPICY_SOUP, QUALITY_OK ] + - [ ITEM_TASTY_TONIC, QUALITY_OK ] + - [ ITEM_NUTTY_CAKE, QUALITY_OK ] + - [ ITEM_KOOPA_TEA, QUALITY_OK ] + - [ ITEM_SPAGHETTI, QUALITY_OK ] + - [ ITEM_DIZZY_DIAL, QUALITY_ODD ] + - [ ITEM_BIG_COOKIE, QUALITY_GOOD ] + - [ ITEM_CAKE, QUALITY_OK ] + - [ ITEM_FRIED_EGG, QUALITY_OK ] + - [ ITEM_BOILED_EGG, QUALITY_OK ] + - [ ITEM_SUPER_SODA, QUALITY_OK ] + - [ ITEM_YOSHI_COOKIE, QUALITY_OK ] + - [ ITEM_DELUXE_FEAST, QUALITY_GREAT ] + - [ ITEM_FROZEN_FRIES, QUALITY_OK ] + - [ ITEM_POTATO_SALAD, QUALITY_OK ] + - [ ITEM_HOT_SHROOM, QUALITY_OK ] + - [ ITEM_BLAND_MEAL, QUALITY_GOOD ] + - [ ITEM_HONEY_SHROOM, QUALITY_OK ] + - [ ITEM_MAPLE_SHROOM, QUALITY_OK ] + - [ ITEM_JELLY_SHROOM, QUALITY_OK ] + - [ ITEM_LIFE_SHROOM, QUALITY_OK ] + - [ ITEM_VOLT_SHROOM, QUALITY_OK ] + - [ ITEM_SLEEPY_SHEEP, QUALITY_ODD ] + - [ ITEM_SHROOM_CAKE, QUALITY_OK ] + - [ ITEM_SHROOM_STEAK, QUALITY_OK ] + - [ ITEM_HONEY_SUPER, QUALITY_OK ] + - [ ITEM_MAPLE_SUPER, QUALITY_OK ] + - [ ITEM_JELLY_SUPER, QUALITY_OK ] + - [ ITEM_YUMMY_MEAL, QUALITY_GOOD ] + - [ ITEM_HONEY_ULTRA, QUALITY_OK ] + - [ ITEM_MAPLE_ULTRA, QUALITY_OK ] + - [ ITEM_JELLY_ULTRA, QUALITY_OK ] + - [ ITEM_SWEET_SHROOM, QUALITY_OK ] + - [ ITEM_ELECTRO_POP, QUALITY_OK ] + - [ ITEM_THUNDER_RAGE, QUALITY_ODD ] + - [ ITEM_FIRE_POP, QUALITY_OK ] + - [ ITEM_EGG_MISSILE, QUALITY_OK ] + - [ ITEM_SPECIAL_SHAKE, QUALITY_GOOD ] + - [ ITEM_COCO_POP, QUALITY_OK ] + - [ ITEM_HEALTHY_JUICE, QUALITY_GREAT ] + - [ ITEM_LIME_CANDY, QUALITY_OK ] + - [ ITEM_LEMON_CANDY, QUALITY_OK ] + - [ ITEM_HONEY_CANDY, QUALITY_OK ] + - [ ITEM_JELLY_POP, QUALITY_OK ] + - [ ITEM_APPLE_PIE, QUALITY_OK ] + - [ ITEM_KOOPASTA, QUALITY_OK ] + - [ ITEM_KOOKY_COOKIE, QUALITY_OK ] + - [ ITEM_FIRE_FLOWER, QUALITY_ODD ] + - [ ITEM_STRANGE_CAKE, QUALITY_GOOD ] +# Cooking a Mystery has 50% to make MISTAKE and 50% change to create any of these with equal probability +MysteryProducts: + - ITEM_FIRE_FLOWER + - ITEM_TASTY_TONIC + - ITEM_SUPER_SODA + - ITEM_SLEEPY_SHEEP + - ITEM_LIFE_SHROOM + - ITEM_DIZZY_DIAL + - ITEM_VOLT_SHROOM + - ITEM_FRIED_SHROOM + - ITEM_KOOPASTA + - ITEM_SPICY_SOUP + - ITEM_KOOPA_TEA + - ITEM_SPAGHETTI + - ITEM_FRIED_EGG + - ITEM_BOILED_EGG + - ITEM_POTATO_SALAD + - ITEM_HONEY_SHROOM + - ITEM_BLAND_MEAL + - ITEM_THUNDER_RAGE + - ITEM_EGG_MISSILE + - ITEM_APPLE_PIE + - ITEM_KOOKY_COOKIE + - ITEM_BIG_COOKIE + - ITEM_SPECIAL_SHAKE +# [ Input, Product without Cookbook, Product with Cookbook (optional) ] +SingleRecipes: + - [ ITEM_MUSHROOM, ITEM_FRIED_SHROOM ] + - [ ITEM_SUPER_SHROOM, ITEM_FRIED_SHROOM ] + - [ ITEM_ULTRA_SHROOM, ITEM_SHROOM_STEAK ] + - [ ITEM_LIFE_SHROOM, ITEM_HOT_SHROOM ] + - [ ITEM_VOLT_SHROOM, ITEM_HOT_SHROOM ] + - [ ITEM_FIRE_FLOWER, ITEM_SPICY_SOUP ] + - [ ITEM_COCONUT, ITEM_TASTY_TONIC ] + - [ ITEM_LIME, ITEM_TASTY_TONIC ] + - [ ITEM_LEMON, ITEM_TASTY_TONIC ] + - [ ITEM_HONEY_SYRUP, ITEM_SUPER_SODA ] + - [ ITEM_MAPLE_SYRUP, ITEM_SUPER_SODA ] + - [ ITEM_JAMMIN_JELLY, ITEM_SUPER_SODA ] + - [ ITEM_APPLE, ITEM_SUPER_SODA ] + - [ ITEM_RED_BERRY, ITEM_MISTAKE, ITEM_SUPER_SODA ] + - [ ITEM_BLUE_BERRY, ITEM_MISTAKE, ITEM_SUPER_SODA ] + - [ ITEM_YELLOW_BERRY, ITEM_MISTAKE, ITEM_SUPER_SODA ] + - [ ITEM_GOOMNUT, ITEM_NUTTY_CAKE ] + - [ ITEM_KOOPA_LEAF, ITEM_KOOPA_TEA ] + - [ ITEM_DRIED_PASTA, ITEM_SPAGHETTI ] + - [ ITEM_DRIED_FRUIT, ITEM_MISTAKE ] + - [ ITEM_STRANGE_LEAF, ITEM_MISTAKE, ITEM_DIZZY_DIAL ] + - [ ITEM_CAKE_MIX, ITEM_CAKE ] + - [ ITEM_EGG, ITEM_FRIED_EGG ] + - [ ITEM_MELON, ITEM_SPECIAL_SHAKE ] + - [ ITEM_STINKY_HERB, ITEM_MISTAKE ] + - [ ITEM_ICED_POTATO, ITEM_POTATO_SALAD ] + - [ ITEM_DRIED_SHROOM, ITEM_MISTAKE, ITEM_FRIED_SHROOM ] + - [ ITEM_BUBBLE_BERRY, ITEM_MISTAKE, ITEM_TASTY_TONIC ] + - [ ITEM_WHACKAS_BUMP, ITEM_MISTAKE, ITEM_YUMMY_MEAL ] +# [ Input1, Input2, Product ] +# Recipes with both inputs found as ingredients in SingleRecipes will be added to the DoubleRecipesMatrix, +# all others will generate as ExtraDoubleRecipes +DoubleRecipes: + - [ ITEM_MUSHROOM, ITEM_SUPER_SHROOM, ITEM_HOT_SHROOM ] + - [ ITEM_MUSHROOM, ITEM_ULTRA_SHROOM, ITEM_SHROOM_STEAK ] + - [ ITEM_MUSHROOM, ITEM_LIFE_SHROOM, ITEM_SHROOM_STEAK ] + - [ ITEM_MUSHROOM, ITEM_VOLT_SHROOM, ITEM_HOT_SHROOM ] + - [ ITEM_MUSHROOM, ITEM_FIRE_FLOWER, ITEM_HOT_SHROOM ] + - [ ITEM_MUSHROOM, ITEM_HONEY_SYRUP, ITEM_HONEY_SHROOM ] + - [ ITEM_MUSHROOM, ITEM_MAPLE_SYRUP, ITEM_MAPLE_SHROOM ] + - [ ITEM_MUSHROOM, ITEM_JAMMIN_JELLY, ITEM_JELLY_SHROOM ] + - [ ITEM_MUSHROOM, ITEM_GOOMNUT, ITEM_LIFE_SHROOM ] + - [ ITEM_MUSHROOM, ITEM_KOOPA_LEAF, ITEM_LIFE_SHROOM ] + - [ ITEM_MUSHROOM, ITEM_DRIED_PASTA, ITEM_BLAND_MEAL ] + - [ ITEM_MUSHROOM, ITEM_DRIED_FRUIT, ITEM_VOLT_SHROOM ] + - [ ITEM_MUSHROOM, ITEM_STRANGE_LEAF, ITEM_LIFE_SHROOM ] + - [ ITEM_MUSHROOM, ITEM_CAKE_MIX, ITEM_SHROOM_CAKE ] + - [ ITEM_MUSHROOM, ITEM_EGG, ITEM_BLAND_MEAL ] + - [ ITEM_MUSHROOM, ITEM_ICED_POTATO, ITEM_BLAND_MEAL ] + - [ ITEM_MUSHROOM, ITEM_DRIED_SHROOM, ITEM_FRIED_SHROOM ] + - [ ITEM_SUPER_SHROOM, ITEM_ULTRA_SHROOM, ITEM_SHROOM_STEAK ] + - [ ITEM_SUPER_SHROOM, ITEM_LIFE_SHROOM, ITEM_SHROOM_STEAK ] + - [ ITEM_SUPER_SHROOM, ITEM_VOLT_SHROOM, ITEM_HOT_SHROOM ] + - [ ITEM_SUPER_SHROOM, ITEM_FIRE_FLOWER, ITEM_BLAND_MEAL ] + - [ ITEM_SUPER_SHROOM, ITEM_HONEY_SYRUP, ITEM_HONEY_SUPER ] + - [ ITEM_SUPER_SHROOM, ITEM_MAPLE_SYRUP, ITEM_MAPLE_SUPER ] + - [ ITEM_SUPER_SHROOM, ITEM_JAMMIN_JELLY, ITEM_JELLY_SUPER ] + - [ ITEM_SUPER_SHROOM, ITEM_GOOMNUT, ITEM_LIFE_SHROOM ] + - [ ITEM_SUPER_SHROOM, ITEM_KOOPA_LEAF, ITEM_LIFE_SHROOM ] + - [ ITEM_SUPER_SHROOM, ITEM_DRIED_PASTA, ITEM_BLAND_MEAL ] + - [ ITEM_SUPER_SHROOM, ITEM_DRIED_FRUIT, ITEM_VOLT_SHROOM ] + - [ ITEM_SUPER_SHROOM, ITEM_STRANGE_LEAF, ITEM_LIFE_SHROOM ] + - [ ITEM_SUPER_SHROOM, ITEM_CAKE_MIX, ITEM_SHROOM_CAKE ] + - [ ITEM_SUPER_SHROOM, ITEM_EGG, ITEM_BLAND_MEAL ] + - [ ITEM_SUPER_SHROOM, ITEM_ICED_POTATO, ITEM_BLAND_MEAL ] + - [ ITEM_SUPER_SHROOM, ITEM_DRIED_SHROOM, ITEM_HOT_SHROOM ] + - [ ITEM_ULTRA_SHROOM, ITEM_LIFE_SHROOM, ITEM_SHROOM_STEAK ] + - [ ITEM_ULTRA_SHROOM, ITEM_VOLT_SHROOM, ITEM_SHROOM_STEAK ] + - [ ITEM_ULTRA_SHROOM, ITEM_FIRE_FLOWER, ITEM_YUMMY_MEAL ] + - [ ITEM_ULTRA_SHROOM, ITEM_HONEY_SYRUP, ITEM_HONEY_ULTRA ] + - [ ITEM_ULTRA_SHROOM, ITEM_MAPLE_SYRUP, ITEM_MAPLE_ULTRA ] + - [ ITEM_ULTRA_SHROOM, ITEM_JAMMIN_JELLY, ITEM_JELLY_ULTRA ] + - [ ITEM_ULTRA_SHROOM, ITEM_GOOMNUT, ITEM_LIFE_SHROOM ] + - [ ITEM_ULTRA_SHROOM, ITEM_KOOPA_LEAF, ITEM_LIFE_SHROOM ] + - [ ITEM_ULTRA_SHROOM, ITEM_DRIED_PASTA, ITEM_YUMMY_MEAL ] + - [ ITEM_ULTRA_SHROOM, ITEM_DRIED_FRUIT, ITEM_VOLT_SHROOM ] + - [ ITEM_ULTRA_SHROOM, ITEM_STRANGE_LEAF, ITEM_LIFE_SHROOM ] + - [ ITEM_ULTRA_SHROOM, ITEM_CAKE_MIX, ITEM_SWEET_SHROOM ] + - [ ITEM_ULTRA_SHROOM, ITEM_EGG, ITEM_YUMMY_MEAL ] + - [ ITEM_ULTRA_SHROOM, ITEM_ICED_POTATO, ITEM_YUMMY_MEAL ] + - [ ITEM_ULTRA_SHROOM, ITEM_DRIED_SHROOM, ITEM_SHROOM_STEAK ] + - [ ITEM_LIFE_SHROOM, ITEM_FIRE_FLOWER, ITEM_BLAND_MEAL ] + - [ ITEM_LIFE_SHROOM, ITEM_HONEY_SYRUP, ITEM_HONEY_SUPER ] + - [ ITEM_LIFE_SHROOM, ITEM_MAPLE_SYRUP, ITEM_MAPLE_SUPER ] + - [ ITEM_LIFE_SHROOM, ITEM_JAMMIN_JELLY, ITEM_JELLY_SUPER ] + - [ ITEM_LIFE_SHROOM, ITEM_GOOMNUT, ITEM_LIFE_SHROOM ] + - [ ITEM_LIFE_SHROOM, ITEM_KOOPA_LEAF, ITEM_LIFE_SHROOM ] + - [ ITEM_LIFE_SHROOM, ITEM_DRIED_PASTA, ITEM_BLAND_MEAL ] + - [ ITEM_LIFE_SHROOM, ITEM_DRIED_FRUIT, ITEM_VOLT_SHROOM ] + - [ ITEM_LIFE_SHROOM, ITEM_STRANGE_LEAF, ITEM_LIFE_SHROOM ] + - [ ITEM_LIFE_SHROOM, ITEM_CAKE_MIX, ITEM_SWEET_SHROOM ] + - [ ITEM_LIFE_SHROOM, ITEM_EGG, ITEM_BLAND_MEAL ] + - [ ITEM_LIFE_SHROOM, ITEM_ICED_POTATO, ITEM_BLAND_MEAL ] + - [ ITEM_LIFE_SHROOM, ITEM_DRIED_SHROOM, ITEM_SHROOM_STEAK ] + - [ ITEM_VOLT_SHROOM, ITEM_FIRE_FLOWER, ITEM_BLAND_MEAL ] + - [ ITEM_VOLT_SHROOM, ITEM_HONEY_SYRUP, ITEM_HONEY_SUPER ] + - [ ITEM_VOLT_SHROOM, ITEM_MAPLE_SYRUP, ITEM_MAPLE_SUPER ] + - [ ITEM_VOLT_SHROOM, ITEM_JAMMIN_JELLY, ITEM_JELLY_SUPER ] + - [ ITEM_VOLT_SHROOM, ITEM_GOOMNUT, ITEM_LIFE_SHROOM ] + - [ ITEM_VOLT_SHROOM, ITEM_KOOPA_LEAF, ITEM_LIFE_SHROOM ] + - [ ITEM_VOLT_SHROOM, ITEM_DRIED_PASTA, ITEM_BLAND_MEAL ] + - [ ITEM_VOLT_SHROOM, ITEM_DRIED_FRUIT, ITEM_THUNDER_RAGE ] + - [ ITEM_VOLT_SHROOM, ITEM_STRANGE_LEAF, ITEM_DIZZY_DIAL ] + - [ ITEM_VOLT_SHROOM, ITEM_CAKE_MIX, ITEM_ELECTRO_POP ] + - [ ITEM_VOLT_SHROOM, ITEM_EGG, ITEM_BLAND_MEAL ] + - [ ITEM_VOLT_SHROOM, ITEM_ICED_POTATO, ITEM_BLAND_MEAL ] + - [ ITEM_VOLT_SHROOM, ITEM_DRIED_SHROOM, ITEM_HOT_SHROOM ] + - [ ITEM_FIRE_FLOWER, ITEM_GOOMNUT, ITEM_BLAND_MEAL ] + - [ ITEM_FIRE_FLOWER, ITEM_CAKE_MIX, ITEM_FIRE_POP ] + - [ ITEM_FIRE_FLOWER, ITEM_EGG, ITEM_EGG_MISSILE ] + - [ ITEM_FIRE_FLOWER, ITEM_ICED_POTATO, ITEM_FROZEN_FRIES ] + - [ ITEM_FIRE_FLOWER, ITEM_DRIED_SHROOM, ITEM_FRIED_SHROOM ] + - [ ITEM_COCONUT, ITEM_HONEY_SYRUP, ITEM_TASTY_TONIC ] + - [ ITEM_COCONUT, ITEM_MAPLE_SYRUP, ITEM_SUPER_SODA ] + - [ ITEM_COCONUT, ITEM_JAMMIN_JELLY, ITEM_SPECIAL_SHAKE ] + - [ ITEM_COCONUT, ITEM_APPLE, ITEM_SUPER_SODA ] + - [ ITEM_COCONUT, ITEM_RED_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_COCONUT, ITEM_BLUE_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_COCONUT, ITEM_YELLOW_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_COCONUT, ITEM_KOOPA_LEAF, ITEM_SUPER_SODA ] + - [ ITEM_COCONUT, ITEM_DRIED_PASTA, ITEM_BLAND_MEAL ] + - [ ITEM_COCONUT, ITEM_CAKE_MIX, ITEM_COCO_POP ] + - [ ITEM_COCONUT, ITEM_MELON, ITEM_SUPER_SODA ] + - [ ITEM_COCONUT, ITEM_ICED_POTATO, ITEM_BLAND_MEAL ] + - [ ITEM_LIME, ITEM_LEMON, ITEM_SUPER_SODA ] + - [ ITEM_LIME, ITEM_HONEY_SYRUP, ITEM_TASTY_TONIC ] + - [ ITEM_LIME, ITEM_MAPLE_SYRUP, ITEM_SUPER_SODA ] + - [ ITEM_LIME, ITEM_JAMMIN_JELLY, ITEM_SPECIAL_SHAKE ] + - [ ITEM_LIME, ITEM_APPLE, ITEM_SUPER_SODA ] + - [ ITEM_LIME, ITEM_RED_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_LIME, ITEM_BLUE_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_LIME, ITEM_YELLOW_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_LIME, ITEM_KOOPA_LEAF, ITEM_SUPER_SODA ] + - [ ITEM_LIME, ITEM_CAKE_MIX, ITEM_LIME_CANDY ] + - [ ITEM_LIME, ITEM_MELON, ITEM_SPECIAL_SHAKE ] + - [ ITEM_LEMON, ITEM_HONEY_SYRUP, ITEM_TASTY_TONIC ] + - [ ITEM_LEMON, ITEM_MAPLE_SYRUP, ITEM_SUPER_SODA ] + - [ ITEM_LEMON, ITEM_JAMMIN_JELLY, ITEM_SPECIAL_SHAKE ] + - [ ITEM_LEMON, ITEM_APPLE, ITEM_SUPER_SODA ] + - [ ITEM_LEMON, ITEM_RED_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_LEMON, ITEM_BLUE_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_LEMON, ITEM_YELLOW_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_LEMON, ITEM_KOOPA_LEAF, ITEM_SUPER_SODA ] + - [ ITEM_LEMON, ITEM_CAKE_MIX, ITEM_LEMON_CANDY ] + - [ ITEM_LEMON, ITEM_MELON, ITEM_SPECIAL_SHAKE ] + - [ ITEM_HONEY_SYRUP, ITEM_MAPLE_SYRUP, ITEM_SUPER_SODA ] + - [ ITEM_HONEY_SYRUP, ITEM_JAMMIN_JELLY, ITEM_SPECIAL_SHAKE ] + - [ ITEM_HONEY_SYRUP, ITEM_APPLE, ITEM_TASTY_TONIC ] + - [ ITEM_HONEY_SYRUP, ITEM_RED_BERRY, ITEM_TASTY_TONIC ] + - [ ITEM_HONEY_SYRUP, ITEM_BLUE_BERRY, ITEM_TASTY_TONIC ] + - [ ITEM_HONEY_SYRUP, ITEM_YELLOW_BERRY, ITEM_TASTY_TONIC ] + - [ ITEM_HONEY_SYRUP, ITEM_KOOPA_LEAF, ITEM_SUPER_SODA ] + - [ ITEM_HONEY_SYRUP, ITEM_CAKE_MIX, ITEM_HONEY_CANDY ] + - [ ITEM_HONEY_SYRUP, ITEM_MELON, ITEM_SPECIAL_SHAKE ] + - [ ITEM_MAPLE_SYRUP, ITEM_JAMMIN_JELLY, ITEM_SPECIAL_SHAKE ] + - [ ITEM_MAPLE_SYRUP, ITEM_APPLE, ITEM_SUPER_SODA ] + - [ ITEM_MAPLE_SYRUP, ITEM_RED_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_MAPLE_SYRUP, ITEM_BLUE_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_MAPLE_SYRUP, ITEM_YELLOW_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_MAPLE_SYRUP, ITEM_KOOPA_LEAF, ITEM_SUPER_SODA ] + - [ ITEM_MAPLE_SYRUP, ITEM_CAKE_MIX, ITEM_KOOKY_COOKIE ] + - [ ITEM_MAPLE_SYRUP, ITEM_MELON, ITEM_SPECIAL_SHAKE ] + - [ ITEM_JAMMIN_JELLY, ITEM_APPLE, ITEM_SPECIAL_SHAKE ] + - [ ITEM_JAMMIN_JELLY, ITEM_RED_BERRY, ITEM_SPECIAL_SHAKE ] + - [ ITEM_JAMMIN_JELLY, ITEM_BLUE_BERRY, ITEM_SPECIAL_SHAKE ] + - [ ITEM_JAMMIN_JELLY, ITEM_YELLOW_BERRY, ITEM_SPECIAL_SHAKE ] + - [ ITEM_JAMMIN_JELLY, ITEM_KOOPA_LEAF, ITEM_SUPER_SODA ] + - [ ITEM_JAMMIN_JELLY, ITEM_CAKE_MIX, ITEM_JELLY_POP ] + - [ ITEM_JAMMIN_JELLY, ITEM_MELON, ITEM_SPECIAL_SHAKE ] + - [ ITEM_APPLE, ITEM_RED_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_APPLE, ITEM_BLUE_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_APPLE, ITEM_YELLOW_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_APPLE, ITEM_CAKE_MIX, ITEM_APPLE_PIE ] + - [ ITEM_APPLE, ITEM_MELON, ITEM_SPECIAL_SHAKE ] + - [ ITEM_RED_BERRY, ITEM_BLUE_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_RED_BERRY, ITEM_YELLOW_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_RED_BERRY, ITEM_KOOPA_LEAF, ITEM_BLAND_MEAL ] + - [ ITEM_RED_BERRY, ITEM_DRIED_PASTA, ITEM_BLAND_MEAL ] + - [ ITEM_RED_BERRY, ITEM_STRANGE_LEAF, ITEM_SLEEPY_SHEEP ] + - [ ITEM_RED_BERRY, ITEM_CAKE_MIX, ITEM_BIG_COOKIE ] + - [ ITEM_RED_BERRY, ITEM_MELON, ITEM_SPECIAL_SHAKE ] + - [ ITEM_BLUE_BERRY, ITEM_YELLOW_BERRY, ITEM_SUPER_SODA ] + - [ ITEM_BLUE_BERRY, ITEM_KOOPA_LEAF, ITEM_BLAND_MEAL ] + - [ ITEM_BLUE_BERRY, ITEM_DRIED_PASTA, ITEM_BLAND_MEAL ] + - [ ITEM_BLUE_BERRY, ITEM_STRANGE_LEAF, ITEM_SLEEPY_SHEEP ] + - [ ITEM_BLUE_BERRY, ITEM_CAKE_MIX, ITEM_BIG_COOKIE ] + - [ ITEM_BLUE_BERRY, ITEM_MELON, ITEM_SPECIAL_SHAKE ] + - [ ITEM_YELLOW_BERRY, ITEM_KOOPA_LEAF, ITEM_BLAND_MEAL ] + - [ ITEM_YELLOW_BERRY, ITEM_DRIED_PASTA, ITEM_BLAND_MEAL ] + - [ ITEM_YELLOW_BERRY, ITEM_STRANGE_LEAF, ITEM_SLEEPY_SHEEP ] + - [ ITEM_YELLOW_BERRY, ITEM_CAKE_MIX, ITEM_BIG_COOKIE ] + - [ ITEM_YELLOW_BERRY, ITEM_MELON, ITEM_SPECIAL_SHAKE ] + - [ ITEM_GOOMNUT, ITEM_KOOPA_LEAF, ITEM_BLAND_MEAL ] + - [ ITEM_GOOMNUT, ITEM_DRIED_PASTA, ITEM_BLAND_MEAL ] + - [ ITEM_GOOMNUT, ITEM_STRANGE_LEAF, ITEM_BLAND_MEAL ] + - [ ITEM_GOOMNUT, ITEM_CAKE_MIX, ITEM_BIG_COOKIE ] + - [ ITEM_KOOPA_LEAF, ITEM_DRIED_PASTA, ITEM_KOOPASTA ] + - [ ITEM_KOOPA_LEAF, ITEM_CAKE_MIX, ITEM_KOOKY_COOKIE ] + - [ ITEM_KOOPA_LEAF, ITEM_MELON, ITEM_SPECIAL_SHAKE ] + - [ ITEM_DRIED_PASTA, ITEM_DRIED_FRUIT, ITEM_YUMMY_MEAL ] + - [ ITEM_DRIED_PASTA, ITEM_STRANGE_LEAF, ITEM_BLAND_MEAL ] + - [ ITEM_DRIED_PASTA, ITEM_EGG, ITEM_BLAND_MEAL ] + - [ ITEM_DRIED_PASTA, ITEM_ICED_POTATO, ITEM_BLAND_MEAL ] + - [ ITEM_DRIED_FRUIT, ITEM_STRANGE_LEAF, ITEM_FIRE_FLOWER ] + - [ ITEM_DRIED_FRUIT, ITEM_ICED_POTATO, ITEM_YUMMY_MEAL ] + - [ ITEM_STRANGE_LEAF, ITEM_CAKE_MIX, ITEM_STRANGE_CAKE ] + - [ ITEM_STRANGE_LEAF, ITEM_EGG, ITEM_BOILED_EGG ] + - [ ITEM_STRANGE_LEAF, ITEM_MELON, ITEM_SPECIAL_SHAKE ] + - [ ITEM_STRANGE_LEAF, ITEM_STINKY_HERB, ITEM_DIZZY_DIAL ] + - [ ITEM_STRANGE_LEAF, ITEM_ICED_POTATO, ITEM_YUMMY_MEAL ] + - [ ITEM_CAKE_MIX, ITEM_EGG, ITEM_BIG_COOKIE ] + - [ ITEM_CAKE_MIX, ITEM_MELON, ITEM_YOSHI_COOKIE ] + - [ ITEM_CAKE_MIX, ITEM_STINKY_HERB, ITEM_KOOKY_COOKIE ] + - [ ITEM_CAKE_MIX, ITEM_ICED_POTATO, ITEM_BLAND_MEAL ] + - [ ITEM_EGG, ITEM_STINKY_HERB, ITEM_BOILED_EGG ] + - [ ITEM_EGG, ITEM_ICED_POTATO, ITEM_BLAND_MEAL ] + - [ ITEM_SPECIAL_SHAKE, ITEM_DRIED_SHROOM, ITEM_HEALTHY_JUICE ] + - [ ITEM_SPECIAL_SHAKE, ITEM_STRANGE_LEAF, ITEM_HEALTHY_JUICE ] + - [ ITEM_SPECIAL_SHAKE, ITEM_STINKY_HERB, ITEM_HEALTHY_JUICE ] + - [ ITEM_POTATO_SALAD, ITEM_SPAGHETTI, ITEM_YUMMY_MEAL ] + - [ ITEM_POTATO_SALAD, ITEM_FRIED_SHROOM, ITEM_BLAND_MEAL ] + - [ ITEM_POTATO_SALAD, ITEM_HOT_SHROOM, ITEM_YUMMY_MEAL ] + - [ ITEM_POTATO_SALAD, ITEM_SHROOM_STEAK, ITEM_DELUXE_FEAST ] + - [ ITEM_STRANGE_LEAF, ITEM_WHACKAS_BUMP, ITEM_DELUXE_FEAST ] +# [ Product, Flag ] +# Flag will be set when the corresponding item is cooked +CookingRecords: + - [ ITEM_SPICY_SOUP, GF_MAC02_DiscoveredRecipe_00 ] + - [ ITEM_APPLE_PIE, GF_MAC02_DiscoveredRecipe_01 ] + - [ ITEM_HONEY_ULTRA, GF_MAC02_DiscoveredRecipe_02 ] + - [ ITEM_MAPLE_ULTRA, GF_MAC02_DiscoveredRecipe_03 ] + - [ ITEM_JELLY_ULTRA, GF_MAC02_DiscoveredRecipe_04 ] + - [ ITEM_KOOPASTA, GF_MAC02_DiscoveredRecipe_05 ] + - [ ITEM_FRIED_SHROOM, GF_MAC02_DiscoveredRecipe_06 ] + - [ ITEM_SHROOM_CAKE, GF_MAC02_DiscoveredRecipe_07 ] + - [ ITEM_SHROOM_STEAK, GF_MAC02_DiscoveredRecipe_08 ] + - [ ITEM_HOT_SHROOM, GF_MAC02_DiscoveredRecipe_09 ] + - [ ITEM_SWEET_SHROOM, GF_MAC02_DiscoveredRecipe_0A ] + - [ ITEM_BLAND_MEAL, GF_MAC02_DiscoveredRecipe_0B ] + - [ ITEM_YUMMY_MEAL, GF_MAC02_DiscoveredRecipe_0C ] + - [ ITEM_DELUXE_FEAST, GF_MAC02_DiscoveredRecipe_0D ] + - [ ITEM_SPECIAL_SHAKE, GF_MAC02_DiscoveredRecipe_0E ] + - [ ITEM_HEALTHY_JUICE, GF_MAC02_DiscoveredRecipe_0F ] + - [ ITEM_BIG_COOKIE, GF_MAC02_DiscoveredRecipe_10 ] + - [ ITEM_CAKE, GF_MAC02_DiscoveredRecipe_11 ] + - [ ITEM_MISTAKE, GF_MAC02_DiscoveredRecipe_12 ] + - [ ITEM_KOOPA_TEA, GF_MAC02_DiscoveredRecipe_13 ] + - [ ITEM_HONEY_SUPER, GF_MAC02_DiscoveredRecipe_14 ] + - [ ITEM_MAPLE_SUPER, GF_MAC02_DiscoveredRecipe_15 ] + - [ ITEM_JELLY_SUPER, GF_MAC02_DiscoveredRecipe_16 ] + - [ ITEM_SPAGHETTI, GF_MAC02_DiscoveredRecipe_17 ] + - [ ITEM_EGG_MISSILE, GF_MAC02_DiscoveredRecipe_18 ] + - [ ITEM_FRIED_EGG, GF_MAC02_DiscoveredRecipe_19 ] + - [ ITEM_HONEY_SHROOM, GF_MAC02_DiscoveredRecipe_1A ] + - [ ITEM_HONEY_CANDY, GF_MAC02_DiscoveredRecipe_1B ] + - [ ITEM_ELECTRO_POP, GF_MAC02_DiscoveredRecipe_1C ] + - [ ITEM_FIRE_POP, GF_MAC02_DiscoveredRecipe_1D ] + - [ ITEM_LIME_CANDY, GF_MAC02_DiscoveredRecipe_1E ] + - [ ITEM_COCO_POP, GF_MAC02_DiscoveredRecipe_1F ] + - [ ITEM_LEMON_CANDY, GF_MAC02_DiscoveredRecipe_20 ] + - [ ITEM_JELLY_POP, GF_MAC02_DiscoveredRecipe_21 ] + - [ ITEM_STRANGE_CAKE, GF_MAC02_DiscoveredRecipe_22 ] + - [ ITEM_KOOKY_COOKIE, GF_MAC02_DiscoveredRecipe_23 ] + - [ ITEM_FROZEN_FRIES, GF_MAC02_DiscoveredRecipe_24 ] + - [ ITEM_POTATO_SALAD, GF_MAC02_DiscoveredRecipe_25 ] + - [ ITEM_NUTTY_CAKE, GF_MAC02_DiscoveredRecipe_26 ] + - [ ITEM_MAPLE_SHROOM, GF_MAC02_DiscoveredRecipe_27 ] + - [ ITEM_BOILED_EGG, GF_MAC02_DiscoveredRecipe_28 ] + - [ ITEM_YOSHI_COOKIE, GF_MAC02_DiscoveredRecipe_29 ] + - [ ITEM_JELLY_SHROOM, GF_MAC02_DiscoveredRecipe_2A ] + - [ ITEM_TASTY_TONIC, GF_MAC02_DiscoveredRecipe_2B ] + - [ ITEM_DIZZY_DIAL, GF_MAC02_DiscoveredRecipe_2C ] + - [ ITEM_SUPER_SODA, GF_MAC02_DiscoveredRecipe_2D ] + - [ ITEM_REPEL_GEL, GF_MAC02_DiscoveredRecipe_2E ] + - [ ITEM_LIFE_SHROOM, GF_MAC02_DiscoveredRecipe_2F ] + - [ ITEM_VOLT_SHROOM, GF_MAC02_DiscoveredRecipe_30 ] + - [ ITEM_SLEEPY_SHEEP, GF_MAC02_DiscoveredRecipe_31 ] + - [ ITEM_THUNDER_RAGE, GF_MAC02_DiscoveredRecipe_32 ] + - [ ITEM_FIRE_FLOWER, GF_MAC02_DiscoveredRecipe_33 ] diff --git a/src/world/area_iwa/iwa_00/npc.c b/src/world/area_iwa/iwa_00/npc.c index d8d20c7a1d..78bd5d71fd 100644 --- a/src/world/area_iwa/iwa_00/npc.c +++ b/src/world/area_iwa/iwa_00/npc.c @@ -6,6 +6,11 @@ #include "world/common/enemy/Whacka.inc.c" #include "world/common/complete/GiveReward.inc.c" +#if VERSION_JP +#include "world/common/todo/SomeItemEntityFunc.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" +#include "world/common/todo/UnkScriptJP00.inc.c" +#endif API_CALLABLE(N(func_80240118_90CD58)) { Enemy* enemy = script->owner1.enemy; diff --git a/src/world/area_iwa/iwa_02/npc.c b/src/world/area_iwa/iwa_02/npc.c index d31a9fa222..f16fea0bed 100644 --- a/src/world/area_iwa/iwa_02/npc.c +++ b/src/world/area_iwa/iwa_02/npc.c @@ -6,6 +6,11 @@ #include "world/common/npc/Bubulb.inc.c" #include "world/common/complete/GiveReward.inc.c" +#if VERSION_JP +#include "world/common/todo/SomeItemEntityFunc.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" +#include "world/common/todo/UnkScriptJP00.inc.c" +#endif NpcData N(NpcData_Cleft_01) = { .id = NPC_Cleft_01, diff --git a/src/world/area_iwa/iwa_10/npc.c b/src/world/area_iwa/iwa_10/npc.c index 12d55d3ed8..e46b7829e2 100644 --- a/src/world/area_iwa/iwa_10/npc.c +++ b/src/world/area_iwa/iwa_10/npc.c @@ -5,6 +5,11 @@ #include "world/common/npc/Dryite_Stationary.inc.c" #include "world/common/complete/GiveReward.inc.c" +#if VERSION_JP +#include "world/common/todo/SomeItemEntityFunc.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" +#include "world/common/todo/UnkScriptJP00.inc.c" +#endif EvtScript N(EVS_NpcInteract_TrainToad_01) = { Call(GetEntryID, LVar0) diff --git a/src/world/area_iwa/iwa_11/settings.c b/src/world/area_iwa/iwa_11/settings.c index 3c7c55a7cd..7215579a8e 100644 --- a/src/world/area_iwa/iwa_11/settings.c +++ b/src/world/area_iwa/iwa_11/settings.c @@ -10,4 +10,7 @@ MapSettings N(settings) = { .entryList = &N(Entrances), .entryCount = ENTRY_COUNT(N(Entrances)), .background = &gBackgroundImage, +#if VERSION_JP + .tattle = { MSG_MapTattle_018C } +#endif }; diff --git a/src/world/area_kmr/kmr_20/records.c b/src/world/area_kmr/kmr_20/records.c index 38b349044f..f7af7ed0ca 100644 --- a/src/world/area_kmr/kmr_20/records.c +++ b/src/world/area_kmr/kmr_20/records.c @@ -67,6 +67,66 @@ void N(appendGfx_records_impl)(GameRecords* records, s32 alpha) { #endif if (alpha > 0) { +#if VERSION_JP + gSPDisplayList(gMainGfxPos++, N(records_screen_gfx)); + gDPPipeSync(gMainGfxPos++); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 16, 120, 24, alpha * 0.65); + gDPFillRectangle(gMainGfxPos++, 63, 43, 257, 192); + gDPPipeSync(gMainGfxPos++); + + msg_draw_frame(60, 40, 200, 155, MSG_STYLE_INSPECT, MSG_PAL_WHITE, TRUE, alpha * 0.55, alpha); + draw_msg(MSG_CH0_00FC, 88, 50, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(gPlayerData.totalCoinsEarned, 194, 50, 1, MSG_PAL_WHITE, alpha, 2); + draw_msg(MSG_CH0_00FD, 124, 65, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(records->equippedBadges, 209, 65, 1, MSG_PAL_WHITE, alpha, 3); + draw_msg(MSG_MenuTip_0034, 210, 63, alpha, MSG_PAL_WHITE, 0); + draw_number(80, 222, 65, 1, MSG_PAL_WHITE, alpha, 2); + if (gPlayerData.starPiecesCollected == 0) { + draw_msg(MSG_CH0_00FA, 139, 80, alpha, MSG_PAL_WHITE, 1); + } else { + draw_msg(MSG_CH0_00FB, 96, 80, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(gPlayerData.starPiecesCollected, 209, 80, 1, MSG_PAL_WHITE, alpha, 3); + draw_msg(MSG_MenuTip_0034, 210, 78, alpha, MSG_PAL_WHITE, 0); + draw_number(160, 222, 80, 1, MSG_PAL_WHITE, alpha, 2); + } + + if (records->recipesFoundCount == 0) { + draw_msg(MSG_CH0_00FA, 140, 95, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + } else { + if (records->recipesFoundCount == -1) { + draw_msg(MSG_CH0_00FE, 103, 95, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(0, 209, 95, 1, MSG_PAL_WHITE, alpha, 3); + } else { + draw_msg(MSG_CH0_00FE, 103, 95, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(records->recipesFoundCount, 209, 95, 1, MSG_PAL_WHITE, alpha, 3); + } + draw_msg(MSG_MenuTip_0034, 210, 93, alpha, MSG_PAL_WHITE, 0); + draw_number(records->totalRecipesCount, 222, 95, 1, MSG_PAL_WHITE, alpha, 2); + } + + if (gPlayerData.quizzesAnswered == 0) { + draw_msg(MSG_CH0_00FA, 139, 110, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + } else { + draw_msg(MSG_CH0_00FF, 94, 110, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(gPlayerData.quizzesCorrect, 209, 110, 1, MSG_PAL_WHITE, alpha, 3); + draw_msg(MSG_MenuTip_0034, 210, 108, alpha, MSG_PAL_WHITE, 0); + draw_number(gPlayerData.quizzesAnswered, 222, 110, 1, MSG_PAL_WHITE, alpha, 2); + } + + draw_msg(MSG_CH0_00F4, 93, 125, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(gPlayerData.battlesCount, 194, 125, 1, MSG_PAL_WHITE, alpha, 2); + draw_msg(MSG_CH0_00F7, 84, 140, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(gPlayerData.playerFirstStrikes, 194, 140, 1, MSG_PAL_WHITE, alpha, 2); + draw_msg(MSG_CH0_00F8, 75, 155, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(gPlayerData.enemyFirstStrikes, 194, 155, 1, MSG_PAL_WHITE, alpha, 2); + + if (gPlayerData.powerBounces == 0) { + draw_msg(MSG_CH0_00FA, 139, 170, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + } else { + draw_msg(MSG_CH0_00F9, 102, 170, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(gPlayerData.powerBounces, 194, 170, 1, MSG_PAL_WHITE, alpha, 2); + } +#else gSPDisplayList(gMainGfxPos++, N(records_screen_gfx)); gDPPipeSync(gMainGfxPos++); gDPSetPrimColor(gMainGfxPos++, 0, 0, 16, 120, 24, alpha * 0.65); @@ -127,6 +187,7 @@ void N(appendGfx_records_impl)(GameRecords* records, s32 alpha) { draw_msg(MSG_CH0_00F9, 206 - get_msg_width(MSG_CH0_00F9, CHARSET), 170, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); draw_number(gPlayerData.powerBounces, 216, 171, 1, MSG_PAL_WHITE, alpha, 2); } +#endif } #undef CHARSET diff --git a/src/world/area_kmr/kmr_21/main.c b/src/world/area_kmr/kmr_21/main.c index db4824facf..dd03ec989f 100644 --- a/src/world/area_kmr/kmr_21/main.c +++ b/src/world/area_kmr/kmr_21/main.c @@ -13,7 +13,11 @@ static TitleDataFile* TitleData; static IMG_PTR TitleImage; s32 TitlePrimAlpha = 0; +#if VERSION_JP +s32 TitlePosY = 125; +#else s32 TitlePosY = 106; +#endif Gfx N(Gfx_TexSetup_TitleImage)[] = { gsDPPipeSync(), @@ -42,6 +46,19 @@ void worker_render_title_image(void) { gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, TitlePrimAlpha); gDPPipeSync(gMainGfxPos++); +#if VERSION_JP + for (i = 0; i < 44; i++) { + gDPLoadTextureTile(gMainGfxPos++, &TitleImage[2176 * i], G_IM_FMT_RGBA, G_IM_SIZ_32b, 272, 112, + 0, 0, 271, 1, 0, + G_TX_WRAP, G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gSPTextureRectangle(gMainGfxPos++, + /* ulx */ 25 * 4, + /* uly */ (i * 2 + TitlePosY) * 4, + /* lrx */ 297 * 4, + /* lry */ ((i * 2 + 2) + TitlePosY) * 4, + G_TX_RENDERTILE, 0, 0, 1024, 1024); + } +#else for (i = 0; i < 56; i++) { gDPLoadTextureTile(gMainGfxPos++, &TitleImage[1600 * i], G_IM_FMT_RGBA, G_IM_SIZ_32b, 200, 112, 0, 0, 199, 1, 0, @@ -53,6 +70,7 @@ void worker_render_title_image(void) { /* lry */ ((i * 2 + 2) + TitlePosY) * 4, G_TX_RENDERTILE, 0, 0, 1024, 1024); } +#endif gDPPipeSync(gMainGfxPos++); } @@ -103,7 +121,11 @@ EvtScript N(EVS_Scene_ShowTitle) = { EndIf EndLoop EndThread +#if VERSION_JP + Call(MakeLerp, 125, 75, 100 * DT, EASING_CUBIC_OUT) +#else Call(MakeLerp, 106, 56, 100 * DT, EASING_CUBIC_OUT) +#endif Loop(0) Call(UpdateLerp) Call(N(SetTitlePosY)) diff --git a/src/world/area_kmr/kmr_22/npc.c b/src/world/area_kmr/kmr_22/npc.c index b0223779b7..c6bbf5002c 100644 --- a/src/world/area_kmr/kmr_22/npc.c +++ b/src/world/area_kmr/kmr_22/npc.c @@ -33,7 +33,11 @@ NpcSettings N(NpcSettings_Unused) = { NpcData N(NpcData_Chapter1)[] = { { .id = NPC_Eldstar, +#if VERSION_JP + .pos = { -40.0f, 96.0f, 0.0f }, +#else .pos = { -62.0f, 96.0f, 0.0f }, +#endif .yaw = 270, .init = &N(EVS_NpcInit_Eldstar), .settings = &N(NpcSettings_Dummy), @@ -86,7 +90,11 @@ NpcData N(NpcData_Chapter1)[] = { NpcData N(NpcData_Chapter2)[] = { { .id = NPC_Mamar, +#if VERSION_JP + .pos = { -40.0f, 96.0f, 0.0f }, +#else .pos = { -62.0f, 96.0f, 0.0f }, +#endif .yaw = 270, .init = &N(EVS_NpcInit_Mamar), .settings = &N(NpcSettings_Dummy), @@ -257,7 +265,11 @@ NpcData N(NpcData_Chapter2)[] = { NpcData N(NpcData_Chapter3)[] = { { .id = NPC_Skolar, +#if VERSION_JP + .pos = { -40.0f, 96.0f, 0.0f }, +#else .pos = { -62.0f, 96.0f, 0.0f }, +#endif .yaw = 270, .init = &N(EVS_NpcInit_Skolar), .settings = &N(NpcSettings_Dummy), @@ -297,7 +309,11 @@ NpcData N(NpcData_Chapter3)[] = { NpcData N(NpcData_Chapter4)[] = { { .id = NPC_Muskular, +#if VERSION_JP + .pos = { -40.0f, 96.0f, 0.0f }, +#else .pos = { -62.0f, 96.0f, 0.0f }, +#endif .yaw = 270, .init = &N(EVS_NpcInit_Muskular), .settings = &N(NpcSettings_Dummy), @@ -357,7 +373,11 @@ NpcData N(NpcData_Chapter4)[] = { NpcData N(NpcData_Chapter5)[] = { { .id = NPC_Misstar, +#if VERSION_JP + .pos = { -40.0f, 96.0f, 0.0f }, +#else .pos = { -62.0f, 96.0f, 0.0f }, +#endif .yaw = 270, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_Dummy), @@ -403,7 +423,11 @@ NpcData N(NpcData_Chapter5)[] = { NpcData N(NpcData_Chapter6)[] = { { .id = NPC_Klevar, +#if VERSION_JP + .pos = { -40.0f, 96.0f, 0.0f }, +#else .pos = { -62.0f, 96.0f, 0.0f }, +#endif .yaw = 270, .init = &N(EVS_NpcInit_Klevar), .settings = &N(NpcSettings_Dummy), @@ -550,7 +574,11 @@ NpcData N(NpcData_Chapter6)[] = { NpcData N(NpcData_Chapter7)[] = { { .id = NPC_Kalmar, +#if VERSION_JP + .pos = { -40.0f, 96.0f, 0.0f }, +#else .pos = { -62.0f, 96.0f, 0.0f }, +#endif .yaw = 270, .init = &N(EVS_NpcInit_Kalmar), .settings = &N(NpcSettings_Dummy), diff --git a/src/world/area_kmr/kmr_23/npc.c b/src/world/area_kmr/kmr_23/npc.c index 17835b2461..d820c4a016 100644 --- a/src/world/area_kmr/kmr_23/npc.c +++ b/src/world/area_kmr/kmr_23/npc.c @@ -481,7 +481,11 @@ EvtScript N(EVS_Scene_EndOfChapter) = { Wait(30 * DT) Call(N(FlashScreenWhite)) Call(N(SpinDownStarSpirit), 1800, 100 * DT) +#if VERSION_JP + Call(N(EndOfChapterBounceIn), 64, 0, 55, 60) +#else Call(N(EndOfChapterBounceIn), 36, 0, 55, 60) +#endif Thread Call(N(AddCardAngularVelocity), 0) EndThread @@ -495,7 +499,11 @@ EvtScript N(EVS_Scene_EndOfChapter) = { Set(LVar1, MSG_Menus_01A5) Switch(LVar0) CaseEq(kmr_23_ENTRY_0) +#if VERSION_JP + Set(LVar1, MSG_Menus_JP_01C8) +#else Set(LVar1, MSG_Menus_01A5) +#endif CaseEq(kmr_23_ENTRY_1) Set(LVar1, MSG_Menus_01A6) CaseEq(kmr_23_ENTRY_2) diff --git a/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c b/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c index 4e754df5e7..7120dea7d1 100644 --- a/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c +++ b/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c @@ -304,9 +304,19 @@ EvtScript N(EVS_ItemPrompt_Dictionary) = { IfEq(GF_MAC00_TranslatedMysteryNote, TRUE) Call(SpeakToPlayer, NPC_SELF, ANIM_RussT_Talk, ANIM_RussT_Idle, 0, MSG_MAC_Gate_0010) EndIf +#if VERSION_JP + IfEq(GF_Unused_MAC_74, TRUE) + Call(SpeakToPlayer, NPC_SELF, ANIM_RussT_Talk, ANIM_RussT_Idle, 0, MSG_MAC_Gate_JP_0011) + EndIf +#endif CaseEq(ITEM_MYSTERY_NOTE) Call(SpeakToPlayer, NPC_SELF, ANIM_RussT_Talk, ANIM_RussT_Idle, 0, MSG_MAC_Gate_000F) Set(GF_MAC00_TranslatedMysteryNote, TRUE) +#if VERSION_JP + CaseEq(ITEM_SUSPICIOUS_NOTE) + Call(SpeakToPlayer, NPC_SELF, ANIM_RussT_Talk, ANIM_RussT_Idle, 0, MSG_MAC_Gate_0122) + Set(GF_Unused_MAC_74, TRUE) +#endif CaseEq(-1) Call(SpeakToPlayer, NPC_SELF, ANIM_RussT_Talk, ANIM_RussT_Idle, 0, MSG_MAC_Gate_000C) CaseEq(0) @@ -327,6 +337,13 @@ EvtScript N(EVS_ItemPrompt_Documents) = { Return EndIf Else +#if VERSION_JP + IfEq(GF_Unused_MAC_74, TRUE) + Call(SpeakToPlayer, NPC_SELF, ANIM_RussT_Talk, ANIM_RussT_Idle, 0, MSG_MAC_Gate_JP_0011) + Set(LVarA, 1) + Return + EndIf +#endif EndIf CaseEq(-1) CaseDefault @@ -334,6 +351,12 @@ EvtScript N(EVS_ItemPrompt_Documents) = { Call(SpeakToPlayer, NPC_SELF, ANIM_RussT_Talk, ANIM_RussT_Idle, 0, MSG_MAC_Gate_000E) Set(GF_MAC00_TranslatedMysteryNote, TRUE) Set(LVarA, 1) +#if VERSION_JP + Else + Call(SpeakToPlayer, NPC_SELF, ANIM_RussT_Talk, ANIM_RussT_Idle, 0, MSG_MAC_Gate_0121) + Set(GF_Unused_MAC_74, TRUE) + Set(LVarA, 1) +#endif EndIf EndSwitch Return diff --git a/src/world/area_mac/mac_00/npc/waterfront_family.inc.c b/src/world/area_mac/mac_00/npc/waterfront_family.inc.c index 55a15d0b33..4ceecc7ec8 100644 --- a/src/world/area_mac/mac_00/npc/waterfront_family.inc.c +++ b/src/world/area_mac/mac_00/npc/waterfront_family.inc.c @@ -62,6 +62,18 @@ EvtScript N(EVS_NpcInteract_WaterfrontMom) = { EndIf CaseLt(STORY_CH3_STAR_SPIRIT_RESCUED) Set(LVar0, MSG_MAC_Gate_0059) +#if VERSION_JP + CaseLt(STORY_CH4_STAR_SPRIT_DEPARTED) + IfEq(GF_MAC00_DictionaryStolen, FALSE) + Set(LVar0, MSG_MAC_Gate_0123) + Else + IfEq(GF_MAC00_DictionaryReturned, FALSE) + Set(LVar0, MSG_MAC_Gate_0124) + Else + Set(LVar0, MSG_MAC_Gate_0125) + EndIf + EndIf +#endif CaseLt(STORY_CH5_DEFEATED_FUZZIPEDE) Set(LVar0, MSG_MAC_Gate_005A) CaseLt(STORY_CH5_STAR_SPRIT_DEPARTED) @@ -148,6 +160,18 @@ EvtScript N(EVS_NpcInteract_WaterfrontKid2) = { EndIf CaseLt(STORY_CH3_STAR_SPIRIT_RESCUED) Set(LVar0, MSG_MAC_Gate_0076) +#if VERSION_JP + CaseLt(STORY_CH4_STAR_SPRIT_DEPARTED) + IfEq(GF_MAC00_DictionaryStolen, FALSE) + Set(LVar0, MSG_MAC_Gate_0126) + Else + IfEq(GF_MAC00_DictionaryReturned, FALSE) + Set(LVar0, MSG_MAC_Gate_0127) + Else + Set(LVar0, MSG_MAC_Gate_0128) + EndIf + EndIf +#endif CaseLt(STORY_CH5_DEFEATED_FUZZIPEDE) Set(LVar0, MSG_MAC_Gate_0077) CaseLt(STORY_CH5_STAR_SPRIT_DEPARTED) diff --git a/src/world/area_mac/mac_01/bulletin.c b/src/world/area_mac/mac_01/bulletin.c index 702b8780ea..e01fd76050 100644 --- a/src/world/area_mac/mac_01/bulletin.c +++ b/src/world/area_mac/mac_01/bulletin.c @@ -47,7 +47,11 @@ BulletinBoardEntry N(BulletinBoardData)[] = { { MSG_NewsBoard_000E, MSG_GossipBoard_000E, STORY_CH4_STAR_SPIRIT_RESCUED }, { MSG_NewsBoard_000F, MSG_GossipBoard_000F, STORY_CH5_REACHED_LAVA_LAVA_ISLAND }, { MSG_NewsBoard_0010, MSG_GossipBoard_0010, STORY_CH5_ZIP_LINE_READY }, +#if VERSION_JP + { MSG_NewsBoard_0011, MSG_GossipBoard_0011, STORY_CH5_OPENED_ESCAPE_ROUTE }, +#else { MSG_NewsBoard_0011, MSG_GossipBoard_0011, STORY_CH5_TRADED_VASE_FOR_SEED }, +#endif { MSG_NewsBoard_0012, MSG_GossipBoard_0012, STORY_CH6_ARRIVED_AT_FLOWER_FIELDS }, { MSG_NewsBoard_0013, MSG_GossipBoard_0013, STORY_CH6_SPOKE_WITH_THE_SUN }, { MSG_NewsBoard_0014, MSG_GossipBoard_0014, STORY_CH6_STAR_SPIRIT_RESCUED }, diff --git a/src/world/area_mac/mac_01/npc.c b/src/world/area_mac/mac_01/npc.c index 1100c5b317..f733935cf3 100644 --- a/src/world/area_mac/mac_01/npc.c +++ b/src/world/area_mac/mac_01/npc.c @@ -1595,6 +1595,9 @@ EvtScript N(EVS_NpcInteract_Toad_08) = { Set(LVar0, MSG_MAC_Plaza_00C1) CaseLt(STORY_CH4_STAR_SPRIT_DEPARTED) IfEq(GF_MAC01_ShyGuysTramplingGarden, FALSE) +#if VERSION_JP + Set(LVar0, MSG_MAC_Plaza_00EE) +#endif Else Set(LVar0, GF_MAC01_ChasedShyGuysFromGardenA) Add(LVar0, GF_MAC01_ChasedShyGuysFromGardenB) diff --git a/src/world/area_mac/mac_01/npc/flower_gate.inc.c b/src/world/area_mac/mac_01/npc/flower_gate.inc.c index 93f26e20b8..a02006a09e 100644 --- a/src/world/area_mac/mac_01/npc/flower_gate.inc.c +++ b/src/world/area_mac/mac_01/npc/flower_gate.inc.c @@ -471,6 +471,10 @@ EvtScript N(EVS_NpcInteract_MinhT) = { Set(LVar0, GF_MAC01_ChasedShyGuysFromGardenA) Add(LVar0, GF_MAC01_ChasedShyGuysFromGardenB) IfEq(LVar0, 2) +#if VERSION_JP + Set(LVar0, MSG_MAC_Plaza_00EC) + Set(LVar1, MSG_MAC_Plaza_00EC) +#endif Set(LVar2, 1) Else Set(LVar0, MSG_MAC_Plaza_006D) @@ -561,6 +565,10 @@ EvtScript N(EVS_NpcInteract_MinhT) = { Set(LVar5, 2) ExecWait(N(EVS_MinhT_PlantSeed)) CaseEq(ITEM_MAGICAL_SEED4) +#if VERSION_JP + Set(GF_MAC01_Planted_MagicalSeed4, TRUE) + Set(LVar4, MSG_MAC_Plaza_00ED) +#endif Set(LVar5, 3) ExecWait(N(EVS_MinhT_PlantSeed)) EndSwitch diff --git a/src/world/area_mac/mac_01/npc/post_office.inc.c b/src/world/area_mac/mac_01/npc/post_office.inc.c index d30769e2a4..ac9b375bbb 100644 --- a/src/world/area_mac/mac_01/npc/post_office.inc.c +++ b/src/world/area_mac/mac_01/npc/post_office.inc.c @@ -222,6 +222,19 @@ API_CALLABLE(N(func_80245440_805CC0)) { return ApiStatus_DONE2; } +#if VERSION_JP +EvtScript N(D_80256C10_81EF80) = { + IfEq(GF_MAC01_Met_Postmaster, FALSE) + Call(SpeakToPlayer, NPC_Postmaster, ANIM_Postmaster_Talk, ANIM_Postmaster_Idle, 0, MSG_MAC_Plaza_00EA) + Set(GF_MAC01_Met_Postmaster, TRUE) + Else + Call(SpeakToPlayer, NPC_Postmaster, ANIM_Postmaster_Talk, ANIM_Postmaster_Idle, 0, MSG_MAC_Plaza_00EB) + EndIf + Return + End +}; +#endif + s32 N(ItemList_Mailbag)[] = { ITEM_MAILBAG, ITEM_NONE @@ -263,6 +276,9 @@ EvtScript N(EVS_NpcInteract_Postmaster) = { Call(N(func_80244E90_805710)) Switch(LVar0) CaseEq(-1) +#if VERSION_JP + Call(SpeakToPlayer, NPC_Postmaster, ANIM_Postmaster_Talk, ANIM_Postmaster_Idle, 0, MSG_MAC_Plaza_00EA) +#endif Return CaseEq(1) Call(SpeakToPlayer, NPC_Postmaster, ANIM_Postmaster_Talk, ANIM_Postmaster_Idle, 0, MSG_MAC_Plaza_0055) @@ -271,6 +287,9 @@ EvtScript N(EVS_NpcInteract_Postmaster) = { Call(N(func_80244E90_805710)) Switch(LVar0) CaseEq(-1) +#if VERSION_JP + Call(SpeakToPlayer, NPC_Postmaster, ANIM_Postmaster_Talk, ANIM_Postmaster_Idle, 0, MSG_MAC_Plaza_00EB) +#endif Return CaseEq(0) Call(SpeakToPlayer, NPC_Postmaster, ANIM_Postmaster_Talk, ANIM_Postmaster_Idle, 0, MSG_MAC_Plaza_0057) diff --git a/src/world/area_mac/mac_02/npc/bubulb.inc.c b/src/world/area_mac/mac_02/npc/bubulb.inc.c index f47f789952..a0f4249fca 100644 --- a/src/world/area_mac/mac_02/npc/bubulb.inc.c +++ b/src/world/area_mac/mac_02/npc/bubulb.inc.c @@ -15,6 +15,9 @@ EvtScript N(EVS_NpcInteract_Bubulb) = { Else Switch(GB_StoryProgress) CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) +#if VERSION_JP + Set(LVar0, MSG_MAC_Bridge_00A6) +#endif CaseLt(STORY_CH2_BEGAN_PEACH_MISSION) Set(LVar0, MSG_MAC_Bridge_0088) CaseLt(STORY_CH3_STAR_SPIRIT_RESCUED) diff --git a/src/world/area_mac/mac_02/npc/cooking_apprentice.inc.c b/src/world/area_mac/mac_02/npc/cooking_apprentice.inc.c index 184cc18811..9afd01d7ff 100644 --- a/src/world/area_mac/mac_02/npc/cooking_apprentice.inc.c +++ b/src/world/area_mac/mac_02/npc/cooking_apprentice.inc.c @@ -1,5 +1,13 @@ EvtScript N(EVS_NpcInteract_CookingApprentice) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Bridge_0097) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Bridge_0098) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Bridge_0099) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Bridge_004A) @@ -8,6 +16,10 @@ EvtScript N(EVS_NpcInteract_CookingApprentice) = { EndIf CaseLt(STORY_CH3_STAR_SPIRIT_RESCUED) Set(LVar0, MSG_MAC_Bridge_004C) +#if VERSION_JP + CaseLt(STORY_CH3_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Bridge_009A) +#endif CaseLt(STORY_CH4_GOT_TAYCE_TS_CAKE) Set(LVar0, MSG_MAC_Bridge_004D) CaseLt(STORY_CH4_STAR_SPRIT_DEPARTED) diff --git a/src/world/area_mac/mac_02/npc/fice_t.inc.c b/src/world/area_mac/mac_02/npc/fice_t.inc.c index 5492e96c68..f544ccd88e 100644 --- a/src/world/area_mac/mac_02/npc/fice_t.inc.c +++ b/src/world/area_mac/mac_02/npc/fice_t.inc.c @@ -29,6 +29,12 @@ EvtScript N(EVS_LetterReward_FiceT) = { EvtScript N(EVS_NpcInteract_FiceT) = { Set(LVar3, 0) Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Bridge_0094) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Bridge_0095) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) Set(LVar0, MSG_MAC_Bridge_0021) CaseLt(STORY_CH3_STAR_SPIRIT_RESCUED) diff --git a/src/world/area_mac/mac_02/npc/tayce_t.inc.c b/src/world/area_mac/mac_02/npc/tayce_t.inc.c index 1e6af05890..fed0f4f7cb 100644 --- a/src/world/area_mac/mac_02/npc/tayce_t.inc.c +++ b/src/world/area_mac/mac_02/npc/tayce_t.inc.c @@ -304,7 +304,11 @@ EvtScript N(EVS_TayceT_Cook) = { CaseEq(0) CaseEq(-1) Call(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0006) +#if VERSION_JP + Call(ShowChoice, MSG_Choice_0010) +#else Call(ShowChoice, MSG_Choice_0009) +#endif IfEq(LVar0, 0) Call(ContinueSpeech, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0004) Goto(LABEL_DONE) diff --git a/src/world/area_mac/mac_02/npc/toad_2.inc.c b/src/world/area_mac/mac_02/npc/toad_2.inc.c index e7e523376e..d8d1928f27 100644 --- a/src/world/area_mac/mac_02/npc/toad_2.inc.c +++ b/src/world/area_mac/mac_02/npc/toad_2.inc.c @@ -1,5 +1,13 @@ EvtScript N(EVS_NpcInteract_Toad_02) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Bridge_009B) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Bridge_009C) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Bridge_009D) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Bridge_0057) diff --git a/src/world/area_mac/mac_02/npc/toad_3.inc.c b/src/world/area_mac/mac_02/npc/toad_3.inc.c index acf9849852..0b499a9b6d 100644 --- a/src/world/area_mac/mac_02/npc/toad_3.inc.c +++ b/src/world/area_mac/mac_02/npc/toad_3.inc.c @@ -1,5 +1,13 @@ EvtScript N(EVS_NpcInteract_Toad_03) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Bridge_00A0) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Bridge_00A1) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Bridge_00A2) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Bridge_006B) diff --git a/src/world/area_mac/mac_02/npc/toad_4.inc.c b/src/world/area_mac/mac_02/npc/toad_4.inc.c index 104fd74752..32ce29b3d0 100644 --- a/src/world/area_mac/mac_02/npc/toad_4.inc.c +++ b/src/world/area_mac/mac_02/npc/toad_4.inc.c @@ -1,5 +1,13 @@ EvtScript N(EVS_NpcInteract_Toad_04) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Bridge_00A3) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Bridge_00A4) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Bridge_00A5) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Bridge_0078) diff --git a/src/world/area_mac/mac_02/npc/toad_kid.inc.c b/src/world/area_mac/mac_02/npc/toad_kid.inc.c index d126f29233..803a74463c 100644 --- a/src/world/area_mac/mac_02/npc/toad_kid.inc.c +++ b/src/world/area_mac/mac_02/npc/toad_kid.inc.c @@ -1,5 +1,11 @@ EvtScript N(EVS_NpcInteract_ToadKid) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Bridge_009E) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Bridge_009F) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) Set(LVar0, MSG_MAC_Bridge_0064) CaseLt(STORY_CH3_STAR_SPIRIT_RESCUED) diff --git a/src/world/area_mac/mac_03/npc.c b/src/world/area_mac/mac_03/npc.c index 2f6ef21f45..c129a82d57 100644 --- a/src/world/area_mac/mac_03/npc.c +++ b/src/world/area_mac/mac_03/npc.c @@ -157,6 +157,14 @@ EvtScript N(EVS_NpcInit_TrainToad_01) = { EvtScript N(EVS_NpcInteract_Toad_01) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Station_0067) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Station_0068) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Station_0069) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Station_000A) @@ -203,6 +211,14 @@ EvtScript N(EVS_NpcInit_Toad_01) = { EvtScript N(EVS_NpcInteract_Toadette_01) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Station_006A) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Station_006B) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Station_006C) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Station_0017) @@ -249,6 +265,14 @@ EvtScript N(EVS_NpcInit_Toadette_01) = { EvtScript N(EVS_NpcInteract_Toad_02) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Station_006D) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Station_006E) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Station_006F) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Station_0024) @@ -303,6 +327,17 @@ EvtScript N(EVS_NpcInteract_ToadKid_02) = { Call(SetNpcAnimation, NPC_ToadKid_01, ANIM_ToadKid_Red_Idle) Call(SetNpcAnimation, NPC_ToadKid_02, ANIM_ToadKid_Yellow_Idle) Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Station_0070) + Set(LVar1, MSG_MAC_Station_0071) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Station_0072) + Set(LVar1, MSG_MAC_Station_0073) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Station_0074) + Set(LVar1, MSG_MAC_Station_0075) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Station_0031) @@ -316,6 +351,10 @@ EvtScript N(EVS_NpcInteract_ToadKid_02) = { Set(LVar1, MSG_MAC_Station_0036) CaseLt(STORY_CH4_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_ShyGuyBlockingTracks, FALSE) +#if VERSION_JP + Set(LVar0, MSG_MAC_Station_0076) + Set(LVar1, MSG_MAC_Station_0077) +#endif Else IfEq(GF_MAC03_ShyGuyChasedOff, FALSE) Set(LVar0, MSG_MAC_Station_0037) diff --git a/src/world/area_mac/mac_03/oinks.c b/src/world/area_mac/mac_03/oinks.c index e593dc9d66..21c0fc96f0 100644 --- a/src/world/area_mac/mac_03/oinks.c +++ b/src/world/area_mac/mac_03/oinks.c @@ -351,7 +351,11 @@ LilOinkReward N(LilOinkPrizes)[] = { [LIL_OINK_TYPE_STAR] { .itemID = ITEM_SHOOTING_STAR, .quantity = 1, .chance = 100 }, [LIL_OINK_TYPE_QUESTION] { .itemID = ITEM_REPEL_GEL, .quantity = 1, .chance = 100 }, [LIL_OINK_TYPE_SILVER] { .itemID = ITEM_JAMMIN_JELLY, .quantity = 1, .chance = 100 }, +#if VERSION_JP + [LIL_OINK_TYPE_GOLD] { .itemID = ITEM_JELLY_SHROOM, .quantity = 1, .chance = 100 }, +#else [LIL_OINK_TYPE_GOLD] { .itemID = ITEM_ULTRA_SHROOM, .quantity = 1, .chance = 100 }, +#endif }; API_CALLABLE(N(GetLilOinkPrize)) { diff --git a/src/world/area_mac/mac_04/npc_gossip_trio.inc.c b/src/world/area_mac/mac_04/npc_gossip_trio.inc.c index 214133e784..050ca5b95b 100644 --- a/src/world/area_mac/mac_04/npc_gossip_trio.inc.c +++ b/src/world/area_mac/mac_04/npc_gossip_trio.inc.c @@ -1,5 +1,19 @@ EvtScript N(EVS_NpcInteract_GossipTrio) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Housing_00EF) + Set(LVar1, MSG_MAC_Housing_00F0) + Set(LVar2, MSG_MAC_Housing_00F1) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Housing_00F2) + Set(LVar1, MSG_MAC_Housing_00F3) + Set(LVar2, MSG_MAC_Housing_00F4) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Housing_00F5) + Set(LVar1, MSG_MAC_Housing_00F6) + Set(LVar2, MSG_MAC_Housing_00F7) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Housing_0081) diff --git a/src/world/area_mac/mac_04/npc_new_residents.inc.c b/src/world/area_mac/mac_04/npc_new_residents.inc.c index da3de8de77..8991261c9d 100644 --- a/src/world/area_mac/mac_04/npc_new_residents.inc.c +++ b/src/world/area_mac/mac_04/npc_new_residents.inc.c @@ -1,5 +1,13 @@ EvtScript N(EVS_NpcInteract_NewResident1) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Housing_00D4) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Housing_00D5) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Housing_00D6) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Housing_0006) @@ -45,6 +53,14 @@ EvtScript N(EVS_NpcInit_NewResident1) = { EvtScript N(EVS_NpcInteract_NewResident2) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Housing_00D7) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Housing_00D8) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Housing_00D9) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Housing_0013) diff --git a/src/world/area_mac/mac_04/npc_toad_01.inc.c b/src/world/area_mac/mac_04/npc_toad_01.inc.c index bc8b23c927..e48db4d5cf 100644 --- a/src/world/area_mac/mac_04/npc_toad_01.inc.c +++ b/src/world/area_mac/mac_04/npc_toad_01.inc.c @@ -1,5 +1,13 @@ EvtScript N(EVS_NpcInteract_Toad_01) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Housing_00DA) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Housing_00DB) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Housing_00DC) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Housing_0020) diff --git a/src/world/area_mac/mac_04/npc_toad_02.inc.c b/src/world/area_mac/mac_04/npc_toad_02.inc.c index 758b63dc21..35bd6be9a5 100644 --- a/src/world/area_mac/mac_04/npc_toad_02.inc.c +++ b/src/world/area_mac/mac_04/npc_toad_02.inc.c @@ -1,5 +1,13 @@ EvtScript N(EVS_NpcInteract_Toad_02) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Housing_00DD) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Housing_00DE) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Housing_00DF) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Housing_002D) diff --git a/src/world/area_mac/mac_04/npc_toad_03.inc.c b/src/world/area_mac/mac_04/npc_toad_03.inc.c index 4b8d14d445..11db843aae 100644 --- a/src/world/area_mac/mac_04/npc_toad_03.inc.c +++ b/src/world/area_mac/mac_04/npc_toad_03.inc.c @@ -1,5 +1,13 @@ EvtScript N(EVS_NpcInteract_Toad_03) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Housing_00EC) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Housing_00ED) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Housing_00EE) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Housing_0074) diff --git a/src/world/area_mac/mac_04/npc_toad_kids.inc.c b/src/world/area_mac/mac_04/npc_toad_kids.inc.c index ae910df1fd..33635b1699 100644 --- a/src/world/area_mac/mac_04/npc_toad_kids.inc.c +++ b/src/world/area_mac/mac_04/npc_toad_kids.inc.c @@ -1,5 +1,19 @@ EvtScript N(EVS_NpcInteract_ToadKids) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Housing_00E0) + Set(LVar1, MSG_MAC_Housing_00E1) + Set(LVar2, MSG_MAC_Housing_00E2) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Housing_00E3) + Set(LVar1, MSG_MAC_Housing_00E4) + Set(LVar2, MSG_MAC_Housing_00E5) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Housing_00E6) + Set(LVar1, MSG_MAC_Housing_00E7) + Set(LVar2, MSG_MAC_Housing_00E8) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Housing_003A) diff --git a/src/world/area_mac/mac_04/npc_toadette_03.inc.c b/src/world/area_mac/mac_04/npc_toadette_03.inc.c index be9e6949ea..5d0eb2ecf1 100644 --- a/src/world/area_mac/mac_04/npc_toadette_03.inc.c +++ b/src/world/area_mac/mac_04/npc_toadette_03.inc.c @@ -1,5 +1,13 @@ EvtScript N(EVS_NpcInteract_Toadette_03) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Housing_00E9) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Housing_00EA) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Housing_00EB) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Housing_0061) diff --git a/src/world/area_mac/mac_05/npc.c b/src/world/area_mac/mac_05/npc.c index 1193853b9d..ffe3ac5615 100644 --- a/src/world/area_mac/mac_05/npc.c +++ b/src/world/area_mac/mac_05/npc.c @@ -1,6 +1,8 @@ #include "mac_05.h" #include "sprite/player.h" +void increment_max_star_power(void); + NpcSettings N(NpcSettings_Whale) = { .height = 24, .radius = 48, @@ -131,6 +133,13 @@ EvtScript N(EVS_ArtifactPrompt_Kolorado) = { End }; +#if VERSION_JP +API_CALLABLE(N(IncreaseMaxSP)) { + increment_max_star_power(); + return ApiStatus_DONE2; +} +#endif + API_CALLABLE(N(func_80242A90_854C00)) { Bytecode* args = script->ptrReadPos; s32 mode = evt_get_variable(script, *args++); @@ -1371,6 +1380,17 @@ EvtScript N(EVS_NpcInit_JrTroopa_02) = { EvtScript N(EVS_NpcInteract_Fuzzipede1) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Port_00D9) + Set(LVar1, MSG_MAC_Port_00DC) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Port_00DA) + Set(LVar1, MSG_MAC_Port_00DD) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Port_00DB) + Set(LVar1, MSG_MAC_Port_00DE) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Port_004E) @@ -1477,6 +1497,14 @@ EvtScript N(EVS_NpcInit_Fuzzipede) = { EvtScript N(EVS_NpcInteract_Toad_04) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Port_00CC) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Port_00CD) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Port_00CE) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Port_001A) @@ -1521,6 +1549,14 @@ EvtScript N(EVS_NpcInit_Toad_04) = { EvtScript N(EVS_NpcInteract_Toad_05) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Port_00CF) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Port_00D0) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Port_00D1) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Port_0027) @@ -1565,6 +1601,14 @@ EvtScript N(EVS_NpcInit_Toad_05) = { EvtScript N(EVS_NpcInteract_Toad_06) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Port_00D3) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Port_00D4) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Port_00D5) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Port_0034) @@ -1609,6 +1653,14 @@ EvtScript N(EVS_NpcInit_Toad_06) = { EvtScript N(EVS_NpcInteract_Toad_07) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Port_00D6) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Port_00D7) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Port_00D8) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Port_0041) @@ -1653,6 +1705,14 @@ EvtScript N(EVS_NpcInit_Toad_07) = { EvtScript N(EVS_NpcInteract_Bartender) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Port_00C6) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Port_00C7) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Port_00C8) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Port_0000) @@ -1697,6 +1757,14 @@ EvtScript N(EVS_NpcInit_Bartender) = { EvtScript N(EVS_NpcInteract_Toad_02) = { Switch(GB_StoryProgress) +#if VERSION_JP + CaseLt(STORY_CH0_MET_STAR_SPIRITS) + Set(LVar0, MSG_MAC_Port_00C9) + CaseLt(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + Set(LVar0, MSG_MAC_Port_00CA) + CaseLt(STORY_CH1_STAR_SPRIT_DEPARTED) + Set(LVar0, MSG_MAC_Port_00CB) +#endif CaseLt(STORY_CH2_STAR_SPRIT_DEPARTED) IfEq(GF_MAC03_BombedRock, FALSE) Set(LVar0, MSG_MAC_Port_000D) diff --git a/src/world/area_mac/mac_05/rooms.c b/src/world/area_mac/mac_05/rooms.c index e893190bc4..7b4c2f696b 100644 --- a/src/world/area_mac/mac_05/rooms.c +++ b/src/world/area_mac/mac_05/rooms.c @@ -43,7 +43,9 @@ EvtScript N(D_802525B0_864720) = { CaseEq(0) Call(SetMusicTrack, 0, SONG_CLUB64, 0, 8) Call(StopSound, SOUND_LOOP_MAC_HARBOR_WATER) +#if !VERSION_JP Call(StopTrackingSoundPos, SOUND_LRAW_MAC_HARBOR_WATER) +#endif Call(EnableGroup, MODEL_bar_inn, TRUE) Call(EnableModel, MODEL_o139, FALSE) Call(EnableModel, MODEL_o140, FALSE) diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index 6d4236aba4..b1f1354009 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -1114,20 +1114,24 @@ EvtScript N(EVS_Quizmo_QuizMain) = { Call(N(Quizmo_SetStageLightsDelay), 15) Call(N(Quizmo_SetVannaAnim_Idle)) Call(SetMessageValue, GB_CompletedQuizzes, 0) +#if VERSION_US || VERSION_IQUE + IfEq(GB_CompletedQuizzes, 1) + Call(SetMessageText, Ref(MessageSingular), 1) + Else + Call(SetMessageText, Ref(MessagePlural), 1) + EndIf +#elif VERSION_PAL IfEq(GB_CompletedQuizzes, 1) Call(SetMessageText, Ref(MessageSingular), 1) Else -#if VERSION_PAL Call(GetLanguage, LVar0) IfEq(LVar0, LANGUAGE_DE) Call(SetMessageText, Ref(MessagePlural_de), 1) Else Call(SetMessageText, Ref(MessagePlural), 1) EndIf -#else - Call(SetMessageText, Ref(MessagePlural), 1) -#endif EndIf +#endif Call(SpeakToPlayer, NPC_SELF, ANIM_ChuckQuizmo_Talk, ANIM_ChuckQuizmo_Idle, 0, MSG_MGM_000F) EndIf Set(LVar0, 1) diff --git a/src/world/common/todo/UnkScriptJP00.inc.c b/src/world/common/todo/UnkScriptJP00.inc.c new file mode 100644 index 0000000000..1f704a391e --- /dev/null +++ b/src/world/common/todo/UnkScriptJP00.inc.c @@ -0,0 +1,60 @@ +#include "effects.h" +#include "sprite/player.h" + +EvtScript N(EVS_UnkJP00) = { + Call(N(StashVars)) + Call(SetPlayerAnimation, ANIM_Mario1_GetItem) + Set(LVarA, LVar0) + Set(LVarB, LVar1) + Set(LVarC, LVar2) + Call(GetPlayerPos, LVar5, LVar6, LVar7) + Add(LVar6, 50) + Call(MakeItemEntity, LVarA, LVar5, LVar6, LVar7, 1, 0) + Set(LVarD, LVar0) + Call(GetPlayerPos, LVar5, LVar6, LVar7) + Add(LVar5, -15) + Add(LVar6, 40) + Call(MakeItemEntity, LVarB, LVar5, LVar6, LVar7, 1, 0) + Set(LVarE, LVar0) + Call(GetPlayerPos, LVar5, LVar6, LVar7) + Add(LVar5, 15) + Add(LVar6, 40) + Call(MakeItemEntity, LVarC, LVar5, LVar6, LVar7, 1, 0) + Set(LVarF, LVar0) + Thread + Wait(4) + Call(GetPlayerPos, LVar3, LVar4, LVar5) + Add(LVar4, 50) + Add(LVar5, 2) + Add(LVar3, 8) + PlayEffect(EFFECT_SPARKLES, 3, LVar3, LVar4, LVar5, 20) + Add(LVar3, -16) + PlayEffect(EFFECT_SPARKLES, 3, LVar3, LVar4, LVar5, 20) + EndThread + Call(PlaySound, SOUND_JINGLE_GOT_KEY) + Call(N(GetItemName), LVarA) + Call(SetMessageText, LVarA, 0) + Call(N(GetItemName), LVarB) + Call(SetMessageText, LVarB, 1) + Call(N(GetItemName), LVarC) + Call(SetMessageText, LVarC, 2) + Call(ShowMessageAtScreenPos, MSG_Menus_JP_0009, 160, 40) + Call(RemoveItemEntity, LVarD) + Call(RemoveItemEntity, LVarE) + Call(RemoveItemEntity, LVarF) + Call(SetPlayerAnimation, ANIM_Mario1_Idle) + Call(N(StashVars)) + Return + End +}; + +EvtScript N(EVS_UnkJP01) = { + SetGroup(EVT_GROUP_00) + Call(SetTimeFreezeMode, TIME_FREEZE_FULL) + Wait(40) + Call(ShowGotItem, LVar0, FALSE, 0) + Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Return + Return + End +}; diff --git a/tools/build/configure.py b/tools/build/configure.py index f2b8c70562..f8f3711123 100755 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -592,11 +592,18 @@ class Configure: "world_map", ) - build( - self.build_path() / "include/recipes.inc.c", - [Path("src/recipes.yaml")], - "recipes", - ) + if self.version == "jp": + build( + self.build_path() / "include/recipes.inc.c", + [Path("src/recipes_jp.yaml")], + "recipes", + ) + else: + build( + self.build_path() / "include/recipes.inc.c", + [Path("src/recipes.yaml")], + "recipes", + ) build( [ diff --git a/tools/splat_ext/msg_jp.yaml b/tools/splat_ext/msg_jp.yaml index 6afa725693..5aacbf7c53 100644 --- a/tools/splat_ext/msg_jp.yaml +++ b/tools/splat_ext/msg_jp.yaml @@ -1,19 +1,123 @@ # This file describes what to name messages when splitting. - [0x00, 0x0000, NONE] +- [0x00, 0x006B, Intro_001E] +- [0x00, 0x006C, Intro_001F] +- [0x00, 0x006D, Intro_0020] +- [0x00, 0x006E, Intro_0021] - [0x00, 0x00A4, Intro_0057] - [0x00, 0x00A5, Intro_0058] - [0x00, 0x00A6, Intro_0059] - [0x00, 0x00A7, Intro_005A] - [0x00, 0x00A8, Intro_005B] - [0x00, 0x00A9, Intro_005C] +- [0x01, 0x000E, Outro_000D] +- [0x01, 0x000F, Outro_000E] +- [0x01, 0x0010, Outro_000F] +- [0x01, 0x0011, Outro_0010] +- [0x01, 0x0012, Outro_0011] +- [0x01, 0x0013, Outro_0012] +- [0x01, 0x0014, Outro_0013] +- [0x01, 0x0015, Outro_0014] +- [0x01, 0x0016, Outro_0015] +- [0x01, 0x0017, Outro_0016] +- [0x01, 0x0022, Outro_0021] +- [0x01, 0x0023, Outro_0022] +- [0x01, 0x0024, Outro_0023] +- [0x01, 0x0025, Outro_0024] +- [0x01, 0x0026, Outro_0025] +- [0x01, 0x0027, Outro_0026] +- [0x01, 0x0028, Outro_0027] +- [0x01, 0x0029, Outro_0028] +- [0x01, 0x002A, Outro_0029] +- [0x01, 0x002B, Outro_002A] +- [0x01, 0x002C, Outro_002B] +- [0x01, 0x002D, Outro_002C] +- [0x01, 0x002E, Outro_002D] +- [0x01, 0x002F, Outro_002E] +- [0x01, 0x0030, Outro_002F] +- [0x01, 0x0031, Outro_0030] +- [0x01, 0x0032, Outro_0031] +- [0x01, 0x0033, Outro_0032] +- [0x01, 0x0034, Outro_0033] +- [0x01, 0x0035, Outro_0034] +- [0x01, 0x0036, Outro_0035] +- [0x01, 0x0037, Outro_0036] +- [0x01, 0x0038, Outro_0037] +- [0x01, 0x0039, Outro_0038] +- [0x01, 0x003A, Outro_0039] +- [0x01, 0x003B, Outro_003A] +- [0x01, 0x003C, Outro_003B] +- [0x01, 0x003D, Outro_003C] +- [0x01, 0x003E, Outro_003D] +- [0x01, 0x003F, Outro_003E] +- [0x01, 0x0040, Outro_003F] +- [0x01, 0x0041, Outro_0040] +- [0x01, 0x0042, Outro_0041] +- [0x01, 0x0043, Outro_0042] +- [0x01, 0x0044, Outro_0043] +- [0x01, 0x0045, Outro_0044] +- [0x01, 0x0046, Outro_0045] +- [0x01, 0x0047, Outro_0046] +- [0x01, 0x0048, Outro_0047] +- [0x01, 0x0049, Outro_0048] +- [0x01, 0x004A, Outro_0049] +- [0x01, 0x004B, Outro_004A] +- [0x01, 0x004C, Outro_004B] +- [0x01, 0x004D, Outro_004C] +- [0x01, 0x004E, Outro_004D] +- [0x01, 0x004F, Outro_004E] +- [0x01, 0x0050, Outro_004F] +- [0x01, 0x0051, Outro_0050] +- [0x01, 0x0052, Outro_0051] +- [0x01, 0x0053, Outro_0052] +- [0x01, 0x0054, Outro_0053] +- [0x01, 0x0055, Outro_0054] +- [0x02, 0x0000, MAC_Gate_0000] +- [0x02, 0x0001, MAC_Gate_0001] +- [0x02, 0x0002, MAC_Gate_0002] +- [0x02, 0x0003, MAC_Gate_0003] +- [0x02, 0x0004, MAC_Gate_0004] +- [0x02, 0x0005, MAC_Gate_0005] +- [0x02, 0x0006, MAC_Gate_0006] +- [0x02, 0x0007, MAC_Gate_0007] +- [0x02, 0x0008, MAC_Gate_0008] +- [0x02, 0x0009, MAC_Gate_0009] +- [0x02, 0x000A, MAC_Gate_000A] +- [0x02, 0x000B, MAC_Gate_000B] +- [0x02, 0x000C, MAC_Gate_000C] +- [0x02, 0x000D, MAC_Gate_000D] +- [0x02, 0x000E, MAC_Gate_000E] +- [0x02, 0x000F, MAC_Gate_000F] +- [0x02, 0x0010, MAC_Gate_0010] +- [0x02, 0x0011, MAC_Gate_JP_0011] +- [0x02, 0x0012, MAC_Gate_0011] +- [0x02, 0x0013, MAC_Gate_0012] +- [0x02, 0x0014, MAC_Gate_0013] +- [0x02, 0x0015, MAC_Gate_0014] +- [0x02, 0x0016, MAC_Gate_0015] +- [0x02, 0x0017, MAC_Gate_0016] +- [0x02, 0x0018, MAC_Gate_0017] +- [0x02, 0x0019, MAC_Gate_0018] +- [0x02, 0x001A, MAC_Gate_0019] +- [0x02, 0x001C, MAC_Gate_001B] +- [0x02, 0x001D, MAC_Gate_001C] +- [0x02, 0x001E, MAC_Gate_001D] +- [0x02, 0x001F, MAC_Gate_001E] - [0x02, 0x0020, MAC_Gate_001F] - [0x02, 0x0021, MAC_Gate_0020] - [0x02, 0x0022, MAC_Gate_0021] - [0x02, 0x0023, MAC_Gate_0022] +- [0x02, 0x0024, MAC_Gate_0023] +- [0x02, 0x0025, MAC_Gate_0024] +- [0x02, 0x0026, MAC_Gate_0025] - [0x02, 0x0028, MAC_Gate_0027] - [0x02, 0x0029, MAC_Gate_0028] - [0x02, 0x002A, MAC_Gate_0029] +- [0x02, 0x002B, MAC_Gate_002A] +- [0x02, 0x002C, MAC_Gate_002B] +- [0x02, 0x002D, MAC_Gate_002C] +- [0x02, 0x002E, MAC_Gate_002D] - [0x02, 0x002F, MAC_Gate_002E] - [0x02, 0x0030, MAC_Gate_002F] - [0x02, 0x0031, MAC_Gate_0030] @@ -30,12 +134,1251 @@ - [0x02, 0x003C, MAC_Gate_003B] - [0x02, 0x003D, MAC_Gate_003C] - [0x02, 0x003E, MAC_Gate_003D] +- [0x02, 0x003F, MAC_Gate_003E] +- [0x02, 0x0040, MAC_Gate_003F] +- [0x02, 0x0041, MAC_Gate_0040] +- [0x02, 0x0042, MAC_Gate_0041] +- [0x02, 0x0043, MAC_Gate_0042] +- [0x02, 0x0044, MAC_Gate_0043] +- [0x02, 0x0045, MAC_Gate_0044] +- [0x02, 0x0046, MAC_Gate_0045] +- [0x02, 0x0047, MAC_Gate_0046] +- [0x02, 0x0048, MAC_Gate_0047] +- [0x02, 0x0049, MAC_Gate_0048] +- [0x02, 0x004A, MAC_Gate_0049] +- [0x02, 0x004B, MAC_Gate_004A] +- [0x02, 0x004C, MAC_Gate_004B] +- [0x02, 0x004D, MAC_Gate_004C] +- [0x02, 0x004E, MAC_Gate_004D] +- [0x02, 0x004F, MAC_Gate_004E] +- [0x02, 0x0050, MAC_Gate_004F] +- [0x02, 0x0051, MAC_Gate_0050] +- [0x02, 0x0052, MAC_Gate_0051] +- [0x02, 0x0053, MAC_Gate_0052] +- [0x02, 0x0054, MAC_Gate_0053] +- [0x02, 0x0055, MAC_Gate_0054] +- [0x02, 0x0056, MAC_Gate_0055] +- [0x02, 0x0057, MAC_Gate_0056] +- [0x02, 0x0058, MAC_Gate_0057] +- [0x02, 0x0059, MAC_Gate_0058] +- [0x02, 0x005A, MAC_Gate_0059] +- [0x02, 0x005B, MAC_Gate_005A] +- [0x02, 0x005C, MAC_Gate_005B] +- [0x02, 0x005D, MAC_Gate_005C] +- [0x02, 0x005E, MAC_Gate_005D] +- [0x02, 0x005F, MAC_Gate_005E] +- [0x02, 0x0060, MAC_Gate_005F] +- [0x02, 0x0061, MAC_Gate_0060] +- [0x02, 0x0062, MAC_Gate_0061] +- [0x02, 0x0063, MAC_Gate_0062] +- [0x02, 0x0064, MAC_Gate_0063] +- [0x02, 0x0065, MAC_Gate_0064] +- [0x02, 0x0066, MAC_Gate_0065] +- [0x02, 0x0067, MAC_Gate_0066] +- [0x02, 0x0068, MAC_Gate_0067] +- [0x02, 0x0069, MAC_Gate_0068] +- [0x02, 0x006A, MAC_Gate_0069] +- [0x02, 0x006B, MAC_Gate_006A] +- [0x02, 0x006C, MAC_Gate_006B] +- [0x02, 0x006D, MAC_Gate_006C] +- [0x02, 0x006E, MAC_Gate_006D] +- [0x02, 0x006F, MAC_Gate_006E] +- [0x02, 0x0070, MAC_Gate_006F] +- [0x02, 0x0071, MAC_Gate_0070] +- [0x02, 0x0072, MAC_Gate_0071] +- [0x02, 0x0073, MAC_Gate_0072] +- [0x02, 0x0074, MAC_Gate_0073] +- [0x02, 0x0075, MAC_Gate_0074] +- [0x02, 0x0076, MAC_Gate_0075] +- [0x02, 0x0077, MAC_Gate_0076] +- [0x02, 0x0078, MAC_Gate_0077] +- [0x02, 0x0079, MAC_Gate_0078] +- [0x02, 0x007A, MAC_Gate_0079] +- [0x02, 0x007B, MAC_Gate_007A] +- [0x02, 0x007C, MAC_Gate_007B] +- [0x02, 0x007D, MAC_Gate_007C] +- [0x02, 0x007E, MAC_Gate_007D] +- [0x02, 0x007F, MAC_Gate_007E] +- [0x02, 0x0080, MAC_Gate_007F] +- [0x02, 0x0081, MAC_Gate_0080] +- [0x02, 0x0082, MAC_Gate_0081] +- [0x02, 0x0083, MAC_Gate_0082] +- [0x02, 0x0084, MAC_Gate_0083] +- [0x02, 0x0085, MAC_Gate_0084] +- [0x02, 0x0086, MAC_Gate_0085] +- [0x02, 0x0087, MAC_Gate_0086] +- [0x02, 0x0088, MAC_Gate_0087] +- [0x02, 0x0089, MAC_Gate_0088] +- [0x02, 0x008A, MAC_Gate_0089] +- [0x02, 0x008B, MAC_Gate_008A] +- [0x02, 0x008C, MAC_Gate_008B] +- [0x02, 0x008D, MAC_Gate_008C] +- [0x02, 0x008E, MAC_Gate_008D] +- [0x02, 0x008F, MAC_Gate_008E] +- [0x02, 0x0090, MAC_Gate_008F] +- [0x02, 0x0091, MAC_Gate_0090] +- [0x02, 0x0092, MAC_Gate_0091] +- [0x02, 0x0093, MAC_Gate_0092] +- [0x02, 0x0094, MAC_Gate_0093] +- [0x02, 0x0095, MAC_Gate_0094] +- [0x02, 0x0096, MAC_Gate_0095] +- [0x02, 0x0097, MAC_Gate_0096] +- [0x02, 0x0098, MAC_Gate_0097] +- [0x02, 0x0099, MAC_Gate_0098] +- [0x02, 0x009A, MAC_Gate_0099] +- [0x02, 0x009B, MAC_Gate_009A] +- [0x02, 0x009C, MAC_Gate_009B] +- [0x02, 0x009D, MAC_Gate_009C] +- [0x02, 0x009E, MAC_Gate_009D] +- [0x02, 0x009F, MAC_Gate_009E] +- [0x02, 0x00A0, MAC_Gate_009F] +- [0x02, 0x00A1, MAC_Gate_00A0] +- [0x02, 0x00A2, MAC_Gate_00A1] +- [0x02, 0x00A3, MAC_Gate_00A2] +- [0x02, 0x00A4, MAC_Gate_00A3] +- [0x02, 0x00A5, MAC_Gate_00A4] +- [0x02, 0x00A6, MAC_Gate_00A5] +- [0x02, 0x00A7, MAC_Gate_00A6] +- [0x02, 0x00A8, MAC_Gate_00A7] +- [0x02, 0x00A9, MAC_Gate_00A8] +- [0x02, 0x00AA, MAC_Gate_00A9] +- [0x02, 0x00AB, MAC_Gate_00AA] +- [0x02, 0x00AC, MAC_Gate_00AB] +- [0x02, 0x00AD, MAC_Gate_00AC] +- [0x02, 0x00AE, MAC_Gate_00AD] +- [0x02, 0x00AF, MAC_Gate_00AE] +- [0x02, 0x00B0, MAC_Gate_00AF] +- [0x02, 0x00B1, MAC_Gate_00B0] +- [0x02, 0x00B2, MAC_Gate_00B1] +- [0x02, 0x00B3, MAC_Gate_00B2] +- [0x02, 0x00B4, MAC_Gate_00B3] +- [0x02, 0x00B5, MAC_Gate_00B4] +- [0x02, 0x00B6, MAC_Gate_00B5] +- [0x02, 0x00B7, MAC_Gate_00B6] +- [0x02, 0x00B8, MAC_Gate_00B7] +- [0x02, 0x00B9, MAC_Gate_00B8] +- [0x02, 0x00BA, MAC_Gate_00B9] +- [0x02, 0x00BB, MAC_Gate_00BA] +- [0x02, 0x00BC, MAC_Gate_00BB] +- [0x02, 0x00BD, MAC_Gate_00BC] +- [0x02, 0x00BE, MAC_Gate_00BD] +- [0x02, 0x00BF, MAC_Gate_00BE] +- [0x02, 0x00C0, MAC_Gate_00BF] +- [0x02, 0x00C1, MAC_Gate_00C0] +- [0x02, 0x00C2, MAC_Gate_00C1] +- [0x02, 0x00C3, MAC_Gate_00C2] +- [0x02, 0x00C4, MAC_Gate_00C3] +- [0x02, 0x00C5, MAC_Gate_00C4] +- [0x02, 0x00C6, MAC_Gate_00C5] +- [0x02, 0x00C7, MAC_Gate_00C6] +- [0x02, 0x00C8, MAC_Gate_00C7] +- [0x02, 0x00C9, MAC_Gate_00C8] +- [0x02, 0x00CA, MAC_Gate_00C9] +- [0x02, 0x00CB, MAC_Gate_00CA] +- [0x02, 0x00CC, MAC_Gate_00CB] +- [0x02, 0x00CD, MAC_Gate_00CC] +- [0x02, 0x00CE, MAC_Gate_00CD] +- [0x02, 0x00CF, MAC_Gate_00CE] +- [0x02, 0x00D0, MAC_Gate_00CF] +- [0x02, 0x00D1, MAC_Gate_00D0] +- [0x02, 0x00D2, MAC_Gate_00D1] +- [0x02, 0x00D3, MAC_Gate_00D2] +- [0x02, 0x00D4, MAC_Gate_00D3] +- [0x02, 0x00D5, MAC_Gate_00D4] +- [0x02, 0x00D6, MAC_Gate_00D5] +- [0x02, 0x00D7, MAC_Gate_00D6] +- [0x02, 0x00D8, MAC_Gate_00D7] +- [0x02, 0x00D9, MAC_Gate_00D8] +- [0x02, 0x00DA, MAC_Gate_00D9] +- [0x02, 0x00DB, MAC_Gate_00DA] +- [0x02, 0x00DC, MAC_Gate_00DB] +- [0x02, 0x00DD, MAC_Gate_00DC] +- [0x02, 0x00DE, MAC_Gate_00DD] +- [0x02, 0x00DF, MAC_Gate_00DE] +- [0x02, 0x00E0, MAC_Gate_00DF] +- [0x02, 0x00E1, MAC_Gate_00E0] +- [0x02, 0x00E2, MAC_Gate_00E1] +- [0x02, 0x00E3, MAC_Gate_00E2] +- [0x02, 0x00E4, MAC_Gate_00E3] +- [0x02, 0x00E5, MAC_Gate_00E4] +- [0x02, 0x00E6, MAC_Gate_00E5] +- [0x02, 0x00E7, MAC_Gate_00E6] +- [0x02, 0x00E8, MAC_Gate_00E7] +- [0x02, 0x00E9, MAC_Gate_00E8] +- [0x02, 0x00EA, MAC_Gate_00E9] +- [0x02, 0x00EB, MAC_Gate_00EA] +- [0x02, 0x00EC, MAC_Gate_00EB] +- [0x02, 0x00ED, MAC_Gate_00EC] +- [0x02, 0x00EE, MAC_Gate_00ED] +- [0x02, 0x00EF, MAC_Gate_00EE] +- [0x02, 0x00F0, MAC_Gate_00EF] +- [0x02, 0x00F1, MAC_Gate_00F0] +- [0x02, 0x00F2, MAC_Gate_00F1] +- [0x02, 0x00F3, MAC_Gate_00F2] +- [0x02, 0x00F4, MAC_Gate_00F3] +- [0x02, 0x00F5, MAC_Gate_00F4] +- [0x02, 0x00F6, MAC_Gate_00F5] +- [0x02, 0x00F7, MAC_Gate_00F6] +- [0x02, 0x00F8, MAC_Gate_00F7] +- [0x02, 0x00F9, MAC_Gate_00F8] +- [0x02, 0x00FA, MAC_Gate_00F9] +- [0x02, 0x00FB, MAC_Gate_00FA] +- [0x02, 0x00FC, MAC_Gate_00FB] +- [0x02, 0x00FD, MAC_Gate_00FC] +- [0x02, 0x00FE, MAC_Gate_00FD] +- [0x02, 0x00FF, MAC_Gate_00FE] +- [0x02, 0x0100, MAC_Gate_00FF] +- [0x02, 0x0101, MAC_Gate_0100] +- [0x02, 0x0102, MAC_Gate_0101] +- [0x02, 0x0103, MAC_Gate_0102] +- [0x02, 0x0104, MAC_Gate_0103] +- [0x02, 0x0105, MAC_Gate_0104] +- [0x02, 0x0106, MAC_Gate_0105] +- [0x02, 0x0107, MAC_Gate_0106] +- [0x02, 0x0108, MAC_Gate_0107] +- [0x02, 0x0109, MAC_Gate_0108] +- [0x02, 0x010A, MAC_Gate_0109] +- [0x02, 0x010B, MAC_Gate_010A] +- [0x02, 0x010C, MAC_Gate_010B] +- [0x02, 0x010D, MAC_Gate_010C] +- [0x02, 0x010E, MAC_Gate_010D] +- [0x02, 0x010F, MAC_Gate_010E] +- [0x02, 0x0110, MAC_Gate_010F] +- [0x02, 0x0111, MAC_Gate_0110] +- [0x02, 0x0112, MAC_Gate_0111] +- [0x02, 0x0113, MAC_Gate_0112] +- [0x02, 0x0114, MAC_Gate_0113] +- [0x02, 0x0115, MAC_Gate_0114] +- [0x02, 0x0116, MAC_Gate_0115] +- [0x02, 0x0117, MAC_Gate_0116] +- [0x02, 0x0118, MAC_Gate_0117] +- [0x02, 0x0119, MAC_Gate_0118] +- [0x02, 0x011A, MAC_Gate_0119] +- [0x02, 0x011B, MAC_Gate_011A] +- [0x02, 0x011C, MAC_Gate_011B] +- [0x02, 0x011D, MAC_Gate_011C] +- [0x02, 0x011E, MAC_Gate_011D] +- [0x02, 0x011F, MAC_Gate_011E] +- [0x02, 0x0120, MAC_Gate_011F] +- [0x02, 0x0121, MAC_Gate_0121] +- [0x02, 0x0122, MAC_Gate_0122] +- [0x02, 0x0123, MAC_Gate_0123] +- [0x02, 0x0124, MAC_Gate_0124] +- [0x02, 0x0125, MAC_Gate_0125] +- [0x02, 0x0126, MAC_Gate_0126] +- [0x02, 0x0127, MAC_Gate_0127] +- [0x02, 0x0128, MAC_Gate_0128] +- [0x03, 0x0000, MAC_Plaza_0000] +- [0x03, 0x0001, MAC_Plaza_0001] +- [0x03, 0x0002, MAC_Plaza_0002] +- [0x03, 0x0003, MAC_Plaza_0003] +- [0x03, 0x0004, MAC_Plaza_0004] +- [0x03, 0x0005, MAC_Plaza_0005] +- [0x03, 0x0006, MAC_Plaza_0006] +- [0x03, 0x0007, MAC_Plaza_0007] +- [0x03, 0x0008, MAC_Plaza_0008] +- [0x03, 0x0009, MAC_Plaza_0009] +- [0x03, 0x000A, MAC_Plaza_000A] +- [0x03, 0x000B, MAC_Plaza_000B] +- [0x03, 0x000C, MAC_Plaza_000C] +- [0x03, 0x000D, MAC_Plaza_000D] +- [0x03, 0x000E, MAC_Plaza_000E] +- [0x03, 0x000F, MAC_Plaza_000F] +- [0x03, 0x0010, MAC_Plaza_0010] +- [0x03, 0x0011, MAC_Plaza_0011] +- [0x03, 0x0012, MAC_Plaza_0012] +- [0x03, 0x0013, MAC_Plaza_0013] +- [0x03, 0x0014, MAC_Plaza_0014] +- [0x03, 0x0015, MAC_Plaza_0015] +- [0x03, 0x0016, MAC_Plaza_0016] +- [0x03, 0x0017, MAC_Plaza_0017] +- [0x03, 0x0018, MAC_Plaza_0018] +- [0x03, 0x0019, MAC_Plaza_0019] +- [0x03, 0x001A, MAC_Plaza_001A] +- [0x03, 0x001B, MAC_Plaza_001B] +- [0x03, 0x001C, MAC_Plaza_001C] +- [0x03, 0x001D, MAC_Plaza_001D] +- [0x03, 0x001E, MAC_Plaza_001E] +- [0x03, 0x001F, MAC_Plaza_001F] +- [0x03, 0x0020, MAC_Plaza_0020] +- [0x03, 0x0021, MAC_Plaza_0021] +- [0x03, 0x0022, MAC_Plaza_0022] +- [0x03, 0x0023, MAC_Plaza_0023] +- [0x03, 0x0024, MAC_Plaza_0024] +- [0x03, 0x0025, MAC_Plaza_0025] +- [0x03, 0x0026, MAC_Plaza_0026] +- [0x03, 0x0027, MAC_Plaza_0027] +- [0x03, 0x0028, MAC_Plaza_0028] +- [0x03, 0x0029, MAC_Plaza_0029] +- [0x03, 0x002A, MAC_Plaza_002A] +- [0x03, 0x002B, MAC_Plaza_002B] +- [0x03, 0x002C, MAC_Plaza_002C] +- [0x03, 0x002D, MAC_Plaza_002D] +- [0x03, 0x002E, MAC_Plaza_002E] +- [0x03, 0x002F, MAC_Plaza_002F] +- [0x03, 0x0030, MAC_Plaza_0030] +- [0x03, 0x0031, MAC_Plaza_0031] +- [0x03, 0x0032, MAC_Plaza_0032] +- [0x03, 0x0033, MAC_Plaza_0033] +- [0x03, 0x0034, MAC_Plaza_0034] +- [0x03, 0x0035, MAC_Plaza_0035] +- [0x03, 0x0036, MAC_Plaza_0036] +- [0x03, 0x0037, MAC_Plaza_0037] +- [0x03, 0x0038, MAC_Plaza_0038] +- [0x03, 0x0039, MAC_Plaza_0039] +- [0x03, 0x003A, MAC_Plaza_003A] +- [0x03, 0x003B, MAC_Plaza_003B] +- [0x03, 0x003C, MAC_Plaza_003C] +- [0x03, 0x003D, MAC_Plaza_003D] +- [0x03, 0x003E, MAC_Plaza_003E] +- [0x03, 0x003F, MAC_Plaza_003F] +- [0x03, 0x0040, MAC_Plaza_0040] +- [0x03, 0x0041, MAC_Plaza_0041] +- [0x03, 0x0042, MAC_Plaza_0042] +- [0x03, 0x0043, MAC_Plaza_0043] +- [0x03, 0x0044, MAC_Plaza_0044] +- [0x03, 0x0045, MAC_Plaza_0045] +- [0x03, 0x0046, MAC_Plaza_0046] +- [0x03, 0x0047, MAC_Plaza_0047] +- [0x03, 0x0048, MAC_Plaza_0048] +- [0x03, 0x0049, MAC_Plaza_0049] +- [0x03, 0x004A, MAC_Plaza_004A] +- [0x03, 0x004B, MAC_Plaza_004B] +- [0x03, 0x004C, MAC_Plaza_004C] +- [0x03, 0x004D, MAC_Plaza_004D] +- [0x03, 0x004E, MAC_Plaza_004E] +- [0x03, 0x004F, MAC_Plaza_004F] +- [0x03, 0x0050, MAC_Plaza_0050] +- [0x03, 0x0051, MAC_Plaza_0051] +- [0x03, 0x0052, MAC_Plaza_0052] +- [0x03, 0x0053, MAC_Plaza_0053] +- [0x03, 0x0054, MAC_Plaza_0054] +- [0x03, 0x0055, MAC_Plaza_0055] +- [0x03, 0x0056, MAC_Plaza_0056] +- [0x03, 0x0057, MAC_Plaza_0057] +- [0x03, 0x0059, MAC_Plaza_0059] +- [0x03, 0x005A, MAC_Plaza_005A] +- [0x03, 0x005C, MAC_Plaza_005C] +- [0x03, 0x005D, MAC_Plaza_005D] +- [0x03, 0x005E, MAC_Plaza_005E] +- [0x03, 0x005F, MAC_Plaza_005F] +- [0x03, 0x0060, MAC_Plaza_0060] +- [0x03, 0x0061, MAC_Plaza_0061] +- [0x03, 0x0062, MAC_Plaza_0062] +- [0x03, 0x0063, MAC_Plaza_0063] +- [0x03, 0x0064, MAC_Plaza_0064] +- [0x03, 0x0065, MAC_Plaza_0065] +- [0x03, 0x0066, MAC_Plaza_0066] +- [0x03, 0x0067, MAC_Plaza_0067] +- [0x03, 0x0068, MAC_Plaza_0068] +- [0x03, 0x0069, MAC_Plaza_0069] +- [0x03, 0x006A, MAC_Plaza_006A] +- [0x03, 0x006B, MAC_Plaza_006B] +- [0x03, 0x006C, MAC_Plaza_006C] +- [0x03, 0x006D, MAC_Plaza_006D] +- [0x03, 0x006E, MAC_Plaza_006E] +- [0x03, 0x006F, MAC_Plaza_006F] +- [0x03, 0x0070, MAC_Plaza_0070] +- [0x03, 0x0071, MAC_Plaza_0071] +- [0x03, 0x0072, MAC_Plaza_0072] +- [0x03, 0x0073, MAC_Plaza_0073] +- [0x03, 0x0074, MAC_Plaza_0074] +- [0x03, 0x0075, MAC_Plaza_0075] +- [0x03, 0x0076, MAC_Plaza_0076] +- [0x03, 0x0077, MAC_Plaza_0077] +- [0x03, 0x0078, MAC_Plaza_0078] +- [0x03, 0x0079, MAC_Plaza_0079] +- [0x03, 0x007A, MAC_Plaza_007A] +- [0x03, 0x007B, MAC_Plaza_007B] +- [0x03, 0x007C, MAC_Plaza_007C] +- [0x03, 0x007D, MAC_Plaza_007D] +- [0x03, 0x007E, MAC_Plaza_007E] +- [0x03, 0x007F, MAC_Plaza_007F] +- [0x03, 0x0080, MAC_Plaza_0080] +- [0x03, 0x0081, MAC_Plaza_0081] +- [0x03, 0x0082, MAC_Plaza_0082] +- [0x03, 0x0083, MAC_Plaza_0083] +- [0x03, 0x0084, MAC_Plaza_0084] +- [0x03, 0x0085, MAC_Plaza_0085] +- [0x03, 0x0086, MAC_Plaza_0086] +- [0x03, 0x0087, MAC_Plaza_0087] +- [0x03, 0x0088, MAC_Plaza_0088] +- [0x03, 0x0089, MAC_Plaza_0089] +- [0x03, 0x008A, MAC_Plaza_008A] +- [0x03, 0x008B, MAC_Plaza_008B] +- [0x03, 0x008C, MAC_Plaza_008C] +- [0x03, 0x008D, MAC_Plaza_008D] +- [0x03, 0x008E, MAC_Plaza_008E] +- [0x03, 0x008F, MAC_Plaza_008F] +- [0x03, 0x0090, MAC_Plaza_0090] +- [0x03, 0x0091, MAC_Plaza_0091] +- [0x03, 0x0092, MAC_Plaza_0092] +- [0x03, 0x0093, MAC_Plaza_0093] +- [0x03, 0x0094, MAC_Plaza_0094] +- [0x03, 0x0095, MAC_Plaza_0095] +- [0x03, 0x0096, MAC_Plaza_0096] +- [0x03, 0x0097, MAC_Plaza_0097] +- [0x03, 0x0098, MAC_Plaza_0098] +- [0x03, 0x0099, MAC_Plaza_0099] +- [0x03, 0x009A, MAC_Plaza_009A] +- [0x03, 0x009B, MAC_Plaza_009B] +- [0x03, 0x009C, MAC_Plaza_009C] +- [0x03, 0x009D, MAC_Plaza_009D] +- [0x03, 0x009E, MAC_Plaza_009E] +- [0x03, 0x009F, MAC_Plaza_009F] +- [0x03, 0x00A0, MAC_Plaza_00A0] +- [0x03, 0x00A1, MAC_Plaza_00A1] +- [0x03, 0x00A2, MAC_Plaza_00A2] +- [0x03, 0x00A3, MAC_Plaza_00A3] +- [0x03, 0x00A4, MAC_Plaza_00A4] +- [0x03, 0x00A5, MAC_Plaza_00A5] +- [0x03, 0x00A6, MAC_Plaza_00A6] +- [0x03, 0x00A7, MAC_Plaza_00A7] +- [0x03, 0x00A8, MAC_Plaza_00A8] +- [0x03, 0x00A9, MAC_Plaza_00A9] +- [0x03, 0x00AA, MAC_Plaza_00AA] +- [0x03, 0x00AB, MAC_Plaza_00AB] +- [0x03, 0x00AC, MAC_Plaza_00AC] +- [0x03, 0x00AD, MAC_Plaza_00AD] +- [0x03, 0x00AE, MAC_Plaza_00AE] +- [0x03, 0x00AF, MAC_Plaza_00AF] +- [0x03, 0x00B0, MAC_Plaza_00B0] +- [0x03, 0x00B1, MAC_Plaza_00B1] +- [0x03, 0x00B2, MAC_Plaza_00B2] +- [0x03, 0x00B3, MAC_Plaza_00B3] +- [0x03, 0x00B4, MAC_Plaza_00B4] +- [0x03, 0x00B5, MAC_Plaza_00B5] +- [0x03, 0x00B6, MAC_Plaza_00B6] +- [0x03, 0x00B7, MAC_Plaza_00B7] +- [0x03, 0x00B8, MAC_Plaza_00B8] +- [0x03, 0x00B9, MAC_Plaza_00B9] +- [0x03, 0x00BA, MAC_Plaza_00BA] +- [0x03, 0x00BB, MAC_Plaza_00BB] +- [0x03, 0x00BC, MAC_Plaza_00BC] +- [0x03, 0x00BD, MAC_Plaza_00BD] +- [0x03, 0x00BE, MAC_Plaza_00BE] +- [0x03, 0x00BF, MAC_Plaza_00BF] +- [0x03, 0x00C0, MAC_Plaza_00C0] +- [0x03, 0x00C1, MAC_Plaza_00C1] +- [0x03, 0x00C2, MAC_Plaza_00C2] +- [0x03, 0x00C3, MAC_Plaza_00C3] +- [0x03, 0x00C4, MAC_Plaza_00C4] +- [0x03, 0x00C5, MAC_Plaza_00C5] +- [0x03, 0x00C6, MAC_Plaza_00C6] +- [0x03, 0x00C7, MAC_Plaza_00C7] +- [0x03, 0x00C8, MAC_Plaza_00C8] +- [0x03, 0x00C9, MAC_Plaza_00C9] +- [0x03, 0x00CA, MAC_Plaza_00CA] +- [0x03, 0x00CB, MAC_Plaza_00CB] +- [0x03, 0x00CC, MAC_Plaza_00CC] +- [0x03, 0x00CD, MAC_Plaza_00CD] +- [0x03, 0x00CE, MAC_Plaza_00CE] +- [0x03, 0x00CF, MAC_Plaza_00CF] +- [0x03, 0x00D0, MAC_Plaza_00D0] +- [0x03, 0x00D1, MAC_Plaza_00D1] +- [0x03, 0x00D2, MAC_Plaza_00D2] +- [0x03, 0x00D3, MAC_Plaza_00D3] +- [0x03, 0x00D4, MAC_Plaza_00D4] +- [0x03, 0x00D5, MAC_Plaza_00D5] +- [0x03, 0x00D6, MAC_Plaza_00D6] +- [0x03, 0x00D7, MAC_Plaza_00D7] +- [0x03, 0x00D8, MAC_Plaza_00D8] +- [0x03, 0x00D9, MAC_Plaza_00D9] +- [0x03, 0x00DA, MAC_Plaza_00DA] +- [0x03, 0x00DB, MAC_Plaza_00DB] +- [0x03, 0x00DC, MAC_Plaza_00DC] +- [0x03, 0x00DD, MAC_Plaza_00DD] +- [0x03, 0x00DE, MAC_Plaza_00DE] +- [0x03, 0x00DF, MAC_Plaza_00DF] +- [0x03, 0x00E0, MAC_Plaza_00E0] +- [0x03, 0x00E1, MAC_Plaza_00E1] +- [0x03, 0x00E2, MAC_Plaza_00E2] +- [0x03, 0x00E3, MAC_Plaza_00E3] +- [0x03, 0x00E4, MAC_Plaza_00E4] +- [0x03, 0x00E5, MAC_Plaza_00E5] +- [0x03, 0x00E6, MAC_Plaza_00E6] +- [0x03, 0x00E7, MAC_Plaza_00E7] +- [0x03, 0x00E8, MAC_Plaza_00E8] +- [0x03, 0x00E9, MAC_Plaza_00E9] +- [0x03, 0x00EA, MAC_Plaza_00EA] +- [0x03, 0x00EB, MAC_Plaza_00EB] +- [0x03, 0x00EC, MAC_Plaza_00EC] +- [0x03, 0x00ED, MAC_Plaza_00ED] +- [0x03, 0x00EE, MAC_Plaza_00EE] +- [0x04, 0x0000, MAC_Bridge_0000] +- [0x04, 0x0001, MAC_Bridge_0001] +- [0x04, 0x0002, MAC_Bridge_0002] +- [0x04, 0x0003, MAC_Bridge_0003] +- [0x04, 0x0004, MAC_Bridge_0004] +- [0x04, 0x0005, MAC_Bridge_0005] +- [0x04, 0x0006, MAC_Bridge_0006] +- [0x04, 0x0007, MAC_Bridge_0007] +- [0x04, 0x0008, MAC_Bridge_0008] +- [0x04, 0x0009, MAC_Bridge_0009] +- [0x04, 0x000A, MAC_Bridge_000A] +- [0x04, 0x000B, MAC_Bridge_000B] +- [0x04, 0x000C, MAC_Bridge_000C] +- [0x04, 0x000D, MAC_Bridge_000D] +- [0x04, 0x000E, MAC_Bridge_000E] +- [0x04, 0x000F, MAC_Bridge_000F] +- [0x04, 0x0010, MAC_Bridge_0010] +- [0x04, 0x0011, MAC_Bridge_0011] +- [0x04, 0x0012, MAC_Bridge_0012] +- [0x04, 0x0013, MAC_Bridge_0013] +- [0x04, 0x0014, MAC_Bridge_0014] +- [0x04, 0x0015, MAC_Bridge_0015] +- [0x04, 0x0016, MAC_Bridge_0016] +- [0x04, 0x0017, MAC_Bridge_0017] +- [0x04, 0x0018, MAC_Bridge_0018] +- [0x04, 0x0019, MAC_Bridge_0019] +- [0x04, 0x001A, MAC_Bridge_001A] +- [0x04, 0x001B, MAC_Bridge_001B] +- [0x04, 0x001C, MAC_Bridge_001C] +- [0x04, 0x001D, MAC_Bridge_001D] +- [0x04, 0x001E, MAC_Bridge_001E] +- [0x04, 0x001F, MAC_Bridge_001F] +- [0x04, 0x0020, MAC_Bridge_0020] +- [0x04, 0x0021, MAC_Bridge_0021] +- [0x04, 0x0022, MAC_Bridge_0022] +- [0x04, 0x0023, MAC_Bridge_0023] +- [0x04, 0x0024, MAC_Bridge_0024] +- [0x04, 0x0025, MAC_Bridge_0025] +- [0x04, 0x0026, MAC_Bridge_0026] +- [0x04, 0x0027, MAC_Bridge_0027] +- [0x04, 0x0028, MAC_Bridge_0028] +- [0x04, 0x0029, MAC_Bridge_0029] +- [0x04, 0x002A, MAC_Bridge_002A] +- [0x04, 0x002B, MAC_Bridge_002B] +- [0x04, 0x002C, MAC_Bridge_002C] +- [0x04, 0x002D, MAC_Bridge_002D] +- [0x04, 0x002E, MAC_Bridge_002E] +- [0x04, 0x002F, MAC_Bridge_002F] +- [0x04, 0x0030, MAC_Bridge_0030] +- [0x04, 0x0031, MAC_Bridge_0031] +- [0x04, 0x0032, MAC_Bridge_0032] +- [0x04, 0x0033, MAC_Bridge_0033] +- [0x04, 0x0034, MAC_Bridge_0034] +- [0x04, 0x0035, MAC_Bridge_0035] +- [0x04, 0x0036, MAC_Bridge_0036] +- [0x04, 0x0037, MAC_Bridge_0037] +- [0x04, 0x0038, MAC_Bridge_0038] +- [0x04, 0x0039, MAC_Bridge_0039] +- [0x04, 0x003A, MAC_Bridge_003A] +- [0x04, 0x003B, MAC_Bridge_003B] +- [0x04, 0x003C, MAC_Bridge_003C] +- [0x04, 0x003D, MAC_Bridge_003D] +- [0x04, 0x003E, MAC_Bridge_003E] +- [0x04, 0x003F, MAC_Bridge_003F] +- [0x04, 0x0040, MAC_Bridge_0040] +- [0x04, 0x0041, MAC_Bridge_0041] +- [0x04, 0x0042, MAC_Bridge_0042] +- [0x04, 0x0043, MAC_Bridge_0043] +- [0x04, 0x0044, MAC_Bridge_0044] +- [0x04, 0x0045, MAC_Bridge_0045] +- [0x04, 0x0046, MAC_Bridge_0046] +- [0x04, 0x0047, MAC_Bridge_0047] +- [0x04, 0x0048, MAC_Bridge_0048] +- [0x04, 0x0049, MAC_Bridge_0049] +- [0x04, 0x004A, MAC_Bridge_004A] +- [0x04, 0x004B, MAC_Bridge_004B] +- [0x04, 0x004C, MAC_Bridge_004C] +- [0x04, 0x004D, MAC_Bridge_004D] +- [0x04, 0x004E, MAC_Bridge_004E] +- [0x04, 0x004F, MAC_Bridge_004F] +- [0x04, 0x0050, MAC_Bridge_0050] +- [0x04, 0x0051, MAC_Bridge_0051] +- [0x04, 0x0052, MAC_Bridge_0052] +- [0x04, 0x0053, MAC_Bridge_0053] +- [0x04, 0x0054, MAC_Bridge_0054] +- [0x04, 0x0055, MAC_Bridge_0055] +- [0x04, 0x0056, MAC_Bridge_0056] +- [0x04, 0x0057, MAC_Bridge_0057] +- [0x04, 0x0058, MAC_Bridge_0058] +- [0x04, 0x0059, MAC_Bridge_0059] +- [0x04, 0x005A, MAC_Bridge_005A] +- [0x04, 0x005B, MAC_Bridge_005B] +- [0x04, 0x005C, MAC_Bridge_005C] +- [0x04, 0x005D, MAC_Bridge_005D] +- [0x04, 0x005E, MAC_Bridge_005E] +- [0x04, 0x005F, MAC_Bridge_005F] +- [0x04, 0x0060, MAC_Bridge_0060] +- [0x04, 0x0061, MAC_Bridge_0061] +- [0x04, 0x0062, MAC_Bridge_0062] +- [0x04, 0x0063, MAC_Bridge_0063] +- [0x04, 0x0064, MAC_Bridge_0064] +- [0x04, 0x0065, MAC_Bridge_0065] +- [0x04, 0x0066, MAC_Bridge_0066] +- [0x04, 0x0067, MAC_Bridge_0067] +- [0x04, 0x0068, MAC_Bridge_0068] +- [0x04, 0x0069, MAC_Bridge_0069] +- [0x04, 0x006A, MAC_Bridge_006A] +- [0x04, 0x006B, MAC_Bridge_006B] +- [0x04, 0x006C, MAC_Bridge_006C] +- [0x04, 0x006D, MAC_Bridge_006D] +- [0x04, 0x006E, MAC_Bridge_006E] +- [0x04, 0x006F, MAC_Bridge_006F] +- [0x04, 0x0070, MAC_Bridge_0070] +- [0x04, 0x0071, MAC_Bridge_0071] +- [0x04, 0x0072, MAC_Bridge_0072] +- [0x04, 0x0073, MAC_Bridge_0073] +- [0x04, 0x0074, MAC_Bridge_0074] +- [0x04, 0x0075, MAC_Bridge_0075] +- [0x04, 0x0076, MAC_Bridge_0076] +- [0x04, 0x0077, MAC_Bridge_0077] +- [0x04, 0x0078, MAC_Bridge_0078] +- [0x04, 0x0079, MAC_Bridge_0079] +- [0x04, 0x007A, MAC_Bridge_007A] +- [0x04, 0x007B, MAC_Bridge_007B] +- [0x04, 0x007C, MAC_Bridge_007C] +- [0x04, 0x007D, MAC_Bridge_007D] +- [0x04, 0x007E, MAC_Bridge_007E] +- [0x04, 0x007F, MAC_Bridge_007F] +- [0x04, 0x0080, MAC_Bridge_0080] +- [0x04, 0x0081, MAC_Bridge_0081] +- [0x04, 0x0082, MAC_Bridge_0082] +- [0x04, 0x0083, MAC_Bridge_0083] +- [0x04, 0x0084, MAC_Bridge_0084] +- [0x04, 0x0085, MAC_Bridge_0085] +- [0x04, 0x0086, MAC_Bridge_0086] +- [0x04, 0x0087, MAC_Bridge_0087] +- [0x04, 0x0088, MAC_Bridge_0088] +- [0x04, 0x0089, MAC_Bridge_0089] +- [0x04, 0x008A, MAC_Bridge_008A] +- [0x04, 0x008B, MAC_Bridge_008B] +- [0x04, 0x008C, MAC_Bridge_008C] +- [0x04, 0x008D, MAC_Bridge_008D] +- [0x04, 0x008E, MAC_Bridge_008E] +- [0x04, 0x008F, MAC_Bridge_008F] +- [0x04, 0x0090, MAC_Bridge_0090] +- [0x04, 0x0091, MAC_Bridge_0091] +- [0x04, 0x0092, MAC_Bridge_0092] +- [0x04, 0x0093, MAC_Bridge_0093] +- [0x04, 0x0094, MAC_Bridge_0094] +- [0x04, 0x0095, MAC_Bridge_0095] +- [0x04, 0x0097, MAC_Bridge_0097] +- [0x04, 0x0098, MAC_Bridge_0098] +- [0x04, 0x0099, MAC_Bridge_0099] +- [0x04, 0x009A, MAC_Bridge_009A] +- [0x04, 0x009B, MAC_Bridge_009B] +- [0x04, 0x009C, MAC_Bridge_009C] +- [0x04, 0x009D, MAC_Bridge_009D] +- [0x04, 0x009E, MAC_Bridge_009E] +- [0x04, 0x009F, MAC_Bridge_009F] +- [0x04, 0x00A0, MAC_Bridge_00A0] +- [0x04, 0x00A1, MAC_Bridge_00A1] +- [0x04, 0x00A2, MAC_Bridge_00A2] +- [0x04, 0x00A3, MAC_Bridge_00A3] +- [0x04, 0x00A4, MAC_Bridge_00A4] +- [0x04, 0x00A5, MAC_Bridge_00A5] +- [0x04, 0x00A6, MAC_Bridge_00A6] +- [0x05, 0x0000, MAC_Station_0000] +- [0x05, 0x0001, MAC_Station_0001] +- [0x05, 0x0002, MAC_Station_0002] +- [0x05, 0x0003, MAC_Station_0003] +- [0x05, 0x0004, MAC_Station_0004] +- [0x05, 0x0005, MAC_Station_0005] +- [0x05, 0x0006, MAC_Station_0006] +- [0x05, 0x0007, MAC_Station_0007] +- [0x05, 0x0008, MAC_Station_0008] +- [0x05, 0x0009, MAC_Station_0009] +- [0x05, 0x000A, MAC_Station_000A] +- [0x05, 0x000B, MAC_Station_000B] +- [0x05, 0x000C, MAC_Station_000C] +- [0x05, 0x000D, MAC_Station_000D] +- [0x05, 0x000E, MAC_Station_000E] +- [0x05, 0x000F, MAC_Station_000F] +- [0x05, 0x0010, MAC_Station_0010] +- [0x05, 0x0011, MAC_Station_0011] +- [0x05, 0x0012, MAC_Station_0012] +- [0x05, 0x0013, MAC_Station_0013] +- [0x05, 0x0014, MAC_Station_0014] +- [0x05, 0x0015, MAC_Station_0015] +- [0x05, 0x0016, MAC_Station_0016] +- [0x05, 0x0017, MAC_Station_0017] +- [0x05, 0x0018, MAC_Station_0018] +- [0x05, 0x0019, MAC_Station_0019] +- [0x05, 0x001A, MAC_Station_001A] +- [0x05, 0x001B, MAC_Station_001B] +- [0x05, 0x001C, MAC_Station_001C] +- [0x05, 0x001D, MAC_Station_001D] +- [0x05, 0x001E, MAC_Station_001E] +- [0x05, 0x001F, MAC_Station_001F] +- [0x05, 0x0020, MAC_Station_0020] +- [0x05, 0x0021, MAC_Station_0021] +- [0x05, 0x0022, MAC_Station_0022] +- [0x05, 0x0023, MAC_Station_0023] +- [0x05, 0x0024, MAC_Station_0024] +- [0x05, 0x0025, MAC_Station_0025] +- [0x05, 0x0026, MAC_Station_0026] +- [0x05, 0x0027, MAC_Station_0027] +- [0x05, 0x0028, MAC_Station_0028] +- [0x05, 0x0029, MAC_Station_0029] +- [0x05, 0x002A, MAC_Station_002A] +- [0x05, 0x002B, MAC_Station_002B] +- [0x05, 0x002C, MAC_Station_002C] +- [0x05, 0x002D, MAC_Station_002D] +- [0x05, 0x002E, MAC_Station_002E] +- [0x05, 0x002F, MAC_Station_002F] +- [0x05, 0x0030, MAC_Station_0030] +- [0x05, 0x0031, MAC_Station_0031] +- [0x05, 0x0032, MAC_Station_0032] +- [0x05, 0x0033, MAC_Station_0033] +- [0x05, 0x0034, MAC_Station_0034] +- [0x05, 0x0035, MAC_Station_0035] +- [0x05, 0x0036, MAC_Station_0036] +- [0x05, 0x0037, MAC_Station_0037] +- [0x05, 0x0038, MAC_Station_0038] +- [0x05, 0x0039, MAC_Station_0039] +- [0x05, 0x003A, MAC_Station_003A] +- [0x05, 0x003B, MAC_Station_003B] +- [0x05, 0x003C, MAC_Station_003C] +- [0x05, 0x003D, MAC_Station_003D] +- [0x05, 0x003E, MAC_Station_003E] +- [0x05, 0x003F, MAC_Station_003F] +- [0x05, 0x0040, MAC_Station_0040] +- [0x05, 0x0041, MAC_Station_0041] +- [0x05, 0x0042, MAC_Station_0042] +- [0x05, 0x0043, MAC_Station_0043] +- [0x05, 0x0044, MAC_Station_0044] +- [0x05, 0x0045, MAC_Station_0045] +- [0x05, 0x0046, MAC_Station_0046] +- [0x05, 0x0047, MAC_Station_0047] +- [0x05, 0x0048, MAC_Station_0048] +- [0x05, 0x0049, MAC_Station_0049] +- [0x05, 0x004A, MAC_Station_004A] +- [0x05, 0x004B, MAC_Station_004B] +- [0x05, 0x004C, MAC_Station_004C] +- [0x05, 0x004D, MAC_Station_004D] +- [0x05, 0x004E, MAC_Station_004E] +- [0x05, 0x004F, MAC_Station_004F] +- [0x05, 0x0050, MAC_Station_0050] +- [0x05, 0x0051, MAC_Station_0051] +- [0x05, 0x0052, MAC_Station_0052] +- [0x05, 0x0053, MAC_Station_0053] +- [0x05, 0x0054, MAC_Station_0054] +- [0x05, 0x0055, MAC_Station_0055] +- [0x05, 0x0056, MAC_Station_0056] +- [0x05, 0x0057, MAC_Station_0057] +- [0x05, 0x0058, MAC_Station_0058] +- [0x05, 0x0059, MAC_Station_0059] +- [0x05, 0x005A, MAC_Station_005A] +- [0x05, 0x005B, MAC_Station_005B] +- [0x05, 0x005C, MAC_Station_005C] +- [0x05, 0x005D, MAC_Station_005D] +- [0x05, 0x005E, MAC_Station_005E] +- [0x05, 0x005F, MAC_Station_005F] +- [0x05, 0x0060, MAC_Station_0060] +- [0x05, 0x0061, MAC_Station_0061] +- [0x05, 0x0062, MAC_Station_0062] +- [0x05, 0x0063, MAC_Station_0063] +- [0x05, 0x0064, MAC_Station_0064] +- [0x05, 0x0065, MAC_Station_0065] +- [0x05, 0x0066, MAC_Station_0066] +- [0x05, 0x0067, MAC_Station_0067] +- [0x05, 0x0068, MAC_Station_0068] +- [0x05, 0x0069, MAC_Station_0069] +- [0x05, 0x006A, MAC_Station_006A] +- [0x05, 0x006B, MAC_Station_006B] +- [0x05, 0x006C, MAC_Station_006C] +- [0x05, 0x006D, MAC_Station_006D] +- [0x05, 0x006E, MAC_Station_006E] +- [0x05, 0x006F, MAC_Station_006F] +- [0x05, 0x0070, MAC_Station_0070] +- [0x05, 0x0071, MAC_Station_0071] +- [0x05, 0x0072, MAC_Station_0072] +- [0x05, 0x0073, MAC_Station_0073] +- [0x05, 0x0074, MAC_Station_0074] +- [0x05, 0x0075, MAC_Station_0075] +- [0x05, 0x0076, MAC_Station_0076] +- [0x05, 0x0077, MAC_Station_0077] +- [0x06, 0x0000, MAC_Housing_0000] +- [0x06, 0x0001, MAC_Housing_0001] +- [0x06, 0x0002, MAC_Housing_0002] +- [0x06, 0x0003, MAC_Housing_0003] +- [0x06, 0x0004, MAC_Housing_0004] +- [0x06, 0x0005, MAC_Housing_0005] +- [0x06, 0x0006, MAC_Housing_0006] +- [0x06, 0x0007, MAC_Housing_0007] +- [0x06, 0x0008, MAC_Housing_0008] +- [0x06, 0x0009, MAC_Housing_0009] +- [0x06, 0x000A, MAC_Housing_000A] +- [0x06, 0x000B, MAC_Housing_000B] +- [0x06, 0x000C, MAC_Housing_000C] +- [0x06, 0x000D, MAC_Housing_000D] +- [0x06, 0x000E, MAC_Housing_000E] +- [0x06, 0x000F, MAC_Housing_000F] +- [0x06, 0x0010, MAC_Housing_0010] +- [0x06, 0x0011, MAC_Housing_0011] +- [0x06, 0x0012, MAC_Housing_0012] +- [0x06, 0x0013, MAC_Housing_0013] +- [0x06, 0x0014, MAC_Housing_0014] +- [0x06, 0x0015, MAC_Housing_0015] +- [0x06, 0x0016, MAC_Housing_0016] +- [0x06, 0x0017, MAC_Housing_0017] +- [0x06, 0x0018, MAC_Housing_0018] +- [0x06, 0x0019, MAC_Housing_0019] +- [0x06, 0x001A, MAC_Housing_001A] +- [0x06, 0x001B, MAC_Housing_001B] +- [0x06, 0x001C, MAC_Housing_001C] +- [0x06, 0x001D, MAC_Housing_001D] +- [0x06, 0x001E, MAC_Housing_001E] +- [0x06, 0x001F, MAC_Housing_001F] +- [0x06, 0x0020, MAC_Housing_0020] +- [0x06, 0x0021, MAC_Housing_0021] +- [0x06, 0x0022, MAC_Housing_0022] +- [0x06, 0x0023, MAC_Housing_0023] +- [0x06, 0x0024, MAC_Housing_0024] +- [0x06, 0x0025, MAC_Housing_0025] +- [0x06, 0x0026, MAC_Housing_0026] +- [0x06, 0x0027, MAC_Housing_0027] +- [0x06, 0x0028, MAC_Housing_0028] +- [0x06, 0x0029, MAC_Housing_0029] +- [0x06, 0x002A, MAC_Housing_002A] +- [0x06, 0x002B, MAC_Housing_002B] +- [0x06, 0x002C, MAC_Housing_002C] +- [0x06, 0x002D, MAC_Housing_002D] +- [0x06, 0x002E, MAC_Housing_002E] +- [0x06, 0x002F, MAC_Housing_002F] +- [0x06, 0x0030, MAC_Housing_0030] +- [0x06, 0x0031, MAC_Housing_0031] +- [0x06, 0x0032, MAC_Housing_0032] +- [0x06, 0x0033, MAC_Housing_0033] +- [0x06, 0x0034, MAC_Housing_0034] +- [0x06, 0x0035, MAC_Housing_0035] +- [0x06, 0x0036, MAC_Housing_0036] +- [0x06, 0x0037, MAC_Housing_0037] +- [0x06, 0x0038, MAC_Housing_0038] +- [0x06, 0x0039, MAC_Housing_0039] +- [0x06, 0x003A, MAC_Housing_003A] +- [0x06, 0x003B, MAC_Housing_003B] +- [0x06, 0x003C, MAC_Housing_003C] +- [0x06, 0x003D, MAC_Housing_003D] +- [0x06, 0x003E, MAC_Housing_003E] +- [0x06, 0x003F, MAC_Housing_003F] +- [0x06, 0x0040, MAC_Housing_0040] +- [0x06, 0x0041, MAC_Housing_0041] +- [0x06, 0x0042, MAC_Housing_0042] +- [0x06, 0x0043, MAC_Housing_0043] +- [0x06, 0x0044, MAC_Housing_0044] +- [0x06, 0x0045, MAC_Housing_0045] +- [0x06, 0x0046, MAC_Housing_0046] +- [0x06, 0x0047, MAC_Housing_0047] +- [0x06, 0x0048, MAC_Housing_0048] +- [0x06, 0x0049, MAC_Housing_0049] +- [0x06, 0x004A, MAC_Housing_004A] +- [0x06, 0x004B, MAC_Housing_004B] +- [0x06, 0x004C, MAC_Housing_004C] +- [0x06, 0x004D, MAC_Housing_004D] +- [0x06, 0x004E, MAC_Housing_004E] +- [0x06, 0x004F, MAC_Housing_004F] +- [0x06, 0x0050, MAC_Housing_0050] +- [0x06, 0x0051, MAC_Housing_0051] +- [0x06, 0x0052, MAC_Housing_0052] +- [0x06, 0x0053, MAC_Housing_0053] +- [0x06, 0x0054, MAC_Housing_0054] +- [0x06, 0x0055, MAC_Housing_0055] +- [0x06, 0x0056, MAC_Housing_0056] +- [0x06, 0x0057, MAC_Housing_0057] +- [0x06, 0x0058, MAC_Housing_0058] +- [0x06, 0x0059, MAC_Housing_0059] +- [0x06, 0x005A, MAC_Housing_005A] +- [0x06, 0x005B, MAC_Housing_005B] +- [0x06, 0x005C, MAC_Housing_005C] +- [0x06, 0x005D, MAC_Housing_005D] +- [0x06, 0x005E, MAC_Housing_005E] +- [0x06, 0x005F, MAC_Housing_005F] +- [0x06, 0x0060, MAC_Housing_0060] +- [0x06, 0x0061, MAC_Housing_0061] +- [0x06, 0x0062, MAC_Housing_0062] +- [0x06, 0x0063, MAC_Housing_0063] +- [0x06, 0x0064, MAC_Housing_0064] +- [0x06, 0x0065, MAC_Housing_0065] +- [0x06, 0x0066, MAC_Housing_0066] +- [0x06, 0x0067, MAC_Housing_0067] +- [0x06, 0x0068, MAC_Housing_0068] +- [0x06, 0x0069, MAC_Housing_0069] +- [0x06, 0x006A, MAC_Housing_006A] +- [0x06, 0x006B, MAC_Housing_006B] +- [0x06, 0x006C, MAC_Housing_006C] +- [0x06, 0x006D, MAC_Housing_006D] +- [0x06, 0x006E, MAC_Housing_006E] +- [0x06, 0x006F, MAC_Housing_006F] +- [0x06, 0x0070, MAC_Housing_0070] +- [0x06, 0x0071, MAC_Housing_0071] +- [0x06, 0x0072, MAC_Housing_0072] +- [0x06, 0x0073, MAC_Housing_0073] +- [0x06, 0x0074, MAC_Housing_0074] +- [0x06, 0x0075, MAC_Housing_0075] +- [0x06, 0x0076, MAC_Housing_0076] +- [0x06, 0x0077, MAC_Housing_0077] +- [0x06, 0x0078, MAC_Housing_0078] +- [0x06, 0x0079, MAC_Housing_0079] +- [0x06, 0x007A, MAC_Housing_007A] +- [0x06, 0x007B, MAC_Housing_007B] +- [0x06, 0x007C, MAC_Housing_007C] +- [0x06, 0x007D, MAC_Housing_007D] +- [0x06, 0x007E, MAC_Housing_007E] +- [0x06, 0x007F, MAC_Housing_007F] +- [0x06, 0x0080, MAC_Housing_0080] +- [0x06, 0x0081, MAC_Housing_0081] +- [0x06, 0x0082, MAC_Housing_0082] +- [0x06, 0x0083, MAC_Housing_0083] +- [0x06, 0x0084, MAC_Housing_0084] +- [0x06, 0x0085, MAC_Housing_0085] +- [0x06, 0x0086, MAC_Housing_0086] +- [0x06, 0x0087, MAC_Housing_0087] +- [0x06, 0x0088, MAC_Housing_0088] +- [0x06, 0x0089, MAC_Housing_0089] +- [0x06, 0x008A, MAC_Housing_008A] +- [0x06, 0x008B, MAC_Housing_008B] +- [0x06, 0x008C, MAC_Housing_008C] +- [0x06, 0x008D, MAC_Housing_008D] +- [0x06, 0x008E, MAC_Housing_008E] +- [0x06, 0x008F, MAC_Housing_008F] +- [0x06, 0x0090, MAC_Housing_0090] +- [0x06, 0x0091, MAC_Housing_0091] +- [0x06, 0x0092, MAC_Housing_0092] +- [0x06, 0x0093, MAC_Housing_0093] +- [0x06, 0x0094, MAC_Housing_0094] +- [0x06, 0x0095, MAC_Housing_0095] +- [0x06, 0x0096, MAC_Housing_0096] +- [0x06, 0x0097, MAC_Housing_0097] +- [0x06, 0x0098, MAC_Housing_0098] +- [0x06, 0x0099, MAC_Housing_0099] +- [0x06, 0x009A, MAC_Housing_009A] +- [0x06, 0x009B, MAC_Housing_009B] +- [0x06, 0x009C, MAC_Housing_009C] +- [0x06, 0x009D, MAC_Housing_009D] +- [0x06, 0x009E, MAC_Housing_009E] +- [0x06, 0x009F, MAC_Housing_009F] +- [0x06, 0x00A0, MAC_Housing_00A0] +- [0x06, 0x00A1, MAC_Housing_00A1] +- [0x06, 0x00A2, MAC_Housing_00A2] +- [0x06, 0x00A3, MAC_Housing_00A3] +- [0x06, 0x00A4, MAC_Housing_00A4] +- [0x06, 0x00A5, MAC_Housing_00A5] +- [0x06, 0x00A6, MAC_Housing_00A6] +- [0x06, 0x00A7, MAC_Housing_00A7] +- [0x06, 0x00A8, MAC_Housing_00A8] +- [0x06, 0x00A9, MAC_Housing_00A9] +- [0x06, 0x00AA, MAC_Housing_00AA] +- [0x06, 0x00AB, MAC_Housing_00AB] +- [0x06, 0x00AC, MAC_Housing_00AC] +- [0x06, 0x00AD, MAC_Housing_00AD] +- [0x06, 0x00AE, MAC_Housing_00AE] +- [0x06, 0x00AF, MAC_Housing_00AF] +- [0x06, 0x00B0, MAC_Housing_00B0] +- [0x06, 0x00B1, MAC_Housing_00B1] +- [0x06, 0x00B2, MAC_Housing_00B2] +- [0x06, 0x00B3, MAC_Housing_00B3] +- [0x06, 0x00B4, MAC_Housing_00B4] +- [0x06, 0x00B5, MAC_Housing_00B5] +- [0x06, 0x00B6, MAC_Housing_00B6] +- [0x06, 0x00B7, MAC_Housing_00B7] +- [0x06, 0x00B8, MAC_Housing_00B8] +- [0x06, 0x00B9, MAC_Housing_00B9] +- [0x06, 0x00BA, MAC_Housing_00BA] +- [0x06, 0x00BB, MAC_Housing_00BB] +- [0x06, 0x00BC, MAC_Housing_00BC] +- [0x06, 0x00BD, MAC_Housing_00BD] +- [0x06, 0x00BE, MAC_Housing_00BE] +- [0x06, 0x00BF, MAC_Housing_00BF] +- [0x06, 0x00C0, MAC_Housing_00C0] +- [0x06, 0x00C1, MAC_Housing_00C1] +- [0x06, 0x00C2, MAC_Housing_00C2] +- [0x06, 0x00C3, MAC_Housing_00C3] +- [0x06, 0x00C4, MAC_Housing_00C4] +- [0x06, 0x00C5, MAC_Housing_00C5] +- [0x06, 0x00C6, MAC_Housing_00C6] +- [0x06, 0x00C7, MAC_Housing_00C7] +- [0x06, 0x00C8, MAC_Housing_00C8] +- [0x06, 0x00C9, MAC_Housing_00C9] +- [0x06, 0x00CA, MAC_Housing_00CA] +- [0x06, 0x00CB, MAC_Housing_00CB] +- [0x06, 0x00CC, MAC_Housing_00CC] +- [0x06, 0x00CD, MAC_Housing_00CD] +- [0x06, 0x00CE, MAC_Housing_00CE] +- [0x06, 0x00CF, MAC_Housing_00CF] +- [0x06, 0x00D0, MAC_Housing_00D0] +- [0x06, 0x00D1, MAC_Housing_00D1] +- [0x06, 0x00D2, MAC_Housing_00D2] +- [0x06, 0x00D3, MAC_Housing_00D3] +- [0x06, 0x00D4, MAC_Housing_00D4] +- [0x06, 0x00D5, MAC_Housing_00D5] +- [0x06, 0x00D6, MAC_Housing_00D6] +- [0x06, 0x00D7, MAC_Housing_00D7] +- [0x06, 0x00D8, MAC_Housing_00D8] +- [0x06, 0x00D9, MAC_Housing_00D9] +- [0x06, 0x00DA, MAC_Housing_00DA] +- [0x06, 0x00DB, MAC_Housing_00DB] +- [0x06, 0x00DC, MAC_Housing_00DC] +- [0x06, 0x00DD, MAC_Housing_00DD] +- [0x06, 0x00DE, MAC_Housing_00DE] +- [0x06, 0x00DF, MAC_Housing_00DF] +- [0x06, 0x00E0, MAC_Housing_00E0] +- [0x06, 0x00E1, MAC_Housing_00E1] +- [0x06, 0x00E2, MAC_Housing_00E2] +- [0x06, 0x00E3, MAC_Housing_00E3] +- [0x06, 0x00E4, MAC_Housing_00E4] +- [0x06, 0x00E5, MAC_Housing_00E5] +- [0x06, 0x00E6, MAC_Housing_00E6] +- [0x06, 0x00E7, MAC_Housing_00E7] +- [0x06, 0x00E8, MAC_Housing_00E8] +- [0x06, 0x00E9, MAC_Housing_00E9] +- [0x06, 0x00EA, MAC_Housing_00EA] +- [0x06, 0x00EB, MAC_Housing_00EB] +- [0x06, 0x00EC, MAC_Housing_00EC] +- [0x06, 0x00ED, MAC_Housing_00ED] +- [0x06, 0x00EE, MAC_Housing_00EE] +- [0x06, 0x00EF, MAC_Housing_00EF] +- [0x06, 0x00F0, MAC_Housing_00F0] +- [0x06, 0x00F1, MAC_Housing_00F1] +- [0x06, 0x00F2, MAC_Housing_00F2] +- [0x06, 0x00F3, MAC_Housing_00F3] +- [0x06, 0x00F4, MAC_Housing_00F4] +- [0x06, 0x00F5, MAC_Housing_00F5] +- [0x06, 0x00F6, MAC_Housing_00F6] +- [0x06, 0x00F7, MAC_Housing_00F7] +- [0x07, 0x0000, MAC_Port_0000] +- [0x07, 0x0001, MAC_Port_0001] +- [0x07, 0x0002, MAC_Port_0002] +- [0x07, 0x0003, MAC_Port_0003] +- [0x07, 0x0004, MAC_Port_0004] +- [0x07, 0x0005, MAC_Port_0005] +- [0x07, 0x0006, MAC_Port_0006] +- [0x07, 0x0007, MAC_Port_0007] +- [0x07, 0x0008, MAC_Port_0008] +- [0x07, 0x0009, MAC_Port_0009] +- [0x07, 0x000A, MAC_Port_000A] +- [0x07, 0x000B, MAC_Port_000B] +- [0x07, 0x000C, MAC_Port_000C] +- [0x07, 0x000D, MAC_Port_000D] +- [0x07, 0x000E, MAC_Port_000E] +- [0x07, 0x000F, MAC_Port_000F] +- [0x07, 0x0010, MAC_Port_0010] +- [0x07, 0x0011, MAC_Port_0011] +- [0x07, 0x0012, MAC_Port_0012] +- [0x07, 0x0013, MAC_Port_0013] +- [0x07, 0x0014, MAC_Port_0014] +- [0x07, 0x0015, MAC_Port_0015] +- [0x07, 0x0016, MAC_Port_0016] +- [0x07, 0x0017, MAC_Port_0017] +- [0x07, 0x0018, MAC_Port_0018] +- [0x07, 0x0019, MAC_Port_0019] +- [0x07, 0x001A, MAC_Port_001A] +- [0x07, 0x001B, MAC_Port_001B] +- [0x07, 0x001C, MAC_Port_001C] +- [0x07, 0x001D, MAC_Port_001D] +- [0x07, 0x001E, MAC_Port_001E] +- [0x07, 0x001F, MAC_Port_001F] +- [0x07, 0x0020, MAC_Port_0020] +- [0x07, 0x0021, MAC_Port_0021] +- [0x07, 0x0022, MAC_Port_0022] +- [0x07, 0x0023, MAC_Port_0023] +- [0x07, 0x0024, MAC_Port_0024] +- [0x07, 0x0025, MAC_Port_0025] +- [0x07, 0x0026, MAC_Port_0026] +- [0x07, 0x0027, MAC_Port_0027] +- [0x07, 0x0028, MAC_Port_0028] +- [0x07, 0x0029, MAC_Port_0029] +- [0x07, 0x002A, MAC_Port_002A] +- [0x07, 0x002B, MAC_Port_002B] +- [0x07, 0x002C, MAC_Port_002C] +- [0x07, 0x002D, MAC_Port_002D] +- [0x07, 0x002E, MAC_Port_002E] +- [0x07, 0x002F, MAC_Port_002F] +- [0x07, 0x0030, MAC_Port_0030] +- [0x07, 0x0031, MAC_Port_0031] +- [0x07, 0x0032, MAC_Port_0032] +- [0x07, 0x0033, MAC_Port_0033] +- [0x07, 0x0034, MAC_Port_0034] +- [0x07, 0x0035, MAC_Port_0035] +- [0x07, 0x0036, MAC_Port_0036] +- [0x07, 0x0037, MAC_Port_0037] +- [0x07, 0x0038, MAC_Port_0038] +- [0x07, 0x0039, MAC_Port_0039] +- [0x07, 0x003A, MAC_Port_003A] +- [0x07, 0x003B, MAC_Port_003B] +- [0x07, 0x003C, MAC_Port_003C] +- [0x07, 0x003D, MAC_Port_003D] +- [0x07, 0x003E, MAC_Port_003E] +- [0x07, 0x003F, MAC_Port_003F] +- [0x07, 0x0040, MAC_Port_0040] +- [0x07, 0x0041, MAC_Port_0041] +- [0x07, 0x0042, MAC_Port_0042] +- [0x07, 0x0043, MAC_Port_0043] +- [0x07, 0x0044, MAC_Port_0044] +- [0x07, 0x0045, MAC_Port_0045] +- [0x07, 0x0046, MAC_Port_0046] +- [0x07, 0x0047, MAC_Port_0047] +- [0x07, 0x0048, MAC_Port_0048] +- [0x07, 0x0049, MAC_Port_0049] +- [0x07, 0x004A, MAC_Port_004A] +- [0x07, 0x004B, MAC_Port_004B] +- [0x07, 0x004C, MAC_Port_004C] +- [0x07, 0x004D, MAC_Port_004D] +- [0x07, 0x004E, MAC_Port_004E] +- [0x07, 0x004F, MAC_Port_004F] +- [0x07, 0x0050, MAC_Port_0050] +- [0x07, 0x0051, MAC_Port_0051] +- [0x07, 0x0052, MAC_Port_0052] +- [0x07, 0x0053, MAC_Port_0053] +- [0x07, 0x0054, MAC_Port_0054] +- [0x07, 0x0055, MAC_Port_0055] +- [0x07, 0x0056, MAC_Port_0056] +- [0x07, 0x0057, MAC_Port_0057] +- [0x07, 0x0058, MAC_Port_0058] +- [0x07, 0x0059, MAC_Port_0059] +- [0x07, 0x005A, MAC_Port_005A] +- [0x07, 0x005B, MAC_Port_005B] +- [0x07, 0x005C, MAC_Port_005C] +- [0x07, 0x005D, MAC_Port_005D] +- [0x07, 0x005E, MAC_Port_005E] +- [0x07, 0x005F, MAC_Port_005F] +- [0x07, 0x0060, MAC_Port_0060] +- [0x07, 0x0061, MAC_Port_0061] +- [0x07, 0x0062, MAC_Port_0062] +- [0x07, 0x0063, MAC_Port_0063] +- [0x07, 0x0064, MAC_Port_0064] +- [0x07, 0x0065, MAC_Port_0065] +- [0x07, 0x0066, MAC_Port_0066] +- [0x07, 0x0067, MAC_Port_0067] +- [0x07, 0x0068, MAC_Port_0068] +- [0x07, 0x0069, MAC_Port_0069] +- [0x07, 0x006A, MAC_Port_006A] +- [0x07, 0x006B, MAC_Port_006B] +- [0x07, 0x006C, MAC_Port_006C] +- [0x07, 0x006D, MAC_Port_006D] +- [0x07, 0x006E, MAC_Port_006E] +- [0x07, 0x006F, MAC_Port_006F] +- [0x07, 0x0070, MAC_Port_0070] +- [0x07, 0x0071, MAC_Port_0071] +- [0x07, 0x0072, MAC_Port_0072] +- [0x07, 0x0073, MAC_Port_0073] +- [0x07, 0x0074, MAC_Port_0074] +- [0x07, 0x0075, MAC_Port_0075] +- [0x07, 0x0076, MAC_Port_0076] +- [0x07, 0x0077, MAC_Port_0077] +- [0x07, 0x0078, MAC_Port_0078] +- [0x07, 0x0079, MAC_Port_0079] +- [0x07, 0x007A, MAC_Port_007A] +- [0x07, 0x007B, MAC_Port_007B] +- [0x07, 0x007C, MAC_Port_007C] +- [0x07, 0x007D, MAC_Port_007D] +- [0x07, 0x007E, MAC_Port_007E] +- [0x07, 0x007F, MAC_Port_007F] +- [0x07, 0x0080, MAC_Port_0080] +- [0x07, 0x0081, MAC_Port_0081] +- [0x07, 0x0082, MAC_Port_0082] +- [0x07, 0x0083, MAC_Port_0083] +- [0x07, 0x0084, MAC_Port_0084] +- [0x07, 0x0085, MAC_Port_0085] +- [0x07, 0x0086, MAC_Port_0086] +- [0x07, 0x0087, MAC_Port_0087] +- [0x07, 0x0088, MAC_Port_0088] +- [0x07, 0x0089, MAC_Port_0089] +- [0x07, 0x008A, MAC_Port_008A] +- [0x07, 0x008B, MAC_Port_008B] +- [0x07, 0x008C, MAC_Port_008C] +- [0x07, 0x008D, MAC_Port_008D] +- [0x07, 0x008E, MAC_Port_008E] +- [0x07, 0x008F, MAC_Port_008F] +- [0x07, 0x0090, MAC_Port_0090] +- [0x07, 0x0091, MAC_Port_0091] +- [0x07, 0x0092, MAC_Port_0092] +- [0x07, 0x0093, MAC_Port_0093] +- [0x07, 0x0094, MAC_Port_0094] +- [0x07, 0x0095, MAC_Port_0095] +- [0x07, 0x0096, MAC_Port_0096] +- [0x07, 0x0097, MAC_Port_0097] +- [0x07, 0x0098, MAC_Port_0098] +- [0x07, 0x0099, MAC_Port_0099] +- [0x07, 0x009A, MAC_Port_009A] +- [0x07, 0x009B, MAC_Port_009B] +- [0x07, 0x009C, MAC_Port_009C] +- [0x07, 0x009D, MAC_Port_009D] +- [0x07, 0x009E, MAC_Port_009E] +- [0x07, 0x009F, MAC_Port_009F] +- [0x07, 0x00A0, MAC_Port_00A0] +- [0x07, 0x00A1, MAC_Port_00A1] +- [0x07, 0x00A2, MAC_Port_00A2] +- [0x07, 0x00A3, MAC_Port_00A3] +- [0x07, 0x00A4, MAC_Port_00A4] +- [0x07, 0x00A5, MAC_Port_00A5] +- [0x07, 0x00A6, MAC_Port_00A6] +- [0x07, 0x00A7, MAC_Port_00A7] +- [0x07, 0x00A8, MAC_Port_00A8] +- [0x07, 0x00A9, MAC_Port_00A9] +- [0x07, 0x00AA, MAC_Port_00AA] +- [0x07, 0x00AB, MAC_Port_00AB] +- [0x07, 0x00AC, MAC_Port_00AC] +- [0x07, 0x00AD, MAC_Port_00AD] +- [0x07, 0x00AE, MAC_Port_00AE] +- [0x07, 0x00AF, MAC_Port_00AF] +- [0x07, 0x00B0, MAC_Port_00B0] +- [0x07, 0x00B1, MAC_Port_00B1] +- [0x07, 0x00B2, MAC_Port_00B2] +- [0x07, 0x00B3, MAC_Port_00B3] +- [0x07, 0x00B4, MAC_Port_00B4] +- [0x07, 0x00B5, MAC_Port_00B5] +- [0x07, 0x00B6, MAC_Port_00B6] +- [0x07, 0x00B7, MAC_Port_00B7] - [0x07, 0x00B8, MAC_Port_00B8] - [0x07, 0x00B9, MAC_Port_00B9] - [0x07, 0x00BA, MAC_Port_00BA] - [0x07, 0x00BB, MAC_Port_00BB] - [0x07, 0x00BC, MAC_Port_00BC] -- [0x07, 0x009C, MAC_Port_009C] +- [0x07, 0x00BD, MAC_Port_00BD] +- [0x07, 0x00BE, MAC_Port_00BE] +- [0x07, 0x00BF, MAC_Port_00BF] +- [0x07, 0x00C0, MAC_Port_00C0] +- [0x07, 0x00C1, MAC_Port_00C1] +- [0x07, 0x00C2, MAC_Port_00C2] +- [0x07, 0x00C3, MAC_Port_00C3] +- [0x07, 0x00C4, MAC_Port_00C4] +- [0x07, 0x00C5, MAC_Port_00C5] +- [0x07, 0x00C6, MAC_Port_00C6] +- [0x07, 0x00C7, MAC_Port_00C7] +- [0x07, 0x00C8, MAC_Port_00C8] +- [0x07, 0x00C9, MAC_Port_00C9] +- [0x07, 0x00CA, MAC_Port_00CA] +- [0x07, 0x00CB, MAC_Port_00CB] +- [0x07, 0x00CC, MAC_Port_00CC] +- [0x07, 0x00CD, MAC_Port_00CD] +- [0x07, 0x00CE, MAC_Port_00CE] +- [0x07, 0x00CF, MAC_Port_00CF] +- [0x07, 0x00D0, MAC_Port_00D0] +- [0x07, 0x00D1, MAC_Port_00D1] +- [0x07, 0x00D3, MAC_Port_00D3] +- [0x07, 0x00D4, MAC_Port_00D4] +- [0x07, 0x00D5, MAC_Port_00D5] +- [0x07, 0x00D6, MAC_Port_00D6] +- [0x07, 0x00D7, MAC_Port_00D7] +- [0x07, 0x00D8, MAC_Port_00D8] +- [0x07, 0x00D9, MAC_Port_00D9] +- [0x07, 0x00DA, MAC_Port_00DA] +- [0x07, 0x00DB, MAC_Port_00DB] +- [0x07, 0x00DC, MAC_Port_00DC] +- [0x07, 0x00DD, MAC_Port_00DD] +- [0x07, 0x00DE, MAC_Port_00DE] +- [0x08, 0x0000, MGM_0000] +- [0x08, 0x0001, MGM_0001] +- [0x08, 0x0002, MGM_0002] +- [0x08, 0x0003, MGM_0003] +- [0x08, 0x0004, MGM_0004] +- [0x08, 0x0005, MGM_0005] +- [0x08, 0x0006, MGM_0006] +- [0x08, 0x0007, MGM_0007] +- [0x08, 0x0008, MGM_0008] +- [0x08, 0x0009, MGM_0009] +- [0x08, 0x000A, MGM_000A] +- [0x08, 0x000B, MGM_000B] +- [0x08, 0x000C, MGM_000C] +- [0x08, 0x000D, MGM_000D] +- [0x08, 0x000E, MGM_000E] +- [0x08, 0x000F, MGM_000F] +- [0x08, 0x0010, MGM_0010] +- [0x08, 0x0011, MGM_0011] - [0x0A, 0x0019, HOS_0019] - [0x0A, 0x001A, HOS_001A] - [0x0A, 0x001B, HOS_001B] @@ -55,24 +1398,268 @@ - [0x0A, 0x002C, HOS_002C] - [0x0A, 0x002D, HOS_002D] - [0x0A, 0x002E, HOS_002E] +- [0x0A, 0x006F, HOS_0070] +- [0x0B, 0x0000, CH0_0000] +- [0x0B, 0x0001, CH0_0001] +- [0x0B, 0x0002, CH0_0002] +- [0x0B, 0x0003, CH0_0003] +- [0x0B, 0x0004, CH0_0004] +- [0x0B, 0x0005, CH0_0005] +- [0x0B, 0x0006, CH0_0006] +- [0x0B, 0x0007, CH0_0007] +- [0x0B, 0x0008, CH0_0008] +- [0x0B, 0x0009, CH0_0009] +- [0x0B, 0x000A, CH0_000A] +- [0x0B, 0x000B, CH0_000B] +- [0x0B, 0x000C, CH0_000C] +- [0x0B, 0x000D, CH0_000D] +- [0x0B, 0x000E, CH0_000E] +- [0x0B, 0x000F, CH0_000F] +- [0x0B, 0x0010, CH0_0010] +- [0x0B, 0x0011, CH0_0011] +- [0x0B, 0x0012, CH0_0012] +- [0x0B, 0x0013, CH0_0013] +- [0x0B, 0x0014, CH0_0014] +- [0x0B, 0x0015, CH0_0015] +- [0x0B, 0x0016, CH0_0016] +- [0x0B, 0x0017, CH0_0017] +- [0x0B, 0x0018, CH0_0018] +- [0x0B, 0x0019, CH0_0019] +- [0x0B, 0x001A, CH0_001A] +- [0x0B, 0x001B, CH0_001B] +- [0x0B, 0x001C, CH0_001C] +- [0x0B, 0x001D, CH0_001D] +- [0x0B, 0x001E, CH0_001E] +- [0x0B, 0x001F, CH0_001F] +- [0x0B, 0x0020, CH0_0020] +- [0x0B, 0x0021, CH0_0021] +- [0x0B, 0x0022, CH0_0022] +- [0x0B, 0x0023, CH0_0023] +- [0x0B, 0x0024, CH0_0024] +- [0x0B, 0x0025, CH0_0025] +- [0x0B, 0x0026, CH0_0026] +- [0x0B, 0x0027, CH0_0027] +- [0x0B, 0x0028, CH0_0028] +- [0x0B, 0x0029, CH0_0029] +- [0x0B, 0x002A, CH0_002A] +- [0x0B, 0x002B, CH0_002B] +- [0x0B, 0x002C, CH0_002C] +- [0x0B, 0x002D, CH0_002D] +- [0x0B, 0x002E, CH0_002E] +- [0x0B, 0x002F, CH0_002F] +- [0x0B, 0x0030, CH0_0030] +- [0x0B, 0x0031, CH0_0031] +- [0x0B, 0x0032, CH0_0032] +- [0x0B, 0x0033, CH0_0033] +- [0x0B, 0x0034, CH0_0034] +- [0x0B, 0x0035, CH0_0035] +- [0x0B, 0x0036, CH0_0036] +- [0x0B, 0x0037, CH0_0037] +- [0x0B, 0x0038, CH0_0038] +- [0x0B, 0x0039, CH0_0039] +- [0x0B, 0x003A, CH0_003A] +- [0x0B, 0x003B, CH0_003B] +- [0x0B, 0x003C, CH0_003C] +- [0x0B, 0x003D, CH0_003D] +- [0x0B, 0x003E, CH0_003E] +- [0x0B, 0x003F, CH0_003F] +- [0x0B, 0x0040, CH0_0040] +- [0x0B, 0x0041, CH0_0041] +- [0x0B, 0x0042, CH0_0042] +- [0x0B, 0x0043, CH0_0043] +- [0x0B, 0x0044, CH0_0044] +- [0x0B, 0x0045, CH0_0045] +- [0x0B, 0x0046, CH0_0046] +- [0x0B, 0x0047, CH0_0047] +- [0x0B, 0x0048, CH0_0048] +- [0x0B, 0x0049, CH0_0049] +- [0x0B, 0x004A, CH0_004A] +- [0x0B, 0x004B, CH0_004B] +- [0x0B, 0x004C, CH0_004C] +- [0x0B, 0x004D, CH0_004D] +- [0x0B, 0x004E, CH0_004E] +- [0x0B, 0x004F, CH0_004F] +- [0x0B, 0x0050, CH0_0050] +- [0x0B, 0x0051, CH0_0051] +- [0x0B, 0x0052, CH0_0052] +- [0x0B, 0x0053, CH0_0053] +- [0x0B, 0x0054, CH0_0054] +- [0x0B, 0x0055, CH0_0055] +- [0x0B, 0x0056, CH0_0056] +- [0x0B, 0x0057, CH0_0057] +- [0x0B, 0x0058, CH0_0058] +- [0x0B, 0x0059, CH0_0059] +- [0x0B, 0x005A, CH0_005A] +- [0x0B, 0x005B, CH0_005B] +- [0x0B, 0x005C, CH0_005C] +- [0x0B, 0x005D, CH0_005D] +- [0x0B, 0x005E, CH0_005E] +- [0x0B, 0x005F, CH0_005F] +- [0x0B, 0x0060, CH0_0060] +- [0x0B, 0x0061, CH0_0061] +- [0x0B, 0x0062, CH0_0062] +- [0x0B, 0x0063, CH0_0063] +- [0x0B, 0x0064, CH0_0064] +- [0x0B, 0x0065, CH0_0065] +- [0x0B, 0x0066, CH0_0066] +- [0x0B, 0x0067, CH0_0067] +- [0x0B, 0x0068, CH0_0068] +- [0x0B, 0x0069, CH0_0069] +- [0x0B, 0x006A, CH0_006A] +- [0x0B, 0x006B, CH0_006B] +- [0x0B, 0x006C, CH0_006C] +- [0x0B, 0x006D, CH0_006D] +- [0x0B, 0x006E, CH0_006E] +- [0x0B, 0x006F, CH0_006F] +- [0x0B, 0x0070, CH0_0070] +- [0x0B, 0x0071, CH0_0071] +- [0x0B, 0x0072, CH0_0072] +- [0x0B, 0x0073, CH0_0073] +- [0x0B, 0x0074, CH0_0074] +- [0x0B, 0x0075, CH0_0075] +- [0x0B, 0x0076, CH0_0076] +- [0x0B, 0x0077, CH0_0077] +- [0x0B, 0x0078, CH0_0078] +- [0x0B, 0x0079, CH0_0079] +- [0x0B, 0x007A, CH0_007A] +- [0x0B, 0x007B, CH0_007B] +- [0x0B, 0x007C, CH0_007C] +- [0x0B, 0x007D, CH0_007D] +- [0x0B, 0x007E, CH0_007E] +- [0x0B, 0x007F, CH0_007F] +- [0x0B, 0x0080, CH0_0080] +- [0x0B, 0x0081, CH0_0081] +- [0x0B, 0x0082, CH0_0082] +- [0x0B, 0x0083, CH0_0083] +- [0x0B, 0x0084, CH0_0084] +- [0x0B, 0x0085, CH0_0085] +- [0x0B, 0x0086, CH0_0086] +- [0x0B, 0x0087, CH0_0087] +- [0x0B, 0x0088, CH0_0088] +- [0x0B, 0x0089, CH0_0089] +- [0x0B, 0x008A, CH0_008A] +- [0x0B, 0x008B, CH0_008B] +- [0x0B, 0x008C, CH0_008C] +- [0x0B, 0x008D, CH0_008D] +- [0x0B, 0x008E, CH0_008E] +- [0x0B, 0x008F, CH0_008F] +- [0x0B, 0x0090, CH0_0090] +- [0x0B, 0x0091, CH0_0091] +- [0x0B, 0x0092, CH0_0092] +- [0x0B, 0x0093, CH0_0093] +- [0x0B, 0x0094, CH0_0094] +- [0x0B, 0x0095, CH0_0095] +- [0x0B, 0x0096, CH0_0096] +- [0x0B, 0x0097, CH0_0097] +- [0x0B, 0x0098, CH0_0098] +- [0x0B, 0x0099, CH0_0099] +- [0x0B, 0x009A, CH0_009A] +- [0x0B, 0x009B, CH0_009B] +- [0x0B, 0x009C, CH0_009C] +- [0x0B, 0x009D, CH0_009D] +- [0x0B, 0x009E, CH0_009E] +- [0x0B, 0x009F, CH0_009F] +- [0x0B, 0x00A0, CH0_00A0] +- [0x0B, 0x00A1, CH0_00A1] +- [0x0B, 0x00A2, CH0_00A2] +- [0x0B, 0x00A3, CH0_00A3] +- [0x0B, 0x00A4, CH0_00A4] +- [0x0B, 0x00A5, CH0_00A5] +- [0x0B, 0x00A6, CH0_00A6] +- [0x0B, 0x00A7, CH0_00A7] +- [0x0B, 0x00A8, CH0_00A8] +- [0x0B, 0x00A9, CH0_00A9] +- [0x0B, 0x00AA, CH0_00AA] +- [0x0B, 0x00AB, CH0_00AB] +- [0x0B, 0x00AC, CH0_00AC] +- [0x0B, 0x00AD, CH0_00AD] +- [0x0B, 0x00AE, CH0_00AE] - [0x0B, 0x00AF, CH0_00AF] - [0x0B, 0x00B0, CH0_00B0] - [0x0B, 0x00B1, CH0_00B1] - [0x0B, 0x00B2, CH0_00B2] - [0x0B, 0x00B3, CH0_00B3] - [0x0B, 0x00B4, CH0_00B4] +- [0x0B, 0x00B5, CH0_00B5] +- [0x0B, 0x00B6, CH0_00B6] +- [0x0B, 0x00B7, CH0_00B7] - [0x0B, 0x00B8, CH0_00B8] - [0x0B, 0x00B9, CH0_00B9] - [0x0B, 0x00BA, CH0_00BA] +- [0x0B, 0x00BB, CH0_00BB] +- [0x0B, 0x00BC, CH0_00BC] +- [0x0B, 0x00BD, CH0_00BD] +- [0x0B, 0x00BE, CH0_00BE] - [0x0B, 0x00BF, CH0_00BF] - [0x0B, 0x00C0, CH0_00C0] - [0x0B, 0x00C1, CH0_00C1] +- [0x0B, 0x00C2, CH0_00C2] +- [0x0B, 0x00C3, CH0_00C3] +- [0x0B, 0x00C4, CH0_00C4] +- [0x0B, 0x00C5, CH0_00C5] +- [0x0B, 0x00C6, CH0_00C6] +- [0x0B, 0x00C7, CH0_00C7] +- [0x0B, 0x00C8, CH0_00C8] +- [0x0B, 0x00C9, CH0_00C9] +- [0x0B, 0x00CA, CH0_00CA] - [0x0B, 0x00CB, CH0_00CB] - [0x0B, 0x00CC, CH0_00CC] - [0x0B, 0x00CD, CH0_00CD] - [0x0B, 0x00CE, CH0_00CE] - [0x0B, 0x00CF, CH0_00CF] - [0x0B, 0x00D0, CH0_00D0] +- [0x0B, 0x00D1, CH0_00D1] +- [0x0B, 0x00D2, CH0_00D2] +- [0x0B, 0x00D3, CH0_00D3] +- [0x0B, 0x00D4, CH0_00D4] +- [0x0B, 0x00D5, CH0_00D5] +- [0x0B, 0x00D6, CH0_00D6] +- [0x0B, 0x00D7, CH0_00D7] +- [0x0B, 0x00D8, CH0_00D8] +- [0x0B, 0x00D9, CH0_00D9] +- [0x0B, 0x00DA, CH0_00DA] +- [0x0B, 0x00DB, CH0_00DB] +- [0x0B, 0x00DC, CH0_00DC] +- [0x0B, 0x00DD, CH0_00DD] +- [0x0B, 0x00DE, CH0_00DE] +- [0x0B, 0x00DF, CH0_00DF] +- [0x0B, 0x00E0, CH0_00E0] +- [0x0B, 0x00E1, CH0_00E1] +- [0x0B, 0x00E2, CH0_00E2] +- [0x0B, 0x00E3, CH0_00E3] +- [0x0B, 0x00E5, CH0_00E5] +- [0x0B, 0x00E6, CH0_00E6] +- [0x0B, 0x00E7, CH0_00E7] +- [0x0B, 0x00E8, CH0_00E8] +- [0x0B, 0x00E9, CH0_00E9] +- [0x0B, 0x00EA, CH0_00EA] +- [0x0B, 0x00EB, CH0_00EB] +- [0x0B, 0x00EC, CH0_00EC] +- [0x0B, 0x00ED, CH0_00ED] +- [0x0B, 0x00EE, CH0_00EE] +- [0x0B, 0x00EF, CH0_00EF] +- [0x0B, 0x00F0, CH0_00F0] +- [0x0B, 0x00F1, CH0_00F1] +- [0x0B, 0x00F2, CH0_00F2] +- [0x0B, 0x00F3, CH0_00F3] +- [0x0B, 0x00F4, CH0_00F4] +- [0x0B, 0x00F7, CH0_00F7] +- [0x0B, 0x00F8, CH0_00F8] +- [0x0B, 0x00F9, CH0_00F9] +- [0x0B, 0x00FA, CH0_00FA] +- [0x0B, 0x00FB, CH0_00FB] +- [0x0B, 0x00FC, CH0_00FC] +- [0x0B, 0x00FD, CH0_00FD] +- [0x0B, 0x00FE, CH0_00FE] +- [0x0B, 0x00FF, CH0_00FF] +- [0x0B, 0x0100, CH0_0100] +- [0x0B, 0x0101, CH0_0101] +- [0x0B, 0x0102, CH0_0102] +- [0x0B, 0x0103, CH0_0103] +- [0x0B, 0x0104, CH0_0104] +- [0x0B, 0x0105, CH0_0105] +- [0x0B, 0x0106, CH0_0106] +- [0x0B, 0x0107, CH0_0107] - [0x0C, 0x00FD, CH1_00FD] - [0x0C, 0x00FE, CH1_00FE] - [0x0C, 0x00FF, CH1_00FF] @@ -100,10 +1687,115 @@ - [0x0C, 0x0128, CH1_0128] - [0x0C, 0x0129, CH1_0129] - [0x0C, 0x012A, CH1_012A] +- [0x0D, 0x0000, CH2_0000] +- [0x0D, 0x0001, CH2_0001] +- [0x0D, 0x0002, CH2_0002] +- [0x0D, 0x0003, CH2_0003] +- [0x0D, 0x0004, CH2_0004] +- [0x0D, 0x0005, CH2_0005] +- [0x0D, 0x0006, CH2_0006] +- [0x0D, 0x0007, CH2_0007] +- [0x0D, 0x0008, CH2_0008] +- [0x0D, 0x0009, CH2_0009] +- [0x0D, 0x000A, CH2_000A] +- [0x0D, 0x000B, CH2_000B] +- [0x0D, 0x000C, CH2_000C] +- [0x0D, 0x000D, CH2_000D] +- [0x0D, 0x000E, CH2_000E] +- [0x0D, 0x000F, CH2_000F] +- [0x0D, 0x0010, CH2_0010] +- [0x0D, 0x0011, CH2_0011] +- [0x0D, 0x0012, CH2_0012] +- [0x0D, 0x0013, CH2_0013] +- [0x0D, 0x0014, CH2_0014] +- [0x0D, 0x0015, CH2_0015] +- [0x0D, 0x0016, CH2_0016] +- [0x0D, 0x0017, CH2_0017] +- [0x0D, 0x0018, CH2_0018] +- [0x0D, 0x0019, CH2_0019] +- [0x0D, 0x001A, CH2_001A] +- [0x0D, 0x001B, CH2_001B] +- [0x0D, 0x001C, CH2_001C] +- [0x0D, 0x001D, CH2_001D] +- [0x0D, 0x001E, CH2_001E] +- [0x0D, 0x001F, CH2_001F] +- [0x0D, 0x0020, CH2_0020] +- [0x0D, 0x0021, CH2_0021] +- [0x0D, 0x0022, CH2_0022] +- [0x0D, 0x0023, CH2_0023] +- [0x0D, 0x0024, CH2_0024] +- [0x0D, 0x0025, CH2_0025] +- [0x0D, 0x0026, CH2_0026] +- [0x0D, 0x0027, CH2_0027] +- [0x0D, 0x0028, CH2_0028] +- [0x0D, 0x0029, CH2_0029] +- [0x0D, 0x002A, CH2_002A] +- [0x0D, 0x002B, CH2_002B] +- [0x0D, 0x002C, CH2_002C] +- [0x0D, 0x002D, CH2_002D] +- [0x0D, 0x002E, CH2_002E] +- [0x0D, 0x002F, CH2_002F] +- [0x0D, 0x0030, CH2_0030] +- [0x0D, 0x0031, CH2_0031] +- [0x0D, 0x0032, CH2_0032] +- [0x0D, 0x0033, CH2_0033] +- [0x0D, 0x0034, CH2_0034] +- [0x0D, 0x0035, CH2_0035] +- [0x0D, 0x0036, CH2_0036] +- [0x0D, 0x0037, CH2_0037] +- [0x0D, 0x0038, CH2_0038] +- [0x0D, 0x0039, CH2_0039] +- [0x0D, 0x003A, CH2_003A] +- [0x0D, 0x003B, CH2_003B] +- [0x0D, 0x003C, CH2_003C] +- [0x0D, 0x003D, CH2_003D] +- [0x0D, 0x003E, CH2_003E] +- [0x0D, 0x003F, CH2_003F] +- [0x0D, 0x0040, CH2_0040] +- [0x0D, 0x0041, CH2_0041] +- [0x0D, 0x0042, CH2_0042] +- [0x0D, 0x0043, CH2_0043] +- [0x0D, 0x0044, CH2_0044] +- [0x0D, 0x0045, CH2_0045] +- [0x0D, 0x0046, CH2_0046] +- [0x0D, 0x0047, CH2_0047] +- [0x0D, 0x0048, CH2_0048] +- [0x0D, 0x0049, CH2_0049] +- [0x0D, 0x004A, CH2_004A] +- [0x0D, 0x004B, CH2_004B] +- [0x0D, 0x004C, CH2_004C] +- [0x0D, 0x004D, CH2_004D] +- [0x0D, 0x004E, CH2_004E] +- [0x0D, 0x004F, CH2_004F] +- [0x0D, 0x0050, CH2_0050] +- [0x0D, 0x0051, CH2_0051] +- [0x0D, 0x0052, CH2_0052] +- [0x0D, 0x0053, CH2_0053] +- [0x0D, 0x0054, CH2_0054] +- [0x0D, 0x0055, CH2_0055] +- [0x0D, 0x0056, CH2_0056] +- [0x0D, 0x0057, CH2_0057] +- [0x0D, 0x0058, CH2_0058] +- [0x0D, 0x0059, CH2_0059] +- [0x0D, 0x005A, CH2_005A] +- [0x0D, 0x005B, CH2_005B] +- [0x0D, 0x005C, CH2_005C] +- [0x0D, 0x005D, CH2_005D] +- [0x0D, 0x005E, CH2_005E] - [0x0D, 0x00E4, CH2_00E4] - [0x0D, 0x00E5, CH2_00E5] - [0x0D, 0x00E6, CH2_00E6] - [0x0D, 0x00E7, CH2_00E7] +- [0x0D, 0x00EB, CH2_00EB] +- [0x0D, 0x00EC, CH2_00EC] +- [0x0D, 0x00ED, CH2_00ED] +- [0x0D, 0x00EE, CH2_00EE] +- [0x0D, 0x00EF, CH2_00EF] +- [0x0D, 0x00F0, CH2_00F0] +- [0x0D, 0x00F1, CH2_00F1] +- [0x0D, 0x00F2, CH2_00F2] +- [0x0D, 0x00F3, CH2_00F3] +- [0x0D, 0x00F4, CH2_00F4] - [0x0E, 0x0020, CH3_0020] - [0x0E, 0x0021, CH3_0021] - [0x0E, 0x00C3, CH3_00C3] @@ -183,6 +1875,304 @@ - [0x13, 0x00A7, CH8_00A7] - [0x13, 0x00A8, CH8_00A8] - [0x13, 0x00A9, CH8_00A9] +- [0x16, 0x0000, RussTHint_0000] +- [0x16, 0x0001, RussTHint_0001] +- [0x16, 0x0002, RussTHint_0002] +- [0x16, 0x0003, RussTHint_0003] +- [0x16, 0x0004, RussTHint_0004] +- [0x16, 0x0005, RussTHint_0005] +- [0x16, 0x0006, RussTHint_0006] +- [0x16, 0x0007, RussTHint_0007] +- [0x16, 0x0008, RussTHint_0008] +- [0x16, 0x0009, RussTHint_0009] +- [0x16, 0x000A, RussTHint_000A] +- [0x16, 0x000B, RussTHint_000B] +- [0x16, 0x000C, RussTHint_000C] +- [0x16, 0x000D, RussTHint_000D] +- [0x16, 0x000E, RussTHint_000E] +- [0x16, 0x000F, RussTHint_000F] +- [0x16, 0x0010, RussTHint_0010] +- [0x16, 0x0011, RussTHint_0011] +- [0x16, 0x0012, RussTHint_0012] +- [0x16, 0x0013, RussTHint_0013] +- [0x16, 0x0014, RussTHint_0014] +- [0x16, 0x0015, RussTHint_0015] +- [0x16, 0x0016, RussTHint_0016] +- [0x16, 0x0017, RussTHint_0017] +- [0x16, 0x0018, RussTHint_0018] +- [0x16, 0x0019, RussTHint_0019] +- [0x16, 0x001A, RussTHint_001A] +- [0x16, 0x001B, RussTHint_001B] +- [0x16, 0x001C, RussTHint_001C] +- [0x16, 0x001D, RussTHint_001D] +- [0x16, 0x001E, RussTHint_001E] +- [0x16, 0x001F, RussTHint_001F] +- [0x16, 0x0020, RussTHint_0020] +- [0x16, 0x0021, RussTHint_0021] +- [0x16, 0x0022, RussTHint_0022] +- [0x16, 0x0023, RussTHint_0023] +- [0x19, 0x0000, NewsBoard_0000] +- [0x19, 0x0001, NewsBoard_0001] +- [0x19, 0x0002, NewsBoard_0002] +- [0x19, 0x0003, NewsBoard_0003] +- [0x19, 0x0004, NewsBoard_0004] +- [0x19, 0x0005, NewsBoard_0005] +- [0x19, 0x0006, NewsBoard_0006] +- [0x19, 0x0007, NewsBoard_0007] +- [0x19, 0x0008, NewsBoard_0008] +- [0x19, 0x0009, NewsBoard_0009] +- [0x19, 0x000A, NewsBoard_000A] +- [0x19, 0x000B, NewsBoard_000B] +- [0x19, 0x000C, NewsBoard_000C] +- [0x19, 0x000D, NewsBoard_000D] +- [0x19, 0x000E, NewsBoard_000E] +- [0x19, 0x000F, NewsBoard_000F] +- [0x19, 0x0010, NewsBoard_0010] +- [0x19, 0x0011, NewsBoard_0011] +- [0x19, 0x0012, NewsBoard_0012] +- [0x19, 0x0013, NewsBoard_0013] +- [0x19, 0x0014, NewsBoard_0014] +- [0x19, 0x0015, NewsBoard_0015] +- [0x19, 0x0016, NewsBoard_0016] +- [0x19, 0x0017, NewsBoard_0017] +- [0x19, 0x0018, NewsBoard_0018] +- [0x19, 0x0019, NewsBoard_0019] +- [0x1A, 0x0000, GossipBoard_0000] +- [0x1A, 0x0001, GossipBoard_0001] +- [0x1A, 0x0002, GossipBoard_0002] +- [0x1A, 0x0003, GossipBoard_0003] +- [0x1A, 0x0004, GossipBoard_0004] +- [0x1A, 0x0005, GossipBoard_0005] +- [0x1A, 0x0006, GossipBoard_0006] +- [0x1A, 0x0007, GossipBoard_0007] +- [0x1A, 0x0008, GossipBoard_0008] +- [0x1A, 0x0009, GossipBoard_0009] +- [0x1A, 0x000A, GossipBoard_000A] +- [0x1A, 0x000B, GossipBoard_000B] +- [0x1A, 0x000C, GossipBoard_000C] +- [0x1A, 0x000D, GossipBoard_000D] +- [0x1A, 0x000E, GossipBoard_000E] +- [0x1A, 0x000F, GossipBoard_000F] +- [0x1A, 0x0010, GossipBoard_0010] +- [0x1A, 0x0011, GossipBoard_0011] +- [0x1A, 0x0012, GossipBoard_0012] +- [0x1A, 0x0013, GossipBoard_0013] +- [0x1A, 0x0014, GossipBoard_0014] +- [0x1A, 0x0015, GossipBoard_0015] +- [0x1A, 0x0016, GossipBoard_0016] +- [0x1A, 0x0017, GossipBoard_0017] +- [0x1A, 0x0018, GossipBoard_0018] +- [0x1A, 0x0019, GossipBoard_0019] +- [0x1B, 0x0000, MapTattle_mac_00] +- [0x1B, 0x0001, MapTattle_mac_01] +- [0x1B, 0x0002, MapTattle_mac_02] +- [0x1B, 0x0003, MapTattle_mac_03] +- [0x1B, 0x0004, MapTattle_mac_04] +- [0x1B, 0x0005, MapTattle_mac_05] +- [0x1B, 0x0023, MapTattle_tik_01] +- [0x1B, 0x0024, MapTattle_tik_02] +- [0x1B, 0x0025, MapTattle_tik_03] +- [0x1B, 0x0026, MapTattle_tik_04] +- [0x1B, 0x0027, MapTattle_tik_05] +- [0x1B, 0x0028, MapTattle_tik_06] +- [0x1B, 0x0029, MapTattle_tik_07] +- [0x1B, 0x002A, MapTattle_tik_08] +- [0x1B, 0x002B, MapTattle_tik_09] +- [0x1B, 0x002C, MapTattle_tik_10] +- [0x1B, 0x002D, MapTattle_tik_12] +- [0x1B, 0x002E, MapTattle_tik_14] +- [0x1B, 0x002F, MapTattle_tik_15] +- [0x1B, 0x0030, MapTattle_tik_17] +- [0x1B, 0x0031, MapTattle_tik_18] +- [0x1B, 0x0032, MapTattle_tik_19] +- [0x1B, 0x0033, MapTattle_tik_20] +- [0x1B, 0x0034, MapTattle_tik_21] +- [0x1B, 0x0035, MapTattle_tik_22] +- [0x1B, 0x0036, MapTattle_tik_23] +- [0x1B, 0x0037, MapTattle_tik_24] +- [0x1B, 0x0038, MapTattle_tik_25] +- [0x1B, 0x0039, MapTattle_kmr_00] +- [0x1B, 0x003A, MapTattle_kmr_02] +- [0x1B, 0x003B, MapTattle_kmr_03] +- [0x1B, 0x003C, MapTattle_kmr_04] +- [0x1B, 0x003D, MapTattle_kmr_05] +- [0x1B, 0x003E, MapTattle_kmr_06] +- [0x1B, 0x003F, MapTattle_kmr_07] +- [0x1B, 0x0040, MapTattle_kmr_12] +- [0x1B, 0x0041, MapTattle_kmr_09] +- [0x1B, 0x0042, MapTattle_kmr_11] +- [0x1B, 0x0043, MapTattle_kmr_10] +- [0x1B, 0x0044, MapTattle_kmr_20] +- [0x1B, 0x0059, MapTattle_iwa_10] +- [0x1B, 0x005A, MapTattle_iwa_00] +- [0x1B, 0x005B, MapTattle_iwa_01] +- [0x1B, 0x005C, MapTattle_iwa_02] +- [0x1B, 0x005D, MapTattle_iwa_03] +- [0x1B, 0x005E, MapTattle_iwa_04] +- [0x1B, 0x005F, MapTattle_sbk_99] +- [0x1B, 0x0060, MapTattle_sbk_00] +- [0x1B, 0x0061, MapTattle_sbk_01] +- [0x1B, 0x0062, MapTattle_sbk_02_before] +- [0x1B, 0x0063, MapTattle_sbk_02_after] +- [0x1B, 0x0064, MapTattle_sbk_03] +- [0x1B, 0x0065, MapTattle_sbk_04] +- [0x1B, 0x0066, MapTattle_sbk_05] +- [0x1B, 0x0067, MapTattle_sbk_06] +- [0x1B, 0x0068, MapTattle_sbk_10] +- [0x1B, 0x0069, MapTattle_sbk_11] +- [0x1B, 0x006A, MapTattle_sbk_12] +- [0x1B, 0x006B, MapTattle_sbk_13] +- [0x1B, 0x006C, MapTattle_sbk_14] +- [0x1B, 0x006D, MapTattle_sbk_15] +- [0x1B, 0x006E, MapTattle_sbk_16] +- [0x1B, 0x006F, MapTattle_sbk_20] +- [0x1B, 0x0070, MapTattle_sbk_21] +- [0x1B, 0x0071, MapTattle_sbk_22] +- [0x1B, 0x0072, MapTattle_sbk_23] +- [0x1B, 0x0073, MapTattle_sbk_24] +- [0x1B, 0x0074, MapTattle_sbk_25] +- [0x1B, 0x0075, MapTattle_sbk_26] +- [0x1B, 0x0076, MapTattle_sbk_30_before] +- [0x1B, 0x0077, MapTattle_sbk_30_after] +- [0x1B, 0x0078, MapTattle_sbk_31] +- [0x1B, 0x0079, MapTattle_sbk_32] +- [0x1B, 0x007A, MapTattle_sbk_33] +- [0x1B, 0x007B, MapTattle_sbk_34] +- [0x1B, 0x007C, MapTattle_sbk_35] +- [0x1B, 0x007D, MapTattle_sbk_36] +- [0x1B, 0x007E, MapTattle_sbk_40] +- [0x1B, 0x007F, MapTattle_sbk_41] +- [0x1B, 0x0080, MapTattle_sbk_42] +- [0x1B, 0x0081, MapTattle_sbk_43] +- [0x1B, 0x0082, MapTattle_sbk_44] +- [0x1B, 0x0083, MapTattle_sbk_45] +- [0x1B, 0x0084, MapTattle_sbk_46] +- [0x1B, 0x0085, MapTattle_sbk_50] +- [0x1B, 0x0086, MapTattle_sbk_51] +- [0x1B, 0x0087, MapTattle_sbk_52] +- [0x1B, 0x0088, MapTattle_sbk_53] +- [0x1B, 0x0089, MapTattle_sbk_54] +- [0x1B, 0x008A, MapTattle_sbk_55] +- [0x1B, 0x008B, MapTattle_sbk_56] +- [0x1B, 0x008C, MapTattle_sbk_60] +- [0x1B, 0x008D, MapTattle_sbk_61] +- [0x1B, 0x008E, MapTattle_sbk_62] +- [0x1B, 0x008F, MapTattle_sbk_63] +- [0x1B, 0x0090, MapTattle_sbk_64] +- [0x1B, 0x0091, MapTattle_sbk_65] +- [0x1B, 0x0092, MapTattle_sbk_66] +- [0x1B, 0x00E9, MapTattle_kgr_01] +- [0x1B, 0x00EA, MapTattle_kgr_02] +- [0x1B, 0x018C, MapTattle_018C] +- [0x1C, 0x0000, NpcTattle_Kolorado] +- [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, 0x000D, NpcTattle_RipCheato] +- [0x1C, 0x000E, NpcTattle_RussT] +- [0x1C, 0x000F, NpcTattle_TheMaster] +- [0x1C, 0x0010, NpcTattle_Chan] +- [0x1C, 0x0011, NpcTattle_Lee] +- [0x1C, 0x0012, NpcTattle_MAC00_ShopOwner] +- [0x1C, 0x0013, NpcTattle_MAC_GateGuardian] +- [0x1C, 0x0014, NpcTattle_MAC_ShopLoiterer] +- [0x1C, 0x0015, NpcTattle_MAC_NewsEnthusiast] +- [0x1C, 0x0016, NpcTattle_MAC_FickleLovers] +- [0x1C, 0x0017, NpcTattle_MAC_ShamelessLover] +- [0x1C, 0x0018, NpcTattle_MAC_ThreeSisters_Eldest] +- [0x1C, 0x0019, NpcTattle_MAC_ThreeSisters_Middle] +- [0x1C, 0x001A, NpcTattle_MAC_ThreeSisters_Youngest] +- [0x1C, 0x001B, NpcTattle_MAC_DojoSpectator] +- [0x1C, 0x001C, NpcTattle_MAC_LuckyCastleWorker] +- [0x1C, 0x001D, NpcTattle_MAC_Homemaker] +- [0x1C, 0x001E, NpcTattle_MAC_FriendlyToadKid] +- [0x1C, 0x001F, NpcTattle_MAC_PowerHungryToadKid] +- [0x1C, 0x0020, NpcTattle_MAC_DojoFanToad] +- [0x1C, 0x0021, NpcTattle_Merlon] +- [0x1C, 0x0022, NpcTattle_Postmaster] +- [0x1C, 0x0023, NpcTattle_MAC_Parakarry] +- [0x1C, 0x0024, NpcTattle_Rowf] +- [0x1C, 0x0025, NpcTattle_Rhuff] +- [0x1C, 0x0026, NpcTattle_MinhT] +- [0x1C, 0x0027, NpcTattle_DarkToadA] +- [0x1C, 0x0028, NpcTattle_DarkToadB] +- [0x1C, 0x0029, NpcTattle_DarkToadC] +- [0x1C, 0x002A, NpcTattle_DarkToadD] +- [0x1C, 0x002B, NpcTattle_MAC_RunsHisMouth] +- [0x1C, 0x002C, NpcTattle_MAC_KnowsTheGossip] +- [0x1C, 0x002D, NpcTattle_MAC_PrincessFan] +- [0x1C, 0x002E, NpcTattle_MAC_KnowsTheRumors] +- [0x1C, 0x002F, NpcTattle_MAC_CrushingOnMinhT] +- [0x1C, 0x0030, NpcTattle_MAC_SeeksTheSouth] +- [0x1C, 0x0031, NpcTattle_MAC_ToadHouseToad] +- [0x1C, 0x0032, NpcTattle_MAC_FlowerGateBubulb] +- [0x1C, 0x0033, NpcTattle_TayceT] +- [0x1C, 0x0034, NpcTattle_FiceT] +- [0x1C, 0x0035, NpcTattle_MAC_HardWorker] +- [0x1C, 0x0036, NpcTattle_MAC_CookingApprentice] +- [0x1C, 0x0037, NpcTattle_MAC_CantKeepQuiet] +- [0x1C, 0x0038, NpcTattle_MAC_FickleDreamer] +- [0x1C, 0x0039, NpcTattle_MAC_PrettySmart] +- [0x1C, 0x003A, NpcTattle_MAC_PetBoaster] +- [0x1C, 0x003B, NpcTattle_MAC_Bubulb_Hidden] +- [0x1C, 0x003C, NpcTattle_MAC_Bubulb_Revealed] +- [0x1C, 0x003D, NpcTattle_MAC_StationMaster] +- [0x1C, 0x003E, NpcTattle_MAC_TrainLover] +- [0x1C, 0x003F, NpcTattle_MAC_CaringToad] +- [0x1C, 0x0040, NpcTattle_MAC_DesertTraveler] +- [0x1C, 0x0041, NpcTattle_MAC_TravelFan] +- [0x1C, 0x0042, NpcTattle_MAC_GoodFriends] +- [0x1C, 0x0043, NpcTattle_MAC_LilOinkFan] +- [0x1C, 0x0044, NpcTattle_HarryT_ShopOwner] +- [0x1C, 0x0045, NpcTattle_MAC_TalksAlot] +- [0x1C, 0x0046, NpcTattle_MAC_WaryListener] +- [0x1C, 0x0047, NpcTattle_MAC_CarefreeKids] +- [0x1C, 0x0048, NpcTattle_MAC_OutdoorKids] +- [0x1C, 0x0049, NpcTattle_MAC_ShyKid] +- [0x1C, 0x004A, NpcTattle_ToadWhoWalks] +- [0x1C, 0x004B, NpcTattle_GuideToad] +- [0x1C, 0x004C, NpcTattle_GreatGossipTrioA] +- [0x1C, 0x004D, NpcTattle_GreatGossipTrioB] +- [0x1C, 0x004E, NpcTattle_GreatGossipTrioC] +- [0x1C, 0x004F, NpcTattle_MAC_NewResidentA] +- [0x1C, 0x0050, NpcTattle_MAC_NewResidentB] +- [0x1C, 0x0051, NpcTattle_ChetRippo] +- [0x1C, 0x0052, NpcTattle_Club64_Bartender] +- [0x1C, 0x0053, NpcTattle_Fishmael] +- [0x1C, 0x0054, NpcTattle_Fuzzipede] +- [0x1C, 0x0055, NpcTattle_Whale] +- [0x1C, 0x0056, NpcTattle_Club64_Waiter] +- [0x1C, 0x0057, NpcTattle_PopDiva_CantSing] +- [0x1C, 0x0058, NpcTattle_PopDiva_CanSing] +- [0x1C, 0x0059, NpcTattle_MasterPoet] +- [0x1C, 0x005A, NpcTattle_MAC_PortGuide] +- [0x1C, 0x005B, NpcTattle_MAC_SeaLover] +- [0x1C, 0x005C, NpcTattle_MAC_WellTraveledToad] +- [0x1C, 0x005D, NpcTattle_MAC_SingsOffKey] +- [0x1C, 0x0063, NpcTattle_Goompa] +- [0x1C, 0x0064, NpcTattle_Gooma] +- [0x1C, 0x0065, NpcTattle_Goompapa] +- [0x1C, 0x0066, NpcTattle_Goomama] +- [0x1C, 0x0067, NpcTattle_Goombaria] +- [0x1C, 0x0068, NpcTattle_KMR_ToadHouseToad] +- [0x1C, 0x0069, NpcTattle_Luigi] +- [0x1C, 0x0083, NpcTattle_IWA_StationMaster] +- [0x1C, 0x0084, NpcTattle_IWA_Parakarry] +- [0x1C, 0x0085, NpcTattle_IWA_TravelAgent] +- [0x1C, 0x0086, NpcTattle_IWA_StationLoiterer] +- [0x1C, 0x0087, NpcTattle_IWA_Bubulb_Hidden] +- [0x1C, 0x0088, NpcTattle_IWA_Bubulb_Revealed] +- [0x1C, 0x0089, NpcTattle_Whacka] +- [0x1C, 0x008A, NpcTattle_IWA_Conservationist] +- [0x1C, 0x008B, NpcTattle_SBK_Kolorado] +- [0x1C, 0x008C, NpcTattle_SBK_ExcavatorA] +- [0x1C, 0x008D, NpcTattle_SBK_ExcavatorB] +- [0x1C, 0x008E, NpcTattle_SBK_Nomadimouse] +- [0x1C, 0x0095, NpcTattle_Composer] +- [0x1C, 0x00BB, NpcTattle_MAC_ShyGuyShopOwner] - [0x1D, 0x0000, EntityTattle_HammerBlock1_CanBreak] - [0x1D, 0x0001, EntityTattle_HammerBlock2_CantBreak] - [0x1D, 0x0002, EntityTattle_HammerBlock2_CanBreak] @@ -389,6 +2379,7 @@ - [0x20, 0x0003, Menus_Tutorial_GotStarPiece] - [0x20, 0x0004, Menus_SavePrompt] - [0x20, 0x0005, Menus_SaveComplete] +- [0x20, 0x0009, Menus_JP_0009] - [0x20, 0x000E, Menus_Party_Goombario] - [0x20, 0x000F, Menus_Party_Kooper] - [0x20, 0x0010, Menus_Party_Bombette] @@ -546,8 +2537,60 @@ - [0x20, 0x00E7, Menus_00CD] - [0x20, 0x00E8, Menus_00CE] - [0x20, 0x00EA, Menus_00D0] +- [0x20, 0x00EB, Menus_00D1] +- [0x20, 0x00EC, Menus_00D2] +- [0x20, 0x00ED, Menus_00D3] - [0x20, 0x00F0, Menus_00D6] - [0x20, 0x00F1, Menus_00D7] +- [0x20, 0x00F2, Menus_00D8] +- [0x20, 0x00F4, Menus_00DA] +- [0x20, 0x00F5, Menus_00DB] +- [0x20, 0x00F6, Menus_00DC] +- [0x20, 0x00F7, Menus_00DD] +- [0x20, 0x00F8, Menus_00DE] +- [0x20, 0x00F9, Menus_00DF] +- [0x20, 0x00FA, Menus_00E0] +- [0x20, 0x00FB, Menus_00E1] +- [0x20, 0x00FC, Menus_00E2] +- [0x20, 0x00FD, Menus_00E3] +- [0x20, 0x00FE, Menus_00E4] +- [0x20, 0x00FF, Menus_00E5] +- [0x20, 0x0100, Menus_00E6] +- [0x20, 0x0101, Menus_00E7] +- [0x20, 0x0102, Menus_00E8] +- [0x20, 0x0103, Menus_00E9] +- [0x20, 0x0104, Menus_00EA] +- [0x20, 0x0105, Menus_00EB] +- [0x20, 0x0106, Menus_00EC] +- [0x20, 0x0107, Menus_00ED] +- [0x20, 0x0108, Menus_00EE] +- [0x20, 0x0109, Menus_00EF] +- [0x20, 0x010A, Menus_00F0] +- [0x20, 0x010B, Menus_00F1] +- [0x20, 0x0172, Menus_Inspect_Toybox] +- [0x20, 0x017F, Menus_Inspect_FoundHammer] +- [0x20, 0x0180, Menus_Sign_BewareOfGoombas] +- [0x20, 0x0181, Menus_Sign_EatMushroomsTip] +- [0x20, 0x0182, Menus_Sign_EatMushroomsTrap] +- [0x20, 0x0183, Menus_Sign_GoombaKingsFortress] +- [0x20, 0x0184, Menus_Inspect_DangerSealed] +- [0x20, 0x0186, Menus_Inspect_LockedFromInside] +- [0x20, 0x0187, Menus_016B] +- [0x20, 0x0188, Menus_016C] +- [0x20, 0x018B, Menus_016F] +- [0x20, 0x018C, Menus_0170] +- [0x20, 0x018D, Menus_0171] +- [0x20, 0x018E, Menus_0172] +- [0x20, 0x018F, Menus_0173] +- [0x20, 0x0190, Menus_0174] +- [0x20, 0x0191, Menus_0175] +- [0x20, 0x0193, Menus_0177] +- [0x20, 0x0196, Menus_017A] +- [0x20, 0x01A3, Menus_0187] +- [0x20, 0x01A5, Menus_0189] +- [0x20, 0x01A8, Menus_018C] +- [0x20, 0x01AE, Menus_0192] +- [0x20, 0x01B0, Menus_0194] - [0x20, 0x01B6, Menus_019A] - [0x20, 0x01B7, Menus_019B] - [0x20, 0x01BE, Menus_019C] @@ -559,15 +2602,213 @@ - [0x20, 0x01C4, Menus_01A2] - [0x20, 0x01C5, Menus_01A3] - [0x20, 0x01C6, Menus_01A4] +- [0x20, 0x01C7, Menus_01A5] +- [0x20, 0x01C8, Menus_JP_01C8] +- [0x20, 0x01C9, Menus_01A6] +- [0x20, 0x01CA, Menus_01A7] +- [0x20, 0x01CB, Menus_01A8] +- [0x20, 0x01CC, Menus_01A9] +- [0x20, 0x01CD, Menus_01AA] +- [0x20, 0x01CE, Menus_01AB] - [0x21, 0x0002, Choice_0001] - [0x21, 0x0003, Choice_0002] - [0x21, 0x0004, Choice_0003] - [0x21, 0x0005, Choice_0004] - [0x21, 0x0006, Choice_0005] +- [0x21, 0x0007, Choice_0006] +- [0x21, 0x0008, Choice_0007] +- [0x21, 0x0009, Choice_0008] - [0x21, 0x000A, Choice_000A] +- [0x21, 0x000B, Choice_000B] +- [0x21, 0x000C, Choice_000C] +- [0x21, 0x000D, Choice_000D] +- [0x21, 0x000E, Choice_000E] +- [0x21, 0x000F, Choice_000F] +- [0x21, 0x0010, Choice_0010] +- [0x21, 0x0011, Choice_0011] +- [0x21, 0x0013, Choice_0013] +- [0x21, 0x0016, Choice_0016] +- [0x21, 0x0017, Choice_0017] - [0x21, 0x001D, Choice_001D] +- [0x21, 0x0036, Choice_0036] +- [0x21, 0x004D, Choice_004D] - [0x22, 0x0001, MenuTip_0032] +- [0x22, 0x000B, MenuTip_0034] - [0x22, 0x0014, MenuTip_0033] +- [0x23, 0x0000, Document_Letter_Mario01_Body] +- [0x23, 0x0001, Document_Letter_Mario01_From] +- [0x23, 0x0002, Document_Letter_Mario02_Body] +- [0x23, 0x0003, Document_Letter_Mario02_From] +- [0x23, 0x0004, Document_Letter_Mario03_Body] +- [0x23, 0x0005, Document_Letter_Mario03_From] +- [0x23, 0x0006, Document_Letter_Mario04_Body] +- [0x23, 0x0007, Document_Letter_Mario04_From] +- [0x23, 0x0008, Document_Letter_Mario05_Body] +- [0x23, 0x0009, Document_Letter_Mario05_From] +- [0x23, 0x000A, Document_Letter_Mario06_Body] +- [0x23, 0x000B, Document_Letter_Mario06_From] +- [0x23, 0x000C, Document_Letter_Mario07_Body] +- [0x23, 0x000D, Document_Letter_Mario07_From] +- [0x23, 0x000E, Document_Letter_Mario08_Body] +- [0x23, 0x000F, Document_Letter_Mario08_From] +- [0x23, 0x0010, Document_Letter_Mario09_Body] +- [0x23, 0x0011, Document_Letter_Mario09_From] +- [0x23, 0x0012, Document_Letter_Mario10_Body] +- [0x23, 0x0013, Document_Letter_Mario10_From] +- [0x23, 0x0014, Document_Letter_Mario11_Body] +- [0x23, 0x0015, Document_Letter_Mario11_From] +- [0x23, 0x0016, Document_Letter_Mario12_Body] +- [0x23, 0x0017, Document_Letter_Mario12_From] +- [0x23, 0x0018, Document_Letter_Goombario1_From] +- [0x23, 0x0019, Document_Letter_Goombario1_Desc] +- [0x23, 0x001A, Document_Letter_Goombario1_Body] +- [0x23, 0x001B, Document_Letter_Goombario2_From] +- [0x23, 0x001C, Document_Letter_Goombario2_Desc] +- [0x23, 0x001D, Document_Letter_Goombario2_Body] +- [0x23, 0x001E, Document_Letter_Goombario3_From] +- [0x23, 0x001F, Document_Letter_Goombario3_Desc] +- [0x23, 0x0020, Document_Letter_Goombario3_Body] +- [0x23, 0x0021, Document_Letter_Kooper1_From] +- [0x23, 0x0022, Document_Letter_Kooper1_Desc] +- [0x23, 0x0023, Document_Letter_Kooper1_Body] +- [0x23, 0x0024, Document_Letter_Kooper2_From] +- [0x23, 0x0025, Document_Letter_Kooper2_Desc] +- [0x23, 0x0026, Document_Letter_Kooper2_Body] +- [0x23, 0x0027, Document_Letter_Kooper3_From] +- [0x23, 0x0028, Document_Letter_Kooper3_Desc] +- [0x23, 0x0029, Document_Letter_Kooper3_Body] +- [0x23, 0x002A, Document_Letter_Bombette1_From] +- [0x23, 0x002B, Document_Letter_Bombette1_Desc] +- [0x23, 0x002C, Document_Letter_Bombette1_Body] +- [0x23, 0x002D, Document_Letter_Bombette2_From] +- [0x23, 0x002E, Document_Letter_Bombette2_Desc] +- [0x23, 0x002F, Document_Letter_Bombette2_Body] +- [0x23, 0x0030, Document_Letter_Bombette3_From] +- [0x23, 0x0031, Document_Letter_Bombette3_Desc] +- [0x23, 0x0032, Document_Letter_Bombette3_Body] +- [0x23, 0x0033, Document_Letter_Parakarry1_From] +- [0x23, 0x0034, Document_Letter_Parakarry1_Desc] +- [0x23, 0x0035, Document_Letter_Parakarry1_Body] +- [0x23, 0x0036, Document_Letter_Parakarry2_From] +- [0x23, 0x0037, Document_Letter_Parakarry2_Desc] +- [0x23, 0x0038, Document_Letter_Parakarry2_Body] +- [0x23, 0x0039, Document_Letter_Bow1_From] +- [0x23, 0x003A, Document_Letter_Bow1_Desc] +- [0x23, 0x003B, Document_Letter_Bow1_Body] +- [0x23, 0x003C, Document_Letter_Bow2_From] +- [0x23, 0x003D, Document_Letter_Bow2_Desc] +- [0x23, 0x003E, Document_Letter_Bow2_Body] +- [0x23, 0x003F, Document_Letter_Watt1_From] +- [0x23, 0x0040, Document_Letter_Watt1_Desc] +- [0x23, 0x0041, Document_Letter_Watt1_Body] +- [0x23, 0x0042, Document_Letter_Watt2_From] +- [0x23, 0x0043, Document_Letter_Watt2_Desc] +- [0x23, 0x0044, Document_Letter_Watt2_Body] +- [0x23, 0x0045, Document_Letter_Sushie1_From] +- [0x23, 0x0046, Document_Letter_Sushie1_Desc] +- [0x23, 0x0047, Document_Letter_Sushie1_Body] +- [0x23, 0x0048, Document_Letter_Sushie2_From] +- [0x23, 0x0049, Document_Letter_Sushie2_Desc] +- [0x23, 0x004A, Document_Letter_Sushie2_Body] +- [0x23, 0x004B, Document_Letter_Lakilester1_From] +- [0x23, 0x004C, Document_Letter_Lakilester1_Desc] +- [0x23, 0x004D, Document_Letter_Lakilester1_Body] +- [0x23, 0x004E, Document_Letter_Lakilester2_From] +- [0x23, 0x004F, Document_Letter_Lakilester2_Desc] +- [0x23, 0x0050, Document_Letter_Lakilester2_Body] +- [0x23, 0x0051, Document_LuigisDiary_01] +- [0x23, 0x0052, Document_LuigisDiary_02] +- [0x23, 0x0053, Document_LuigisDiary_03] +- [0x23, 0x0054, Document_LuigisDiary_04] +- [0x23, 0x0055, Document_LuigisDiary_05] +- [0x23, 0x0056, Document_LuigisDiary_06] +- [0x23, 0x0057, Document_LuigisDiary_07] +- [0x23, 0x0058, Document_LuigisDiary_08] +- [0x23, 0x0059, Document_LuigisDiary_09] +- [0x23, 0x005A, Document_LuigisDiary_10] +- [0x23, 0x005B, Document_LuigisDiary_11] +- [0x23, 0x005C, Document_LuigisDiary_12] +- [0x24, 0x0000, QuizQuestion_01] +- [0x25, 0x0000, QuizChoice_01] +- [0x26, 0x0000, MerlonHint_0000] +- [0x26, 0x0001, MerlonHint_0001] +- [0x26, 0x0002, MerlonHint_0002] +- [0x26, 0x0003, MerlonHint_0003] +- [0x26, 0x0004, MerlonHint_0004] +- [0x26, 0x0005, MerlonHint_0005] +- [0x26, 0x0006, MerlonHint_0006] +- [0x26, 0x0007, MerlonHint_0007] +- [0x26, 0x0008, MerlonHint_0008] +- [0x26, 0x0009, MerlonHint_0009] +- [0x26, 0x000A, MerlonHint_000A] +- [0x26, 0x000B, MerlonHint_000B] +- [0x26, 0x000C, MerlonHint_000C] +- [0x26, 0x000D, MerlonHint_000D] +- [0x26, 0x000E, MerlonHint_000E] +- [0x26, 0x000F, MerlonHint_000F] +- [0x26, 0x0010, MerlonHint_0010] +- [0x26, 0x0011, MerlonHint_0011] +- [0x26, 0x0012, MerlonHint_0012] +- [0x26, 0x0013, MerlonHint_0013] +- [0x26, 0x0014, MerlonHint_0014] +- [0x26, 0x0015, MerlonHint_0015] +- [0x26, 0x0016, MerlonHint_0016] +- [0x26, 0x0017, MerlonHint_0017] +- [0x26, 0x0018, MerlonHint_0018] +- [0x26, 0x0019, MerlonHint_0019] +- [0x26, 0x001A, MerlonHint_001A] +- [0x26, 0x001B, MerlonHint_001B] +- [0x26, 0x001C, MerlonHint_001C] +- [0x26, 0x001D, MerlonHint_001D] +- [0x26, 0x001E, MerlonHint_001E] +- [0x26, 0x001F, MerlonHint_001F] +- [0x26, 0x0020, MerlonHint_0020] +- [0x26, 0x0021, MerlonHint_0021] +- [0x26, 0x0022, MerlonHint_0022] +- [0x26, 0x0023, MerlonHint_0023] +- [0x26, 0x0024, MerlonHint_0024] +- [0x26, 0x0025, MerlonHint_0025] +- [0x26, 0x0026, MerlonHint_0026] +- [0x26, 0x0027, MerlonHint_0027] +- [0x26, 0x0028, MerlonHint_0028] +- [0x26, 0x0029, MerlonHint_0029] +- [0x26, 0x002A, MerlonHint_002A] +- [0x26, 0x002B, MerlonHint_002B] +- [0x26, 0x002C, MerlonHint_002C] +- [0x26, 0x002D, MerlonHint_002D] +- [0x26, 0x002E, MerlonHint_002E] +- [0x26, 0x002F, MerlonHint_002F] +- [0x26, 0x0030, MerlonHint_0030] +- [0x26, 0x0031, MerlonHint_0031] +- [0x26, 0x0032, MerlonHint_0032] +- [0x26, 0x0033, MerlonHint_0033] +- [0x26, 0x0034, MerlonHint_0034] +- [0x26, 0x0035, MerlonHint_0035] +- [0x26, 0x0036, MerlonHint_0036] +- [0x26, 0x0037, MerlonHint_0037] +- [0x26, 0x0038, MerlonHint_0038] +- [0x26, 0x0039, MerlonHint_0039] +- [0x26, 0x003A, MerlonHint_003A] +- [0x26, 0x003B, MerlonHint_003B] +- [0x26, 0x003C, MerlonHint_003C] +- [0x26, 0x003D, MerlonHint_003D] +- [0x26, 0x003E, MerlonHint_003E] +- [0x26, 0x003F, MerlonHint_003F] +- [0x26, 0x0040, MerlonHint_0040] +- [0x26, 0x0041, MerlonHint_0041] +- [0x26, 0x0042, MerlonHint_0042] +- [0x26, 0x0043, MerlonHint_0043] +- [0x26, 0x0044, MerlonHint_0044] +- [0x26, 0x0045, MerlonHint_0045] +- [0x26, 0x0046, MerlonHint_0046] +- [0x26, 0x0047, MerlonHint_0047] +- [0x26, 0x0048, MerlonHint_0048] +- [0x26, 0x0049, MerlonHint_0049] +- [0x26, 0x004A, MerlonHint_004A] +- [0x26, 0x004B, MerlonHint_004B] +- [0x26, 0x004C, MerlonHint_004C] +- [0x26, 0x004D, MerlonHint_004D] +- [0x26, 0x004E, MerlonHint_004E] - [0x28, 0x0000, ItemShortDesc_FireFlower] - [0x28, 0x0001, ItemShortDesc_SnowmanDoll] - [0x28, 0x0002, ItemShortDesc_ThunderRage] @@ -869,6 +3110,34 @@ - [0x28, 0x013D, ItemShortDesc_KootAltPhoto] - [0x28, 0x013E, ItemShortDesc_KootPackage] - [0x28, 0x013F, ItemShortDesc_KootRedJar] +- [0x29, 0x0000, ItemShopDesc_FireFlower] +- [0x29, 0x0002, ItemShopDesc_ThunderRage] +- [0x29, 0x0007, ItemShopDesc_StoneCap] +- [0x29, 0x0008, ItemShopDesc_VoltShroom] +- [0x29, 0x000C, ItemShopDesc_Mushroom] +- [0x29, 0x000D, ItemShopDesc_SuperShroom] +- [0x29, 0x0011, ItemShopDesc_TastyTonic] +- [0x29, 0x0019, ItemShopDesc_HoneySyrup] +- [0x29, 0x0029, ItemShopDesc_SleepySheep] +- [0x29, 0x002B, ItemShopDesc_POWBlock] +- [0x29, 0x002E, ItemShopDesc_DizzyDial] +- [0x29, 0x0031, ItemShopDesc_FrightJar] +- [0x29, 0x0065, ItemShopDesc_JumpCharge] +- [0x29, 0x0067, ItemShopDesc_SleepStomp] +- [0x29, 0x0069, ItemShopDesc_Multibounce] +- [0x29, 0x0075, ItemShopDesc_SSmashChg] +- [0x29, 0x0078, ItemShopDesc_SpinSmash] +- [0x29, 0x0079, ItemShopDesc_DDownPound] +- [0x29, 0x007C, ItemShopDesc_MegaQuake] +- [0x29, 0x007E, ItemShopDesc_DoubleDip] +- [0x29, 0x0080, ItemShopDesc_GroupFocus] +- [0x29, 0x0082, ItemShopDesc_HPPlus] +- [0x29, 0x0083, ItemShopDesc_FPPlus] +- [0x29, 0x0086, ItemShopDesc_DamageDodge] +- [0x29, 0x0095, ItemShopDesc_DodgeMaster] +- [0x29, 0x009C, ItemShopDesc_FirstAttack] +- [0x29, 0x00A0, ItemShopDesc_SpeedySpin] +- [0x29, 0x00A8, ItemShopDesc_AllorNothing] - [0x2A, 0x0000, ItemFullDesc_FireFlower] - [0x2A, 0x0001, ItemFullDesc_SnowmanDoll] - [0x2A, 0x0002, ItemFullDesc_ThunderRage] @@ -1525,6 +3794,56 @@ - [0x2C, 0x0053, MoveName_ISpy] - [0x2C, 0x0055, MoveName_HealthyHealthy] - [0x2C, 0x005C, MoveName_32] +- [0x2D, 0x0000, Shop_00_MAC00] +- [0x2D, 0x0001, Shop_01_MAC00] +- [0x2D, 0x0002, Shop_02_MAC00] +- [0x2D, 0x0003, Shop_03_MAC00] +- [0x2D, 0x0004, Shop_04_MAC00] +- [0x2D, 0x0005, Shop_05_MAC00] +- [0x2D, 0x0006, Shop_06_MAC00] +- [0x2D, 0x0007, Shop_07_MAC00] +- [0x2D, 0x0008, Shop_08_MAC00] +- [0x2D, 0x0009, Shop_09_MAC00] +- [0x2D, 0x000A, Shop_0A_MAC00] +- [0x2D, 0x000B, Shop_0B_MAC00] +- [0x2D, 0x000C, Shop_0C_MAC00] +- [0x2D, 0x000D, Shop_0D_MAC00] +- [0x2D, 0x000E, Shop_0E_MAC00] +- [0x2D, 0x000F, Shop_0F_MAC00] +- [0x2D, 0x0010, Shop_10_MAC00] +- [0x2D, 0x0011, Shop_11_MAC00] +- [0x2D, 0x0012, Shop_12_MAC00] +- [0x2D, 0x0013, Shop_13_MAC00] +- [0x2D, 0x0014, Shop_14_MAC00] +- [0x2D, 0x0015, Shop_15_MAC00] +- [0x2D, 0x0016, Shop_16_MAC00] +- [0x2D, 0x0017, Shop_00_MAC01] +- [0x2D, 0x0018, Shop_01_MAC01] +- [0x2D, 0x0019, Shop_03_MAC01] +- [0x2D, 0x001A, Shop_16_MAC01] +- [0x2D, 0x001B, Shop_00_MAC04] +- [0x2D, 0x001C, Shop_01_MAC04] +- [0x2D, 0x001D, Shop_02_MAC04] +- [0x2D, 0x001E, Shop_03_MAC04] +- [0x2D, 0x001F, Shop_04_MAC04] +- [0x2D, 0x0020, Shop_05_MAC04] +- [0x2D, 0x0021, Shop_06_MAC04] +- [0x2D, 0x0022, Shop_07_MAC04] +- [0x2D, 0x0023, Shop_08_MAC04] +- [0x2D, 0x0024, Shop_09_MAC04] +- [0x2D, 0x0025, Shop_0A_MAC04] +- [0x2D, 0x0026, Shop_0B_MAC04] +- [0x2D, 0x0027, Shop_0C_MAC04] +- [0x2D, 0x0028, Shop_0D_MAC04] +- [0x2D, 0x0029, Shop_0E_MAC04] +- [0x2D, 0x002A, Shop_0F_MAC04] +- [0x2D, 0x002B, Shop_10_MAC04] +- [0x2D, 0x002C, Shop_11_MAC04] +- [0x2D, 0x002D, Shop_12_MAC04] +- [0x2D, 0x002E, Shop_13_MAC04] +- [0x2D, 0x002F, Shop_14_MAC04] +- [0x2D, 0x0030, Shop_15_MAC04] +- [0x2D, 0x0031, Shop_16_MAC04] - [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 11fbc1cafd..61ad27d5a1 100644 --- a/ver/jp/splat.yaml +++ b/ver/jp/splat.yaml @@ -7772,430 +7772,1170 @@ segments: ############ ### Maps ### ############ - - type: bin - name: machi + - name: machi + dir: world/area_mac/machi + type: code start: 0x7EECD0 vram: 0x80240000 - - type: bin - name: mac_00 + subsegments: + - [auto, c, settings] + - [auto, c, tables] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, goomba_king] + - [auto, c, npc] + - [auto, c, misstar] + - [auto, c, partner] + - name: mac_00 + dir: world/area_mac/mac_00 + type: code start: 0x7F2640 vram: 0x80240000 - - type: bin - name: mac_01 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, rooms] + - [auto, c, npc] + - [auto, c, shop] + - [auto, c, music_mix] + - [auto, c, demo] + - [auto, c, water_gfx] + - [auto, c, shared_npc] + - [auto, c, intro_npc] + - [auto, c, intro] + - [auto, c, epilogue_npc] + - [auto, c, epilogue] + - name: mac_01 + dir: world/area_mac/mac_01 + type: code start: 0x808370 vram: 0x80240000 - - type: bin - name: mac_02 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, rooms] + - [auto, c, shop] + - [auto, c, crystal_ball_gfx] + - [auto, c, bulletin] + - [auto, c, music_mix] + - [auto, c, npc] + - [auto, c, intro_npc] + - [auto, c, epilogue_npc] + - [auto, c, intro] + - [auto, c, foliage] + - start: 0x810C98 + type: .data + name: npc + subsegments: + - [0x9786E8] + - [0x8138B8, vtx_common, ../../toad_house/blanket] + - [0x814E98, gfx_common, ../../toad_house/blanket] + - [0x815000, rgba16, ../../toad_house/blanket, 16, 32, namespaced] + - [0x815400] + - [0x827468] + - name: mac_02 + dir: world/area_mac/mac_02 + type: code start: 0x82AE80 vram: 0x80240000 - - type: bin - name: mac_03 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, rooms] + - [auto, c, foliage] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, music_mix] + - name: mac_03 + dir: world/area_mac/mac_03 + type: code start: 0x839560 vram: 0x80240000 - - type: bin - name: mac_04 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, train] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, foliage] + - [auto, c, oinks] + - [auto, c, demo] + - name: mac_04 + dir: world/area_mac/mac_04 + type: code start: 0x84AA80 vram: 0x80240000 - - type: bin - name: mac_05 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, rooms] + - [auto, c, foliage] + - [auto, c, shop] + - [auto, c, npc] + - [auto, c, wish_scene] + - [auto, c, entity] + - [auto, c, music_mix] + - name: mac_05 + dir: world/area_mac/mac_05 + type: code start: 0x85A330 vram: 0x80240000 - - type: bin - name: mac_06 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, entity] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, whale] + - [auto, c, rooms] + - [auto, c, club64_sign] + - name: mac_06 + dir: world/area_mac/mac_06 + type: code start: 0x86CF40 vram: 0x80240000 - - type: bin - name: tik_01 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, whale] + - [auto, c, npc] + - name: tik_01 + dir: world/area_tik/tik_01 + type: code start: 0x8718B0 vram: 0x80240000 - - type: bin - name: tik_02 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, drips] + - [auto, c, entity] + - [auto, c, npc] + - name: tik_02 + dir: world/area_tik/tik_02 + type: code start: 0x874B40 vram: 0x80240000 - - type: bin - name: tik_03 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, drips] + - [auto, c, npc] + - name: tik_03 + dir: world/area_tik/tik_03 + type: code start: 0x876F00 vram: 0x80240000 - - type: bin - name: tik_04 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, drips] + - [auto, c, platforms] + - [auto, c, entity] + - [auto, c, demo] + - name: tik_04 + dir: world/area_tik/tik_04 + type: code start: 0x879E30 vram: 0x80240000 - - type: bin - name: tik_05 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, drips] + - [auto, c, platforms] + - [auto, c, npc] + - name: tik_05 + dir: world/area_tik/tik_05 + type: code start: 0x87D1C0 vram: 0x80240000 - - type: bin - name: tik_06 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, drips] + - [auto, c, entity] + - [auto, c, npc] + - name: tik_06 + dir: world/area_tik/tik_06 + type: code start: 0x87F2E0 vram: 0x80240000 - - type: bin - name: tik_07 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, drips] + - [auto, c, entity] + - name: tik_07 + dir: world/area_tik/tik_07 + type: code start: 0x881FE0 vram: 0x80240000 - - type: bin - name: tik_08 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, drips] + - [auto, c, platforms] + - [auto, c, npc] + - name: tik_08 + dir: world/area_tik/tik_08 + type: code start: 0x8871F0 vram: 0x80240000 - - type: bin - name: tik_09 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, drips] + - [auto, c, entity] + - [auto, c, npc] + - name: tik_09 + dir: world/area_tik/tik_09 + type: code start: 0x88A5C0 vram: 0x80240000 - - type: bin - name: tik_10 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, drips] + - [auto, c, entity] + - [auto, c, npc] + - name: tik_10 + dir: world/area_tik/tik_10 + type: code start: 0x88E7C0 vram: 0x80240000 - - type: bin - name: tik_12 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, drips] + - [auto, c, entity] + - name: tik_12 + dir: world/area_tik/tik_12 + type: code start: 0x890FD0 vram: 0x80240000 - - type: bin - name: tik_14 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, drips] + - [auto, c, entity] + - [auto, c, npc] + - name: tik_14 + dir: world/area_tik/tik_14 + type: code start: 0x895A00 vram: 0x80240000 - - type: bin - name: tik_15 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, drips] + - [auto, c, entity] + - name: tik_15 + dir: world/area_tik/tik_15 + type: code start: 0x897FA0 vram: 0x80240000 - - type: bin - name: tik_17 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, drips] + - [auto, c, npc] + - name: tik_17 + dir: world/area_tik/tik_17 + type: code start: 0x89AE20 vram: 0x80240000 - - type: bin - name: tik_18 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, entity] + - [auto, c, main] + - name: tik_18 + dir: world/area_tik/tik_18 + type: code start: 0x89DAE0 vram: 0x80240000 - - type: bin - name: tik_19 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, drips] + - [auto, c, npc] + - [auto, c, entity] + - name: tik_19 + dir: world/area_tik/tik_19 + type: code start: 0x89F9E0 vram: 0x80240000 - - type: bin - name: tik_20 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - name: tik_20 + dir: world/area_tik/tik_20 + type: code start: 0x8A2750 vram: 0x80240000 - - type: bin - name: tik_21 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: tik_21 + dir: world/area_tik/tik_21 + type: code start: 0x8A5BA0 vram: 0x80240000 - - type: bin - name: tik_22 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - name: tik_22 + dir: world/area_tik/tik_22 + type: code start: 0x8A82C0 vram: 0x80240000 - - type: bin - name: tik_23 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - name: tik_23 + dir: world/area_tik/tik_23 + type: code start: 0x8AA7D0 vram: 0x80240000 - - type: bin - name: tik_24 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: tik_24 + dir: world/area_tik/tik_24 + type: code start: 0x8ADE80 vram: 0x80240000 - - type: bin - name: tik_25 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, drips] + - [auto, c, entity] + - [auto, c, npc] + - name: tik_25 + dir: world/area_tik/tik_25 + type: code start: 0x8B0380 vram: 0x80240000 - - type: bin - name: kgr_01 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - name: kgr_01 + dir: world/area_kgr/kgr_01 + type: code start: 0x8B1E10 vram: 0x80240000 - - type: bin - name: kgr_02 + subsegments: + - [auto, c, main] + - [auto, c, wiggle] + - [auto, c, extra] + - name: kgr_02 + dir: world/area_kgr/kgr_02 + type: code start: 0x8B2850 vram: 0x80240000 - - type: bin - name: kmr_00 + subsegments: + - [auto, c, main] + - [auto, c, unused] + - [auto, c, npc] + - [auto, c, extra] + - name: kmr_00 + dir: world/area_kmr/kmr_00 + type: code start: 0x8B4390 vram: 0x80240000 - - type: bin - name: kmr_02 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, revival] + - [auto, c, npc] + - [auto, c, entity] + - name: kmr_02 + dir: world/area_kmr/kmr_02 + type: code start: 0x8B8470 vram: 0x80240000 - - type: bin - name: kmr_03 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, rooms_1] + - [auto, c, entity] + - [auto, c, rooms_2] + - [auto, c, kammy] + - [auto, c, foliage] + - [auto, c, images] + - start: 0x8CFF30 + type: .data + name: images + subsegments: + - [0x8CFF30, ci4, heart_block, 32, 32] + - [0x8D0130, palette, heart_block] + - [0x8D0150] + - name: kmr_03 + dir: world/area_kmr/kmr_03 + type: code start: 0x8D0350 vram: 0x80240000 - - type: bin - name: kmr_04 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, foliage] + - [auto, c, fall_down] + - name: kmr_04 + dir: world/area_kmr/kmr_04 + type: code start: 0x8D2CC0 vram: 0x80240000 - - type: bin - name: kmr_05 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, foliage] + - start: 0x8D48B0 + type: .data + name: foliage + subsegments: + - [0x8D48B0, ci4, hammer_block_message, 48, 48] + - [0x8D4D30, palette, hammer_block_message] + - [0x8D4D50] + - name: kmr_05 + dir: world/area_kmr/kmr_05 + type: code start: 0x8D6430 vram: 0x80240000 - - type: bin - name: kmr_06 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, foliage] + - name: kmr_06 + dir: world/area_kmr/kmr_06 + type: code start: 0x8D98D0 vram: 0x80240000 - - type: bin - name: kmr_07 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, sticker_sign] + - name: kmr_07 + dir: world/area_kmr/kmr_07 + type: code start: 0x8DC180 vram: 0x80240000 - - type: bin - name: kmr_09 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: kmr_09 + dir: world/area_kmr/kmr_09 + type: code start: 0x8DE1C0 vram: 0x80240000 - - type: bin - name: kmr_10 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: kmr_10 + dir: world/area_kmr/kmr_10 + type: code start: 0x8E0890 vram: 0x80240000 - - type: bin - name: kmr_11 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, foliage] + - name: kmr_11 + dir: world/area_kmr/kmr_11 + type: code start: 0x8E24C0 vram: 0x80240000 - - type: bin - name: kmr_12 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, scenes] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, kammy] + - [auto, c, foliage] + - [auto, c, fortress_skeleton] + - [auto, c, fortress_animation] + - [auto, c, bridge_skeleton] + - [auto, c, bridge_animation] + - name: kmr_12 + dir: world/area_kmr/kmr_12 + type: code start: 0x8F3720 vram: 0x80240000 - - type: bin - name: kmr_20 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: kmr_20 + dir: world/area_kmr/kmr_20 + type: code start: 0x8F41E0 vram: 0x80240000 - - type: bin - name: kmr_21 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, rooms] + - [auto, c, documents] + - [auto, c, entity] + - [auto, c, trees] + - [auto, c, bushes] + - [auto, c, bed] + - [auto, c, npc_scenes] + - [auto, c, npc] + - [auto, c, npc_intro] + - [auto, c, npc_epilogue] + - [auto, c, records] + - start: 0x906E80 + type: .data + name: records + subsegments: + - [0x906E80, gfx, records_screen] + - [0x906FF0] + - name: kmr_21 + dir: world/area_kmr/kmr_21 + type: code start: 0x907190 vram: 0x80240000 - - type: bin - name: kmr_22 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - name: kmr_22 + dir: world/area_kmr/kmr_22 + type: code start: 0x907990 vram: 0x80240000 - - type: bin - name: kmr_23 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npc] + - start: 0x908DA0 + type: .data + name: npc + subsegments: + - [0x908DA0] + - [0x909290, ci4, lava_piranha_vine, 64, 32] + - [0x909690, palette, lava_piranha_vine] + - [0x909890, gfx, lava_piranha_vine] + - [0x909970] + - name: kmr_23 + dir: world/area_kmr/kmr_23 + type: code start: 0x90FD50 vram: 0x80240000 - - type: bin - name: kmr_24 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npc] + - start: 0x9113B0 + type: .data + name: npc + subsegments: + - [0x9113B0] + - [0x911418, ia8, window_ul, 8, 8] + - [0x911458, ia8, window_ur, 8, 8] + - [0x911498, ia8, window_ll, 8, 8] + - [0x9114D8, ia8, window_lr, 8, 8] + - [0x911518] + - name: kmr_24 + dir: world/area_kmr/kmr_24 + type: code start: 0x913560 vram: 0x80240000 - - type: bin - name: kmr_30 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - name: kmr_30 + dir: world/area_kmr/kmr_30 + type: code start: 0x9139F0 vram: 0x80240000 - - type: bin - name: iwa_00 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, the_end] + - name: iwa_00 + dir: world/area_iwa/iwa_00 + type: code start: 0x914F60 vram: 0x80240000 - - type: bin - name: iwa_01 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, slide] + - name: iwa_01 + dir: world/area_iwa/iwa_01 + type: code start: 0x917F50 vram: 0x80240000 - - type: bin - name: iwa_02 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, splash] + - [auto, c, npc] + - [auto, c, slide] + - start: 0x91B910 + type: .data + name: splash + subsegments: + - [0x91B910, i8, splash, 32, 32] + - [0x91BD10, vtx, splash] + - [0x91BD50, gfx, splash] + - [0x91BE18] + - name: iwa_02 + dir: world/area_iwa/iwa_02 + type: code start: 0x91E610 vram: 0x80240000 - - type: bin - name: iwa_03 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: iwa_03 + dir: world/area_iwa/iwa_03 + type: code start: 0x9219C0 vram: 0x80240000 - - type: bin - name: iwa_04 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - [auto, c, slide] + - name: iwa_04 + dir: world/area_iwa/iwa_04 + type: code start: 0x9246F0 vram: 0x80240000 - - type: bin - name: iwa_10 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: iwa_10 + dir: world/area_iwa/iwa_10 + type: code start: 0x927380 vram: 0x80240000 - - type: bin - name: iwa_11 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, train] + - [auto, c, entity] + - [auto, c, parakarry] + - [auto, c, new_partner] + - [auto, c, foliage] + - name: iwa_11 + dir: world/area_iwa/iwa_11 + type: code start: 0x92FD70 vram: 0x80240000 - - type: bin - name: sbk_00 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, train] + - [auto, c, scenery] + - [auto, c, npc] + - name: sbk_00 + dir: world/area_sbk/sbk_00 + type: code start: 0x9325F0 vram: 0x80240000 - - type: bin - name: sbk_01 + subsegments: + - [auto, c, settings] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: sbk_01 + dir: world/area_sbk/sbk_01 + type: code start: 0x932E10 vram: 0x80240000 - - type: bin - name: sbk_02 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_02 #TODO + dir: world/area_sbk/sbk_02 + type: code start: 0x933630 vram: 0x80240000 - - type: bin - name: sbk_03 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, ruins] + - [auto, c, npc] + - [auto, c, entity] + - name: sbk_03 + dir: world/area_sbk/sbk_03 + type: code start: 0x938C30 vram: 0x80240000 - - type: bin - name: sbk_04 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_04 + dir: world/area_sbk/sbk_04 + type: code start: 0x939850 vram: 0x80240000 - - type: bin - name: sbk_05 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_05 + dir: world/area_sbk/sbk_05 + type: code start: 0x93A070 vram: 0x80240000 - - type: bin - name: sbk_06 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: sbk_06 + dir: world/area_sbk/sbk_06 + type: code start: 0x93B940 vram: 0x80240000 - - type: bin - name: sbk_10 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - [auto, c, foliage] + - [auto, c, entity] + - name: sbk_10 + dir: world/area_sbk/sbk_10 + type: code start: 0x93D000 vram: 0x80240000 - - type: bin - name: sbk_11 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - name: sbk_11 + dir: world/area_sbk/sbk_11 + type: code start: 0x93D3C0 vram: 0x80240000 - - type: bin - name: sbk_12 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_12 + dir: world/area_sbk/sbk_12 + type: code start: 0x93E0C0 vram: 0x80240000 - - type: bin - name: sbk_13 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_13 + dir: world/area_sbk/sbk_13 + type: code start: 0x93EB60 vram: 0x80240000 - - type: bin - name: sbk_14 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_14 + dir: world/area_sbk/sbk_14 + type: code start: 0x93FA60 vram: 0x80240000 - - type: bin - name: sbk_15 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - name: sbk_15 + dir: world/area_sbk/sbk_15 + type: code start: 0x940050 vram: 0x80240000 - - type: bin - name: sbk_16 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_16 + dir: world/area_sbk/sbk_16 + type: code start: 0x9408F0 vram: 0x80240000 - - type: bin - name: sbk_20 + subsegments: + - [auto, c, main] + - [auto, c, foliage] + - name: sbk_20 + dir: world/area_sbk/sbk_20 + type: code start: 0x941910 vram: 0x80240000 - - type: bin - name: sbk_21 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - [auto, c, npc] + - name: sbk_21 + dir: world/area_sbk/sbk_21 + type: code start: 0x9428E0 vram: 0x80240000 - - type: bin - name: sbk_22 + subsegments: + - [auto, c, main] + - name: sbk_22 + dir: world/area_sbk/sbk_22 + type: code start: 0x942CB0 vram: 0x80240000 - - type: bin - name: sbk_23 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: sbk_23 + dir: world/area_sbk/sbk_23 + type: code start: 0x943AE0 vram: 0x80240000 - - type: bin - name: sbk_24 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - name: sbk_24 + dir: world/area_sbk/sbk_24 + type: code start: 0x943FB0 vram: 0x80240000 - - type: bin - name: sbk_25 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - [auto, c, foliage] + - name: sbk_25 + dir: world/area_sbk/sbk_25 + type: code start: 0x945600 vram: 0x80240000 - - type: bin - name: sbk_26 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - [auto, c, foliage] + - [auto, c, entity] + - name: sbk_26 + dir: world/area_sbk/sbk_26 + type: code start: 0x947050 vram: 0x80240000 - - type: bin - name: sbk_30 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - [auto, c, foliage] + - name: sbk_30 + dir: world/area_sbk/sbk_30 + type: code start: 0x948930 vram: 0x80240000 - - type: bin - name: sbk_31 + subsegments: + - [auto, c, settings] + - [auto, c, music] + - [auto, c, main] + - [auto, c, npc] + - [auto, c, foliage] + - name: sbk_31 + dir: world/area_sbk/sbk_31 + type: code start: 0x94D380 vram: 0x80240000 - - type: bin - name: sbk_32 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_32 + dir: world/area_sbk/sbk_32 + type: code start: 0x94DDE0 vram: 0x80240000 - - type: bin - name: sbk_33 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_33 + dir: world/area_sbk/sbk_33 + type: code start: 0x94ED50 vram: 0x80240000 - - type: bin - name: sbk_34 + subsegments: # unusual organization + - [auto, c, settings] + - [auto, c, entity] + - [auto, c, main] + - name: sbk_34 + dir: world/area_sbk/sbk_34 + type: code start: 0x94F250 vram: 0x80240000 - - type: bin - name: sbk_35 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - [auto, c, foliage] + - name: sbk_35 + dir: world/area_sbk/sbk_35 + type: code start: 0x951A30 vram: 0x80240000 - - type: bin - name: sbk_36 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - [auto, c, foliage] + - name: sbk_36 + dir: world/area_sbk/sbk_36 + type: code start: 0x9531E0 vram: 0x80240000 - - type: bin - name: sbk_40 + subsegments: + - [auto, c, main] + - [auto, c, foliage] + - [auto, c, entity] + - name: sbk_40 + dir: world/area_sbk/sbk_40 + type: code start: 0x954720 vram: 0x80240000 - - type: bin - name: sbk_41 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - [auto, c, entity] + - name: sbk_41 + dir: world/area_sbk/sbk_41 + type: code start: 0x9553C0 vram: 0x80240000 - - type: bin - name: sbk_42 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - name: sbk_42 + dir: world/area_sbk/sbk_42 + type: code start: 0x955890 vram: 0x80240000 - - type: bin - name: sbk_43 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_43 + dir: world/area_sbk/sbk_43 + type: code start: 0x9564F0 vram: 0x80240000 - - type: bin - name: sbk_44 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - name: sbk_44 + dir: world/area_sbk/sbk_44 + type: code start: 0x956920 vram: 0x80240000 - - type: bin - name: sbk_45 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_45 + dir: world/area_sbk/sbk_45 + type: code start: 0x957820 vram: 0x80240000 - - type: bin - name: sbk_46 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - name: sbk_46 + dir: world/area_sbk/sbk_46 + type: code start: 0x957D20 vram: 0x80240000 - - type: bin - name: sbk_50 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - [auto, c, foliage] + - [auto, c, entity] + - name: sbk_50 + dir: world/area_sbk/sbk_50 + type: code start: 0x959990 vram: 0x80240000 - - type: bin - name: sbk_51 + subsegments: + - [auto, c, main] + - name: sbk_51 + dir: world/area_sbk/sbk_51 + type: code start: 0x959CF0 vram: 0x80240000 - - type: bin - name: sbk_52 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_52 + dir: world/area_sbk/sbk_52 + type: code start: 0x95A9F0 vram: 0x80240000 - - type: bin - name: sbk_53 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - name: sbk_53 + dir: world/area_sbk/sbk_53 + type: code start: 0x95AE60 vram: 0x80240000 - - type: bin - name: sbk_54 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_54 + dir: world/area_sbk/sbk_54 + type: code start: 0x95B900 vram: 0x80240000 - - type: bin - name: sbk_55 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - name: sbk_55 + dir: world/area_sbk/sbk_55 + type: code start: 0x95BDD0 vram: 0x80240000 - - type: bin - name: sbk_56 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - [auto, c, foliage] + - [auto, c, entity] + - name: sbk_56 + dir: world/area_sbk/sbk_56 + type: code start: 0x95D340 vram: 0x80240000 - - type: bin - name: sbk_60 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - [auto, c, foliage] + - name: sbk_60 + dir: world/area_sbk/sbk_60 + type: code start: 0x95FD70 vram: 0x80240000 - - type: bin - name: sbk_61 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_61 + dir: world/area_sbk/sbk_61 + type: code start: 0x960310 vram: 0x80240000 - - type: bin - name: sbk_62 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - name: sbk_62 + dir: world/area_sbk/sbk_62 + type: code start: 0x9606D0 vram: 0x80240000 - - type: bin - name: sbk_63 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_63 + dir: world/area_sbk/sbk_63 + type: code start: 0x9610F0 vram: 0x80240000 - - type: bin - name: sbk_64 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - name: sbk_64 + dir: world/area_sbk/sbk_64 + type: code start: 0x961910 vram: 0x80240000 - - type: bin - name: sbk_65 + subsegments: + - [auto, c, main] + - [auto, c, entity] + - name: sbk_65 + dir: world/area_sbk/sbk_65 + type: code start: 0x961CD0 vram: 0x80240000 - - type: bin - name: sbk_66 + subsegments: + - [auto, c, main] + - name: sbk_66 + dir: world/area_sbk/sbk_66 + type: code start: 0x962030 vram: 0x80240000 - - type: bin - name: sbk_99 + subsegments: + - [auto, c, main] + - [auto, c, npc] + - [auto, c, foliage] + - [auto, c, entity] + - name: sbk_99 + dir: world/area_sbk/sbk_99 + type: code start: 0x964230 vram: 0x80240000 + subsegments: + - [auto, c, main] + - [auto, c, entity] - type: bin name: dro_01 start: 0x964580 @@ -9519,9 +10259,12 @@ segments: - [0xE2C040, gfx, ispy_icon] - [0xE2C0B8] - [0xE2C0C0] - - - [ 0xE2C0F0, bin ] - + - type: code + name: model_clear_render_tasks + start: 0xE2C0F0 + vram: 0x802B7E00 + subsegments: + - [auto, c, model_clear_render_tasks] - type: code name: world_action_idle dir: world/action @@ -9648,8 +10391,1166 @@ segments: vram: 0x802B6000 subsegments: - [auto, c, sneaky_parasol] + - type: code + dir: entity/default + start: 0xE343B0 + vram: 0x802BAE00 + subsegments: + - [auto, c, Padlock] + - [auto, c, BoardedFloor] + - [auto, c, BombableRock] + - type: code + dir: entity/jan_iwa + start: 0xE365B0 + vram: 0x802BAE00 + subsegments: + - [auto, c, Plants1] + - [auto, c, Plants2] + - [auto, c, ArrowSign] + - type: code + dir: entity/sbk_omo + start: 0xE385D0 + vram: 0x802BAE00 + subsegments: + - [auto, c, Tweester] + - [auto, c, StarBoxLauncher] + - name: entity_model_Hammer1Block + dir: entity/model + type: code + start: 0xE3A3B0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, Hammer1Block] + - start: 0xE3A3B0 + type: .data + name: Hammer1Block + subsegments: + - [0xE3A3B0, vtx, Hammer1Block] + - [0xE3A630, ci4, Hammer1Block_face, 16, 32] + - [0xE3A730, palette, Hammer1Block_face] + - [0xE3A750] + - name: entity_model_Hammer2Block + dir: entity/model + type: code + start: 0xE3A8B0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, Hammer2Block] + - start: 0xE3A8B0 + type: .data + name: Hammer2Block + subsegments: + - [0xE3A8B0, vtx, Hammer2Block] + - [0xE3AB30, ci4, Hammer2Block_face, 16, 32] + - [0xE3AC30, palette, Hammer2Block_face] + - [0xE3AC50] + - name: entity_model_Hammer3Block + dir: entity/model + type: code + start: 0xE3ADB0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, Hammer3Block] + - start: 0xE3ADB0 + type: .data + name: Hammer3Block + subsegments: + - [0xE3ADB0, vtx, Hammer3Block] + - [0xE3B030, ci4, Hammer3Block_face, 16, 32] + - [0xE3B130, palette, Hammer3Block_face] + - [0xE3B150] + - name: entity_model_ShatteringHammer1Block + dir: entity/model + type: code + start: 0xE3B2A0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, ShatteringHammer1Block] + - start: 0xE3B2A0 + type: .data + name: ShatteringHammer1Block + subsegments: + - [0xE3B2A0, vtx, ShatteringHammer1Block] + - [0xE3C300, ci8, ShatteringHammer1Block_texture, 16, 32] + - [0xE3C500, palette, ShatteringHammer1Block_texture] + - [0xE3C700] + - name: entity_model_ShatteringHammer2Block + dir: entity/model + type: code + start: 0xE3E4F0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, ShatteringHammer2Block] + - start: 0xE3E4F0 + type: .data + name: ShatteringHammer2Block + subsegments: + - [0xE3E4F0, vtx, ShatteringHammer2Block] + - [0xE3F550, rgba16, ShatteringHammer2Block_texture, 16, 32] + - [0xE3F950] + - name: entity_model_ShatteringHammer3Block + dir: entity/model + type: code + start: 0xE41710 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, ShatteringHammer3Block] + - start: 0xE41710 + type: .data + name: ShatteringHammer3Block + subsegments: + - [0xE41710, vtx, ShatteringHammer3Block] + - [0xE42760, ci4, ShatteringHammer3Block_texture, 16, 32] + - [0xE42860, palette, ShatteringHammer3Block_texture] + - [0xE42880] + - name: entity_model_YellowBlock + dir: entity/model + type: code + start: 0xE446F0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, YellowBlock] + - start: 0xE446F0 + type: .data + name: YellowBlock + subsegments: + - [0xE446F0, vtx, YellowBlock] + - [0xE44870, rgba16, YellowBlock_face, 32, 32] + - [0xE45070] + - name: entity_model_RedBlock + dir: entity/model + type: code + start: 0xE451A0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, RedBlock] + - start: 0xE451A0 + type: .data + name: RedBlock + subsegments: + - [0xE451A0, vtx, RedBlock] + - [0xE45320, rgba16, RedBlock_face, 32, 32] + - [0xE45B20] + - name: entity_model_UnusedBlock + dir: entity/model + type: code + start: 0xE45C50 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, UnusedBlock] + - start: 0xE45C50 + type: .data + name: UnusedBlock + subsegments: + - [0xE45C50, vtx, UnusedBlock] + - [0xE46010, rgba16, UnusedBlock_img1, 16, 32] + - [0xE46410] + - [0xE46498, ci4, UnusedBlock_img2, 16, 32] + - [0xE46598, palette, UnusedBlock_img2] + - [0xE465B8] + - name: entity_model_PushBlock + dir: entity/model + type: code + start: 0xE468E0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, PushBlock] + - start: 0xE468E0 + type: .data + name: PushBlock + subsegments: + - [0xE468E0, vtx, PushBlock] + - [0xE46A00, ci4, PushBlock_face, 16, 16] + - [0xE46A80, palette, PushBlock_face] + - [0xE46AA0] + - name: entity_model_BrickBlock + dir: entity/model + type: code + start: 0xE46C30 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, BrickBlock] + - start: 0xE46C30 + type: .data + name: BrickBlock + subsegments: + - [0xE46C30, vtx, BrickBlock] + - [0xE46D70, ci4, BrickBlock_face, 32, 32] + - [0xE46F70, palette, BrickBlock_face] + - [0xE46F90] + - name: entity_model_ShatteringBrickBlock + dir: entity/model + type: code + start: 0xE470E0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, ShatteringBrickBlock] + - start: 0xE470E0 + type: .data + name: ShatteringBrickBlock + subsegments: + - [0xE470E0, vtx, ShatteringBrickBlock] + - [0xE48B80, rgba16, ShatteringBrickBlock_texture, 32, 32] + - [0xE49380] + - name: entity_model_InertYellowBlock + dir: entity/model + type: code + start: 0xE4B0C0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, InertYellowBlock] + - start: 0xE4B0C0 + type: .data + name: InertYellowBlock + subsegments: + - [0xE4B0C0, vtx, InertYellowBlock_1] + - [0xE4B1C0, vtx, InertYellowBlock_2] + - [0xE4B240, ci4, InertYellowBlock_face, 32, 32] + - [0xE4B440, palette, InertYellowBlock_face] + - [0xE4B460] + - name: entity_model_InertRedBlock + dir: entity/model + type: code + start: 0xE4B5C0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, InertRedBlock] + - start: 0xE4B5C0 + type: .data + name: InertRedBlock + subsegments: + - [0xE4B5C0, vtx, InertRedBlock_1] + - [0xE4B6C0, vtx, InertRedBlock_2] + - [0xE4B740, rgba16, InertRedBlock_face, 32, 32] + - [0xE4BF40] + - name: entity_model_HeartBlock + dir: entity/model + type: code + start: 0xE4C070 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, HeartBlock] + - start: 0xE4C070 + type: .data + name: HeartBlock + subsegments: + - [0xE4C070, vtx, HeartBlock] + - [0xE4C430, rgba16, HeartBlock_face, 16, 32] + - [0xE4C830] + - name: entity_model_PowBlock + dir: entity/model + type: code + start: 0xE4C9A0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, PowBlock] + - start: 0xE4C9A0 + type: .data + name: PowBlock + subsegments: + - [0xE4C9A0, vtx, PowBlock] + - [0xE4CAA0, ci8, PowBlock_face, 64, 32] + - [0xE4D2A0, palette, PowBlock_face] + - [0xE4D4A0] + - name: entity_model_SuperBlock + dir: entity/model + type: code + start: 0xE4D680 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, SuperBlock] + - start: 0xE4D680 + type: .data + name: SuperBlock + subsegments: + - [0xE4D680, vtx, SuperBlock] + - [0xE4DB00, ci4, SuperBlock_tex, 16, 32] + - [0xE4DC00, palette, SuperBlock_tex] + - [0xE4DC20] + - name: entity_model_UltraBlock + dir: entity/model + type: code + start: 0xE4DF90 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, UltraBlock] + - start: 0xE4DF90 + type: .data + name: UltraBlock + subsegments: + - [0xE4DF90, vtx, UltraBlock] + - [0xE4E410, ci4, UltraBlock_tex, 16, 32] + - [0xE4E510, palette, UltraBlock_tex] + - [0xE4E530] + - name: entity_model_HitYellowBlock_gfx + dir: entity/model + type: code + start: 0xE4E870 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, HitYellowBlock_gfx] + - start: 0xE4E870 + type: .data + name: HitYellowBlock_gfx + subsegments: + - [0xE4E870, vtx, HitYellowBlock_1] + - [0xE4E9D0, vtx, HitYellowBlock_2] + - [0xE4EB30] + - [0xE4EC90, rgba16, HitYellowBlock_face1, 32, 32] + - [0xE4F490, rgba16, HitYellowBlock_face2, 32, 32] + - name: entity_model_HitYellowBlock_anim + dir: entity/model + type: code + start: 0xE4FC90 + vram: 0x00000000 + subsegments: + - [auto, c, HitYellowBlock_anim] + - name: entity_model_HitFloatingYellowBlock_gfx + dir: entity/model + type: code + start: 0xE4FF30 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, HitFloatingYellowBlock_gfx] + - start: 0xE4FF30 + type: .data + name: HitFloatingYellowBlock_gfx + subsegments: + - [0xE4FF30, vtx, HitFloatingYellowBlock_1] + - [0xE50090, vtx, HitFloatingYellowBlock_2] + - [0xE50210] + - [0xE50370, rgba16, HitFloatingYellowBlock_face1, 32, 32] + - [0xE50B70, rgba16, HitFloatingYellowBlock_face2, 32, 32] + - name: entity_model_HitFloatingYellowBlock_anim + dir: entity/model + type: code + start: 0xE51370 + vram: 0x00000000 + subsegments: + - [auto, c, HitFloatingYellowBlock_anim] + - name: entity_model_HitRedBlock_gfx + dir: entity/model + type: code + start: 0xE51600 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, HitRedBlock_gfx] + - start: 0xE51600 + type: .data + name: HitRedBlock_gfx + subsegments: + - [0xE51600, vtx, HitRedBlock_1] + - [0xE51760, vtx, HitRedBlock_2] + - [0xE518C0] + - [0xE51A60, rgba16, HitRedBlock_face1, 32, 32] + - [0xE52260, rgba16, HitRedBlock_face2, 32, 32] + - name: entity_model_HitRedBlock_anim + dir: entity/model + type: code + start: 0xE52A60 + vram: 0x00000000 + subsegments: + - [auto, c, HitRedBlock_anim] + - name: entity_model_HeartBlockContent + dir: entity/model + type: code + start: 0xE52CC0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, HeartBlockContent] + - start: 0xE52CC0 + type: .data + name: HeartBlockContent + subsegments: + - [0xE52CC0] + #- [0xE52CC0, ci4, HeartBlockContent_img1, 32, 32] + #- [0xE52EC0, ci4, HeartBlockContent_img2, 32, 32] + #- [0xE530C0, ci4, HeartBlockContent_img3, 32, 32] + #- [0xE532C0, palette, HeartBlockContent_pal] # this palette is common for all images above + #- [0xE532E0] + - name: entity_model_SuperBlockContent + dir: entity/model + type: code + start: 0xE53520 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, SuperBlockContent] + - start: 0xE53520 + type: .data + name: SuperBlockContent + subsegments: + - [0xE53520, ci4, SuperBlockContent, 32, 32] + - [0xE53720, palette, SuperBlockContent] + - [0xE53740, palette, SuperBlockContent.pal2] + - [0xE53760, palette, SuperBlockContent.pal3] + - [0xE53780, palette, SuperBlockContent.pal4] + - [0xE537A0] + - name: entity_model_UltraBlockContent + dir: entity/model + type: code + start: 0xE53900 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, UltraBlockContent] + - start: 0xE53900 + type: .data + name: UltraBlockContent + subsegments: + - [0xE53900] + #- [0xE53900, ci4, UltraBlockContent_img1, 32, 32] + #- [0xE53B00, ci4, UltraBlockContent_img2, 32, 32] + #- [0xE53D00, ci4, UltraBlockContent_img3, 32, 32] + #- [0xE53F00, palette, UltraBlockContent_pal] # this palette is common for all images above + #- [0xE53F20] + - name: entity_model_SaveBlock + dir: entity/model + type: code + start: 0xE54160 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, SaveBlock] + - start: 0xE54160 + type: .data + name: SaveBlock + subsegments: + - [0xE54160, vtx, SaveBlock_1] + - [0xE544D0, vtx, SaveBlock_2] + - [0xE54820, vtx, SaveBlock_3] + - [0xE54A60, rgba16, SaveBlock_star, 32, 32] + - [0xE55260] + - [0xE552D0, rgba32, SaveBlock_face, 32, 32] + - [0xE562D0] + - [0xE56348, rgba16, SaveBlock_letterS, 64, 32] + - [0xE57348] + - name: entity_model_BoardedFloor + dir: entity/model + type: code + start: 0xE57670 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, BoardedFloor] + - start: 0xE57670 + type: .data + name: BoardedFloor + subsegments: + - [0xE57670, vtx, BoardedFloor_1] + - [0xE57850, vtx, BoardedFloor_2] + - [0xE57A30, vtx, BoardedFloor_3] + - [0xE57C10, vtx, BoardedFloor_4] + - [0xE57DF0, vtx, BoardedFloor_5] + - [0xE57F70, vtx, BoardedFloor_6] + - [0xE580F0, vtx, BoardedFloor_7] + - [0xE582F0, vtx, BoardedFloor_8] + - [0xE584F0, vtx, BoardedFloor_9] + - [0xE58670, vtx, BoardedFloor_A] + - [0xE587F0, vtx, BoardedFloor_B] + - [0xE588F0, vtx, BoardedFloor_C] + - [0xE58A70, rgba16, BoardedFloor, 64, 32] + - [0xE59A70] + - name: entity_model_WoodenCrate + dir: entity/model + type: code + start: 0xE5A4C0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, WoodenCrate] + - start: 0xE5A4C0 + type: .data + name: WoodenCrate + subsegments: + - [0xE5A4C0, vtx, WoodenCrate] + - [0xE5BA20, ci4, WoodenCrate_img1, 64, 64] + - [0xE5C220, palette, WoodenCrate_img1] + - [0xE5C240] + - [0xE5C2E8, ci4, WoodenCrate_img2, 64, 64] + - [0xE5CAE8, palette, WoodenCrate_img2] + - [0xE5CB08] + - name: entity_model_StarBoxLauncher + dir: entity/model + type: code + start: 0xE5E8C0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, StarBoxLauncher] + - start: 0xE5E8C0 + type: .data + name: StarBoxLauncher + subsegments: + - [0xE5E8C0, vtx, StarBoxLauncher_1] + - [0xE5E9B0, vtx, StarBoxLauncher_2] + - [0xE5EAD0, vtx, StarBoxLauncher_3] + - [0xE5EB10, vtx, StarBoxLauncher_4] + - [0xE5EB50, rgba16, StarBoxLauncher_link, 16, 16] + - [0xE5ED50] + - [0xE5EDC8, ci4, StarBoxLauncher_face, 128, 32] + - [0xE5F5C8, palette, StarBoxLauncher_face] + - [0xE5F5E8] + - [0xE5F690, ci4, StarBoxLauncher_box, 16, 32] + - [0xE5F790, palette, StarBoxLauncher_box] + - [0xE5F7B0] + - name: entity_model_HiddenPanel + dir: entity/model + type: code + start: 0xE5FA20 + vram: 0x0A000000 + subsegments: + - [auto, c, HiddenPanel] + - name: entity_model_Tweester + dir: entity/model + type: code + start: 0xE5FCE0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, Tweester] + - start: 0xE5FCE0 + type: .data + name: Tweester + subsegments: + - [0xE5FCE0, vtx, Tweester_1] + - [0xE600F0, vtx, Tweester_2] + - [0xE60500, vtx, Tweester_3] + - [0xE60540, vtx, Tweester_4] + - [0xE608D0, i8, Tweester_img1, 32, 32] + - [0xE60CD0, i8, Tweester_img2, 32, 32] + - [0xE610D0] + - [0xE61180, ci4, Tweester_img3, 64, 32] + - [0xE61580, palette, Tweester_img3] + - [0xE615A0] + - name: entity_model_BlueWarpPipe + dir: entity/model + type: code + start: 0xE61B50 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, BlueWarpPipe] + - start: 0xE61B50 + type: .data + name: BlueWarpPipe + subsegments: + - [0xE61B50, vtx, BlueWarpPipe_1] + - [0xE61BB0, vtx, BlueWarpPipe_2] + - [0xE61E30, vtx, BlueWarpPipe_3] + - [0xE61E70, ci4, BlueWarpPipe_texBase, 16, 16] + - [0xE61EF0, palette, BlueWarpPipe_texBase] + - [0xE61F10] + - [0xE61FC0, ci4, BlueWarpPipe_texPipe, 32, 16] + - [0xE620C0, palette, BlueWarpPipe_texPipe] + - [0xE620E0] + - name: entity_model_Signpost + dir: entity/model + type: code + start: 0xE62300 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, Signpost] + - start: 0xE62300 + type: .data + name: Signpost + subsegments: + - [0xE62300, vtx, Signpost_1] + - [0xE62420, vtx, Signpost_2] + - [0xE62880, ci4, Signpost, 32, 32] + - [0xE62A80, palette, Signpost] + - [0xE62AA0] + - name: entity_model_ArrowSign + dir: entity/model + type: code + start: 0xE62D80 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, ArrowSign] + - start: 0xE62D80 + type: .data + name: ArrowSign + subsegments: + - [0xE62D80] + - [0xE62E00, ci8, ArrowSign, 64, 32] + - [0xE63600, palette, ArrowSign] + - [0xE63800] + - name: entity_model_Padlock + dir: entity/model + type: code + start: 0xE639D0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, Padlock] + - start: 0xE639D0 + type: .data + name: Padlock + subsegments: + - [0xE639D0, vtx, Padlock_1] + - [0xE63F90, vtx, Padlock_2] + - [0xE63FF0, vtx, Padlock_3] + - [0xE64030, vtx, Padlock_4] + - [0xE640D0, ci8, Padlock_face, 32, 32] + - [0xE644D0, palette, Padlock_face] + - [0xE646D0] + - [0xE64778, ci8, Padlock_keyhole, 32, 64] + - [0xE64F78, palette, Padlock_keyhole] + - [0xE65178] + - [0xE65220, ci8, Padlock_body, 32, 32] + - [0xE65620, palette, Padlock_body] + - [0xE65820] + - name: entity_model_PadlockRedFrame + dir: entity/model + type: code + start: 0xE65C00 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, PadlockRedFrame] + - start: 0xE65C00 + type: .data + name: PadlockRedFrame + subsegments: + - [0xE65C00, vtx, PadlockRedFrame_1] + - [0xE65E00, vtx, PadlockRedFrame_2] + - [0xE65E40, vtx, PadlockRedFrame_3] + - [0xE65E80, vtx, PadlockRedFrame_4] + - [0xE66140, ci8, PadlockRedFrame_keyhole, 32, 64] + - [0xE66940, palette, PadlockRedFrame_keyhole] + - [0xE66B40] + - [0xE66BE8, ci8, PadlockRedFrame_face, 32, 32] + - [0xE66FE8, palette, PadlockRedFrame_face] + - [0xE671E8] + - name: entity_model_PadlockRedFace + dir: entity/model + type: code + start: 0xE675B0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, PadlockRedFace] + - start: 0xE675B0 + type: .data + name: PadlockRedFace + subsegments: + - [0xE675B0, vtx, PadlockRedFace_1] + - [0xE67B70, vtx, PadlockRedFace_2] + - [0xE67BD0, vtx, PadlockRedFace_3] + - [0xE67C10, vtx, PadlockRedFace_4] + - [0xE67CB0, i4, PadlockRedFace_face, 32, 32] + - [0xE67EB0] + - [0xE67F28, ci8, PadlockRedFace_keyhole, 32, 64] + - [0xE68728, palette, PadlockRedFace_keyhole] + - [0xE68928] + - [0xE689D0, ci8, PadlockRedFace_body, 32, 32] + - [0xE68DD0, palette, PadlockRedFace_body] + - [0xE68FD0] + - name: entity_model_PadlockBlueFace + dir: entity/model + type: code + start: 0xE693D0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, PadlockBlueFace] + - start: 0xE693D0 + type: .data + name: PadlockBlueFace + subsegments: + - [0xE693D0, vtx, PadlockBlueFace_1] + - [0xE69990, vtx, PadlockBlueFace_2] + - [0xE699F0, vtx, PadlockBlueFace_3] + - [0xE69A30, vtx, PadlockBlueFace_4] + - [0xE69AD0, i4, PadlockBlueFace_face, 32, 32] + - [0xE69CD0] + - [0xE69D48, ci8, PadlockBlueFace_keyhole, 32, 64] + - [0xE6A548, palette, PadlockBlueFace_keyhole] + - [0xE6A748] + - [0xE6A7F0, ci8, PadlockBlueFace_body, 32, 32] + - [0xE6ABF0, palette, PadlockBlueFace_body] + - [0xE6ADF0] + - name: entity_model_GreenStompSwitch + dir: entity/model + type: code + start: 0xE6B1F0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, GreenStompSwitch] + - start: 0xE6B1F0 + type: .data + name: GreenStompSwitch + subsegments: + - [0xE6B1F0, vtx, GreenStompSwitch_1] + - [0xE6B270, vtx, GreenStompSwitch_2] + - [0xE6B470, ci4, GreenStompSwitch_tex, 16, 16] + - [0xE6B4F0, palette, GreenStompSwitch_tex] + - [0xE6B510] + - [0xE6B5C8, ci4, GreenStompSwitch_exclamationMark, 16, 32] + - [0xE6B6C8, palette, GreenStompSwitch_exclamationMark] + - [0xE6B6E8] + - name: entity_model_RedSwitch + dir: entity/model + type: code + start: 0xE6B940 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, RedSwitch] + - start: 0xE6B940 + type: .data + name: RedSwitch + subsegments: + - [0xE6B940, vtx, RedSwitch_1] + - [0xE6BCD0, vtx, RedSwitch_2] + - [0xE6BD10, vtx, RedSwitch_3] + - [0xE6BF10, ci8, RedSwitch_tex, 16, 16] + - [0xE6C010, palette, RedSwitch_tex] + - [0xE6C210] + - [0xE6C2B8, ia4, RedSwitch_exclamationMark, 16, 32] + - [0xE6C3B8] + - name: entity_model_BlueSwitch + dir: entity/model + type: code + start: 0xE6C840 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, BlueSwitch] + - start: 0xE6C840 + type: .data + name: BlueSwitch + subsegments: + - [0xE6C840, vtx, BlueSwitch_1] + - [0xE6CB40, vtx, BlueSwitch_2] + - [0xE6CBD0, vtx, BlueSwitch_3] + - [0xE6CC10, vtx, BlueSwitch_4] + - [0xE6CE10, ci8, BlueSwitch_tex, 16, 16] + - [0xE6CF10, palette, BlueSwitch_tex] + - [0xE6D110] + - [0xE6D1B8, ia4, BlueSwitch_exclamationMark, 16, 32] + - [0xE6D2B8] + - name: entity_model_Chest + dir: entity/model + type: code + start: 0xE6D750 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, Chest] + - start: 0xE6D750 + type: .data + name: Chest + subsegments: + - [0xE6D750, vtx, Chest_1] + - [0xE6D8E0, vtx, Chest_2] + - [0xE6D960, vtx, Chest_3] + - [0xE6DAE0, vtx, Chest_4] + - [0xE6DB60, rgba16, Chest_tex1, 16, 32] + - [0xE6DF60] + - [0xE6DFE8, ci4, Chest_tex2, 16, 32] + - [0xE6E0E8, palette, Chest_tex2] + - [0xE6E108] + - [0xE6E1C0, ci4, Chest_lock, 16, 32] + - [0xE6E2C0, palette, Chest_lock] + - [0xE6E2E0] + - name: entity_model_ScriptSpring_gfx + dir: entity/model + type: code + start: 0xE6E620 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, ScriptSpring_gfx] + - start: 0xE6E620 + type: .data + name: ScriptSpring_gfx + subsegments: + - [0xE6E620, vtx, ScriptSpring_1] + - [0xE6E8A0, vtx, ScriptSpring_2] + - [0xE6E920, vtx, ScriptSpring_3] + - [0xE6E9A0, vtx, ScriptSpring_4] + - [0xE6EA20, vtx, ScriptSpring_5] + - [0xE6ECA0, vtx, ScriptSpring_6] + - [0xE6EE00, vtx, ScriptSpring_7] + - [0xE6EE80, ci8, ScriptSpring_tex1, 16, 16] + - [0xE6EF80, palette, ScriptSpring_tex1] + - [0xE6F180] + - [0xE6F228, ci8, ScriptSpring_tex2, 16, 16] + - [0xE6F328, palette, ScriptSpring_tex2] + - [0xE6F528] + - [0xE6F5D0, ci8, ScriptSpring_star, 32, 32] + - [0xE6F9D0, palette, ScriptSpring_star] + - [0xE6FBD0] + - name: entity_model_ScriptSpring_anim + dir: entity/model + type: code + start: 0xE6FFA0 + vram: 0x00000000 + subsegments: + - [auto, c, ScriptSpring_anim] + - name: entity_model_SimpleSpring_gfx + dir: entity/model + type: code + start: 0xE71400 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, SimpleSpring_gfx] + - start: 0xE71400 + type: .data + name: SimpleSpring_gfx + subsegments: + - [0xE71400, vtx, SimpleSpring_1] + - [0xE71680, vtx, SimpleSpring_2] + - [0xE71700, vtx, SimpleSpring_3] + - [0xE71780, vtx, SimpleSpring_4] + - [0xE71A00, vtx, SimpleSpring_5] + - [0xE71B60, vtx, SimpleSpring_6] + - [0xE71BE0, ci8, SimpleSpring_tex1, 16, 16] + - [0xE71CE0, palette, SimpleSpring_tex1] + - [0xE71EE0] + - [0xE71F88, rgba16, SimpleSpring_tex2, 16, 16] + - [0xE72188] + - [0xE72200, ci8, SimpleSpring_star, 32, 32] + - [0xE72600, palette, SimpleSpring_star] + - [0xE72800] + - name: entity_model_SimpleSpring_anim + dir: entity/model + type: code + start: 0xE72BD0 + vram: 0x00000000 + subsegments: + - [auto, c, SimpleSpring_anim] + - name: entity_model_BellbellPlant_gfx + dir: entity/model + type: code + start: 0xE74030 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, BellbellPlant_gfx] + - start: 0xE74030 + type: .data + name: BellbellPlant_gfx + subsegments: + - [0xE74030, vtx, BellbellPlant_1] + - [0xE743C0, vtx, BellbellPlant_2] + - [0xE74670, vtx, BellbellPlant_3] + - [0xE74750, vtx, BellbellPlant_4] + - [0xE74A40, vtx, BellbellPlant_5] + - [0xE74B20] + - [0xE750C0, rgba16, BellbellPlant, 16, 16] + - name: entity_model_BellbellPlant_anim + dir: entity/model + type: code + start: 0xE752C0 + vram: 0x00000000 + subsegments: + - [auto, c, BellbellPlant_anim] + - name: entity_model_TrumpetPlant_gfx + dir: entity/model + type: code + start: 0xE76210 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, TrumpetPlant_gfx] + - start: 0xE76210 + type: .data + name: TrumpetPlant_gfx + subsegments: + - [0xE76210, vtx, TrumpetPlant_1] + - [0xE76450, vtx, TrumpetPlant_2] + - [0xE76BC0] + - [0xE76F50, rgba16, TrumpetPlant, 16, 16] + - name: entity_model_TrumpetPlant_anim + dir: entity/model + type: code + start: 0xE77150 + vram: 0x00000000 + subsegments: + - [auto, c, TrumpetPlant_anim] + - name: entity_model_MunchlesiaReset_gfx + dir: entity/model + type: code + start: 0xE774E0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, MunchlesiaReset_gfx] + - start: 0xE774E0 + type: .data + name: MunchlesiaReset_gfx + subsegments: + - [0xE774E0, vtx, MunchlesiaReset] + - [0xE78DD0] + - [0xE7D3C8, rgba16, MunchlesiaReset, 16, 16] + - name: entity_model_MunchlesiaReset_anim + dir: entity/model + type: code + start: 0xE7D5D0 + vram: 0x00000000 + subsegments: + - [auto, c, MunchlesiaReset_anim] + - name: entity_model_MunchlesiaGrab_gfx + dir: entity/model + type: code + start: 0xE7DA50 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, MunchlesiaGrab_gfx] + - start: 0xE7DA50 + type: .data + name: MunchlesiaGrab_gfx + subsegments: + - [0xE7DA50, vtx, MunchlesiaGrab] + - [0xE7F340] + - [0xE83938, rgba16, MunchlesiaGrab, 16, 16] + - name: entity_model_MunchlesiaGrab_anim + dir: entity/model + type: code + start: 0xE83B40 + vram: 0x00000000 + subsegments: + - [auto, c, MunchlesiaGrab_anim] + - name: entity_model_MunchlesiaEnvelop_gfx + dir: entity/model + type: code + start: 0xE83F60 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, MunchlesiaEnvelop_gfx] + - start: 0xE83F60 + type: .data + name: MunchlesiaEnvelop_gfx + subsegments: + - [0xE83F60, vtx, MunchlesiaEnvelop] + - [0xE85850] + - [0xE89E48, rgba16, MunchlesiaEnvelop, 16, 16] + - name: entity_model_MunchlesiaEnvelop_anim + dir: entity/model + type: code + start: 0xE8A050 + vram: 0x00000000 + subsegments: + - [auto, c, MunchlesiaEnvelop_anim] + - name: entity_model_MunchlesiaBeginChew_gfx + dir: entity/model + type: code + start: 0xE8A470 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, MunchlesiaBeginChew_gfx] + - start: 0xE8A470 + type: .data + name: MunchlesiaBeginChew_gfx + subsegments: + - [0xE8A470, vtx, MunchlesiaBeginChew] + - [0xE8BD60] + - [0xE90CB0, rgba16, MunchlesiaBeginChew, 16, 16] + - name: entity_model_MunchlesiaBeginChew_anim + dir: entity/model + type: code + start: 0xE90EB0 + vram: 0x00000000 + subsegments: + - [auto, c, MunchlesiaBeginChew_anim] + - name: entity_model_MunchlesiaChewing_gfx + dir: entity/model + type: code + start: 0xE91320 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, MunchlesiaChewing_gfx] + - start: 0xE91320 + type: .data + name: MunchlesiaChewing_gfx + subsegments: + - [0xE91320, vtx, MunchlesiaChewing] + - [0xE92C10] + - [0xE93090, rgba16, MunchlesiaChewing, 16, 16] + - name: entity_model_MunchlesiaChewing_anim + dir: entity/model + type: code + start: 0xE93290 + vram: 0x00000000 + subsegments: + - [auto, c, MunchlesiaChewing_anim] + - name: entity_model_MunchlesiaSpitOut_gfx + dir: entity/model + type: code + start: 0xE93860 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, MunchlesiaSpitOut_gfx] + - start: 0xE93860 + type: .data + name: MunchlesiaSpitOut_gfx + subsegments: + - [0xE93860, vtx, MunchlesiaSpitOut] + - [0xE95150] + - [0xE9A0A0, rgba16, MunchlesiaSpitOut, 16, 16] + - name: entity_model_MunchlesiaSpitOut_anim + dir: entity/model + type: code + start: 0xE9A2A0 + vram: 0x00000000 + subsegments: + - [auto, c, MunchlesiaSpitOut_anim] + - name: entity_model_MunchlesiaReset1_gfx + dir: entity/model + type: code + start: 0xE9A710 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, MunchlesiaReset1_gfx] + - start: 0xE9A710 + type: .data + name: MunchlesiaReset1_gfx + subsegments: + - [0xE9A710, vtx, MunchlesiaReset1] + - [0xE9C000] + - [0xEA0F50, rgba16, MunchlesiaReset1, 16, 16] + - name: entity_model_MunchlesiaReset1_anim + dir: entity/model + type: code + start: 0xEA1150 + vram: 0x00000000 + subsegments: + - [auto, c, MunchlesiaReset1_anim] + - name: entity_model_CymbalPlant_anim + dir: entity/model + type: code + start: 0xEA15C0 + vram: 0x00000000 + subsegments: + - [auto, c, CymbalPlant_anim] + - name: entity_model_CymbalPlant_gfx + dir: entity/model + type: code + start: 0xEA2170 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, CymbalPlant_gfx] + - start: 0xEA2170 + type: .data + name: CymbalPlant_gfx + subsegments: + - [0xEA2170, ci4, CymbalPlant, 64, 64] + - [0xEA2970, palette, CymbalPlant] + - [0xEA2990] + - [0xEA2A38, vtx, CymbalPlant_1] + - [0xEA2AD8, vtx, CymbalPlant_2] + - [0xEA2B38, vtx, CymbalPlant_3] + - [0xEA2BD8, vtx, CymbalPlant_4] + - [0xEA2D28, vtx, CymbalPlant_5] + - [0xEA2E98, vtx, CymbalPlant_6] + - [0xEA2F28, vtx, CymbalPlant_7] + - [0xEA3098, vtx, CymbalPlant_8] + - [0xEA31E8] + - name: entity_model_PinkFlower_anim + dir: entity/model + type: code + start: 0xEA3810 + vram: 0x00000000 + subsegments: + - [auto, c, PinkFlower_anim] + - name: entity_model_PinkFlower_gfx + dir: entity/model + type: code + start: 0xEA4380 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, PinkFlower_gfx] + - start: 0xEA4380 + type: .data + name: PinkFlower_gfx + subsegments: + - [0xEA4380, vtx, PinkFlower_1] + - [0xEA43C0, vtx, PinkFlower_2] + - [0xEA4610, vtx, PinkFlower_3] + - [0xEA4730, vtx, PinkFlower_4] + - [0xEA4830, vtx, PinkFlower_5] + - [0xEA4930, ia16, PinkFlower_light, 16, 16] + - [0xEA4B30] + - [0xEA4BA0, rgba16, PinkFlower_tex, 16, 64] + - [0xEA53A0] + - name: entity_model_SpinningFlower + dir: entity/model + type: code + start: 0xEA5780 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, SpinningFlower] + - start: 0xEA5780 + type: .data + name: SpinningFlower + subsegments: + - [0xEA5780, vtx, SpinningFlower_1] + - [0xEA57D0, vtx, SpinningFlower_2] + - [0xEA5820, vtx, SpinningFlower_3] + - [0xEA58A0, vtx, SpinningFlower_4] + - [0xEA5900, ia4, SpinningFlower_img1, 16, 32] + - [0xEA5A00] + - [0xEA5A78, rgba16, SpinningFlower_petal, 32, 32] + - [0xEA6278] + - name: entity_model_BombableRock + dir: entity/model + type: code + start: 0xEA64D0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, BombableRock] + - start: 0xEA64D0 + type: .data + name: BombableRock + subsegments: + - [0xEA64D0, vtx, BombableRock_1] + - [0xEA6850, vtx, BombableRock_2] + - [0xEA6970, vtx, BombableRock_3] + - [0xEA6AD0, vtx, BombableRock_4] + - [0xEA6BF0, vtx, BombableRock_5] + - [0xEA6D10, ci4, BombableRock, 64, 64] + - [0xEA7510, palette, BombableRock] + - [0xEA7530] - - [ 0xE343B0, bin ] + - [ 0xEA7B50, bin ] - start: 0xFC0000 type: pm_sbn diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index d244c2a780..3e28c31e3d 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -4733,6 +4733,18 @@ D_802ACD10_7B46B0 = 0x802AC5D0; // rom:0x7BC040 D_802ACD60_7B4700 = 0x802AC620; // rom:0x7BC090 D_802ADE30_7B57D0 = 0x802AD6F0; // rom:0x7BD160 +mac_01_toad_house_blanket_vtx = 0x8024B548; // segment:mac_01 rom:0x8138B8 size:0x15E0 +mac_01_toad_house_blanket_gfx = 0x8024CB28; // segment:mac_01 rom:0x814E98 +mac_01_toad_house_blanket_img = 0x8024CC90; // segment:mac_01 rom:0x815000 +kmr_02_heart_block_img = 0x80257AC0; // rom:0x8CFF30 +kmr_04_hammer_block_message_img = 0x80241BF0; // rom:0x8D48B0 +kmr_20_records_screen_gfx = 0x80252CA0; // rom:0x906E80 +D_80241900 = 0x80241900; // rom:0x909290 +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 + inspect_icon_img = 0x802B7A20; // rom:0xE299C0 inspect_icon_gfx = 0x802B7C40; // rom:0xE29BE0 speech_bubble_img = 0x802B7710; // rom:0xE2A450 @@ -4741,3 +4753,137 @@ pulse_stone_icon_img = 0x802B7640; // rom:0xE2AD40 pulse_stone_icon_gfx = 0x802B7CA0; // rom:0xE2B3A0 ispy_icon_img = 0x802B7580; // rom:0xE2B9C0 ispy_icon_gfx = 0x802B7C00; // rom:0xE2C040 + +D_0A000000_E31530 = 0x0A000000; // rom:0xE3A3B0 +D_0A000000_E31A30 = 0x0A000000; // rom:0xE3A8B0 +D_0A000000_E31F30 = 0x0A000000; // rom:0xE3ADB0 +D_0A000000_E32420 = 0x0A000000; // rom:0xE3B2A0 +D_0A000000_E35670 = 0x0A000000; // rom:0xE3E4F0 +D_0A000000_E38890 = 0x0A000000; // rom:0xE41710 +D_0A000000_E3B870 = 0x0A000000; // rom:0xE446F0 +D_0A000000_E3C320 = 0x0A000000; // rom:0xE451A0 +D_0A000000_E3CDD0 = 0x0A000000; // rom:0xE45C50 +D_0A000000_E3DA60 = 0x0A000000; // rom:0xE468E0 +D_0A000000_E3DDB0 = 0x0A000000; // rom:0xE46C30 +D_0A000000_E3E260 = 0x0A000000; // rom:0xE470E0 +D_0A000000_E42240 = 0x0A000000; // rom:0xE4B0C0 +D_0A000100_E42340 = 0x0A000100; // rom:0xE4B1C0 +D_0A000000_E42740 = 0x0A000000; // rom:0xE4B5C0 +D_0A000100_E42840 = 0x0A000100; // rom:0xE4B6C0 +D_0A000000_E431F0 = 0x0A000000; // rom:0xE4C070 +D_0A000000_E43B20 = 0x0A000000; // rom:0xE4C9A0 +D_0A000000_E44800 = 0x0A000000; // rom:0xE4D680 +D_0A000000_E45110 = 0x0A000000; // rom:0xE4DF90 +D_0A000000_E459F0 = 0x0A000000; // rom:0xE4E870 +D_0A000160_E45B50 = 0x0A000160; // rom:0xE4E9D0 +D_0A000000_E470B0 = 0x0A000000; // rom:0xE4FF30 +D_0A000160_E47210 = 0x0A000160; // rom:0xE50090 +D_0A000000_E48780 = 0x0A000000; // rom:0xE51600 +D_0A000160_E488E0 = 0x0A000160; // rom:0xE51760 +D_0A000000_E4B2E0 = 0x0A000000; // rom:0xE54160 +D_0A000370_E4B650 = 0x0A000370; // rom:0xE544D0 +D_0A0006C0_E4B9A0 = 0x0A0006C0; // rom:0xE54820 +D_0A000000_E4E7F0 = 0x0A000000; // rom:0xE57670 +D_0A0001E0_E4E9D0 = 0x0A0001E0; // rom:0xE57850 +D_0A0003C0_E4EBB0 = 0x0A0003C0; // rom:0xE57A30 +D_0A0005A0_E4ED90 = 0x0A0005A0; // rom:0xE57C10 +D_0A000780_E4EF70 = 0x0A000780; // rom:0xE57DF0 +D_0A000900_E4F0F0 = 0x0A000900; // rom:0xE57F70 +D_0A000A80_E4F270 = 0x0A000A80; // rom:0xE580F0 +D_0A000C80_E4F470 = 0x0A000C80; // rom:0xE582F0 +D_0A000E80_E4F670 = 0x0A000E80; // rom:0xE584F0 +D_0A001000_E4F7F0 = 0x0A001000; // rom:0xE58670 +D_0A001180_E4F970 = 0x0A001180; // rom:0xE587F0 +D_0A001280_E4FA70 = 0x0A001280; // rom:0xE588F0 +D_0A000000_E51640 = 0x0A000000; // rom:0xE5A4C0 +D_0A000000_E55A40 = 0x0A000000; // rom:0xE5E8C0 +D_0A0000F0_E55B30 = 0x0A0000F0; // rom:0xE5E9B0 +D_0A000210_E55C50 = 0x0A000210; // rom:0xE5EAD0 +D_0A000250_E55C90 = 0x0A000250; // rom:0xE5EB10 +D_0A000000_E56E60 = 0x0A000000; // rom:0xE5FCE0 +D_0A000410_E57270 = 0x0A000410; // rom:0xE600F0 +D_0A000820_E57680 = 0x0A000820; // rom:0xE60500 +D_0A000860_E576C0 = 0x0A000860; // rom:0xE60540 +D_0A000000_E58CD0 = 0x0A000000; // rom:0xE61B50 +D_0A000060_E58D30 = 0x0A000060; // rom:0xE61BB0 +D_0A0002E0_E58FB0 = 0x0A0002E0; // rom:0xE61E30 +D_0A000000_E59480 = 0x0A000000; // rom:0xE62300 +D_0A000120_E595A0 = 0x0A000120; // rom:0xE62420 +D_0A000000_E5AB50 = 0x0A000000; // rom:0xE639D0 +D_0A0005C0_E5B110 = 0x0A0005C0; // rom:0xE63F90 +D_0A000620_E5B170 = 0x0A000620; // rom:0xE63FF0 +D_0A000660_E5B1B0 = 0x0A000660; // rom:0xE64030 +D_0A000000_E5CD80 = 0x0A000000; // rom:0xE65C00 +D_0A000200_E5CF80 = 0x0A000200; // rom:0xE65E00 +D_0A000240_E5CFC0 = 0x0A000240; // rom:0xE65E40 +D_0A000280_E5D000 = 0x0A000280; // rom:0xE65E80 +D_0A000000_E5E730 = 0x0A000000; // rom:0xE675B0 +D_0A0005C0_E5ECF0 = 0x0A0005C0; // rom:0xE67B70 +D_0A000620_E5ED50 = 0x0A000620; // rom:0xE67BD0 +D_0A000660_E5ED90 = 0x0A000660; // rom:0xE67C10 +D_0A000000_E60550 = 0x0A000000; // rom:0xE693D0 +D_0A0005C0_E60B10 = 0x0A0005C0; // rom:0xE69990 +D_0A000620_E60B70 = 0x0A000620; // rom:0xE699F0 +D_0A000660_E60BB0 = 0x0A000660; // rom:0xE69A30 +D_0A000000_E62370 = 0x0A000000; // rom:0xE6B1F0 +D_0A000080_E623F0 = 0x0A000080; // rom:0xE6B270 +D_0A000000_E62AC0 = 0x0A000000; // rom:0xE6B940 +D_0A000390_E62E50 = 0x0A000390; // rom:0xE6BCD0 +D_0A0003D0_E62E90 = 0x0A0003D0; // rom:0xE6BD10 +D_0A000000_E639C0 = 0x0A000000; // rom:0xE6C840 +D_0A000300_E63CC0 = 0x0A000300; // rom:0xE6CB40 +D_0A000390_E63D50 = 0x0A000390; // rom:0xE6CBD0 +D_0A0003D0_E63D90 = 0x0A0003D0; // rom:0xE6CC10 +D_0A000000_E648D0 = 0x0A000000; // rom:0xE6D750 +D_0A000190_E64A60 = 0x0A000190; // rom:0xE6D8E0 +D_0A000210_E64AE0 = 0x0A000210; // rom:0xE6D960 +D_0A000390_E64C60 = 0x0A000390; // rom:0xE6DAE0 +D_0A000000_E657A0 = 0x0A000000; // rom:0xE6E620 +D_0A000280_E65A20 = 0x0A000280; // rom:0xE6E8A0 +D_0A000300_E65AA0 = 0x0A000300; // rom:0xE6E920 +D_0A000380_E65B20 = 0x0A000380; // rom:0xE6E9A0 +D_0A000400_E65BA0 = 0x0A000400; // rom:0xE6EA20 +D_0A000680_E65E20 = 0x0A000680; // rom:0xE6ECA0 +D_0A0007E0_E65F80 = 0x0A0007E0; // rom:0xE6EE00 +D_0A000000_E68580 = 0x0A000000; // rom:0xE71400 +D_0A000280_E68800 = 0x0A000280; // rom:0xE71680 +D_0A000300_E68880 = 0x0A000300; // rom:0xE71700 +D_0A000380_E68900 = 0x0A000380; // rom:0xE71780 +D_0A000600_E68B80 = 0x0A000600; // rom:0xE71A00 +D_0A000760_E68CE0 = 0x0A000760; // rom:0xE71B60 +D_0A000000_E6B1B0 = 0x0A000000; // rom:0xE74030 +D_0A000390_E6B540 = 0x0A000390; // rom:0xE743C0 +D_0A000640_E6B7F0 = 0x0A000640; // rom:0xE74670 +D_0A000720_E6B8D0 = 0x0A000720; // rom:0xE74750 +D_0A000A10_E6BBC0 = 0x0A000A10; // rom:0xE74A40 +D_0A000000_E6D390 = 0x0A000000; // rom:0xE76210 +D_0A000240_E6D5D0 = 0x0A000240; // rom:0xE76450 +D_0A000000_E884A0 = 0x0A000000; // rom:0xE91320 +D_0A0008C8_E99BB8 = 0x0A0008C8; // rom:0xEA2A38 +D_0A000968_E99C58 = 0x0A000968; // rom:0xEA2AD8 +D_0A0009C8_E99CB8 = 0x0A0009C8; // rom:0xEA2B38 +D_0A000A68_E99D58 = 0x0A000A68; // rom:0xEA2BD8 +D_0A000BB8_E99EA8 = 0x0A000BB8; // rom:0xEA2D28 +D_0A000D28_E9A018 = 0x0A000D28; // rom:0xEA2E98 +D_0A000DB8_E9A0A8 = 0x0A000DB8; // rom:0xEA2F28 +D_0A000F28_E9A218 = 0x0A000F28; // rom:0xEA3098 +D_0A000000_E9B500 = 0x0A000000; // rom:0xEA4380 +D_0A000040_E9B540 = 0x0A000040; // rom:0xEA43C0 +D_0A000290_E9B790 = 0x0A000290; // rom:0xEA4610 +D_0A0003B0_E9B8B0 = 0x0A0003B0; // rom:0xEA4730 +D_0A0004B0_E9B9B0 = 0x0A0004B0; // rom:0xEA4830 +D_0A000000_E9C900 = 0x0A000000; // rom:0xEA5780 +D_0A000050_E9C950 = 0x0A000050; // rom:0xEA57D0 +D_0A0000A0_E9C9A0 = 0x0A0000A0; // rom:0xEA5820 +D_0A000120_E9CA20 = 0x0A000120; // rom:0xEA58A0 +D_0A000000_E9D650 = 0x0A000000; // rom:0xEA64D0 +D_0A000380_E9D9D0 = 0x0A000380; // rom:0xEA6850 +D_0A0004A0_E9DAF0 = 0x0A0004A0; // rom:0xEA6970 +D_0A000600_E9DC50 = 0x0A000600; // rom:0xEA6AD0 +D_0A000720_E9DD70 = 0x0A000720; // rom:0xEA6BF0 +D_0A000000_E6E660 = 0x0A000000; // rom:0xE774E0 +D_0A000000_E74BD0 = 0x0A000000; // rom:0xE7DA50 +D_0A000000_E7B0E0 = 0x0A000000; // rom:0xE83F60 +D_0A000000_E815F0 = 0x0A000000; // rom:0xE8A470 +D_0A000000_E8A9E0 = 0x0A000000; // rom:0xE93860 +D_0A000000_E91890 = 0x0A000000; // rom:0xE9A710 diff --git a/ver/jp/undefined_syms.txt b/ver/jp/undefined_syms.txt index 47a125364a..754ce6b5e0 100644 --- a/ver/jp/undefined_syms.txt +++ b/ver/jp/undefined_syms.txt @@ -75,118 +75,6 @@ gFrameBuf1 = 0x803B5000; heap_battleHead = 0x803DA800; gFrameBuf2 = 0x803DA800; -machi_settings = 0x802407A0; // segment:machi -mac_00_settings = 0x80243BE0; // segment:mac_00 -mac_01_settings = 0x80246730; // segment:mac_01 -mac_02_settings = 0x80243580; // segment:mac_02 -mac_03_settings = 0x802428B0; // segment:mac_03 -mac_04_settings = 0x80242080; // segment:mac_04 -mac_04_map_init = 0x80240000; // segment:mac_04 -mac_05_settings = 0x802441C0; // segment:mac_05 -mac_06_settings = 0x802416A0; // segment:mac_06 -tik_01_settings = 0x80240AE0; // segment:tik_01 -tik_02_settings = 0x802409B0; // segment:tik_02 -tik_03_settings = 0x80240B00; // segment:tik_03 -tik_04_settings = 0x80240CB0; // segment:tik_04 -tik_05_settings = 0x80240A90; // segment:tik_05 -tik_06_settings = 0x802409A0; // segment:tik_06 -tik_07_settings = 0x80242920; // segment:tik_07 -tik_08_settings = 0x80240B10; // segment:tik_08 -tik_09_settings = 0x802412D0; // segment:tik_09 -tik_10_settings = 0x802413D0; // segment:tik_10 -tik_12_settings = 0x80242260; // segment:tik_12 -tik_14_settings = 0x80240980; // segment:tik_14 -tik_15_settings = 0x80240B30; // segment:tik_15 -tik_17_settings = 0x80241380; // segment:tik_17 -tik_18_settings = 0x802406D0; // segment:tik_18 -tik_19_settings = 0x80241340; // segment:tik_19 -tik_20_settings = 0x80241170; // segment:tik_20 -tik_21_settings = 0x80240990; // segment:tik_21 -tik_22_settings = 0x802409D0; // segment:tik_22 -tik_23_settings = 0x80241160; // segment:tik_23 -tik_24_settings = 0x80240ED0; // segment:tik_24 -tik_24_map_init = 0x80240000; // segment:tik_24 -tik_25_settings = 0x802407D0; // segment:tik_25 -kgr_01_settings = 0x80240540; // segment:kgr_01 -kgr_02_settings = 0x80240790; // segment:kgr_02 -kmr_00_settings = 0x80240D80; // segment:kmr_00 -kmr_02_settings = 0x80243AF0; // segment:kmr_02 -kmr_03_settings = 0x80240680; // segment:kmr_03 -kmr_04_settings = 0x80240520; // segment:kmr_04 -kmr_05_settings = 0x802417A0; // segment:kmr_05 -kmr_06_settings = 0x80241DC0; // segment:kmr_06 -kmr_07_settings = 0x80240B70; // segment:kmr_07 -kmr_09_settings = 0x80241550; // segment:kmr_09 -kmr_10_settings = 0x80240640; // segment:kmr_10 -kmr_11_settings = 0x80241180; // segment:kmr_11 -kmr_12_settings = 0x80240050; // segment:kmr_12 -kmr_20_settings = 0x80242B50; // segment:kmr_20 -kmr_21_settings = 0x80240300; // segment:kmr_21 -kmr_21_map_init = 0x80240000; // segment:kmr_21 -kmr_22_settings = 0x80240DA0; // segment:kmr_22 -kmr_22_map_init = 0x80240000; // segment:kmr_22 -kmr_23_settings = 0x80241150; // segment:kmr_23 -kmr_23_map_init = 0x80240000; // segment:kmr_23 -kmr_24_settings = 0x80240120; // segment:kmr_24 -kmr_24_map_init = 0x80240000; // segment:kmr_24 -kmr_30_settings = 0x802404F0; // segment:kmr_30 -iwa_00_settings = 0x802404B0; // segment:iwa_00 -iwa_01_settings = 0x80243320; // segment:iwa_01 -iwa_02_settings = 0x802412E0; // segment:iwa_02 -iwa_03_settings = 0x80241360; // segment:iwa_03 -iwa_04_settings = 0x80241100; // segment:iwa_04 -iwa_10_settings = 0x802419B0; // segment:iwa_10 -iwa_11_settings = 0x80240330; // segment:iwa_11 -sbk_00_settings = 0x802400A0; // segment:sbk_00 -sbk_01_settings = 0x802400A0; // segment:sbk_01 -sbk_02_settings = 0x80240C80; // segment:sbk_02 -sbk_03_settings = 0x802400A0; // segment:sbk_03 -sbk_04_settings = 0x802400A0; // segment:sbk_04 -sbk_05_settings = 0x802400B0; // segment:sbk_05 -sbk_06_settings = 0x802403C0; // segment:sbk_06 -sbk_10_settings = 0x80240080; // segment:sbk_10 -sbk_11_settings = 0x802401A0; // segment:sbk_11 -sbk_12_settings = 0x802400A0; // segment:sbk_12 -sbk_13_settings = 0x802401A0; // segment:sbk_13 -sbk_14_settings = 0x80240090; // segment:sbk_14 -sbk_15_settings = 0x802400A0; // segment:sbk_15 -sbk_16_settings = 0x802402C0; // segment:sbk_16 -sbk_20_settings = 0x80240180; // segment:sbk_20 -sbk_21_settings = 0x80240080; // segment:sbk_21 -sbk_22_settings = 0x802401A0; // segment:sbk_22 -sbk_23_settings = 0x80240080; // segment:sbk_23 -sbk_24_settings = 0x802403D0; // segment:sbk_24 -sbk_25_settings = 0x802403C0; // segment:sbk_25 -sbk_26_settings = 0x802403E0; // segment:sbk_26 -sbk_30_settings = 0x80241870; // segment:sbk_30 -sbk_31_settings = 0x80240180; // segment:sbk_31 -sbk_32_settings = 0x802401B0; // segment:sbk_32 -sbk_33_settings = 0x80240080; // segment:sbk_33 -sbk_34_settings = 0x80240A20; // segment:sbk_34 -sbk_35_settings = 0x802403C0; // segment:sbk_35 -sbk_36_settings = 0x802402C0; // segment:sbk_36 -sbk_40_settings = 0x80240180; // segment:sbk_40 -sbk_41_settings = 0x80240080; // segment:sbk_41 -sbk_42_settings = 0x80240180; // segment:sbk_42 -sbk_43_settings = 0x80240080; // segment:sbk_43 -sbk_44_settings = 0x802401A0; // segment:sbk_44 -sbk_45_settings = 0x80240090; // segment:sbk_45 -sbk_46_settings = 0x802403E0; // segment:sbk_46 -sbk_50_settings = 0x80240080; // segment:sbk_50 -sbk_51_settings = 0x802401A0; // segment:sbk_51 -sbk_52_settings = 0x80240080; // segment:sbk_52 -sbk_53_settings = 0x802400A0; // segment:sbk_53 -sbk_54_settings = 0x80240080; // segment:sbk_54 -sbk_55_settings = 0x802402E0; // segment:sbk_55 -sbk_56_settings = 0x80241040; // segment:sbk_56 -sbk_60_settings = 0x802400A0; // segment:sbk_60 -sbk_61_settings = 0x80240080; // segment:sbk_61 -sbk_62_settings = 0x802400A0; // segment:sbk_62 -sbk_63_settings = 0x802400A0; // segment:sbk_63 -sbk_64_settings = 0x80240080; // segment:sbk_64 -sbk_65_settings = 0x80240080; // segment:sbk_65 -sbk_66_settings = 0x802403C0; // segment:sbk_66 -sbk_99_settings = 0x80240020; // segment:sbk_99 dro_01_settings = 0x80243B70; // segment:dro_01 dro_02_settings = 0x80243AB0; // segment:dro_02 isk_01_settings = 0x80240020; // segment:isk_01 @@ -558,186 +446,8 @@ mgm_03_settings = 0x80240010; // segment:mgm_03 gv_01_settings = 0x802407D0; // segment:gv_01 heap_spriteHead = 0x8034F800; -Entity_UltraBlockContent_Render = 0x0A000800; -entity_model_SimpleSpring_gfx_ROM_END = 0x00E72BD0; -Entity_SaveBlock_RenderNone = 0x0A003508; -entity_model_BlueSwitch_ROM_END = 0x00E6D750; -Entity_HitYellowBlock_Mesh = 0x00000084; -entity_model_Hammer3Block_ROM_END = 0x00E3B2A0; -entity_model_SimpleSpring_anim_ROM_END = 0x00E74030; -Entity_SuperBlockContent_Render2 = 0x0A000380; -Entity_Chest_RenderBox = 0x0A000EB8; -Entity_InertYellowBlock_Render = 0x0A0004E0; -entity_model_HitYellowBlock_gfx_ROM_END = 0x00E4FC90; -Entity_SaveBlock_RenderBlock = 0x0A0034F0; -entity_model_UltraBlockContent_ROM_END = 0x00E54160; -Entity_HitFloatingYellowBlock_AnimationIdle = 0x0000022C; -entity_model_PowBlock_ROM_START = 0x00E4C9A0; -entity_model_ShatteringHammer1Block_ROM_END = 0x00E3E4F0; -Entity_Signpost_Render = 0x0A000A68; -entity_model_BlueWarpPipe_ROM_END = 0x00E62300; -entity_model_Hammer1Block_ROM_START = 0x00E3A3B0; -entity_model_HitRedBlock_anim_ROM_END = 0x00E52CC0; -D_0A000240_E4A8E0 = 0x0A000240; -entity_model_WoodenCrate_ROM_START = 0x00E5A4C0; -entity_model_Hammer2Block_ROM_END = 0x00E3ADB0; -Entity_HeartBlock_Render = 0x0A000918; -Entity_Hammer2Block_Render = 0x0A0004F0; -Entity_HitRedBlock_AnimationHit = 0x00000094; -Entity_BrickBlock_Render = 0x0A0004A0; -Entity_SuperBlockContent_Render = 0x0A000328; -entity_model_SuperBlockContent_ROM_START = 0x00E53520; -entity_model_InertRedBlock_ROM_START = 0x00E4B5C0; -entity_model_SuperBlockContent_ROM_END = 0x00E53900; -entity_model_Hammer3Block_ROM_START = 0x00E3ADB0; -Entity_ScriptSpring_AnimLaunch = 0x000001E4; -entity_model_Chest_ROM_START = 0x00E6D750; -Entity_GreenStompSwitch_Render = 0x0A000740; -entity_model_HiddenPanel_ROM_END = 0x00E5FCE0; -entity_model_ShatteringBrickBlock_ROM_END = 0x00E4B0C0; -Entity_Chest_LidMtx = 0x0A000C48; -Entity_HeartBlockContent_RenderHeartHappy = 0x0A000808; -entity_model_GreenStompSwitch_ROM_END = 0x00E6B940; -Entity_HeartBlockContent_RenderHeartSleeping = 0x0A000700; -entity_model_RedBlock_ROM_END = 0x00E45C50; -Entity_SaveBlock_RenderContent = 0x0A0034E0; -Entity_HeartBlockContent_RenderHeartAwake = 0x0A0007B0; -D_0A000220_E4A8C0 = 0x0A000220; -entity_model_PowBlock_ROM_END = 0x00E4D680; -entity_model_ShatteringBrickBlock_ROM_START = 0x00E470E0; -Entity_HitYellowBlock_AnimationHit = 0x00000094; -entity_model_YellowBlock_ROM_END = 0x00E451A0; -entity_model_HitFloatingYellowBlock_anim_ROM_START = 0x00E51370; -Entity_PushBlock_Render = 0x0A000338; -entity_model_ScriptSpring_gfx_ROM_START = 0x00E6E620; -Entity_InertRedBlock_Render = 0x0A000A90; -entity_model_ShatteringHammer3Block_ROM_START = 0x00E41710; -Entity_Hammer3Block_Render = 0x0A0004E0; -entity_model_Chest_ROM_END = 0x00E6E620; -entity_model_RedBlock_ROM_START = 0x00E451A0; -entity_model_BrickBlock_ROM_START = 0x00E46C30; -entity_model_HitFloatingYellowBlock_anim_ROM_END = 0x00E51600; -entity_model_InertYellowBlock_ROM_END = 0x00E4B5C0; -Entity_WoodenCrate_Render = 0x0A004338; -entity_model_ShatteringHammer3Block_ROM_END = 0x00E446F0; -entity_model_HitYellowBlock_anim_ROM_START = 0x00E4FC90; -entity_model_HitRedBlock_gfx_ROM_END = 0x00E52A60; -entity_model_UltraBlock_ROM_START = 0x00E4DF90; -entity_model_BrickBlock_ROM_END = 0x00E470E0; -entity_model_HeartBlockContent_ROM_END = 0x00E53520; -Entity_SuperBlock_Render = 0x0A0008F8; -Gfx_HiddenPanel_Render = 0x0A000280; -entity_model_HitRedBlock_anim_ROM_START = 0x00E52A60; -Entity_ShatteringHammer1Block_FragmentsMatrices = 0x0A001508; -entity_model_HeartBlock_ROM_START = 0x00E4C070; -Entity_ShatteringHammer3Block_FragmentsRender = 0x0A002F78; -Entity_UltraBlockContent_Render2 = 0x0A000750; -Entity_Chest_RenderLid = 0x0A000DC0; -Entity_WoodenCrate_FragmentsMatrices = 0x0A0026F0; -Entity_SimpleSpring_Mesh = 0x000001B8; -entity_model_ShatteringHammer2Block_ROM_END = 0x00E41710; -entity_model_SaveBlock_ROM_END = 0x00E57670; -entity_model_GreenStompSwitch_ROM_START = 0x00E6B1F0; -entity_model_ShatteringHammer1Block_ROM_START = 0x00E3B2A0; -Gfx_AltHiddenPanel_RenderTop = 0x0A0001B0; -entity_model_SimpleSpring_anim_ROM_START = 0x00E72BD0; -entity_model_Hammer2Block_ROM_START = 0x00E3A8B0; -entity_model_PushBlock_ROM_END = 0x00E46C30; -entity_model_InertRedBlock_ROM_END = 0x00E4C070; -Entity_BlueSwitch_Render = 0x0A000EF8; -entity_model_PushBlock_ROM_START = 0x00E468E0; -entity_model_BlueSwitch_ROM_START = 0x00E6C840; -Entity_RedBlock_Render = 0x0A000A90; -Entity_RedSwitch_Render = 0x0A000EE8; -entity_model_HitFloatingYellowBlock_gfx_ROM_END = 0x00E51370; -entity_model_HitYellowBlock_anim_ROM_END = 0x00E4FF30; -entity_model_HitRedBlock_gfx_ROM_START = 0x00E51600; -entity_model_HitFloatingYellowBlock_gfx_ROM_START = 0x00E4FF30; -Entity_BlueWarpPipe_RenderBase = 0x0A000680; -entity_model_ScriptSpring_anim_ROM_END = 0x00E71400; -Entity_ShatteringHammer2Block_FragmentsRender = 0x0A0031B0; -entity_model_HeartBlock_ROM_END = 0x00E4C9A0; -Gfx_HiddenPanel_Render2 = 0x0A0002A0; -entity_model_Hammer1Block_ROM_END = 0x00E3A8B0; -entity_model_Signpost_ROM_END = 0x00E62D80; -entity_model_SuperBlock_ROM_END = 0x00E4DF90; -entity_model_ScriptSpring_gfx_ROM_END = 0x00E6FFA0; -entity_model_Signpost_ROM_START = 0x00E62300; -entity_model_UltraBlockContent_ROM_START = 0x00E53900; -entity_model_InertYellowBlock_ROM_START = 0x00E4B0C0; -Entity_ShatteringBrickBlock_FragmentsRender = 0x0A003F70; -entity_model_SuperBlock_ROM_START = 0x00E4D680; -Entity_PowBlock_Render = 0x0A000CC8; -Entity_ShatteringBrickBlock_FragmentsMatrices = 0x0A002318; -Entity_Hammer1Block_Render = 0x0A0004F0; -entity_model_UltraBlock_ROM_END = 0x00E4E870; -entity_model_YellowBlock_ROM_START = 0x00E446F0; -Gfx_HiddenPanel_RenderHole = 0x0A000230; -entity_model_HeartBlockContent_ROM_START = 0x00E52CC0; -D_0A000260_E4A900 = 0x0A000260; -Entity_ScriptSpring_AnimIdle = 0x0000131C; -entity_model_BlueWarpPipe_ROM_START = 0x00E61B50; -Entity_HitRedBlock_Mesh = 0x00000084; -Entity_BlueWarpPipe_RenderPipe = 0x0A0006B8; -Entity_SimpleSpring_AnimLaunch = 0x000001E4; -Entity_YellowBlock_Render = 0x0A000A90; -entity_model_WoodenCrate_ROM_END = 0x00E5E8C0; -entity_model_HitYellowBlock_gfx_ROM_START = 0x00E4E870; -Entity_ShatteringHammer3Block_FragmentsMatrices = 0x0A001218; -Entity_ShatteringHammer1Block_FragmentsRender = 0x0A0031E0; -Gfx_HiddenPanel_RenderTop = 0x0A000180; -entity_model_ScriptSpring_anim_ROM_START = 0x00E6FFA0; -entity_model_HiddenPanel_ROM_START = 0x00E5FA20; -Entity_UltraBlock_Render = 0x0A0008C8; -Entity_HitFloatingYellowBlock_Mesh = 0x00000084; -entity_model_RedSwitch_ROM_END = 0x00E6C840; -Entity_ShatteringHammer2Block_FragmentsMatrices = 0x0A0014D8; -Entity_HitYellowBlock_AnimationIdle = 0x0000023C; -Entity_ScriptSpring_Mesh = 0x000001B8; -Entity_SimpleSpring_AnimIdle = 0x0000131C; -Entity_SaveBlock_Mtx = 0x0A003260; -D_0A000200_E4A8A0 = 0x0A000200; -entity_model_RedSwitch_ROM_START = 0x00E6B940; -entity_model_SimpleSpring_gfx_ROM_START = 0x00E71400; -Entity_WoodenCrate_FragmentsRender = 0x0A004350; -entity_model_ShatteringHammer2Block_ROM_START = 0x00E3E4F0; -entity_model_SaveBlock_ROM_START = 0x00E54160; -entity_default_ROM_START = 0x00E343B0; BattleEntityHeapBottom = 0x801A7000; -entity_jan_iwa_ROM_START = 0x00E365B0; -entity_sbk_omo_ROM_END = 0x00E3A3B0; -ClearRenderTaskLists = 0x802B7E00; -entity_default_ROM_END = 0x00E365B0; -entity_sbk_omo_ROM_START = 0x00E385D0; -TextureHeap = 0x8028E000; -entity_jan_iwa_ROM_END = 0x00E385D0; -flip_card_1_header = 0x000C0490; -horizontal_pipe_curl_header = 0x0001E830; -shock_header = 0x00014358; -tutankoopa_swirl_2_header = 0x000A1820; -flutter_down_header = 0x000314E0; -tutankoopa_swirl_1_header = 0x000ACDE8; -unused_1_header = 0x0005B7A8; -tutankoopa_gather_header = 0x00096258; -imgfx_data_ROM_START = 0x00253C00; -vertical_pipe_curl_header = 0x0001A858; -flip_card_2_header = 0x000C49B8; -flip_card_3_header = 0x000C6150; -shuffle_cards_header = 0x000BBF68; -unfurl_header = 0x00033498; -spirit_capture_header = 0x00039228; -unused_2_header = 0x0007CF10; -unused_3_header = 0x00086490; -cymbal_crush_header = 0x000CA380; -startle_header = 0x00029458; -get_in_bed_header = 0x00038988; -shiver_header = 0x00018200; - -// entity/jan_iwa -FlowerGoalPositionY = 0x802BCE30; -FlowerGoalPositionZ = 0x802BCE32; -FlowerGoalPositionX = 0x802BCE34; // btl states btl_state_update_player_menu = 0x802A5908;