mirror of
https://github.com/pmret/papermario.git
synced 2024-11-08 12:02:30 +01:00
[JP] Entities and World Areas (mac, tik, kgr, kmr, iwa, sbk)
This commit is contained in:
mrshigure
parent
efd86abeac
commit
d26ea9aa75
@ -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
|
||||
|
||||
359
src/recipes_jp.yaml
Normal file
359
src/recipes_jp.yaml
Normal file
@ -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 ]
|
||||
@ -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;
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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
|
||||
};
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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))
|
||||
|
||||
@ -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),
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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 },
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)) {
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
60
src/world/common/todo/UnkScriptJP00.inc.c
Normal file
60
src/world/common/todo/UnkScriptJP00.inc.c
Normal file
@ -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
|
||||
};
|
||||
@ -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(
|
||||
[
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
2333
ver/jp/splat.yaml
2333
ver/jp/splat.yaml
File diff suppressed because it is too large
Load Diff
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user