mirror
/
banjo-kazooie
mirror of https://github.com/n64decomp/banjo-kazooie
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Redo of BGS and world dialog documentation

This commit is contained in:
SuperZambezi 2025-11-02 00:35:59 +00:00 committed by Moses Troyer
parent c25491f68a
commit bbf940a0df
67 changed files with 526 additions and 461 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

261
include/enums.h
View File

@ -3018,7 +3018,7 @@ enum asset_e
ASSET_2AA_ANIM_BAT_DIE,
ASSET_2AB_ANIM_TEEHEE_DIE,
// 2d1 Grey House Brick (Upon Smashing MM Huts)
ASSET_2D2_MODEL_ORANGE = 0x2d2, //projectile
ASSET_2D2_MODEL_ORANGE = 0x2d2, //projectile
// 2d3 MM Conga Tree
// 2d4 (Shadow?)
// 2d5 FP Blue Present
@ -4229,20 +4229,25 @@ enum asset_e
ASSET_A0C_DIALOG_BLUBBER_HALF_GOLD,
ASSET_A0D_DIALOG_BLUBBER_COMPLETE,
ASSET_A0E_DIALOG_NIPPER_SPAWNED,
ASSET_A10_DIALOG_TTC_NIPPER_HURT = 0xa10,
ASSET_A14_DIALOG_CLAM_TAUNT = 0xA14,
ASSET_A15_DIALOG_TTC_LOCKUP_SPAWNED,
ASSET_A17_DIALOG_BURIED_TREASURE_SPAWNED = 0xA17,
ASSET_A0F_DIALOG_NIPPER_HIT_BY_EGG,
ASSET_A10_DIALOG_NIPPER_HURT,
ASSET_A11_DIALOG_NIPPER_ATTACK,
ASSET_A12_DIALOG_BLACK_SNIPPET_SPAWNED,
ASSET_A13_DIALOG_BLACK_SNIPPET_DEFEATED,
ASSET_A14_DIALOG_CLAM_TAUNT,
ASSET_A15_DIALOG_LOCKUP_SPAWNED,
ASSET_A16_DIALOG_LOCKUP_GRUNTY_RESPONSE,
ASSET_A17_DIALOG_BURIED_TREASURE_SPAWNED,
ASSET_A18_DIALOG_TREASUREHUNT_FOLLOW_CLUES,
ASSET_A19_DIALOG_TREASUREHUNT_SECOND_STEP,
ASSET_A1A_DIALOG_LEAKY_FIRST_MEET,
ASSET_A1B_DIALOG_SNACKER_SPAWNED_1,
ASSET_A1C_DIALOG_SNACKER_SPAWNED_2,
ASSET_A1D_DIALOG_SNACKER_SPAWNED_3,
ASSET_A1E_DIALOG_SNACKER_SPAWNED_4,
ASSET_A1F_DIALOG_SHOCKJUMP_LEARN = VER_SELECT(0xa1f, 0x91f, 0, 0),
ASSET_A20_DIALOG_FLY_LEARN,
ASSET_A21_DIALOG_BLUBBER_TREASURE_MEET,
ASSET_A21_DIALOG_BLUBBER_MEET,
ASSET_A22_DIALOG_FLY_REFRESHER,
ASSET_A23_DIALOG_SHOCKJUMP_REFRESHER,
ASSET_A24_DIALOG_JUMP_PAD_DISCOVERED,
@ -4250,11 +4255,11 @@ enum asset_e
ASSET_A26_DIALOG_NEED_RED_FEATHERS_TO_FLY,
ASSET_A27_DIALOG_BOTTLES_ALL_TTC_MOVES_LEARNED,
ASSET_A28_DIALOG_LEAKY_DONE,
ASSET_A29_DIALOG_SNACKER_BITE,
ASSET_A2A_DIALOG_BLUBBER_COMPLETE_JIGGY_COLLECTED,
ASSET_A2A_BLUBBER_COMPLETE_JIGGY_COLLECTED = 0xA2A,
ASSET_A6F_DIALOG_CHARMER_MEET = 0xA6F,
ASSET_A70_DIALOG_CHARMER_HELPED,
ASSET_A6F_DIALOG_RUBEE_MEET = 0xA6F,
ASSET_A70_DIALOG_RUBEE_HELPED,
ASSET_A71_DIALOG_TRUNKER_MEET,
ASSET_A72_DIALOG_TRUNKER_HELPED,
ASSET_A73_DIALOG_GOBI_MEET,
@ -4269,38 +4274,41 @@ enum asset_e
ASSET_A7C_DIALOG_JINXY_ONE_EGG,
ASSET_A7D_DIALOG_JINXY_HELPED,
ASSET_A7E_DIALOG_SAND_EELS_MEET,
ASSET_A7F_DIALOG_ANICIENT_ONES_MEET,
ASSET_A80_DIALOG_ANICIENT_ONES_DONE,
ASSET_A7F_DIALOG_ANCIENT_ONES_MEET,
ASSET_A80_DIALOG_ANCIENT_ONES_DONE,
ASSET_A81_DIALOG_SANDYBUTT_ENTER,
ASSET_A82_DIALOG_SANDYBUTT_START_MAZE,
ASSET_A83_DIALOG_SANDYBUTT_DONE,
ASSET_A84_DIALOG_TURBOTRAINERS_LEARN,
ASSET_A85_DIALOG_TURBOTRAINERS_REFRESHER,
ASSET_A86_DIALOG_BOTTLES_ALL_GV_MOVES_LEARNED, // unused? 0xC2A is used for both FP and GV
ASSET_A87_DIALOG_BOTTLES_ALL_MOVES_LEARNED, // not sure how this works with ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED
ASSET_A88_DIALOG_GRUNTY_WATER_PYRAMID_DOOR_MISS,
ASSET_A88_DIALOG_GRUNTY_GV_MISS_TRAPDOOR = 0xA88,
ASSET_AD3_DIALOG_UNKNOWN = 0xad3,
ASSET_AD4_DIALOG_UNKNOWN,
ASSET_AD5_DIALOG_UNKNOWN,
ASSET_AD6_DIALOG_UNKNOWN,
ASSET_ADA_DIALOG_UNKNOWN = 0xada,
ASSET_ADB_DIALOG_UNKNOWN,
ASSET_ADC_DIALOG_UNKNOWN,
ASSET_ADD_DIALOG_UNKNOWN,
ASSET_AD3_DIALOG_MOTZAND_MEET = 0xAD3,
ASSET_AD4_DIALOG_MOTZAND_HALFWAY,
ASSET_AD5_DIALOG_MOTZAND_COMPLETE,
ASSET_AD6_DIALOG_MOTZAND_RETRY,
ASSET_AD7_DIALOG_NAPPER_AWAKE,
ASSET_AD8_DIALOG_NAPPER_HIT,
ASSET_AD9_DIALOG_NAPPER_COMPLETE,
ASSET_ADA_DIALOG_TUMBLAR_MEET,
ASSET_ADB_DIALOG_TUMBLAR_COMPLETE,
ASSET_ADC_DIALOG_GRUNTY_ENTER_SHED,
ASSET_ADD_DIALOG_MOTZAND_MISS,
ASSET_ADE_DIALOG_LOGGO_AS_BEAR,
ASSET_ADF_DIALOG_ENTER_LOGGO,
ASSET_AE0_DIALOG_EXIT_LOGGO,
ASSET_AE1_DIALOG_GRUNTY_MMM_THORNS,
ASSET_AE2_DIALOG_GRUNTY_MMM_MISS_CHRUCH_DOOR,
ASSET_AE1_DIALOG_GRUNTY_HEDGE_THORNS,
ASSET_AE2_DIALOG_GRUNTY_CHURCH_DOOR_MISS,
ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE = 0xb37,
ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE = 0xB37,
ASSET_B38_DIALOG_CONGA_DEFEAT,
ASSET_B39_DIALOG_CONGA_HIT_BY_EGG,
ASSET_B3A_DIALOG_CONGA_HITS_PLAYER,
ASSET_B3B_DIALOG_CONGA_ORANGE_PAD_JIGGY,
ASSET_B3C_DIALOG_CONGA_MEET,
ASSET_B3D_DIALOG_CONGA_DONT_TOUCH_BLOCKS,
ASSET_B3D_DIALOG_CONGA_TOUCH_PAD,
ASSET_B3E_DIALOG_CONGA_MEET_AS_TERMITE = VER_SELECT(0xb3e, 0x95c, 0, 0),
ASSET_B3F_DIALOG_CHIMPY_MEET,
ASSET_B40_DIALOG_CHIMPY_COMPLETE,
@ -4309,59 +4317,74 @@ enum asset_e
ASSET_B43_DIALOG_TERMITE_MEET_AS_BEAR,
ASSET_B44_DIALOG_JUJU_MEET,
ASSET_B45_DIALOG_JIGGY_COLLECT_10,
ASSET_B46_DIALOG_COLLECT_ORANGE,
ASSET_B46_DIALOG_CONGA_COLLECT_ORANGE,
ASSET_B47_DIALOG_EGGS_LEARN,
ASSET_B48_DIALOG_BEAKBUSTER_LEARN,
ASSET_B49_DIALOG_TALON_TROT_LEARN,
ASSET_B4A_DIALOG_TALON_TROT_REFRESHER,
ASSET_B4B_DIALOG_EGGS_REFRESHER,
ASSET_B4C_DIALOG_BEAKBUSTER_REFRESHER,
ASSET_B4D_DIALOG_BOTTLES_SLIPPERY,
ASSET_B4D_DIALOG_BOTTLES_MM_SLIP_ON_HILL,
ASSET_B4E_DIALOG_BOTTLES_ALL_MM_MOVES_LEARNED,
ASSET_B50_DIALOG_BOTTLES_UNUSED_UNKNOWN_ITEM_COLLECT = 0xB50,
ASSET_B4F_DIALOG_BOTTLES_EGG_CARRY, // unused
ASSET_B50_DIALOG_BOTTLES_BACKPACK_STORE, // unused
ASSET_B51_DIALOG_BOTTLES_HOW_TO_EXIT_LEVEL,
ASSET_B9F_DIALOG_UNKNOWN = 0xb9f,
ASSET_BA0_DIALOG_GRUNTY_RBB_RED_HOT_OVENS = 0xBA0,
ASSET_BA1_DIALOG_GRUNTY_RBB_WATER_SWIM = 0xBA1,
ASSET_BA2_DIALOG_GRUNTY_RBB_WATER_DIVE = 0xBA2,
ASSET_BA3_DIALOG_GRUNTY_RBB_OILY_SCUM_UNUSED = 0xBA3,
ASSET_B9B_DIALOG_SNORKEL_MEET = 0xB9B,
ASSET_B9C_DIALOG_SNORKEL_COMPLETE,
ASSET_B9D_DIALOG_GRUNTY_PROPELLER_MISS,
ASSET_B9E_DIALOG_BOSS_BOOM_BOX_MEET,
ASSET_B9F_DIALOG_BOSS_BOOM_BOX_COMPLETE,
ASSET_BA0_DIALOG_GRUNTY_TOUCH_OVEN,
ASSET_BA1_DIALOG_GRUNTY_TOUCH_OILY_WATER,
ASSET_BA2_DIALOG_GRUNTY_DIVE_OILY_WATER,
ASSET_BA3_DIALOG_GRUNTY_TOUCH_OILY_WATER_2, // unused
ASSET_BFF_DIALOG_UNKNOWN = 0xbff,
ASSET_C01_DIALOG_UNKNOWN = 0xc01,
ASSET_C02_DIALOG_UNKNOWN,
ASSET_C05_DIALOG_UNKNOWN = 0xc05,
ASSET_C08_DIALOG_UNKNOWN = 0xc08,
ASSET_C09_DIALOG_UNKNOWN,
ASSET_C0A_DIALOG_UNKNOWN,
ASSET_C11_DIALOG_FREEZING_WATER = 0xC11,
ASSET_C15_DIALOG_TWINKLIE_MINIGAME_LOST = 0xc15,
ASSET_C17_DIALOG_UNKNOWN = 0xC17,
ASSET_C18_DIALOG_UNKNOWN,
ASSET_C19_DIALOG_UNKNOWN,
ASSET_C1A_DIALOG_UNKNOWN,
ASSET_C1E_DIALOG_BOGGY_LOOK_FOR_PRESENTS = 0xc1e,
ASSET_C1F_DIALOG_BOGGY_NEEDS_SLEEP,
ASSET_C20_DIALOG_PRESENT_COLLECTIBLE_MEET_BLUE = 0xC20,
ASSET_BFF_DIALOG_BOGGY_MEET = 0xBFF,
ASSET_C00_DIALOG_BOGGY_SAVED,
ASSET_C01_DIALOG_BOGGY_SLED_BEAR_DENY,
ASSET_C02_DIALOG_BOGGY_SLED_WALRUS_MEET,
ASSET_C03_DIALOG_BOGGY_SLED_WALRUS_START,
ASSET_C04_DIALOG_BOGGY_SLED_WALRUS_MISS,
ASSET_C05_DIALOG_BOGGY_SLED_WALRUS_MISS_RETRY,
ASSET_C06_DIALOG_BOGGY_SLED_WALRUS_SECOND_START,
ASSET_C07_DIALOG_BOGGY_SLED_WALRUS_COMPLETE,
ASSET_C08_DIALOG_BOGGY_SLED_WALRUS_COMPLETE_RETRY,
ASSET_C09_DIALOG_BOGGY_SLED_BEAR_ANSWER_TO_START,
ASSET_C0A_DIALOG_BOGGY_SLED_BEAR_MISS_RETRY,
ASSET_C0B_DIALOG_BOGGY_SLED_BEAR_MISS,
ASSET_C0C_DIALOG_BOGGY_SLED_BEAR, // unused? couldn't find this isolated text
ASSET_C0D_DIALOG_BOGGY_SLED_BEAR_COMPLETE,
ASSET_C0E_DIALOG_BOGGY_SLED_EITHER_TAUNT_1,
ASSET_C0F_DIALOG_BOGGY_SLED_EITHER_TAUNT_2,
ASSET_C10_DIALOG_BOGGY_SLED_EITHER_GIVE_UP,
ASSET_C11_DIALOG_TOUCH_ICY_WATER,
ASSET_C12_DIALOG_TWINKLIE_MINIGAME_START,
ASSET_C13_DIALOG_TWINKLIE_MINIGAME_COMPLETE,
ASSET_C14_DIALOG_TWINKLIE_MINIGAME_LIGHT_TREE,
ASSET_C15_DIALOG_TWINKLIE_MINIGAME_MISS,
ASSET_C16_DIALOG_TWINKLIE_MINIGAME_EATEN,
ASSET_C17_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_1,
ASSET_C18_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_2,
ASSET_C19_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_3,
ASSET_C1A_DIALOG_BOGGY_KIDS_MEET,
ASSET_C1B_DIALOG_WOZZA_MEET_AS_BEAR,
ASSET_C1C_DIALOG_WOZZA_MEET_AS_WALRUS,
ASSET_C1D_DIALOG_WOZZA_RETURN,
ASSET_C1E_DIALOG_BOGGY_IGLOO_1,
ASSET_C1F_DIALOG_BOGGY_IGLOO_2,
ASSET_C20_DIALOG_PRESENT_COLLECTIBLE_MEET_BLUE,
ASSET_C21_DIALOG_PRESENT_COLLECTIBLE_MEET_GREEN,
ASSET_C22_DIALOG_PRESENT_COLLECTIBLE_MEET_RED,
ASSET_C23_DIALOG_BEAKBOMB_LEARN,
ASSET_C24_DIALOG_BEAKBOMB_REFRESHER,
ASSET_C26_DIALOG_UNKNOWN = 0xc26,
ASSET_C27_DIALOG_UNKNOWN,
ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED = 0xC2A,
ASSET_C2B_DIALOG_UNKNOWN,
ASSET_C25_DIALOG_TWINKLIE_MINIGAME_RETRY,
ASSET_C26_DIALOG_WOZZA_CAVE_MEET_AS_BEAR,
ASSET_C27_DIALOG_WOZZA_CAVE_MEET_AS_WALRUS,
ASSET_C28_DIALOG_BOGGY_SLED_BEAR_START,
ASSET_C29_DIALOG_BOGGY_SLED_BEAR_SECOND_START,
ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED,
ASSET_C2B_DIALOG_BOGGY_SAVED_2,
ASSET_C63_DIALOG_MR_VILE_INTRO = 0xC63,
ASSET_C64_DIALOG_MR_VILE_ROUND_1_START,
@ -4378,26 +4401,34 @@ enum asset_e
ASSET_C6F_DIALOG_MR_VILE_LOSE_ROUND_3_REMATCH,
ASSET_C70_DIALOG_MR_VILE_WIN_ROUND_2_REMATCH,
ASSET_C71_DIALOG_MR_VILE_WIN_ROUND_3_REMATCH,
ASSET_C72_DIALOG_UNKNOWN,
ASSET_C74_DIALOG_UNKNOWN = 0xc74,
ASSET_C76_DIALOG_UNKNOWN = 0xc76,
text_flibbits_meet = 0xc81,
text_flibbits_defeat = 0xc82,
text_flibbits_return = 0xc83,
ASSET_C85_DIALOG_PIRANHA_WATER = 0xC85,
ASSET_C86_DIALOG_UNKNOWN = 0xc86,
ASSET_C88_DIALOG_LONGLEG_LEARN = 0xC88,
ASSET_C89_DIALOG_LONGLEG_REFRESHER,
ASSET_C72_DIALOG_TIPTUP_MEET_1,
ASSET_C73_DIALOG_TIPTUP_MEET_2,
ASSET_C74_DIALOG_TIPTUP_MEET_3,
ASSET_C75_DIALOG_TIPTUP_MISS,
ASSET_C76_DIALOG_CHOIR_MEMBER_HIT_AFTER_JIGGY,
ASSET_C77_DIALOG_TIPTUP_LESSON_1_COMPLETE,
ASSET_C78_DIALOG_TIPTUP_LESSON_1_REPEAT,
ASSET_C79_DIALOG_TIPTUP_LESSON_2_COMPLETE,
ASSET_C7A_DIALOG_TIPTUP_LESSON_2_REPEAT,
ASSET_C7B_DIALOG_TIPTUP_LESSON_3_COMPLETE,
ASSET_C7C_DIALOG_TIPTUP_LESSON_3_REPEAT,
ASSET_C7D_DIALOG_TIPTUP_MEET_AFTER_JIGGY,
ASSET_C7E_DIALOG_TANKTUP_MEET,
ASSET_C7F_DIALOG_TANKTUP_COMPLETE,
ASSET_C80_DIALOG_TANKTUP_HIT,
ASSET_C81_DIALOG_YELLOW_FLIBBITS_MEET,
ASSET_C82_DIALOG_YELLOW_FLIBBITS_COMPLETE,
ASSET_C83_DIALOG_YELLOW_FLIBBITS_RETURN,
ASSET_C84_DIALOG_YELLOW_FLIBBITS_MEET_AS_CROCODILE, // unused? tested with croc and got 0xC81 text
ASSET_C85_DIALOG_PIRANHA_TOUCH_SWAMP_WATER,
ASSET_C86_DIALOG_CROCTUS_FIRST_SUCCESS,
ASSET_C87_DIALOG_CROCTUS_SECOND_SPAWN,
ASSET_C88_DIALOG_WADING_BOOTS_LEARN,
ASSET_C89_DIALOG_WADING_BOOTS_REFRESHER,
ASSET_C8A_DIALOG_BOTTLES_ALL_BGS_MOVES_LEARNED,
ASSET_C8B_DIALOG_GRUNTY_BGS_MISS_WALKWAY_JIGGY,
ASSET_C8C_DIALOG_GRUNTY_BGS_MISS_MAZE_JIGGY,
ASSET_C8D_DIALOG_MR_VILE_EXTRA_CHALLENGE_INTRO = 0xC8D,
ASSET_C8B_DIALOG_GRUNTY_LONG_SWITCH_MISS,
ASSET_C8C_DIALOG_GRUNTY_SHORT_SWITCH_MISS,
ASSET_C8D_DIALOG_MR_VILE_EXTRA_CHALLENGE_INTRO,
ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1,
ASSET_C8F_DIALOG_MR_VILE_PLAYER_DECLINES_EXTRA_CHALLENGE,
ASSET_C90_DIALOG_MR_VILE_EXTRA_CHALLENGE_REMATCH_1,
@ -4410,21 +4441,55 @@ enum asset_e
ASSET_C97_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_3,
ASSET_C98_DIALOG_MR_VILE_GIVES_PRIZE,
ASSET_CC7_DIALOG_UNKNOWN = 0xcc7,
ASSET_CC7_DIALOG_CATERPILLAR_COLLECT = 0xCC7,
ASSET_CC8_DIALOG_NABNUT_MEET_SPRING,
ASSET_CC9_DIALOG_NABNUT_MEET_SUMMER,
ASSET_CCA_DIALOG_NABNUT_MEET_FALL,
ASSET_CCB_DIALOG_NABNUT_ACORN_CHECK,
ASSET_CCC_DIALOG_NABNUT_ACORN_COMPLETE,
ASSET_CCD_DIALOG_NABNUT_MEET_WINTER,
ASSET_CCE_DIALOG_GNAWTY_MEET_SPRING,
ASSET_CCF_DIALOG_GNAWTY_MEET_SUMMER,
ASSET_CD0_DIALOG_GNAWTY_COMPLETE_SUMMER,
ASSET_CD1_DIALOG_GNAWTY_MEET_FALL_OUTSIDE,
ASSET_CD2_DIALOG_GNAWTY_MEET_FALL_INSIDE,
ASSET_CD3_DIALOG_GNAWTY_MEET_WINTER_OUTSIDE,
ASSET_CD4_DIALOG_GNAWTY_MEET_WINTER_INSIDE_JIGGY,
ASSET_CD5_DIALOG_GNAWTY_MEET_WINTER_INSIDE_AFTER_JIGGY,
ASSET_CD6_DIALOG_BABY_EYRIE_HATCH,
ASSET_CD7_DIALOG_BABY_EYRIE_MEET_SUMMER,
ASSET_CD8_DIALOG_BABY_EYRIE_CHECK_SUMMER,
ASSET_CD9_DIALOG_BABY_EYRIE_COMPLETE_SUMMER,
ASSET_CDA_DIALOG_BABY_EYRIE_MEET_FALL,
ASSET_CDB_DIALOG_BABY_EYRIE_COMPLETE_FALL,
ASSET_CDC_DIALOG_ADULT_EYRIE_MEET_WINTER,
ASSET_CDD_DIALOG_ADULT_EYRIE_COMPLETE_WINTER,
ASSET_CDE_DIALOG_CCW_GOBI_MEET_SUMMER,
ASSET_CDF_DIALOG_CCW_GOBI_COMPLETE_SUMMER,
ASSET_CE0_DIALOG_CCW_GOBI_COMPLETE_FALL,
ASSET_CE1_DIALOG_ZUBBA_MEET_SPRING,
ASSET_CE2_DIALOG_ZUBBA_MEET_SUMMER,
ASSET_CE3_DIALOG_ZUBBA_RETURN,
ASSET_CE4_DIALOG_ZUBBA_COMPLETE,
ASSET_CE5_DIALOG_ZUBBA_MEET_FALL,
ASSET_CE6_DIALOG_GRUNTY_TOUCH_BRAMBLE,
ASSET_CE7_DIALOG_GRUNTY_TOUCH_ICY_WATER,
ASSET_CE8_DIALOG_GRUNTY_TOUCH_ICY_WATER_2, // unused
ASSET_CE6_DIALOG_GRUNTY_MMM_BRAMBLES = 0xCE6,
ASSET_CE7_DIALOG_GRUNTY_CCW_ICY_WATER_SWIM = 0xCE7,
ASSET_CE8_DIALOG_GRUNTY_CCW_ICY_WATER_UNUSED = 0xCE8,
ASSET_D2B_DIALOG_UNKNOWN = 0xd2b,
ASSET_D32_DIALOG_MUTANT_CRAB_MEET = 0xD32,
ASSET_D2B_DIALOG_CLANKER_MEET = 0xD2B,
ASSET_D2C_DIALOG_CLANKER_KEY_COMPLETE,
ASSET_D2D_DIALOG_CLANKER_COLLECT_JIGGY,
ASSET_D2E_DIALOG_CLANKER_LEFT_TOOTH_FIRST,
ASSET_D2F_DIALOG_CLANKER_LEFT_TOOTH_SECOND,
ASSET_D30_DIALOG_CLANKER_RIGHT_TOOTH_FIRST,
ASSET_D31_DIALOG_CLANKER_RIGHT_TOOTH_SECOND,
ASSET_D32_DIALOG_MUTANT_CRAB_MEET,
ASSET_D33_DIALOG_MUTANT_CRAB_DEFEAT,
ASSET_D34_DIALOG_GLOOP_MEET,
ASSET_D35_DIALOG_WONDERWING_LEARN,
ASSET_D36_DIALOG_WONDERWING_REFRESHER,
ASSET_D37_DIALOG_BOTTLES_ALL_CC_MOVES_LEARNED,
ASSET_D38_DIALOG_EMPTY,
ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED,
ASSET_D39_DIALOG_BOTTLES_REFILL_HEALTH,
ASSET_D8F_DIALOG_MUMBO_MEET = 0xD8F,

