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

Names corrections to better match the style guide.

This commit is contained in:
MaikelChan 2023-08-14 23:40:53 +02:00
parent 4f9848c062
commit 011bea824c
No known key found for this signature in database
GPG Key ID: B2CE398C279239EC
5 changed files with 102 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/TTC/code_3E30.c
View File

@ -32,7 +32,7 @@ typedef struct {
u8 letter;
u8 unk3;
f32 unk4;
}LetterButton;
}LetterFloorTile;
typedef struct {
s16 minId;
@ -43,7 +43,7 @@ s32 __sandcastleCodes_getNumberEntered(void);
/* .data */
s32 D_8038C980 = 0;
LetterButton letterButtonsTable[] ={
LetterFloorTile letterFloorTilesTable[] ={
{0x02, 0x70, 0, 0.0f},
{0x04, 0x35, 0, 0.0f},
{0x06, 0x6E, 0, 0.0f},
@ -129,10 +129,10 @@ void func_8038A258(s32 arg0) {
D_8038D720.unk10 = arg0;
}
LetterButton *func_8038A2DC(s32 mesh_id) {
LetterButton *i_ptr;
LetterFloorTile *func_8038A2DC(s32 mesh_id) {
LetterFloorTile *i_ptr;
for(i_ptr = letterButtonsTable; i_ptr->meshId != 0; i_ptr++){
for(i_ptr = letterFloorTilesTable; i_ptr->meshId != 0; i_ptr++){
if(i_ptr->meshId == mesh_id){
return i_ptr;
}
@ -141,9 +141,9 @@ LetterButton *func_8038A2DC(s32 mesh_id) {
}
void func_8038A328(void) {
LetterButton *i_ptr;
LetterFloorTile *i_ptr;
for(i_ptr = letterButtonsTable; i_ptr->meshId != 0; i_ptr++){
for(i_ptr = letterFloorTilesTable; i_ptr->meshId != 0; i_ptr++){
i_ptr->unk3 = 2;
i_ptr->unk4 = 0.0f;
}
@ -151,7 +151,7 @@ void func_8038A328(void) {
}
void func_8038A37C(s32 arg0, BKVtxRef *ref, Vtx *dst, s32 arg3) {
LetterButton *ptr = (LetterButton *) arg3;
LetterFloorTile *ptr = (LetterFloorTile *) arg3;
f32 temp_f2;
if (ptr->unk4 < 0.5) {
@ -168,7 +168,7 @@ void func_8038A37C(s32 arg0, BKVtxRef *ref, Vtx *dst, s32 arg3) {
}
}
void TTC_func_8038A5D8(LetterButton *arg0, s32 arg1) {
void TTC_func_8038A5D8(LetterFloorTile *arg0, s32 arg1) {
s32 temp_v0;
temp_v0 = arg0->unk3;
@ -180,7 +180,7 @@ void TTC_func_8038A5D8(LetterButton *arg0, s32 arg1) {
}
void func_8038A618(s32 arg0, BKVtxRef *ref, Vtx *dst, s32 arg3) {
LetterButton *ptr = (LetterButton *) arg3;
LetterFloorTile *ptr = (LetterFloorTile *) arg3;
f32 temp_f12;
@ -196,7 +196,7 @@ void func_8038A618(s32 arg0, BKVtxRef *ref, Vtx *dst, s32 arg3) {
}
void func_8038A7DC(s32 arg0, BKVtxRef *ref, Vtx *dst, s32 arg3){
LetterButton *ptr = (LetterButton *) arg3;
LetterFloorTile *ptr = (LetterFloorTile *) arg3;
f32 temp_f2;
if (ptr->unk4 < 0.5) {
@ -215,17 +215,17 @@ void func_8038A7DC(s32 arg0, BKVtxRef *ref, Vtx *dst, s32 arg3){
void func_8038AA2C(void) {
f32 temp_f20;
LetterButton *button;
LetterFloorTile *floor_tile;
temp_f20 = time_getDelta();
for(button = letterButtonsTable; button->meshId != 0; button++){
button->unk4 += temp_f20;
if (button->unk3 == 1) {
BKModel_transformMesh(D_8038D720.model1, button->meshId, func_8038A37C, (s32)button);
} else if (button->unk3 == 3) {
BKModel_transformMesh(D_8038D720.model1, button->meshId, func_8038A618, (s32)button);
} else if (button->unk3 == 5) {
BKModel_transformMesh(D_8038D720.model1, button->meshId, func_8038A7DC, (s32)button);
for(floor_tile = letterFloorTilesTable; floor_tile->meshId != 0; floor_tile++){
floor_tile->unk4 += temp_f20;
if (floor_tile->unk3 == 1) {
BKModel_transformMesh(D_8038D720.model1, floor_tile->meshId, func_8038A37C, (s32)floor_tile);
} else if (floor_tile->unk3 == 3) {
BKModel_transformMesh(D_8038D720.model1, floor_tile->meshId, func_8038A618, (s32)floor_tile);
} else if (floor_tile->unk3 == 5) {
BKModel_transformMesh(D_8038D720.model1, floor_tile->meshId, func_8038A7DC, (s32)floor_tile);
}
}
}
@ -259,7 +259,7 @@ void func_8038ABA0(u32 arg0){
}
}
void func_8038AC48(LetterButton *arg0) {
void func_8038AC48(LetterFloorTile *arg0) {
s32 sp40[4];
s32 sp3C;
bool temp_s5;
@ -452,7 +452,7 @@ void func_8038B2F0(void) {
s32 mesh_id;
f32 sp24;
u8 temp_v0;
LetterButton *temp_v0_3;
LetterFloorTile *temp_v0_3;
sp24 = time_getDelta();
if (__sandcastleCodes_getNumberEntered() == 3) {
@ -725,7 +725,7 @@ void TTC_func_8038BBA0(s32 secretCodeIndex) {
func_8038B5B4();
}
bool func_8038BD10(LetterButton *arg0) {
bool func_8038BD10(LetterFloorTile *arg0) {
struct_ttc_3E30_4_s *var_s0;
struct_ttc_3E30_4_s *var_v0;
s32 var_a2;

32
src/core2/abilityprogress.c
View File

@ -2,8 +2,8 @@
#include "functions.h"
#include "variables.h"
s32 learnedAbilities;
s32 usedAbilities;
s32 abilityprogress_learnedAbilities;
s32 abilityprogress_usedAbilities;
void ability_use(s32 arg0){
s32 sp2C;
@ -12,7 +12,7 @@ void ability_use(s32 arg0){
sp2C = 0;
sp28 = 1;
if(usedAbilities & (1 << arg0))
if(abilityprogress_usedAbilities & (1 << arg0))
return;
switch(arg0){
@ -53,7 +53,7 @@ void ability_use(s32 arg0){
return;
}
else{
usedAbilities |= (1 << arg0);
abilityprogress_usedAbilities |= (1 << arg0);
}
break;
case 0x8://L80295738 //fly
@ -69,49 +69,49 @@ void ability_use(s32 arg0){
if(sp2C)
func_80311480(sp2C, 4, NULL, NULL, NULL, 0);
usedAbilities |= (1 << arg0);
abilityprogress_usedAbilities |= (1 << arg0);
}
int ability_hasUsed(enum ability_e move){
return (1 << move) & usedAbilities;
return (1 << move) & abilityprogress_usedAbilities;
}
void ability_setHasUsed(enum ability_e move){
usedAbilities |= (1 << move);
abilityprogress_usedAbilities |= (1 << move);
}
int ability_hasLearned(enum ability_e move){
return (1 << move) & learnedAbilities;
return (1 << move) & abilityprogress_learnedAbilities;
}
s32 ability_getAllLearned(void){
return learnedAbilities;
return abilityprogress_learnedAbilities;
}
void ability_debug(void){}
void ability_clearAll(void){
learnedAbilities = 0;
usedAbilities = 0;
abilityprogress_learnedAbilities = 0;
abilityprogress_usedAbilities = 0;
}
void ability_setLearned(s32 move, s32 val){
if(val){
learnedAbilities |= (1 << move);
abilityprogress_learnedAbilities |= (1 << move);
}else{
learnedAbilities &= ~(1 << move);
abilityprogress_learnedAbilities &= ~(1 << move);
}
}
void ability_setAllLearned(s32 val){
learnedAbilities = val;
abilityprogress_learnedAbilities = val;
}
void ability_setAllUsed(s32 val){
usedAbilities = val;
abilityprogress_usedAbilities = val;
}
void ability_getSizeAndPtr(s32 *size, u8 **addr){
*size = 8;
*addr = &learnedAbilities;
*addr = &abilityprogress_learnedAbilities;
}

8
src/core2/bs/swim.c
View File

@ -72,7 +72,7 @@ void func_802B55DC(void) {
func_80297970(ml_interpolate_f(sp1C, bsSwimHorzVelocityMin, bsSwimHorzVelocityMax));
}
void entered_water(void) {
void swim_enteredWater(void) {
if (level_get() == LEVEL_9_RUSTY_BUCKET_BAY) {
func_8035644C(FILEPROG_AB_SWIM_OILY_WATER);
} else if (map_get() == MAP_46_CCW_WINTER) {
@ -141,7 +141,7 @@ void func_802B5774(void) {
func_8029C7F4(1, 3, 3, 2);
yaw_setVelocityBounded(500.0f, 5.0f);
func_80297970(0.0f);
entered_water();
swim_enteredWater();
bsSwimCurrentAnimation = 0;
}
@ -283,7 +283,7 @@ void func_802B5E8C(void) {
func_8029C7F4(1, 3, 3, 2);
yaw_setVelocityBounded(500.0f, 5.0f);
func_80297970(0.0f);
entered_water();
swim_enteredWater();
func_802B5E30();
}
@ -303,7 +303,7 @@ void func_802B5F38(void){
}
void func_802B5F58(void){
entered_water();
swim_enteredWater();
bsdrone_init();
}

108
src/core2/code_B5040.c
View File

@ -56,16 +56,16 @@ Struct_B5040 D_80370A20[] = {
};
/* .bss */
s32 base_offset;
s32 jiggy_offset;
s32 honeycomb_offset;
s32 mumbotoken_offset;
s32 notescores_offset;
s32 timescores_offset;
s32 progressflags_offset;
s32 saved_item_offset;
s32 abilities_offset;
s32 end_offset;
s32 baseOffset;
s32 jiggyOffset;
s32 honeycombOffset;
s32 mumbotokenOffset;
s32 notescoresOffset;
s32 timescoresOffset;
s32 progressflagsOffset;
s32 savedItemsOffset;
s32 abilitiesOffset;
s32 endOffset;
u8 D_80383D18[8];
/* .code */
@ -117,16 +117,16 @@ void savedata_init(void){ //savedata_init
timeScores_getSizeAndPtr(&timescores_size, &timescores_addr);
saveditem_getSizeAndPtr(&saved_item_size, &saved_item_addr);
ability_getSizeAndPtr(&abilities_size, &abilities_addr);
base_offset = 0;
jiggy_offset = base_offset + 2;
honeycomb_offset = jiggy_offset + jiggy_size;
mumbotoken_offset = honeycomb_offset + honeycomb_size;
notescores_offset = mumbotoken_offset + mumbotoken_size;
timescores_offset = notescores_offset + notescores_size;
progressflags_offset = timescores_offset + timescores_size;
saved_item_offset = progressflags_offset + progressflags_size;
abilities_offset = saved_item_offset + saved_item_size;
end_offset = abilities_offset + abilities_size;
baseOffset = 0;
jiggyOffset = baseOffset + 2;
honeycombOffset = jiggyOffset + jiggy_size;
mumbotokenOffset = honeycombOffset + honeycomb_size;
notescoresOffset = mumbotokenOffset + mumbotoken_size;
timescoresOffset = notescoresOffset + notescores_size;
progressflagsOffset = timescoresOffset + timescores_size;
savedItemsOffset = progressflagsOffset + progressflags_size;
abilitiesOffset = savedItemsOffset + saved_item_size;
endOffset = abilitiesOffset + abilities_size;
}
void __savedata_load_jiggyScore(u8 *savedata){
@ -135,8 +135,8 @@ void __savedata_load_jiggyScore(u8 *savedata){
int i;
jiggyscore_getSizeAndPtr(&jiggy_size, &jiggy_addr);
for(i = jiggy_offset; i < jiggy_offset + jiggy_size; i++){
jiggy_addr[i - jiggy_offset] = savedata[i];
for(i = jiggyOffset; i < jiggyOffset + jiggy_size; i++){
jiggy_addr[i - jiggyOffset] = savedata[i];
}
func_8034798C();
}
@ -147,8 +147,8 @@ void __savedata_load_honeycombScore(u8 *savedata){ //savedata_save_honeycomb
int i;
honeycombscore_getSizeAndPtr(&honeycomb_size, &honeycomb_addr);
for(i = honeycomb_offset; i < honeycomb_offset + honeycomb_size; i++){
honeycomb_addr[i - honeycomb_offset] = savedata[i];
for(i = honeycombOffset; i < honeycombOffset + honeycomb_size; i++){
honeycomb_addr[i - honeycombOffset] = savedata[i];
}
func_80347958();
}
@ -159,8 +159,8 @@ void __savedata_load_mumboScore(u8 *savedata){
int i;
mumboscore_getSizeAndPtr(&mumbotoken_size, &mumbotoken_addr);
for(i = mumbotoken_offset; i < mumbotoken_offset + mumbotoken_size; i++){
mumbotoken_addr[i - mumbotoken_offset] = savedata[i];
for(i = mumbotokenOffset; i < mumbotokenOffset + mumbotoken_size; i++){
mumbotoken_addr[i - mumbotokenOffset] = savedata[i];
}
func_80347984();
}
@ -171,8 +171,8 @@ void __savedata_load_highNoteScores(u8 *savedata){
int i;
notescore_getSizeAndPtr(&notescores_size, &notescores_addr);
for(i = notescores_offset; i < notescores_offset + notescores_size; i++){
notescores_addr[i - notescores_offset] = savedata[i];
for(i = notescoresOffset; i < notescoresOffset + notescores_size; i++){
notescores_addr[i - notescoresOffset] = savedata[i];
}
itemscore_highNoteScores_fromSaveData(notescores_addr);
}
@ -183,8 +183,8 @@ void __savedata_load_timeScores(u8 *savedata){
int i;
timeScores_getSizeAndPtr(&timescores_size, &timescores_addr);
for(i = timescores_offset; i < timescores_offset + timescores_size; i++){
timescores_addr[i - timescores_offset] = savedata[i];
for(i = timescoresOffset; i < timescoresOffset + timescores_size; i++){
timescores_addr[i - timescoresOffset] = savedata[i];
}
itemscore_timeScores_fromSaveData(timescores_addr);
}
@ -195,8 +195,8 @@ void func_8033C460(u8 *savedata){ //global_progress
int i;
progressflags_getSizeAndPtr(&progressflags_size, &progressflags_addr);
for(i = progressflags_offset; i < progressflags_offset + progressflags_size; i++){
progressflags_addr[i - progressflags_offset] = savedata[i];
for(i = progressflagsOffset; i < progressflagsOffset + progressflags_size; i++){
progressflags_addr[i - progressflagsOffset] = savedata[i];
}
}
@ -206,8 +206,8 @@ void func_8033C4E4(u8 *savedata){ //saveddata_load_collectibles
int i;
saveditem_getSizeAndPtr(&saved_item_size, &saved_item_addr);
for(i = saved_item_offset; i < saved_item_offset + saved_item_size; i++){
saved_item_addr[i - saved_item_offset] = savedata[i];
for(i = savedItemsOffset; i < savedItemsOffset + saved_item_size; i++){
saved_item_addr[i - savedItemsOffset] = savedata[i];
}
func_803479C0(saved_item_addr);
}
@ -218,13 +218,13 @@ void __savedata_load_abilities(u8 *savedata){ //savedata_load_abilities
int i;
ability_getSizeAndPtr(&abilities_size, &abilities_addr);
for(i = abilities_offset; i < abilities_offset + abilities_size; i++){
abilities_addr[i - abilities_offset] = savedata[i];
for(i = abilitiesOffset; i < abilitiesOffset + abilities_size; i++){
abilities_addr[i - abilitiesOffset] = savedata[i];
}
}
void __savedata_save_magic(u8 *savedata){
savedata[base_offset] = 0x11;
savedata[baseOffset] = 0x11;
}
void __savedata_save_jiggyScore(u8 *savedata){ //savedata_save_jiggies
@ -233,8 +233,8 @@ void __savedata_save_jiggyScore(u8 *savedata){ //savedata_save_jiggies
int i;
jiggyscore_getSizeAndPtr(&jiggy_size, &jiggy_addr);
for(i = jiggy_offset; i < jiggy_offset + jiggy_size; i++){
savedata[i] = jiggy_addr[i - jiggy_offset];
for(i = jiggyOffset; i < jiggyOffset + jiggy_size; i++){
savedata[i] = jiggy_addr[i - jiggyOffset];
}
}
@ -244,8 +244,8 @@ void __savedata_save_honeycombScore(u8 *savedata){ //savedata_save_honeycomb
int i;
honeycombscore_getSizeAndPtr(&honeycomb_size, &honeycomb_addr);
for(i = honeycomb_offset; i < honeycomb_offset + honeycomb_size; i++){
savedata[i] = honeycomb_addr[i - honeycomb_offset];
for(i = honeycombOffset; i < honeycombOffset + honeycomb_size; i++){
savedata[i] = honeycomb_addr[i - honeycombOffset];
}
}
@ -255,8 +255,8 @@ void __savedata_save_mumboScore(u8 *savedata){
int i;
mumboscore_getSizeAndPtr(&mumbotoken_size, &mumbotoken_addr);
for(i = mumbotoken_offset; i < mumbotoken_offset + mumbotoken_size; i++){
savedata[i] = mumbotoken_addr[i - mumbotoken_offset];
for(i = mumbotokenOffset; i < mumbotokenOffset + mumbotoken_size; i++){
savedata[i] = mumbotoken_addr[i - mumbotokenOffset];
}
}
@ -266,8 +266,8 @@ void __savedata_save_highNoteScores(u8 *savedata){
int i;
notescore_getSizeAndPtr(&notescores_size, &notescores_addr);
for(i = notescores_offset; i < notescores_offset + notescores_size; i++){
savedata[i] = notescores_addr[i - notescores_offset];
for(i = notescoresOffset; i < notescoresOffset + notescores_size; i++){
savedata[i] = notescores_addr[i - notescoresOffset];
}
}
@ -277,8 +277,8 @@ void __savedata_save_timeScores(u8 *savedata){
int i;
timeScores_getSizeAndPtr(&timescores_size, &timescores_addr);
for(i = timescores_offset; i < timescores_offset + timescores_size; i++){
savedata[i] = timescores_addr[i - timescores_offset];
for(i = timescoresOffset; i < timescoresOffset + timescores_size; i++){
savedata[i] = timescores_addr[i - timescoresOffset];
}
}
@ -288,8 +288,8 @@ void __savedata_8033C8A0(u8 *savedata){ //global_progress
int i;
progressflags_getSizeAndPtr(&progressflags_size, &progressflags_addr);
for(i = progressflags_offset; i < progressflags_offset + progressflags_size; i++){
savedata[i] = progressflags_addr[i - progressflags_offset];
for(i = progressflagsOffset; i < progressflagsOffset + progressflags_size; i++){
savedata[i] = progressflags_addr[i - progressflagsOffset];
}
}
@ -299,8 +299,8 @@ void __savedata_8033CA2C(u8 *savedata){ //saveddata_save_collectibles
int i;
saveditem_getSizeAndPtr(&saved_item_size, &saved_item_addr);
for(i = saved_item_offset; i < saved_item_offset + saved_item_size; i++){
savedata[i] = saved_item_addr[i - saved_item_offset];
for(i = savedItemsOffset; i < savedItemsOffset + saved_item_size; i++){
savedata[i] = saved_item_addr[i - savedItemsOffset];
}
}
@ -310,8 +310,8 @@ void __savedata_save_abilities(u8 *savedata){ //savedata_save_abilities
int i;
ability_getSizeAndPtr(&abilities_size, &abilities_addr);
for(i = abilities_offset; i < abilities_offset + abilities_size; i++){
savedata[i] = abilities_addr[i - abilities_offset];
for(i = abilitiesOffset; i < abilitiesOffset + abilities_size; i++){
savedata[i] = abilities_addr[i - abilitiesOffset];
}
}
@ -321,7 +321,7 @@ s32 savedata_8033CA2C(s32 filenum, SaveData *save_data){
sp1C = load_file_blocks(filenum, 0, save_data, 0xF);
if( sp1C
|| savedata_verify(0x78, save_data)
|| ((u8*)save_data)[base_offset] != 0x11
|| ((u8*)save_data)[baseOffset] != 0x11
){
sp1C = 2;
}

10
src/core2/code_B5E00.c
View File

@ -70,18 +70,18 @@ s32 gameFile_8033CFD4(s32 gamenum){
s32 filenum;
u32 i = 3;
s32 eeprom_error;
SaveData *saveData;
SaveData *save_data;
filenum = D_80383F04;
next = gameFile_GameIdToFileIdMap[gamenum];
gameFile_GameIdToFileIdMap[gamenum] = D_80383F04;
bcopy(&gameFile_saveData[next], &gameFile_saveData[filenum], 0xF*8);
saveData = gameFile_saveData + filenum;
saveData->slotIndex = gamenum + 1;
savedata_update_crc(saveData, sizeof(SaveData));
save_data = gameFile_saveData + filenum;
save_data->slotIndex = gamenum + 1;
savedata_update_crc(save_data, sizeof(SaveData));
for(eeprom_error = 1; eeprom_error && i > 0; i--){//L8033D070
eeprom_error = savedata_8033CC98(filenum, saveData);
eeprom_error = savedata_8033CC98(filenum, save_data);
if(!eeprom_error){
__gameFile_8033CE14(gamenum);
}