mirror/banjo-kazooie
1
0
Fork 0
mirror of https://gitlab.com/banjo.decomp/banjo-kazooie synced 2026-08-17 04:51:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

pal: all core2/bs matched

Browse Source
This commit is contained in:
Banjo Kazooie
2025-09-13 19:29:38 -05:00
parent c45dd154f1
commit 2decbef3fa
148 changed files with 908 additions and 1018 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CC/ch/sawblade.c
+1 -1
View File
@@ -142,7 +142,7 @@ void chSawblade_update(Actor *this){
local->unk0 = &D_80389C30[(this->modelCacheIndex < 0x43) ? this->modelCacheIndex - 0x3D : this->modelCacheIndex - 0x28A];
local->unk4 = 0;
func_80256C60(this->position, 100);
if(map_get() == MAP_21_CC_WITCH_SWITCH_ROOM){
if(gsworld_get_map() == MAP_21_CC_WITCH_SWITCH_ROOM){
this->position_z += 64.0f;
}
}//L80389660
src/CC/code_1B90.c
+1 -1
View File
@@ -62,7 +62,7 @@ void func_803880D4(void){
void func_80388104(void){
D_80389F90.unk0 = 0;
if(map_get() == MAP_22_CC_INSIDE_CLANKER){
if(gsworld_get_map() == MAP_22_CC_INSIDE_CLANKER){
if(jiggyscore_isSpawned(JIGGY_1C_CC_RINGS)){
timedFunc_set_0(0.0f, func_80387F80);
}
src/CC/code_1F70.c
+1 -1
View File
@@ -263,7 +263,7 @@ void func_80388CB4(void){
void func_80388D54(void){
D_80389FA0.unk21 = 0;
if(map_get() == MAP_B_CC_CLANKERS_CAVERN){
if(gsworld_get_map() == MAP_B_CC_CLANKERS_CAVERN){
D_80389FA0.unk0 = skeletalAnim_new();
D_80389FA0.sfxsourceIdx = sfxsource_createSfxsourceAndReturnIndex();
D_80389FA0.unk8 = 1.0f;
src/CCW/ch/grublinhood.c
+1 -1
View File
@@ -133,7 +133,7 @@ void __chgrublinhood_initialize(Actor *this){
}
enum ccw_season_e __get_current_season(Actor *this){
switch(map_get()){
switch(gsworld_get_map()){
case MAP_43_CCW_SPRING: //// 8038E930
case MAP_4A_CCW_SPRING_MUMBOS_SKULL:// 8038E930
case MAP_5B_CCW_SPRING_ZUBBA_HIVE:// 8038E930
src/CCW/code_0.c
+1 -1
View File
@@ -19,7 +19,7 @@ void CCW_func_803863F0(Actor *this, s32 next_state){
void func_80386468(ActorMarker* marker, ActorMarker *arg1) {
Actor* actor = marker_getActor(marker);
if (actor->state == 1 && map_get() == MAP_44_CCW_SUMMER) {
if (actor->state == 1 && gsworld_get_map() == MAP_44_CCW_SUMMER) {
CCW_func_803863F0(actor, 2);
}
}
src/CCW/code_14B0.c
+1 -1
View File
@@ -73,7 +73,7 @@ void CCW_func_80387A40(Actor *this) {
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = CCW_func_80387A20;
local->unk4 = &D_8038EC00[0];
while((local->unk4->unk0 != 0) && (map_get() != local->unk4->unk0)) {
while((local->unk4->unk0 != 0) && (gsworld_get_map() != local->unk4->unk0)) {
local->unk4++;
}
local->sfxsourceIdx = sfxsource_createSfxsourceAndReturnIndex();
src/CCW/code_160.c
+1 -1
View File
@@ -205,7 +205,7 @@ void func_8038687C(Actor *this) {
item_set(ITEM_6_HOURGLASS, 1);
item_set(ITEM_0_HOURGLASS_TIMER, 1800 - 1);
func_803865F4(this, 3);
} else if ((local->unk0 != NULL) && (map_get() == MAP_5A_CCW_SUMMER_ZUBBA_HIVE)) {
} else if ((local->unk0 != NULL) && (gsworld_get_map() == MAP_5A_CCW_SUMMER_ZUBBA_HIVE)) {
player_getPosition(sp40);
if ((ml_vec3f_distance(this->position, sp40) < 300.0f) && (player_getTransformation() == TRANSFORM_1_BANJO)) {
func_803865F4(this, 2);
src/CCW/code_1B20.c
+5 -5
View File
@@ -52,13 +52,13 @@ void func_80387F64(Actor *this, s32 next_state){
skeletalAnim_setBehavior(this->unk148, local->unk0->unk2);
}
if (next_state == 2) {
if (map_get() == MAP_43_CCW_SPRING) {
if (gsworld_get_map() == MAP_43_CCW_SPRING) {
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
}
fileProgressFlag_set(local->unk0->unk8, TRUE);
skeletalAnim_set(this->unk148, local->unk0->unk4, 0.0f, 6.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
if (map_get() == MAP_43_CCW_SPRING) {
if (gsworld_get_map() == MAP_43_CCW_SPRING) {
func_80324E38(0.0f, 3);
}
timed_setStaticCameraToNode(0.0f, 0);
@@ -70,7 +70,7 @@ void func_80387F64(Actor *this, s32 next_state){
timedFunc_set_0(6.1f, func_80387F10);
timedFunc_set_2(8.0f, (GenFunction_2)func_80387F38, (s32) this->marker, 3);
} else {
if (map_get() == MAP_43_CCW_SPRING) {
if (gsworld_get_map() == MAP_43_CCW_SPRING) {
timed_exitStaticCamera(7.0f);
func_80324E38(7.0f, 0);
}
@@ -97,7 +97,7 @@ void CCW_func_80388278(ActorMarker *marker, ActorMarker *other_marker) {
void func_803882A4(ActorMarker* marker, ActorMarker *other_marker) {
Actor* actor = marker_getActor(marker);
if (map_get() == MAP_43_CCW_SPRING && actor->state == 1) {
if (gsworld_get_map() == MAP_43_CCW_SPRING && actor->state == 1) {
func_80387F64(actor, 2);
}
}
@@ -156,7 +156,7 @@ void func_80388478(Actor *this) {
}
}
if (!fileProgressFlag_get(FILEPROG_E3_CCW_FLOWER_SPRING) && (map_get() != MAP_43_CCW_SPRING)) {
if (!fileProgressFlag_get(FILEPROG_E3_CCW_FLOWER_SPRING) && (gsworld_get_map() != MAP_43_CCW_SPRING)) {
marker_despawn(this->marker);
}
else{
src/CCW/code_2270.c
+5 -5
View File
@@ -55,7 +55,7 @@ void CCW_func_8038868C(Actor *this, s32 next_state) {
skeletalAnim_set(local->unk4, ASSET_100_ANIM_GOBI_SPIT, 0.0f, 3.0f);
skeletalAnim_setBehavior(local->unk4, 2);
func_80324E38(0.0f, 3);
timed_setStaticCameraToNode(0.0f, (map_get() == MAP_44_CCW_SUMMER) ? 1 : 2);
timed_setStaticCameraToNode(0.0f, (gsworld_get_map() == MAP_44_CCW_SUMMER) ? 1 : 2);
timed_playSfx(0.05f, SFX_84_GOBI_CRYING, 1.1f, 32000);
timed_playSfx(0.8f, SFX_4B_GULPING, 0.8f, 28000);
timed_playSfx(1.4f, SFX_4B_GULPING, 0.8f, 28000);
@@ -145,13 +145,13 @@ void chGobiCCW_update(Actor *this) {
fileProgressFlag_set(FILEPROG_E5_CCW_FLOWER_AUTUMN, FALSE);
}
local->unk0 = &D_8038ECD0[0];
while((local->unk0->map_id != 0) && (map_get() != local->unk0->map_id)) {
while((local->unk0->map_id != 0) && (gsworld_get_map() != local->unk0->map_id)) {
local->unk0++;
}
if( (map_get() == MAP_44_CCW_SUMMER) && fileProgressFlag_get(FILEPROG_E3_CCW_FLOWER_SPRING) && !fileProgressFlag_get(FILEPROG_E4_CCW_FLOWER_SUMMER)) {
if( (gsworld_get_map() == MAP_44_CCW_SUMMER) && fileProgressFlag_get(FILEPROG_E3_CCW_FLOWER_SPRING) && !fileProgressFlag_get(FILEPROG_E4_CCW_FLOWER_SUMMER)) {
CCW_func_8038868C(this, 1);
} else if( (map_get() == MAP_45_CCW_AUTUMN) && fileProgressFlag_get(FILEPROG_E4_CCW_FLOWER_SUMMER) && !fileProgressFlag_get(FILEPROG_E5_CCW_FLOWER_AUTUMN) ) {
} else if( (gsworld_get_map() == MAP_45_CCW_AUTUMN) && fileProgressFlag_get(FILEPROG_E4_CCW_FLOWER_SUMMER) && !fileProgressFlag_get(FILEPROG_E5_CCW_FLOWER_AUTUMN) ) {
CCW_func_8038868C(this, 1);
} else{
marker_despawn(this->marker);
@@ -176,7 +176,7 @@ void chGobiCCW_update(Actor *this) {
if(this->state == 3){
if (!func_80388438()) {
if (map_get() == MAP_44_CCW_SUMMER) {
if (gsworld_get_map() == MAP_44_CCW_SUMMER) {
CCW_func_8038868C(this, 4);
} else {
CCW_func_8038868C(this, 5);
src/CCW/code_3310.c
+1 -1
View File
@@ -225,7 +225,7 @@ void CCW_func_80389BFC(Actor *this) {
local->unk4 = 0U;
}
local->unk0 = &D_8038F080[0];
while(local->unk0->map_id != 0 && map_get() != local->unk0->map_id){
while(local->unk0->map_id != 0 && gsworld_get_map() != local->unk0->map_id){
local->unk0++;
}
src/CCW/code_3DA0.c
+1 -1
View File
@@ -97,7 +97,7 @@ void chcaterpillar_update(Actor *this){
chcaterpillar_setState(this, 2);
}
else{//L8038A408
map_id = map_get();
map_id = gsworld_get_map();
if ( !fileProgressFlag_get(FILEPROG_E6_SPRING_EYRIE_HATCHED)
|| ( map_id == MAP_45_CCW_AUTUMN && !fileProgressFlag_get(FILEPROG_E7_SUMMER_EYRIE_FED))
) {
src/CCW/code_5BF0.c
+1 -1
View File
@@ -98,7 +98,7 @@ void func_8038C41C(Actor *this) {
}
if (this->state == 0) {
if( map_get() == MAP_60_CCW_AUTUMN_NABNUTS_HOUSE
if( gsworld_get_map() == MAP_60_CCW_AUTUMN_NABNUTS_HOUSE
&& !jiggyscore_isSpawned(JIGGY_4A_CCW_NABNUT)
&& (this->marker->id == 0x1C6 || this->marker->id == 0x1CA)
){
src/CCW/code_6620.c
+1 -1
View File
@@ -93,7 +93,7 @@ void func_8038CC4C(Actor *this) {
this->volatile_initialized = TRUE;
this->has_met_before = FALSE;
local->unk0 = &D_8038F490[0];
while(local->unk0->map_id != 0 && map_get() != local->unk0->map_id){
while(local->unk0->map_id != 0 && gsworld_get_map() != local->unk0->map_id){
local->unk0++;
}
func_8038CB40(this, 1);
src/CCW/code_6EC0.c
+1 -1
View File
@@ -56,7 +56,7 @@ void func_8038D368(Actor *this) {
this->volatile_initialized = TRUE;
this->has_met_before = FALSE;
local->unk0 = D_8038F600;
while (local->unk0->map != 0 && map_get() != local->unk0->map) {
while (local->unk0->map != 0 && gsworld_get_map() != local->unk0->map) {
local->unk0++;
}
src/CCW/code_7120.c
+1 -1
View File
@@ -112,7 +112,7 @@ void func_8038D85C(Actor *this) {
levelSpecificFlags_set(LEVEL_FLAG_25_CCW_UNKNOWN, TRUE);
}
if ((levelSpecificFlags_get(LEVEL_FLAG_25_CCW_UNKNOWN) != FALSE) && (map_get() != MAP_43_CCW_SPRING)) {
if ((levelSpecificFlags_get(LEVEL_FLAG_25_CCW_UNKNOWN) != FALSE) && (gsworld_get_map() != MAP_43_CCW_SPRING)) {
marker_despawn(this->marker);
}
return;
src/FP/code_B4D0.c
+2 -2
View File
@@ -10,7 +10,7 @@ static struct {
/* .code */
void func_803918C0(void){
Actor *pntWozza;
if(map_get() == MAP_7F_FP_WOZZAS_CAVE){
if(gsworld_get_map() == MAP_7F_FP_WOZZAS_CAVE){
Me.sound = func_8030ED2C(SFX_128_FIRE_CRACKING, 2);
sfxsource_playSfxAtVolume(Me.sound, 1.0f);
pntWozza = actorArray_findActorFromActorId(0x353);
@@ -33,7 +33,7 @@ void func_8039195C(void){
}
void func_80391994(void){
if(map_get() == MAP_7F_FP_WOZZAS_CAVE){
if(gsworld_get_map() == MAP_7F_FP_WOZZAS_CAVE){
func_8030DB04(Me.sound, 22000, Me.position, 400.0f, 1200.0f);
sfxSource_func_8030E2C4(Me.sound);
}
src/FP/ma/slalom.c
+3 -3
View File
@@ -238,7 +238,7 @@ void __maSlalom_loseDialogCallback(void){
timed_exitStaticCamera(0.0f);
timedFunc_set_0(0.0f, __maSlalom_despawnAllGates);
timedFunc_set_0(0.0f, __maSlalom_despawnAllBridges);
func_8028FA14(map_get(), 0x11);
func_8028FA14(gsworld_get_map(), 0x11);
func_8028F66C(BS_INTR_2A);
}
@@ -267,7 +267,7 @@ void maSlalom_dialogCallback(ActorMarker *caller, enum asset_e text_id, s32 arg2
case 0xc10: //8038B358
func_8038ABDC();
func_8028FA14(map_get(), 0x11);
func_8028FA14(gsworld_get_map(), 0x11);
func_8028F66C(BS_INTR_2A);
timedFunc_set_0(0.0f, __maSlalom_clearState);
break;
@@ -373,7 +373,7 @@ void maSlalom_init(void){
FP_func_8038AB60(0);
if(map_get() != MAP_27_FP_FREEZEEZY_PEAK || jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3)){
if(gsworld_get_map() != MAP_27_FP_FREEZEEZY_PEAK || jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3)){
Me.state = MA_SLALOM_STATE_0_NONE;
return;
}
src/FP/ma/snowbutton.c
+1 -1
View File
@@ -24,7 +24,7 @@ static struct {
/* .code */
void maSnowButton_init(void){
if( map_get() != MAP_27_FP_FREEZEEZY_PEAK
if( gsworld_get_map() != MAP_27_FP_FREEZEEZY_PEAK
|| jiggyscore_isCollected(JIGGY_2D_FP_SNOWMAN_BUTTONS)
|| jiggyscore_isSpawned(JIGGY_2D_FP_SNOWMAN_BUTTONS)
){
src/FP/ma/snowy.c
+1 -1
View File
@@ -23,7 +23,7 @@ static struct {
/* .code */
void maSnowy_init(void){
if( map_get() != MAP_27_FP_FREEZEEZY_PEAK
if( gsworld_get_map() != MAP_27_FP_FREEZEEZY_PEAK
|| jiggyscore_isCollected(JIGGY_31_FP_SIR_SLUSH)
|| jiggyscore_isSpawned(JIGGY_31_FP_SIR_SLUSH)
){
src/GV/code_4740.c
+1 -1
View File
@@ -37,7 +37,7 @@ f32 GV_D_80391A70[3];
/* .code */
void func_8038AB30(ParticleEmitter *pCtrl, f32 position[3], s32 cnt){
if(map_get() != MAP_1A_GV_INSIDE_JINXY)
if(gsworld_get_map() != MAP_1A_GV_INSIDE_JINXY)
particleEmitter_setRGB(pCtrl, D_803910BC);
else
particleEmitter_setRGB(pCtrl, D_803910C8);
src/GV/code_5570.c
+1 -1
View File
@@ -71,7 +71,7 @@ s32 func_8038BAA4(Actor *jiggy){
s32 tmp_v0;
s32 sp18[3];
map_get();
gsworld_get_map();
sp18[0] = (s32)jiggy->position_x;
sp18[1] = (s32)jiggy->position_y;
sp18[2] = (s32)jiggy->position_z;
src/GV/code_7FF0.c
+2 -2
View File
@@ -191,7 +191,7 @@ void func_8038E4DC(Actor *this){
}
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(exit_get() == 3){
if(gsworld_get_exit() == 3){
if(0.65 < this->unk48 && this->unk48 < 0.95){
func_80343E20(0x6a, 0x7ff8, 0.32842f, 0x34);
}
@@ -291,7 +291,7 @@ void func_8038E97C(Actor *this){
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(exit_get() == 7){
if(gsworld_get_exit() == 7){
this->position_z += 117.0;
this->position_y += 130.0;
this->unk38_31 = 30;
src/GV/code_9B70.c
+1 -1
View File
@@ -7,7 +7,7 @@ void func_8038FF60(void){}
void func_8038FF68(void){
if(map_get() != MAP_12_GV_GOBIS_VALLEY) return;
if(gsworld_get_map() != MAP_12_GV_GOBIS_VALLEY) return;
if(jiggyscore_isCollected(JIGGY_42_GV_WATER_PYRAMID)){
func_8034DE60(&func_8034C528(0x190)->type_6D, 0.0f, 270.0f, 0.0f, 1);
src/GV/matchinggame.c
+1 -1
View File
@@ -118,7 +118,7 @@ void gv_matchingGame_reset(void){
void gv_matchingGame_init(void){
Actor *actor;
matchingGame.state = 0;
if(map_get() == MAP_13_GV_MEMORY_GAME){
if(gsworld_get_map() == MAP_13_GV_MEMORY_GAME){
if( !jiggyscore_isSpawned(JIGGY_40_GV_MATCHING_GAME) //jiggy is collected
|| volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) //in FF minigame
){
src/GV/waterctrl.c
+1 -1
View File
@@ -52,7 +52,7 @@ void gv_waterCtrl_init(void){
GV_D_80391B00.state = 0;
if(map_get() != MAP_15_GV_WATER_PYRAMID) return;
if(gsworld_get_map() != MAP_15_GV_WATER_PYRAMID) return;
if(jiggyscore_isCollected(JIGGY_42_GV_WATER_PYRAMID)){
tmp_v0 = func_8034C528(400);
src/MM/ch/conga.c
+1 -1
View File
@@ -59,7 +59,7 @@ bool __chConga_isPlayerNearCongaTree(Actor * this){
f32 plyr_pos[3];
f32 unused_tmpz;
if (map_get() != MAP_2_MM_MUMBOS_MOUNTAIN) {
if (gsworld_get_map() != MAP_2_MM_MUMBOS_MOUNTAIN) {
return FALSE;
}
src/MM/ch/lmonkey.c
+1 -1
View File
@@ -94,7 +94,7 @@ void chlmonkey_update(Actor *this) {
actor_collisionOff(this);
this->marker->propPtr->unk8_3 = 1;
if (map_get() != MAP_2_MM_MUMBOS_MOUNTAIN) {
if (gsworld_get_map() != MAP_2_MM_MUMBOS_MOUNTAIN) {
func_80343DEC(this);
}
else {//L80388630
src/MMM/code_3120.c
+1 -1
View File
@@ -31,7 +31,7 @@ void func_8038953C() {
void func_80389544(void){
MMM_D_8038C4E0.unk0 = 0;
MMM_D_8038C4E0.unk2 = 0;
if(map_get() == MAP_26_MMM_NAPPERS_ROOM){
if(gsworld_get_map() == MAP_26_MMM_NAPPERS_ROOM){
if(jiggyscore_isCollected(JIGGY_5D_MMM_NAPPER)){
MMM_D_8038C4E0.unk1 = 2;
}
src/MMM/code_3420.c
+1 -1
View File
@@ -319,7 +319,7 @@ void code3420_handleOrganGame(s32 arg0, s32 arg1) {
func_80250170(0, 0x6A, 0);
Me.state = 0;
if ((map_get() == MAP_1C_MMM_CHURCH) && (arg1 == 2)) {
if ((gsworld_get_map() == MAP_1C_MMM_CHURCH) && (arg1 == 2)) {
Me.motzhand_marker = NULL;
Me.pattern = 0;
src/MMM/code_3D50.c
+1 -1
View File
@@ -219,7 +219,7 @@ void func_8038A9B4(void){
MMM_D_8038C510.unk8 = 0;
if(map_get() == MAP_24_MMM_TUMBLARS_SHED){
if(gsworld_get_map() == MAP_24_MMM_TUMBLARS_SHED){
MMM_D_8038C510.unkC = NULL;
MMM_D_8038C510.unk0 = mapModel_getModel(0);
MMM_D_8038C510.unk4 = NULL;
src/TTC/ma/castle.c
+2 -2
View File
@@ -516,7 +516,7 @@ void maCastle_init(void)
void *sp2C;
void *sp28;
if( map_get() == MAP_7_TTC_TREASURE_TROVE_COVE
if( gsworld_get_map() == MAP_7_TTC_TREASURE_TROVE_COVE
&& levelSpecificFlags_get(LEVEL_FLAG_2_TTC_UNKNOWN)
){
sp2C = func_8034C5AC(0x12C);
@@ -526,7 +526,7 @@ void maCastle_init(void)
}
}
sMapState.model1 = 0;
if (map_get() != MAP_A_TTC_SANDCASTLE)
if (gsworld_get_map() != MAP_A_TTC_SANDCASTLE)
{
__maCastle_setsecretCheatCodeRelatedValue();
}
src/core1/code_CE60.c
+2 -2
View File
@@ -85,7 +85,7 @@ void core1_ce60_func_8024AAB0(void) {
if (0 <= sTrackId[1])
sTrackId[3] = gcMusic_getDefaultVolumeForTrack(sTrackId[1]);
switch (map_get()) {
switch (gsworld_get_map()) {
case MAP_7_TTC_TREASURE_TROVE_COVE:
sTrackId[2] = ml_map_f(4700 - sPlayerPosition[1], 0.0f, 900.0f, 0.0f, sTrackId[2]);
sTrackId[3] = ml_map_f(4700 - sPlayerPosition[1], 0.0f, 900.0f, sTrackId[3], 0.0f);
@@ -200,7 +200,7 @@ void core1_ce60_func_8024AF48(void) {
player_getPosition_s32(sPlayerPosition);
core1_ce60_func_8024AAB0();
switch(map_get()){
switch(gsworld_get_map()){
case MAP_2_MM_MUMBOS_MOUNTAIN:
if (core1_ce60_isPlayerInRange(-4450, 4550, 1900) || core1_ce60_isPlayerInRange(-6007, 6176, 620)) {
core1_ce60_setChanMask(0x1cc0);
src/core1/musicplayer.c
+1 -1
View File
@@ -433,7 +433,7 @@ void playMusic(enum comusic_e comusic_id, s32 volume, s32 forceReInit) {
if (track->track_id < 0 || forceReInit) {
switch (comusic_id) {
case COMUSIC_15_EXTRA_LIFE_COLLECTED:
if (map_get() == MAP_10_BGS_MR_VILE) {
if (gsworld_get_map() == MAP_10_BGS_MR_VILE) {
break;
}
case COMUSIC_3B_MINIGAME_VICTORY:
src/core2/abilityprogress.c
+4 -4
View File
@@ -38,19 +38,19 @@ void ability_use(enum ability_used ability) {
break;
case ABILITY_USED_SWIM:
if (map_get() == MAP_1_SM_SPIRAL_MOUNTAIN) {
if (gsworld_get_map() == MAP_1_SM_SPIRAL_MOUNTAIN) {
dialog_id = ASSET_DFC_BOTTLES_UNDERWATER_TUTORIAL;
}
break;
case ABILITY_USED_CLIMB:
if (map_get() == MAP_1_SM_SPIRAL_MOUNTAIN) {
if (gsworld_get_map() == MAP_1_SM_SPIRAL_MOUNTAIN) {
dialog_id = ASSET_E02_DIALOG_BOTTLES_CLIMB_OTHER;
}
break;
case ABILITY_USED_BEAK_BARGE:
if (map_get() == MAP_1_SM_SPIRAL_MOUNTAIN) {
if (gsworld_get_map() == MAP_1_SM_SPIRAL_MOUNTAIN) {
dialog_id = ASSET_E05_DIALOG_BOTTLES_KAZOOIE_BARGE;
}
break;
@@ -58,7 +58,7 @@ void ability_use(enum ability_used ability) {
case ABILITY_USED_SLIDE:
play_ding = FALSE;
if (!ability_isUnlocked(ABILITY_10_TALON_TROT)) {
if (map_get() == MAP_2_MM_MUMBOS_MOUNTAIN) {
if (gsworld_get_map() == MAP_2_MM_MUMBOS_MOUNTAIN) {
dialog_id = ASSET_B4D_DIALOG_BOTTLES_SLIPPERY;
} else {
return;
src/core2/anctrl.c
+1 -1
View File
@@ -296,7 +296,7 @@ s32 anctrl_8028780C(f32 position[3], s32 arg1){
void anctrl_drawSetup(AnimCtrl *this, f32 *position, s32 arg2){
s32 map;
map = map_get();
map = gsworld_get_map();
if( map != MAP_1E_CS_START_NINTENDO
&& map != MAP_1F_CS_START_RAREWARE
&& map != MAP_20_CS_END_NOT_100
src/core2/anseq.c
+2 -2
View File
@@ -54,8 +54,8 @@ void __anSeq_func_80289F4(s32 arg0) {
s32 phi_a3;
phi_a3 = arg0 >> 0x10;
if( !(phi_a3 == 0xF2 && map_get() == MAP_91_FILE_SELECT && gameSelect_getGameNumber() != 0)
&& !((phi_a3 == 0x21 || phi_a3 == 0x3ED) && map_get() == MAP_91_FILE_SELECT && (gameSelect_getGameNumber() == 1))
if( !(phi_a3 == 0xF2 && gsworld_get_map() == MAP_91_FILE_SELECT && gameSelect_getGameNumber() != 0)
&& !((phi_a3 == 0x21 || phi_a3 == 0x3ED) && gsworld_get_map() == MAP_91_FILE_SELECT && (gameSelect_getGameNumber() == 1))
){
gcsfx_playWithPitch(phi_a3, (f32) ((f64) ((arg0 >> 8) & 0xFF) * 0.0078125), (s32) ((f64) (arg0 & 0xFF) * 128.0));
}
src/core2/ba/anim.c
+1 -1
View File
@@ -121,7 +121,7 @@ void __baanim_applyBottlesBonus(s32 arg0, s32 arg1) {
boneTransformList_setBoneScale(arg0, 0x64, scale);
boneTransformList_setBoneScale(arg0, 0x67, scale);
}
if (map_get() == MAP_A_TTC_SANDCASTLE) {
if (gsworld_get_map() == MAP_A_TTC_SANDCASTLE) {
if ((D_8037BF4C & BAANIM_WISHYWASHY) && (player_getTransformation() != TRANSFORM_7_WISHWASHY)) {
func_8028FB88(TRANSFORM_7_WISHWASHY);
}
src/core2/ba/marker.c
+5 -5
View File
@@ -111,10 +111,10 @@ void __baMarker_8028B7F4(void){
void __baMarker_8028B848(void){
s32 s0 = 0;
if(map_get() == MAP_69_GL_MM_LOBBY){
if(gsworld_get_map() == MAP_69_GL_MM_LOBBY){
s0 = ASSET_E57_DIALOG_FIRST_JIGGY;
}
else if(map_get() == MAP_2_MM_MUMBOS_MOUNTAIN){
else if(gsworld_get_map() == MAP_2_MM_MUMBOS_MOUNTAIN){
s0 = ASSET_B45_DIALOG_JIGGY_COLLECT_10;
}
@@ -596,7 +596,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
if(__baMarker_8028BC20(marker))
return;
if( map_get() == MAP_8E_GL_FURNACE_FUN
if( gsworld_get_map() == MAP_8E_GL_FURNACE_FUN
&& volatileFlag_get(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ)
&& !fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)
){
@@ -613,7 +613,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
case MARKER_169_SNS_EGG: //L8028C908
{ //ONLY THIS CASE DOESN'T MATCH
switch (map_get())
switch (gsworld_get_map())
{
case MAP_1D_MMM_CELLAR: //L8028C95C
sns_set_item_and_update_payload(SNS_ITEM_EGG_CYAN, 0, 1);
@@ -708,7 +708,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
case MARKER_61_EXTRA_LIFE: //L8028CD50
if(__baMarker_8028BC20(marker))
return;
if( map_get() == MAP_8E_GL_FURNACE_FUN
if( gsworld_get_map() == MAP_8E_GL_FURNACE_FUN
&& volatileFlag_get(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ)
&& !fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)
){
src/core2/babounds.c
+42
View File
@@ -0,0 +1,42 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "core2/ba/physics.h"
/* .bss */
struct{
f32 max[3];
f32 min[3];
u8 attempted_return;
} D_8037C3C0;
/* .code */
void babounds_init(void){
s32 max[3];
s32 min[3];
mapModel_getBounds(min, max);
ml_vec3w_to_vec3f(D_8037C3C0.min, min);
ml_vec3w_to_vec3f(D_8037C3C0.max, max);
D_8037C3C0.min[0] -= 400.0f;
D_8037C3C0.min[1] = -8000.0f;
D_8037C3C0.min[2] -= 400.0f;
D_8037C3C0.max[0] += 400.0f;
D_8037C3C0.max[1] += 1000.0f;
D_8037C3C0.max[2] += 400.0f;
D_8037C3C0.attempted_return = 0;
}
void babounds_update(void){
f32 sp1C[3];
_player_getPosition(sp1C);
if(!ml_vec3f_inside_box_vec3f(sp1C, D_8037C3C0.min, D_8037C3C0.max)){
if(D_8037C3C0.attempted_return == 0){
D_8037C3C0.attempted_return = 1;
func_8029B6F0();
}
else{
baphysics_set_type(BA_PHYSICS_FREEZE);
}
}
}
src/core2/balookat.c
+107
View File
@@ -0,0 +1,107 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
typedef enum {
BA_LOOKAT_STATE_0_NONE,
BA_LOOKAT_STATE_1_UNKNOWN,
BA_LOOKAT_STATE_2_UNKNOWN,
BA_LOOKAT_STATE_3_UNKNOWN,
BA_LOOKAT_STATE_4_UNKNOWN,
} BaLookAtState;
typedef struct{
u8 state;
u8 lookat;
f32 position[3]; // position
}BaLookAt;
/* .bss */
BaLookAt s_lookat_stack[8];
u8 s_length;
u8 s_lookat_state;
/* .code */
int balookat_try_get_position(f32 arg0[3]){
if(!s_lookat_stack[s_length - 1].lookat)
return 0;
ml_vec3f_copy(arg0, s_lookat_stack[s_length - 1].position);
return 1;
}
BaLookAtState balookat_getState(void){
if(!s_length){
return 0;
}
return s_lookat_stack[s_length - 1].state;
}
void balookat_init(void){
s_lookat_state = 0;
s_length = 0;
}
void balookat_pop(void){
if(s_length){
s_length--;
if(s_length == 0){
baiFrame_startWithValue(1.2f);
s_lookat_state = 0;
}
}
}
void balookat_push(BaLookAtState state){
s_lookat_stack[s_length].state = state;
s_lookat_stack[s_length].lookat = FALSE;
ml_vec3f_clear(s_lookat_stack[s_length].position);
s_length++;
}
void balookat_set_position(f32 position[3]){
s_lookat_stack[s_length-1].lookat = TRUE;
ml_vec3f_copy(s_lookat_stack[s_length-1].position, position);
}
void balookat_update_state(BaLookAtState state){
int val = 0;
switch(state){
case 1:
if(bs_checkInterrupt(BS_INTR_1E) == 2)
val = 1;
break;
case 2:
if(bs_checkInterrupt(BS_INTR_1C) == 2)
val = 1;
break;
case 3:
if(bs_checkInterrupt(BS_INTR_1D) == 2)
val = 1;
break;
case 4:
if(bs_checkInterrupt(BS_INTR_25) == 2)
val = 1;
break;
default:
val = 1;
break;
}
if(val)
s_lookat_state = state;
}
void balookat_end(void){
if(s_length != 0)
s_lookat_state = 0;
}
void balookat_update(void){
s32 tmp;
if(s_length){
tmp = s_lookat_stack[s_length-1].state;
if(s_lookat_state != tmp){
balookat_update_state(tmp);
}
}
}
src/core2/bs/ant.c
+2 -2
View File
@@ -397,7 +397,7 @@ void bsant_die_init(void){
baphysics_set_gravity(-1200.0f);
pitch_setAngVel(1000.0f, 12.0f);
func_802914CC(0xd);
ncDynamicCamD_func_802BF2C0(30.0f);
ncbadie_func_802BF2C0(30.0f);
func_8029C984();
bsant_substate = 0;
baMarker_collisionOff();
@@ -463,7 +463,7 @@ void func_8029F3F4(void){
func_802B3A50();
func_80299628(0);
func_8029C6D0();
if(!func_80298850())
if(!balookat_getState())
sp1C = BS_35_ANT_IDLE;
bs_setState(sp1C);
src/core2/bs/bFly.c
+8 -8
View File
@@ -11,7 +11,7 @@
extern void baModel_setYDisplacement(f32);
extern f32 bastick_getX(void);
extern void ncDynamicCam4_func_802BFE50(f32, f32, f32);
extern void ncbafly_func_802BFE50(f32, f32, f32);
extern void func_80354030(f32[3], f32);
extern BKCollisionTri *func_8029463C(void);
@@ -336,7 +336,7 @@ void func_802A3F9C(void){
pitch_setIdeal(sp1C[0]);
func_8029E070(1);
func_802914CC(4);
ncDynamicCam4_func_802BFE74(1);
ncbafly_func_802BFE74(1);
func_802A3430();
FUNC_8030E624(SFX_52_BANJO_YAH_OH, 1.0f, 28000);
D_8037D345 = 0;
@@ -579,7 +579,7 @@ void func_802A48B4(void) {
if (item_getCount(ITEM_14_HEALTH) == 0) {
func_8029C984();
func_8029151C(0xD);
ncDynamicCamD_func_802BF2C0(30.0f);
ncbadie_func_802BF2C0(30.0f);
func_8029B930();
batimer_set(0, 2.5f);
D_8037D344 = 2;
@@ -648,7 +648,7 @@ void func_802A4A78(s32 arg0) {
baphysics_set_target_horizontal_velocity(velocity);
baphysics_set_target_yaw(sp28);
baphysics_set_horizontal_velocity(sp28, baphysics_get_target_horizontal_velocity());
if ((arg0 == 1) && (map_get() == MAP_90_GL_BATTLEMENTS)) {
if ((arg0 == 1) && (gsworld_get_map() == MAP_90_GL_BATTLEMENTS)) {
yaw_setIdeal(mlNormalizeAngle(sp28));
yaw_applyIdeal();
}
@@ -658,7 +658,7 @@ void func_802A4A78(s32 arg0) {
baphysics_set_terminal_velocity(-4000.0f);
func_8029E070(1);
func_802914CC(4);
ncDynamicCam4_func_802BFE50(12.0f, 10000.0f, 800.0f);
ncbafly_func_802BFE50(12.0f, 10000.0f, 800.0f);
baMarker_collisionOff();
func_802A3430();
}
@@ -725,7 +725,7 @@ void func_802A4D90(void) {
baphysics_set_target_horizontal_velocity(1300.0f);
baphysics_set_target_yaw(sp34);
baphysics_set_horizontal_velocity(sp34, baphysics_get_target_horizontal_velocity());
if (map_get() == MAP_90_GL_BATTLEMENTS) {
if (gsworld_get_map() == MAP_90_GL_BATTLEMENTS) {
yaw_setIdeal(mlNormalizeAngle(sp34));
yaw_applyIdeal();
}
@@ -734,7 +734,7 @@ void func_802A4D90(void) {
baphysics_set_gravity(-1800.0f);
baMarker_collisionOff();
func_802914CC(4);
ncDynamicCam4_func_802BFE50(12.0f, 10000.0f, 800.0f);
ncbafly_func_802BFE50(12.0f, 10000.0f, 800.0f);
}
void func_802A4EC8(void) {
@@ -774,7 +774,7 @@ void func_802A4FC8(void) {
if (anctrl_isAt(baanim_getAnimCtrlPtr(), 0.1358f) != 0) {
func_8030EBC8(SFX_2_CLAW_SWIPE, 0.6f, 0.7f, 10000, 12000);
}
if (func_80298850() == 0) {
if (balookat_getState() == 0) {
next_state = BS_24_FLY;
}
bs_setState(next_state);
src/core2/bs/bLongLeg.c
+1 -1
View File
@@ -478,7 +478,7 @@ void func_802A63F0(void){
func_8029C6D0();
func_80299628(1);
if(func_80298850() == 0)
if(balookat_getState() == 0)
next_state = BS_26_LONGLEG_IDLE;
if(func_802A51D0())
src/core2/bs/bSwim.c
+18 -19
View File
@@ -65,7 +65,7 @@ void func_802A7304() {
bool func_802A73BC(void) {
f32 sp1C;
sp1C = (map_get() == MAP_46_CCW_WINTER) ? 90.0f : 130.0f;
sp1C = (gsworld_get_map() == MAP_46_CCW_WINTER) ? 90.0f : 130.0f;
return floor_isCurrentFloorunk59() && player_getYPosition() > (floor_getCurrentFloorYPosition() - sp1C);
}
@@ -90,10 +90,10 @@ bool bsbswim_inSet(enum bs_e move_id){
|| move_id == BS_2C_DIVE_B
|| move_id == BS_39_DIVE_A
|| move_id == BS_30_DIVE_ENTER
|| move_id == BS_78_DIVE_LOCKED
|| move_id == BS_78_DIVE_LOOKAT_DRONE
|| move_id == BS_7F_DIVE_OW
|| move_id == BS_54_SWIM_DIE
|| move_id == BS_97_DIVE_LOCKED
|| move_id == BS_97_DIVE_DRONE
;
}
@@ -286,7 +286,7 @@ void func_802A7BD0(void) {
f32 sp30[3];
f32 sp24[3];
func_80298760(func_80296560());
barebound_set_active(func_80296560());
baanim_playForDuration_onceSmooth(0x1A0, 1.4f);
basfx_playOwSfx(1.0f);
_player_getPosition(sp30);
@@ -294,7 +294,7 @@ void func_802A7BD0(void) {
func_80257F18(sp24, sp30, &sp3C);
yaw_setIdeal(mlNormalizeAngle(sp3C));
yaw_applyIdeal();
baphysics_set_target_horizontal_velocity(func_802987D4());
baphysics_set_target_horizontal_velocity(barebound_get_horizontal_velocity());
baphysics_set_target_yaw(sp3C);
baphysics_set_horizontal_velocity(sp3C, baphysics_get_target_horizontal_velocity());
func_8029C7F4(1, 1, 2, BA_PHYSICS_LOCKED_ROTATION);
@@ -387,7 +387,7 @@ void func_802A7F4C(void){
void func_802A7F6C(void) {
D_8037D394 = BOOL(bs_getPrevState() == BS_41_DIE);
if (D_8037D394 || level_get() == LEVEL_9_RUSTY_BUCKET_BAY || map_get() == MAP_46_CCW_WINTER) {
if (D_8037D394 || level_get() == LEVEL_9_RUSTY_BUCKET_BAY || gsworld_get_map() == MAP_46_CCW_WINTER) {
D_8037D395 = 0;
} else {
D_8037D395 = 1;
@@ -444,7 +444,7 @@ void func_802A8098(void) {
}
if (batimer_isAt(1, 1.9f)) {
func_802914CC(0xD);
ncDynamicCamD_func_802BF2C0(80.0f);
ncbadie_func_802BF2C0(80.0f);
if (D_8037D394) {
batimer_set(0, 0.5f);
} else {
@@ -473,12 +473,12 @@ void func_802A82D4(void) {
func_802A75B0();
}
void func_802A8330(void) {
void __bsbswim_update_rotation(void) {
f32 sp44[3];
f32 sp38[3];
f32 sp2C[3];
if (func_80298850() && func_80298800(sp2C)) {
if (balookat_getState() && balookat_try_get_position(sp2C)) {
_player_getPosition(sp44);
func_8025727C(sp44[0], sp44[1], sp44[2], sp2C[0], sp2C[1], sp2C[2], &sp38[0], &sp38[1]);
pitch_setIdeal(sp38[0]);
@@ -487,28 +487,27 @@ void func_802A8330(void) {
}
}
void func_802A83C0(void) {
void bsbswim_lookat_init(void) {
baanim_playForDuration_loopSmooth(0x70, 2.0f);
func_802A7140();
baphysics_set_target_velocity(0);
baphysics_set_acceleration(0.4f);
func_802A744C();
func_802A8330();
__bsbswim_update_rotation();
}
void func_802A8410(void) {
void bsbswim_lookat_update(void) {
s32 next_state;
next_state = 0;
if (func_80298850() == 0) {
if (balookat_getState() == 0) {
next_state = BS_2B_DIVE_IDLE;
}
func_802A8330();
__bsbswim_update_rotation();
bs_setState(next_state);
}
void func_802A844C(void){
void bsbswim_lookat_end(void){
func_802A75B0();
}
@@ -575,16 +574,16 @@ void func_802A872C(void){
func_802A75B0();
}
void func_802A874C(void){
void bsbswim_drone_init(void){
func_802A744C();
bsdrone_init();
}
void func_802A8774(void){
void bsbswim_drone_update(void){
bsdrone_update();
}
void func_802A8794(void){
void bsbswim_drone_end(void){
bsdrone_end();
func_802A75B0();
}
src/core2/bs/bTrot.c
+7 -7
View File
@@ -692,7 +692,7 @@ void bsbtrot_unk79_update(void){
func_8029C6D0();
func_802A8AD8();
func_80299628(1);
if(!func_80298850())
if(!balookat_getState())
sp1C = BS_15_BTROT_IDLE;
bs_setState(sp1C);
}
@@ -708,7 +708,7 @@ void bsbtrot_ow_init(void){
f32 sp24[3];
func_802A8A40();
func_80298760(func_80296560());
barebound_set_active(func_80296560());
baanim_playForDuration_onceSmooth(ASSET_66_ANIM_BSBTROT_OW, 1.1f);
basfx_playOwSfx(1.0f);
_player_getPosition(sp30);
@@ -716,21 +716,21 @@ void bsbtrot_ow_init(void){
func_80257F18(sp24, sp30, &sp3C);
yaw_setIdeal(mlNormalizeAngle(sp3C + 180.0f));\
yaw_applyIdeal();
baphysics_set_target_horizontal_velocity(func_802987D4());
baphysics_set_target_horizontal_velocity(barebound_get_horizontal_velocity());
baphysics_set_target_yaw(sp3C);
baphysics_set_horizontal_velocity(sp3C, baphysics_get_target_horizontal_velocity());
func_8029C7F4(1,1,2, BA_PHYSICS_LOCKED_ROTATION);
if(func_802987B4() == 2)
if(barebound_802987B4() == 2)
baphysics_set_type(BA_PHYSICS_AIRBORN);
baphysics_set_vertical_velocity(func_802987C4());
baphysics_set_gravity(func_802987E4());
baphysics_set_vertical_velocity(barebound_get_vertical_velocity());
baphysics_set_gravity(barebound_get_gravity());
baMarker_collisionOff();
baeyes_close();
}
void bsbtrot_ow_update(void){
enum bs_e sp1C = 0;
if(func_802987B4() == 2)
if(barebound_802987B4() == 2)
func_802B6FA8();
if(baanim_isAt(0.3f))
src/core2/bs/bWhirl.c
+1 -1
View File
@@ -294,7 +294,7 @@ void func_802AAE08(void){
enum bs_e sp1C =0;
__bsbwhirl_spawnSparkle();
func_8029C6D0();
if(!func_80298850())
if(!balookat_getState())
sp1C = BS_1B_WONDERWING_IDLE;
bs_setState(sp1C);
src/core2/bs/beeFly.c
+2 -2
View File
@@ -11,7 +11,7 @@ f32 bastick_distance(void);
f32 bastick_getAngleRelativeToBanjo(void);
void baModel_setYDisplacement(f32);
void ncDynamicCam4_func_802BFE50(f32, f32, f32);
void ncbafly_func_802BFE50(f32, f32, f32);
void yaw_setVelocityBounded(f32, f32);
f32 bastick_getX(void);
f32 bastick_getY(void);
@@ -121,7 +121,7 @@ void _bsBeeFly_updateYaw(void){
f32 sp30;
f32 stickX;
stickX = bastick_getX();
ncDynamicCam4_func_802BFE50(2.0f, 2000.0f, 350.0f);
ncbafly_func_802BFE50(2.0f, 2000.0f, 350.0f);
if(bakey_held(BUTTON_R)){
yaw_setVelocityBounded(500.0f, 30.0f);
sp34 = 6.0f;
src/core2/bs/beeMain.c
+4 -4
View File
@@ -8,7 +8,7 @@
f32 func_8029B41C(void);
void func_80299628(s32);
void yaw_applyIdeal(void);
void ncDynamicCamD_func_802BF2C0(f32);
void ncbadie_func_802BF2C0(f32);
f32 baanim_getTimer(void);
void baanim_setEndAndDuration(f32, f32);
@@ -423,7 +423,7 @@ void bsbeemain_die_init(void){
baMarker_collisionOff();
baeyes_close();
func_802914CC(0xd);
ncDynamicCamD_func_802BF2C0(30.0f);
ncbadie_func_802BF2C0(30.0f);
func_8029C984();
func_8030E58C(SFX_36_BANJO_DOH, 1.8f);
batimer_set(0, 2.9f);
@@ -491,7 +491,7 @@ void func_802A1FC8(void){
func_802B3A50();
func_80299628(0);
func_8029C6D0();
if(!func_80298850()){
if(!balookat_getState()){
sp1C = BS_85_BEE_IDLE;
}
bs_setState(sp1C);
@@ -509,7 +509,7 @@ void func_802A2054(void){
func_8025A2FC(-1, 0xFA0);
core1_ce60_incOrDecCounter(TRUE);
func_80291548();
func_80298A64();
balookat_end();
}
void func_802A2098(void){
src/core2/bs/climb.c
+2 -2
View File
@@ -144,7 +144,7 @@ void bsclimb_move_update(void){
bafalldamage_start();
func_802AB5C0();
map = map_get();
map = gsworld_get_map();
if( map == MAP_B_CC_CLANKERS_CAVERN
|| map == MAP_1B_MMM_MAD_MONSTER_MANSION
@@ -204,7 +204,7 @@ void func_802ABCCC(void){
//bsclimb_unknown_9E_update
void func_802ABD0C(void){
s32 next_state = 0;
if(!func_80298850())
if(!balookat_getState())
next_state = BS_4F_CLIMB_IDLE;
bs_setState(next_state);
src/core2/bs/croc.c
+2 -2
View File
@@ -445,7 +445,7 @@ void bscroc_die_init(void){
baMarker_collisionOff();
baeyes_close();
func_802914CC(0xd);
ncDynamicCamD_func_802BF2C0(30.0f);
ncbadie_func_802BF2C0(30.0f);
func_8029C984();
func_8030E58C(SFX_36_BANJO_DOH, 1.8f);
batimer_set(0, 2.9f);
@@ -682,7 +682,7 @@ void bscroc_locked_update(void){
func_802B3A50();
func_80299628(0);
func_8029C6D0();
if(!func_80298850()){
if(!balookat_getState()){
next_state = BS_5E_CROC_IDLE;
}
src/core2/bs/die.c
+1 -1
View File
@@ -55,7 +55,7 @@ void bsdie_init(void){
pitch_setAngVel(1000.0f, 12.0f);
func_8029E070(1);
func_8029151C(0xd);
ncDynamicCamD_func_802BF2C0(30.0f);
ncbadie_func_802BF2C0(30.0f);
func_8029C984();
batimer_set(0,2.9f);
D_8037D414 = 0;
src/core2/bs/dronelook.c
+7 -7
View File
@@ -24,12 +24,12 @@ void bsDroneLook_init(void) {
baphysics_set_velocity(0);
ncDynamicCamera_enterFirstPerson();
__bsDroneLook_getEyePos(eye_position);
ncFirstPersonCamera_setZoomedOutPosition(eye_position);
ncba1p_setZoomedOutPosition(eye_position);
player_getRotation(eye_rotation);
eye_rotation[0] = 0.0f;
eye_rotation[1] += 180.0f;
eye_rotation[2] = 0.0f;
ncFirstPersonCamera_setZoomedOutRotation(eye_rotation);
ncba1p_setZoomedOutRotation(eye_rotation);
baflag_set(BA_FLAG_17_FIRST_PERSON_VIEW);
}
@@ -42,14 +42,14 @@ void bsDroneLook_update(void) {
next_state = 0;
dt = time_getDelta();
if (ncFirstPersonCamera_getState() == FIRSTPERSON_STATE_2_IDLE) {
if (ncba1p_getState() == FIRSTPERSON_STATE_2_IDLE) {
//camera is in "idle" state
ncFirstPersonCamera_getZoomedInRotation(eye_rotation);
ncba1p_getZoomedInRotation(eye_rotation);
eye_rotation[0] -= bastick_getY() * 90.0f * dt;
eye_rotation[1] -= bastick_getX() * 90.0f * dt;
eye_rotation[2] = 0.0f;
eye_rotation[0] = (eye_rotation[0] > 180.0f) ? ml_max_f(305.0f, eye_rotation[0]) : ml_min_f(70.0f, eye_rotation[0]);
ncFirstPersonCamera_setZoomedOutRotation(eye_rotation);
ncba1p_setZoomedOutRotation(eye_rotation);
yaw_setIdeal(eye_rotation[1] + 180.0f);
exit_first_person = FALSE;
@@ -70,12 +70,12 @@ void bsDroneLook_update(void) {
}
}
__bsDroneLook_getEyePos(eye_position);
ncFirstPersonCamera_setZoomedOutPosition(eye_position);
ncba1p_setZoomedOutPosition(eye_position);
bs_setState(next_state);
}
void bsDroneLook_end(void) {
if (func_80298850() == 0) {
if (balookat_getState() == 0) {
basfx_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000);
}
ncDynamicCamera_exitFirstPerson();
src/core2/bs/dronexform.c
+1 -1
View File
@@ -442,7 +442,7 @@ void bsdronexform_end(void){
func_8031B990(0xff,0xff,0xff);
func_802AFADC();
func_802B014C();
func_80298A64();
balookat_end();
baflag_clear(BA_FLAG_1B_TRANSFORMING);
}
src/core2/bs/jig.c
+3 -3
View File
@@ -117,7 +117,7 @@ void bsjig_jiggy_end(void){
transitionToMap(MAP_95_CS_END_ALL_100, 0, 1);
} else {//L802B0DFC
if( jiggyscore_total() == 2
&& map_get() == MAP_2_MM_MUMBOS_MOUNTAIN
&& gsworld_get_map() == MAP_2_MM_MUMBOS_MOUNTAIN
){
sp2C = VER_SELECT(0xb51, 0x96f, 0, 0);
sp28 = 0xe;
@@ -137,7 +137,7 @@ void bsjig_jiggy_end(void){
gcdialog_showDialog(sp2C, sp28, 0, 0, 0, 0);
}
}//L802B0EA4
func_80298A64();
balookat_end();
}
void bsjig_jiggy_interrupt(void){
@@ -164,7 +164,7 @@ void bsjig_notedoor_end(void){
func_8028F918(2);
transitionToMap(MAP_95_CS_END_ALL_100, 0, 1);
}
func_80298A64();
balookat_end();
}
void bsjig_notedoor_init(void){
src/core2/bs/pumpkin.c
+2 -2
View File
@@ -455,7 +455,7 @@ void bspumpkin_die_init(void) {
baphysics_set_gravity(-1200.0f);
pitch_setAngVel(1000.0f, 12.0f);
func_802914CC(0xD);
ncDynamicCamD_func_802BF2C0(30.0f);
ncbadie_func_802BF2C0(30.0f);
func_8029C984();
baMarker_collisionOff();
baeyes_close();
@@ -546,7 +546,7 @@ void func_802B34F8(void) {
next_state = 0;
func_802B3A50();
func_8029C6D0();
if (func_80298850() == 0) {
if (balookat_getState() == 0) {
next_state = BS_48_PUMPKIN_IDLE;
}
bs_setState(next_state);
src/core2/bs/rebound.c
+7 -7
View File
@@ -54,15 +54,15 @@ void func_802B360C(void) {
batimer_set(6, sp24);
} else {
func_802B35D0(0);
func_80298760(sp1C);
barebound_set_active(sp1C);
yaw_setIdeal(mlNormalizeAngle(sp28 + 180.0f));
baphysics_set_target_horizontal_velocity(func_802987D4());
baphysics_set_target_horizontal_velocity(barebound_get_horizontal_velocity());
baphysics_set_target_yaw(sp28);
baphysics_set_horizontal_velocity(sp28, baphysics_get_target_horizontal_velocity());
baphysics_set_vertical_velocity(func_802987C4());
baphysics_set_gravity(func_802987E4());
baphysics_set_vertical_velocity(barebound_get_vertical_velocity());
baphysics_set_gravity(barebound_get_gravity());
func_8029C7F4(1, 1, 2, BA_PHYSICS_LOCKED_ROTATION);
if (func_802987B4() == 2) {
if (barebound_802987B4() == 2) {
baphysics_set_type(BA_PHYSICS_AIRBORN);
}
}
@@ -80,7 +80,7 @@ void func_802B37DC(void) {
baphysics_set_velocity(velocity);
baphysics_set_target_horizontal_velocity(0.0f);
}
} else if (func_802987B4() == 2) {
} else if (barebound_802987B4() == 2) {
func_802B6FA8();
}
}
@@ -115,7 +115,7 @@ void func_802B3954(void) {
next_state = 0;
anim_ctrl = baanim_getAnimCtrlPtr();
if (batimer_decrement(0) && map_get() == MAP_93_GL_DINGPOT) {
if (batimer_decrement(0) && gsworld_get_map() == MAP_93_GL_DINGPOT) {
baMarker_collisionOn();
}
func_802B37DC();
src/core2/bs/rest.c
+9 -9
View File
@@ -9,9 +9,9 @@ void func_802B3A50(void) {
f32 plyr_pos[3];
f32 sp1C[3];
if (func_80298850()) {
if (balookat_getState()) {
_player_getPosition(plyr_pos);
if (func_80298800(sp1C) && func_80257F18(plyr_pos, sp1C, &sp34)) {
if (balookat_try_get_position(sp1C) && func_80257F18(plyr_pos, sp1C, &sp34)) {
yaw_setIdeal(sp34);
}
}
@@ -59,13 +59,13 @@ bool func_802B3BB0(void) {
if (baanim_isStopped() != 0) {
if (anctrl_isPlayedForwards(anim_ctrl) != 0) {
baanim_playForDuration_loopSmooth(ASSET_14A_ANIM_BSREST_LISTEN, 11.4f);
} else if (func_80298850() == 0) {
} else if (balookat_getState() == 0) {
sp20 = TRUE;
}
}
break;
case ASSET_14A_ANIM_BSREST_LISTEN:
if (func_80298850() == 0) {
if (balookat_getState() == 0) {
anctrl_reset(anim_ctrl);
anctrl_setDirection(anim_ctrl, 0);
anctrl_setIndex(anim_ctrl, 0x167);
@@ -76,7 +76,7 @@ bool func_802B3BB0(void) {
}
break;
default:
if (func_80298850() == 0) {
if (balookat_getState() == 0) {
sp20 = TRUE;
}
break;
@@ -101,7 +101,7 @@ void func_802B3D1C(void) {
next_state = 0;
if (player_inWater() != 0) {
next_state = BS_77_SWIM_LOCKED;
next_state = BS_77_SWIM_LOOKAT_DRONE;
}
if (func_802B3BB0() != 0) {
next_state = bs_getIdleState();
@@ -127,7 +127,7 @@ void func_802B3DBC(void) {
next_state = 0;
if (player_inWater() != 0) {
next_state = BS_77_SWIM_LOCKED;
next_state = BS_77_SWIM_LOOKAT_DRONE;
}
if (func_802B3BB0() != 0) {
next_state = bs_getIdleState();
@@ -155,12 +155,12 @@ void func_802B3E64(void) {
next_state = 0;
func_8029C6D0();
if (player_inWater()) {
next_state = BS_77_SWIM_LOCKED;
next_state = BS_77_SWIM_LOOKAT_DRONE;
}
if (func_802B3BB0()) {
next_state = bs_getIdleState();
}
if (map_get() == MAP_27_FP_FREEZEEZY_PEAK && baflag_isTrue(BA_FLAG_14_LOSE_BOGGY_RACE)) {
if (gsworld_get_map() == MAP_27_FP_FREEZEEZY_PEAK && baflag_isTrue(BA_FLAG_14_LOSE_BOGGY_RACE)) {
next_state = func_8029CA94(next_state);
}
bs_setState(next_state);
src/core2/bs/sled.c
+12 -5
View File
@@ -7,7 +7,7 @@
ActorMarker *bssled_gSledMarker;
/* .code */
void func_802B3F20(void){
void __bssled_linkSledMarker(void){
Actor *sled;
bssled_gSledMarker = func_80296554();
@@ -15,7 +15,7 @@ void func_802B3F20(void){
sled->unk138_20 = TRUE;
}
void func_802B3F60(void){
void __bssled_unlinkSledMarker(void){
Actor *sled;
if(bssled_gSledMarker != NULL){
sled = marker_getActor(bssled_gSledMarker);
@@ -25,12 +25,16 @@ void func_802B3F60(void){
}
void bssled_init(void){
func_802B3F20();
__bssled_linkSledMarker();
baanim_playForDuration_loopSmooth(ASSET_228_ANIM_BANJO_SLED, 1.8f);
func_8029C7F4(1, 1, 3, BA_PHYSICS_FREEZE);
baphysics_set_target_horizontal_velocity(0.0f);
func_80294A8C(0);
func_80294378(6);
#if VERSION != VERSION_USA_1_0
baMarker_8028D638(0x34, 0x30);
#endif
}
void bssled_update(void){
@@ -43,14 +47,17 @@ void bssled_update(void){
void bssled_end(void){
func_80294A8C(1);
func_80294378(1);
func_802B3F60();
__bssled_unlinkSledMarker();
roll_setIdeal(0.0f);
pitch_setIdeal(0.0f);
#if VERSION != VERSION_USA_1_0
baMarker_8028D638(0, 0);
#endif
}
void bssled_interrupt(void){
if(bs_getInterruptType() == BS_INTR_28){
func_802B3F60();
__bssled_unlinkSledMarker();
bs_setInterruptResponse(2);
}
else{
src/core2/bs/stand.c
+4 -6
View File
@@ -51,16 +51,16 @@ u32 func_802B4870(u32 arg0){
s32 func_802B488C(s32 arg0){
s32 retVal = arg0;
switch(bastick_getZone()){
case 1: //L802B48CC
case 1:
retVal = BS_WALK_CREEP;
break;
case 2: //L802B48D4
case 2:
retVal = BS_2_WALK_SLOW;
break;
case 3: //L802B48D4
case 3:
retVal = BS_WALK;
break;
case 4: //L802B48D4
case 4:
retVal = BS_4_WALK_FAST;
break;
}
@@ -278,13 +278,11 @@ void bsstand_end(void){
baeyes_open();
}
//bsStand_Land_init
void bsstand_landing_init(void){
func_8029C7F4(1,1,1, BA_PHYSICS_NORMAL);
baphysics_set_target_horizontal_velocity(0.0f);
}
//bsStand_Land_update
void bsstand_landing_update(void){
s32 sp1C = 0;
AnimCtrl * sp18 = baanim_getAnimCtrlPtr();
src/core2/bs/swim.c
+42 -41
View File
@@ -31,7 +31,7 @@ s16 bsSwimAnimations[10] = {
u32 bsSwimCurrentAnimation;
/* .code */
void func_802B5480(void) {
void __bsswim_createBubble(void) {
f32 bubble_spawn_position[3];
ParticleEmitter *bubble_emitter;
@@ -47,7 +47,7 @@ void func_802B5480(void) {
}
}
void func_802B5538(AnimCtrl *arg0) {
void __bsswim_updateIdleAnimation(AnimCtrl *arg0) {
enum asset_e sp24;
sp24 = bsSwimAnimations[bsSwimCurrentAnimation];
@@ -62,7 +62,7 @@ void func_802B5538(AnimCtrl *arg0) {
}
}
void func_802B55DC(void) {
void __bsswim_updateVelocity(void) {
f32 sp1C;
sp1C = bastick_getZonePosition();
@@ -73,10 +73,10 @@ void func_802B55DC(void) {
baphysics_set_target_horizontal_velocity(ml_interpolate_f(sp1C, bsSwimHorzVelocityMin, bsSwimHorzVelocityMax));
}
void swim_enteredWater(void) {
void __bsswim_enteredWater(void) {
if (level_get() == LEVEL_9_RUSTY_BUCKET_BAY) {
progressDialog_showDialogMaskZero(FILEPROG_AB_SWIM_OILY_WATER);
} else if (map_get() == MAP_46_CCW_WINTER) {
} else if (gsworld_get_map() == MAP_46_CCW_WINTER) {
progressDialog_showDialogMaskZero(FILEPROG_DD_HAS_TOUCHED_CCW_ICY_WATER);
}
baphysics_set_gravity(100.0f);
@@ -87,7 +87,7 @@ void swim_enteredWater(void) {
}
void func_802B56D4(void) {
void __bsswim_end(void) {
if (!bsswim_inset(bs_getNextState())) {
baphysics_reset_terminal_velocity();
baphysics_reset_gravity();
@@ -100,12 +100,12 @@ bool bsswim_inset(enum bs_e state_id){
return state_id == BS_2D_SWIM_IDLE
|| state_id == BS_2E_SWIM
|| state_id == BS_4C_LANDING_IN_WATER
|| state_id == BS_77_SWIM_LOCKED
|| state_id == BS_96_SWIM_LOCKED
|| state_id == BS_77_SWIM_LOOKAT_DRONE
|| state_id == BS_96_SWIM_DRONE
;
}
void func_802B5774(void) {
void bsswim_idle_init(void) {
AnimCtrl *anim_ctrl;
s32 prev_state;
f32 transition_duration;
@@ -121,7 +121,7 @@ void func_802B5774(void) {
if (prev_state == BS_54_SWIM_DIE) {
basfx_80299CF4(SFX_AF_BANJO_CATCHING_BREATH, 1.0f, 30000);
} else {
basfx_80299CF4(SFX_AF_BANJO_CATCHING_BREATH, 1.0f, (s32) ml_map_f(item_getCount(ITEM_17_AIR), 3600.0f, 0.0f, 8000.0f, 30000.0f));
basfx_80299CF4(SFX_AF_BANJO_CATCHING_BREATH, 1.0f, (s32) ml_map_f(item_getCount(ITEM_17_AIR), (60.0f * FRAMERATE), 0.0f, 8000.0f, 30000.0f));
}
bainput_setDiveCooldown(4, 0.7f);
}
@@ -142,11 +142,12 @@ void func_802B5774(void) {
func_8029C7F4(1, 3, 3, BA_PHYSICS_NORMAL);
yaw_setVelocityBounded(500.0f, 5.0f);
baphysics_set_target_horizontal_velocity(0.0f);
swim_enteredWater();
__bsswim_enteredWater();
bsSwimCurrentAnimation = 0;
}
// #endif
void func_802B5950(void) {
void bsswim_idle_update(void) {
s32 next_state;
AnimCtrl *anim_ctrl;
@@ -156,13 +157,13 @@ void func_802B5950(void) {
func_8029C304(1);
}
if ((globalTimer_getTimeMasked(7) == 0) && ((f64) randf() < 0.5)) {
func_802B5480();
__bsswim_createBubble();
}
if (anctrl_isAt(anim_ctrl, 0.01f) != 0) {
func_8030EC20(SFX_DC_IDLE_PADDLING, 0.85f, 1.15f, 16000, 16000);
}
if (anctrl_isAt(anim_ctrl, 0.4348f) != 0) {
func_802B5538(anim_ctrl);
__bsswim_updateIdleAnimation(anim_ctrl);
}
if (bastick_getZone() == 1) {
next_state = BS_2E_SWIM;
@@ -185,11 +186,11 @@ void func_802B5950(void) {
bs_setState(next_state);
}
void func_802B5AF8(void){
func_802B56D4();
void bsswim_idle_end(void){
__bsswim_end();
}
void func_802B5B18(void) {
void bsswim_swim_init(void) {
AnimCtrl *anim_ctrl;
f32 anim_duration;
@@ -216,7 +217,7 @@ void func_802B5B18(void) {
baphysics_set_type(BA_PHYSICS_NORMAL);
}
void func_802B5C40(void) {
void bsswim_swim_update(void) {
s32 next_state;
AnimCtrl *anim_ctrl;
f32 sp1C[3];
@@ -235,7 +236,7 @@ void func_802B5C40(void) {
if (anctrl_isAt(anim_ctrl, 0.7f)) {
func_8030EB88(SFX_12_WATER_PADDLING_1, 0.9f, 1.1f);
}
func_802B55DC();
__bsswim_updateVelocity();
if (bastick_getZone() == 0) {
next_state = BS_2D_SWIM_IDLE;
}
@@ -262,57 +263,57 @@ void func_802B5C40(void) {
bs_setState(next_state);
}
void func_802B5E10(void){
func_802B56D4();
void bsswim_swim_end(void){
__bsswim_end();
}
void func_802B5E30(void) {
f32 sp34;
void __bsswim_update_rotation(void) {
f32 rotation;
f32 plyr_pos[3];
f32 sp1C[3];
f32 target_pos[3];
if (func_80298850() != 0) {
if (balookat_getState() != 0) {
_player_getPosition(plyr_pos);
if (func_80298800(sp1C) && func_80257F18(plyr_pos, sp1C, &sp34)) {
yaw_setIdeal(sp34);
if (balookat_try_get_position(target_pos) && func_80257F18(plyr_pos, target_pos, &rotation)) {
yaw_setIdeal(rotation);
}
}
}
void func_802B5E8C(void) {
baanim_playForDuration_loopSmooth(0x57, 1.2f);
void bsswim_lookat_init(void) {
baanim_playForDuration_loopSmooth(ASSET_57_ANIM_BSSWIM_IDLE, 1.2f);
func_8029C7F4(1, 3, 3, BA_PHYSICS_NORMAL);
yaw_setVelocityBounded(500.0f, 5.0f);
baphysics_set_target_horizontal_velocity(0.0f);
swim_enteredWater();
func_802B5E30();
__bsswim_enteredWater();
__bsswim_update_rotation();
}
void func_802B5EFC(void) {
void bsswim_lookat_update(void) {
enum bs_e next_state;
next_state = 0;
if (func_80298850() == 0) {
if (balookat_getState() == 0) {
next_state = BS_2D_SWIM_IDLE;
}
func_802B5E30();
__bsswim_update_rotation();
bs_setState(next_state);
}
void func_802B5F38(void){
func_802B56D4();
void bsswim_lookat_end(void){
__bsswim_end();
}
void func_802B5F58(void){
swim_enteredWater();
void bsswim_drone_init(void){
__bsswim_enteredWater();
bsdrone_init();
}
void func_802B5F80(void){
void bsswim_drone_update(void){
bsdrone_update();
}
void func_802B5FA0(void){
void bsswim_drone_end(void){
bsdrone_end();
func_802B56D4();
__bsswim_end();
}
src/core2/bs/timeout.c
+3 -3
View File
@@ -7,7 +7,7 @@
void baeyes_openSingleEye(s32, f32);
f32 func_8029B41C(void);
void ncDynamicCamD_func_802BF2C0(f32);
void ncbadie_func_802BF2C0(f32);
void func_802B6270(void){
baanim_playForDuration_once(ASSET_77_ANIM_BSTIMEOUT, 3.2f);
@@ -15,7 +15,7 @@ void func_802B6270(void){
baphysics_set_target_horizontal_velocity(0.0f);
func_802914CC(0xd);
yaw_setIdeal(func_8029B41C() + 35.0f);
ncDynamicCamD_func_802BF2C0(80.0f);
ncbadie_func_802BF2C0(80.0f);
func_8025A58C(0,0xfa0);
comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS);
core1_ce60_incOrDecCounter(FALSE);
@@ -56,7 +56,7 @@ void func_802B63F8(void){
baphysics_set_target_horizontal_velocity(0.0f);
func_802914CC(0xd);
yaw_setIdeal(func_8029B41C() + 35.0f);
ncDynamicCamD_func_802BF2C0(80.0f);
ncbadie_func_802BF2C0(80.0f);
func_8025A58C(0,0xfa0);
comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS);
core1_ce60_incOrDecCounter(FALSE);
src/core2/bs/walrus.c
+8 -7
View File
@@ -6,6 +6,7 @@
#include "core2/ba/timer.h"
extern void func_8029AD68(f32, s32);
extern ParticleEmitter *func_802F1EC8(f32 *);
int bswalrus_inSet(enum bs_e state);
@@ -371,7 +372,7 @@ static void __bswalrus_recoil_init(s32 damage){
f32 sp30[3];
f32 sp24[3];
func_80298760(func_80296560());
barebound_set_active(func_80296560());
baanim_playForDuration_onceSmooth(0x19c, 1.0f);
if(damage == 1)
func_8030E58C(SFX_38_BANJO_AYE_1, 1.8f);
@@ -383,12 +384,12 @@ static void __bswalrus_recoil_init(s32 damage){
func_80257F18(sp24, sp30, &sp3C);
yaw_setIdeal(mlNormalizeAngle(sp3C + 180.0f));
yaw_applyIdeal();
baphysics_set_target_horizontal_velocity(func_802987D4());
baphysics_set_target_horizontal_velocity(barebound_get_horizontal_velocity());
baphysics_set_target_yaw(sp3C);
baphysics_set_horizontal_velocity(sp3C, baphysics_get_target_horizontal_velocity());
func_8029C7F4(1,1,2, BA_PHYSICS_LOCKED_ROTATION);
baphysics_set_vertical_velocity(func_802987C4());
baphysics_set_gravity(func_802987E4());
baphysics_set_vertical_velocity(barebound_get_vertical_velocity());
baphysics_set_gravity(barebound_get_gravity());
baMarker_collisionOff();
baeyes_close();
func_802B8110();
@@ -465,7 +466,7 @@ void bswalrus_die_init(void){
baphysics_set_gravity(-1200.0f);
pitch_setAngVel(1000.0f, 12.0f);
func_802914CC(0xd);
ncDynamicCamD_func_802BF2C0(30.0f);
ncbadie_func_802BF2C0(30.0f);
func_8025AB00();
func_8025A2FC(0, 0xfa0);
comusic_playTrack(0x1A);
@@ -544,7 +545,7 @@ void func_802B9130(void){
func_802B3A50();
func_80299628(0);
func_8029C6D0();
if(!func_80298850())
if(!balookat_getState())
next_state = BS_7D_WALRUS_SLED;
bs_setState(next_state);
@@ -729,7 +730,7 @@ void bswalrus_timeout_init(void) {
func_8029C7F4(1, 1, 3, BA_PHYSICS_FREEZE);
baphysics_set_target_horizontal_velocity(0.0f);
func_802914CC(0xD);
ncDynamicCamD_func_802BF2C0(60.0f);
ncbadie_func_802BF2C0(60.0f);
func_8025A58C(0, 4000);
comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS);
core1_ce60_incOrDecCounter(FALSE);
src/core2/ch/beehive.c
+1 -1
View File
@@ -46,7 +46,7 @@ void chBeehive_update(Actor *this){
this->volatile_initialized = TRUE;
this->unk38_0 = volatileFlag_get(VOLATILE_FLAG_1)| volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE);
}//L802CE960
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK){
if(gsworld_get_map() == MAP_27_FP_FREEZEEZY_PEAK){
if(maSlalom_isActive()){
this->unk58_0 = 0;
return;
src/core2/ch/code_468E0.c
+3 -3
View File
@@ -45,7 +45,7 @@ void func_802CD8C0(Actor *this){
marker_despawn(this->marker);
return;
}
if(map_get() == MAP_26_MMM_NAPPERS_ROOM){
if(gsworld_get_map() == MAP_26_MMM_NAPPERS_ROOM){
if(fileProgressFlag_get(FILEPROG_1D_MMM_DINNING_ROOM_CUTSCENE)){
marker_despawn(this->marker);
return;
@@ -56,7 +56,7 @@ void func_802CD8C0(Actor *this){
}
}
//L802CD9C4
if(map_get() == MAP_8E_GL_FURNACE_FUN){
if(gsworld_get_map() == MAP_8E_GL_FURNACE_FUN){
if(fileProgressFlag_get(FILEPROG_F4_ENTER_FF_CUTSCENE)){
marker_despawn(this->marker);
return;
@@ -73,7 +73,7 @@ void func_802CD8C0(Actor *this){
this->marker->unk2C_2 = 0;
if(*(s32*)this->unkBC)
func_8028F918(0);
if(map_get() == MAP_8E_GL_FURNACE_FUN){
if(gsworld_get_map() == MAP_8E_GL_FURNACE_FUN){
mapSpecificFlags_set(4, TRUE);
}
else{
src/core2/ch/code_CFA60.c
+1 -1
View File
@@ -99,7 +99,7 @@ void func_80356CCC(Actor *this){
sp58 = ml_vec3f_distance(this->position, sp5C);
if( this->state == 1){
if( sp58 < this->scale*400.0f
&& (map_get() != MAP_3C_RBB_KITCHEN || this->position_z < sp5C[2])
&& (gsworld_get_map() != MAP_3C_RBB_KITCHEN || this->position_z < sp5C[2])
){
func_803569F0(this, 2);
}
src/core2/ch/collectible.c
+1 -1
View File
@@ -147,7 +147,7 @@ void chCollectible_update(Actor *this) {
func_8032AA58(this, 0.56f);
}
this->unk10_12 = -1;
this->unk38_0 = (map_get() == MAP_90_GL_BATTLEMENTS);
this->unk38_0 = (gsworld_get_map() == MAP_90_GL_BATTLEMENTS);
this->actor_specific_1_f = this->unk38_0 ? 0.0f : 255.0f;
this->initialized = TRUE;
}
src/core2/ch/crab.c
+4 -4
View File
@@ -182,7 +182,7 @@ void __chCrab_die(ActorMarker *marker, ActorMarker *other){
marker->collidable = FALSE;
this->unk138_27 = 1;
marker_despawn(marker);
if( map_get() == MAP_B_CC_CLANKERS_CAVERN
if( gsworld_get_map() == MAP_B_CC_CLANKERS_CAVERN
&& ml_vec3f_point_within_horizontal_distance(this->position, 13778.0f, 0.0f, 3000.0f)
) {
this->depth_mode = MODEL_RENDER_DEPTH_COMPARE;
@@ -240,7 +240,7 @@ void chCrab_update(Actor *this) {
this->has_met_before = FALSE;
this->volatile_initialized = TRUE;
anctrl_setTransitionDuration(this->anctrl, 0.25f);
if (map_get() == MAP_A_TTC_SANDCASTLE) {
if (gsworld_get_map() == MAP_A_TTC_SANDCASTLE) {
if (!jiggyscore_isCollected(JIGGY_10_TTC_SANDCASTLE)) {
mapSpecificFlags_set(1, 0);
}
@@ -260,7 +260,7 @@ void chCrab_update(Actor *this) {
func_80328FB0(this, 4.0f);
return;
}
if( (map_get() == MAP_B_CC_CLANKERS_CAVERN)
if( (gsworld_get_map() == MAP_B_CC_CLANKERS_CAVERN)
&& !mapSpecificFlags_get(0)
&& is_mutant_snippet
&& !jiggyscore_isCollected(JIGGY_16_CC_SNIPPETS)
@@ -274,7 +274,7 @@ void chCrab_update(Actor *this) {
this->has_met_before = TRUE;
}
}
if (map_get() == MAP_A_TTC_SANDCASTLE) {
if (gsworld_get_map() == MAP_A_TTC_SANDCASTLE) {
if( !mapSpecificFlags_get(0)
&& levelSpecificFlags_get(LEVEL_FLAG_2_TTC_UNKNOWN)
&& !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)
src/core2/ch/gameSelect.c
+2 -2
View File
@@ -690,13 +690,13 @@ void gameSelect_initAndUpdate(Actor * this){
void gameSelect_saveAndExit(void) {
s32 level_id = level_get();
s32 is_map_game_over = map_get() == MAP_83_CS_GAME_OVER_MACHINE_ROOM;
s32 is_map_game_over = gsworld_get_map() == MAP_83_CS_GAME_OVER_MACHINE_ROOM;
// Within bounds of levels. 0xD is 1 more than the amount of levels in the game.
s32 is_level_id_valid = (0 < level_id && level_id < 0xD);
if ((is_level_id_valid || is_map_game_over)
&& (gameNumber != -1 && !func_802E4A08() && map_get() != MAP_91_FILE_SELECT)) {
&& (gameNumber != -1 && !func_802E4A08() && gsworld_get_map() != MAP_91_FILE_SELECT)) {
gameFile_save(gameNumber);
gameFile_8033CFD4(gameNumber);
src/core2/ch/ghost.c
+1 -1
View File
@@ -305,7 +305,7 @@ void func_8035BD48(Actor *this){
marker_setCollisionScripts(this->marker, NULL, func_8035B3B4, func_8035B2C4);
mapSpecificFlags_set(3, FALSE);
mapSpecificFlags_set(4, FALSE);
if(map_get() == MAP_24_MMM_TUMBLARS_SHED){
if(gsworld_get_map() == MAP_24_MMM_TUMBLARS_SHED){
if( jiggyscore_isSpawned(JIGGY_62_MMM_TUMBLAR)
|| jiggyscore_isCollected(JIGGY_62_MMM_TUMBLAR)
){
src/core2/ch/icecube.c
+1 -1
View File
@@ -253,7 +253,7 @@ void chicecube_update(Actor *this){
f32 sp3C = time_getDelta();
f32 sp30[3];
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK){
if(gsworld_get_map() == MAP_27_FP_FREEZEEZY_PEAK){
if(maSlalom_isActive()){
actor_collisionOff(this);
this->unk58_0 = FALSE;
src/core2/ch/jiggy.c
+1 -1
View File
@@ -29,7 +29,7 @@ enum jiggy_e getJiggyId(Actor *this) {
s32 id;
s32 position[3];
id = map_get();
id = gsworld_get_map();
position[0] = (s32)this->position[0];
position[1] = (s32)this->position[1];
src/core2/ch/snowman.c
+5 -5
View File
@@ -186,7 +186,7 @@ void __chSnowman_deathCallback(ActorMarker *marker, ActorMarker *other_marker){
sfx_playFadeShorthandDefault(SFX_2F_ORANGE_SPLAT, 1.0f, 30000, actor->position, 1500, 4500);
__spawnQueue_add_1((GenFunction_1)__chSnowman_spawnHat, (s32)actor->marker);
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK)
if(gsworld_get_map() == MAP_27_FP_FREEZEEZY_PEAK)
maSnowy_decRemaining();
__chSnowman_spawnSnowballParticles(actor->position, 0xC);
marker_despawn(actor->marker);
@@ -195,7 +195,7 @@ void __chSnowman_deathCallback(ActorMarker *marker, ActorMarker *other_marker){
int __chSnowman_CCW_playerInProtectedZone(void){
static f32 ccw_no_attack_zone[3] = {350.0f, 600.0f, 65.0f};
f32 player_position[3];
if(map_get() == MAP_46_CCW_WINTER){
if(gsworld_get_map() == MAP_46_CCW_WINTER){
player_getPosition(player_position);
if(ml_vec3f_within_horizontal_distance(player_position, ccw_no_attack_zone, 900.0f))
return 1;
@@ -222,12 +222,12 @@ void chSnowman_update(Actor *this){
anctrl_setTransitionDuration(this->anctrl, 0.8f);
anctrl_setAnimTimer(this->anctrl, randf());
func_8032BC18(this);
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK){
if(gsworld_get_map() == MAP_27_FP_FREEZEEZY_PEAK){
local->unk0 = actorArray_findActorFromActorId(0x336)->marker;
maSnowy_incTotal();
}
}//L802E21D8
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK){
if(gsworld_get_map() == MAP_27_FP_FREEZEEZY_PEAK){
if(maSlalom_isActive() || func_8038DD14()){
actor_collisionOff(this);
this->unk58_0 = 0;
@@ -254,7 +254,7 @@ void chSnowman_update(Actor *this){
__chSnowman_enterDeath(this);
}
else if(
map_get() != MAP_27_FP_FREEZEEZY_PEAK
gsworld_get_map() != MAP_27_FP_FREEZEEZY_PEAK
|| func_8038DD34(local->unk0) == 0
|| fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME)
){//L802E2318
src/core2/ch/termite.c
+1 -1
View File
@@ -164,7 +164,7 @@ void chTermite_update(Actor *this) {
this->unk16C_0 = TRUE;
this->volatile_initialized = TRUE;
}
if( map_get() == MAP_C_MM_TICKERS_TOWER
if( gsworld_get_map() == MAP_C_MM_TICKERS_TOWER
&& !mapSpecificFlags_get(0)
&& subaddie_playerIsWithinSphereAndActive(this, 700)
&& !subaddie_playerIsWithinSphereAndActive(this, 150)
src/core2/code_11660.c
+1 -1
View File
@@ -24,7 +24,7 @@ s32 func_802985F0(void){
case TRANSFORM_1_BANJO: //80298654
default:
{
switch (map_get())
switch (gsworld_get_map())
{
case MAP_20_CS_END_NOT_100:
case MAP_7B_CS_INTRO_GL_DINGPOT_1:
src/core2/code_117D0.c
+38 -34
View File
@@ -2,57 +2,61 @@
#include "functions.h"
#include "variables.h"
typedef struct{
u8 id;
u8 unk1;
f32 vertical_velocity;
f32 gravity;
f32 horizontal_velocity;
}BaRebound;
/* .data */
struct50s D_80364450[] =
{
{0x01, 0x01, 510.0f, -1200.0f, 200.0f},
{0x02, 0x01, 600.0f, -1500.0f, 300.0f},
{0x03, 0x01, 510.0f, -1200.0f, 100.0f},
{0x04, 0x01, 510.0f, -1200.0f, 200.0f},
{0x05, 0x01, 510.0f, -1200.0f, 300.0f},
{0x06, 0x01, 510.0f, -1200.0f, 400.0f},
{0x07, 0x01, 510.0f, -1200.0f, 500.0f},
{0x08, 0x01, 600.0f, -1500.0f, 100.0f},
{0x09, 0x01, 600.0f, -1500.0f, 200.0f},
{0x0A, 0x01, 600.0f, -1500.0f, 300.0f},
{0x0B, 0x01, 600.0f, -1500.0f, 400.0f},
{0x0C, 0x01, 600.0f, -1500.0f, 500.0f},
{0x0D, 0x02, 300.0f, -1200.0f, 0.0f},
{0x0F, 0x01, 300.0f, -1200.0f, 0.0f},
{0x0E, 0x03, 300.0f, -1200.0f, 0.0f},
{0x10, 0x03, 300.0f, -1200.0f, 0.0f},
BaRebound s_rebound_list[] = {
{BA_REBOUND_1_UNK, 0x01, 510.0f, -1200.0f, 200.0f},
{BA_REBOUND_2_UNK, 0x01, 600.0f, -1500.0f, 300.0f},
{BA_REBOUND_3_UNK, 0x01, 510.0f, -1200.0f, 100.0f},
{BA_REBOUND_4_UNK, 0x01, 510.0f, -1200.0f, 200.0f},
{BA_REBOUND_5_UNK, 0x01, 510.0f, -1200.0f, 300.0f},
{BA_REBOUND_6_UNK, 0x01, 510.0f, -1200.0f, 400.0f},
{BA_REBOUND_7_UNK, 0x01, 510.0f, -1200.0f, 500.0f},
{BA_REBOUND_8_UNK, 0x01, 600.0f, -1500.0f, 100.0f},
{BA_REBOUND_9_UNK, 0x01, 600.0f, -1500.0f, 200.0f},
{BA_REBOUND_A_UNK, 0x01, 600.0f, -1500.0f, 300.0f},
{BA_REBOUND_B_UNK, 0x01, 600.0f, -1500.0f, 400.0f},
{BA_REBOUND_C_UNK, 0x01, 600.0f, -1500.0f, 500.0f},
{BA_REBOUND_D_UNK, 0x02, 300.0f, -1200.0f, 0.0f},
{BA_REBOUND_F_UNK, 0x01, 300.0f, -1200.0f, 0.0f},
{BA_REBOUND_E_UNK, 0x03, 300.0f, -1200.0f, 0.0f},
{BA_REBOUND_10_UNK, 0x03, 300.0f, -1200.0f, 0.0f},
{00}
};
/*.bss*/
struct{
struct50s *unk0;
f32 unk4[3];
}D_8037C5E0;
BaRebound *s_active_rebound;
/*.code*/
int func_80298760(s32 arg0){
int barebound_set_active(enum ba_rebound_id id){
int i;
for(i = 0; D_80364450[i].unk0; i++){
if(arg0 == D_80364450[i].unk0){
D_8037C5E0.unk0 = D_80364450 + i;
for(i = 0; s_rebound_list[i].id; i++){
if(id == s_rebound_list[i].id){
s_active_rebound = &s_rebound_list[i];
break;
}
}
}
s32 func_802987B4(void){
return D_8037C5E0.unk0->unk1;
s32 barebound_802987B4(void){
return s_active_rebound->unk1;
}
f32 func_802987C4(void){
return D_8037C5E0.unk0->unk4[0];
f32 barebound_get_vertical_velocity(void){
return s_active_rebound->vertical_velocity;
}
f32 func_802987D4(void){
return D_8037C5E0.unk0->unk4[2];
f32 barebound_get_horizontal_velocity(void){
return s_active_rebound->horizontal_velocity;
}
f32 func_802987E4(void){
return D_8037C5E0.unk0->unk4[1];
f32 barebound_get_gravity(void){
return s_active_rebound->gravity;
}
src/core2/code_11870.c
-93
View File
@@ -1,93 +0,0 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
/* .bss */
struct50s D_8037C5F0[8];
u8 D_8037C670;
u8 D_8037C671;
/* .code */
int func_80298800(f32 arg0[3]){
if(!D_8037C5F0[D_8037C670 - 1].unk1)
return 0;
ml_vec3f_copy(arg0, D_8037C5F0[D_8037C670 - 1].unk4);
return 1;
}
s32 func_80298850(void){
if(!D_8037C670){
return 0;
}
return D_8037C5F0[D_8037C670 - 1].unk0;
}
void func_8029887C(void){
D_8037C671 = 0;
D_8037C670 = 0;
}
void func_80298890(void){
if(D_8037C670){
D_8037C670--;
if(D_8037C670 == 0){
baiFrame_startWithValue(1.2f);
D_8037C671 = 0;
}
}
}
void func_802988DC(s32 arg0){
D_8037C5F0[D_8037C670].unk0 = arg0;
D_8037C5F0[D_8037C670].unk1 = 0;
ml_vec3f_clear(D_8037C5F0[D_8037C670].unk4);
D_8037C670++;
}
void func_8029892C(f32 arg0[3]){
D_8037C5F0[D_8037C670-1].unk1 = 1;
ml_vec3f_copy(D_8037C5F0[D_8037C670-1].unk4, arg0);
}
void func_80298970(s32 arg0){
int val = 0;
switch(arg0){
case 1:
if(bs_checkInterrupt(BS_INTR_1E) == 2)
val = 1;
break;
case 2:
if(bs_checkInterrupt(BS_INTR_1C) == 2)
val = 1;
break;
case 3:
if(bs_checkInterrupt(BS_INTR_1D) == 2)
val = 1;
break;
case 4:
if(bs_checkInterrupt(BS_INTR_25) == 2)
val = 1;
break;
default:
val = 1;
break;
}
if(val)
D_8037C671 = arg0;
}
void func_80298A64(void){
if(D_8037C670)
D_8037C671 = 0;
}
void func_80298A84(void){
s32 tmp;
if(D_8037C670){
tmp = D_8037C5F0[D_8037C670-1].unk0;
if(D_8037C671 != tmp){
func_80298970(tmp);
}
}
}
src/core2/code_12F30.c
+1 -1
View File
@@ -225,7 +225,7 @@ void func_8029A47C(s32 arg0[3]){
void func_8029A4D0(void){
int i;
s32 map_id = map_get();
s32 map_id = gsworld_get_map();
D_8037C6F0.unk0 = 0;
D_8037C6F0.unk4[0] = 255.0f;
D_8037C6F0.unk4[1] = 255.0f;
src/core2/code_13A00.c
+2 -2
View File
@@ -21,7 +21,7 @@ void func_8029A990(void){
f32 plyr_pos[3];
ParticleEmitter *pCtrl;
if(map_get() == MAP_2C_MMM_BATHROOM)
if(gsworld_get_map() == MAP_2C_MMM_BATHROOM)
func_8029C304(0);
else
func_8029C304(1);
@@ -40,7 +40,7 @@ void func_8029AA3C(void){
f32 sp34[3];
f32 sp30;
ParticleEmitter *pCtrl;
if(map_get() == MAP_2C_MMM_BATHROOM)
if(gsworld_get_map() == MAP_2C_MMM_BATHROOM)
func_8029C304(0);
else
func_8029C304(2);
src/core2/code_14420.c
+22 -22
View File
@@ -64,8 +64,8 @@ Struct_core2_13FC0 D_80364650[14] = {
{BS_93_PUMPKIN_DRONE, ASSET_A0_ANIM_BSPUMPKIN_WALK, 0.4f},
{BS_94_CROC_DRONE, ASSET_E0_ANIM_BSCROC_WALK, 0.6f},
{BS_95_WALRUS_DRONE, ASSET_120_ANIM_BSWALRUS_WALK, 0.7f},
{BS_96_SWIM_LOCKED, ASSET_39_ANIM_BSSWIM_MOVE, 0.8f},
{BS_97_DIVE_LOCKED, ASSET_71_ANIM_BSSWIM_DIVE_SLOW, 0.75f},
{BS_96_SWIM_DRONE, ASSET_39_ANIM_BSSWIM_MOVE, 0.8f},
{BS_97_DIVE_DRONE, ASSET_71_ANIM_BSSWIM_DIVE_SLOW, 0.75f},
{BS_98_WALK_DRONE, ASSET_3_ANIM_BSWALK, 0.43f},
{BS_99_BFLY_DRONE, ASSET_38_ANIM_BSBFLY, 0.62f},
{BS_9A_BTROT_DRONE, ASSET_15_ANIM_BSBTROT_WALK, 0.53f},
@@ -81,8 +81,8 @@ Struct_core2_13FC0 D_803646C0[14] = {
{BS_93_PUMPKIN_DRONE, ASSET_A0_ANIM_BSPUMPKIN_WALK, 0.8f},
{BS_94_CROC_DRONE, ASSET_E1_ANIM_BSCROC_IDLE, 1.0f},
{BS_95_WALRUS_DRONE, ASSET_11F_ANIM_BSWALRUS_IDLE, 4.0f},
{BS_96_SWIM_LOCKED, ASSET_57_ANIM_BSSWIM_IDLE, 1.2f},
{BS_97_DIVE_LOCKED, ASSET_70_ANIM_BSSWIM_DIVE_IDLE, 2.0f},
{BS_96_SWIM_DRONE, ASSET_57_ANIM_BSSWIM_IDLE, 1.2f},
{BS_97_DIVE_DRONE, ASSET_70_ANIM_BSSWIM_DIVE_IDLE, 2.0f},
{BS_98_WALK_DRONE, ASSET_19B_ANIM_UNKNOWN, 4.5f},
{BS_99_BFLY_DRONE, ASSET_38_ANIM_BSBFLY, 0.62f},
{BS_9A_BTROT_DRONE, ASSET_26_ANIM_BSBTROT_IDLE, 1.2f},
@@ -98,8 +98,8 @@ Struct_core2_13FC0 D_80364730[14] = {
{BS_93_PUMPKIN_DRONE, ASSET_A0_ANIM_BSPUMPKIN_WALK, 0.8f},
{BS_94_CROC_DRONE, ASSET_E1_ANIM_BSCROC_IDLE, 1.0f},
{BS_95_WALRUS_DRONE, ASSET_11F_ANIM_BSWALRUS_IDLE, 4.0f},
{BS_96_SWIM_LOCKED, ASSET_57_ANIM_BSSWIM_IDLE, 1.2f},
{BS_97_DIVE_LOCKED, ASSET_70_ANIM_BSSWIM_DIVE_IDLE, 2.0f},
{BS_96_SWIM_DRONE, ASSET_57_ANIM_BSSWIM_IDLE, 1.2f},
{BS_97_DIVE_DRONE, ASSET_70_ANIM_BSSWIM_DIVE_IDLE, 2.0f},
{BS_98_WALK_DRONE, ASSET_19B_ANIM_UNKNOWN, 4.5f},
{BS_99_BFLY_DRONE, ASSET_38_ANIM_BSBFLY, 0.62f},
{BS_9A_BTROT_DRONE, ASSET_26_ANIM_BSBTROT_IDLE, 1.2f},
@@ -115,8 +115,8 @@ Struct_core2_13FC0 D_803647A0[14] = {
{BS_93_PUMPKIN_DRONE, ASSET_A0_ANIM_BSPUMPKIN_WALK, 0.8f},
{BS_94_CROC_DRONE, ASSET_E1_ANIM_BSCROC_IDLE, 1.0f},
{BS_95_WALRUS_DRONE, ASSET_11F_ANIM_BSWALRUS_IDLE, 4.0f},
{BS_96_SWIM_LOCKED, ASSET_57_ANIM_BSSWIM_IDLE, 1.2f},
{BS_97_DIVE_LOCKED, ASSET_70_ANIM_BSSWIM_DIVE_IDLE, 2.0f},
{BS_96_SWIM_DRONE, ASSET_57_ANIM_BSSWIM_IDLE, 1.2f},
{BS_97_DIVE_DRONE, ASSET_70_ANIM_BSSWIM_DIVE_IDLE, 2.0f},
{BS_98_WALK_DRONE, ASSET_6F_ANIM_BSSTAND_IDLE, 5.5f},
{BS_99_BFLY_DRONE, ASSET_38_ANIM_BSBFLY, 0.62f},
{BS_9A_BTROT_DRONE, ASSET_26_ANIM_BSBTROT_IDLE, 1.2f},
@@ -132,8 +132,8 @@ Struct_core2_13FC0 D_80364810[14] = {
{BS_8F_PUMPKIN_LOCKED, 0, 0.0f},
{BS_8D_CROC_LOCKED, 0, 0.0f},
{BS_73_UNKNOWN, ASSET_11F_ANIM_BSWALRUS_IDLE, 4.0f},
{BS_77_SWIM_LOCKED, 0, 0.0f},
{BS_78_DIVE_LOCKED, 0, 0.0f},
{BS_77_SWIM_LOOKAT_DRONE, 0, 0.0f},
{BS_78_DIVE_LOOKAT_DRONE, 0, 0.0f},
{BS_73_UNKNOWN, ASSET_14A_ANIM_BSREST_LISTEN, 11.4f},
{BS_76_BFLY_LOCKED, 0, 0.0f},
{BS_79_BTROT_LOCKED, 0, 0.0f},
@@ -149,8 +149,8 @@ Struct_core2_13FC0 D_80364880[14] = {
{BS_8F_PUMPKIN_LOCKED, 0, 0.0f},
{BS_8D_CROC_LOCKED, 0, 0.0f},
{BS_74_UNKNOWN, ASSET_11F_ANIM_BSWALRUS_IDLE, 4.0f},
{BS_77_SWIM_LOCKED, 0, 0.0f},
{BS_78_DIVE_LOCKED, 0, 0.0f},
{BS_77_SWIM_LOOKAT_DRONE, 0, 0.0f},
{BS_78_DIVE_LOOKAT_DRONE, 0, 0.0f},
{BS_74_UNKNOWN, ASSET_6F_ANIM_BSSTAND_IDLE, 5.5f},
{BS_76_BFLY_LOCKED, 0, 0.0f},
{BS_79_BTROT_LOCKED, 0, 0.0f},
@@ -165,8 +165,8 @@ Struct_core2_13FC0 D_803648F0[14] = {
{BS_8F_PUMPKIN_LOCKED, 0, 0.0f},
{BS_8D_CROC_LOCKED, 0, 0.0f},
{BS_75_UNKNOWN, ASSET_11F_ANIM_BSWALRUS_IDLE, 4.0f},
{BS_77_SWIM_LOCKED, 0, 0.0f},
{BS_78_DIVE_LOCKED, 0, 0.0f},
{BS_77_SWIM_LOOKAT_DRONE, 0, 0.0f},
{BS_78_DIVE_LOOKAT_DRONE, 0, 0.0f},
{BS_75_UNKNOWN, ASSET_14A_ANIM_BSREST_LISTEN, 11.4f},
{BS_76_BFLY_LOCKED, 0, 0.0f},
{BS_79_BTROT_LOCKED, 0, 0.0f},
@@ -706,8 +706,8 @@ void update_void_return_Location(void) {
level_id = level_get();
if ((level_id == 0) || (level_id == LEVEL_6_LAIR)) {
map_id = map_get();
exit_id = exit_get();
map_id = gsworld_get_map();
exit_id = gsworld_get_exit();
} else {
map_id = level_get_main_map(level_id);
exit_id = level_get_main_exit(level_id);
@@ -720,12 +720,12 @@ void func_8029C674(void) {
f32 sp1C[3];
D_8037D1E8 = FALSE;
if (func_80298850() == BSGROUP_4_LOOK) {
if (balookat_getState() == BSGROUP_4_LOOK) {
D_8037D1E8 = TRUE;
baflag_set(BA_FLAG_17_FIRST_PERSON_VIEW);
ncDynamicCamera_enterFirstPerson();
func_8028E9C4(5, sp1C);
ncFirstPersonCamera_setZoomedOutPosition(sp1C);
ncba1p_setZoomedOutPosition(sp1C);
}
}
@@ -735,13 +735,13 @@ void func_8029C6D0(void) {
f32 sp24[3];
f32 sp18[3];
if (func_80298850() == 4 && D_8037D1E8) {
if (balookat_getState() == 4 && D_8037D1E8) {
func_8028E9C4(5, sp18);
ncFirstPersonCamera_setZoomedOutPosition(sp18);
ncba1p_setZoomedOutPosition(sp18);
func_8028E9C4(5, sp30);
func_80298800(sp24);
balookat_try_get_position(sp24);
func_802BC434(sp3C, sp24, sp30);
ncFirstPersonCamera_setZoomedOutRotation(sp3C);
ncba1p_setZoomedOutRotation(sp3C);
}
}
src/core2/code_34790.c
+2 -2
View File
@@ -137,7 +137,7 @@ void func_802BBA84(void) {
D_8037D8C8 = D_8037D8CC * 0.0078125;
return;
}
if (map_get() == MAP_91_FILE_SELECT) {
if (gsworld_get_map() == MAP_91_FILE_SELECT) {
D_8037D8C8 = D_8037D8CC * 0.0078125;
return;
}
@@ -245,7 +245,7 @@ f32 func_802BBEA4(f32 arg0[3], f32 arg1[3], f32 arg2, s32 arg3, s32 arg4) {
return func_802BBD48();
}
void func_802BC044(void) {
void nccamera_init(void) {
s32 i;
D_8037D8C4 = 0;
src/core2/code_35520.c
+1 -1
View File
@@ -133,7 +133,7 @@ struct_core2_35520_1 *func_802BC4B0(s32 arg0) {
s32 map_id;
s32 i;
map_id = map_get();
map_id = gsworld_get_map();
for( i = 0; D_8037D930[i].map_id != 0; i++){
if(map_id == D_8037D930[i].map_id && (arg0 == D_8037D930[i].unk2)){
return &D_8037D930[i];
src/core2/code_37E50.c
+1 -1
View File
@@ -78,7 +78,7 @@ bool func_802BEF64(void){
void func_802BEF70(void){}
void func_802BEF78(void){
D_8037DA80.unk0 = func_802BEDE0(map_get());
D_8037DA80.unk0 = func_802BEDE0(gsworld_get_map());
D_8037DA80.unk8 = 0;
D_8037DA80.unkC = 0;
}
src/core2/code_42CB0.c
+2 -2
View File
@@ -36,7 +36,7 @@ enum honeycomb_e func_802C9C40(Actor *this){
s32 tmp_a0;
s32 sp18[3];
if(map_get() == MAP_2_MM_MUMBOS_MOUNTAIN){
if(gsworld_get_map() == MAP_2_MM_MUMBOS_MOUNTAIN){
if (2500.0f < this->position_y)
return HONEYCOMB_2_MM_JUJU;
else
@@ -134,7 +134,7 @@ void chHoneycomb_update(Actor *this){
}
}//L802CA098
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK){
if(gsworld_get_map() == MAP_27_FP_FREEZEEZY_PEAK){
if(maSlalom_isActive()){
this->unk58_0 = FALSE;
actor_collisionOff(this);
src/core2/code_43A40.c
+1 -1
View File
@@ -72,7 +72,7 @@ void chFlightPad_update(Actor *this){
actor_setOpacity(this, 0x5a);
}
if(map_get() == MAP_12_GV_GOBIS_VALLEY){
if(gsworld_get_map() == MAP_12_GV_GOBIS_VALLEY){
this->unk6C = 352.0f;
this->pitch = 352.0f;
this->yaw_ideal = 90.0f;
src/core2/code_47BD0.c
+2 -2
View File
@@ -389,7 +389,7 @@ void chBeeSwarm_update(Actor *this) {
D_8037DCBC = 0;
}
}
if (map_get() == MAP_27_FP_FREEZEEZY_PEAK) {
if (gsworld_get_map() == MAP_27_FP_FREEZEEZY_PEAK) {
if (maSlalom_isActive()) {
this->unk58_0 = FALSE;
return;
@@ -419,7 +419,7 @@ void chBeeSwarm_update(Actor *this) {
}
chBeeSwarm_802CF1C8(this->unk1C, this->position, this->velocity, this->actor_specific_1_f, 100.0f, 0, &spA0);
}
if (map_get() == MAP_78_GL_RBB_AND_MMM_PUZZLE) {
if (gsworld_get_map() == MAP_78_GL_RBB_AND_MMM_PUZZLE) {
if (this->unk38_31++ == 0x1E) {
this->unk38_31 = 0;
next_position[0] = this->position[0];
src/core2/code_4A6F0.c
+11 -11
View File
@@ -118,7 +118,7 @@ void chMumbo_func_802D186C(Actor *this) {
void chMumbo_func_802D18B4(Actor *this) {
bool player_is_within_range;
if (map_get() == MAP_7A_GL_CRYPT) {
if (gsworld_get_map() == MAP_7A_GL_CRYPT) {
player_is_within_range = chMumbo_withinHorzDistToPlayer(1107, 0, 188);
} else {
player_is_within_range = chMumbo_withinHorzDistToPlayer(0, -107, 188);
@@ -200,7 +200,7 @@ void chMumbo_func_802D1B8C(Actor *this, enum transformation_e transform_id) {
gcdialog_showDialog(transform_id + ASSET_D8F_DIALOG_MUMBO_MEET, 6, this->position, this->marker, __chMumbo_textCallback, NULL);
return;
}
if (map_get() == MAP_7A_GL_CRYPT && transform_id == TRANSFORM_3_PUMPKIN && !fileProgressFlag_get(FILEPROG_F7_HAS_TRANSFORMED_IN_CRYPT)) {
if (gsworld_get_map() == 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);
fileProgressFlag_set(FILEPROG_F7_HAS_TRANSFORMED_IN_CRYPT, TRUE);
return;
@@ -223,7 +223,7 @@ void chMumbo_update(Actor *this) {
this->unk130 = func_803255FC;
if( !volatileFlag_get(VOLATILE_FLAG_1)
&& !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)
&& map_get() != MAP_7A_GL_CRYPT) {
&& gsworld_get_map() != MAP_7A_GL_CRYPT) {
item_adjustByDiffWithHud(ITEM_1C_MUMBO_TOKEN, 0);
}
if(!this->initialized){
@@ -243,7 +243,7 @@ void chMumbo_update(Actor *this) {
this->unk38_31 = 0;
if( player_getTransformation() == TRANSFORM_1_BANJO
&& !fileProgressFlag_get(__bkProgId_from_transformationId(D_8037DDF0))
&& (map_get() != MAP_7A_GL_CRYPT)
&& (gsworld_get_map() != MAP_7A_GL_CRYPT)
){
this->unk38_31 = __transformation_getCost(D_8037DDF0);
}
@@ -308,7 +308,7 @@ void chMumbo_update(Actor *this) {
case 4: //L802D20E4
actor_loopAnimation(this);
sp48 = (map_get() == MAP_7A_GL_CRYPT) ? chMumbo_withinHorzDistToPlayer(0x442, 0, 0x3C) : chMumbo_withinHorzDistToPlayer(0, -0x5A, 0x3C);
sp48 = (gsworld_get_map() == MAP_7A_GL_CRYPT) ? chMumbo_withinHorzDistToPlayer(0x442, 0, 0x3C) : chMumbo_withinHorzDistToPlayer(0, -0x5A, 0x3C);
if( sp48
&& player_movementGroup() == BSGROUP_0_NONE
&& func_8028F20C()
@@ -318,15 +318,15 @@ void chMumbo_update(Actor *this) {
if(face_buttons[FACE_BUTTON(BUTTON_B)] == 1){
if (D_8037DDF0 == TRANSFORM_7_WISHWASHY) {
this->unk38_31 = 0;
} else if (player_getTransformation() == TRANSFORM_1_BANJO && !fileProgressFlag_get(__bkProgId_from_transformationId(D_8037DDF0)) && map_get() != MAP_7A_GL_CRYPT){
} else if (player_getTransformation() == TRANSFORM_1_BANJO && !fileProgressFlag_get(__bkProgId_from_transformationId(D_8037DDF0)) && gsworld_get_map() != MAP_7A_GL_CRYPT){
this->unk38_31 = __transformation_getCost(D_8037DDF0);
}
this->unk38_0 = (D_8037DDF0 == TRANSFORM_7_WISHWASHY) || (item_getCount(ITEM_1C_MUMBO_TOKEN) >= this->unk38_31);
if (this->unk38_0) {
sp48 = map_get() != MAP_E_MM_MUMBOS_SKULL;
sp48 = gsworld_get_map() != MAP_E_MM_MUMBOS_SKULL;
sp44 = player_getTransformation() == TRANSFORM_1_BANJO;
func_8028F94C(2, this->position);
if ( sp44 && map_get() != MAP_7A_GL_CRYPT
if ( sp44 && gsworld_get_map() != MAP_7A_GL_CRYPT
&& !fileProgressFlag_get(FILEPROG_BA_HAS_SEEN_TREX_TEXT)
&& randf() < 0.01
&& sp48
@@ -337,7 +337,7 @@ void chMumbo_update(Actor *this) {
subaddie_set_state(this, 3);
} else if (
sp44
&& map_get() != MAP_7A_GL_CRYPT
&& gsworld_get_map() != MAP_7A_GL_CRYPT
&& !this->unk138_23
&& (sp40 = fileProgressFlag_getN(FILEPROG_BB_MUMBO_MISTAKE_INDEX, 2), sp40 < 3)
&& randf() < 0.05
@@ -429,7 +429,7 @@ void chMumbo_update(Actor *this) {
case 7: //L802D2704
chMumbo_func_802D186C(this);
if (volatileFlag_get(VOLATILE_FLAG_11) == 0) {
if (map_get() == MAP_7A_GL_CRYPT) {
if (gsworld_get_map() == MAP_7A_GL_CRYPT) {
sp48 = chMumbo_withinHorzDistToPlayer(0x453, 0, 0xBC);
} else {
sp48 = chMumbo_withinHorzDistToPlayer(0, -0x6B, 0xBC);
@@ -445,7 +445,7 @@ void chMumbo_update(Actor *this) {
case 8: //L802D2790
chMumbo_func_802D186C(this);
if (volatileFlag_get(VOLATILE_FLAG_12) == 0) {
if (map_get() == MAP_7A_GL_CRYPT) {
if (gsworld_get_map() == MAP_7A_GL_CRYPT) {
sp48 = chMumbo_withinHorzDistToPlayer(0x453, 0, 0xBC);
} else {
sp48 = chMumbo_withinHorzDistToPlayer(0, -0x6B, 0xBC);
src/core2/code_4C020.c
+28 -28
View File
@@ -422,7 +422,7 @@ void func_802D3FD4(Actor *this){
if(!this->initialized){
this->initialized = TRUE;
func_802D3CE8(this);
switch(map_get()){
switch(gsworld_get_map()){
case MAP_1D_MMM_CELLAR: //L802D4058
if(sns_get_item_state(SNS_ITEM_EGG_CYAN, 1) && !sns_get_item_state(SNS_ITEM_EGG_CYAN, 0)){
return;
@@ -518,7 +518,7 @@ bool func_802D42F8(Actor *this) {
void func_802D4388(Actor *this){
func_802D3CE8(this);
this->unk38_0 = BOOL(map_get() == MAP_7A_GL_CRYPT || item_getCount(ITEM_1C_MUMBO_TOKEN) >= this->actorTypeSpecificField || func_802D42F8(this));
this->unk38_0 = BOOL(gsworld_get_map() == MAP_7A_GL_CRYPT || item_getCount(ITEM_1C_MUMBO_TOKEN) >= this->actorTypeSpecificField || func_802D42F8(this));
mapSpecificFlags_set(0x1F, (func_8028F20C() && func_8028FB48(0x78000000)) || player_movementGroup() == BSGROUP_D_TRANSFORMING);
switch(this->state){
case 0x12: //L802D4468
@@ -586,7 +586,7 @@ void func_802D4680(Actor *this){
case 1:
if(ml_vec3f_horizontal_distance_zero_likely(this->position, sp1C) < 150.0f && func_8028F20C()){
if(player_movementGroup() == BSGROUP_0_NONE || player_movementGroup() == BSGROUP_8_TROT){
if(map_get() == MAP_8E_GL_FURNACE_FUN){
if(gsworld_get_map() == MAP_8E_GL_FURNACE_FUN){
volatileFlag_set(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ, 0);
func_802D4614(MAP_80_GL_FF_ENTRANCE);
}
@@ -712,7 +712,7 @@ void func_802D4CAC(Actor *this){
}
void func_802D4CD4(Actor *this){
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK){
if(gsworld_get_map() == MAP_27_FP_FREEZEEZY_PEAK){
if(maSlalom_isActive()){
this->unk58_0 = FALSE;
return;
@@ -785,7 +785,7 @@ void func_802D5058(enum map_e map_id, s32 arg1, bool arg2) {
D_8036768C = 0x15;
}
D_80367690 = 0;
D_80367694 = map_get();
D_80367694 = gsworld_get_map();
D_80367698 = 1;
D_8036769C = 0;
D_803676A0 = 0;
@@ -813,7 +813,7 @@ void func_802D5178(s32 arg0, enum file_progress_e arg1, s32 arg2, enum map_e arg
}
void func_802D520C(Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(volatileFlag_get(VOLATILE_FLAG_1) && map_get() != MAP_8E_GL_FURNACE_FUN){
if(volatileFlag_get(VOLATILE_FLAG_1) && gsworld_get_map() != MAP_8E_GL_FURNACE_FUN){
gcquiz_draw(gfx, mtx, vtx);
}
}
@@ -824,9 +824,9 @@ void func_802D5260(void) {
f32 sp34;
f32 sp28[3];
sp3C = (map_get() == MAP_76_GL_640_NOTE_DOOR) ? 0
: (map_get() == MAP_77_GL_RBB_LOBBY) ? 1
: (map_get() == MAP_78_GL_RBB_AND_MMM_PUZZLE) ? 2
sp3C = (gsworld_get_map() == MAP_76_GL_640_NOTE_DOOR) ? 0
: (gsworld_get_map() == MAP_77_GL_RBB_LOBBY) ? 1
: (gsworld_get_map() == MAP_78_GL_RBB_AND_MMM_PUZZLE) ? 2
: -1;
if (sp3C == -1) {
@@ -901,8 +901,8 @@ void func_802D5628(void){
static s32 D_803679EC = 0;
static f32 D_803679F0 = 0.0f;
if( map_get() != MAP_8E_GL_FURNACE_FUN
&& map_get() != MAP_80_GL_FF_ENTRANCE
if( gsworld_get_map() != MAP_8E_GL_FURNACE_FUN
&& gsworld_get_map() != MAP_80_GL_FF_ENTRANCE
){
D_803676AC = 0;
}
@@ -928,7 +928,7 @@ void func_802D5628(void){
D_803679E8 = 0;
}
}//L802D5774
if(D_80367684 && map_get() == D_80367684){
if(D_80367684 && gsworld_get_map() == D_80367684){
switch(D_8036768C){
case 0x1: // L802D57C8
if(!D_80367690){
@@ -1007,7 +1007,7 @@ void func_802D5628(void){
case 0x15:// L802D5AB4
case 0x2d:// L802D5AB4
if(D_80367684 && D_80367684 == map_get()){
if(D_80367684 && D_80367684 == gsworld_get_map()){
gcquiz_func_80319EA4();
if(0.0f < D_8037DE08){
D_8037DE08 -= time_getDelta();
@@ -1056,8 +1056,8 @@ void func_802D5628(void){
if( getGameMode() == GAME_MODE_3_NORMAL
|| func_802E4A08()
){
if( map_get() != MAP_8E_GL_FURNACE_FUN
&& map_get() != MAP_90_GL_BATTLEMENTS
if( gsworld_get_map() != MAP_8E_GL_FURNACE_FUN
&& gsworld_get_map() != MAP_90_GL_BATTLEMENTS
&& !fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY)
){
D_8037DE04 += time_getDelta();
@@ -1124,8 +1124,8 @@ void func_802D6114(void){
if(D_8036769C)
fileProgressFlag_set(D_8036769C, TRUE);
func_802D6344();
if(map_get() != sp24){
if(map_getLevel(sp24) != map_getLevel(map_get())){
if(gsworld_get_map() != sp24){
if(map_getLevel(sp24) != map_getLevel(gsworld_get_map())){
func_802E4A70();
}//L802D6194
volatileFlag_set(VOLATILE_FLAG_21, 1);
@@ -1141,7 +1141,7 @@ void func_802D6114(void){
}
void func_802D61FC(enum map_e arg0){
if( map_getLevel(arg0) != map_getLevel(map_get()))
if( map_getLevel(arg0) != map_getLevel(gsworld_get_map()))
func_802E4A70();
func_803228D8();
transitionToMap(D_80367684, 0, 0);
@@ -1154,7 +1154,7 @@ void func_802D6264(f32 delay, enum map_e map_id, s32 arg2, s32 arg3, s32 arg4, e
D_8036768C = arg3;
D_80367690 = 0;
D_80367694 = map_get();
D_80367694 = gsworld_get_map();
D_80367698 = arg4;
D_8036769C = arg5;
D_803676A0 = 0;
@@ -1197,7 +1197,7 @@ void func_802D63D4(void){
if(D_80367684 == 0)
return;
if(map_get() != D_80367684)
if(gsworld_get_map() != D_80367684)
return;
func_80347A14(0);
@@ -1221,7 +1221,7 @@ void func_802D63D4(void){
void func_802D6494(void){
if( (!D_80367684 || (D_80367684 && (map_get() == D_80367684)))
if( (!D_80367684 || (D_80367684 && (gsworld_get_map() == D_80367684)))
){
switch(D_803676A0){
case ACTOR_2E5_DOOR_OF_GRUNTY:
@@ -1235,13 +1235,13 @@ void func_802D6494(void){
coMusicPlayer_playMusicWeak(COMUSIC_64_WORLD_OPENING_A, 32000);
break;
case ACTOR_212_CC_ENTRANCE_BARS:// L802D6550
if(map_get() == MAP_70_GL_CC_LOBBY && !volatileFlag_get(VOLATILE_FLAG_7F_SANDCASTLE_OPEN_CC)){
if(gsworld_get_map() == MAP_70_GL_CC_LOBBY && !volatileFlag_get(VOLATILE_FLAG_7F_SANDCASTLE_OPEN_CC)){
func_802D4830(actorArray_findActorFromActorId(ACTOR_212_CC_ENTRANCE_BARS), SFX_9A_MECHANICAL_CLOSING, 0.5f);
coMusicPlayer_playMusicWeak(COMUSIC_64_WORLD_OPENING_A, 32000);
}
break;
case ACTOR_234_CCW_ENTRANCE_DOOR:// L802D65A0
if(map_get() == MAP_79_GL_CCW_LOBBY && !volatileFlag_get(VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW)){
if(gsworld_get_map() == MAP_79_GL_CCW_LOBBY && !volatileFlag_get(VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW)){
func_802D485C(actorArray_findActorFromActorId(ACTOR_234_CCW_ENTRANCE_DOOR), SFX_3EC_CCW_DOOR_OPENING, 0.8f, 15000);
coMusicPlayer_playMusicWeak(COMUSIC_64_WORLD_OPENING_A, 32000);
}
@@ -1253,13 +1253,13 @@ void func_802D6494(void){
}
break;
case ACTOR_235_FP_ENTANCE_DOOR:// L802D6624
if(map_get() == MAP_6F_GL_FP_LOBBY && !volatileFlag_get(VOLATILE_FLAG_8B_SANDCASTLE_OPEN_FP)){
if(gsworld_get_map() == MAP_6F_GL_FP_LOBBY && !volatileFlag_get(VOLATILE_FLAG_8B_SANDCASTLE_OPEN_FP)){
func_802D4830(actorArray_findActorFromActorId(ACTOR_235_FP_ENTANCE_DOOR), SFX_18_BIGBUTT_SLIDE, 0.5f);
coMusicPlayer_playMusicWeak(COMUSIC_64_WORLD_OPENING_A, 32000);
}
break;
case ACTOR_226_GV_ENTRANCE:// L802D6674
if(map_get() == MAP_6E_GL_GV_LOBBY && !volatileFlag_get(VOLATILE_FLAG_87_SANDCASTLE_OPEN_GV)){
if(gsworld_get_map() == MAP_6E_GL_GV_LOBBY && !volatileFlag_get(VOLATILE_FLAG_87_SANDCASTLE_OPEN_GV)){
func_802D485C(actorArray_findActorFromActorId(ACTOR_226_GV_ENTRANCE), SFX_3EC_CCW_DOOR_OPENING, 0.8f, 15000);
coMusicPlayer_playMusicWeak(COMUSIC_64_WORLD_OPENING_A, 32000);
}
@@ -1271,7 +1271,7 @@ void func_802D6494(void){
}
break;
case ACTOR_20F_RBB_ENTRANCE_DOOR:// L802D66F8
if(map_get() == MAP_77_GL_RBB_LOBBY && !volatileFlag_get(VOLATILE_FLAG_90_SANDCASTLE_OPEN_RBB)){
if(gsworld_get_map() == MAP_77_GL_RBB_LOBBY && !volatileFlag_get(VOLATILE_FLAG_90_SANDCASTLE_OPEN_RBB)){
func_802D4830(actorArray_findActorFromActorId(ACTOR_20F_RBB_ENTRANCE_DOOR), SFX_9A_MECHANICAL_CLOSING, 0.5f);
coMusicPlayer_playMusicWeak(COMUSIC_64_WORLD_OPENING_A, 32000);
}
@@ -1333,7 +1333,7 @@ int func_802D686C(void){
if(volatileFlag_get(VOLATILE_FLAG_1E)){
return FALSE;
}
return map_get() == D_80367684;
return gsworld_get_map() == D_80367684;
}
int func_802D68B4(void){
@@ -1354,7 +1354,7 @@ void func_802D6924(void){
//update_has_entered_level_flags
void func_802D6948(void){
switch(map_get()){
switch(gsworld_get_map()){
case MAP_2_MM_MUMBOS_MOUNTAIN:
fileProgressFlag_set(FILEPROG_B0_HAS_ENTERED_MM, TRUE);
break;
src/core2/code_509D0.c
+1 -1
View File
@@ -365,7 +365,7 @@ void chLevelCollectible_update(Actor *this){
func_802D83EC(this);
break;
case MARKER_36_ORANGE_COLLECTIBLE: //L802D86DC
if (mapSpecificFlags_get(MM_SPECIFIC_FLAG_3_CHIMPY_HAS_LEAVED) && map_get() == MAP_2_MM_MUMBOS_MOUNTAIN) {
if (mapSpecificFlags_get(MM_SPECIFIC_FLAG_3_CHIMPY_HAS_LEAVED) && gsworld_get_map() == MAP_2_MM_MUMBOS_MOUNTAIN) {
marker_despawn(this->marker);
}
break;
src/core2/code_53A10.c
+3 -3
View File
@@ -21,7 +21,7 @@ void func_802DA9A0(ActorMarker *caller, enum asset_e text_id, s32 arg2){
flag = FILEPROG_15_ENTER_MMM_TEXT;
}
else{
if(map_get() == MAP_69_GL_MM_LOBBY)
if(gsworld_get_map() == MAP_69_GL_MM_LOBBY)
tmp = FILEPROG_97_ENTERED_LAIR_TEXT;
else
tmp = FILEPROG_98_EXITED_LEVEL_TEXT;
@@ -45,7 +45,7 @@ void func_802DAA14(Actor *this){
flag = FILEPROG_15_ENTER_MMM_TEXT;
}
else{
if(map_get() == MAP_69_GL_MM_LOBBY)
if(gsworld_get_map() == MAP_69_GL_MM_LOBBY)
tmp = FILEPROG_97_ENTERED_LAIR_TEXT;
else
tmp = FILEPROG_98_EXITED_LEVEL_TEXT;
@@ -72,7 +72,7 @@ void func_802DAA14(Actor *this){
text_id = ASSET_ADC_DIALOG_UNKNOWN;
}
else{
if(map_get() == MAP_69_GL_MM_LOBBY)
if(gsworld_get_map() == MAP_69_GL_MM_LOBBY)
tmp = ASSET_F66_DIALOG_UNKNOWN;
else
tmp = ASSET_F67_DIALOG_UNKNOWN;
src/core2/code_57C70.c
+1 -1
View File
@@ -97,7 +97,7 @@ void func_802DEE1C(Actor *this) {
if (D_8037DFE8 == NULL) {
D_8037DFE8 = assetcache_get(0x56E);
}
sp4C = map_getLevel(map_get());
sp4C = map_getLevel(gsworld_get_map());
sp44 = sp4C == D_8037DFE4;
if (sp44) {
subaddie_set_state_with_direction(this, 2, 0.0f, 1);
src/core2/code_59A80.c
+1 -1
View File
@@ -40,7 +40,7 @@ enum mumbotoken_e func_802E0A90(Actor *this){
s32 id;
s32 pos[3];
map_get();
gsworld_get_map();
pos[0] = (s32)this->position[0];
pos[1] = (s32)this->position[1];
pos[2] = (s32)this->position[2];
src/core2/code_5C870.c
+6 -6
View File
@@ -98,13 +98,13 @@ void func_802E38E8(enum map_e map, s32 exit, s32 reset_on_load){
func_8030AFA0(map);
}
func_802FA508();
func_80334B20(map, exit, 0);
gsworld_set(map, exit, 0);
func_802E3800();
func_8033DC10();
}
void func_802E398C(s32 arg0) {
func_80334910();
gsworld_free();
func_8030ED0C();
coMusicPlayer_update();
if (arg0 != 0) {
@@ -118,7 +118,7 @@ void func_802E39D0(Gfx **gdl, Mtx **mptr, Vtx **vptr, s32 framebuffer_idx, s32 a
scissorBox_SetForGameMode(gdl, framebuffer_idx);
D_8037E8E0.unkC = FALSE;
func_80334540(gdl, mptr, vptr);
gsworld_draw(gdl, mptr, vptr);
if(!arg4){
func_802E67AC();
func_802E3BD0(getActiveFramebuffer());
@@ -262,9 +262,9 @@ void func_802E3E7C(enum game_mode_e mode){
sp28 = D_8037E8E0.exit;
prev_mode = D_8037E8E0.unk0;
game_setMode(GAME_MODE_2_UNKNOWN, 0);
if(!volatileFlag_getAndSet(VOLATILE_FLAG_21, 0) || map_getLevel(map_get()) == map_getLevel(D_8037E8E0.map)){
if(!volatileFlag_getAndSet(VOLATILE_FLAG_21, 0) || map_getLevel(gsworld_get_map()) == map_getLevel(D_8037E8E0.map)){
if(!volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE))
mapSavestate_save(map_get());
mapSavestate_save(gsworld_get_map());
}
func_802E398C(1);
func_802E38E8(map, sp28, sp34);
@@ -515,7 +515,7 @@ bool func_802E4424(void) {
game_setMode(D_8037E8E0.unk1A - 1, D_8037E8E0.unk1B);
D_8037E8E0.unk1A = 0;
}
sp1C = func_80334ECC();
sp1C = gsworld_update();
func_80321C34();
func_8030ED0C();
coMusicPlayer_update();
src/core2/code_6D490.c
+1 -1
View File
@@ -74,7 +74,7 @@ s32 func_802F4420(Struct5Ds *this){
return 4;
}
return func_803246B4(map_get(), this->unk0);
return func_803246B4(gsworld_get_map(), this->unk0);
}
void func_802F44AC(Struct5Ds *this, enum sfx_e sfx_id, f32 arg2, f32 arg3, s32 arg4){
src/core2/code_6DA30.c
+1 -1
View File
@@ -226,7 +226,7 @@ void func_802F7A2C(s32 arg0);
enum asset_e func_802F49C0(void){
s32 i;
for(i = 0; D_8036907C[i].mapID != 0 ; i++){
if(map_get() == D_8036907C[i].mapID){
if(gsworld_get_map() == D_8036907C[i].mapID){
return D_8036907C[i].assetId;
}
}
src/core2/code_7060.c
+10 -10
View File
@@ -115,7 +115,7 @@ void func_8028E0F0(s32 arg0, s32 arg1[3]) {
}
D_80363690 = 0;
switch (map_get()) {
switch (gsworld_get_map()) {
case MAP_27_FP_FREEZEEZY_PEAK:
if (arg0 == 0xD) {
baflag_set(BA_FLAG_16_FLYING);
@@ -185,7 +185,7 @@ void func_8028E4B0(void) {
D_8037BFBA = TRUE;
D_8037BFB9 = FALSE;
func_80295914();
sp20 = exit_get();
sp20 = gsworld_get_exit();
D_8037BFB8 = 0;
player_setPosition(D_803636C0);
if (volatileFlag_get(VOLATILE_FLAG_E) || func_802D686C() || (sp20 == 0x65)){
@@ -357,7 +357,7 @@ void func_8028E9C4(s32 arg0, f32 arg1[3]) {
_player_getPosition(arg1);
switch(bsStoredState_getTransformation()){
case TRANSFORM_3_PUMPKIN: //L8028EA68
if(map_get() == MAP_1B_MMM_MAD_MONSTER_MANSION){
if(gsworld_get_map() == MAP_1B_MMM_MAD_MONSTER_MANSION){
arg1[1] += 100.0f;
}
else{
@@ -417,7 +417,7 @@ f32 player_getPitch(void){
}
int func_8028EC04(void){
return func_80298850();
return balookat_getState();
}
void player_getRotation(f32 *dst){
@@ -839,16 +839,16 @@ void func_8028F8F8(s32 arg0, bool arg1){
void func_8028F918(s32 arg0){
if(arg0 == 0){
func_80298890();
balookat_pop();
}
else{
func_802988DC(arg0);
balookat_push(arg0);
}
}
void func_8028F94C(s32 arg0, f32 arg1[3]){
func_802988DC(arg0);
func_8029892C(arg1);
balookat_push(arg0);
balookat_set_position(arg1);
}
void func_8028F974(void){
@@ -858,7 +858,7 @@ void func_8028F974(void){
void func_8028F994(void){
D_803636B0 = 1;
player_getPosition(D_803636B4);
transitionToMap(map_get(), 0, 0);
transitionToMap(gsworld_get_map(), 0, 0);
}
void func_8028F9DC(s32 arg0){
@@ -942,7 +942,7 @@ bool player_throwCarriedObject(void){
}
void func_8028FC8C(f32 arg0[3]){
func_8029892C(arg0);
balookat_set_position(arg0);
}
void func_8028FCAC(void){
src/core2/code_8DC20.c
+1 -1
View File
@@ -64,7 +64,7 @@ void func_80315084(Gfx **gfx, Mtx **mtx, Vtx **vtx){
void func_80315110(Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(!D_803830A0){
if(map_get() != MAP_90_GL_BATTLEMENTS){
if(gsworld_get_map() != MAP_90_GL_BATTLEMENTS){
func_803306C8(2);
func_8032AD7C(2);
}
src/core2/code_935F0.c
+2 -2
View File
@@ -32,7 +32,7 @@ ActorInfo chMinigame = {
/* .code */
enum minigame_e __chminigame_getCurrentMapId(void){
switch(map_get()){
switch(gsworld_get_map()){
case MAP_3A_RBB_BOSS_BOOM_BOX:
return MINIGAME_0_BOSS_BOOM_BOX;
case MAP_10_BGS_MR_VILE:
@@ -77,7 +77,7 @@ void func_8031A678(Actor *this){
return;
case MINIGAME_3_ZUBBAS:
if (map_get() != MAP_5B_CCW_SPRING_ZUBBA_HIVE) {
if (gsworld_get_map() != MAP_5B_CCW_SPRING_ZUBBA_HIVE) {
sp20[0] = 0.0f;
sp20[1] = 0.0f;
sp20[2] = -1000.0f;
src/core2/code_956B0.c
+3 -3
View File
@@ -76,7 +76,7 @@ bool cutscene_skipBeachCutsceneCheck(void){
//checks is a cutscene can be inturrupted and performs take me there
void cutscenetrigger_check(s32 cs_map, s32 arg1, s32 return_map, s32 return_exit, bool (* condFunc)(void)){
if(map_get() != cs_map)
if(gsworld_get_map() != cs_map)
return;
if((condFunc && condFunc()) || mapSpecificFlags_get(arg1)){
@@ -111,7 +111,7 @@ s32 cutscenetrigger_update(void){
cutscenetrigger_check(MAP_7C_CS_INTRO_BANJOS_HOUSE_1, 0xC, MAP_1_SM_SPIRAL_MOUNTAIN, 0x12, cutscene_skipIntroCutsceneCheck);
cutscenetrigger_check(MAP_86_CS_SPIRAL_MOUNTAIN_4, 0xC, MAP_1_SM_SPIRAL_MOUNTAIN, 0x12, cutscene_skipIntroCutsceneCheck);
cutscenetrigger_check(MAP_89_CS_INTRO_BANJOS_HOUSE_2, 0xC, MAP_1_SM_SPIRAL_MOUNTAIN, 0x12, cutscene_skipIntroCutsceneCheck);
if(map_get() == MAP_95_CS_END_ALL_100 && mapSpecificFlags_get(1)){
if(gsworld_get_map() == MAP_95_CS_END_ALL_100 && mapSpecificFlags_get(1)){
func_8034B9E4();
mapSpecificFlags_set(1, 0);
}
@@ -122,7 +122,7 @@ void func_8031CB50(enum map_e map_id, s32 exit_id, s32 arg2) {
s32 sp1C;
if ((D_80383190 == 0) && (getGameMode() != GAME_MODE_8_BOTTLES_BONUS) && (getGameMode() != GAME_MODE_7_ATTRACT_DEMO)) {
sp1C = func_803226E8(map_get());
sp1C = func_803226E8(gsworld_get_map());
if ((func_803226E8(map_id) != sp1C) && (func_80322914() == 0)) {
func_8025A388(0, 0x4E2);
func_8025AB00();
src/core2/code_9A9D0.c
+1 -1
View File
@@ -66,7 +66,7 @@ void func_803219F4(s32 arg0){
func_8025A8B8(COMUSIC_58_WADING_BOOTS, 1);
break;
case 4: //L80321B60
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK){
if(gsworld_get_map() == MAP_27_FP_FREEZEEZY_PEAK){
D_80383314 = COMUSIC_8A_GETTING_TURBO_TRAINERS;
}
else{
src/core2/code_9B650.c
+3 -3
View File
@@ -221,9 +221,9 @@ void func_8032278C(s32 arg0, s32 arg1) {
static s32 D_8036E2B4 = 1;
D_80383340.unk4 = func_803226BC(map_get());
D_80383340.unk0 = func_803226E8(map_get());
D_80383340.unk2 = func_80322714(map_get());
D_80383340.unk4 = func_803226BC(gsworld_get_map());
D_80383340.unk0 = func_803226E8(gsworld_get_map());
D_80383340.unk2 = func_80322714(gsworld_get_map());
if (arg1 == 3) {
D_8036E2B4 = 1;
return;

Some files were not shown because too many files have changed in this diff Show More