2
src/BGS/ch/bigalligator.c
View File

@ -9,7 +9,7 @@
void chLargeCrocodile_init(Actor *);
/* .data */
ActorInfo chLargeCrocodile = {MARKER_DC_BIG_ALLIGATOR, ACTOR_F6_BIG_ALLIGATOR, ASSET_397_MODEL_BIG_ALLIGATOR, 0x01, NULL,
ActorInfo gChLargeCrocodile = {MARKER_DC_BIG_ALLIGATOR, ACTOR_F6_BIG_ALLIGATOR, ASSET_397_MODEL_BIG_ALLIGATOR, 0x01, NULL,
chLargeCrocodile_init, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};

34
src/BGS/ch/code_2270.c
View File

@ -22,14 +22,14 @@ typedef struct ch_bgs_2270_s{
void chTiptup_update(Actor *this);
Actor *actor_draw(ActorMarker *, Gfx **, Mtx **, Vtx **);
ActorInfo chTiptup = {
ActorInfo gChTiptup = {
MARKER_19A_TIPTUP, ACTOR_27A_TIPTUP, ASSET_3F8_MODEL_TIPTUP,
0, NULL,
chTiptup_update, NULL, actor_draw,
0, 0, 2.5f, 0
};
s16 D_80390854[] = {0, 0xC78, 0xC7A, 0xC7C}; //see again texts
s16 D_8039085C[] = {0, 0xC77, 0xC79, 0xC7B}; //success texts
s16 D_80390854[] = {0, ASSET_C78_DIALOG_TIPTUP_LESSON_1_REPEAT, ASSET_C7A_DIALOG_TIPTUP_LESSON_2_REPEAT, ASSET_C7C_DIALOG_TIPTUP_LESSON_3_REPEAT}; //see again texts
s16 D_8039085C[] = {0, ASSET_C77_DIALOG_TIPTUP_LESSON_1_COMPLETE, ASSET_C79_DIALOG_TIPTUP_LESSON_2_COMPLETE, ASSET_C7B_DIALOG_TIPTUP_LESSON_3_COMPLETE}; //success texts
u8 D_80390864[] = {3, 3, 5, 7}; //chchoirgame_sequence_length
f32 D_80390868[3] = {0.0f, 100.0f, -1020.0f}; //chchoirgame_jiggy_position
@ -77,21 +77,21 @@ void chTiptup_textEvent(ActorMarker *this, enum asset_e text_id, s32 arg2){
thisActor = marker_getActor(this);
switch(text_id){
case 0xc72:
case 0xc74:
case ASSET_C72_DIALOG_TIPTUP_MEET_1:
case ASSET_C74_DIALOG_TIPTUP_MEET_3:
chTiptup_setState(thisActor, 3);
break;
case 0xc78:
case 0xc7a:
case 0xc7c:
case ASSET_C78_DIALOG_TIPTUP_LESSON_1_REPEAT:
case ASSET_C7A_DIALOG_TIPTUP_LESSON_2_REPEAT:
case ASSET_C7C_DIALOG_TIPTUP_LESSON_3_REPEAT:
chTiptup_setState(thisActor, 4);
break;
case 0xc77:
case 0xc79:
case ASSET_C77_DIALOG_TIPTUP_LESSON_1_COMPLETE:
case ASSET_C79_DIALOG_TIPTUP_LESSON_2_COMPLETE:
func_80324E38(0.0f, 0);
chTiptup_setState(thisActor, 3);
break;
case 0xc7b:
case ASSET_C7B_DIALOG_TIPTUP_LESSON_3_COMPLETE:
timedFunc_set_0(0.0f, chTiptup_jiggySpawn);
timed_exitStaticCamera(2.5f);
func_80324E38(2.5f, 0);
@ -147,10 +147,10 @@ void chTiptup_setState(Actor *this, s32 arg1){
this->has_met_before = TRUE;
if (unqPtr->unkA == 0) {
gcdialog_showDialog(ASSET_C72_DIALOG_UNKNOWN, 0xe, this->position, this->marker, chTiptup_textEvent, 0);
gcdialog_showDialog(ASSET_C72_DIALOG_TIPTUP_MEET_1, 0xe, this->position, this->marker, chTiptup_textEvent, 0);
}
else {
gcdialog_showDialog(ASSET_C74_DIALOG_UNKNOWN, 0xf, this->position, this->marker, chTiptup_textEvent, 0);
gcdialog_showDialog(ASSET_C74_DIALOG_TIPTUP_MEET_3, 0xf, this->position, this->marker, chTiptup_textEvent, 0);
}
}
else {
@ -176,7 +176,7 @@ void chTiptup_setState(Actor *this, s32 arg1){
timed_exitStaticCamera(tmpf += 2.5);
if(!unqPtr->unkA && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){
func_80324DBC(tmpf + 0.5, 0xc73, 0xe, this->position, this->marker, chTiptup_textEvent, 0);
func_80324DBC(tmpf + 0.5, ASSET_C73_DIALOG_TIPTUP_MEET_2, 0xe, this->position, this->marker, chTiptup_textEvent, 0);
unqPtr->unkA = 1;
}
func_80324E38(sp54 = tmpf + 0.6, 0);
@ -235,7 +235,7 @@ void chTiptup_choirHitReaction(ActorMarker *this, s32 arg1){
thisActor = marker_getActor(this);
unqPtr = (ActorLocal_Tiptup *)&thisActor->local;
if((s32)unqPtr->unk0 >= (s32) vector_size(unqPtr->unk4)){
if(!mapSpecificFlags_get(0) && gcdialog_showDialog(ASSET_C76_DIALOG_UNKNOWN, 0, 0, 0, 0, 0))
if(!mapSpecificFlags_get(0) && gcdialog_showDialog(ASSET_C76_DIALOG_CHOIR_MEMBER_HIT_AFTER_JIGGY, 0, 0, 0, 0, 0))
mapSpecificFlags_set(0,1);
}else{
tmp = (Struct_BGS_2270_0s *)vector_at(unqPtr->unk4, unqPtr->unk0);
@ -245,7 +245,7 @@ void chTiptup_choirHitReaction(ActorMarker *this, s32 arg1){
else{
func_8028F55C(1, thisActor->marker);
timedFunc_set_0(0.5f, chTiptup_sfxIncorrectHit);
if(!mapSpecificFlags_get(1) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && gcdialog_showDialog(0xc75, 0, NULL, NULL, NULL, NULL))
if(!mapSpecificFlags_get(1) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && gcdialog_showDialog(ASSET_C75_DIALOG_TIPTUP_MISS, 0, NULL, NULL, NULL, NULL))
mapSpecificFlags_set(1,TRUE);
}
}
@ -342,7 +342,7 @@ void chTiptup_update(Actor *this){
if(this->state == 6){
if(ml_vec3f_distance(this->position, player_position) < 300.0f && !unqPtr->unk8){
unqPtr->unk8 = 1;
gcdialog_showDialog(0xc7d, 4, 0, 0, 0, 0);
gcdialog_showDialog(ASSET_C7D_DIALOG_TIPTUP_MEET_AFTER_JIGGY, 4, 0, 0, 0, 0);
}
}
}

28
src/BGS/ch/croctus.c
View File

@ -14,13 +14,13 @@ extern void gcStaticCamera_activate(s32 arg0);
void func_80387D18(ActorMarker *, u32);
Actor *func_8038860C(ActorMarker *, Gfx**, Mtx **, Vtx**);
void func_80387FD4(Actor *this);
Actor *chCroctus_draw(ActorMarker *, Gfx**, Mtx **, Vtx**);
void chCroctus_updat(Actor *this);
/* .data */
s16 D_803907B0[4] = {0x15, 0x16, 0x17, 0x18};
ActorMarker *bgs_D_803907B8[5] = {NULL};
ActorAnimationInfo D_803907CC[] = {
ActorAnimationInfo chCroctusAnimations[] = {
{0x000, 0.0f},
{0x14B, 3.3e+7f},
{0x14B, 1.4f},
@ -29,9 +29,9 @@ ActorAnimationInfo D_803907CC[] = {
{0x14B, 2.0f},
{0x14B, 2.0f}
};
ActorInfo D_80390804 ={MARKER_FC_CROCTUS, ACTOR_1FA_CROCTUS, ASSET_425_MODEL_CROCTUS,
1, D_803907CC,
func_80387FD4, actor_update_func_80326224, func_8038860C,
ActorInfo gChCroctus ={MARKER_FC_CROCTUS, ACTOR_1FA_CROCTUS, ASSET_425_MODEL_CROCTUS,
1, chCroctusAnimations,
chCroctus_updat, actor_update_func_80326224, chCroctus_draw,
0, 0, 0.0f, 0
};
@ -53,7 +53,7 @@ void func_80387D18(ActorMarker * arg0, u32 arg1){
if(arg0);
}
void *func_80387D90(ActorMarker * arg0){
void *chCroctus_jiggySpawn(ActorMarker * arg0){
ActorMarker *marker;
Actor* this;
f32 spawnPos[3];
@ -64,7 +64,7 @@ void *func_80387D90(ActorMarker * arg0){
spawnPos[1] = this->position_y;
spawnPos[2] = this->position_z;
marker->propPtr->unk8_3 = 0;
gcStaticCamera_activate(0x19);
gcStaticCamera_activate(0x19); //related to temporary switch to fixed camera
jiggy_spawn(JIGGY_22_CROCTUS, spawnPos);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
}
@ -86,7 +86,7 @@ void func_80387E40(ActorMarker * arg0){
void func_80387E68(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this;
if(text_id == 0xC86){
if(text_id == ASSET_C86_DIALOG_CROCTUS_FIRST_SUCCESS){
this = marker_getActor(caller);
timed_playSfx(0.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000);
timed_playSfx(1.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000);
@ -97,7 +97,7 @@ void func_80387E68(ActorMarker *caller, enum asset_e text_id, s32 arg2){
bgs_D_803907B8[this->actorTypeSpecificField]->propPtr->unk8_4 = TRUE;
timedFunc_set_1(1.1f, (GenFunction_1)func_80387E00, reinterpret_cast(s32, bgs_D_803907B8[this->actorTypeSpecificField]));
timed_setStaticCameraToNode(0.8f, 9);
func_80324DBC(3.4f, 0xC87, 0xE, NULL, NULL, func_80387E68, NULL);
func_80324DBC(3.4f, ASSET_C87_DIALOG_CROCTUS_SECOND_SPAWN, 0xE, NULL, NULL, func_80387E68, NULL);
__spawnQueue_add_2((GenFunction_2) func_80387D18, reinterpret_cast(s32, this->marker), 0x46);
}
else{
@ -106,7 +106,7 @@ void func_80387E68(ActorMarker *caller, enum asset_e text_id, s32 arg2){
}
}
void func_80387FD4(Actor *this){
void chCroctus_updat(Actor *this){
int j;
if(!this->volatile_initialized){
@ -143,7 +143,7 @@ void func_80387FD4(Actor *this){
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
if (this->actorTypeSpecificField == 1) {
func_8028F94C(2, this->position);
gcdialog_showDialog(ASSET_C86_DIALOG_UNKNOWN, 0xE, this->position, this->marker, func_80387E68, NULL);
gcdialog_showDialog(ASSET_C86_DIALOG_CROCTUS_FIRST_SUCCESS, 0xE, this->position, this->marker, func_80387E68, NULL);
subaddie_set_state_with_direction(this, 6, 0.79f, 1);
} else {
timed_playSfx(0.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000); //0.4f
@ -161,7 +161,7 @@ void func_80387FD4(Actor *this){
timedFunc_set_1(1.1f, (GenFunction_1)func_80387E00, reinterpret_cast(s32, bgs_D_803907B8[this->actorTypeSpecificField]));
gcStaticCamera_activate(D_803907B0[this->actorTypeSpecificField-1]);
} else {
timedFunc_set_1(0.8f, (GenFunction_1)func_80387D90, (s32) this->marker);
timedFunc_set_1(0.8f, (GenFunction_1)chCroctus_jiggySpawn, (s32) this->marker);
}
__spawnQueue_add_2((GenFunction_2)func_80387D18, reinterpret_cast(s32, this->marker), 0x46);
}
@ -224,7 +224,7 @@ void BGS_func_803885DC(void){
bgs_D_803907B8[i] = 0;
}
Actor *func_8038860C(ActorMarker *this, Gfx** gdl, Mtx ** mptr, Vtx **vtx){
Actor *chCroctus_draw(ActorMarker *this, Gfx** gdl, Mtx ** mptr, Vtx **vtx){
Actor *thisActor;
thisActor = marker_getActor(this);
func_8033A45C(1, thisActor->actorTypeSpecificField);

40
src/BGS/ch/flibbit.c
View File

@ -18,14 +18,14 @@ typedef struct{
extern f32 mapModel_getFloorY(f32 *);
void chflibbit_update(Actor *this);
Actor *chflibbit_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void chFlibbit_update(Actor *this);
Actor *chFlibbit_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
ActorInfo D_80390690 = {
ActorInfo gChFlibbit = {
MARKER_C1_FLIBBIT_RED, ACTOR_133_FLIBBIT_RED, ASSET_375_MODEL_FLIBBIT_RED,
0, NULL,
chflibbit_update, NULL, chflibbit_draw,
chFlibbit_update, NULL, chFlibbit_draw,
0, 0, 1.0f, 0
};
@ -171,7 +171,7 @@ bool func_80386A34(Actor * this){
return out;
}
void func_80386AEC(Actor *this, s32 next_state) {
void chFlibbit_setState(Actor *this, s32 next_state) {
ActorLocal_Flibbit *local;
local = (ActorLocal_Flibbit *) &this->local;
@ -193,7 +193,7 @@ void func_80386AEC(Actor *this, s32 next_state) {
if(!func_80386A34(this)) {
if (this->state != 3) {
next_state = 3;
func_80386AEC(this, next_state);
chFlibbit_setState(this, next_state);
}
return;
}
@ -244,25 +244,25 @@ void func_80386AEC(Actor *this, s32 next_state) {
void BGS_func_80386E30(ActorMarker *this, ActorMarker *other){
Actor *thisActor = marker_getActor(this);
if(thisActor->state < 6){
func_80386AEC(thisActor, 4);
chFlibbit_setState(thisActor, 4);
}
}
void func_80386E70(ActorMarker *this, ActorMarker *other){
Actor *thisActor = marker_getActor(this);
if(thisActor->state < 6){
func_80386AEC(thisActor, 5);
chFlibbit_setState(thisActor, 5);
}
}
void func_80386EB0(ActorMarker *this, ActorMarker *other){
Actor *thisActor = marker_getActor(this);
if(thisActor->state < 6){
func_80386AEC(thisActor, 6);
chFlibbit_setState(thisActor, 6);
}
}
Actor *chflibbit_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *chFlibbit_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this;
ActorLocal_Flibbit *local;
BoneTransformList *temp_a0;
@ -299,7 +299,7 @@ Actor *chflibbit_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
return this;
}
void chflibbit_update(Actor *this){
void chFlibbit_update(Actor *this){
f32 player_position[3];
f32 spB0[3];
f32 player_distance;
@ -333,7 +333,7 @@ void chflibbit_update(Actor *this){
local->unkE[2] = (s16) this->position_z;
local->unkE[1] = mapModel_getFloorY(this->position);
func_80386AEC(this, 1);
chFlibbit_setState(this, 1);
}
player_getPosition(player_position);
@ -353,7 +353,7 @@ void chflibbit_update(Actor *this){
if(this->state == 1){
if(func_80329210(this, player_position)){
func_80386AEC(this, 2);
chFlibbit_setState(this, 2);
return;
}
@ -373,10 +373,10 @@ void chflibbit_update(Actor *this){
sp84[1] = (f32)local->unkE[1];
sp84[2] = (f32)local->unkE[2];
if(ml_vec3f_distance(this->position, sp84) < 30.0f){
func_80386AEC(this, 1);
chFlibbit_setState(this, 1);
}
else{
func_80386AEC(this, 2);
chFlibbit_setState(this, 2);
}
}
@ -409,17 +409,17 @@ void chflibbit_update(Actor *this){
func_80258A4C(this->position, this->yaw - 90.0f, player_position, &sp60, &sp5C, &sp58);
this->yaw += sp58 * 90.0f * spA4;
if ((-0.4 <= sp58) && (sp58 <= 0.4) && ((f64) randf() > 0.5)) {
func_80386AEC(this, 2);
chFlibbit_setState(this, 2);
}
if ((sp5C < 0.0f) && (randf() > 0.5)) {
func_80386AEC(this, 2);
chFlibbit_setState(this, 2);
}
}
if(this->state == 4 || this->state == 5){
if(ml_timer_update(&local->unk18, spA4)){
func_80386AEC(this, 3);
chFlibbit_setState(this, 3);
}
}
@ -434,12 +434,12 @@ void chflibbit_update(Actor *this){
local->unk14 -= 3000.0f*spA4;
if(this->position_y < mapModel_getFloorY(this->position)){
this->position_y = mapModel_getFloorY(this->position);
func_80386AEC(this, 7);
chFlibbit_setState(this, 7);
}
}
if(this->state == 7){
if(skeletalAnim_getLoopCount(this->unk148) > 0)
func_80386AEC(this, 8);
chFlibbit_setState(this, 8);
}
}

16
src/BGS/ch/frogminigame.c
View File

@ -3,15 +3,15 @@
#include "variables.h"
void chfrogminigame_update(Actor *);
void chFrogMinigame_update(Actor *);
void chFrogMinigame_setState(Actor * arg0, u32 next_state);
void func_8025A58C(u32, u32);
void timed_exitStaticCamera(f32);
ActorInfo chFrogMinigame = {MARKER_C4_YELLOW_FLIBBIT_CTRL, ACTOR_136_YELLOW_FLIBBIT_CONTROLLER, 0x00,
ActorInfo gChFrogMinigame = {MARKER_C4_YELLOW_FLIBBIT_CTRL, ACTOR_136_YELLOW_FLIBBIT_CONTROLLER, 0x00,
0x00, NULL,
chfrogminigame_update, NULL, func_80325340,
chFrogMinigame_update, NULL, func_80325340,
0, 0, 0.0f, 0
};
@ -56,13 +56,13 @@ void chFrogMinigame_setState(Actor * arg0, u32 next_state){
mapSpecificFlags_set(0x10, 1);
if(!fileProgressFlag_get(FILEPROG_1B_MET_YELLOW_FLIBBITS)){
fileProgressFlag_set(FILEPROG_1B_MET_YELLOW_FLIBBITS, 1);
gcdialog_showDialog(text_flibbits_meet, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
gcdialog_showDialog(ASSET_C81_DIALOG_YELLOW_FLIBBITS_MEET, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
}else{
if(!arg0->bgs_6730.unk8){
gcdialog_showDialog(text_flibbits_return, 0x4, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
gcdialog_showDialog(ASSET_C83_DIALOG_YELLOW_FLIBBITS_RETURN, 0x4, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
}
else{
__chFrogMinigame_textCallback(arg0->marker, text_flibbits_return, 0);
__chFrogMinigame_textCallback(arg0->marker, ASSET_C83_DIALOG_YELLOW_FLIBBITS_RETURN, 0);
return;
}
}
@ -93,7 +93,7 @@ void chFrogMinigame_setState(Actor * arg0, u32 next_state){
}
if (next_state == 4) {
gcdialog_showDialog(text_flibbits_defeat, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
gcdialog_showDialog(ASSET_C82_DIALOG_YELLOW_FLIBBITS_COMPLETE, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
}
if(next_state == 5){
@ -127,7 +127,7 @@ void BGS_func_8038CED0(void){
D_80391240[3]++;
}
void chfrogminigame_update(Actor *this){
void chFrogMinigame_update(Actor *this){
f32 player_position[3];
u32 sp28;
ActorLocal_BGS_6730 *local;

2
src/BGS/ch/leafboat.c
View File

@ -22,7 +22,7 @@ Actor *chLeafBoat_draw(ActorMarker *this, Gfx** gdl, Mtx** mtx, Vtx **Vtx);
/* .data section */
u8 D_80390DA0[6] = {0, 0, 0, 1, 1, 1};
ActorInfo chLeafBoat = {MARKER_DA_LEAF_BOAT, ACTOR_F1_LEAF_BOAT, ASSET_30D_MODEL_LEAF_BOAT,
ActorInfo gChLeafBoat = {MARKER_DA_LEAF_BOAT, ACTOR_F1_LEAF_BOAT, ASSET_30D_MODEL_LEAF_BOAT,
0x01, NULL,
chLeafBoat_update, chLeafBoat_update, chLeafBoat_draw,
0, 0, 0.0f, 0

36
src/BGS/ch/mrvile.c
View File

@ -5,8 +5,8 @@
#include "prop.h"
#include "core2/modelRender.h"
Actor *chvile_draw(ActorMarker*, Gfx **, Mtx **, Vtx **);
void chvile_update(Actor *);
Actor *chVile_draw(ActorMarker*, Gfx **, Mtx **, Vtx **);
void chVile_update(Actor *);
void func_8038BB40(ActorMarker *);
extern bool func_80320C94(f32[3], f32[3], f32, f32[3], s32, u32);
@ -27,8 +27,8 @@ typedef struct chmrvile_s{
} ActorLocal_MrVile;
/* .data */
ActorInfo D_80390A70 = {MARKER_C8_MR_VILE, ACTOR_13A_MR_VILE, ASSET_373_MODEL_MR_VILE, 0x00, NULL,
chvile_update, NULL, chvile_draw,
ActorInfo gChVile = {MARKER_C8_MR_VILE, ACTOR_13A_MR_VILE, ASSET_373_MODEL_MR_VILE, 0x00, NULL,
chVile_update, NULL, chVile_draw,
0, 0, 0.0f, 0
};
@ -193,7 +193,7 @@ void func_8038BDD4(Actor *this) {
}
}
void func_8038C0C8(Actor * this, s32 next_state){
void chVile_setState(Actor * this, s32 next_state){
ActorLocal_MrVile *local;
local = (ActorLocal_MrVile *)&this->local;
@ -223,7 +223,7 @@ void func_8038C0C8(Actor * this, s32 next_state){
this->state = next_state;
}
Actor *chvile_draw(ActorMarker *marker, Gfx **gfx, Mtx** mtx, Vtx **vtx){
Actor *chVile_draw(ActorMarker *marker, Gfx **gfx, Mtx** mtx, Vtx **vtx){
Actor *this;
ActorLocal_MrVile *local;
f32 position[3];
@ -273,7 +273,7 @@ bool BGS_func_8038C338(ActorMarker *marker){
return this->state == 1;
}
void chvile_free(Actor *this){
void chVile_free(Actor *this){
ActorLocal_MrVile *local;
local = (ActorLocal_MrVile *)&this->local;
@ -285,42 +285,42 @@ void func_8038C384(ActorMarker *marker){
Actor *this;
this = marker_getActor(marker);
func_8038C0C8(this, 4);
chVile_setState(this, 4);
}
void func_8038C3B0(ActorMarker *marker){
Actor *this;
this = marker_getActor(marker);
func_8038C0C8(this, 2);
chVile_setState(this, 2);
}
void func_8038C3DC(ActorMarker *marker){
Actor *this;
this = marker_getActor(marker);
func_8038C0C8(this, 3);
chVile_setState(this, 3);
}
void func_8038C408(ActorMarker *marker){
Actor *this;
this = marker_getActor(marker);
func_8038C0C8(this, 5);
chVile_setState(this, 5);
}
void BGS_func_8038C434(ActorMarker *marker){
Actor *this;
this = marker_getActor(marker);
func_8038C0C8(this, 6);
chVile_setState(this, 6);
}
void BGS_func_8038C460(ActorMarker *arg0){
func_8038C0C8(marker_getActor(arg0), 1);
chVile_setState(marker_getActor(arg0), 1);
}
void chvile_update(Actor *this) {
void chVile_update(Actor *this) {
f32 player_position[3];
f32 sp90;
f32 temp_a0;
@ -339,12 +339,12 @@ void chvile_update(Actor *this) {
local = (ActorLocal_MrVile *)&this->local;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = chvile_free;
this->marker->actorFreeFunc = chVile_free;
local->unk0 = 0;
local->unk4 = assetcache_get(0x3F6);
local->game_marker = NULL;
func_8038BD84(this);
func_8038C0C8(this, 1);
chVile_setState(this, 1);
return;
}
if (local->game_marker == NULL) {
@ -362,7 +362,7 @@ void chvile_update(Actor *this) {
if (((sp84 > 50.0f) && (0.05 < sp7C)) || (sp7C < -0.05)) {
this->yaw += sp7C * 20.0f;
} else {
func_8038C0C8(this, 1);
chVile_setState(this, 1);
}
}
if (this->state == 3) {
@ -415,7 +415,7 @@ void chvile_update(Actor *this) {
BGS_func_8038BBA0(this, 103);
}
if ((local->unkC == 103) && (skeletalAnim_getLoopCount(this->unk148) >= 2)) {
func_8038C0C8(this, 1);
chVile_setState(this, 1);
}
}
if (this->state == 5) {

2
src/BGS/ch/mudhut.c
View File

@ -33,7 +33,7 @@ enum bundle_e D_80390B50[6] = {
BUNDLE_C_BGS_HUT_JIGGY
};
ActorInfo chMudHut = {MARKER_D5_BGS_MUD_HUT, ACTOR_C_MUD_HUT, ASSET_7D8_MODEL_MM_HUT_TOP, 0x01, chMudHutAnimations,
ActorInfo gChMudHut = {MARKER_D5_BGS_MUD_HUT, ACTOR_C_MUD_HUT, ASSET_7D8_MODEL_MM_HUT_TOP, 0x01, chMudHutAnimations,
chMudHut_update, actor_update_func_80326224, chMudHut_draw,
0, 0, 0.0f, 0
};

10
src/BGS/ch/pinkegg.c
View File

@ -27,27 +27,27 @@ ActorAnimationInfo chPinkEggAnimations[4] = {
{0x10B, 2.0f}
};
ActorInfo chPinkEggLargest = {MARKER_6E_PINK_EGG_LARGEST, ACTOR_5B_PINK_EGG_LARGEST, ASSET_380_MODEL_PINK_EGG_LARGEST, 0x01, chPinkEggAnimations,
ActorInfo gChPinkEggLargest = {MARKER_6E_PINK_EGG_LARGEST, ACTOR_5B_PINK_EGG_LARGEST, ASSET_380_MODEL_PINK_EGG_LARGEST, 0x01, chPinkEggAnimations,
chPinkEgg_update, actor_update_func_80326224, chPinkEgg_draw,
0, 0x2CC, 6.0f, 0
};
ActorInfo chPinkEggLarge = {MARKER_D6_PINK_EGG_LARGE, ACTOR_ED_PINK_EGG_LARGE, ASSET_381_MODEL_PINK_EGG_LARGE, 0x01, chPinkEggAnimations,
ActorInfo gChPinkEggLarge = {MARKER_D6_PINK_EGG_LARGE, ACTOR_ED_PINK_EGG_LARGE, ASSET_381_MODEL_PINK_EGG_LARGE, 0x01, chPinkEggAnimations,
chPinkEgg_update, actor_update_func_80326224, chPinkEgg_draw,
0, 0x2CC, 5.0f, 0
};
ActorInfo chPinkEggMedium = {MARKER_D7_PINK_EGG_MEDIUM, ACTOR_EE_PINK_EGG_MEDIUM, ASSET_382_MODEL_PINK_EGG_MEDIUM, 0x01, chPinkEggAnimations,
ActorInfo gChPinkEggMedium = {MARKER_D7_PINK_EGG_MEDIUM, ACTOR_EE_PINK_EGG_MEDIUM, ASSET_382_MODEL_PINK_EGG_MEDIUM, 0x01, chPinkEggAnimations,
chPinkEgg_update, actor_update_func_80326224, chPinkEgg_draw,
0, 0x2CC, 4.0f, 0
};
ActorInfo chPinkEggSmall = {MARKER_D8_PINK_EGG_SMALL, ACTOR_EF_PINK_EGG_SMALL, ASSET_383_MODEL_PINK_EGG_SMALL, 0x01, chPinkEggAnimations,
ActorInfo gChPinkEggSmall = {MARKER_D8_PINK_EGG_SMALL, ACTOR_EF_PINK_EGG_SMALL, ASSET_383_MODEL_PINK_EGG_SMALL, 0x01, chPinkEggAnimations,
chPinkEgg_update, actor_update_func_80326224, chPinkEgg_draw,
0, 0x2CC, 3.0f, 0
};
ActorInfo chPinkEggSmallest = {MARKER_D9_PINK_EGG_SMALLEST, ACTOR_F0_PINK_EGG_SMALLEST, ASSET_384_MODEL_PINK_EGG_SMALLEST, 0x01, chPinkEggAnimations,
ActorInfo gChPinkEggSmallest = {MARKER_D9_PINK_EGG_SMALLEST, ACTOR_F0_PINK_EGG_SMALLEST, ASSET_384_MODEL_PINK_EGG_SMALLEST, 0x01, chPinkEggAnimations,
chPinkEgg_update, actor_update_func_80326224, chPinkEgg_draw,
0, 0x2CC, 2.0f, 0
};

4
src/BGS/ch/swampswitch.c
View File

@ -19,10 +19,10 @@ ActorAnimationInfo chSwampSwitchAnimations[] = {
{ ASSET_D5_ANIM_SWITCH_UP, 1e+8f }
};
ActorInfo chLongSwampSwitch = {
ActorInfo gChLongSwampSwitch = {
MARKER_F5_BGS_ELEVATED_WALKWAY_SWITCH, ACTOR_14E_BGS_ELEVATED_WALKWAY_SWITCH, ASSET_3F5_BGS_JIGGY_SWITCH,
1, chSwampSwitchAnimations, chLongSwampSwitch_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0 };
ActorInfo chShortSwampSwitch = { MARKER_FD_BGS_MAZE_SWITCH, ACTOR_1FB_BGS_MAZE_SWITCH, ASSET_3F5_BGS_JIGGY_SWITCH,
ActorInfo gChShortSwampSwitch = { MARKER_FD_BGS_MAZE_SWITCH, ACTOR_1FB_BGS_MAZE_SWITCH, ASSET_3F5_BGS_JIGGY_SWITCH,
1, chSwampSwitchAnimations, chShortSwampSwitch_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
void chLongSwampSwitch_jiggySpawn(void) {

16
src/BGS/ch/tanktup.c
View File

@ -11,7 +11,7 @@ void timedFunc_set_2(f32, void(*)(s32, s32), s32, s32);
void func_8028E668(f32[3], f32, f32, f32);
extern void __spawnQueue_add_3(GenFunction_3, s32, s32, s32);
void func_8038F6A4(Actor *);
void chTanktup_update(Actor *);
/* .data */
enum chtanktup_leg_e {
@ -28,8 +28,8 @@ ActorAnimationInfo BGS_D_80390C20[] = {
{0x107, 1.75f}
};
ActorInfo chTanktup = {MARKER_6C_TANKTUP, ACTOR_E8_TANKTUP, ASSET_3EE_TANKTUP, 0x01, BGS_D_80390C20,
func_8038F6A4, actor_update_func_80326224, actor_draw,
ActorInfo gChTanktup = {MARKER_6C_TANKTUP, ACTOR_E8_TANKTUP, ASSET_3EE_TANKTUP, 0x01, BGS_D_80390C20,
chTanktup_update, actor_update_func_80326224, actor_draw,
0, 0x80, 0.0f, 0
};
@ -92,7 +92,7 @@ void func_8038F610(Actor *this) {
void func_8028F94C(s32, f32[3]);
void func_8028F918(s32);
void func_8038F6A4(Actor *this)
void chTanktup_update(Actor *this)
{
ActorLocal_TanktupBody *local = (ActorLocal_TanktupBody *) (&this->local);
f32 sp48[3];
@ -142,7 +142,7 @@ void func_8038F6A4(Actor *this)
{
if ((((ml_vec3f_distance(local->unk18, sp48) < 250.0f) && (ml_vec3f_distance(local->unk18, sp48) > 80.0f)) && (!player_movementGroup())) && (player_getTransformation() == TRANSFORM_1_BANJO))
{
gcdialog_showDialog(0xC7E, 0, 0, 0, 0, 0);
gcdialog_showDialog(ASSET_C7E_DIALOG_TANKTUP_MEET, 0, 0, 0, 0, 0);
this->has_met_before = TRUE;
}
}
@ -163,7 +163,7 @@ void func_8038F6A4(Actor *this)
if ((!this->unk138_23) && (!local->unk14))
{
if (gcdialog_showDialog(0xC80, 0, 0, 0, 0, 0))
if (gcdialog_showDialog(ASSET_C80_DIALOG_TANKTUP_HIT, 0, 0, 0, 0, 0))
{
this->unk138_23 = 1;
}
@ -214,11 +214,11 @@ void func_8038F6A4(Actor *this)
func_8028F918(0);
if (jiggyscore_isCollected(JIGGY_26_BGS_TANKTUP) == 0)
{
gcdialog_showDialog(0xC7F, 0xF, this->position, this->marker, func_8038F5E4, 0);
gcdialog_showDialog(ASSET_C7F_DIALOG_TANKTUP_COMPLETE, 0xF, this->position, this->marker, func_8038F5E4, 0);
}
else
{
func_8038F5E4(this->marker, 0xC7F, -1);
func_8038F5E4(this->marker, ASSET_C7F_DIALOG_TANKTUP_COMPLETE, -1);
}
}
break;

50
src/BGS/ch/yellowflibbit.c
View File

@ -17,14 +17,14 @@ typedef struct {
f32 unk28;
}ActorLocal_Yellow_Flibbit;
Actor *func_8038DE5C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx** vtx);
void BGS_func_8038E034(Actor *this);
Actor *chYellowFlibbit_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx** vtx);
void chYellowFlibbit_update(Actor *this);
/* .data */
ActorInfo BGS_D_80390AE0 = {
ActorInfo gChYellowFlibbit = {
MARKER_C5_FLIBBIT_YELLOW, ACTOR_137_FLIBBIT_YELLOW, ASSET_385_MODEL_FLIBBIT_YELLOW,
0, NULL,
BGS_func_8038E034, NULL, func_8038DE5C,
chYellowFlibbit_update, NULL, chYellowFlibbit_draw,
0, 0, 1.0f, 0
};
s32 D_80390B04[3] = {0xFF, 0xB3, 0};
@ -184,7 +184,7 @@ bool func_8038D930(Actor *this) {
return var_v1;
}
void func_8038D9D0(Actor *this, s32 next_state) {
void chYellowFlibbit_setState(Actor *this, s32 next_state) {
ActorLocal_Yellow_Flibbit *local;
local = (ActorLocal_Yellow_Flibbit *)&this->local;
@ -215,12 +215,12 @@ void func_8038D9D0(Actor *this, s32 next_state) {
}
if (next_state == 5) {
if (mapSpecificFlags_get(0x10)) {
func_8038D9D0(this, 4);
chYellowFlibbit_setState(this, 4);
return;
}
if (!func_8038D930(this)){
if ((this->state != 6)) {
func_8038D9D0(this, 6);
chYellowFlibbit_setState(this, 6);
}
return;
}
@ -269,7 +269,7 @@ void func_8038DD9C(ActorMarker *marker, ActorMarker *other_marker){
this = marker_getActor(marker);
if(this->state < 9){
func_8038D9D0(this, 7);
chYellowFlibbit_setState(this, 7);
}
}
@ -278,7 +278,7 @@ void func_8038DDDC(ActorMarker *marker, ActorMarker *other_marker){
this = marker_getActor(marker);
if(this->state < 9){
func_8038D9D0(this, 8);
chYellowFlibbit_setState(this, 8);
}
}
@ -287,11 +287,11 @@ void func_8038DE1C(ActorMarker *marker, ActorMarker *other_marker){
this = marker_getActor(marker);
if(this->state < 9){
func_8038D9D0(this, 9);
chYellowFlibbit_setState(this, 9);
}
}
Actor *func_8038DE5C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
Actor *chYellowFlibbit_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
Actor *this;
ActorLocal_Yellow_Flibbit *local;
s32 var_s0;
@ -325,7 +325,7 @@ Actor *func_8038DE5C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
return this;
}
void BGS_func_8038E034(Actor *this) {
void chYellowFlibbit_update(Actor *this) {
f32 spB4[3];
f32 spA8[3];
f32 spA4;
@ -357,7 +357,7 @@ void BGS_func_8038E034(Actor *this) {
local->unk10[0] = (s16) (s32) this->position[0];
local->unk10[1] = (s16) (s32) this->position[1];
local->unk10[2] = (s16) (s32) this->position[2];
func_8038D9D0(this, 1);
chYellowFlibbit_setState(this, 1);
if (jiggyscore_isSpawned(JIGGY_24_BGS_FLIBBITS) != 0) {
marker_despawn(this->marker);
}
@ -384,7 +384,7 @@ void BGS_func_8038E034(Actor *this) {
if(this->state == 1){
if(mapSpecificFlags_getClear(0x12)){
func_8038D9D0(this, 2);
chYellowFlibbit_setState(this, 2);
return;
}
@ -396,22 +396,22 @@ void BGS_func_8038E034(Actor *this) {
if(this->state == 2){
if(ml_timer_update(&local->unk1C, sp9C)){
func_8038D9D0(this, 3);
chYellowFlibbit_setState(this, 3);
}
}
if(this->state == 3){
if (func_80329210(this, spB4)) {
func_8038D9D0(this, 5);
chYellowFlibbit_setState(this, 5);
} else {
func_8038D9D0(this, 1);
chYellowFlibbit_setState(this, 1);
}
}
if(this->state == 4){
if(!mapSpecificFlags_get(0x10))
func_8038D9D0(this, 5);
chYellowFlibbit_setState(this, 5);
}
if (this->state == 5) {
@ -424,9 +424,9 @@ void BGS_func_8038E034(Actor *this) {
sp7C[1] = (f32) local->unk10[1];
sp7C[2] = (f32) local->unk10[2];
if (ml_vec3f_distance(this->position, sp7C) < 30.0f) {
func_8038D9D0(this, 1);
chYellowFlibbit_setState(this, 1);
} else {
func_8038D9D0(this, 5);
chYellowFlibbit_setState(this, 5);
}
} else {
@ -456,16 +456,16 @@ void BGS_func_8038E034(Actor *this) {
func_80258A4C(this->position, this->yaw - 90.0f, spB4, &sp5C, &sp58, &sp54);
this->yaw += sp54 * 90.0f * sp9C;
if ((-0.4 <= sp54) && (sp54 <= 0.4) && ((f64) randf() > 0.5)) {
func_8038D9D0(this, 5);
chYellowFlibbit_setState(this, 5);
}
if ((sp58 < 0.0f) && (randf() > 0.5)) {
func_8038D9D0(this, 5);
chYellowFlibbit_setState(this, 5);
}
}
if(this->state == 7 || this->state == 8){
if(ml_timer_update(&local->unk1C, sp9C)){
func_8038D9D0(this, 6);
chYellowFlibbit_setState(this, 6);
}
}
@ -484,13 +484,13 @@ void BGS_func_8038E034(Actor *this) {
local->unk18 -= 3000.0f*sp9C;
if(this->position_y < mapModel_getFloorY(this->position)){
this->position_y = mapModel_getFloorY(this->position);
func_8038D9D0(this, 10);
chYellowFlibbit_setState(this, 10);
}
}
if(this->state == 10){
if(skeletalAnim_getLoopCount(this->unk148) > 0){
func_8038D9D0(this, 11);
chYellowFlibbit_setState(this, 11);
}
}
}

32
src/BGS/ch/yumblie.c
View File

@ -24,13 +24,13 @@ typedef struct chyumblie_s{
ActorMarker *game_marker;
} ActorLocal_Yumblie;
void chyumblie_set_state(Actor*, enum chyumblie_state_e);
void chyumblie_update(Actor *);
Actor *chyumblie_draw(ActorMarker *this, Gfx **gfx, Mtx** mtx, Vtx **vtx);
void chYumblie_setState(Actor*, enum chyumblie_state_e);
void chYumblie_update(Actor *);
Actor *chYumblie_draw(ActorMarker *this, Gfx **gfx, Mtx** mtx, Vtx **vtx);
/* .data */
ActorInfo D_80390A40 = {MARKER_C7_YUMBLIE, ACTOR_139_YUMBLIE, ASSET_3F6_MODEL_YUMBLIE, 0x00, NULL,
chyumblie_update, NULL, chyumblie_draw,
ActorInfo gChYumblie = {MARKER_C7_YUMBLIE, ACTOR_139_YUMBLIE, ASSET_3F6_MODEL_YUMBLIE, 0x00, NULL,
chYumblie_update, NULL, chYumblie_draw,
0, 0, 0.0f, 0
};
@ -53,7 +53,7 @@ bool func_8038B160(Actor *this){
return BOOL(randf() >= 0.5);
}
void chyumblie_set_state(Actor* this, enum chyumblie_state_e next_state){
void chYumblie_setState(Actor* this, enum chyumblie_state_e next_state){
ActorLocal_Yumblie *s0;
s0 = (ActorLocal_Yumblie *)&this->local;
@ -100,7 +100,7 @@ bool chyumblie_is_edible(ActorMarker * arg0){
return (actPtr->state >= 2) && (actPtr->state < 5);
}
Actor *chyumblie_draw(ActorMarker *this, Gfx **gfx, Mtx** mtx, Vtx **vtx){
Actor *chYumblie_draw(ActorMarker *this, Gfx **gfx, Mtx** mtx, Vtx **vtx){
Actor *thisActor;
ActorLocal_Yumblie *sp40;
f32 sp44[3];
@ -134,14 +134,14 @@ bool func_8038B684(ActorMarker * arg0){
Actor* actPtr = marker_getActor(arg0);
if( actPtr->state < 5){
chyumblie_set_state(actPtr, YUMBLIE_STATE_5_BEING_EATEN);
chYumblie_setState(actPtr, YUMBLIE_STATE_5_BEING_EATEN);
return TRUE;
}
return FALSE;
}
void chyumblie_update(Actor *this){
void chYumblie_update(Actor *this){
ActorLocal_Yumblie *s0;
f32 sp50;
f32 sp4C;
@ -156,7 +156,7 @@ void chyumblie_update(Actor *this){
s0->unk0 = 0.0f;
s0->unk4 = 0;
s0->game_marker = NULL;
chyumblie_set_state(this, YUMBLIE_STATE_1_UNDER_GROUND);
chYumblie_setState(this, YUMBLIE_STATE_1_UNDER_GROUND);
return;
}
@ -167,10 +167,10 @@ void chyumblie_update(Actor *this){
if(this->state == YUMBLIE_STATE_1_UNDER_GROUND){
if(ml_timer_update(&s0->unk8, sp4C)){
if(mapSpecificFlags_get(6) && (12 > chvilegame_get_piece_count(s0->game_marker))){
chyumblie_set_state(this, YUMBLIE_STATE_2_APPEAR);
chYumblie_setState(this, YUMBLIE_STATE_2_APPEAR);
}
else{
chyumblie_set_state(this, YUMBLIE_STATE_1_UNDER_GROUND);
chYumblie_setState(this, YUMBLIE_STATE_1_UNDER_GROUND);
}
}
}
@ -192,13 +192,13 @@ void chyumblie_update(Actor *this){
if( 0 < skeletalAnim_getLoopCount(this->unk148)){
s0->unk0 = 1.0f;
chyumblie_set_state(this,YUMBLIE_STATE_3_ABOVE_GROUND);
chYumblie_setState(this,YUMBLIE_STATE_3_ABOVE_GROUND);
}
}
if(this->state == YUMBLIE_STATE_3_ABOVE_GROUND){
if( ml_timer_update(&s0->unk8,sp4C) || !mapSpecificFlags_get(6) ){
chyumblie_set_state(this,YUMBLIE_STATE_4_DISAPPEAR);
chYumblie_setState(this,YUMBLIE_STATE_4_DISAPPEAR);
}
}
@ -208,13 +208,13 @@ void chyumblie_update(Actor *this){
if(0.0f >= s0->unk0){
s0->unk0 = 0.0f;
chyumblie_set_state(this,YUMBLIE_STATE_1_UNDER_GROUND);
chYumblie_setState(this,YUMBLIE_STATE_1_UNDER_GROUND);
}
}
if(this->state == YUMBLIE_STATE_5_BEING_EATEN){
if( ml_timer_update(&s0->unk8,sp4C)){
chyumblie_set_state(this,YUMBLIE_STATE_1_UNDER_GROUND);
chYumblie_setState(this,YUMBLIE_STATE_1_UNDER_GROUND);
}
}
}

12
src/BGS/code_3030.c
View File

@ -13,12 +13,12 @@ void chChoirTurtle_update(Actor *this);
Actor *chChoirTurtle_draw(ActorMarker *marker, Gfx **, Mtx **, Vtx**);
/* .data */
ActorInfo chChoirTurtleYellow = { MARKER_19B_CHOIR_TURTLE_YELLOW, ACTOR_27B_CHOIR_TURTLE_YELLOW, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, chChoirTurtle_update, NULL, chChoirTurtle_draw, 0, 0, 1.5f, 0};
ActorInfo chChoirTurtleCyan = { MARKER_19C_CHOIR_TURTLE_CYAN, ACTOR_27C_CHOIR_TURTLE_CYAN, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, chChoirTurtle_update, NULL, chChoirTurtle_draw, 0, 0, 1.5f, 0};
ActorInfo chChoirTurtleBlue = { MARKER_19D_CHOIR_TURTLE_BLUE, ACTOR_27D_CHOIR_TURTLE_BLUE, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, chChoirTurtle_update, NULL, chChoirTurtle_draw, 0, 0, 1.5f, 0};
ActorInfo chChoirTurtleRed = { MARKER_19E_CHOIR_TURTLE_RED, ACTOR_27E_CHOIR_TURTLE_RED, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, chChoirTurtle_update, NULL, chChoirTurtle_draw, 0, 0, 1.5f, 0};
ActorInfo chChoirTurtlePink = { MARKER_19F_CHOIR_TURTLE_PINK, ACTOR_27F_CHOIR_TURTLE_PINK, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, chChoirTurtle_update, NULL, chChoirTurtle_draw, 0, 0, 1.5f, 0};
ActorInfo chChoirTurtlePurple = { MARKER_1A0_CHOIR_TURTLE_PURPLE, ACTOR_280_CHOIR_TURTLE_PURPLE, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, chChoirTurtle_update, NULL, chChoirTurtle_draw, 0, 0, 1.5f, 0};
ActorInfo gChChoirTurtleYellow = { MARKER_19B_CHOIR_TURTLE_YELLOW, ACTOR_27B_CHOIR_TURTLE_YELLOW, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, chChoirTurtle_update, NULL, chChoirTurtle_draw, 0, 0, 1.5f, 0};
ActorInfo gChChoirTurtleCyan = { MARKER_19C_CHOIR_TURTLE_CYAN, ACTOR_27C_CHOIR_TURTLE_CYAN, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, chChoirTurtle_update, NULL, chChoirTurtle_draw, 0, 0, 1.5f, 0};
ActorInfo gChChoirTurtleBlue = { MARKER_19D_CHOIR_TURTLE_BLUE, ACTOR_27D_CHOIR_TURTLE_BLUE, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, chChoirTurtle_update, NULL, chChoirTurtle_draw, 0, 0, 1.5f, 0};
ActorInfo gChChoirTurtleRed = { MARKER_19E_CHOIR_TURTLE_RED, ACTOR_27E_CHOIR_TURTLE_RED, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, chChoirTurtle_update, NULL, chChoirTurtle_draw, 0, 0, 1.5f, 0};
ActorInfo gChChoirTurtlePink = { MARKER_19F_CHOIR_TURTLE_PINK, ACTOR_27F_CHOIR_TURTLE_PINK, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, chChoirTurtle_update, NULL, chChoirTurtle_draw, 0, 0, 1.5f, 0};
ActorInfo gChChoirTurtlePurple = { MARKER_1A0_CHOIR_TURTLE_PURPLE, ACTOR_280_CHOIR_TURTLE_PURPLE, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, chChoirTurtle_update, NULL, chChoirTurtle_draw, 0, 0, 1.5f, 0};
/* .code */
void chChoirTurtle_returnState(ActorMarker *marker) {

2
src/BGS/code_3420.c
View File

@ -35,7 +35,7 @@ void func_8038A068(Actor *this, s32 next_state);
void chvilegame_update(Actor *this);
/* .data */
ActorInfo D_80390960 = {
ActorInfo gChVileGame = {
MARKER_C6_VILE_GAME_CTRL, ACTOR_138_VILE_GAME_CTRL, 0,
0, NULL,
chvilegame_update, NULL, func_80325340,

116
src/BGS/code_8DF0.c
View File

@ -4,66 +4,66 @@
#include "prop.h"
#include "actor.h"
extern ActorInfo D_80390804;
extern ActorInfo D_80390690;
extern ActorInfo chPinkEggLargest;
extern ActorInfo chPinkEggLarge;
extern ActorInfo chPinkEggMedium;
extern ActorInfo chPinkEggSmall;
extern ActorInfo chPinkEggSmallest;
extern ActorInfo chMudHut;
extern ActorInfo chTanktup;
extern ActorInfo D_80390C88;
extern ActorInfo D_80390CC8;
extern ActorInfo D_80390D08;
extern ActorInfo D_80390D48;
extern ActorInfo chFrogMinigame;
extern ActorInfo BGS_D_80390AE0;
extern ActorInfo D_80390960;
extern ActorInfo D_80390A40;
extern ActorInfo D_80390A70;
extern ActorInfo chTiptup;
extern ActorInfo chChoirTurtleYellow;
extern ActorInfo chChoirTurtleCyan;
extern ActorInfo chChoirTurtleBlue;
extern ActorInfo chChoirTurtleRed;
extern ActorInfo chChoirTurtlePink;
extern ActorInfo chChoirTurtlePurple;
extern ActorInfo chLeafBoat;
extern ActorInfo chLargeCrocodile;
extern ActorInfo chLongSwampSwitch;
extern ActorInfo chShortSwampSwitch;
extern ActorInfo gChCroctus;
extern ActorInfo gChFlibbit;
extern ActorInfo gChPinkEggLargest;
extern ActorInfo gChPinkEggLarge;
extern ActorInfo gChPinkEggMedium;
extern ActorInfo gChPinkEggSmall;
extern ActorInfo gChPinkEggSmallest;
extern ActorInfo gChMudHut;
extern ActorInfo gChTanktup;
extern ActorInfo gChTanktupLegFrontLeft;
extern ActorInfo gChTanktupLegBackLeft;
extern ActorInfo gChTanktupLegFrontRight;
extern ActorInfo gChTanktupLegBackRight;
extern ActorInfo gChFrogMinigame;
extern ActorInfo gChYellowFlibbit;
extern ActorInfo gChVileGame;
extern ActorInfo gChYumblie;
extern ActorInfo gChVile;
extern ActorInfo gChTiptup;
extern ActorInfo gChChoirTurtleYellow;
extern ActorInfo gChChoirTurtleCyan;
extern ActorInfo gChChoirTurtleBlue;
extern ActorInfo gChChoirTurtleRed;
extern ActorInfo gChChoirTurtlePink;
extern ActorInfo gChChoirTurtlePurple;
extern ActorInfo gChLeafBoat;
extern ActorInfo gChLargeCrocodile;
extern ActorInfo gChLongSwampSwitch;
extern ActorInfo gChShortSwampSwitch;
void BGS_func_8038F1E0(void){//bgs_updateSpawnableActors
spawnableActorList_add(&D_80390804, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);//croctus
spawnableActorList_add(&D_80390690, actor_new, ACTOR_FLAG_UNKNOWN_25 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_0); //flibbit
spawnableActorList_add(&chPinkEggLargest, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_largest
spawnableActorList_add(&chPinkEggLarge, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_large
spawnableActorList_add(&chPinkEggMedium, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_medium
spawnableActorList_add(&chPinkEggSmall, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_small
spawnableActorList_add(&chPinkEggSmallest, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_smallest
spawnableActorList_add(&chMudHut, actor_new, ACTOR_FLAG_NONE); //mudhut_top
spawnableActorList_add(&chTanktup, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_3);//tanktup
spawnableActorList_add(&D_80390C88, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
spawnableActorList_add(&D_80390CC8, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
spawnableActorList_add(&D_80390D08, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
spawnableActorList_add(&D_80390D48, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
spawnableActorList_add(&chFrogMinigame, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_0);
spawnableActorList_add(&BGS_D_80390AE0, actor_new, ACTOR_FLAG_UNKNOWN_25 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_0); //yellow_flibbit
spawnableActorList_add(&D_80390960, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&D_80390A40, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7); //yumblie
spawnableActorList_add(&D_80390A70, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_1); //mr. vile
spawnableActorList_add(&chTiptup, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup
spawnableActorList_add(&chChoirTurtleYellow, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&chChoirTurtleCyan, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&chChoirTurtleBlue, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&chChoirTurtleRed, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&chChoirTurtlePink, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&chChoirTurtlePurple, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&chLeafBoat, actor_new, ACTOR_FLAG_UNKNOWN_14); //leafboat
spawnableActorList_add(&chLargeCrocodile, actor_new, ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7); //bigAlligator
spawnableActorList_add(&chLongSwampSwitch, actor_new, ACTOR_FLAG_UNKNOWN_3); //green_jiggy_switch
spawnableActorList_add(&chShortSwampSwitch, actor_new, ACTOR_FLAG_UNKNOWN_3); //green_jiggy_switch
spawnableActorList_add(&gChCroctus, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);//croctus
spawnableActorList_add(&gChFlibbit, actor_new, ACTOR_FLAG_UNKNOWN_25 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_0); //flibbit
spawnableActorList_add(&gChPinkEggLargest, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_largest
spawnableActorList_add(&gChPinkEggLarge, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_large
spawnableActorList_add(&gChPinkEggMedium, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_medium
spawnableActorList_add(&gChPinkEggSmall, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_small
spawnableActorList_add(&gChPinkEggSmallest, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_smallest
spawnableActorList_add(&gChMudHut, actor_new, ACTOR_FLAG_NONE); //mudhut_top
spawnableActorList_add(&gChTanktup, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_3);//tanktup
spawnableActorList_add(&gChTanktupLegFrontLeft, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
spawnableActorList_add(&gChTanktupLegBackLeft, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
spawnableActorList_add(&gChTanktupLegFrontRight, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
spawnableActorList_add(&gChTanktupLegBackRight, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
spawnableActorList_add(&gChFrogMinigame, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_0);
spawnableActorList_add(&gChYellowFlibbit, actor_new, ACTOR_FLAG_UNKNOWN_25 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_0); //yellow_flibbit
spawnableActorList_add(&gChVileGame, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add(&gChYumblie, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7); //yumblie
spawnableActorList_add(&gChVile, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_1); //mr. vile
spawnableActorList_add(&gChTiptup, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup
spawnableActorList_add(&gChChoirTurtleYellow, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&gChChoirTurtleCyan, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&gChChoirTurtleBlue, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&gChChoirTurtleRed, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&gChChoirTurtlePink, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&gChChoirTurtlePurple, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
spawnableActorList_add(&gChLeafBoat, actor_new, ACTOR_FLAG_UNKNOWN_14); //leafboat
spawnableActorList_add(&gChLargeCrocodile, actor_new, ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7); //bigAlligator
spawnableActorList_add(&gChLongSwampSwitch, actor_new, ACTOR_FLAG_UNKNOWN_3); //green_jiggy_switch
spawnableActorList_add(&gChShortSwampSwitch, actor_new, ACTOR_FLAG_UNKNOWN_3); //green_jiggy_switch
}

28
src/BGS/code_9750.c
View File

@ -7,53 +7,53 @@ void timed_exitStaticCamera(f32);
void timedFunc_set_2(f32, void(*)(s32, s32), s32, s32);
void func_8028E668(f32[3], f32, f32, f32);
void func_8038FBF8(Actor *);
void chTanktupLeg_update(Actor *);
ActorAnimationInfo D_80390C70[3] = {
ActorAnimationInfo chTanktupLegFrontLeftAnimations[3] = {
{0, 0.0f},
{0x103, 8000000.0f},
{0x103, 0.75f}
};
ActorInfo D_80390C88 = {MARKER_6D_TANKTUP_LEG, ACTOR_E9_TANKTUP_LEG_FL, ASSET_3EF_MODEL_TANKTUP_LEG_FL, 0x01, D_80390C70,
func_8038FBF8, actor_update_func_80326224, actor_draw,
ActorInfo gChTanktupLegFrontLeft = {MARKER_6D_TANKTUP_LEG, ACTOR_E9_TANKTUP_LEG_FL, ASSET_3EF_MODEL_TANKTUP_LEG_FL, 0x01, chTanktupLegFrontLeftAnimations,
chTanktupLeg_update, actor_update_func_80326224, actor_draw,
0, 0x166, 0.0f, 0
};
u8 pad_80390CCC[4] = {0};
ActorAnimationInfo BGS_D_80390CB0[3] = {
ActorAnimationInfo chTanktupLegBackLeftAnimations[3] = {
{0, 0.0f},
{0x104, 8000000.0f},
{0x104, 0.75f}
};
ActorInfo D_80390CC8 = {MARKER_6D_TANKTUP_LEG, ACTOR_EA_TANKTUP_LEG_BL, ASSET_3F0_MODEL_TANKTUP_LEG_BL, 0x01, BGS_D_80390CB0,
func_8038FBF8, actor_update_func_80326224, actor_draw,
ActorInfo gChTanktupLegBackLeft = {MARKER_6D_TANKTUP_LEG, ACTOR_EA_TANKTUP_LEG_BL, ASSET_3F0_MODEL_TANKTUP_LEG_BL, 0x01, chTanktupLegBackLeftAnimations,
chTanktupLeg_update, actor_update_func_80326224, actor_draw,
0, 0x166, 0.0f, 0
};
u8 pad_80390CEC[4] = {0};
ActorAnimationInfo BGS_D_80390CF0[3] = {
ActorAnimationInfo chTanktupLegFrontRightAnimations[3] = {
{0, 0.0f},
{0x105, 8000000.0f},
{0x105, 0.75f}
};
ActorInfo D_80390D08 = {MARKER_6D_TANKTUP_LEG, ACTOR_EB_TANKTUP_LEG_FR, ASSET_3F1_MODEL_TANKTUP_LEG_FR, 0x01, BGS_D_80390CF0,
func_8038FBF8, actor_update_func_80326224, actor_draw,
ActorInfo gChTanktupLegFrontRight = {MARKER_6D_TANKTUP_LEG, ACTOR_EB_TANKTUP_LEG_FR, ASSET_3F1_MODEL_TANKTUP_LEG_FR, 0x01, chTanktupLegFrontRightAnimations,
chTanktupLeg_update, actor_update_func_80326224, actor_draw,
0, 0x166, 0.0f, 0
};
u8 pad_80390C2C[4] = {0};
ActorAnimationInfo D_80390C30[3] = {
ActorAnimationInfo chTanktupLegBackRightAnimations[3] = {
{0, 0.0f},
{0x106, 8000000.0f},
{0x106, 0.75f}
};
ActorInfo D_80390D48 = {MARKER_6D_TANKTUP_LEG, ACTOR_EC_TANKTUP_LEG_BR, ASSET_3F2_MODEL_TANKTUP_LEG_BR, 0x01, D_80390C30,
func_8038FBF8, actor_update_func_80326224, actor_draw,
ActorInfo gChTanktupLegBackRight = {MARKER_6D_TANKTUP_LEG, ACTOR_EC_TANKTUP_LEG_BR, ASSET_3F2_MODEL_TANKTUP_LEG_BR, 0x01, chTanktupLegBackRightAnimations,
chTanktupLeg_update, actor_update_func_80326224, actor_draw,
0, 0x166, 0.0f, 0
};
@ -77,7 +77,7 @@ void BGS_func_8038FB84(ActorMarker *this, ActorMarker *other_marker){
this->collidable = FALSE;
}
void func_8038FBF8(Actor *this){
void chTanktupLeg_update(Actor *this){
if(!this->initialized){
this->initialized = TRUE;
this->marker->propPtr->unk8_3 = 1;

4
src/CC/code_1F70.c
View File

@ -120,7 +120,7 @@ void CC_func_8038868C(void) {
timedFunc_set_0(13.0f, &func_80388664);
timed_setStaticCameraToNode(16.0f, 1);
if (jiggyscore_isCollected(JIGGY_17_CC_CLANKER_RAISED) == 0) {
func_80324DBC(18.0f, 0xD2C, 4, NULL, NULL, NULL, 0);
func_80324DBC(18.0f, ASSET_D2C_DIALOG_CLANKER_KEY_COMPLETE, 4, NULL, NULL, NULL, 0);
}
timed_exitStaticCamera(18.0f);
func_80324E38(18.0f, 0);
@ -360,7 +360,7 @@ void CC_func_80388F4C(void){
if(D_80389FA0.unk20 && skeletalAnim_getAnimId(D_80389FA0.unk0) != ASSET_C4_ANIM_CLANKER_BITE){
skeletalAnim_set(D_80389FA0.unk0, ASSET_C4_ANIM_CLANKER_BITE, 1.0f, 10.0f);
if(!D_80389FA0.unk48){
gcdialog_showDialog(ASSET_D2B_DIALOG_UNKNOWN, 0xE, D_80389FA0.unk28, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_D2B_DIALOG_CLANKER_MEET, 0xE, D_80389FA0.unk28, NULL, NULL, NULL);
D_80389FA0.unk48 = TRUE;
}
}//L8038918C

2
src/CC/code_BF0.c
View File

@ -127,7 +127,7 @@ void func_803870F8(Actor *this){
else if(this->state == 2 && 1.0f <= local->unk8){
flagCnt = levelSpecificFlags_get(LEVEL_FLAG_0_CC_TOKEN_TOOTH_OPEN) + levelSpecificFlags_get(LEVEL_FLAG_1_CC_JIGGY_TOOTH_OPEN);
if(!jiggyscore_isCollected(JIGGY_1B_CC_TOOTH)){
gcdialog_showDialog((local->unk0 == 1)? ((flagCnt == 0)? 0xd30 : 0xd31) : ((flagCnt == 0)? 0xd2e : 0xd2f), 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog((local->unk0 == 1)? ((flagCnt == 0)? ASSET_D30_DIALOG_CLANKER_RIGHT_TOOTH_FIRST : ASSET_D31_DIALOG_CLANKER_RIGHT_TOOTH_SECOND) : ((flagCnt == 0)? ASSET_D2E_DIALOG_CLANKER_LEFT_TOOTH_FIRST : ASSET_D2F_DIALOG_CLANKER_LEFT_TOOTH_SECOND), 4, NULL, NULL, NULL, NULL);
}
CC_func_80386FE0(this, 3);
}//L80387474

4
src/CCW/code_14B0.c
View File

@ -25,8 +25,8 @@ void CCW_func_80387A40(Actor *this);
/* .data */
Struct_CCW_14B0_0 D_8038EC00[] = {
{MAP_5B_CCW_SPRING_ZUBBA_HIVE, 0x7, 0x4C, 0xCE1},
{MAP_5C_CCW_AUTUMN_ZUBBA_HIVE, 0x8, 0x00, 0xCE5},
{MAP_5B_CCW_SPRING_ZUBBA_HIVE, 0x7, 0x4C, ASSET_CE1_DIALOG_ZUBBA_MEET_SPRING},
{MAP_5C_CCW_AUTUMN_ZUBBA_HIVE, 0x8, 0x00, ASSET_CE5_DIALOG_ZUBBA_MEET_FALL},
0
};

6
src/CCW/code_160.c
View File

@ -45,9 +45,9 @@ void func_803865F4(Actor *this, s32 next_state) {
local->unkC = 0.0f;
if (next_state == 2) {
if (!volatileFlag_getAndSet(VOLATILE_FLAG_B5, 1)) {
gcdialog_showDialog(0xCE2, 4, NULL, this->marker, func_803865C4, NULL);
gcdialog_showDialog(ASSET_CE2_DIALOG_ZUBBA_MEET_SUMMER, 4, NULL, this->marker, func_803865C4, NULL);
} else {
gcdialog_showDialog(0xCE3, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CE3_DIALOG_ZUBBA_RETURN, 4, NULL, NULL, NULL, NULL);
func_803865F4(this, 3);
return;
}
@ -65,7 +65,7 @@ void func_803865F4(Actor *this, s32 next_state) {
volatileFlag_set(VOLATILE_FLAG_3, 0);
volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, 1);
} else {
gcdialog_showDialog(0xCE4, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CE4_DIALOG_ZUBBA_COMPLETE, 4, NULL, NULL, NULL, NULL);
func_8025A58C(-1, 400);
comusic_8025AB44(COMUSIC_4B_CCW_ZUBBA_FIGHT, 0, 400);
func_8025AABC(COMUSIC_4B_CCW_ZUBBA_FIGHT);

4
src/CCW/code_2270.c
View File

@ -21,8 +21,8 @@ void chGobiCCW_update(Actor *this);
/* .data */
Struct_CCW_2270_0 D_8038ECD0[] = {
{MAP_44_CCW_SUMMER, 0xCDE, 0xCDF, 0x000},
{MAP_45_CCW_AUTUMN, 0x000, 0x000, 0xCE0},
{MAP_44_CCW_SUMMER, ASSET_CDE_DIALOG_CCW_GOBI_MEET_SUMMER, ASSET_CDF_DIALOG_CCW_GOBI_COMPLETE_SUMMER, 0x000},
{MAP_45_CCW_AUTUMN, 0x000, 0x000, ASSET_CE0_DIALOG_CCW_GOBI_COMPLETE_FALL},
0
};

12
src/CCW/code_3310.c
View File

@ -90,8 +90,8 @@ Struct_CCW_3310_1 D_8038F060[] = {
Struct_CCW_3310_0 D_8038F080[] = {
{MAP_43_CCW_SPRING, 0, FILEPROG_E6_SPRING_EYRIE_HATCHED, 0, NULL, 3, 0, NULL, 0x18F, D_8038EFC0, 0x190, D_8038F030, 0, 0, 0, 0},
{MAP_44_CCW_SUMMER, FILEPROG_E6_SPRING_EYRIE_HATCHED, FILEPROG_E7_SUMMER_EYRIE_FED, 0x191, D_8038EEA0, 2, 0x192, D_8038EF20, 0x193, D_8038EFC0, 0x194, D_8038F030, 2, 5, 0x21A, 0xCD7},
{MAP_45_CCW_AUTUMN, FILEPROG_E7_SUMMER_EYRIE_FED, FILEPROG_E8_AUTMN_EYRIE_FED, 0x195, D_8038EEA0, 2, 0x196, D_8038EF20, 0x197, D_8038EFC0, 0x198, D_8038F030, 4, 0xA, 0x21B, 0xCDA},
{MAP_44_CCW_SUMMER, FILEPROG_E6_SPRING_EYRIE_HATCHED, FILEPROG_E7_SUMMER_EYRIE_FED, 0x191, D_8038EEA0, 2, 0x192, D_8038EF20, 0x193, D_8038EFC0, 0x194, D_8038F030, 2, 5, 0x21A, ASSET_CD7_DIALOG_BABY_EYRIE_MEET_SUMMER},
{MAP_45_CCW_AUTUMN, FILEPROG_E7_SUMMER_EYRIE_FED, FILEPROG_E8_AUTMN_EYRIE_FED, 0x195, D_8038EEA0, 2, 0x196, D_8038EF20, 0x197, D_8038EFC0, 0x198, D_8038F030, 4, 0xA, 0x21B, ASSET_CDA_DIALOG_BABY_EYRIE_MEET_FALL},
0
};
@ -153,14 +153,14 @@ void func_803897B8(Actor *this, s32 next_state) {
skeletalAnim_set(this->unk148, local->unk0->unk14, 0.5f, 8.5f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
if (local->unk0->map_id == MAP_43_CCW_SPRING) {
gcdialog_showDialog(0xCD6, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CD6_DIALOG_BABY_EYRIE_HATCH, 4, NULL, NULL, NULL, NULL);
skeletalAnim_setCallback_0(this->unk148, 0.65f, &func_80389798);
}
if (local->unk0->map_id == MAP_44_CCW_SUMMER) {
gcdialog_showDialog(0xCD9, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CD9_DIALOG_BABY_EYRIE_COMPLETE_SUMMER, 4, NULL, NULL, NULL, NULL);
}
if (local->unk0->map_id == MAP_45_CCW_AUTUMN) {
gcdialog_showDialog(0xCDB, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CDB_DIALOG_BABY_EYRIE_COMPLETE_FALL, 4, NULL, NULL, NULL, NULL);
}
local->unk8 = local->unk0->unk18;
}
@ -274,7 +274,7 @@ void CCW_func_80389BFC(Actor *this) {
if ((local->unk0->unkE != 0) && (carriedObj_getActorId() == ACTOR_2A2_CATERPILLAR) && (ml_vec3f_distance(this->position, sp4C) < 1010.0f) && (player_throwCarriedObject() != 0)) {
player_setThrowTargetPosition(D_8038FDE0);
if ((local->unk0->map_id == MAP_44_CCW_SUMMER) && (local->unk4 == 0)) {
gcdialog_showDialog(0xCD8, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CD8_DIALOG_BABY_EYRIE_CHECK_SUMMER, 4, NULL, NULL, NULL, NULL);
}
local->unk4++;
if (local->unk4 < local->unk0->unk25) {

2
src/CCW/code_3DA0.c
View File

@ -153,7 +153,7 @@ void chcaterpillar_update(Actor *this){
if(ml_vec3f_distance(this->position, sp74) < 50.0f){
func_8028F030(ACTOR_2A2_CATERPILLAR);
if(!volatileFlag_get(VOLATILE_FLAG_B2)){
gcdialog_showDialog(ASSET_CC7_DIALOG_UNKNOWN, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CC7_DIALOG_CATERPILLAR_COLLECT, 4, NULL, NULL, NULL, NULL);
volatileFlag_set(VOLATILE_FLAG_B2, TRUE);
}
sfx_playFadeShorthandDefault(SFX_C5_TWINKLY_POP, 1.0f, 25000, this->position, 0x1f4, 0x9c4);

2
src/CCW/code_4530.c
View File

@ -44,7 +44,7 @@ void func_8038A950(Actor *this, s32 next_state) {
skeletalAnim_set(this->unk148, 0x199, 0.0f, 6.5f);
}
if (next_state == 2) {
gcdialog_showDialog(0xCDC, 0xA, this->position, this->marker, func_8038A920, NULL);
gcdialog_showDialog(ASSET_CDC_DIALOG_ADULT_EYRIE_MEET_WINTER, 0xA, this->position, this->marker, func_8038A920, NULL);
}
if (next_state == 3) {
skeletalAnim_set(this->unk148, 0x19A, 0.0f, 7.0f);

2
src/CCW/code_4960.c
View File

@ -28,7 +28,7 @@ Struct_CCW_4960_0 D_8038F254[] = {
/* .code */
void func_8038AD50(Actor *this, s32 next_state) {
if (next_state == 2) {
gcdialog_showDialog(0xCDD, 0, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CDD_DIALOG_ADULT_EYRIE_COMPLETE_WINTER, 0, NULL, NULL, NULL, NULL);
if (this->state == 1) {
mapSpecificFlags_set(6, 0);
timed_setStaticCameraToNode(0.0f, 1);

2
src/CCW/code_4D00.c
View File

@ -90,7 +90,7 @@ void func_8038B19C(Actor *this) {
}
if (!this->has_met_before && func_803292E0(this)) {
this->has_met_before = TRUE;
gcdialog_showDialog(0xCC8, 0, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CC8_DIALOG_NABNUT_MEET_SPRING, 0, NULL, NULL, NULL, NULL);
}
func_8028E668(this->position, 300.0f, -50.0f, 120.0f);
}

2
src/CCW/code_50D0.c
View File

@ -92,7 +92,7 @@ void func_8038B87C(Actor *this) {
}
if (!this->has_met_before && func_803292E0(this)) {
this->has_met_before = TRUE;
gcdialog_showDialog(0xCC9, 0, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CC9_DIALOG_NABNUT_MEET_SUMMER, 0, NULL, NULL, NULL, NULL);
}
func_8028E668(this->position, 300.0f, -50.0f, 120.0f);
}

6
src/CCW/code_5540.c
View File

@ -49,7 +49,7 @@ void chnabnut_setState(Actor *this, s32 next_state) {
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
func_80324E38(0.0f, 3);
timed_setStaticCameraToNode(0.0f, 0xB);
gcdialog_showDialog(0xCCC, 0x20, this->position, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CCC_DIALOG_NABNUT_ACORN_COMPLETE, 0x20, this->position, NULL, NULL, NULL);
}
if (next_state == NABNUT_STATE_4_THANK_PLAYER) {
@ -135,7 +135,7 @@ void chnabnut_update(Actor *this) {
player_getPosition(sp30);
if (!this->has_met_before && (ml_vec3f_distance(this->position, sp30) < 400.0f)) {
this->has_met_before = TRUE;
gcdialog_showDialog(0xCCA, 0xE, this->position, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CCA_DIALOG_NABNUT_MEET_FALL, 0xE, this->position, NULL, NULL, NULL);
}
if (item_getCount(ITEM_23_ACORNS) > 0) {
func_80258A4C(this->position, this->yaw - 90.0f, sp30, &sp2C, &sp28, &sp24);
@ -149,7 +149,7 @@ void chnabnut_update(Actor *this) {
if (local->returned_acorn_count == 6) {
chnabnut_setState(this, NABNUT_STATE_2_WAIT);
} else if (item_getCount(ITEM_23_ACORNS) == 1) {
gcdialog_showDialog(0xCCB, 0x20, this->position, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CCB_DIALOG_NABNUT_ACORN_CHECK, 0x20, this->position, NULL, NULL, NULL);
}
}
}

2
src/CCW/code_5BF0.c
View File

@ -116,7 +116,7 @@ void func_8038C41C(Actor *this) {
player_getPosition(sp2C);
if (!this->has_met_before && (ml_vec3f_distance(this->position, sp2C) < 400.0f)) {
this->has_met_before = TRUE;
gcdialog_showDialog(0xCCD, 0, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CCD_DIALOG_NABNUT_MEET_WINTER, 0, NULL, NULL, NULL, NULL);
}
}
}

6
src/CCW/code_6620.c
View File

@ -20,9 +20,9 @@ void func_8038CC4C(Actor *this);
/* .data */
Struct_CCW_6620_0 D_8038F490[] ={
{0x43, 0, 0xCCE},
{0x45, 1, 0xCD1},
{0x46, 1, 0xCD3},
{0x43, 0, ASSET_CCE_DIALOG_GNAWTY_MEET_SPRING},
{0x45, 1, ASSET_CD1_DIALOG_GNAWTY_MEET_FALL_OUTSIDE},
{0x46, 1, ASSET_CD3_DIALOG_GNAWTY_MEET_WINTER_OUTSIDE},
0
};

2
src/CCW/code_6AC0.c
View File

@ -61,7 +61,7 @@ void func_8038CEB0(Actor *this, s32 next_state) {
this->marker->propPtr->unk8_3 = FALSE;
skeletalAnim_set(this->unk148, 0x1A7, 0.2f, 3.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
gcdialog_showDialog(0xCD0, 0x24, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CD0_DIALOG_GNAWTY_COMPLETE_SUMMER, 0x24, NULL, NULL, NULL, NULL);
}
if (next_state == 3) {
skeletalAnim_set(this->unk148, 0x1A8, 0.2f, 0.5f);

4
src/CCW/code_6EC0.c
View File

@ -17,8 +17,8 @@ Actor *func_8038D30C(ActorMarker* marker, Gfx** gfx, Mtx** mtx, Vtx** vtx);
/* .data */
Struct_CCW_6EC0_0 D_8038F600[] = {
{MAP_45_CCW_AUTUMN, 0xCD2, 0},
{MAP_46_CCW_WINTER, 0xCD4, 0xCD5},
{MAP_45_CCW_AUTUMN, ASSET_CD2_DIALOG_GNAWTY_MEET_FALL_INSIDE, 0},
{MAP_46_CCW_WINTER, ASSET_CD4_DIALOG_GNAWTY_MEET_WINTER_INSIDE_JIGGY, ASSET_CD5_DIALOG_GNAWTY_MEET_WINTER_INSIDE_AFTER_JIGGY},
0
};

10
src/FP/ch/bearcub.c
View File

@ -124,9 +124,9 @@ void func_8038A384(Actor *this){
}//L8038A4E4
sp34 = levelSpecificFlags_get(LEVEL_FLAG_11_FP_UNKNOWN) + levelSpecificFlags_get(LEVEL_FLAG_12_FP_UNKNOWN) + levelSpecificFlags_get(LEVEL_FLAG_13_FP_UNKNOWN);
sp38 = (sp34 == 1) ? ASSET_C17_DIALOG_UNKNOWN
: (sp34 == 2) ? ASSET_C18_DIALOG_UNKNOWN
: ASSET_C19_DIALOG_UNKNOWN;
sp38 = (sp34 == 1) ? ASSET_C17_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_1
: (sp34 == 2) ? ASSET_C18_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_2
: ASSET_C19_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_3;
this->yaw_ideal = (f32)func_80329784(this);
func_80328FB0(this, 2.0f);
@ -140,7 +140,7 @@ void func_8038A384(Actor *this){
&& !jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3)
&& !jiggyscore_isSpawned(JIGGY_2C_FP_BOGGY_3)
){
if (gcdialog_showDialog(ASSET_C1A_DIALOG_UNKNOWN, 0x2a, NULL, NULL, NULL, NULL)) {
if (gcdialog_showDialog(ASSET_C1A_DIALOG_BOGGY_KIDS_MEET, 0x2a, NULL, NULL, NULL, NULL)) {
levelSpecificFlags_set(LEVEL_FLAG_19_FP_UNKNOWN, TRUE);
}
}
@ -163,7 +163,7 @@ void func_8038A384(Actor *this){
}
if(levelSpecificFlags_get(D_80391E80[sp3C].unk0)){
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
if (sp38 == ASSET_C19_DIALOG_UNKNOWN) {
if (sp38 == ASSET_C19_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_3) {
gcdialog_showDialog(sp38, 0x2f, this->position, this->marker, func_8038A318, NULL);
}
else {

8
src/FP/ch/boggy1.c
View File

@ -85,8 +85,8 @@ void func_803877A8(ActorMarker *caller, enum asset_e text_id, s32 arg2){
void func_80387828(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
if (text_id == 0xc00) {
gcdialog_showDialog(ASSET_C2B_DIALOG_UNKNOWN, 0xf, NULL, this->marker, NULL, func_803877A8);
if (text_id == ASSET_C00_DIALOG_BOGGY_SAVED) {
gcdialog_showDialog(ASSET_C2B_DIALOG_BOGGY_SAVED_2, 0xf, NULL, this->marker, NULL, func_803877A8);
}
}
@ -142,14 +142,14 @@ void func_8038794C(Actor *this){
if(mapSpecificFlags_get(0x1)){
func_8028F94C(1, this->position);
timed_setStaticCameraToNode(0.0f, 0x12);
func_80324DBC(1.0f, 0xc00, 0xe, NULL, this->marker, func_80387828, func_803877A8);
func_80324DBC(1.0f, ASSET_C00_DIALOG_BOGGY_SAVED, 0xe, NULL, this->marker, func_80387828, func_803877A8);
func_803876A4(this);
break;
}//L80387B38
if(!this->has_met_before && subaddie_playerIsWithinSphereAndActive(this, 0x1f4)){
if(!player_movementGroup() || player_movementGroup() == BSGROUP_8_TROT){
if (gcdialog_showDialog(ASSET_BFF_DIALOG_UNKNOWN, 0x2a, this->position, NULL, NULL, NULL)) {
if (gcdialog_showDialog(ASSET_BFF_DIALOG_BOGGY_MEET, 0x2a, this->position, NULL, NULL, NULL)) {
for (i = 0; i < 5; i++) {
timedFunc_set_1(D_80391BEC[i], (GenFunction_1) func_8038787C, (s32) this->marker);
}

32
src/FP/ch/boggy2.c
View File

@ -94,19 +94,19 @@ void FP_func_803888E4(Actor *this){
subaddie_set_state_with_direction(this, 0xC, 0.0001f, 1);
if(!jiggyscore_isSpawned(JIGGY_30_FP_BOGGY_2)){
if(mapSpecificFlags_get(5)){
func_80324DBC(0.1f, 0xc06, 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
func_80324DBC(0.1f, ASSET_C06_DIALOG_BOGGY_SLED_WALRUS_SECOND_START, 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
}
else{//L80388964
func_80324DBC(0.1f, 0xc03, 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
func_80324DBC(0.1f, ASSET_C03_DIALOG_BOGGY_SLED_WALRUS_START, 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
}
}
else{//L803889A0
func_8028F490(D_80391D0C);
if(mapSpecificFlags_get(6)){
func_80324DBC(0.1f, 0xc29, 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
func_80324DBC(0.1f, ASSET_C29_DIALOG_BOGGY_SLED_BEAR_SECOND_START, 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
}
else{
func_80324DBC(0.1f, 0xc28, 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
func_80324DBC(0.1f, ASSET_C28_DIALOG_BOGGY_SLED_BEAR_START, 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
}
}//L80388A30
mapSpecificFlags_set(5, TRUE);
@ -124,10 +124,10 @@ void func_80388A50(Actor *this){
void func_80388A94(Actor *this){
func_80388A50(this);
if(mapSpecificFlags_get(6)){
gcdialog_showDialog(ASSET_C0A_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C0A_DIALOG_BOGGY_SLED_BEAR_MISS_RETRY, 0xe, this->position, this->marker, func_80388D70, NULL);
}
else{
gcdialog_showDialog(ASSET_C09_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C09_DIALOG_BOGGY_SLED_BEAR_ANSWER_TO_START, 0xe, this->position, this->marker, func_80388D70, NULL);
}
}
@ -136,15 +136,15 @@ void func_80388B18(Actor *this, u8 arg1){
if(player_getTransformation() == TRANSFORM_4_WALRUS){
func_80388A50(this);
if(mapSpecificFlags_get(5)){
gcdialog_showDialog(ASSET_C05_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C05_DIALOG_BOGGY_SLED_WALRUS_MISS_RETRY, 0xf, this->position, this->marker, func_80388D70, NULL);
}
else{
gcdialog_showDialog(ASSET_C02_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C02_DIALOG_BOGGY_SLED_WALRUS_MEET, 0xf, this->position, this->marker, func_80388D70, NULL);
}
}
else{//L80388BB8
if(!volatileFlag_get(VOLATILE_FLAG_B3)){
if(gcdialog_showDialog(ASSET_C01_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL)){
if(gcdialog_showDialog(ASSET_C01_DIALOG_BOGGY_SLED_BEAR_DENY, 0xe, this->position, this->marker, func_80388D70, NULL)){
volatileFlag_set(VOLATILE_FLAG_B3, TRUE);
func_80388A50(this);
}
@ -154,7 +154,7 @@ void func_80388B18(Actor *this, u8 arg1){
else{//L80388C08
if(player_getTransformation() == TRANSFORM_4_WALRUS){
if(!volatileFlag_get(VOLATILE_FLAG_B4)){
if(gcdialog_showDialog(ASSET_C08_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL)){
if(gcdialog_showDialog(ASSET_C08_DIALOG_BOGGY_SLED_WALRUS_COMPLETE_RETRY, 0xe, this->position, this->marker, func_80388D70, NULL)){
volatileFlag_set(VOLATILE_FLAG_B4, TRUE);
func_80388A50(this);
}
@ -195,10 +195,10 @@ void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2){
timed_exitStaticCamera(0.0f);
switch(text_id){
case 0xc03:
case 0xc06:
case 0xc28:
case 0xc29://L80388DC4
case ASSET_C03_DIALOG_BOGGY_SLED_WALRUS_START:
case ASSET_C06_DIALOG_BOGGY_SLED_WALRUS_SECOND_START:
case ASSET_C28_DIALOG_BOGGY_SLED_BEAR_START:
case ASSET_C29_DIALOG_BOGGY_SLED_BEAR_SECOND_START://L80388DC4
coMusicPlayer_playMusic(COMUSIC_3A_FP_BOGGY_RACE, 25000);
func_8025A58C(0, 4000);
core1_ce60_incOrDecCounter(FALSE);
@ -478,13 +478,13 @@ void func_803896FC(Actor *this){
&& player_getTransformation() != TRANSFORM_4_WALRUS
&& volatileFlag_get(VOLATILE_FLAG_B3)
){
gcdialog_showDialog(ASSET_C01_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C01_DIALOG_BOGGY_SLED_BEAR_DENY, 0xf, this->position, this->marker, func_80388D70, NULL);
}
else if( local->unk19 == 2){
if( player_getTransformation() == TRANSFORM_4_WALRUS
&& volatileFlag_get(VOLATILE_FLAG_B4)
){
gcdialog_showDialog(ASSET_C08_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C08_DIALOG_BOGGY_SLED_WALRUS_COMPLETE_RETRY, 0xf, this->position, this->marker, func_80388D70, NULL);
}
else if( player_getTransformation() != TRANSFORM_4_WALRUS){
func_80388A94(this);

4
src/FP/ch/boggy3.c
View File

@ -77,14 +77,14 @@ void func_80390388(Actor *this){
&& (player_movementGroup() == BSGROUP_0_NONE || player_movementGroup() == BSGROUP_8_TROT)
){
if(0.0f == this->unk1C[0] && func_80390334()){
if(gcdialog_showDialog(ASSET_C1F_DIALOG_BOGGY_NEEDS_SLEEP, 0xb, this->position, NULL, NULL, NULL)){
if(gcdialog_showDialog(ASSET_C1F_DIALOG_BOGGY_IGLOO_2, 0xb, this->position, NULL, NULL, NULL)){
this->has_met_before = TRUE;
this->unk1C[0] = 1.0f;
}
}
else{
if( !this->has_met_before ){
if(gcdialog_showDialog(ASSET_C1E_DIALOG_BOGGY_LOOK_FOR_PRESENTS, 0x2b, this->position, NULL, NULL, NULL)){
if(gcdialog_showDialog(ASSET_C1E_DIALOG_BOGGY_IGLOO_1, 0x2b, this->position, NULL, NULL, NULL)){
this->has_met_before = TRUE;
}
}

4
src/FP/ch/cavewozza.c
View File

@ -69,14 +69,14 @@ void func_80390630(Actor *this){
if (subaddie_playerIsWithinSphereAndActive(this, 350)) {
if (player_getTransformation() == TRANSFORM_4_WALRUS) {
if (!levelSpecificFlags_get(LEVEL_FLAG_31_FP_UNKNOWN)) {
if (gcdialog_showDialog(ASSET_C27_DIALOG_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)) {
if (gcdialog_showDialog(ASSET_C27_DIALOG_WOZZA_CAVE_MEET_AS_WALRUS, 0x23, NULL, NULL, NULL, NULL)) {
levelSpecificFlags_set(LEVEL_FLAG_31_FP_UNKNOWN, TRUE);
}
}
}
else {
if (!levelSpecificFlags_get(LEVEL_FLAG_32_FP_UNKNOWN)) {
if (gcdialog_showDialog(ASSET_C26_DIALOG_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)) {
if (gcdialog_showDialog(ASSET_C26_DIALOG_WOZZA_CAVE_MEET_AS_BEAR, 0x23, NULL, NULL, NULL, NULL)) {
levelSpecificFlags_set(LEVEL_FLAG_32_FP_UNKNOWN, TRUE);
}
}

4
src/FP/ch/twinkly.c
View File

@ -336,11 +336,11 @@ void func_8038C9A0(Actor *this){
if(this->unk1C[1] <= this->position_y){
this->position_y = this->unk1C[1];
if(!fileProgressFlag_get(FILEPROG_82_MET_TWINKLIES)){
gcdialog_showDialog(0xc12, 0x2a, this->position, this->marker, func_8038C94C, NULL);
gcdialog_showDialog(ASSET_C12_DIALOG_TWINKLIE_MINIGAME_START, 0x2a, this->position, this->marker, func_8038C94C, NULL);
fileProgressFlag_set(FILEPROG_82_MET_TWINKLIES, TRUE);
}
else{
gcdialog_showDialog(0xc25, 0x2b, this->position, this->marker, func_8038C94C, NULL);
gcdialog_showDialog(ASSET_C25_DIALOG_TWINKLIE_MINIGAME_RETRY, 0x2b, this->position, this->marker, func_8038C94C, NULL);
}
subaddie_set_state(this, 5);
this->pitch -= 3.0f;

2
src/FP/ch/twinklybox.c
View File

@ -177,7 +177,7 @@ void func_8038D294(ActorMarker *marker){
func_8038D01C(this->position, 12, ASSET_700_SPRITE_DUST);
this->velocity[1] = 0.0f;
sfx_playFadeShorthandDefault(SFX_30_MAGIC_POOF, 1.0f, 32000, this->position, 1000, 3500);
gcdialog_showDialog(0xc13, 0, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_C13_DIALOG_TWINKLIE_MINIGAME_COMPLETE, 0, NULL, NULL, NULL, NULL);
}
void func_8038D324(Actor *this){

2
src/FP/ch/twinklymuncher.c
View File

@ -127,7 +127,7 @@ void func_8038E094(Actor *this){
if(this->actorTypeSpecificField == 1 && !fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME)){
if(this->state != 6 && this->state != 7 && 0.0f == this->velocity[0]){
timed_setStaticCameraToNode(0.5f, 0xd);
gcdialog_showDialog(ASSET_C15_DIALOG_TWINKLIE_MINIGAME_LOST, 0x2b, this->position, this->marker, func_8038E040, NULL);
gcdialog_showDialog(ASSET_C15_DIALOG_TWINKLIE_MINIGAME_MISS, 0x2b, this->position, this->marker, func_8038E040, NULL);
this->velocity[0] = 1.0f;
subaddie_set_state_with_direction(this, 6, 0.03f, 1);
actor_loopAnimation(this);

10
src/FP/ch/wozza.c
View File

@ -69,11 +69,11 @@ void func_8038F2F0(Actor *this){
void func_8038F330(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
switch(text_id){
case 0xC1B:
case ASSET_C1B_DIALOG_WOZZA_MEET_AS_BEAR:
timed_exitStaticCamera(0.0f);
break;
case 0xC1C:
case ASSET_C1C_DIALOG_WOZZA_MEET_AS_WALRUS:
timed_exitStaticCamera(0.0f);
func_8038F2F0(this);
break;
@ -106,7 +106,7 @@ void func_8038F454(Actor *this){
subaddie_set_state(this, 2);
actor_loopAnimation(this);
timed_setStaticCameraToNode(0.0f, 0x2e);
func_80324DBC(0.0f, 0xc1b, 0x2a, this->position, this->marker, func_8038F330, NULL);
func_80324DBC(0.0f, ASSET_C1B_DIALOG_WOZZA_MEET_AS_BEAR, 0x2a, this->position, this->marker, func_8038F330, NULL);
timedFunc_set_1(2.5f, (GenFunction_1)func_8038F3F4, (s32)this->marker);
}
else{
@ -273,7 +273,7 @@ void FP_func_8038F7AC(Actor *this){
func_8038F560(this);
if(!local->unk30){
if(gcdialog_showDialog(0xc1d, 0x20, NULL, NULL, NULL, NULL)){
if(gcdialog_showDialog(ASSET_C1D_DIALOG_WOZZA_RETURN, 0x20, NULL, NULL, NULL, NULL)){
local->unk30 = TRUE;
}
}
@ -300,7 +300,7 @@ void FP_func_8038F7AC(Actor *this){
}
if(subaddie_playerIsWithinSphereAndActive(this, 500) && !this->has_met_before){
if(gcdialog_showDialog(0xc1c, 0xAA, this->position, this->marker, func_8038F330, func_8038F3C4)){
if(gcdialog_showDialog(ASSET_C1C_DIALOG_WOZZA_MEET_AS_WALRUS, 0xAA, this->position, this->marker, func_8038F330, func_8038F3C4)){
timed_setStaticCameraToNode(0.0f, 0x2E);
this->has_met_before = TRUE;
}

2
src/FP/ch/xmastree.c
View File

@ -128,7 +128,7 @@ void chXmasTree_update(Actor *this){
this->lifetime_value = 2.0f;
coMusicPlayer_playMusic(COMUSIC_61_XMAS_TREE_LIGHTS_UP, 28000);
gcStaticCamera_activate(0x1A);
gcdialog_showDialog(0xC14, 0, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_C14_DIALOG_TWINKLIE_MINIGAME_LIGHT_TREE, 0, NULL, NULL, NULL, NULL);
break;
case 3: // L803872F0

24
src/FP/ma/slalom.c
View File

@ -249,23 +249,23 @@ void maSlalom_dialogCallback(ActorMarker *caller, enum asset_e text_id, s32 arg2
}
switch(text_id){
case 0xc04: //8038B318
case ASSET_C04_DIALOG_BOGGY_SLED_WALRUS_MISS: //8038B318
__maSlalom_loseDialogCallback();
break;
case 0xc07: //8038B328
case ASSET_C07_DIALOG_BOGGY_SLED_WALRUS_COMPLETE: //8038B328
__maSlalom_winDialogCallback(JIGGY_30_FP_BOGGY_2);
break;
case 0xc0b: //8038B338
case ASSET_C0B_DIALOG_BOGGY_SLED_BEAR_MISS: //8038B338
__maSlalom_loseDialogCallback();
break;
case 0xc0d: //8038B348
case ASSET_C0D_DIALOG_BOGGY_SLED_BEAR_COMPLETE: //8038B348
__maSlalom_winDialogCallback(JIGGY_2C_FP_BOGGY_3);
break;
case 0xc10: //8038B358
case ASSET_C10_DIALOG_BOGGY_SLED_EITHER_GIVE_UP: //8038B358
func_8038ABDC();
func_8028FA14(gsworld_get_map(), 0x11);
func_8028F66C(BS_INTR_2A);
@ -299,12 +299,12 @@ void maSlalom_lose(void){
if(!jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2)){
timed_setStaticCameraToNode(0.0f, 1);
timed_playSfx(1.0f, SFX_8C_BOGGY_WAHEY, 1.0f, 32000);
func_80324DBC(2.0f, 0xC04, 0x2b, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL);
func_80324DBC(2.0f, ASSET_C04_DIALOG_BOGGY_SLED_WALRUS_MISS, 0x2b, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL);
}//L8038B4E0
else{
timed_setStaticCameraToNode(0.0f, 1);
timed_playSfx(1.0f, SFX_8C_BOGGY_WAHEY, 1.0f, 32000);
func_80324DBC(2.0f, 0xC0b, 0x2b, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL);
func_80324DBC(2.0f, ASSET_C0B_DIALOG_BOGGY_SLED_BEAR_MISS, 0x2b, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL);
}
}
@ -358,10 +358,10 @@ void maSlalom_update(void){
pntBoggy->unk38_31 = 2;
timed_playSfx(1.0f, SFX_8D_BOGGY_OHWW, 1.0f, 32000);
if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) || jiggyscore_isSpawned(JIGGY_30_FP_BOGGY_2)){
func_80324DBC(2.0f, 0xc0d, 0x2a, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL);
func_80324DBC(2.0f, ASSET_C0D_DIALOG_BOGGY_SLED_BEAR_COMPLETE, 0x2a, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL);
}
else{
func_80324DBC(2.0f, 0xc07, 0x22, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL);
func_80324DBC(2.0f, ASSET_C07_DIALOG_BOGGY_SLED_WALRUS_COMPLETE, 0x22, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL);
}
Me.state = MA_SLALOM_STATE_4_LOSE;
break;
@ -538,7 +538,7 @@ void maSlalom_setBoggyGate(s32 gate_num){
FP_func_8038AB60(0);
if(!player_isDead()){
func_8028F918(2);
gcdialog_showDialog(0xc10, 0x20, NULL, NULL, maSlalom_dialogCallback, NULL);
gcdialog_showDialog(ASSET_C10_DIALOG_BOGGY_SLED_EITHER_GIVE_UP, 0x20, NULL, NULL, maSlalom_dialogCallback, NULL);
}//L8038BD40
Me.state = MA_SLALOM_STATE_4_LOSE;
break;
@ -546,7 +546,7 @@ void maSlalom_setBoggyGate(s32 gate_num){
case 3:
if(!Me.hasBeenThreeBehind && !player_isDead()){
Me.hasBeenThreeBehind = 1;
gcdialog_showDialog(0xc0f, 0x20, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_C0F_DIALOG_BOGGY_SLED_EITHER_TAUNT_2, 0x20, NULL, NULL, NULL, NULL);
}//L8038BD94
func_8025AEA0(0x3a, 0x411aa);
break;
@ -554,7 +554,7 @@ void maSlalom_setBoggyGate(s32 gate_num){
case 2:
if(!Me.hasBeenTwoBehind && !player_isDead()){
Me.hasBeenTwoBehind = 1;
gcdialog_showDialog(0xc0e, 0x20, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_C0E_DIALOG_BOGGY_SLED_EITHER_TAUNT_1, 0x20, NULL, NULL, NULL, NULL);
}//L8038BDF0
func_8025AEA0(0x3a, 0x493e0);
break;

4
src/GV/ch/ancientone.c
View File

@ -149,7 +149,7 @@ void chAncientOne_update(Actor *this){
mapSpecificFlags_set(sp38, TRUE);
if(sp38== 0xB){
if(!jiggyscore_isCollected(JIGGY_46_GV_ANCIENT_ONES)){
gcdialog_showDialog(ASSET_A80_DIALOG_ANICIENT_ONES_DONE, 0xE, NULL, this->marker, func_80386850, NULL);
gcdialog_showDialog(ASSET_A80_DIALOG_ANCIENT_ONES_DONE, 0xE, NULL, this->marker, func_80386850, NULL);
}
else{
func_80386850(this->marker, 0xA80, -1);
@ -158,7 +158,7 @@ void chAncientOne_update(Actor *this){
else {
if(sp38== 7){
if(!jiggyscore_isCollected(JIGGY_46_GV_ANCIENT_ONES)){
gcdialog_showDialog(ASSET_A7F_DIALOG_ANICIENT_ONES_MEET, 0x4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_A7F_DIALOG_ANCIENT_ONES_MEET, 0x4, NULL, NULL, NULL, NULL);
}
}

6
src/GV/code_3630.c
View File

@ -29,14 +29,14 @@ void func_80389A20(ActorMarker *caller, enum asset_e text_id, s32 arg2){
}
void func_80389A60(Actor *this){
gcdialog_showDialog(ASSET_A70_DIALOG_CHARMER_HELPED, 4, NULL, this->marker, func_80389A20, NULL);
gcdialog_showDialog(ASSET_A70_DIALOG_RUBEE_HELPED, 4, NULL, this->marker, func_80389A20, NULL);
this->has_met_before = TRUE;
subaddie_set_state(this, 5);
}
void func_80389ABC(Actor *this){
if(this->unk138_23){
func_80389A20(this->marker, ASSET_A70_DIALOG_CHARMER_HELPED, -1);
func_80389A20(this->marker, ASSET_A70_DIALOG_RUBEE_HELPED, -1);
}
else{
this->unk138_23 = TRUE;
@ -63,7 +63,7 @@ void func_80389B1C(Actor *this){
if(this->state == 1 || this->state == 2){
if(! this->has_met_before && subaddie_playerIsWithinSphereAndActive(this, 250) && !subaddie_playerIsWithinSphereAndActive(this, 0x50)){
gcdialog_showDialog(ASSET_A6F_DIALOG_CHARMER_MEET, 0xe, this->position, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_A6F_DIALOG_RUBEE_MEET, 0xe, this->position, NULL, NULL, NULL);
this->has_met_before = TRUE;
mapSpecificFlags_set(0, TRUE);
}

2
src/MM/ch/orangepad.c
View File

@ -112,7 +112,7 @@ void chOrangePad_update(Actor *this) {
&& !mapSpecificFlags_get(MM_SPECIFIC_FLAG_CONGA_WARNED_BLOCKS)
&& conga->state != CONGA_STATE_MOPEY) {
if (gcdialog_showDialog(ASSET_B3D_DIALOG_CONGA_DONT_TOUCH_BLOCKS, 0, NULL, NULL, NULL, NULL)) {
if (gcdialog_showDialog(ASSET_B3D_DIALOG_CONGA_TOUCH_PAD, 0, NULL, NULL, NULL, NULL)) {
mapSpecificFlags_set(MM_SPECIFIC_FLAG_CONGA_WARNED_BLOCKS, TRUE);
}
}

6
src/MMM/code_3120.c
View File

@ -54,7 +54,7 @@ void func_803895B0(s32 arg0) {
}
void func_803895D8(ActorMarker *caller, enum asset_e text_id, s32 arg2) {
if (text_id == 0xAD7) {
if (text_id == ASSET_AD7_DIALOG_NAPPER_AWAKE) {
timed_playSfx(0.1f, SFX_3F5_UNKNOWN, 1.0f, 30000);
timed_exitStaticCamera(1.5f);
func_80324E38(1.5f, 0);
@ -81,7 +81,7 @@ void func_8038966C(void){
MMM_D_8038C4E0.unk2 = TRUE;
func_80324E38(0.0f, 3);
timed_setStaticCameraToNode(0.2f, 1);
func_80324DBC(0.2f, 0xad9, 6, NULL, NULL, func_803895D8, NULL);
func_80324DBC(0.2f, ASSET_AD9_DIALOG_NAPPER_COMPLETE, 6, NULL, NULL, func_803895D8, NULL);
}//L80389700
if(MMM_D_8038C4E0.unk1 != 1)
@ -108,7 +108,7 @@ void func_8038966C(void){
if (!levelSpecificFlags_get(LEVEL_FLAG_1B_MMM_UNKNOWN)) {
func_80324E38(0.0f, 3);
timed_setStaticCameraToNode(0.0f, 0);
func_80324DBC(0.0f, 0xad7, 6, NULL, NULL, func_803895D8, NULL);
func_80324DBC(0.0f, ASSET_AD7_DIALOG_NAPPER_AWAKE, 6, NULL, NULL, func_803895D8, NULL);
levelSpecificFlags_set(LEVEL_FLAG_1B_MMM_UNKNOWN, TRUE);
}
}

10
src/MMM/code_3420.c
View File

@ -178,7 +178,7 @@ void func_803898EC() {
}
void func_80389910() {
gcdialog_showDialog(ASSET_AD5_DIALOG_UNKNOWN, 0xE, NULL, NULL, MMM_func_80389810, NULL);
gcdialog_showDialog(ASSET_AD5_DIALOG_MOTZAND_COMPLETE, 0xE, NULL, NULL, MMM_func_80389810, NULL);
timedFunc_set_2(0.0f, (GenFunction_2)coMusicPlayer_playMusic, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
timed_setStaticCameraToNode(2.0f, 0);
timedFunc_set_0(2.1f, MMM_func_803898A0);
@ -199,10 +199,10 @@ void organMinigame_setState(s32 next_state){
if (next_state == 2) {
if (Me.pattern == 0) {
Me.pattern = 1;
gcdialog_showDialog(ASSET_AD3_DIALOG_UNKNOWN, 4, NULL, NULL, MMM_func_80389810, NULL);
gcdialog_showDialog(ASSET_AD3_DIALOG_MOTZAND_MEET, 4, NULL, NULL, MMM_func_80389810, NULL);
}
else {//L80389A84
gcdialog_showDialog(ASSET_AD6_DIALOG_UNKNOWN, 4, NULL, NULL, MMM_func_80389810, NULL);
gcdialog_showDialog(ASSET_AD6_DIALOG_MOTZAND_RETRY, 4, NULL, NULL, MMM_func_80389810, NULL);
}
}//L80389A9C
@ -219,13 +219,13 @@ void organMinigame_setState(s32 next_state){
}//L80389AF4
if(next_state == 4){
gcdialog_showDialog(ASSET_ADD_DIALOG_UNKNOWN, 4, NULL, NULL, MMM_func_80389810, NULL);
gcdialog_showDialog(ASSET_ADD_DIALOG_MOTZAND_MISS, 4, NULL, NULL, MMM_func_80389810, NULL);
func_80387720(Me.motzhand_marker);
}
if(next_state == 5){
Me.pattern++;
gcdialog_showDialog(ASSET_AD4_DIALOG_UNKNOWN, 4, NULL, NULL, MMM_func_80389810, NULL);
gcdialog_showDialog(ASSET_AD4_DIALOG_MOTZAND_HALFWAY, 4, NULL, NULL, MMM_func_80389810, NULL);
func_80387720(Me.motzhand_marker);
}

4
src/MMM/code_47D0.c
View File

@ -119,7 +119,7 @@ void __chTumblar_congratulationTextCallback(ActorMarker *marker, enum asset_e te
}
void chTumblar_congratulate(Struct_MMM_47D0_0 *arg0, s32 arg1) {
gcdialog_showDialog(ASSET_ADB_DIALOG_UNKNOWN, 4, NULL, arg0->jiggy_marker, __chTumblar_congratulationTextCallback, NULL);
gcdialog_showDialog(ASSET_ADB_DIALOG_TUMBLAR_COMPLETE, 4, NULL, arg0->jiggy_marker, __chTumblar_congratulationTextCallback, NULL);
arg0->state = TUMBLAR_STATE_1_CONGRATULATING;
}
@ -212,7 +212,7 @@ void chTumblar_update(Struct_MMM_47D0_0 *arg0, Struct68s *arg1, f32 tick) {
func_8035179C_copyPosition(arg1, position);
if (!mapSpecificFlags_get(MMM_SPECIFIC_FLAG_0_UNKNOWN) && arg0->state == TUMBLAR_STATE_0_IDLE && ml_vec3f_horizontal_distance_zero_likely(position, plyr_pos) < 250.0f) {
if (gcdialog_showDialog(ASSET_ADA_DIALOG_UNKNOWN, 0, NULL, NULL, NULL, NULL)) {
if (gcdialog_showDialog(ASSET_ADA_DIALOG_TUMBLAR_MEET, 0, NULL, NULL, NULL, NULL)) {
mapSpecificFlags_set(0, TRUE);
}
}

2
src/RBB/ch/anchorctrl.c
View File

@ -45,7 +45,7 @@ void __chAnchorCtrl_setState(Actor *this, s32 new_state){
timed_playSfx(2.1f, SFX_3F6_RUBBING, 0.6f, 32700);
timedFunc_set_2(2.7f, (GenFunction_2)mapSpecificFlags_set, 4, TRUE);
timedFunc_set_0(3.0f, func_8038C058);
func_80324DBC(3.0f, 0xb9C, 7, NULL, this->marker, __chAnchorCtrl_spawnJiggy, NULL);
func_80324DBC(3.0f, ASSET_B9C_DIALOG_SNORKEL_COMPLETE, 7, NULL, this->marker, __chAnchorCtrl_spawnJiggy, NULL);
}//L8038C1D8
this->state = new_state;
}

4
src/RBB/ch/bossboombox.c
View File

@ -322,7 +322,7 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
}
else{//L8038CEFC
timedFunc_set_3(2.4f, (GenFunction_3)comusic_8025AB44, COMUSIC_62_RBB_BOOMBOX, 0x1f40, 0x12C);
func_80324DBC(2.4f, 0xb9e, 4, NULL, this->marker, func_8038CB34, func_8038CB68);
func_80324DBC(2.4f, ASSET_B9E_DIALOG_BOSS_BOOM_BOX_MEET, 4, NULL, this->marker, func_8038CB34, func_8038CB68);
}
}//L8038CF60
@ -367,7 +367,7 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
}
else{//L8038D220
timedFunc_set_3(0.0f, (GenFunction_3)chbossboombox_respawnJiggy, (s32)this->position_x, (s32)this->position_y, (s32)this->position_z);
gcdialog_showDialog(ASSET_B9F_DIALOG_UNKNOWN, 4, 0, 0, 0, 0);
gcdialog_showDialog(ASSET_B9F_DIALOG_BOSS_BOOM_BOX_COMPLETE, 4, 0, 0, 0, 0);
}
}//L8038D278
}

2
src/RBB/ch/dolphin.c
View File

@ -89,7 +89,7 @@ void func_8038B900(Actor *this){
&& subaddie_playerIsWithinSphereAndActive(this, 0x258)
&& !player_movementGroup()
){
gcdialog_showDialog(0xb9b, 4, 0, 0, 0, 0);
gcdialog_showDialog(ASSET_B9B_DIALOG_SNORKEL_MEET, 4, 0, 0, 0, 0);
this->has_met_before = TRUE;
}
}

2
src/RBB/propellorctrl.c
View File

@ -26,7 +26,7 @@ void __propellorCtrl_setState(s32 arg0){
item_set(ITEM_9_PROPELLOR,0);
if(arg0 == 3 && !jiggyscore_isCollected(JIGGY_57_RBB_PROPELLOR)){
timedFunc_set_1(0.5f, (GenFunction_1)func_802FAD64, 3);
func_80324DBC(1.0f, 0xb9d, 4, NULL, NULL, NULL, NULL);
func_80324DBC(1.0f, ASSET_B9D_DIALOG_GRUNTY_PROPELLER_MISS, 4, NULL, NULL, NULL, NULL);
}
else{
func_802FAD64(3);

4
src/SM/ch/smbottles.c
View File

@ -251,7 +251,7 @@ void __chSmBottles_textCallback(ActorMarker *marker, enum asset_e text_id, s32 a
}
switch (text_id) {
case ASSET_D38_DIALOG_EMPTY:
case ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED:
break;
case ASSET_DF3_DIALOG_BOTTLES_INTRODUCTION: /* 2FB8 803893A8 3C188039 */
@ -279,7 +279,7 @@ void __chSmBottles_textCallback(ActorMarker *marker, enum asset_e text_id, s32 a
default:
if (actor->state != SM_BOTTLES_STATE_5_UNKNOWN) {
gcdialog_showDialog(ASSET_D38_DIALOG_EMPTY, 0x4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0x4, NULL, NULL, NULL, NULL);
}
__chSmBottles_setState(actor, actor->state == SM_BOTTLES_STATE_5_UNKNOWN ? SM_BOTTLES_STATE_1_UNKNOWN : SM_BOTTLES_STATE_4_UNKNOWN);

4
src/TTC/ch/blubber.c
View File

@ -63,7 +63,7 @@ static void __chBlubber_showTextCallback(ActorMarker *caller, enum asset_e text_
Actor *this = marker_getActor(caller);
ActorLocal_Blubber *local = (ActorLocal_Blubber*)&this->local;
if(text_id == ASSET_A0D_DIALOG_BLUBBER_COMPLETE || text_id == ASSET_A2A_BLUBBER_COMPLETE_JIGGY_COLLECTED){
if(text_id == ASSET_A0D_DIALOG_BLUBBER_COMPLETE || text_id == ASSET_A2A_DIALOG_BLUBBER_COMPLETE_JIGGY_COLLECTED){
local->unk24 = 0;
}
else{
@ -89,7 +89,7 @@ static void __chBlubber_showJiggySpawnedText(ActorMarker *marker){
this->actor_specific_1_f = 0.0f;
if(!mapSpecificFlags_get(TTC_SPECIFIC_FLAG_2_BLUBBER_JIGGY_SPAWNED_TEXT_SHOWN)) {
text_id = jiggyscore_isCollected(JIGGY_14_TTC_BLUBBER) ? ASSET_A2A_BLUBBER_COMPLETE_JIGGY_COLLECTED : ASSET_A0D_DIALOG_BLUBBER_COMPLETE;
text_id = jiggyscore_isCollected(JIGGY_14_TTC_BLUBBER) ? ASSET_A2A_DIALOG_BLUBBER_COMPLETE_JIGGY_COLLECTED : ASSET_A0D_DIALOG_BLUBBER_COMPLETE;
gcdialog_showDialog(text_id, 0xf, this->position, this->marker, __chBlubber_showTextCallback, __chBlubber_showTextCallback2);
mapSpecificFlags_set(TTC_SPECIFIC_FLAG_2_BLUBBER_JIGGY_SPAWNED_TEXT_SHOWN, TRUE);
}

2
src/TTC/ch/lockup.c
View File

@ -72,7 +72,7 @@ static void chLockup_update(Actor *this) {
&& subaddie_playerIsWithinSphereAndActive(this, 320)
&& !subaddie_playerIsWithinSphereAndActive(this, 160)
&& !player_movementGroup()
&& gcdialog_showDialog(ASSET_A15_DIALOG_TTC_LOCKUP_SPAWNED, 0, NULL, NULL, NULL, NULL)) {
&& gcdialog_showDialog(ASSET_A15_DIALOG_LOCKUP_SPAWNED, 0, NULL, NULL, NULL, NULL)) {
this->has_met_before = TRUE;
}

8
src/TTC/ch/nipper.c
View File

@ -144,7 +144,7 @@ static void __chNipper_dieFunc(ActorMarker *this_marker, ActorMarker *other_mark
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 0, 300);
func_8025AABC(COMUSIC_12_TTC_NIPPER);
func_8032BB88(this, -1, 300);
gcStaticCamera_activate(0x1C);
gcStaticCamera_activate(0x1C); //camera
return;
}
@ -156,7 +156,7 @@ static void __chNipper_dieFunc(ActorMarker *this_marker, ActorMarker *other_mark
__chNipper_playDeathAnimation(this);
this->lifetime_value = 80.0f;
gcdialog_showDialog(ASSET_A10_DIALOG_TTC_NIPPER_HURT, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_A10_DIALOG_NIPPER_HURT, 4, NULL, NULL, NULL, NULL);
return;
}
@ -177,7 +177,7 @@ static void __chNipper_ow2Func(ActorMarker * this_marker, ActorMarker *other_mar
this = marker_getActor(this_marker);
if( !mapSpecificFlags_get(TTC_SPECIFIC_FLAG_7_NIPPER_FIRST_MEET_TEXT_SHOWN)
&& this->has_met_before
&& gcdialog_showDialog(0xa0f, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showDialog(ASSET_A0F_DIALOG_NIPPER_HIT_BY_EGG, 0, NULL, NULL, NULL, NULL)
){
mapSpecificFlags_set(TTC_SPECIFIC_FLAG_7_NIPPER_FIRST_MEET_TEXT_SHOWN, TRUE);
}
@ -188,7 +188,7 @@ static void __chNipper_owFunc(ActorMarker * this_marker, ActorMarker *other_mark
Actor *this = marker_getActor(this_marker);
if( !this->unk138_23
&& this->has_met_before
&& gcdialog_showDialog(0xa11, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showDialog(ASSET_A11_DIALOG_NIPPER_ATTACK, 0, NULL, NULL, NULL, NULL)
){
this->unk138_23 = TRUE;
}

2
src/core2/abilityprogress.c
View File

@ -59,7 +59,7 @@ void ability_use(enum ability_used ability) {
play_ding = FALSE;
if (!ability_isUnlocked(ABILITY_10_TALON_TROT)) {
if (gsworld_get_map() == MAP_2_MM_MUMBOS_MOUNTAIN) {
dialog_id = ASSET_B4D_DIALOG_BOTTLES_SLIPPERY;
dialog_id = ASSET_B4D_DIALOG_BOTTLES_MM_SLIP_ON_HILL;
} else {
return;
}

4
src/core2/bs/jig.c
View File

@ -125,11 +125,11 @@ void bsjig_jiggy_end(void){
else{//L802B0E34
switch(sp24){
case 0x13:
sp2C = VER_SELECT(0xa16, 0x916, 0, 0);
sp2C = VER_SELECT(ASSET_A16_DIALOG_LOCKUP_GRUNTY_RESPONSE, 0x916, 0, 0);
break;
case 0x17:
if(!levelSpecificFlags_get(LEVEL_FLAG_0_CC_TOKEN_TOOTH_OPEN) || !levelSpecificFlags_get(LEVEL_FLAG_1_CC_JIGGY_TOOTH_OPEN))
sp2C = VER_SELECT(0xd2d, 0xa00, 0, 0);
sp2C = VER_SELECT(ASSET_D2D_DIALOG_CLANKER_COLLECT_JIGGY, 0xa00, 0, 0);
break;
}
}//L802B0E88

4
src/core2/ch/crab.c
View File

@ -281,10 +281,10 @@ void chCrab_update(Actor *this) {
&& !jiggyscore_isCollected(JIGGY_10_TTC_SANDCASTLE)
&& subaddie_playerIsWithinSphereAndActive(this, 1600)
) {
gcdialog_showDialog(0xA12, 4, this->position, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_A12_DIALOG_BLACK_SNIPPET_SPAWNED, 4, this->position, NULL, NULL, NULL);
mapSpecificFlags_set(0, TRUE);
} else if (mapSpecificFlags_get(1)) {
gcdialog_showDialog(0xA13, 4, this->position, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_A13_DIALOG_BLACK_SNIPPET_DEFEATED, 4, this->position, NULL, NULL, NULL);
mapSpecificFlags_set(1, FALSE);
}
}

16
src/core2/ch/mole.c
View File

@ -39,7 +39,7 @@ ChMoleDescription moleTable[] = {
{ASSET_A1F_DIALOG_SHOCKJUMP_LEARN, ASSET_A23_DIALOG_SHOCKJUMP_REFRESHER, 0x0C, ABILITY_D_SHOCK_JUMP},
{ASSET_A20_DIALOG_FLY_LEARN, ASSET_A22_DIALOG_FLY_REFRESHER, 0x0D, ABILITY_9_FLIGHT},
{ASSET_D35_DIALOG_WONDERWING_LEARN, ASSET_D36_DIALOG_WONDERWING_REFRESHER, 0x01, ABILITY_12_WONDERWING},
{ASSET_C88_DIALOG_LONGLEG_LEARN, ASSET_C89_DIALOG_LONGLEG_REFRESHER, 0x10, ABILITY_E_WADING_BOOTS},
{ASSET_C88_DIALOG_WADING_BOOTS_LEARN, ASSET_C89_DIALOG_WADING_BOOTS_REFRESHER, 0x10, ABILITY_E_WADING_BOOTS},
{ASSET_A84_DIALOG_TURBOTRAINERS_LEARN, ASSET_A85_DIALOG_TURBOTRAINERS_REFRESHER, 0x19, ABILITY_11_TURBO_TALON},
{ASSET_F64_DIALOG_NOTEDOORS_LEARN, ASSET_F65_DIALOG_NOTEDOORS_REFRESHER, 0x0E, ABILITY_13_1ST_NOTEDOOR}
};
@ -77,19 +77,19 @@ enum asset_e chmole_learnedAllLevelAbilitiesDialog(void){
int learned_all_moves = chmole_learnedAllLevelAbilities(level_id);
switch(level_id){
case LEVEL_1_MUMBOS_MOUNTAIN:
return learned_all_moves ? ASSET_B4E_DIALOG_BOTTLES_ALL_MM_MOVES_LEARNED : ASSET_D38_DIALOG_EMPTY;
return learned_all_moves ? ASSET_B4E_DIALOG_BOTTLES_ALL_MM_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED;
case LEVEL_2_TREASURE_TROVE_COVE:
return learned_all_moves ? ASSET_A27_DIALOG_BOTTLES_ALL_TTC_MOVES_LEARNED : ASSET_D38_DIALOG_EMPTY;
return learned_all_moves ? ASSET_A27_DIALOG_BOTTLES_ALL_TTC_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED;
case LEVEL_3_CLANKERS_CAVERN:
return learned_all_moves ? ASSET_D37_DIALOG_BOTTLES_ALL_CC_MOVES_LEARNED : ASSET_D38_DIALOG_EMPTY;
return learned_all_moves ? ASSET_D37_DIALOG_BOTTLES_ALL_CC_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED;
case LEVEL_4_BUBBLEGLOOP_SWAMP:
return learned_all_moves ? ASSET_C8A_DIALOG_BOTTLES_ALL_BGS_MOVES_LEARNED : ASSET_D38_DIALOG_EMPTY;
return learned_all_moves ? ASSET_C8A_DIALOG_BOTTLES_ALL_BGS_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED;
case LEVEL_5_FREEZEEZY_PEAK:
return learned_all_moves ? ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED : ASSET_D38_DIALOG_EMPTY;
return learned_all_moves ? ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED;
case LEVEL_7_GOBIS_VALLEY:
return learned_all_moves ? ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED : ASSET_D38_DIALOG_EMPTY;
return learned_all_moves ? ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED;
default:
return ASSET_D38_DIALOG_EMPTY;
return ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED;
}
}

4
src/core2/ch/snacker.c
View File

@ -80,7 +80,7 @@ static void __chsnacker_start_dialog(Actor *this) {
text_index = mapSpecificFlags_getN(8, 3);
if( !this->has_met_before ) {
if(text_index < 4) {
if(gcdialog_showDialog(0xA1B + text_index, 0, NULL, NULL, NULL, NULL)){
if(gcdialog_showDialog(ASSET_A1B_DIALOG_SNACKER_SPAWNED_1 + text_index, 0, NULL, NULL, NULL, NULL)){
text_index++;
mapSpecificFlags_setN(8, text_index, 3);
this->has_met_before = TRUE;
@ -156,7 +156,7 @@ static void __chsnacker_ow(ActorMarker *marker, ActorMarker *other){
this = marker_getActor(marker);
if(level_get() == LEVEL_2_TREASURE_TROVE_COVE && !player_isDead()){
gcdialog_showDialog(0xA29, 0, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_A29_DIALOG_SNACKER_BITE, 0, NULL, NULL, NULL, NULL);
}//L802E10A4
if(this->state == 4){

2
src/core2/code_53A10.c
View File

@ -69,7 +69,7 @@ void func_802DAA14(Actor *this){
if(!this->has_met_before){
if(level_get() == LEVEL_A_MAD_MONSTER_MANSION){
text_id = ASSET_ADC_DIALOG_UNKNOWN;
text_id = ASSET_ADC_DIALOG_GRUNTY_ENTER_SHED;
}
else{
if(gsworld_get_map() == MAP_69_GL_MM_LOBBY)

38
src/core2/progressDialog.c
View File

@ -6,30 +6,30 @@ typedef KEY_VALUE_PAIR(s16, s16) MapProgressFlagToDialogID;
/* Mapping for file progess flags to Dialog IDs */
MapProgressFlagToDialogID fileProgressDialogMap[] = {
{ FILEPROG_AB_SWIM_OILY_WATER, ASSET_BA1_DIALOG_GRUNTY_RBB_WATER_SWIM },
{ FILEPROG_AC_DIVE_OILY_WATER, ASSET_BA2_DIALOG_GRUNTY_RBB_WATER_DIVE },
{ FILEPROG_AA_HAS_TOUCHED_CCW_BRAMBLE_FIELD, ASSET_CE6_DIALOG_GRUNTY_MMM_BRAMBLES },
{ FILEPROG_F_HAS_TOUCHED_PIRANHA_WATER, ASSET_C85_DIALOG_PIRANHA_WATER },
{ FILEPROG_A9_HAS_TOUCHED_RBB_OVEN, ASSET_BA0_DIALOG_GRUNTY_RBB_RED_HOT_OVENS },
{ FILEPROG_10_HAS_TOUCHED_SAND_EEL_SAND, ASSET_A7E_DIALOG_SAND_EELS_MEET },
{ FILEPROG_14_HAS_TOUCHED_FP_ICY_WATER, ASSET_C11_DIALOG_FREEZING_WATER },
{ FILEPROG_F_HAS_TOUCHED_PIRANHA_WATER, ASSET_C85_DIALOG_PIRANHA_WATER },
{ FILEPROG_86_HAS_TOUCHED_MMM_THORN_HEDGE, ASSET_AE1_DIALOG_GRUNTY_MMM_THORNS },
{ FILEPROG_DD_HAS_TOUCHED_CCW_ICY_WATER, ASSET_CE7_DIALOG_GRUNTY_CCW_ICY_WATER_SWIM },
{ FILEPROG_AB_SWIM_OILY_WATER, ASSET_BA1_DIALOG_GRUNTY_TOUCH_OILY_WATER},
{ FILEPROG_AC_DIVE_OILY_WATER, ASSET_BA2_DIALOG_GRUNTY_DIVE_OILY_WATER},
{ FILEPROG_AA_HAS_TOUCHED_CCW_BRAMBLE_FIELD, ASSET_CE6_DIALOG_GRUNTY_TOUCH_BRAMBLE},
{ FILEPROG_F_HAS_TOUCHED_PIRANHA_WATER, ASSET_C85_DIALOG_PIRANHA_TOUCH_SWAMP_WATER},
{ FILEPROG_A9_HAS_TOUCHED_RBB_OVEN, ASSET_BA0_DIALOG_GRUNTY_TOUCH_OVEN},
{ FILEPROG_10_HAS_TOUCHED_SAND_EEL_SAND, ASSET_A7E_DIALOG_SAND_EELS_MEET},
{ FILEPROG_14_HAS_TOUCHED_FP_ICY_WATER, ASSET_C11_DIALOG_TOUCH_ICY_WATER},
{ FILEPROG_F_HAS_TOUCHED_PIRANHA_WATER, ASSET_C85_DIALOG_PIRANHA_TOUCH_SWAMP_WATER},
{ FILEPROG_86_HAS_TOUCHED_MMM_THORN_HEDGE, ASSET_AE1_DIALOG_GRUNTY_HEDGE_THORNS},
{ FILEPROG_DD_HAS_TOUCHED_CCW_ICY_WATER, ASSET_CE7_DIALOG_GRUNTY_TOUCH_ICY_WATER},
{ FILEPROG_3_MUSIC_NOTE_TEXT, ASSET_D9C_DIALOG_MUSIC_NOTE_MEET },
{ FILEPROG_4_MUMBO_TOKEN_TEXT, ASSET_D9D_DIALOG_MUMBO_TOKEN_MEET },
{ FILEPROG_5_BLUE_EGG_TEXT, ASSET_D9E_DIALOG_BLUE_EGG_MEET },
{ FILEPROG_6_RED_FEATHER_TEXT, ASSET_D9F_DIALOG_RED_FEATHER_MEET },
{ FILEPROG_7_GOLD_FEATHER_TEXT, ASSET_DA0_DIALOG_GOLD_FEATHER_MEET },
{ FILEPROG_8_ORANGE_TEXT, ASSET_B46_DIALOG_COLLECT_ORANGE },
{ FILEPROG_9_GOLD_BULLION_TEXT, ASSET_A21_DIALOG_BLUBBER_TREASURE_MEET },
{ FILEPROG_8_ORANGE_TEXT, ASSET_B46_DIALOG_CONGA_COLLECT_ORANGE},
{ FILEPROG_9_GOLD_BULLION_TEXT, ASSET_A21_DIALOG_BLUBBER_MEET },
{ FILEPROG_A_HONEYCOMB_TEXT, ASSET_DA1_DIALOG_HONEYCOMB_MEET },
{ FILEPROG_B_EMPTY_HONEYCOMB_TEXT, ASSET_DA2_DIALOG_EMPTY_HONEYCOMB_MEET },
{ FILEPROG_C_EXTRA_LIFE_TEXT, ASSET_DA3_DIALOG_EXTRA_LIFE_MEET },
{ FILEPROG_BE_CHEATO_BLUEEGGS, ASSET_FA8_EGG_CHEAT_ACTIVATION },
{ FILEPROG_BF_CHEATO_REDFEATHERS, ASSET_FA9_RED_FEATHER_CHEAT_ACTIVATION },
{ FILEPROG_C0_CHEATO_GOLDFEATHERS, ASSET_FAA_GOLD_FEATHER_CHEAT_ACTIVATION },
{ FILEPROG_95_UNUSED_UNKNOWN_ITEM_COLLECT, ASSET_B50_DIALOG_BOTTLES_UNUSED_UNKNOWN_ITEM_COLLECT },
{ FILEPROG_95_UNUSED_UNKNOWN_ITEM_COLLECT, ASSET_B50_DIALOG_BOTTLES_BACKPACK_STORE },
{ FILEPROG_A7_NEAR_PUZZLE_PODIUM_TEXT, ASSET_F7B_DIALOG_BOTTLES_JIGSAW_PICTURE_MEET },
{ -1, -1 }
};
@ -37,8 +37,8 @@ MapProgressFlagToDialogID fileProgressDialogMap[] = {
/* This progress IDs are not saved in the save file, like when Banjo goes near a Note door which requires more notes than the Banjo has. */
/* Triggers a dialog every time after the game restarts. */
MapProgressFlagToDialogID gVolatileFlagDialogMap[] = {
{ VOLATILE_FLAG_9E_BETA_OILY_SCUM, ASSET_BA3_DIALOG_GRUNTY_RBB_OILY_SCUM_UNUSED },
{ VOLATILE_FLAG_9F_BETA_DIVE_IN_ICY_WATER, ASSET_CE8_DIALOG_GRUNTY_CCW_ICY_WATER_UNUSED },
{ VOLATILE_FLAG_9E_BETA_OILY_SCUM, ASSET_BA3_DIALOG_GRUNTY_TOUCH_OILY_WATER_2}, // (unused)
{ VOLATILE_FLAG_9F_BETA_DIVE_IN_ICY_WATER, ASSET_CE8_DIALOG_GRUNTY_TOUCH_ICY_WATER_2}, // (unused)
{ VOLATILE_FLAG_A0_FF_FIRST_ANSWER_RIGHT, ASSET_1032_DIALOG_FF_FIRST_ANSWER_CORRECT },
{ VOLATILE_FLAG_A1_FF_NEXT_ANSWER_RIGHT, ASSET_1033_DIALOG_FF_NEXT_ANSWER_CORRECT },
{ VOLATILE_FLAG_A2_FF_GRUNTY_ANSWER_RIGHT, ASSET_1034_DIALOG_FF_GRUNTY_ANSWER_CORRECT },
@ -51,10 +51,10 @@ MapProgressFlagToDialogID gVolatileFlagDialogMap[] = {
{ VOLATILE_FLAG_A9_FF_USED_JOKER, ASSET_103B_DIALOG_FF_USE_JOKER },
{ VOLATILE_FLAG_AA_FF_LOW_HEALTH, ASSET_103C_DIALOG_FF_LOW_HEALTH },
{ VOLATILE_FLAG_AB_LAST_LIFE_ON_SKULL, ASSET_103D_DIALOG_FF_LOW_HEALTH_ON_SKULL },
{ VOLATILE_FLAG_AC_GV_TRAPDOOR_MISSED, ASSET_A88_DIALOG_GRUNTY_GV_MISS_TRAPDOOR },
{ VOLATILE_FLAG_AD_MMM_CHURCH_DOOR_MISSED, ASSET_AE2_DIALOG_GRUNTY_MMM_MISS_CHRUCH_DOOR },
{ VOLATILE_FLAG_AE_BGS_WALKWAY_JIGGY_MISSED, ASSET_C8B_DIALOG_GRUNTY_BGS_MISS_WALKWAY_JIGGY },
{ VOLATILE_FLAG_AF_BGS_MAZE_JIGGY_MISSED, ASSET_C8C_DIALOG_GRUNTY_BGS_MISS_MAZE_JIGGY },
{ VOLATILE_FLAG_AC_GV_TRAPDOOR_MISSED, ASSET_A88_DIALOG_GRUNTY_WATER_PYRAMID_DOOR_MISS},
{ VOLATILE_FLAG_AD_MMM_CHURCH_DOOR_MISSED, ASSET_AE2_DIALOG_GRUNTY_CHURCH_DOOR_MISS},
{ VOLATILE_FLAG_AE_BGS_WALKWAY_JIGGY_MISSED, ASSET_C8B_DIALOG_GRUNTY_LONG_SWITCH_MISS},
{ VOLATILE_FLAG_AF_BGS_MAZE_JIGGY_MISSED, ASSET_C8C_DIALOG_GRUNTY_SHORT_SWITCH_MISS},
{ VOLATILE_FLAG_B0_NOT_ENOUGH_NOTES, ASSET_FBD_DIALOG_GRUNTY_NOT_ENOUGH_NOTES },
{ VOLATILE_FLAG_C2_NOBONUS_TEXT, ASSET_E36_DIALOG_BOTTLES_NO_BONUS },
{ VOLATILE_FLAG_C5_WISHYWASHYBANJO_TEXT, ASSET_DB6_DIALOG_MUMBO_WISHYWASHY },

2
src/lair/ch/brentilda.c
View File

@ -46,7 +46,7 @@ void func_8038BADC(ActorMarker *marker, enum asset_e text_id, s32 arg2) {
return;
}
}
gcdialog_showDialog(ASSET_D38_DIALOG_EMPTY, 0xC, this->position, this->marker, func_8038BADC, NULL);
gcdialog_showDialog(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xC, this->position, this->marker, func_8038BADC, NULL);
return;
}
subaddie_set_state(this, 1);