mirror/banjo-kazooie
1
0
Fork 0
mirror of https://gitlab.com/banjo.decomp/banjo-kazooie synced 2026-08-28 16:11:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Pal matching 2

Browse Source
This commit is contained in:
Mario
2026-07-18 20:51:43 +00:00
committed by Cyrus Kashef
parent 1b2edf8bea
commit b0d65852c2
72 changed files with 1415 additions and 1970 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompressed.pal.yaml
+618 -617
View File
File diff suppressed because it is too large Load Diff
manual_syms.pal.txt
+395 -1001
View File
File diff suppressed because it is too large Load Diff
src/BGS/ch/croctus.c
+3 -3
View File
@@ -97,7 +97,7 @@ void func_80387E40(ActorMarker * arg0){
void chCroctus_activateNextCroctus(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this;
if(text_id == ASSET_C86_DIALOG_CROCTUS_FIRST_SUCCESS){
if(text_id == VER_SELECT(ASSET_C86_DIALOG_CROCTUS_FIRST_SUCCESS, 0x9C9, 0, 0)){
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);
@@ -108,7 +108,7 @@ void chCroctus_activateNextCroctus(ActorMarker *caller, enum asset_e text_id, s3
bgs_D_803907B8[this->actorTypeSpecificField]->propPtr->isNotFeatherEggOrNote = 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, ASSET_C87_DIALOG_CROCTUS_SECOND_SPAWN, 0xE, NULL, NULL, chCroctus_activateNextCroctus, NULL);
func_80324DBC(3.4f, VER_SELECT(ASSET_C87_DIALOG_CROCTUS_SECOND_SPAWN, 0x9CA, 0, 0), 0xE, NULL, NULL, chCroctus_activateNextCroctus, NULL);
__spawnQueue_add_2((GenFunction_2) func_80387D18, reinterpret_cast(s32, this->marker), 0x46);
}
else{
@@ -154,7 +154,7 @@ void chCroctus_update(Actor *this){
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
if (this->actorTypeSpecificField == 1) {
func_8028F94C(2, this->position);
gcdialog_showDialog(ASSET_C86_DIALOG_CROCTUS_FIRST_SUCCESS, 0xE, this->position, this->marker, chCroctus_activateNextCroctus, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_C86_DIALOG_CROCTUS_FIRST_SUCCESS, 0x9C9, 0, 0), 0xE, this->position, this->marker, chCroctus_activateNextCroctus, NULL);
subaddie_set_state_with_direction(this, CHCROCTUS_STATE_6_DESPAWN, 0.79f, 1);
} else {
timed_playSfx(0.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000); //0.4f
src/BGS/ch/frogminigame.c
+4 -4
View File
@@ -65,13 +65,13 @@ void chFrogMinigame_setState(Actor * arg0, u32 next_state){
mapSpecificFlags_set(BGS_SPECIFIC_FLAG_10_FROG_MINIGAME_FIRST_MET, 1);
if(!fileProgressFlag_get(FILEPROG_1B_MET_YELLOW_FLIBBITS)){
fileProgressFlag_set(FILEPROG_1B_MET_YELLOW_FLIBBITS, 1);
gcdialog_showDialog(ASSET_C81_DIALOG_YELLOW_FLIBBITS_MEET, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
gcdialog_showDialog(VER_SELECT(ASSET_C81_DIALOG_YELLOW_FLIBBITS_MEET, 0x9C4, 0, 0), 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
}else{
if(!arg0->bgs_6730.unk8){
gcdialog_showDialog(ASSET_C83_DIALOG_YELLOW_FLIBBITS_RETURN, 0x4, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
gcdialog_showDialog(VER_SELECT(ASSET_C83_DIALOG_YELLOW_FLIBBITS_RETURN, 0x9C6, 0, 0), 0x4, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
}
else{
__chFrogMinigame_textCallback(arg0->marker, ASSET_C83_DIALOG_YELLOW_FLIBBITS_RETURN, 0);
__chFrogMinigame_textCallback(arg0->marker, VER_SELECT(ASSET_C83_DIALOG_YELLOW_FLIBBITS_RETURN, 0x9C6, 0, 0), 0);
return;
}
}
@@ -102,7 +102,7 @@ void chFrogMinigame_setState(Actor * arg0, u32 next_state){
}
if (next_state == CH_FROG_MINIGAME_STATE_4_COMPLETE) {
gcdialog_showDialog(ASSET_C82_DIALOG_YELLOW_FLIBBITS_COMPLETE, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
gcdialog_showDialog(VER_SELECT(ASSET_C82_DIALOG_YELLOW_FLIBBITS_COMPLETE, 0x9C5, 0, 0), 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
}
if(next_state == CH_FROG_MINIGAME_STATE_5_SPAWN_JIGGY){
src/BGS/ch/tanktup.c
+4 -4
View File
@@ -148,7 +148,7 @@ void chTanktup_update(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(ASSET_C7E_DIALOG_TANKTUP_MEET, 0, 0, 0, 0, 0);
gcdialog_showDialog(VER_SELECT(ASSET_C7E_DIALOG_TANKTUP_MEET, 0x9C1, 0, 0), 0, 0, 0, 0, 0);
this->has_met_before = TRUE;
}
}
@@ -169,7 +169,7 @@ void chTanktup_update(Actor *this)
if ((!this->unk138_23) && (!local->unk14))
{
if (gcdialog_showDialog(ASSET_C80_DIALOG_TANKTUP_HIT, 0, 0, 0, 0, 0))
if (gcdialog_showDialog(VER_SELECT(ASSET_C80_DIALOG_TANKTUP_HIT, 0x9C3, 0, 0), 0, 0, 0, 0, 0))
{
this->unk138_23 = 1;
}
@@ -220,11 +220,11 @@ void chTanktup_update(Actor *this)
func_8028F918(0);
if (jiggyscore_isCollected(JIGGY_26_BGS_TANKTUP) == 0)
{
gcdialog_showDialog(ASSET_C7F_DIALOG_TANKTUP_COMPLETE, 0xF, this->position, this->marker, func_8038F5E4, 0);
gcdialog_showDialog(VER_SELECT(ASSET_C7F_DIALOG_TANKTUP_COMPLETE, 0x9C2, 0, 0), 0xF, this->position, this->marker, func_8038F5E4, 0);
}
else
{
func_8038F5E4(this->marker, ASSET_C7F_DIALOG_TANKTUP_COMPLETE, -1);
func_8038F5E4(this->marker, VER_SELECT(ASSET_C7F_DIALOG_TANKTUP_COMPLETE, 0x9C2, 0, 0), -1);
}
}
break;
src/BGS/ch/tiptup.c
+21 -21
View File
@@ -31,16 +31,16 @@ ActorInfo gChTiptup = {
s16 chTiptupRepeatDialogs[] = {
NULL,
ASSET_C78_DIALOG_TIPTUP_LESSON_1_REPEAT,
ASSET_C7A_DIALOG_TIPTUP_LESSON_2_REPEAT,
ASSET_C7C_DIALOG_TIPTUP_LESSON_3_REPEAT
VER_SELECT(ASSET_C78_DIALOG_TIPTUP_LESSON_1_REPEAT, 0x9BB, 0, 0),
VER_SELECT(ASSET_C7A_DIALOG_TIPTUP_LESSON_2_REPEAT, 0x9BD, 0, 0),
VER_SELECT(ASSET_C7C_DIALOG_TIPTUP_LESSON_3_REPEAT, 0x9BF, 0, 0)
};
s16 chTiptupSuccessDialogs[] = {
NULL,
ASSET_C77_DIALOG_TIPTUP_LESSON_1_COMPLETE,
ASSET_C79_DIALOG_TIPTUP_LESSON_2_COMPLETE,
ASSET_C7B_DIALOG_TIPTUP_LESSON_3_COMPLETE
VER_SELECT(ASSET_C77_DIALOG_TIPTUP_LESSON_1_COMPLETE, 0x9BA, 0, 0),
VER_SELECT(ASSET_C79_DIALOG_TIPTUP_LESSON_2_COMPLETE, 0x9BC, 0, 0),
VER_SELECT(ASSET_C7B_DIALOG_TIPTUP_LESSON_3_COMPLETE, 0x9BE, 0, 0)
};
u8 chTiptupSequenceLength[] = {3, 3, 5, 7};
@@ -98,7 +98,7 @@ void chTiptup_activateTimer(ActorMarker *this){
thisActor = marker_getActor(this);
item_set(ITEM_6_HOURGLASS, 1);
item_set(ITEM_0_HOURGLASS_TIMER, TIPTUP_TIMER * 60 - 1);
item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(TIPTUP_TIMER, 25, 0, 0) * 60 - 1);
chTiptup_setState(thisActor, CH_TIPTUP_STATE_5_WIN_MINIGAME);
}
@@ -115,21 +115,21 @@ void chTiptup_textEvent(ActorMarker *this, enum asset_e text_id, s32 arg2){
thisActor = marker_getActor(this);
switch(text_id){
case ASSET_C72_DIALOG_TIPTUP_MEET_1:
case ASSET_C74_DIALOG_TIPTUP_MEET_3:
case VER_SELECT(ASSET_C72_DIALOG_TIPTUP_MEET_1, 0x9B5, 0, 0):
case VER_SELECT(ASSET_C74_DIALOG_TIPTUP_MEET_3, 0x9B7, 0, 0):
chTiptup_setState(thisActor, CH_TIPTUP_STATE_3_FF_GIVE_SEQUENCE);
break;
case ASSET_C78_DIALOG_TIPTUP_LESSON_1_REPEAT:
case ASSET_C7A_DIALOG_TIPTUP_LESSON_2_REPEAT:
case ASSET_C7C_DIALOG_TIPTUP_LESSON_3_REPEAT:
case VER_SELECT(ASSET_C78_DIALOG_TIPTUP_LESSON_1_REPEAT, 0x9BB, 0, 0):
case VER_SELECT(ASSET_C7A_DIALOG_TIPTUP_LESSON_2_REPEAT, 0x9BD, 0, 0):
case VER_SELECT(ASSET_C7C_DIALOG_TIPTUP_LESSON_3_REPEAT, 0x9BF, 0, 0):
chTiptup_setState(thisActor, CH_TIPTUP_STATE_4_AWAIT_SEQUENCE_COMPLETION);
break;
case ASSET_C77_DIALOG_TIPTUP_LESSON_1_COMPLETE:
case ASSET_C79_DIALOG_TIPTUP_LESSON_2_COMPLETE:
case VER_SELECT(ASSET_C77_DIALOG_TIPTUP_LESSON_1_COMPLETE, 0x9BA, 0, 0):
case VER_SELECT(ASSET_C79_DIALOG_TIPTUP_LESSON_2_COMPLETE, 0x9BC, 0, 0):
func_80324E38(0.0f, 0);
chTiptup_setState(thisActor, CH_TIPTUP_STATE_3_FF_GIVE_SEQUENCE);
break;
case ASSET_C7B_DIALOG_TIPTUP_LESSON_3_COMPLETE:
case VER_SELECT(ASSET_C7B_DIALOG_TIPTUP_LESSON_3_COMPLETE, 0x9BE, 0, 0):
timedFunc_set_0(0.0f, chTiptup_jiggySpawn);
timed_exitStaticCamera(2.5f);
func_80324E38(2.5f, 0);
@@ -185,7 +185,7 @@ void chTiptup_setState(Actor *this, s32 next_state){
if (unqPtr->round == TIPTUP_ROUND_1) {
gcdialog_showDialog(
ASSET_C72_DIALOG_TIPTUP_MEET_1,
VER_SELECT(ASSET_C72_DIALOG_TIPTUP_MEET_1, 0x9B5, 0, 0),
0xe,
this->position,
this->marker,
@@ -194,7 +194,7 @@ void chTiptup_setState(Actor *this, s32 next_state){
}
else {
gcdialog_showDialog(
ASSET_C74_DIALOG_TIPTUP_MEET_3,
VER_SELECT(ASSET_C74_DIALOG_TIPTUP_MEET_3, 0x9B7, 0, 0),
0xf,
this->position,
this->marker,
@@ -242,7 +242,7 @@ void chTiptup_setState(Actor *this, s32 next_state){
if(!unqPtr->round && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){
func_80324DBC(
sequence_time + 0.5,
ASSET_C73_DIALOG_TIPTUP_MEET_2,
VER_SELECT(ASSET_C73_DIALOG_TIPTUP_MEET_2, 0x9B6, 0, 0),
0xe,
this->position,
this->marker,
@@ -325,7 +325,7 @@ void chTiptup_choirHitReaction(ActorMarker *this, s32 arg1){
unqPtr = (ActorLocal_Tiptup *)&thisActor->local;
if((s32)unqPtr->unk0 >= (s32) vector_size(unqPtr->unk4)){
if(!mapSpecificFlags_get(CH_TIPTUP_SPECIFIC_FLAG_0_CHOIR_MEMBER_HIT_AFTER_JIGGY)
&& gcdialog_showDialog(ASSET_C76_DIALOG_CHOIR_MEMBER_HIT_AFTER_JIGGY, 0, 0, 0, 0, 0))
&& gcdialog_showDialog(VER_SELECT(ASSET_C76_DIALOG_CHOIR_MEMBER_HIT_AFTER_JIGGY, 0x9B9, 0, 0), 0, 0, 0, 0, 0))
{
mapSpecificFlags_set(CH_TIPTUP_SPECIFIC_FLAG_0_CHOIR_MEMBER_HIT_AFTER_JIGGY, 1);
}
@@ -339,7 +339,7 @@ void chTiptup_choirHitReaction(ActorMarker *this, s32 arg1){
timedFunc_set_0(0.5f, chTiptup_sfxIncorrectHit);
if(!mapSpecificFlags_get(CH_TIPTUP_SPECIFIC_FLAG_1_TIPTUP_MISS)
&& !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)
&& gcdialog_showDialog(ASSET_C75_DIALOG_TIPTUP_MISS, 0, NULL, NULL, NULL, NULL))
&& gcdialog_showDialog(VER_SELECT(ASSET_C75_DIALOG_TIPTUP_MISS, 0x9B8, 0, 0), 0, NULL, NULL, NULL, NULL))
{
mapSpecificFlags_set(CH_TIPTUP_SPECIFIC_FLAG_1_TIPTUP_MISS, TRUE);
}
@@ -446,7 +446,7 @@ void chTiptup_update(Actor *this){
if(this->state == CH_TIPTUP_STATE_6_AFTER_JIGGY_DIALOG){
if(ml_vec3f_distance(this->position, player_position) < 300.0f && !unqPtr->unk8){
unqPtr->unk8 = 1;
gcdialog_showDialog(ASSET_C7D_DIALOG_TIPTUP_MEET_AFTER_JIGGY, 4, 0, 0, 0, 0);
gcdialog_showDialog(VER_SELECT(ASSET_C7D_DIALOG_TIPTUP_MEET_AFTER_JIGGY, 0x9C0, 0, 0), 4, 0, 0, 0, 0);
}
}
}
src/BGS/crc.c
+3 -3
View File
@@ -2,6 +2,6 @@
#include "checksums.h"
#include "version.h"
s32 D_80390B20 = VER_SELECT(0x00282B61, 0, 0, 0); // BGS_TEXT_CRC1
s32 D_80390B24 = VER_SELECT(0xccdaeea0, 0, 0, 0); // BGS_TEXT_CRC2
s32 D_80390B28 = VER_SELECT(0x0002DE6B, 0, 0, 0); // BGS_DATA_CRC1
s32 D_80390B20 = VER_SELECT(0x00282B61, 0x002871C5, 0, 0); // BGS_TEXT_CRC1
s32 D_80390B24 = VER_SELECT(0xccdaeea0, 0xEDE9F826, 0, 0); // BGS_TEXT_CRC2
s32 D_80390B28 = VER_SELECT(0x0002DE6B, 0x0002EA91, 0, 0); // BGS_DATA_CRC1
src/BGS/mrvileminigame.c
+35 -35
View File
@@ -44,50 +44,50 @@ ActorInfo gChVileGame = {
enum asset_e chMrVileMinigamePlayerLosesDialog[] = {
0,
ASSET_C66_DIALOG_MR_VILE_WINS_ROUND_1,
ASSET_C68_DIALOG_MR_VILE_WINS_ROUND_2,
ASSET_C6A_DIALOG_MR_VILE_WINS_ROUND_3,
ASSET_C92_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_2,
ASSET_C93_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_3,
ASSET_C94_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_4,
VER_SELECT(ASSET_C66_DIALOG_MR_VILE_WINS_ROUND_1, 0x9A9, 0, 0),
VER_SELECT(ASSET_C68_DIALOG_MR_VILE_WINS_ROUND_2, 0x9AB, 0, 0),
VER_SELECT(ASSET_C6A_DIALOG_MR_VILE_WINS_ROUND_3, 0x9AD, 0, 0),
VER_SELECT(ASSET_C92_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_2, 0x9D5, 0, 0),
VER_SELECT(ASSET_C93_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_3, 0x9D6, 0, 0),
VER_SELECT(ASSET_C94_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_4, 0x9D7, 0, 0),
0
};
enum asset_e chMrVileMinigamePlayerWinsDialog[] = {
0,
ASSET_C67_DIALOG_MR_VILE_ROUND_2_START,
ASSET_C69_DIALOG_MR_VILE_ROUND_3_START,
VER_SELECT(ASSET_C67_DIALOG_MR_VILE_ROUND_2_START, 0x9AA, 0, 0),
VER_SELECT(ASSET_C69_DIALOG_MR_VILE_ROUND_3_START, 0x9AC, 0, 0),
0,
ASSET_C95_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_1,
ASSET_C96_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_2,
ASSET_C97_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_3
VER_SELECT(ASSET_C95_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_1, 0x9D8, 0, 0),
VER_SELECT(ASSET_C96_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_2, 0x9D9, 0, 0),
VER_SELECT(ASSET_C97_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_3, 0x9DA, 0, 0)
};
enum asset_e chMrVileMinigamePlayerWinsRematchDialog[] = {
0,
ASSET_C6E_DIALOG_MR_VILE_LOSE_ROUND_2_REMATCH,
ASSET_C6F_DIALOG_MR_VILE_LOSE_ROUND_3_REMATCH,
VER_SELECT(ASSET_C6E_DIALOG_MR_VILE_LOSE_ROUND_2_REMATCH, 0x9B1, 0, 0),
VER_SELECT(ASSET_C6F_DIALOG_MR_VILE_LOSE_ROUND_3_REMATCH, 0x9B2, 0, 0),
0,
ASSET_C95_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_1,
ASSET_C96_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_2,
ASSET_C97_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_3
VER_SELECT(ASSET_C95_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_1, 0x9D8, 0, 0),
VER_SELECT(ASSET_C96_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_2, 0x9D9, 0, 0),
VER_SELECT(ASSET_C97_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_3, 0x9DA, 0, 0)
};
enum asset_e chMrVileMinigamePlayerDeclinesDialog[] = {
ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES,
ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES,
ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES,
ASSET_C8F_DIALOG_MR_VILE_PLAYER_DECLINES_EXTRA_CHALLENGE,
VER_SELECT(ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES, 0x9A8, 0, 0),
VER_SELECT(ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES, 0x9A8, 0, 0),
VER_SELECT(ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES, 0x9A8, 0, 0),
VER_SELECT(ASSET_C8F_DIALOG_MR_VILE_PLAYER_DECLINES_EXTRA_CHALLENGE, 0x9D2, 0, 0),
0,
0,
0
};
enum asset_e chMrVileMinigameRound1AndChallengeDialog[] = {
ASSET_C64_DIALOG_MR_VILE_ROUND_1_START,
VER_SELECT(ASSET_C64_DIALOG_MR_VILE_ROUND_1_START, 0x9A7, 0, 0),
0,
0,
ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1,
VER_SELECT(ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1, 0x9D1, 0, 0),
0,
0,
0,
@@ -95,10 +95,10 @@ enum asset_e chMrVileMinigameRound1AndChallengeDialog[] = {
};
enum asset_e chMrVileMinigameRematchDialog[] = {
ASSET_C6D_DIALOG_MR_VILE_LOSE_ROUND_1_REMATCH,
ASSET_C70_DIALOG_MR_VILE_WIN_ROUND_2_REMATCH,
ASSET_C71_DIALOG_MR_VILE_WIN_ROUND_3_REMATCH,
ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1,
VER_SELECT(ASSET_C6D_DIALOG_MR_VILE_LOSE_ROUND_1_REMATCH, 0x9B0, 0, 0),
VER_SELECT(ASSET_C70_DIALOG_MR_VILE_WIN_ROUND_2_REMATCH, 0x9B3, 0, 0),
VER_SELECT(ASSET_C71_DIALOG_MR_VILE_WIN_ROUND_3_REMATCH, 0x9B4, 0, 0),
VER_SELECT(ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1, 0x9D1, 0, 0),
0,
0,
0,
@@ -128,7 +128,7 @@ enum MrVileMinigameMode {
MR_VILE_MINIGAME_MODE_4_CHALLENGE_3
};
#define MR_VILE_MINIGAME_TIMER 3600
#define MR_VILE_MINIGAME_TIMER VER_SELECT(3600, 3000, 0, 0)
#define TYPE_CHANGE_TIMER_REGULAR 10.0f
#define TYPE_CHANGE_TIMER_FF 5.0f
#define EXTRA_LIFE_SCORE 35
@@ -311,7 +311,7 @@ void chMrVileMinigame_vileDropsJiggy(ActorMarker *marker) {
chMrVileMinigame_spawnJiggy(this, 1);
gcdialog_showDialog(
ASSET_C6B_DIALOG_MR_VILE_PLAYER_WINS,
VER_SELECT(ASSET_C6B_DIALOG_MR_VILE_PLAYER_WINS, 0x9AE, 0, 0),
0xF,
chMrVile_getPostion(local->vile_marker),
this->marker,
@@ -358,7 +358,7 @@ void chMrVileMinigame_vileDropsExtraLives(ActorMarker *marker) {
}
}
gcdialog_showDialog(
ASSET_C98_DIALOG_MR_VILE_GIVES_PRIZE,
VER_SELECT(ASSET_C98_DIALOG_MR_VILE_GIVES_PRIZE, 0x9DB, 0, 0),
0xF,
chMrVile_getPostion(local->vile_marker),
this->marker,
@@ -386,7 +386,7 @@ void chMrVileMinigame_setState(Actor *this, s32 next_state) {
if (local->dialogIndex == 3) {
if (local->mode >= MR_VILE_MINIGAME_MODE_4_CHALLENGE_2) {
gcdialog_showDialog(
ASSET_C91_DIALOG_MR_VILE_EXTRA_CHALLENGE_REMATCH_2,
VER_SELECT(ASSET_C91_DIALOG_MR_VILE_EXTRA_CHALLENGE_REMATCH_2, 0x9D4, 0, 0),
0xE,
chMrVile_getPostion(local->vile_marker),
this->marker,
@@ -396,8 +396,8 @@ void chMrVileMinigame_setState(Actor *this, s32 next_state) {
} else {
gcdialog_showDialog(
(local->dialogIndex == local->mode) ?
ASSET_C8D_DIALOG_MR_VILE_EXTRA_CHALLENGE_INTRO :
ASSET_C90_DIALOG_MR_VILE_EXTRA_CHALLENGE_REMATCH_1,
VER_SELECT(ASSET_C8D_DIALOG_MR_VILE_EXTRA_CHALLENGE_INTRO, 0x9D0, 0, 0) :
VER_SELECT(ASSET_C90_DIALOG_MR_VILE_EXTRA_CHALLENGE_REMATCH_1, 0x9D3, 0, 0),
0xE,
chMrVile_getPostion(local->vile_marker),
this->marker,
@@ -408,8 +408,8 @@ void chMrVileMinigame_setState(Actor *this, s32 next_state) {
} else {
gcdialog_showDialog(
(local->dialogIndex == local->mode) ?
ASSET_C63_DIALOG_MR_VILE_INTRO :
ASSET_C6C_DIALOG_MR_VILE_TRY_AGAIN,
VER_SELECT(ASSET_C63_DIALOG_MR_VILE_INTRO, 0x9A6, 0, 0) :
VER_SELECT(ASSET_C6C_DIALOG_MR_VILE_TRY_AGAIN, 0x9AF, 0, 0),
0xE,
chMrVile_getPostion(local->vile_marker),
this->marker,
@@ -432,7 +432,7 @@ void chMrVileMinigame_setState(Actor *this, s32 next_state) {
if (local->dialogIndex == local->mode) {
gcdialog_showDialog(
chMrVileMinigameRound1AndChallengeDialog[local->dialogIndex],
0xE | ((chMrVileMinigameRound1AndChallengeDialog[local->dialogIndex] == ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1) ? 1 : 0) | 0xE,
0xE | ((chMrVileMinigameRound1AndChallengeDialog[local->dialogIndex] == VER_SELECT(ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1, 0x9D1, 0, 0)) ? 1 : 0) | 0xE,
chMrVile_getPostion(local->vile_marker),
this->marker,
chMrVileMinigame_setStatePlayingMinigame,
src/CCW/ccwspawnqueue.c
+10 -10
View File
@@ -74,7 +74,7 @@ Actor* cc_pal_unk_draw(ActorMarker *, Gfx **, Mtx **, Vtx **);
ActorInfo chNabnutWindowSpring = {
MARKER_239_CCW_UNKNOWN_NABNUT_WINDOW, ACTOR_25F_CCW_UNKNOWN_NABNUT_WINDOW, ASSET_4FC_MODEL_CCW_UNKNOWN_NABNUT_WINDOW,
0x1, NULL,
chMMMBreakableWooden_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0),
chMMMBreakableWooden_update, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
@@ -82,63 +82,63 @@ ActorInfo chNabnutWindowSpring = {
ActorInfo chNabnutWindowSummer = {
MARKER_236_CCW_UNKNOWN_NABNUT_WINDOW, ACTOR_260_CCW_UNKNOWN_NABNUT_WINDOW, ASSET_4F9_MODEL_CCW_UNKNOWN_NABNUT_WINDOW,
0x1, NULL,
chMMMBreakableWooden_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0),
chMMMBreakableWooden_update, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo chNabnutWindowAutumn = {
MARKER_237_CCW_AUTUMN_NABNUT_WINDOW, ACTOR_261_CCW_AUTUMN_NABNUT_WINDOW, ASSET_4FA_MODEL_CCW_AUTUMN_NABNUT_WINDOW,
0x1, NULL,
chMMMBreakableWooden_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0),
chMMMBreakableWooden_update, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo chNabnutWindowWinter = {
MARKER_238_CCW_WINTER_NABNUT_WINDOW, ACTOR_262_CCW_WINTER_NABNUT_WINDOW, ASSET_4FB_MODEL_CCW_WINTER_NABNUT_WINDOW,
0x1, NULL,
chMMMBreakableWooden_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0),
chMMMBreakableWooden_update, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo chNabnutDoor = {
MARKER_243_NABNUT_DOOR, ACTOR_2E6_NABNUT_DOOR, ASSET_533_MODEL_NABNUT_DOOR,
0x1, NULL,
chMMMBreakableWooden_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0),
chMMMBreakableWooden_update, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo chCCWWhipcrackRoomDoor = {
MARKER_263_CCW_WHIPCRACK_ROOM_DOOR, ACTOR_2E7_WHIPCRACK_ROOM_DOOR, ASSET_518_MODEL_CCW_WHIPCRACK_ROOM_DOOR,
0x1, NULL,
code_76C0_ccwWhipcrackRoomDoorUpdate, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0),
code_76C0_ccwWhipcrackRoomDoorUpdate, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo chCCWMumbosHut = {
MARKER_21E_CCW_MUMBOS_HUT, ACTOR_233_CCW_MUMBOS_HUT, ASSET_3B3_MODEL_CCW_MUMBOS_HUT,
0x1, NULL,
func_802D3D74, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0),
func_802D3D74, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo chGnawtysDen = {
MARKER_26B_GNAWTYS_DEN, ACTOR_2DE_GNAWTYS_DEN, ASSET_531_MODEL_GNAWTYS_DEN,
0x1, NULL,
code_76C0_ccwGnawtysStuffUpdate, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0),
code_76C0_ccwGnawtysStuffUpdate, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo chGnawtysBed = {
MARKER_26C_GNAWTYS_BED, ACTOR_2DD_GNAWTYS_BED, ASSET_53E_MODEL_GNAWTY_BED,
0x1, NULL,
code_76C0_ccwGnawtysStuffUpdate, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0),
code_76C0_ccwGnawtysStuffUpdate, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo chGnawtysShelves = {
MARKER_26D_GNAWTYS_SHELVES, ACTOR_2DC_GNAWTYS_SHELVES, ASSET_53F_MODEL_GNAWTY_SHELVES,
0x1, NULL,
code_76C0_ccwGnawtysStuffUpdate, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0),
code_76C0_ccwGnawtysStuffUpdate, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
src/CCW/ch/seasonswitchdoors.c
+4 -8
View File
@@ -29,14 +29,10 @@ ActorAnimationInfo chSeasonSwitchAnimations[] = {
{ASSET_D4_ANIM_SWITCH_DOWN, 100000000.0f}
};
#if VERSION == VERSION_PAL
Actor* cc_pal_unk_draw(ActorMarker *, Gfx **, Mtx **, Vtx **);
#endif
ActorInfo chCCWSpringSwitchDoor = {
MARKER_133_CCW_SPRING_SEASON_DOOR, ACTOR_1E3_CCW_SPRING_SEASON_DOOR, ASSET_52E_MODEL_CCW_SEASON_DOOR,
0x1, NULL,
chSeasonSwitchDoors_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0),
chSeasonSwitchDoors_update, actor_update_func_80326224, actor_drawFullDepth,
0, 0x4000, 0.0f, 0
};
@@ -50,7 +46,7 @@ ActorInfo chCCWSpringSwitch = {
ActorInfo chCCWSummerSwitchDoor = {
MARKER_131_CCW_SUMMER_SEASON_DOOR, ACTOR_16D_CCW_SUMMER_SEASON_DOOR, ASSET_52E_MODEL_CCW_SEASON_DOOR,
0x1, NULL,
chSeasonSwitchDoors_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0),
chSeasonSwitchDoors_update, actor_update_func_80326224, actor_drawFullDepth,
0, 0x4000, 0.0f, 0
};
@@ -64,7 +60,7 @@ ActorInfo chCCWSummerSwitch = {
ActorInfo chCCWAutumnSwitchDoor = {
MARKER_12F_CCW_AUTUMN_SEASON_DOOR, ACTOR_16B_CCW_AUTUMN_SEASON_DOOR, ASSET_52E_MODEL_CCW_SEASON_DOOR,
0x1, NULL,
chSeasonSwitchDoors_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0),
chSeasonSwitchDoors_update, actor_update_func_80326224, actor_drawFullDepth,
0, 0x4000, 0.0f, 0
};
@@ -78,7 +74,7 @@ ActorInfo chCCWAutumnSwitch = {
ActorInfo chCCWWinterSwitchDoor = {
MARKER_12D_CCW_WINTER_SEASON_DOOR, ACTOR_169_CCW_WINTER_SEASON_DOOR, ASSET_52E_MODEL_CCW_SEASON_DOOR,
0x1, NULL,
chSeasonSwitchDoors_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0),
chSeasonSwitchDoors_update, actor_update_func_80326224, actor_drawFullDepth,
0, 0x4000, 0.0f, 0
};
src/FP/ch/bearcub.c
+6 -6
View File
@@ -78,7 +78,7 @@ void func_8038A274(Actor *this){
}
void func_8038A318(ActorMarker *caller, enum asset_e text_id, s32 arg1){
if(text_id == 0xc19){
if(text_id == VER_SELECT(ASSET_C19_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_3, 0x993, 0, 0)){
gcStaticCamera_activate(0x25);
jiggy_spawn(JIGGY_2E_FP_PRESENTS, FP_D_80391E74);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000);
@@ -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_BOGGY_KIDS_PRESENT_RECEIVED_1
: (sp34 == 2) ? ASSET_C18_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_2
: ASSET_C19_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_3;
sp38 = (sp34 == 1) ? VER_SELECT(ASSET_C17_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_1, 0x991, 0, 0)
: (sp34 == 2) ? VER_SELECT(ASSET_C18_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_2, 0x992, 0, 0)
: VER_SELECT(ASSET_C19_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_3, 0x993, 0, 0);
this->yaw_ideal = (f32)subaddie_getYawToPlayer(this);
subaddie_turnToYaw(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_BOGGY_KIDS_MEET, 0x2a, NULL, NULL, NULL, NULL)) {
if (gcdialog_showDialog(VER_SELECT(ASSET_C1A_DIALOG_BOGGY_KIDS_MEET, 0x994, 0, 0), 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_BOGGY_KIDS_PRESENT_RECEIVED_3) {
if (sp38 == VER_SELECT(ASSET_C19_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_3, 0x993, 0, 0)) {
gcdialog_showDialog(sp38, 0x2f, this->position, this->marker, func_8038A318, NULL);
}
else {
src/FP/ch/boggy1.c
+4 -4
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 == ASSET_C00_DIALOG_BOGGY_SAVED) {
gcdialog_showDialog(ASSET_C2B_DIALOG_BOGGY_SAVED_2, 0xf, NULL, this->marker, NULL, func_803877A8);
if (text_id == VER_SELECT(ASSET_C00_DIALOG_BOGGY_SAVED, 0x97A, 0, 0)) {
gcdialog_showDialog(VER_SELECT(ASSET_C2B_DIALOG_BOGGY_SAVED_2, 0x9A5, 0, 0), 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, ASSET_C00_DIALOG_BOGGY_SAVED, 0xe, NULL, this->marker, func_80387828, func_803877A8);
func_80324DBC(1.0f, VER_SELECT(ASSET_C00_DIALOG_BOGGY_SAVED, 0x97A, 0, 0), 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_BOGGY_MEET, 0x2a, this->position, NULL, NULL, NULL)) {
if (gcdialog_showDialog(VER_SELECT(ASSET_BFF_DIALOG_BOGGY_MEET, 0x979, 0, 0), 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);
}
src/FP/ch/boggy2.c
+16 -16
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(FP_SPECIFIC_FLAG_5_WALRUS_RACE_FAILED)){
func_80324DBC(0.1f, ASSET_C06_DIALOG_BOGGY_SLED_WALRUS_SECOND_START, 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
func_80324DBC(0.1f, VER_SELECT(ASSET_C06_DIALOG_BOGGY_SLED_WALRUS_SECOND_START, 0x980, 0, 0), 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
}
else{//L80388964
func_80324DBC(0.1f, ASSET_C03_DIALOG_BOGGY_SLED_WALRUS_START, 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
func_80324DBC(0.1f, VER_SELECT(ASSET_C03_DIALOG_BOGGY_SLED_WALRUS_START, 0x97D, 0, 0), 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
}
}
else{//L803889A0
func_8028F490(D_80391D0C);
if(mapSpecificFlags_get(FP_SPECIFIC_FLAG_6_BANJO_RACE_FAILED)){
func_80324DBC(0.1f, ASSET_C29_DIALOG_BOGGY_SLED_BEAR_SECOND_START, 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
func_80324DBC(0.1f, VER_SELECT(ASSET_C29_DIALOG_BOGGY_SLED_BEAR_SECOND_START, 0x9A3, 0, 0), 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
}
else{
func_80324DBC(0.1f, ASSET_C28_DIALOG_BOGGY_SLED_BEAR_START, 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
func_80324DBC(0.1f, VER_SELECT(ASSET_C28_DIALOG_BOGGY_SLED_BEAR_START, 0x9A2, 0, 0), 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
}
}//L80388A30
mapSpecificFlags_set(FP_SPECIFIC_FLAG_5_WALRUS_RACE_FAILED, TRUE);
@@ -124,10 +124,10 @@ void func_80388A50(Actor *this){
void func_80388A94(Actor *this){
func_80388A50(this);
if(mapSpecificFlags_get(FP_SPECIFIC_FLAG_6_BANJO_RACE_FAILED)){
gcdialog_showDialog(ASSET_C0A_DIALOG_BOGGY_SLED_BEAR_MISS_RETRY, 0xe, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_C0A_DIALOG_BOGGY_SLED_BEAR_MISS_RETRY, 0x984, 0, 0), 0xe, this->position, this->marker, func_80388D70, NULL);
}
else{
gcdialog_showDialog(ASSET_C09_DIALOG_BOGGY_SLED_BEAR_ANSWER_TO_START, 0xe, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_C09_DIALOG_BOGGY_SLED_BEAR_ANSWER_TO_START, 0x983, 0, 0), 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(FP_SPECIFIC_FLAG_5_WALRUS_RACE_FAILED)){
gcdialog_showDialog(ASSET_C05_DIALOG_BOGGY_SLED_WALRUS_MISS_RETRY, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_C05_DIALOG_BOGGY_SLED_WALRUS_MISS_RETRY, 0x97F, 0, 0), 0xf, this->position, this->marker, func_80388D70, NULL);
}
else{
gcdialog_showDialog(ASSET_C02_DIALOG_BOGGY_SLED_WALRUS_MEET, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_C02_DIALOG_BOGGY_SLED_WALRUS_MEET, 0x97C, 0, 0), 0xf, this->position, this->marker, func_80388D70, NULL);
}
}
else{//L80388BB8
if(!volatileFlag_get(VOLATILE_FLAG_B3)){
if(gcdialog_showDialog(ASSET_C01_DIALOG_BOGGY_SLED_BEAR_DENY, 0xe, this->position, this->marker, func_80388D70, NULL)){
if(gcdialog_showDialog(VER_SELECT(ASSET_C01_DIALOG_BOGGY_SLED_BEAR_DENY, 0x97B, 0, 0), 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_BOGGY_SLED_WALRUS_COMPLETE_RETRY, 0xe, this->position, this->marker, func_80388D70, NULL)){
if(gcdialog_showDialog(VER_SELECT(ASSET_C08_DIALOG_BOGGY_SLED_WALRUS_COMPLETE_RETRY, 0x982, 0, 0), 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 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
case VER_SELECT(ASSET_C03_DIALOG_BOGGY_SLED_WALRUS_START, 0x97D, 0, 0):
case VER_SELECT(ASSET_C06_DIALOG_BOGGY_SLED_WALRUS_SECOND_START, 0x980, 0, 0):
case VER_SELECT(ASSET_C28_DIALOG_BOGGY_SLED_BEAR_START, 0x9A2, 0, 0):
case VER_SELECT(ASSET_C29_DIALOG_BOGGY_SLED_BEAR_SECOND_START, 0x9A3, 0, 0)://L80388DC4
coMusicPlayer_playMusic(COMUSIC_3A_FP_BOGGY_RACE, 25000);
func_8025A58C(0, 4000);
core1_ce60_incOrDecCounter(FALSE);
@@ -481,13 +481,13 @@ void func_803896FC(Actor *this){
&& player_getTransformation() != TRANSFORM_4_WALRUS
&& volatileFlag_get(VOLATILE_FLAG_B3)
){
gcdialog_showDialog(ASSET_C01_DIALOG_BOGGY_SLED_BEAR_DENY, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_C01_DIALOG_BOGGY_SLED_BEAR_DENY, 0x97B, 0, 0), 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_BOGGY_SLED_WALRUS_COMPLETE_RETRY, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_C08_DIALOG_BOGGY_SLED_WALRUS_COMPLETE_RETRY, 0x982, 0, 0), 0xf, this->position, this->marker, func_80388D70, NULL);
}
else if( player_getTransformation() != TRANSFORM_4_WALRUS){
func_80388A94(this);
src/FP/ch/boggy3.c
+3 -3
View File
@@ -26,7 +26,7 @@ Actor *func_80390290(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(this->unk38_31) return this;
if(gcdialog_getCurrentTextId() == 0xC1F || gcdialog_getCurrentTextId() == 0xC1E){
if(gcdialog_getCurrentTextId() == VER_SELECT(ASSET_C1F_DIALOG_BOGGY_IGLOO_2, 0x999, 0, 0) || gcdialog_getCurrentTextId() == VER_SELECT(ASSET_C1E_DIALOG_BOGGY_IGLOO_1, 0x998, 0, 0)){
sp18 = 1;
}
modelRender_setAppendageVisibility(1, 0);
@@ -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_IGLOO_2, 0xb, this->position, NULL, NULL, NULL)){
if(gcdialog_showDialog(VER_SELECT(ASSET_C1F_DIALOG_BOGGY_IGLOO_2, 0x999, 0, 0), 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_IGLOO_1, 0x2b, this->position, NULL, NULL, NULL)){
if(gcdialog_showDialog(VER_SELECT(ASSET_C1E_DIALOG_BOGGY_IGLOO_1, 0x998, 0, 0), 0x2b, this->position, NULL, NULL, NULL)){
this->has_met_before = TRUE;
}
}
src/FP/ch/cavewozza.c
+2 -2
View File
@@ -69,14 +69,14 @@ void chCaveWozza_update(Actor *this){
if (subaddie_playerIsWithinSphereAndActive(this, 350)) {
if (player_getTransformation() == TRANSFORM_4_WALRUS) {
if (!levelSpecificFlags_get(LEVEL_FLAG_31_FP_WOZZA_WALRUS_TALKED)) {
if (gcdialog_showDialog(ASSET_C27_DIALOG_WOZZA_CAVE_MEET_AS_WALRUS, 0x23, NULL, NULL, NULL, NULL)) {
if (gcdialog_showDialog(VER_SELECT(ASSET_C27_DIALOG_WOZZA_CAVE_MEET_AS_WALRUS, 0x9A1, 0, 0), 0x23, NULL, NULL, NULL, NULL)) {
levelSpecificFlags_set(LEVEL_FLAG_31_FP_WOZZA_WALRUS_TALKED, TRUE);
}
}
}
else {
if (!levelSpecificFlags_get(LEVEL_FLAG_32_FP_WOZZA_BEAR_TALKED)) {
if (gcdialog_showDialog(ASSET_C26_DIALOG_WOZZA_CAVE_MEET_AS_BEAR, 0x23, NULL, NULL, NULL, NULL)) {
if (gcdialog_showDialog(VER_SELECT(ASSET_C26_DIALOG_WOZZA_CAVE_MEET_AS_BEAR, 0x9A0, 0, 0), 0x23, NULL, NULL, NULL, NULL)) {
levelSpecificFlags_set(LEVEL_FLAG_32_FP_WOZZA_BEAR_TALKED, TRUE);
}
}
src/FP/ch/twinkly.c
+2 -2
View File
@@ -336,11 +336,11 @@ void chTwinkly_update(Actor *this){
if(this->unk1C[1] <= this->position_y){
this->position_y = this->unk1C[1];
if(!fileProgressFlag_get(FILEPROG_82_MET_TWINKLIES)){
gcdialog_showDialog(ASSET_C12_DIALOG_TWINKLIE_MINIGAME_START, 0x2a, this->position, this->marker, chTwinkly_setUpMinigame, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_C12_DIALOG_TWINKLIE_MINIGAME_START, 0x98C, 0, 0), 0x2a, this->position, this->marker, chTwinkly_setUpMinigame, NULL);
fileProgressFlag_set(FILEPROG_82_MET_TWINKLIES, TRUE);
}
else{
gcdialog_showDialog(ASSET_C25_DIALOG_TWINKLIE_MINIGAME_RETRY, 0x2b, this->position, this->marker, chTwinkly_setUpMinigame, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_C25_DIALOG_TWINKLIE_MINIGAME_RETRY, 0x99F, 0, 0), 0x2b, this->position, this->marker, chTwinkly_setUpMinigame, NULL);
}
subaddie_set_state(this, 5);
this->pitch -= 3.0f;
src/FP/ch/twinklybox.c
+2 -2
View File
@@ -177,7 +177,7 @@ void chTwinklyBox_destroyBox(ActorMarker *marker){
chTwinklyBox_destroyBoxDust(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(ASSET_C13_DIALOG_TWINKLIE_MINIGAME_COMPLETE, 0, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_C13_DIALOG_TWINKLIE_MINIGAME_COMPLETE, 0x98D, 0, 0), 0, NULL, NULL, NULL, NULL);
}
void chTwinklyBox_openBox(Actor *this){
@@ -364,7 +364,7 @@ void chTwinklyBox_update(Actor *this){
func_8028F784(0);
subaddie_set_state_with_direction(this, 4, 0.999f, 1);
actor_playAnimationOnce(this);
item_set(ITEM_0_HOURGLASS_TIMER, 80*60 - 1);
item_set(ITEM_0_HOURGLASS_TIMER, 80*FRAMERATE - 1);
item_set(ITEM_6_HOURGLASS, TRUE);
this->unk38_31 = 0xA;
item_set(ITEM_24_TWINKLY_SCORE, this->unk38_31);
src/FP/ch/twinklymuncher.c
+2 -2
View File
@@ -127,7 +127,7 @@ void chTwinklyMuncher_update(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_MISS, 0x2b, this->position, this->marker, chTwinklyMuncher_failMinigameExit, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_C15_DIALOG_TWINKLIE_MINIGAME_MISS, 0x98F, 0, 0), 0x2b, this->position, this->marker, chTwinklyMuncher_failMinigameExit, NULL);
this->velocity[0] = 1.0f;
subaddie_set_state_with_direction(this, 6, 0.03f, 1);
actor_loopAnimation(this);
@@ -201,7 +201,7 @@ void chTwinklyMuncher_update(Actor *this){
sfx_playFadeShorthandDefault(SFX_27_JINJO_HI, 1.6f, 32000, this->position, 1250, 2500);
func_80324D54(0.35f, SFX_110_TWINKLY_DEATH, 1.0f, 32000, this->position, 1250.0f, 2500.0f);
marker_despawn(sp38->marker);
if( !mapSpecificFlags_get(FP_SPECIFIC_FLAG_A_FIRST_TWINKLY_EATEN) && gcdialog_showDialog(ASSET_C16_DIALOG_TWINKLIE_MINIGAME_EATEN, 0, NULL, NULL, NULL, NULL)){
if( !mapSpecificFlags_get(FP_SPECIFIC_FLAG_A_FIRST_TWINKLY_EATEN) && gcdialog_showDialog(VER_SELECT(ASSET_C16_DIALOG_TWINKLIE_MINIGAME_EATEN, 0x990, 0, 0), 0, NULL, NULL, NULL, NULL)){
mapSpecificFlags_set(FP_SPECIFIC_FLAG_A_FIRST_TWINKLY_EATEN, TRUE);
}
}
src/FP/ch/wozza.c
+5 -5
View File
@@ -70,11 +70,11 @@ void chWozza_enterCaveFinal(Actor *this){
void chWozza_textCallback(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
switch(text_id){
case ASSET_C1B_DIALOG_WOZZA_MEET_AS_BEAR:
case VER_SELECT(ASSET_C1B_DIALOG_WOZZA_MEET_AS_BEAR, 0x995, 0, 0):
timed_exitStaticCamera(0.0f);
break;
case ASSET_C1C_DIALOG_WOZZA_MEET_AS_WALRUS:
case VER_SELECT(ASSET_C1C_DIALOG_WOZZA_MEET_AS_WALRUS, 0x996, 0, 0):
timed_exitStaticCamera(0.0f);
chWozza_enterCaveFinal(this);
break;
@@ -110,7 +110,7 @@ void chWozza_firstContact(Actor *this){
subaddie_set_state(this, 2);
actor_loopAnimation(this);
timed_setStaticCameraToNode(0.0f, 0x2e);
func_80324DBC(0.0f, ASSET_C1B_DIALOG_WOZZA_MEET_AS_BEAR, 0x2a, this->position, this->marker, chWozza_textCallback, NULL);
func_80324DBC(0.0f, VER_SELECT(ASSET_C1B_DIALOG_WOZZA_MEET_AS_BEAR, 0x995, 0, 0), 0x2a, this->position, this->marker, chWozza_textCallback, NULL);
timedFunc_set_1(2.5f, (GenFunction_1)chWozza_delayedRetreatToCave, (s32)this->marker);
}
else{
@@ -276,7 +276,7 @@ void chWozza_update(Actor *this){
chWozza_checkForPlayer(this);
if(!local->unk30){
if(gcdialog_showDialog(ASSET_C1D_DIALOG_WOZZA_RETURN, 0x20, NULL, NULL, NULL, NULL)){
if(gcdialog_showDialog(VER_SELECT(ASSET_C1D_DIALOG_WOZZA_RETURN, 0x997, 0, 0), 0x20, NULL, NULL, NULL, NULL)){
local->unk30 = TRUE;
}
}
@@ -303,7 +303,7 @@ void chWozza_update(Actor *this){
}
if(subaddie_playerIsWithinSphereAndActive(this, 500) && !this->has_met_before){
if(gcdialog_showDialog(ASSET_C1C_DIALOG_WOZZA_MEET_AS_WALRUS, 0xAA, this->position, this->marker, chWozza_textCallback, chWozza_checkCompletion)){
if(gcdialog_showDialog(VER_SELECT(ASSET_C1C_DIALOG_WOZZA_MEET_AS_WALRUS, 0x996, 0, 0), 0xAA, this->position, this->marker, chWozza_textCallback, chWozza_checkCompletion)){
timed_setStaticCameraToNode(0.0f, 0x2E);
this->has_met_before = TRUE;
}
src/FP/ch/xmastree.c
+2 -2
View File
@@ -127,7 +127,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(ASSET_C14_DIALOG_TWINKLIE_MINIGAME_LIGHT_TREE, 0, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_C14_DIALOG_TWINKLIE_MINIGAME_LIGHT_TREE, 0x98E, 0, 0), 0, NULL, NULL, NULL, NULL);
break;
case 3: // L803872F0
@@ -150,7 +150,7 @@ void chXmasTree_update(Actor *this){
if(func_802BB270()){
subaddie_set_state(this, 4);
chXmasTree_setState(this, 1);
item_set(ITEM_0_HOURGLASS_TIMER, 3600 - 1);
item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(3600, 3000, 0, 0) - 1);
item_set(ITEM_6_HOURGLASS, TRUE);
}
src/FP/ma/slalom.c
+12 -12
View File
@@ -249,23 +249,23 @@ void maSlalom_dialogCallback(ActorMarker *caller, enum asset_e text_id, s32 arg2
}
switch(text_id){
case ASSET_C04_DIALOG_BOGGY_SLED_WALRUS_MISS: //8038B318
case VER_SELECT(ASSET_C04_DIALOG_BOGGY_SLED_WALRUS_MISS, 0x97E, 0, 0): //8038B318
__maSlalom_loseDialogCallback();
break;
case ASSET_C07_DIALOG_BOGGY_SLED_WALRUS_COMPLETE: //8038B328
case VER_SELECT(ASSET_C07_DIALOG_BOGGY_SLED_WALRUS_COMPLETE, 0x981, 0, 0): //8038B328
__maSlalom_winDialogCallback(JIGGY_30_FP_BOGGY_2);
break;
case ASSET_C0B_DIALOG_BOGGY_SLED_BEAR_MISS: //8038B338
case VER_SELECT(ASSET_C0B_DIALOG_BOGGY_SLED_BEAR_MISS, 0x985, 0, 0): //8038B338
__maSlalom_loseDialogCallback();
break;
case ASSET_C0D_DIALOG_BOGGY_SLED_BEAR_COMPLETE: //8038B348
case VER_SELECT(ASSET_C0D_DIALOG_BOGGY_SLED_BEAR_COMPLETE, 0x987, 0, 0): //8038B348
__maSlalom_winDialogCallback(JIGGY_2C_FP_BOGGY_3);
break;
case ASSET_C10_DIALOG_BOGGY_SLED_EITHER_GIVE_UP: //8038B358
case VER_SELECT(ASSET_C10_DIALOG_BOGGY_SLED_EITHER_GIVE_UP, 0x98A, 0, 0): //8038B358
func_8038ABDC();
code_7060_setVoidOutLocation(gsworld_getMap(), 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, ASSET_C04_DIALOG_BOGGY_SLED_WALRUS_MISS, 0x2b, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL);
func_80324DBC(2.0f, VER_SELECT(ASSET_C04_DIALOG_BOGGY_SLED_WALRUS_MISS, 0x97E, 0, 0), 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, ASSET_C0B_DIALOG_BOGGY_SLED_BEAR_MISS, 0x2b, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL);
func_80324DBC(2.0f, VER_SELECT(ASSET_C0B_DIALOG_BOGGY_SLED_BEAR_MISS, 0x985, 0, 0), 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, ASSET_C0D_DIALOG_BOGGY_SLED_BEAR_COMPLETE, 0x2a, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL);
func_80324DBC(2.0f, VER_SELECT(ASSET_C0D_DIALOG_BOGGY_SLED_BEAR_COMPLETE, 0x987, 0, 0), 0x2a, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL);
}
else{
func_80324DBC(2.0f, ASSET_C07_DIALOG_BOGGY_SLED_WALRUS_COMPLETE, 0x22, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL);
func_80324DBC(2.0f, VER_SELECT(ASSET_C07_DIALOG_BOGGY_SLED_WALRUS_COMPLETE, 0x981, 0, 0), 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(ASSET_C10_DIALOG_BOGGY_SLED_EITHER_GIVE_UP, 0x20, NULL, NULL, maSlalom_dialogCallback, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_C10_DIALOG_BOGGY_SLED_EITHER_GIVE_UP, 0x98A, 0, 0), 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(ASSET_C0F_DIALOG_BOGGY_SLED_EITHER_TAUNT_2, 0x20, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_C0F_DIALOG_BOGGY_SLED_EITHER_TAUNT_2, 0x989, 0, 0), 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(ASSET_C0E_DIALOG_BOGGY_SLED_EITHER_TAUNT_1, 0x20, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_C0E_DIALOG_BOGGY_SLED_EITHER_TAUNT_1, 0x988, 0, 0), 0x20, NULL, NULL, NULL, NULL);
}//L8038BDF0
func_8025AEA0(0x3a, 0x493e0);
break;
src/GV/ch/ancientone.c
+4 -4
View File
@@ -95,7 +95,7 @@ void func_803867F4(void){
void func_80386850(ActorMarker *caller_marker, enum asset_e text_id, s32 arg2){
Actor *caller = marker_getActor(caller_marker);
if(text_id == 0xA80){
if(text_id == VER_SELECT(0xA80, 0x93C, 0, 0)){
subaddie_set_state_with_direction(caller, 2, 0.0f, 1);
actor_playAnimationOnce(caller);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff);
@@ -149,16 +149,16 @@ 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_ANCIENT_ONES_DONE, 0xE, NULL, this->marker, func_80386850, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A80_DIALOG_ANCIENT_ONES_DONE, 0x93C, 0, 0), 0xE, NULL, this->marker, func_80386850, NULL);
}
else{
func_80386850(this->marker, 0xA80, -1);
func_80386850(this->marker, VER_SELECT(ASSET_A80_DIALOG_ANCIENT_ONES_DONE, 0x93C, 0, 0), -1);
}
}//L80386B98
else {
if(sp38== 7){
if(!jiggyscore_isCollected(JIGGY_46_GV_ANCIENT_ONES)){
gcdialog_showDialog(ASSET_A7F_DIALOG_ANCIENT_ONES_MEET, 0x4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A7F_DIALOG_ANCIENT_ONES_MEET, 0x93B, 0, 0), 0x4, NULL, NULL, NULL, NULL);
}
}
src/GV/ch/gobi1.c
+2 -2
View File
@@ -158,7 +158,7 @@ void chGobi1_update(Actor *this){
timed_playSfx(1.0f, SFX_84_GOBI_CRYING, 1.1f, 30000);
timed_playSfx(2.0f, SFX_84_GOBI_CRYING, 1.3f, 30000);
timed_playSfx(2.5f, SFX_74_WALKING_NOISE_5, 0.5f, 30000);
func_80324DBC(3.0f, ASSET_A74_DIALOG_GOBI_HELPED, 0x2a, this->position, NULL, NULL, NULL);
func_80324DBC(3.0f, VER_SELECT(ASSET_A74_DIALOG_GOBI_HELPED, 0x930, 0, 0), 0x2a, this->position, NULL, NULL, NULL);
timed_playSfx(5.0f, SFX_2E_BIGBUTT_RUNNING, 1.0f, 20000);
timed_playSfx(5.6f, SFX_2E_BIGBUTT_RUNNING, 1.0f, 20000);
timed_playSfx(6.5f, SFX_2E_BIGBUTT_RUNNING, 1.0f, 20000);
@@ -180,7 +180,7 @@ void chGobi1_update(Actor *this){
&& subaddie_playerIsWithinSphereAndActive(this, 250)
&& !subaddie_playerIsWithinSphereAndActive(this, 80)
&& func_8028F2A0()
&& gcdialog_showDialog(0xa73, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showDialog(VER_SELECT(0xa73, 0x92F, 0, 0), 0, NULL, NULL, NULL, NULL)
){
this->has_met_before = TRUE;
}
src/GV/ch/gobi2.c
+2 -2
View File
@@ -85,7 +85,7 @@ void chGobi2_setState(Actor *this, s32 next_state){
timed_playSfx(0.8f, SFX_4B_GULPING, 0.8f, 28000);
timed_playSfx(1.4f, SFX_4B_GULPING, 0.8f, 28000);
timed_playSfx(2.0f, SFX_4B_GULPING, 0.8f, 28000);
func_80324DBC(3.0f, ASSET_A72_DIALOG_TRUNKER_HELPED, 0x2A, D_80390CEC, this->marker, func_80387A2C, NULL);
func_80324DBC(3.0f, VER_SELECT(ASSET_A72_DIALOG_TRUNKER_HELPED, 0x92E, 0, 0), 0x2A, D_80390CEC, this->marker, func_80387A2C, NULL);
}//L80387C94
if(next_state == 4){
@@ -203,7 +203,7 @@ void chGobi2_update(Actor *this){
if(!this->has_met_before){
if(subaddie_playerIsWithinSphereAndActive(this, 0xFA) && !subaddie_playerIsWithinSphereAndActive(this, 0x50)){
if(func_8028F2A0()){
if(gcdialog_showDialog(ASSET_A75_DIALOG_GOBI2_MEET, 0, this->position, NULL, NULL, NULL))
if(gcdialog_showDialog(VER_SELECT(ASSET_A75_DIALOG_GOBI2_MEET, 0x931, 0, 0), 0, this->position, NULL, NULL, NULL))
this->has_met_before = TRUE;
}
}
src/GV/ch/gobi3.c
+1 -1
View File
@@ -72,7 +72,7 @@ void chGobi3_setState(Actor *this, s32 next_state){
if(next_state == 5){
skeletalAnim_set(this->unk148, 0xd9, 0.5f, 4.0f);
gcdialog_showDialog(ASSET_A77_DIALOG_GOBI3_DONE, 0xe, this->position, this->marker, __chGobi3_runaway, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A77_DIALOG_GOBI3_DONE, 0x933, 0, 0), 0xe, this->position, this->marker, __chGobi3_runaway, NULL);
}
if(next_state == 4){
src/GV/ch/grabba.c
+3 -3
View File
@@ -73,7 +73,7 @@ void func_8038BA08(Actor *this){
if(player_movementGroup() == BSGROUP_6_TURBO_TALON_TRAINERS)
player_stateTimer_set(STATE_TIMER_3_TURBO_TALON, 0.0f);
gcdialog_showDialog(ASSET_A79_DIALOG_GRABBA_DEFEAT, 0xf, this->position, this->marker, func_8038B988, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A79_DIALOG_GRABBA_DEFEAT, 0x935, 0, 0), 0xf, this->position, this->marker, func_8038B988, NULL);
comusic_8025AB44(COMUSIC_57_TURBO_TRAINERS, 7000, 700);
}
@@ -255,7 +255,7 @@ void chGrabba_update(Actor *this){
}
else{
if(!this->has_met_before){
if(gcdialog_showDialog(ASSET_A78_DIALOG_GRABBA_MEET, 0, NULL, NULL, NULL, NULL)){
if(gcdialog_showDialog(VER_SELECT(ASSET_A78_DIALOG_GRABBA_MEET, 0x934, 0, 0), 0, NULL, NULL, NULL, NULL)){
this->has_met_before = TRUE;
}
}
@@ -286,7 +286,7 @@ void chGrabba_update(Actor *this){
}
if(!this->unk138_23){
if(gcdialog_showDialog(ASSET_A7A_DIALOG_GRABBA_TOO_FAST, 0, NULL, NULL, NULL, NULL)){
if(gcdialog_showDialog(VER_SELECT(ASSET_A7A_DIALOG_GRABBA_TOO_FAST, 0x936, 0, 0), 0, NULL, NULL, NULL, NULL)){
this->unk138_23 = TRUE;
}
}
src/GV/ch/mazectrl.c
+4 -4
View File
@@ -66,7 +66,7 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){
if(next_state == 2){
func_8025A58C(0, 4000);
coMusicPlayer_playMusic(COMUSIC_26_GV_SANDYBUTT_DANGER, 30000);
item_set(ITEM_0_HOURGLASS_TIMER, 0xdd3);
item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(0xdd3, 0xb85, 0, 0));
item_set(ITEM_6_HOURGLASS, TRUE);
func_8038F520(1.0f);
FUNC_8030E624(SFX_3F6_RUBBING, 0.8f, 25000);
@@ -85,7 +85,7 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){
}
if (!levelSpecificFlags_get(LEVEL_FLAG_16_GV_UNKNOWN)) {
gcdialog_showDialog(ASSET_A82_DIALOG_SANDYBUTT_START_MAZE, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A82_DIALOG_SANDYBUTT_START_MAZE, 0x93E, 0, 0), 4, NULL, NULL, NULL, NULL);
levelSpecificFlags_set(LEVEL_FLAG_16_GV_UNKNOWN, TRUE);
}
}//L8038F794
@@ -135,7 +135,7 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff);
if(!levelSpecificFlags_get(LEVEL_FLAG_17_GV_UNKNOWN)){
gcdialog_showDialog(ASSET_A83_DIALOG_SANDYBUTT_DONE, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A83_DIALOG_SANDYBUTT_DONE, 0x93F, 0, 0), 4, NULL, NULL, NULL, NULL);
levelSpecificFlags_set(LEVEL_FLAG_17_GV_UNKNOWN, TRUE);
}
}
@@ -178,7 +178,7 @@ void chMazeCtrl_update(Actor *this){
if (!levelSpecificFlags_get(LEVEL_FLAG_15_GV_UNKNOWN)
&& ml_timer_update(&local->unk8, sp34)
&& gcdialog_showDialog(ASSET_A81_DIALOG_SANDYBUTT_ENTER, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showDialog(VER_SELECT(ASSET_A81_DIALOG_SANDYBUTT_ENTER, 0x93D, 0, 0), 0, NULL, NULL, NULL, NULL)
) {
levelSpecificFlags_set(LEVEL_FLAG_15_GV_UNKNOWN, TRUE);
}
src/GV/ch/trunker.c
+1 -1
View File
@@ -74,7 +74,7 @@ void chTrucker_update(Actor *this){
&& !subaddie_playerIsWithinSphereAndActive(this, 80)
&& func_8028F2A0()
){
gcdialog_showDialog(ASSET_A71_DIALOG_TRUNKER_MEET, 0xe, this->position, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A71_DIALOG_TRUNKER_MEET, 0x92D, 0, 0), 0xe, this->position, NULL, NULL, NULL);
this->has_met_before = TRUE;
}//L80389254
src/GV/code_3630.c
+3 -3
View File
@@ -38,14 +38,14 @@ void func_80389A20(ActorMarker *caller, enum asset_e text_id, s32 arg2){
}
void func_80389A60(Actor *this){
gcdialog_showDialog(ASSET_A70_DIALOG_RUBEE_HELPED, 4, NULL, this->marker, func_80389A20, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A70_DIALOG_RUBEE_HELPED, 0x92C, 0, 0), 4, NULL, this->marker, func_80389A20, NULL);
this->has_met_before = TRUE;
subaddie_set_state(this, CH_RUBEE_STATE_5_UNK);
}
void func_80389ABC(Actor *this){
if(this->unk138_23){
func_80389A20(this->marker, ASSET_A70_DIALOG_RUBEE_HELPED, -1);
func_80389A20(this->marker, VER_SELECT(ASSET_A70_DIALOG_RUBEE_HELPED, 0x92C, 0, 0), -1);
}
else{
this->unk138_23 = TRUE;
@@ -77,7 +77,7 @@ void chRubee_update(Actor *this){
&& subaddie_playerIsWithinSphereAndActive(this, 250)
&& !subaddie_playerIsWithinSphereAndActive(this, 0x50))
{
gcdialog_showDialog(ASSET_A6F_DIALOG_RUBEE_MEET, 0xE, this->position, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A6F_DIALOG_RUBEE_MEET, 0x92B, 0, 0), 0xE, this->position, NULL, NULL, NULL);
this->has_met_before = TRUE;
mapSpecificFlags_set(0, TRUE);
}
src/GV/code_7060.c
+2 -2
View File
@@ -74,7 +74,7 @@ void func_8038D47C(Actor *this){
player_getPosition(sp3C);
if(player_movementGroup() == BSGROUP_0_NONE){
if( ml_vec3f_distance(sp3C, this->unk1C) < 100.0f || ml_vec3f_distance(sp3C, this->velocity) < 100.0f){
if(gcdialog_showDialog(ASSET_A7B_DIALOG_JINXY_MEET, 0, NULL, NULL, NULL, NULL)){
if(gcdialog_showDialog(VER_SELECT(ASSET_A7B_DIALOG_JINXY_MEET, 0x937, 0, 0), 0, NULL, NULL, NULL, NULL)){
mapSpecificFlags_set(0x14, 1);
}
}
@@ -103,7 +103,7 @@ void func_8038D47C(Actor *this){
}
if( actor_animationIsAt(this, 0.99f) ){
if(--this->unk38_31 == 0){
gcdialog_showDialog(ASSET_A7C_DIALOG_JINXY_ONE_EGG, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A7C_DIALOG_JINXY_ONE_EGG, 0x938, 0, 0), 4, NULL, NULL, NULL, NULL);
mapSpecificFlags_set(0x14, TRUE);
subaddie_set_state_forward(this, 1);
}
src/GV/crc.c
+3 -3
View File
@@ -6,9 +6,9 @@
extern void player_stateTimer_set(s32, f32);
extern f32 player_stateTimer_get(enum state_timer_e);
s32 D_80390F30 = VER_SELECT(0x00274530, 0, 0, 0); // GV_TEXT_CRC1
s32 D_80390F34 = VER_SELECT(0xAA18BBF3, 0, 0, 0); // GV_TEXT_CRC2
s32 D_80390F38 = VER_SELECT(0x0003031C, 0, 0, 0); // GV_DATA_CRC1
s32 D_80390F30 = VER_SELECT(0x00274530, 0x002764CA, 0, 0); // GV_TEXT_CRC1
s32 D_80390F34 = VER_SELECT(0xAA18BBF3, 0xFB1E80F4, 0, 0); // GV_TEXT_CRC2
s32 D_80390F38 = VER_SELECT(0x0003031C, 0x00031973, 0, 0); // GV_DATA_CRC1
/* .code */
src/GV/gvspawnqueue.c
+1 -1
View File
@@ -177,7 +177,7 @@ void func_8038E460(Actor *this){//banjo_door
if(!mapSpecificFlags_get(2)){
mapSpecificFlags_set(2, TRUE);
func_8028F918(0);
func_80324DBC(4.0f, ASSET_A7D_DIALOG_JINXY_HELPED, 4, NULL, NULL, NULL, NULL);
func_80324DBC(4.0f, VER_SELECT(ASSET_A7D_DIALOG_JINXY_HELPED, 0x939, 0, 0), 4, NULL, NULL, NULL, NULL);
}
}
}
src/GV/matchinggame.c
+2 -2
View File
@@ -70,9 +70,9 @@ void __matchingGame_setState(s32 next_state){
if(next_state == 2){
item_set(ITEM_6_HOURGLASS, 1);
if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME))
item_set(ITEM_0_HOURGLASS_TIMER, 4499);
item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(4499, 0xea5, 0, 0));
else
item_set(ITEM_0_HOURGLASS_TIMER, 5999);
item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(5999, 0x1387, 0, 0));
}
if(matchingGame.state == 2){
item_set(ITEM_6_HOURGLASS, 0);
src/MM/ch/conga.c
+7 -7
View File
@@ -143,7 +143,7 @@ void func_80387168(ActorMarker *marker, ActorMarker *other_marker){
){
func_8038708C(actorPtr, 2);
if(actorPtr->unk38_31 == 1){
gcdialog_showDialog(ASSET_B39_DIALOG_CONGA_HIT_BY_EGG, 4, actorPtr->position, 0, 0, 0);
gcdialog_showDialog(VER_SELECT(ASSET_B39_DIALOG_CONGA_HIT_BY_EGG, 0x957, 0, 0), 4, actorPtr->position, 0, 0, 0);
}
}
}
@@ -153,10 +153,10 @@ void func_80387168(ActorMarker *marker, ActorMarker *other_marker){
int func_803872EC(void){
s32 text_id = gcdialog_getCurrentTextId();
return text_id == ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE
|| text_id == ASSET_B38_DIALOG_CONGA_DEFEAT
return text_id == VER_SELECT(ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE, 0x955, 0, 0)
|| text_id == VER_SELECT(ASSET_B38_DIALOG_CONGA_DEFEAT, 0x956, 0, 0)
|| volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)
|| text_id == ASSET_B3B_DIALOG_CONGA_ORANGE_PAD_JIGGY
|| text_id == VER_SELECT(ASSET_B3B_DIALOG_CONGA_ORANGE_PAD_JIGGY, 0x959, 0, 0)
|| text_id == ASSET_B45_DIALOG_JIGGY_COLLECT_10
|| text_id == ASSET_B51_DIALOG_BOTTLES_HOW_TO_EXIT_LEVEL;
}
@@ -260,13 +260,13 @@ void chConga_update(Actor *this) {
if (func_8032A9E4(((ActorLocal_Conga *)&this->local)->unk10, ((ActorLocal_Conga *)&this->local)->unk18, ((ActorLocal_Conga *)&this->local)->unk1C)
&& !this->unk138_23
&& gcdialog_showDialog(ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE, 0, 0, 0, 0, 0)) {
&& gcdialog_showDialog(VER_SELECT(ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE, 0x955, 0, 0), 0, 0, 0, 0, 0)) {
this->unk138_23 = 1;
mapSpecificFlags_set(MM_SPECIFIC_FLAG_A_UNKNOWN, TRUE);
}//L803878F8
if (sp3C && !this->has_met_before) {
if (gcdialog_showDialog((player_getTransformation()== TRANSFORM_2_TERMITE) ? ASSET_B3E_DIALOG_CONGA_MEET_AS_TERMITE : ASSET_B3C_DIALOG_CONGA_MEET, 0, this->position, 0,0,0)) {
if (gcdialog_showDialog((player_getTransformation()== TRANSFORM_2_TERMITE) ? ASSET_B3E_DIALOG_CONGA_MEET_AS_TERMITE : VER_SELECT(ASSET_B3C_DIALOG_CONGA_MEET, 0x95A, 0, 0), 0, this->position, 0,0,0)) {
this->has_met_before = TRUE;
}
} //L80387968
@@ -369,7 +369,7 @@ void chConga_update(Actor *this) {
if (actor_animationIsAt(this, 0.99f)) {
subaddie_set_state_with_direction(this, CONGA_STATE_MOPEY, 0.0f, 1);
gcdialog_showDialog(ASSET_B38_DIALOG_CONGA_DEFEAT, 0xe, this->position, this->marker, func_80387370, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_B38_DIALOG_CONGA_DEFEAT, 0x956, 0, 0), 0xe, this->position, this->marker, func_80387370, NULL);
}
break;
src/MM/ch/juju.c
+1 -1
View File
@@ -208,7 +208,7 @@ void chjuju_update(Actor *this) {
switch (jujuPtr->animation_state) {
case JUJU_ANIMATION_STATE_1_YAWING: //L80389624
previous_yaw = this->yaw;
this->yaw += ((11 - mm_juju_count * 2) * time_getDelta() * 60.0f) / 2;
this->yaw += ((11 - mm_juju_count * 2) * time_getDelta() * (float)FRAMERATE) / 2;
if (360.0f < this->yaw) {
has_completed_full_turn = TRUE;
src/MM/ch/orange.c
+1 -1
View File
@@ -30,7 +30,7 @@ f32 D_80389A00[3] = {0.0f, 0.0f, 0.0f};
void __chorange_collisionCallback(ActorMarker *marker, ActorMarker *other_marker) {
if (!player_isDead() &&
!mapSpecificFlags_get(MM_SPECIFIC_FLAG_8_HIT_WITH_ORANGE) &&
gcdialog_showDialog(ASSET_B3A_DIALOG_CONGA_HITS_PLAYER, 0, 0, 0, NULL, NULL)) {
gcdialog_showDialog(VER_SELECT(ASSET_B3A_DIALOG_CONGA_HITS_PLAYER, 0x958, 0, 0), 0, 0, 0, NULL, NULL)) {
mapSpecificFlags_set(MM_SPECIFIC_FLAG_8_HIT_WITH_ORANGE, TRUE);
}
src/MM/ch/orangepad.c
+2 -2
View File
@@ -60,7 +60,7 @@ void handleOrangeCollision(ActorMarker *marker) {
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
if (!jiggyscore_isCollected(JIGGY_8_MM_ORANGE_PADS)) {
gcdialog_showDialog(ASSET_B3B_DIALOG_CONGA_ORANGE_PAD_JIGGY, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_B3B_DIALOG_CONGA_ORANGE_PAD_JIGGY, 0x959, 0, 0), 4, NULL, NULL, NULL, NULL);
}
}
@@ -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_TOUCH_PAD, 0, NULL, NULL, NULL, NULL)) {
if (gcdialog_showDialog(VER_SELECT(ASSET_B3D_DIALOG_CONGA_TOUCH_PAD, 0x95B, 0, 0), 0, NULL, NULL, NULL, NULL)) {
mapSpecificFlags_set(MM_SPECIFIC_FLAG_CONGA_WARNED_BLOCKS, TRUE);
}
}
src/MM/crc.c
+3 -3
View File
@@ -3,9 +3,9 @@
#include "functions.h"
#include "variables.h"
s32 D_803899C0 = VER_SELECT(0x000C740C, 0, 0, 0); // MM_TEXT_CRC1
s32 D_803899C4 = VER_SELECT(0xCD249CB3, 0, 0, 0); // MM_TEXT_CRC2
s32 D_803899C8 = VER_SELECT(0x0000D44F, 0, 0, 0); // MM_DATA_CRC1
s32 D_803899C0 = VER_SELECT(0x000C740C, 0x000C896A, 0, 0); // MM_TEXT_CRC1
s32 D_803899C4 = VER_SELECT(0xCD249CB3, 0xED04CB8F, 0, 0); // MM_TEXT_CRC2
s32 D_803899C8 = VER_SELECT(0x0000D44F, 0x0000D9E8, 0, 0); // MM_DATA_CRC1
void chmumbo_func_802D1724(void);
src/RBB/ch/anchorctrl.c
+1 -1
View File
@@ -54,7 +54,7 @@ void __chAnchorCtrl_setState(Actor *this, s32 next_state){
timed_playSfx(2.1f, SFX_3F6_RUBBING, 0.6f, 32700);
timedFunc_set_2(2.7f, (GenFunction_2)mapSpecificFlags_set, RBB_MAIN_SPECIFIC_FLAG_4_ANCHOR_LIFTING, TRUE);
timedFunc_set_0(3.0f, func_8038C058);
func_80324DBC(3.0f, ASSET_B9C_DIALOG_SNORKEL_COMPLETE, 7, NULL, this->marker, __chAnchorCtrl_spawnJiggy, NULL);
func_80324DBC(3.0f, VER_SELECT(ASSET_B9C_DIALOG_SNORKEL_COMPLETE, 0x971, 0, 0), 7, NULL, this->marker, __chAnchorCtrl_spawnJiggy, NULL);
}//L8038C1D8
this->state = next_state;
}
src/RBB/ch/bossboombox.c
+2 -2
View File
@@ -334,7 +334,7 @@ void chBossBoomBox_setState(Actor *this, s32 new_state){
}
else{//L8038CEFC
timedFunc_set_3(2.4f, (GenFunction_3)comusic_8025AB44, COMUSIC_62_RBB_BOOMBOX, 8000, 300);
func_80324DBC(2.4f, ASSET_B9E_DIALOG_BOSS_BOOM_BOX_MEET, 4, NULL, this->marker, func_8038CB34, func_8038CB68);
func_80324DBC(2.4f, VER_SELECT(ASSET_B9E_DIALOG_BOSS_BOOM_BOX_MEET, 0x973, 0, 0), 4, NULL, this->marker, func_8038CB34, func_8038CB68);
}
}//L8038CF60
@@ -381,7 +381,7 @@ void chBossBoomBox_setState(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_BOSS_BOOM_BOX_COMPLETE, 4, 0, 0, 0, 0);
gcdialog_showDialog(VER_SELECT(ASSET_B9F_DIALOG_BOSS_BOOM_BOX_COMPLETE, 0x974, 0, 0), 4, 0, 0, 0, 0);
}
}//L8038D278
}
src/RBB/ch/dolphin.c
+1 -1
View File
@@ -97,7 +97,7 @@ void func_8038B900(Actor *this){
&& subaddie_playerIsWithinSphereAndActive(this, 600)
&& !player_movementGroup()
){
gcdialog_showDialog(ASSET_B9B_DIALOG_SNORKEL_MEET, 4, 0, 0, 0, 0);
gcdialog_showDialog(VER_SELECT(ASSET_B9B_DIALOG_SNORKEL_MEET, 0x970, 0, 0), 4, 0, 0, 0, 0);
this->has_met_before = TRUE;
}
}
src/RBB/code_CA0.c
+1 -1
View File
@@ -165,7 +165,7 @@ void chCageUpSwitch_setState(Actor *this, s32 next_state){
if(next_state == CH_CAGE_UP_SWITCH_STATE_3_TIMED_RAISED_CAGE){
item_set(ITEM_6_HOURGLASS, 1);
item_set(ITEM_0_HOURGLASS_TIMER, 0x3bf);
item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(0x3bf, 0x31f, 0, 0));
}
if(this->state == CH_CAGE_UP_SWITCH_STATE_3_TIMED_RAISED_CAGE){
src/RBB/propellorctrl.c
+2 -2
View File
@@ -16,7 +16,7 @@ void __propellorCtrl_setState(s32 arg0){
}
if(arg0 == 2){
item_set(ITEM_3_PROPELLOR_TIMER, 3900 - 1);
item_set(ITEM_3_PROPELLOR_TIMER, VER_SELECT(3900, 3250, 0, 0) - 1);
item_set(ITEM_9_PROPELLOR, 1);
}
@@ -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, ASSET_B9D_DIALOG_GRUNTY_PROPELLER_MISS, 4, NULL, NULL, NULL, NULL);
func_80324DBC(1.0f, VER_SELECT(ASSET_B9D_DIALOG_GRUNTY_PROPELLER_MISS, 0x972, 0, 0), 4, NULL, NULL, NULL, NULL);
}
else{
func_802FAD64(3);
src/SM/ch/jumptutorial.c
+3 -3
View File
@@ -57,7 +57,7 @@ void chJumpTutorial_setState(Actor *this, s32 state) {
ability_unlock(ABILITY_A_HOLD_A_JUMP_HIGHER);
gcdialog_showDialog(ASSET_DF6_DIALOG_BOTTLES_HIGH_JUMP_LEARN, 0xe, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL);
this->sm_4070.dialog_id = ASSET_E1A_DIALOG_BOTTLES_UNKNOWN;
this->sm_4070.dialog_id = VER_SELECT(ASSET_E1A_DIALOG_BOTTLES_UNKNOWN, 0xA5C, 0, 0);
mapSpecificFlags_set(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED, FALSE);
}
break;
@@ -113,7 +113,7 @@ void chJumpTutorial_update(Actor *this) {
ability_unlock(ABILITY_7_FEATHERY_FLAP);
gcdialog_showDialog(ASSET_DF7_DIALOG_BOTTLES_FEATHERY_FLAP_LEARN, 0xa, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL);
this->sm_4070.dialog_id = ASSET_E1B_DIALOG_BOTTLES_UNKNOWN;
this->sm_4070.dialog_id = VER_SELECT(ASSET_E1B_DIALOG_BOTTLES_UNKNOWN, 0xA5D, 0, 0);
mapSpecificFlags_set(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED, FALSE);
}//L8038A730
@@ -122,7 +122,7 @@ void chJumpTutorial_update(Actor *this) {
ability_unlock(ABILITY_8_FLAP_FLIP);
gcdialog_showDialog(ASSET_DF8_DIALOG_BOTTLES_FLAP_FLIP_LEARN, 0xa, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL);
this->sm_4070.dialog_id = ASSET_E1C_DIALOG_BOTTLES_UNKNOWN;
this->sm_4070.dialog_id = VER_SELECT(ASSET_E1C_DIALOG_BOTTLES_UNKNOWN, 0xA5E, 0, 0);
mapSpecificFlags_set(SM_SPECIFIC_FLAG_9_ABILITY_FEATHERY_UNLOCKED, FALSE);
}//L8038A794
src/SM/code_46C0.c
+96 -47
View File
@@ -2,62 +2,111 @@
#include "functions.h"
#include "variables.h"
#define US_1_0 0
#define PAL 1
#if VERSION == VERSION_USA_1_0
int func_8038AAB0(void) {
return 0;
}
#if VERSION == US_1_0
int func_8038AAB0(void){return 0;}
#elif VERSION == VERSION_PAL
#elif VERSION == PAL
// u8 D_8038BFC2;
// void func_8038AAB0(s32 arg0, s32 arg1){
// if(arg1 < 0){
// func_8031A844();
// }
// else{
// D_8038BFC2 = arg1;
// func_8038B4D0(3);
// }
// }
struct language_selection_screen_s {
u8 *unk0;
u8 *unk4;
u64 unk8;
// #pragma GLOBAL_ASM("asm/nonmatchings/SM/code_46C0/func_8038A8F0.s")
// void func_8038A8F0(s32 arg0) {
// u8 temp_v0;
u8 *unk10;
u32 unk14;
u64 unk18;
// switch (arg0) { /* irregular */
// case 1:
// D_8038BFC1 = 1;
// func_80319400();
// break;
// case 2:
// D_8038BFC8->unk0 = (s32) D_8038BD38;
// D_8038BFC8->unk4 = (s32) D_8038BD3C;
// D_8038BFC8->unk10 = (s32) D_8038BD40;
// D_8038BFC8->unk20 = (s32) D_8038BD44;
// D_8038BFC8->unk30 = (s32) chMMMWideWindow;
// func_8031A5E4(&D_8038BD30, &D_8038BD34, (void *)0x8038BFC8, 0xA, &D_8038B490);
// break;
// case 3:
// temp_v0 = *(u8 *)0x8038BFC2;
// if (temp_v0 != 0) {
// func_8031B9A4(temp_v0 - 1, 0x80390000);
// }
// func_802FAF44(0);
// D_8038BFC1 = 0;
// break;
// }
// D_8038BFC0 = (s8) arg0;
// }
u8 *unk20;
u32 unk24;
u64 unk28;
u8 *unk30;
u32 unk34;
u64 unk38;
};
// #pragma GLOBAL_ASM("asm/nonmatchings/SM/code_46C0/func_8038A9E4.s")
/* data */
u32 D_8038BD30_pal = 0x0C68696A;
u32 D_8038BD34_pal = 0x02010101;
u8 *D_8038BD38_pal = "WHICH LANGUAGE WOULD";
u8 *D_8038BD3C_pal = "YOU LIKE TO USE?";
u8 *D_8038BD40_pal = "ENGLISH";
u8 *D_8038BD44_pal = "FRANaAIS";
u8 *D_8038BD48_pal = "DEUTSCH";
// #pragma GLOBAL_ASM("asm/nonmatchings/SM/code_46C0/func_8038AA30.s")
/* bss */
u8 D_8038BFC0_pal;
u8 D_8038BFC1_pal;
u8 D_8038BFC2_pal;
struct language_selection_screen_s D_8038BFC8_pal;
// #pragma GLOBAL_ASM("asm/nonmatchings/SM/code_46C0/func_8038AA64.s")
/* text */
void func_8038B4D0_pal(s32 arg0);
// #pragma GLOBAL_ASM("asm/nonmatchings/SM/code_46C0/func_8038AA74.s")
void func_8038B490_pal(s32 arg0, s32 arg1) {
if (arg1 < 0) {
/*func_8031A844_pal*/gcquiz_func_8031A48C();
return;
}
D_8038BFC2_pal = arg1;
func_8038B4D0_pal(3);
}
void func_8038B4D0_pal(s32 arg0) {
switch (arg0) { /* irregular */
case 1:
D_8038BFC1_pal = 1;
/*func_80319400_pal*/gcquiz_init();
break;
case 2:
D_8038BFC8_pal.unk0 = D_8038BD38_pal;
D_8038BFC8_pal.unk4 = D_8038BD3C_pal;
D_8038BFC8_pal.unk10 = D_8038BD40_pal;
D_8038BFC8_pal.unk20 = D_8038BD44_pal;
D_8038BFC8_pal.unk30 = D_8038BD48_pal;
/*func_8031A5E4_pal*/__gcquiz_unused(&D_8038BD30_pal, &D_8038BD34_pal, &D_8038BFC8_pal, 0xA, &func_8038B490_pal);
break;
case 3:
if (D_8038BFC2_pal) {
func_8031B5C4(D_8038BFC2_pal - 1);
}
func_802FAD64(ITEM_0_HOURGLASS_TIMER);
D_8038BFC1_pal = 0;
break;
}
D_8038BFC0_pal = (s8) arg0;
}
void func_8038B5C4_pal(void) {
if (gsworld_getMap() == MAP_91_FILE_SELECT) {
func_8038B4D0_pal(func_8031B638() ? 3 : 1);
}
}
void func_8038B610_pal(void) {
if (gsworld_getMap() == MAP_91_FILE_SELECT) {
/*func_80319540_pal*/gcquiz_free();
}
}
void func_8038B644_pal(s32 arg0, s32 arg1, s32 arg2) {
}
void func_8038B654_pal(void) {
if ((D_8038BFC1_pal) && (getGameMode() == 3)) {
/*func_8031A25C_pal*/gcquiz_func_80319EA4();
if (D_8038BFC0_pal == 1) {
timedFunc_set_1(1.0f, func_8038B4D0_pal, 2);
func_8038B4D0_pal(0);
}
}
}
u8 func_8038B6C8_pal(void) {
return D_8038BFC1_pal;
}
// #pragma GLOBAL_ASM("asm/nonmatchings/SM/code_46C0/func_8038AAE8.s")
#endif
src/SM/smspawnqueue.c
+3 -3
View File
@@ -26,9 +26,9 @@ extern ActorInfo gBanjosChair;
extern ActorInfo gBanjosStove;
extern ActorInfo gRockTrappingGrunty;
s32 D_8038AAE0 = VER_SELECT(0x000FE2C1, 0, 0, 0); // SM_TEXT_CRC1
s32 D_8038AAE4 = VER_SELECT(0x8C0992D1, 0, 0, 0); // SM_TEXT_CRC2
s32 D_8038AAE8 = VER_SELECT(0x0001EB56, 0, 0, 0); // SM_DATA_CRC1
s32 D_8038AAE0 = VER_SELECT(0x000FE2C1, 0x00109339, 0, 0); // SM_TEXT_CRC1
s32 D_8038AAE4 = VER_SELECT(0x8C0992D1, 0xC3A58E96, 0, 0); // SM_TEXT_CRC2
s32 D_8038AAE8 = VER_SELECT(0x0001EB56, 0x00020B4D, 0, 0); // SM_DATA_CRC1
s32 D_8038AAEC = 0;
src/TTC/ch/blubber.c
+4 -4
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_DIALOG_BLUBBER_COMPLETE_JIGGY_COLLECTED){
if(text_id == VER_SELECT(ASSET_A0D_DIALOG_BLUBBER_COMPLETE, 0x90D, 0, 0) || 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_DIALOG_BLUBBER_COMPLETE_JIGGY_COLLECTED : ASSET_A0D_DIALOG_BLUBBER_COMPLETE;
text_id = jiggyscore_isCollected(JIGGY_14_TTC_BLUBBER) ? ASSET_A2A_DIALOG_BLUBBER_COMPLETE_JIGGY_COLLECTED : VER_SELECT(ASSET_A0D_DIALOG_BLUBBER_COMPLETE, 0x90D, 0, 0);
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);
}
@@ -157,7 +157,7 @@ static void __chBlubber_updateFunc(Actor *this){
&& !this->has_met_before
&& item_getCount(ITEM_18_GOLD_BULLIONS) == 0
){
gcdialog_showDialog(ASSET_A0B_DIALOG_BLUBBER_FIRST_MEET, 0xe, this->position, this->marker, __chBlubber_showTextCallback, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A0B_DIALOG_BLUBBER_FIRST_MEET, 0x90B, 0, 0), 0xe, this->position, this->marker, __chBlubber_showTextCallback, NULL);
this->has_met_before = TRUE;
subaddie_set_state_forward(this, CH_BLUBBER_STATE_3_UNKNOWN);
}
@@ -166,7 +166,7 @@ static void __chBlubber_updateFunc(Actor *this){
&& !this->unk138_23
){
if (item_getCount(ITEM_18_GOLD_BULLIONS) == 0) {
gcdialog_showDialog(ASSET_A0C_DIALOG_BLUBBER_HALF_GOLD, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A0C_DIALOG_BLUBBER_HALF_GOLD, 0x90C, 0, 0), 4, NULL, NULL, NULL, NULL);
}
this->unk138_23 = TRUE;
src/TTC/ch/clam.c
+3 -3
View File
@@ -106,7 +106,7 @@ static bool __chClam_rotateTowardTarget(Actor *this, s32 arg1) {
anctrl_setDuration(this->anctrl, 1.0f);
sp2C = (s32) ((f64) (60.0f / (f32) time_getDeltaReal_frames()) * 0.5);
sp2C = (s32) ((f64) ((float)FRAMERATE / (f32) time_getDeltaReal_frames()) * 0.5);
if ((this->unk1C[0] != 0.0f) || !__chClam_updateFuncTarget(this, sp2C)) {
if (((f64) anctrl_getAnimTimer(this->anctrl) < 0.1) && ((f64) randf() < 0.5)) {
if (this->unk1C[0] != 0.0f) {
@@ -235,7 +235,7 @@ static void __chClam_takeDamage(ActorMarker *this_marker, ActorMarker *other_mar
__chClam_emitLargeShellParticles(this->position, 2);
__chClam_emitEyeParticles(this->position, 2);
__chClam_emitSmallShellParticles(this->position, 0xC);
func_803115C4(0xa14);
func_803115C4(VER_SELECT(ASSET_A14_DIALOG_CLAM_TAUNT, 0x914, 0, 0));
marker_despawn(this->marker);
}
@@ -252,7 +252,7 @@ static void __chClam_attackOther(ActorMarker *this_marker, ActorMarker *other_ma
if(baiFrame_getState() == 3) return;
if( !mapSpecificFlags_get(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN) && gcdialog_showDialog(ASSET_A14_DIALOG_CLAM_TAUNT, 0, NULL, NULL, NULL, NULL)){
if( !mapSpecificFlags_get(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN) && gcdialog_showDialog(VER_SELECT(ASSET_A14_DIALOG_CLAM_TAUNT, 0x914, 0, 0), 0, NULL, NULL, NULL, NULL)){
mapSpecificFlags_set(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN, TRUE);
}
src/TTC/ch/leaky.c
+2 -2
View File
@@ -60,7 +60,7 @@ static void __chLeaky_updateFunc(Actor *this) {
&& !this->has_met_before
&& subaddie_playerIsWithinSphereAndActive(this, 250) && !subaddie_playerIsWithinSphereAndActive(this, 160)
&& !player_movementGroup()
&& gcdialog_showDialog(ASSET_A1A_DIALOG_LEAKY_FIRST_MEET, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showDialog(VER_SELECT(ASSET_A1A_DIALOG_LEAKY_FIRST_MEET, 0x91A, 0, 0), 0, NULL, NULL, NULL, NULL)
){
this->has_met_before = TRUE;
}
@@ -118,6 +118,6 @@ bool chLeaky_eggCollision(ActorMarker *marker){
levelSpecificFlags_set(2, TRUE);
levelSpecificFlags_set(5, TRUE);
gcdialog_showDialog(ASSET_A28_DIALOG_LEAKY_DONE, 0x2a, this->position, this->marker, __chLeaky_showDoneText, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A28_DIALOG_LEAKY_DONE, 0x928, 0, 0), 0x2a, this->position, this->marker, __chLeaky_showDoneText, NULL);
return TRUE;
}
src/TTC/ch/lockup.c
+1 -1
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_LOCKUP_SPAWNED, 0, NULL, NULL, NULL, NULL)) {
&& gcdialog_showDialog(VER_SELECT(ASSET_A15_DIALOG_LOCKUP_SPAWNED, 0x915, 0, 0), 0, NULL, NULL, NULL, NULL)) {
this->has_met_before = TRUE;
}
src/TTC/ch/nipper.c
+4 -4
View File
@@ -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_NIPPER_HURT, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A10_DIALOG_NIPPER_HURT, 0x910, 0, 0), 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(ASSET_A0F_DIALOG_NIPPER_HIT_BY_EGG, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showDialog(VER_SELECT(ASSET_A0F_DIALOG_NIPPER_HIT_BY_EGG, 0x90F, 0, 0), 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(ASSET_A11_DIALOG_NIPPER_ATTACK, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showDialog(VER_SELECT(ASSET_A11_DIALOG_NIPPER_ATTACK, 0x911, 0, 0), 0, NULL, NULL, NULL, NULL)
){
this->unk138_23 = TRUE;
}
@@ -243,7 +243,7 @@ static void __chNipper_updateFunc(Actor *this){
&& player_movement_group != BSGROUP_A_FLYING
){
subaddie_set_state_with_direction(this, CH_NIPPER_STATE_5_SPAWNED, 0.01f, 1);
if(gcdialog_showDialog(ASSET_A0E_DIALOG_NIPPER_SPAWNED, 0xf, this->position, this->marker, __chNipper_spawnedShowTextCallback, NULL)){
if(gcdialog_showDialog(VER_SELECT(ASSET_A0E_DIALOG_NIPPER_SPAWNED, 0x90E, 0, 0), 0xf, this->position, this->marker, __chNipper_spawnedShowTextCallback, NULL)){
this->has_met_before = TRUE;
}
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 5000, 300);
src/TTC/ch/treasure.c
+1 -1
View File
@@ -24,7 +24,7 @@ static void __chTreasure_die(ActorMarker *marker, ActorMarker *otherMarker){
Actor *this = marker_getActor(marker);
__spawnQueue_add_4((GenFunction_4) spawnQueue_actor_f32, 0x4C, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
func_802EE278(this, 3, 0xf, 0x3C, 0.2f, 1.2f);
func_803115C4(0xA19);
func_803115C4(VER_SELECT(0xA19, 0x919, 0, 0));
jiggy_spawn(JIGGY_11_TTC_RED_X, this->position);
marker_despawn(marker);
}
src/TTC/ch/treasurehunt.c
+3 -3
View File
@@ -116,10 +116,10 @@ static void __chTreasurehunt_spawnActorForNextStep(void) {
static void __chTreasurehunt_checkStepProgress(s32 currentStep){
if(chtreasureHunt_puzzleCurrentStep == currentStep && __chTreasurehunt_isActiveHitboxBeakBusterHitbox()){
if(currentStep == 0 && !jiggyscore_isCollected(JIGGY_11_TTC_RED_X)){
gcdialog_showDialog(ASSET_A18_DIALOG_TREASUREHUNT_FOLLOW_CLUES, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A18_DIALOG_TREASUREHUNT_FOLLOW_CLUES, 0x918, 0, 0), 4, NULL, NULL, NULL, NULL);
}
else if(currentStep == 4){
gcdialog_showDialog(ASSET_A19_DIALOG_TREASUREHUNT_SECOND_STEP, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A19_DIALOG_TREASUREHUNT_SECOND_STEP, 0x919, 0, 0), 4, NULL, NULL, NULL, NULL);
}
chtreasureHunt_puzzleCurrentStep++;
@@ -170,7 +170,7 @@ void chTreasurehunt_checkStepProgress5(NodeProp *this, ActorMarker *arg1){
gcpausemenu_80314AC8(0);
timedFunc_set_2(0.1f, (GenFunction_2) func_8028F45C, 9, (s32)&particleTargetPosition);
timedFunc_set_1(0.1f, (GenFunction_1) gcpausemenu_80314AC8, 1);
gcdialog_showDialog(ASSET_A17_DIALOG_BURIED_TREASURE_SPAWNED, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A17_DIALOG_BURIED_TREASURE_SPAWNED, 0x917, 0, 0), 4, NULL, NULL, NULL, NULL);
chtreasureHunt_puzzleCurrentStep++;
}
}
src/TTC/code_3040.c
+3 -3
View File
@@ -3,9 +3,9 @@
#include "variables.h"
#include "checksums.h"
s32 D_8038C750 = VER_SELECT(0x0016D2FD, 0, 0, 0); // TTC_TEXT_CRC1
s32 D_8038C754 = VER_SELECT(0xFB70B01D, 0, 0, 0); // TTC_TEXT_CRC2
s32 D_8038C758 = VER_SELECT(0x0004EFAC, 0, 0, 0); // TTC_DATA_CRC1
s32 D_8038C750 = VER_SELECT(0x0016D2FD, 0x0016D2D7, 0, 0); // TTC_TEXT_CRC1
s32 D_8038C754 = VER_SELECT(0xFB70B01D, 0xFCA4DD1E, 0, 0); // TTC_TEXT_CRC2
s32 D_8038C758 = VER_SELECT(0x0004EFAC, 0x0004FD17, 0, 0); // TTC_DATA_CRC1
/* .code */
#if ANTI_TAMPER
src/TTC/ma/castle.c
+5 -5
View File
@@ -167,12 +167,12 @@ static void __maCastle_setupCheatCodeTimer(s32 new_timer_state)
if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME))
{
// set timer to 50 seconds
item_set(ITEM_0_HOURGLASS_TIMER, 2999);
item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(2999, 2499, 0, 0));
}
else
{
// set timer to 100 seconds
item_set(ITEM_0_HOURGLASS_TIMER, 5999);
item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(5999, 4999, 0, 0));
}
item_set(ITEM_6_HOURGLASS, TRUE);
@@ -1031,7 +1031,7 @@ static void __maCastle_eraseGameplayDialogCallback(ActorMarker *caller, enum ass
{
__maCastle_setNumberOfBannedCheatcodesEntered(3);
__maCastle_checkSecretCheatCodeIndex(sThirdForbiddenSecretCheatCodeIndex);
gcdialog_showDialog(ASSET_FBF_DIALOG_ERASED_SAVE, 0xC, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_FBF_DIALOG_ERASED_SAVE, 0xB25, 0, 0), 0xC, NULL, NULL, NULL, NULL);
gameFile_clear(gameSelect_getGameNumber());
gameFile_8033CFD4(gameSelect_getGameNumber());
gameSelect_setGameNumber(-1);
@@ -1066,11 +1066,11 @@ static void __maCastle_checkIfBannedCheatCodeEntered(s32 secret_cheat_code_index
__maCastle_setNumberOfBannedCheatcodesEntered(2);
__maCastle_checkSecretCheatCodeIndex(secret_cheat_code_index);
__maCastle_resetSecretCheatCodeProgress();
gcdialog_showDialog(ASSET_FBE_DIALOG_CHEATING_ERASE_SAVE_WARNING, 0xC, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_FBE_DIALOG_CHEATING_ERASE_SAVE_WARNING, 0xB24, 0, 0), 0xC, NULL, NULL, NULL, NULL);
return;
case 2:
sThirdForbiddenSecretCheatCodeIndex = secret_cheat_code_index;
gcdialog_showDialog(ASSET_E38_DIALOG_CHEATING_ERASE_SAVE_CONFIRMATION, 0xC, NULL, NULL, __maCastle_eraseGameplayDialogCallback, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_E38_DIALOG_CHEATING_ERASE_SAVE_CONFIRMATION, 0xA7A, 0, 0), 0xC, NULL, NULL, __maCastle_eraseGameplayDialogCallback, NULL);
return;
}
return;
src/core2/ch/beehive.c
+3 -3
View File
@@ -35,8 +35,8 @@ void chBeehive_die(ActorMarker *this, ActorMarker *other){
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4A_WOOD_EXPLOSION, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
actor->marker->propPtr->unk8_3 = 0;
func_803115C4(ASSET_D96_DIALOG_BEEHIVE_MEET);
func_803115C4(ASSET_DA6_DIALOG_BEEHIVE_WITH_BEES);
func_803115C4(VER_SELECT(ASSET_D96_DIALOG_BEEHIVE_MEET, 0x0A14, 0, 0));
func_803115C4(VER_SELECT(ASSET_DA6_DIALOG_BEEHIVE_WITH_BEES, 0x0A24, 0, 0));
}
void chBeehive_update(Actor *this){
@@ -63,7 +63,7 @@ void chBeehive_update(Actor *this){
){
if(player_movementGroup() == BSGROUP_0_NONE || player_movementGroup() == BSGROUP_8_TROT){
if( player_getTransformation() == TRANSFORM_1_BANJO
&& gcdialog_showDialog(ASSET_D96_DIALOG_BEEHIVE_MEET, 0, NULL, NULL, NULL, 0)
&& gcdialog_showDialog(VER_SELECT(ASSET_D96_DIALOG_BEEHIVE_MEET, 0xA14, 0, 0), 0, NULL, NULL, NULL, 0)
){
fileProgressFlag_set(FILEPROG_D_BEEHIVE_TEXT, 1);
}
src/core2/ch/beeswarm.c
+1 -1
View File
@@ -445,7 +445,7 @@ void chBeeSwarm_update(Actor *this) {
if (!fileProgressFlag_get(FILEPROG_8F_MET_BEE_INFESTED_BEEHIVE) && subaddie_playerIsWithinCylinder(this, 250, 300)
&& ((player_movementGroup() == BSGROUP_0_NONE) || (player_movementGroup() == BSGROUP_8_TROT))
&& (player_getTransformation() == TRANSFORM_1_BANJO)
&& (gcdialog_showDialog(0xDA6, 0, NULL, NULL, NULL, NULL) != 0)
&& (gcdialog_showDialog(VER_SELECT(0xDA6, 0xA24, 0, 0), 0, NULL, NULL, NULL, NULL) != 0)
) {
fileProgressFlag_set(FILEPROG_8F_MET_BEE_INFESTED_BEEHIVE, TRUE);
}
src/core2/ch/bottlesbonus.c
+7 -7
View File
@@ -58,13 +58,13 @@ void chBottlesBonus_update(Actor *this);
/* .data */
Struct_core2_560F0_0 D_803681A0[] = {
{ 0, 0x000, 0, 0x211},
{99, 0xE27, 0, 0x2C1},
{99, 0xE29, 0, 0x2C2},
{99, 0xE2B, 0, 0x2C9},
{99, 0xE2D, 0, 0x2C3},
{99, 0xE2F, 0, 0x2C4},
{99, 0xE31, 0, 0x2C5},
{75, 0xE34, 0, 0x007}
{99, VER_SELECT(0xE27, 0xA69, 0, 0), 0, 0x2C1},
{99, VER_SELECT(0xE29, 0xA6B, 0, 0), 0, 0x2C2},
{99, VER_SELECT(0xE2B, 0xA6D, 0, 0), 0, 0x2C9},
{99, VER_SELECT(0xE2D, 0xA6F, 0, 0), 0, 0x2C3},
{99, VER_SELECT(0xE2F, 0xA71, 0, 0), 0, 0x2C4},
{99, VER_SELECT(0xE31, 0xA73, 0, 0), 0, 0x2C5},
{75, VER_SELECT(0xE34, 0xA76, 0, 0), 0, 0x007}
};
ActorAnimationInfo chBottlesBonusAnimations[] ={
src/core2/ch/collectible.c
+3 -3
View File
@@ -100,7 +100,7 @@ s32 chCollectible_collectEgg(ActorProp *arg0){
if(arg0->isActorProp)
actPtr = marker_getActor(arg0->marker);
}
chCollectible_collectItem(actPtr, FILEPROG_5_BLUE_EGG_TEXT, 0xD9E, COMUSIC_C_EGG_COLLECTED, 0xD, 2.0f);
chCollectible_collectItem(actPtr, FILEPROG_5_BLUE_EGG_TEXT, VER_SELECT(0xD9E, 0xA1C, 0, 0), COMUSIC_C_EGG_COLLECTED, 0xD, 2.0f);
}
void chCollectible_collectRedFeather(ActorProp *arg0){
@@ -108,7 +108,7 @@ void chCollectible_collectRedFeather(ActorProp *arg0){
fxSparkle_redFeather(&arg0->position_x);
if(arg0->isActorProp)
actPtr = marker_getActor(arg0->marker);
chCollectible_collectItem(actPtr, FILEPROG_6_RED_FEATHER_TEXT, 0xD9F, COMUSIC_B_RED_FEATHER_COLLECTED, 0xF, 4.0f);
chCollectible_collectItem(actPtr, FILEPROG_6_RED_FEATHER_TEXT, VER_SELECT(0xD9F, 0xA1D, 0, 0), COMUSIC_B_RED_FEATHER_COLLECTED, 0xF, 4.0f);
}
void chCollectible_collectGoldFeather(ActorProp *arg0){
@@ -116,7 +116,7 @@ void chCollectible_collectGoldFeather(ActorProp *arg0){
fxSparkle_goldFeather(&arg0->position_x);
if(arg0->isActorProp)
actPtr = marker_getActor(arg0->marker);
chCollectible_collectItem(actPtr, FILEPROG_7_GOLD_FEATHER_TEXT, 0xDA0, COMUSIC_14_GOLD_FEATHER_COLLECTED, ITEM_10_GOLD_FEATHER, 6.0f);
chCollectible_collectItem(actPtr, FILEPROG_7_GOLD_FEATHER_TEXT, VER_SELECT(0xDA0, 0xA1E, 0, 0), COMUSIC_14_GOLD_FEATHER_COLLECTED, ITEM_10_GOLD_FEATHER, 6.0f);
}
Actor *chCollectible_draw(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3){
src/core2/ch/crab.c
+5 -5
View File
@@ -156,7 +156,7 @@ void __chCrab_spawn_mutant_crab_jiggy(void) {
}
void __chCrab_mutantTextCallback(ActorMarker *caller, enum asset_e text_id, s32 model_id){
if (text_id == ASSET_D33_DIALOG_MUTANT_CRAB_DEFEAT) {
if (text_id == VER_SELECT(ASSET_D33_DIALOG_MUTANT_CRAB_DEFEAT, 0xA06, 0, 0)) {
func_80324E38(0.0f, 3);
timed_setStaticCameraToNode(0.0f, 4);
timedFunc_set_0(0.1f, __chCrab_spawn_mutant_crab_jiggy);
@@ -206,7 +206,7 @@ void __chCrab_die(ActorMarker *marker, ActorMarker *other){
jiggy_spawn_position[1] = 3812.0f;
jiggy_spawn_position[2] = 0.0f;
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
func_80324DBC(2.25f, ASSET_D33_DIALOG_MUTANT_CRAB_DEFEAT, 0xF, jiggy_spawn_position, NULL, __chCrab_mutantTextCallback, NULL);
func_80324DBC(2.25f, VER_SELECT(ASSET_D33_DIALOG_MUTANT_CRAB_DEFEAT, 0xA06, 0, 0), 0xF, jiggy_spawn_position, NULL, __chCrab_mutantTextCallback, NULL);
}
}
p_ctrl = partEmitMgr_newEmitter(2);
@@ -282,7 +282,7 @@ void chCrab_update(Actor *this) {
&& !player_movementGroup()
) {
if ((this->state != CRAB_STATE_6_FLIP_UPSIDE_DOWN) && (this->state != CRAB_STATE_5_UPSIDE_DOWN)) {
gcdialog_showDialog(ASSET_D32_DIALOG_MUTANT_CRAB_MEET, 0xF, this->position, NULL, __chCrab_mutantTextCallback, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_D32_DIALOG_MUTANT_CRAB_MEET, 0xA05, 0, 0), 0xF, this->position, NULL, __chCrab_mutantTextCallback, NULL);
mapSpecificFlags_set(0, TRUE);
levelSpecificFlags_set(LEVEL_FLAG_E_CC_MUTIE_SNIPPETS, TRUE);
this->has_met_before = TRUE;
@@ -295,10 +295,10 @@ void chCrab_update(Actor *this) {
&& !jiggyscore_isCollected(JIGGY_10_TTC_SANDCASTLE)
&& subaddie_playerIsWithinSphereAndActive(this, 1600)
) {
gcdialog_showDialog(ASSET_A12_DIALOG_BLACK_SNIPPET_SPAWNED, 4, this->position, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A12_DIALOG_BLACK_SNIPPET_SPAWNED, 0x912, 0, 0), 4, this->position, NULL, NULL, NULL);
mapSpecificFlags_set(0, TRUE);
} else if (mapSpecificFlags_get(1)) {
gcdialog_showDialog(ASSET_A13_DIALOG_BLACK_SNIPPET_DEFEATED, 4, this->position, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_A13_DIALOG_BLACK_SNIPPET_DEFEATED, 0x913, 0, 0), 4, this->position, NULL, NULL, NULL);
mapSpecificFlags_set(1, FALSE);
}
}
src/core2/ch/gloop.c
+1 -1
View File
@@ -60,7 +60,7 @@ void chgloop_update(Actor *this){
if( !mapSpecificFlags_get(2)
&& subaddie_playerIsWithinSphereAndActive(this, 350)
&& gcdialog_showDialog(ASSET_D34_DIALOG_GLOOP_MEET, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showDialog(VER_SELECT(ASSET_D34_DIALOG_GLOOP_MEET, 0xA07, 0, 0), 0, NULL, NULL, NULL, NULL)
){
mapSpecificFlags_set(2, TRUE);
}
src/core2/ch/jinjo.c
+5 -5
View File
@@ -45,11 +45,11 @@ enum chjinjo_state_e {
/*.code */
enum asset_e __chJinjo_getMeetDialogId(enum marker_e marker_id){
switch(marker_id){
case MARKER_5A_JINJO_BLUE: return ASSET_D98_DIALOG_JINJO_MEET_BLUE;
case MARKER_5B_JINJO_GREEN: return ASSET_D99_DIALOG_JINJO_MEET_GREEN;
case MARKER_5C_JINJO_ORANGE: return ASSET_D9B_DIALOG_JINJO_MEET_ORANGE;
case MARKER_5D_JINJO_PINK: return ASSET_D9A_DIALOG_JINJO_MEET_PINK;
case MARKER_5E_JINJO_YELLOW: return ASSET_D97_DIALOG_JINJO_MEET_YELLOW;
case MARKER_5A_JINJO_BLUE: return VER_SELECT(ASSET_D98_DIALOG_JINJO_MEET_BLUE, 0x0A16, 0, 0);
case MARKER_5B_JINJO_GREEN: return VER_SELECT(ASSET_D99_DIALOG_JINJO_MEET_GREEN, 0x0A17, 0, 0);
case MARKER_5C_JINJO_ORANGE: return VER_SELECT(ASSET_D9B_DIALOG_JINJO_MEET_ORANGE, 0x0A19, 0, 0);
case MARKER_5D_JINJO_PINK: return VER_SELECT(ASSET_D9A_DIALOG_JINJO_MEET_PINK, 0x0A18, 0, 0);
case MARKER_5E_JINJO_YELLOW: return VER_SELECT(ASSET_D97_DIALOG_JINJO_MEET_YELLOW, 0x0A15, 0, 0);
}
return 0;
}
src/core2/ch/mole.c
+20 -20
View File
@@ -54,16 +54,16 @@ ActorInfo gChMole = {
};
ChMoleDescription moleTable[] = {
{ASSET_C23_DIALOG_BEAKBOMB_LEARN, ASSET_C24_DIALOG_BEAKBOMB_REFRESHER, 0x0F, ABILITY_1_BEAK_BOMB},
{ASSET_B47_DIALOG_EGGS_LEARN, ASSET_B4B_DIALOG_EGGS_REFRESHER, 0x16, ABILITY_6_EGGS},
{ASSET_B48_DIALOG_BEAKBUSTER_LEARN, ASSET_B4C_DIALOG_BEAKBUSTER_REFRESHER, 0x17, ABILITY_2_BEAK_BUSTER},
{ASSET_B49_DIALOG_TALON_TROT_LEARN, ASSET_B4A_DIALOG_TALON_TROT_REFRESHER, 0x18, ABILITY_10_TALON_TROT},
{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_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}
{VER_SELECT(ASSET_C23_DIALOG_BEAKBOMB_LEARN, 0x99D, 0, 0), VER_SELECT(ASSET_C24_DIALOG_BEAKBOMB_REFRESHER, 0x99E, 0, 0), 0x0F, ABILITY_1_BEAK_BOMB},
{VER_SELECT(ASSET_B47_DIALOG_EGGS_LEARN, 0x965, 0, 0), VER_SELECT(ASSET_B4B_DIALOG_EGGS_REFRESHER, 0x969, 0, 0), 0x16, ABILITY_6_EGGS},
{VER_SELECT(ASSET_B48_DIALOG_BEAKBUSTER_LEARN, 0x966, 0, 0), VER_SELECT(ASSET_B4C_DIALOG_BEAKBUSTER_REFRESHER, 0x96A, 0, 0), 0x17, ABILITY_2_BEAK_BUSTER},
{VER_SELECT(ASSET_B49_DIALOG_TALON_TROT_LEARN, 0x967, 0, 0), VER_SELECT(ASSET_B4A_DIALOG_TALON_TROT_REFRESHER, 0x968, 0, 0), 0x18, ABILITY_10_TALON_TROT},
{VER_SELECT(ASSET_A1F_DIALOG_SHOCKJUMP_LEARN, 0x91F, 0, 0), VER_SELECT(ASSET_A23_DIALOG_SHOCKJUMP_REFRESHER, 0x923, 0, 0), 0x0C, ABILITY_D_SHOCK_JUMP},
{VER_SELECT(ASSET_A20_DIALOG_FLY_LEARN, 0x920, 0, 0), VER_SELECT(ASSET_A22_DIALOG_FLY_REFRESHER, 0x922, 0, 0), 0x0D, ABILITY_9_FLIGHT},
{VER_SELECT(ASSET_D35_DIALOG_WONDERWING_LEARN, 0xA08, 0, 0), VER_SELECT(ASSET_D36_DIALOG_WONDERWING_REFRESHER, 0xA09, 0, 0), 0x01, ABILITY_12_WONDERWING},
{VER_SELECT(ASSET_C88_DIALOG_WADING_BOOTS_LEARN, 0x9CB, 0, 0), VER_SELECT(ASSET_C89_DIALOG_WADING_BOOTS_REFRESHER, 0x9CC, 0, 0), 0x10, ABILITY_E_WADING_BOOTS},
{VER_SELECT(ASSET_A84_DIALOG_TURBOTRAINERS_LEARN, 0x940, 0, 0), VER_SELECT(ASSET_A85_DIALOG_TURBOTRAINERS_REFRESHER, 0x941, 0, 0), 0x19, ABILITY_11_TURBO_TALON},
{VER_SELECT(ASSET_F64_DIALOG_NOTEDOORS_LEARN, 0xACA, 0, 0), VER_SELECT(ASSET_F65_DIALOG_NOTEDOORS_REFRESHER, 0xACB, 0, 0), 0x0E, ABILITY_13_1ST_NOTEDOOR}
};
#define MOLE_ID_TO_TABLE_SHIFT 9
@@ -99,19 +99,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_BOTTLES_ALL_MOVES_LEARNED;
return learned_all_moves ? ASSET_B4E_DIALOG_BOTTLES_ALL_MM_MOVES_LEARNED : VER_SELECT(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xA0B, 0, 0);
case LEVEL_2_TREASURE_TROVE_COVE:
return learned_all_moves ? ASSET_A27_DIALOG_BOTTLES_ALL_TTC_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED;
return learned_all_moves ? ASSET_A27_DIALOG_BOTTLES_ALL_TTC_MOVES_LEARNED : VER_SELECT(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xA0B, 0, 0);
case LEVEL_3_CLANKERS_CAVERN:
return learned_all_moves ? ASSET_D37_DIALOG_BOTTLES_ALL_CC_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED;
return learned_all_moves ? VER_SELECT(ASSET_D37_DIALOG_BOTTLES_ALL_CC_MOVES_LEARNED, 0xA0A, 0, 0) : VER_SELECT(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xA0B, 0, 0);
case LEVEL_4_BUBBLEGLOOP_SWAMP:
return learned_all_moves ? ASSET_C8A_DIALOG_BOTTLES_ALL_BGS_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED;
return learned_all_moves ? VER_SELECT(ASSET_C8A_DIALOG_BOTTLES_ALL_BGS_MOVES_LEARNED, 0x9CD, 0, 0) : VER_SELECT(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xA0B, 0, 0);
case LEVEL_5_FREEZEEZY_PEAK:
return learned_all_moves ? ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED;
return learned_all_moves ? VER_SELECT(ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED, 0x9A4, 0, 0) : VER_SELECT(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xA0B, 0, 0);
case LEVEL_7_GOBIS_VALLEY:
return learned_all_moves ? ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED;
return learned_all_moves ? VER_SELECT(ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED, 0x9A4, 0, 0) : VER_SELECT(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xA0B, 0, 0);
default:
return ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED;
return VER_SELECT(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xA0B, 0, 0);
}
}
@@ -176,10 +176,10 @@ void chmole_healthRefill(ActorMarker *marker, enum asset_e arg1, s32 arg2){
if( arg1 == moleTable[actor->actorTypeSpecificField - MOLE_ID_TO_TABLE_SHIFT].teach_text_id
&& item_getCount(ITEM_14_HEALTH) < item_getCount(ITEM_15_HEALTH_TOTAL)
){
gcdialog_showDialog(ASSET_D39_DIALOG_BOTTLES_REFILL_HEALTH, 7, 0, actor->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions);
gcdialog_showDialog(VER_SELECT(ASSET_D39_DIALOG_BOTTLES_REFILL_HEALTH, 0xA0C, 0, 0), 7, 0, actor->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions);
}//L802D9738
else if(arg1 == moleTable[actor->actorTypeSpecificField - MOLE_ID_TO_TABLE_SHIFT].teach_text_id || arg1 == ASSET_D39_DIALOG_BOTTLES_REFILL_HEALTH){
gcdialog_showDialog(chmole_learnedAllGameAbilities()? ASSET_A87_DIALOG_BOTTLES_ALL_MOVES_LEARNED : chmole_learnedAllLevelAbilitiesDialog(), 7, 0, actor->marker, chmole_healthRefill, NULL);
else if(arg1 == moleTable[actor->actorTypeSpecificField - MOLE_ID_TO_TABLE_SHIFT].teach_text_id || arg1 == VER_SELECT(ASSET_D39_DIALOG_BOTTLES_REFILL_HEALTH, 0xA0C, 0, 0)){
gcdialog_showDialog(chmole_learnedAllGameAbilities()? VER_SELECT(ASSET_A87_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0x943, 0, 0) : chmole_learnedAllLevelAbilitiesDialog(), 7, 0, actor->marker, chmole_healthRefill, NULL);
}
else{//L802D97BC
if(actor->has_met_before){
src/core2/ch/mumbo.c
+24 -24
View File
@@ -142,23 +142,23 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3
this = marker_getActor(caller);
switch(text_id){
case ASSET_D8F_DIALOG_MUMBO_MEET: //L802D1A04
gcdialog_showDialog((this->unk38_0) ? ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS : ASSET_DAB_DIALOG_MUMBO_NOT_ENOUGH_TOKENS, 0xe, this->position, this->marker, __chMumbo_textCallback, NULL);
case VER_SELECT(ASSET_D8F_DIALOG_MUMBO_MEET, 0xA0D, 0, 0): //L802D1A04
gcdialog_showDialog((this->unk38_0) ? VER_SELECT(ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS, 0xA28, 0, 0) : VER_SELECT(ASSET_DAB_DIALOG_MUMBO_NOT_ENOUGH_TOKENS, 0xA29, 0, 0), 0xe, this->position, this->marker, __chMumbo_textCallback, NULL);
return;
case ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR: //L802D1A40
case VER_SELECT(ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR, 0xA0E, 0, 0): //L802D1A40
fileProgressFlag_set(FILEPROG_12_HAS_TRANSFORMED_BEFORE, TRUE);
gcdialog_showDialog(ASSET_D8F_DIALOG_MUMBO_MEET + D_8037DDF0, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_D8F_DIALOG_MUMBO_MEET, 0xA0D, 0, 0) + D_8037DDF0, 4, NULL, NULL, NULL, NULL);
gcpausemenu_80314AC8(1);
break;
case ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS: //L802D1A7C /* fall-through */
case VER_SELECT(ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS, 0xA28, 0, 0): //L802D1A7C /* fall-through */
fileProgressFlag_set(FILEPROG_DC_HAS_HAD_ENOUGH_TOKENS_BEFORE, TRUE);
case ASSET_DAB_DIALOG_MUMBO_NOT_ENOUGH_TOKENS: //L802D1A88
case VER_SELECT(ASSET_DAB_DIALOG_MUMBO_NOT_ENOUGH_TOKENS, 0xA29, 0, 0): //L802D1A88
func_8028F918(0);
break;
case ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE: //L802D1A98
case VER_SELECT(ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 0xA2D, 0, 0): //L802D1A98
this->has_met_before = FALSE;
if(this->unk38_31 != 0){
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
@@ -168,9 +168,9 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3
subaddie_set_state_with_direction(this, 5, 0.0f, 1);
return;
case ASSET_DB0_DIALOG_MUMBO_MISTAKE_0: //L802D1AF8
case ASSET_DB1_DIALOG_MUMBO_MISTAKE_1: //L802D1AF8
case ASSET_DB2_DIALOG_MUMBO_MISTAKE_2: //L802D1AF8
case VER_SELECT(ASSET_DB0_DIALOG_MUMBO_MISTAKE_0, 0xA2E, 0, 0): //L802D1AF8
case VER_SELECT(ASSET_DB1_DIALOG_MUMBO_MISTAKE_1, 0xA2F, 0, 0): //L802D1AF8
case VER_SELECT(ASSET_DB2_DIALOG_MUMBO_MISTAKE_2, 0xA30, 0, 0): //L802D1AF8
D_8037DDF0 = this->unk10_12;
this->unk10_12 = 1;
if(this->unk38_31){
@@ -178,7 +178,7 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3
item_adjustByDiffWithHud(ITEM_1C_MUMBO_TOKEN, -this->unk38_31);
}
case ASSET_DAE_DIALOG_MUMBO_TREX_START: //L802D1B48
case VER_SELECT(ASSET_DAE_DIALOG_MUMBO_TREX_START, 0xA2C, 0, 0): //L802D1B48
subaddie_set_state_with_direction(this, 5, 0.0f, 1);
return;
@@ -191,16 +191,16 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3
void chMumbo_func_802D1B8C(Actor *this, enum transformation_e transform_id) {
if (this->unk10_12 != 0) {
gcdialog_showDialog(fileProgressFlag_getN(FILEPROG_BB_MUMBO_MISTAKE_INDEX, 2) + ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showDialog(fileProgressFlag_getN(FILEPROG_BB_MUMBO_MISTAKE_INDEX, 2) + VER_SELECT(ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 0xA2D, 0, 0), 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
return;
}
if (fileProgressFlag_get(FILEPROG_12_HAS_TRANSFORMED_BEFORE)) {
if (this->velocity[0] == 0.0f) {
gcdialog_showDialog(transform_id + ASSET_D8F_DIALOG_MUMBO_MEET, 6, this->position, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showDialog(transform_id + VER_SELECT(ASSET_D8F_DIALOG_MUMBO_MEET, 0xA0D, 0, 0), 6, this->position, this->marker, __chMumbo_textCallback, NULL);
return;
}
if (gsworld_getMap() == MAP_7A_GL_CRYPT && transform_id == TRANSFORM_3_PUMPKIN && !fileProgressFlag_get(FILEPROG_F7_HAS_TRANSFORMED_IN_CRYPT)) {
gcdialog_showDialog(ASSET_DAD_DIALOG_MUMBO_XFORM_IN_CRYPT, 6, this->position, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_DAD_DIALOG_MUMBO_XFORM_IN_CRYPT, 0xA2B, 0, 0), 6, this->position, this->marker, __chMumbo_textCallback, NULL);
fileProgressFlag_set(FILEPROG_F7_HAS_TRANSFORMED_IN_CRYPT, TRUE);
return;
}
@@ -208,7 +208,7 @@ void chMumbo_func_802D1B8C(Actor *this, enum transformation_e transform_id) {
subaddie_set_state(this, 4U);
return;
}
gcdialog_showDialog(ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR, 0xA0E, 0, 0), 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
}
void chMumbo_update(Actor *this) {
@@ -281,7 +281,7 @@ void chMumbo_update(Actor *this) {
&& !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)
) {
subaddie_set_state(this, 3);
gcdialog_showDialog(ASSET_D8F_DIALOG_MUMBO_MEET, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_D8F_DIALOG_MUMBO_MEET, 0xA0D, 0, 0), 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
fileProgressFlag_set(FILEPROG_11_HAS_MET_MUMBO, TRUE);
break;
}
@@ -292,7 +292,7 @@ void chMumbo_update(Actor *this) {
&& this->unk38_0
){
subaddie_set_state(this, 3);
gcdialog_showDialog(ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS, 0xA28, 0, 0), 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
fileProgressFlag_set(FILEPROG_DC_HAS_HAD_ENOUGH_TOKENS_BEFORE, TRUE);
break;
}
@@ -330,7 +330,7 @@ void chMumbo_update(Actor *this) {
&& randf() < 0.01
&& sp48
) {
gcdialog_showDialog(ASSET_DAE_DIALOG_MUMBO_TREX_START, 6, NULL, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_DAE_DIALOG_MUMBO_TREX_START, 0xA2C, 0, 0), 6, NULL, this->marker, __chMumbo_textCallback, NULL);
fileProgressFlag_set(FILEPROG_BA_HAS_SEEN_TREX_TEXT, 1);
this->has_met_before = TRUE;
subaddie_set_state(this, 3);
@@ -359,7 +359,7 @@ void chMumbo_update(Actor *this) {
break;
}
coMusicPlayer_playMusic(COMUSIC_2C_BUZZER, 22000);
if ((levelSpecificFlags_get(LEVEL_FLAG_3E_UNKNOWN) == FALSE) && (gcdialog_showDialog(ASSET_DAC_DIALOG_MUMBO_FAIL_TO_BUY, 0, NULL, NULL, NULL, NULL) != 0)) {
if ((levelSpecificFlags_get(LEVEL_FLAG_3E_UNKNOWN) == FALSE) && (gcdialog_showDialog(VER_SELECT(ASSET_DAC_DIALOG_MUMBO_FAIL_TO_BUY, 0xA2A, 0, 0), 0, NULL, NULL, NULL, NULL) != 0)) {
levelSpecificFlags_set(LEVEL_FLAG_3E_UNKNOWN, 1);
}
}
@@ -417,7 +417,7 @@ void chMumbo_update(Actor *this) {
}
if (this->has_met_before) {
subaddie_set_state(this, 3);
gcdialog_showDialog(ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 6, NULL, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 0xA2D, 0, 0), 6, NULL, this->marker, __chMumbo_textCallback, NULL);
break;
}
gcpausemenu_80314AC8(1);
@@ -434,7 +434,7 @@ void chMumbo_update(Actor *this) {
sp48 = chMumbo_withinHorzDistToPlayer(0, -0x6B, 0xBC);
}
if (sp48 != 0) {
gcdialog_showDialog(ASSET_DA7_DIALOG_MUMBO_CCW_SUMMER, 7, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_DA7_DIALOG_MUMBO_CCW_SUMMER, 0xA25, 0, 0), 7, NULL, NULL, NULL, NULL);
volatileFlag_set(VOLATILE_FLAG_11, TRUE);
}
}
@@ -450,7 +450,7 @@ void chMumbo_update(Actor *this) {
sp48 = chMumbo_withinHorzDistToPlayer(0, -0x6B, 0xBC);
}
if (sp48 != 0) {
gcdialog_showDialog(ASSET_DA8_DIALOG_MUMBO_CCW_AUTUMN, 7, NULL, NULL, NULL, NULL);
gcdialog_showDialog(VER_SELECT(ASSET_DA8_DIALOG_MUMBO_CCW_AUTUMN, 0xA26, 0, 0), 7, NULL, NULL, NULL, NULL);
volatileFlag_set(VOLATILE_FLAG_12, TRUE);
}
}
@@ -511,7 +511,7 @@ void chMumbo_detransformWarn(NodeProp *arg0, ActorMarker *arg1){
if(D_8037DDF3)
return;
gcdialog_showDialog(fileProgressFlag_getAndSet(FILEPROG_83_MAGIC_GET_WEAK_TEXT, TRUE) ? ASSET_F5C_DIALOG_MUMBO_MAGIC_GET_WEAK_ABREV : ASSET_F5B_DIALOG_MUMBO_MAGIC_GET_WEAK_FULL, 0xe, NULL, NULL, NULL, NULL);
gcdialog_showDialog(fileProgressFlag_getAndSet(FILEPROG_83_MAGIC_GET_WEAK_TEXT, TRUE) ? VER_SELECT(ASSET_F5C_DIALOG_MUMBO_MAGIC_GET_WEAK_ABREV, 0xAC2, 0, 0) : VER_SELECT(ASSET_F5B_DIALOG_MUMBO_MAGIC_GET_WEAK_FULL, 0xAC1, 0, 0), 0xe, NULL, NULL, NULL, NULL);
}
void chMumbo_detransformTrigger(NodeProp *arg0, ActorMarker *arg1){
@@ -519,7 +519,7 @@ void chMumbo_detransformTrigger(NodeProp *arg0, ActorMarker *arg1){
xform = player_getTransformation();
if(xform == TRANSFORM_1_BANJO || xform == TRANSFORM_7_WISHWASHY || D_8037DDF1)
return;
gcdialog_showDialog(fileProgressFlag_getAndSet(FILEPROG_84_MAGIC_ALL_GONE_TEXT, TRUE) ? ASSET_F5E_DIALOG_MUMBO_MAGIC_RUN_OUT_ABREV: ASSET_F5D_DIALOG_MUMBO_MAGIC_RUN_OUT_FULL, 0xe, NULL, NULL, NULL, NULL);
gcdialog_showDialog(fileProgressFlag_getAndSet(FILEPROG_84_MAGIC_ALL_GONE_TEXT, TRUE) ? VER_SELECT(ASSET_F5E_DIALOG_MUMBO_MAGIC_RUN_OUT_ABREV, 0xAC4, 0, 0): VER_SELECT(ASSET_F5D_DIALOG_MUMBO_MAGIC_RUN_OUT_FULL, 0xAC3, 0, 0), 0xe, NULL, NULL, NULL, NULL);
D_8037DDF1++;
player_transform(TRANSFORM_1_BANJO);
}
src/core2/ch/snacker.c
+1 -1
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(ASSET_A1B_DIALOG_SNACKER_SPAWNED_1 + text_index, 0, NULL, NULL, NULL, NULL)){
if(gcdialog_showDialog(VER_SELECT(ASSET_A1B_DIALOG_SNACKER_SPAWNED_1, 0x91B, 0, 0) + text_index, 0, NULL, NULL, NULL, NULL)){
text_index++;
mapSpecificFlags_setN(8, text_index, 3);
this->has_met_before = TRUE;
src/core2/ch/trainers.c
+1 -1
View File
@@ -82,7 +82,7 @@ void chtrainers_update(Actor *this){
&& !volatileFlag_get(VOLATILE_FLAG_F_HAS_MEET_TURBO_SHOES)
&& player_getTransformation() == TRANSFORM_1_BANJO
){
if(gcdialog_showDialog(0xda4, 0, NULL, NULL, NULL, NULL)){
if(gcdialog_showDialog(VER_SELECT(0xda4, 0xA22, 0, 0), 0, NULL, NULL, NULL, NULL)){
volatileFlag_set(VOLATILE_FLAG_F_HAS_MEET_TURBO_SHOES, TRUE);
}
}//L802CA620
src/core2/ch/wadingboots.c
+1 -1
View File
@@ -70,7 +70,7 @@ void chwadingboots_update(Actor *this){
if(!subaddie_playerIsWithinSphereAndActive(this, 250)) break;
if(player_getTransformation() != TRANSFORM_1_BANJO) break;
if(gcdialog_showDialog(ASSET_DA5_DIALOG_WADINGBOOTS_MEET, 0, NULL, NULL, NULL, NULL)){
if(gcdialog_showDialog(VER_SELECT(ASSET_DA5_DIALOG_WADINGBOOTS_MEET, 0xA23, 0, 0), 0, NULL, NULL, NULL, NULL)){
volatileFlag_set(VOLATILE_FLAG_10_HAS_MEET_WADING_BOOTS, TRUE);
}
src/core2/code_53A10.c
+3 -3
View File
@@ -71,13 +71,13 @@ void func_802DAA14(Actor *this){
if(!this->has_met_before){
if(level_get() == LEVEL_A_MAD_MONSTER_MANSION){
text_id = ASSET_ADC_DIALOG_GRUNTY_ENTER_SHED;
text_id = VER_SELECT(ASSET_ADC_DIALOG_GRUNTY_ENTER_SHED, 0x94E, 0, 0);
}
else{
if(gsworld_getMap() == MAP_69_GL_MM_LOBBY)
tmp = ASSET_F66_DIALOG_UNKNOWN;
tmp = VER_SELECT(ASSET_F66_DIALOG_UNKNOWN, 0xACC, 0, 0);
else
tmp = ASSET_F67_DIALOG_UNKNOWN;
tmp = VER_SELECT(ASSET_F67_DIALOG_UNKNOWN, 0xACD, 0, 0);
text_id = tmp;
}
gcdialog_showDialog(text_id, 4, NULL, this->marker, func_802DA9A0, NULL);
src/core2/code_5C870.c
+1 -1
View File
@@ -422,7 +422,7 @@ void func_802E4384(void){
else{
func_8033DC18();
;
time_setDeltaReal_frames((s32)(func_8033DC20()*60.0f + 0.5));
time_setDeltaReal_frames((s32)(func_8033DC20()*(float)FRAMERATE + 0.5));
}
func_8033DC10();
src/core2/code_A5BC0.c
+1 -1
View File
@@ -2276,7 +2276,7 @@ void func_80332894(void) {
s32 size;
s32 i;
size = 0x579;
size = VER_SELECT(0x579, 0x391, 0, 0);
D_8036E7C4 = malloc(size);
i = 0;
do{
src/core2/code_B3A80.c
+5
View File
@@ -222,8 +222,13 @@ void func_8033B1BC(void){
}
void func_8033B268(void){
#if VERSION == VERSION_USA_1_0
D_80383CE0[0] = (vector(struct21s) *)defrag(D_80383CE0[0]);
D_80383CE0[1] = (vector(struct21s) *)defrag(D_80383CE0[1]);
#else
D_80383CE0[0] = (vector(struct21s) *)vector_defrag(D_80383CE0[0]);
D_80383CE0[1] = (vector(struct21s) *)vector_defrag(D_80383CE0[1]);
#endif
}
void func_8033B2A4(s32 arg0) {
src/core2/levelcollectible.c
+3 -3
View File
@@ -126,21 +126,21 @@ void __chLevelCollectible_collide(ActorMarker *marker, ActorMarker *other_marker
levelSpecificFlags_set(LEVEL_FLAG_2A_FP_UNKNOWN, TRUE);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 0x7FFF);
__chLevelCollectible_presentCollectEmitSparkles(this->position, ASSET_711_SPRITE_SPARKLE_DARK_BLUE);
dialog_id = ASSET_C20_DIALOG_PRESENT_COLLECTIBLE_MEET_BLUE;
dialog_id = VER_SELECT(ASSET_C20_DIALOG_PRESENT_COLLECTIBLE_MEET_BLUE, 0x99A, 0, 0);
break;
case MARKER_1FE_GREEN_PRESENT_COLLECTIBLE:
levelSpecificFlags_set(LEVEL_FLAG_2B_FP_UNKNOWN, TRUE);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 0x7FFF);
__chLevelCollectible_presentCollectEmitSparkles(this->position, ASSET_712_SPRITE_SPARKLE_GREEN);
dialog_id = ASSET_C21_DIALOG_PRESENT_COLLECTIBLE_MEET_GREEN;
dialog_id = VER_SELECT(ASSET_C21_DIALOG_PRESENT_COLLECTIBLE_MEET_GREEN, 0x99B, 0, 0);
break;
case MARKER_1FF_RED_PRESENT_COLLECTIBLE:
levelSpecificFlags_set(LEVEL_FLAG_2C_FP_UNKNOWN, TRUE);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 0x7FFF);
__chLevelCollectible_presentCollectEmitSparkles(this->position, ASSET_715_SPRITE_SPARKLE_RED);
dialog_id = ASSET_C22_DIALOG_PRESENT_COLLECTIBLE_MEET_RED;
dialog_id = VER_SELECT(ASSET_C22_DIALOG_PRESENT_COLLECTIBLE_MEET_RED, 0x99C, 0, 0);
break;
default: