mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-08 14:36:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

run clang-format

Browse Source
This commit is contained in:
Pheenoh
2020-12-26 11:31:49 -05:00
parent 64a6a97b7b
commit 4c504d078d
180 changed files with 4083 additions and 4253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/Z2AudioLib/Z2StatusMgr.cpp
+31 -33
View File
@@ -1,10 +1,10 @@
#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
#include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
Z2StatusMgr::Z2StatusMgr(){
Z2StatusMgr::Z2StatusMgr() {
lbl_80450B7C = this;
this->hour = 0;
this->minute = 0;
@@ -25,106 +25,104 @@ Z2StatusMgr::Z2StatusMgr(){
this->heart_gauge_on = 0;
}
void Z2StatusMgr::heartGaugeOn(void){
void Z2StatusMgr::heartGaugeOn(void) {
this->heart_gauge_on = 2;
}
asm void Z2StatusMgr::processHeartGaugeSound(void){
asm void Z2StatusMgr::processHeartGaugeSound(void) {
nofralloc
#include "Z2AudioLib/Z2StatusMgr/asm/func_802B5F7C.s"
#include "Z2AudioLib/Z2StatusMgr/asm/func_802B5F7C.s"
}
void Z2StatusMgr::talkIn(void){
void Z2StatusMgr::talkIn(void) {
u8 is_demo;
is_demo = isMovieDemo();
if(is_demo == false){
if (is_demo == false) {
lbl_80450B84->talkInBgm();
lbl_80450B88->talkInSe();
}
}
void Z2StatusMgr::talkOut(void){
void Z2StatusMgr::talkOut(void) {
u8 is_demo;
is_demo = isMovieDemo();
if(is_demo == false){
if (is_demo == false) {
lbl_80450B84->talkOutBgm();
lbl_80450B88->talkOutSe();
}
}
void Z2StatusMgr::menuIn(){
void Z2StatusMgr::menuIn() {
lbl_80450B84->menuInBgm();
lbl_80450B88->menuInSe();
this->is_menu_in = true;
}
void Z2StatusMgr::menuOut(){
void Z2StatusMgr::menuOut() {
lbl_80450B84->menuOutBgm();
lbl_80450B88->talkOutSe();
this->is_menu_in = false;
}
//right instructions, wrong registers
// right instructions, wrong registers
#ifdef NONMATCHING
bool Z2StatusMgr::isMovieDemo(void){
bool Z2StatusMgr::isMovieDemo(void) {
bool uvar2;
uvar2 = false;
if(this->demo_status == 2 || this->demo_status == 8 || this->demo_status == 9){
if (this->demo_status == 2 || this->demo_status == 8 || this->demo_status == 9) {
uvar2 = true;
}
return uvar2;
}
#else
asm bool Z2StatusMgr::isMovieDemo(void){
asm bool Z2StatusMgr::isMovieDemo(void) {
nofralloc
#include "Z2AudioLib/Z2StatusMgr/asm/func_802B61BC.s"
#include "Z2AudioLib/Z2StatusMgr/asm/func_802B61BC.s"
}
#endif
asm void Z2StatusMgr::setDemoName(char*){
asm void Z2StatusMgr::setDemoName(char*) {
nofralloc
#include "Z2AudioLib/Z2StatusMgr/asm/func_802B61E8.s"
#include "Z2AudioLib/Z2StatusMgr/asm/func_802B61E8.s"
}
void Z2StatusMgr::processTime(void){
void Z2StatusMgr::processTime(void) {
u16 temp = this->hour * 256;
this->time = temp + minute;
}
bool Z2StatusMgr::checkDayTime(void){
if(this->hour >= 6 && this->hour < 19){
bool Z2StatusMgr::checkDayTime(void) {
if (this->hour >= 6 && this->hour < 19) {
return true;
}
else{
} else {
return false;
}
}
void Z2StatusMgr::setEventBit(void* event_bit){
void Z2StatusMgr::setEventBit(void* event_bit) {
this->event_bit = event_bit;
}
void Z2StatusMgr::setCameraPolygonPos(Vec* polygon_pos){
if(polygon_pos == 0){
void Z2StatusMgr::setCameraPolygonPos(Vec* polygon_pos) {
if (polygon_pos == 0) {
return;
}
else{
} else {
this->polygon_position.x = polygon_pos->x;
this->polygon_position.y = polygon_pos->y;
this->polygon_position.z = polygon_pos->z;
}
}
void Z2StatusMgr::setCameraGroupInfo(u8 param1){
void Z2StatusMgr::setCameraGroupInfo(u8 param1) {
return;
}
asm void Z2StatusMgr::setCameraInWaterDepth(float){
asm void Z2StatusMgr::setCameraInWaterDepth(float) {
nofralloc
#include "Z2AudioLib/Z2StatusMgr/asm/func_802B6788.s"
#include "Z2AudioLib/Z2StatusMgr/asm/func_802B6788.s"
}