Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
run: python configure.py && ninja

- name: Run progress script
run: python progress.py --verify-obj --verify-bin --progress-summary
run: python progress.py --verify-bin --progress-summary

- name: Run DTK and objdiff to generate progress file for decomp.dev
run: |
Expand Down
7 changes: 6 additions & 1 deletion include/constants/game_constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,15 @@ enum DIRECTION_e {
DIR_RIGHT
};

enum DIRECTION_LR_e {
DIR_LR_R,
DIR_LR_L
};

enum LAYER_e {
LAYER_1,
LAYER_2,
LAYER_0,
LAYER_0
};

enum PATH_DIRECTION_e {
Expand Down
78 changes: 78 additions & 0 deletions include/constants/sound_list.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

/// @brief The identifiers for each sound effect/music track.
/// @ingroup constants
/// @unofficial
enum SOUND_e {
SE_NULL = -1,
SE_DEMO_OP_DUMMY_U,
Expand Down Expand Up @@ -1985,3 +1986,80 @@ enum SOUND_e {
SE_GAKKI_L_2_ON,
SOUND_COUNT
};

/// @brief Player voice sound IDs
/// @ingroup constants
/// @unofficial
enum VOICE_e {
VOICE_PLAYER_JOIN,
VOICE_PJ_JUMP,
VOICE_PJ_SPIN_JUMP,
VOICE_PLAYER_DECIDE,
VOICE_CS_FALL_INTO_MAP,
VOICE_CS_COURSE_IN,
VOICE_CS_COURSE_IN_MULTI,
VOICE_CS_COURSE_IN_HARD,
VOICE_CS_COURSE_MISS,
VOICE_CS_JUMP,
VOICE_CS_DECIDE_JOIN,
VOICE_CS_ENCOUNT,
VOICE_CS_SHOVED,
VOICE_CS_CHASE_SHIP,
VOICE_CS_NOTICE_JR,
VOICE_GAME_OVER,
VOICE_CONTINUE,
VOICE_CONTINUE_COURSE,
VOICE_MOTIAGE,
VOICE_NAGERU,
VOICE_MOTIAGE_PLAYER,
VOICE_JUMP_2ND,
VOICE_JUMP_3RD,
VOICE_YOSHI_JUMP,
VOICE_JR_A_BATTLE_APP,
VOICE_WALL_KICK,
VOICE_PRPL_JUMP,
VOICE_PNGN_SLIDE,
VOICE_ROPE_CATCH,
VOICE_ROPE_RELEASE,
VOICE_ROPE_FALL,
VOICE_GOAL_POLE_CATCH,
VOICE_CLIFF_DIVE,
VOICE_CLIFF_UP,
VOICE_CLIFF_DOWN,
VOICE_CANNON_SHOT_S,
VOICE_CANNON_SHOT,
VOICE_BALLOON_HELP,
VOICE_BALLOON_HELP_2,
VOICE_HUKKATSU,
VOICE_DAMAGE_LAST,
VOICE_DAMAGE_LAST_2,
VOICE_TIMEUP,
VOICE_TIMEUP_MULTI,
VOICE_SCROLL_OUT,
VOICE_DAMAGE_FIRE,
VOICE_DAMAGE_FREEZE,
VOICE_DAMAGE_POISON,
VOICE_DAMAGE_ELEC,
VOICE_DAMAGE_EATEN,
VOICE_INTO_SANDPILLAR,
VOICE_QUAKE,
VOICE_STOMPED,
VOICE_HIP_ATTACKED,
VOICE_TYUKAN,
VOICE_GET_STAR,
VOICE_ITEM_COMPLETE,
VOICE_CLEAR_NORMAL,
VOICE_CLEAR_ANOTHER,
VOICE_CLEAR_MULTI,
VOICE_CLEAR_HELPED,
VOICE_CLEAR_BOSS,
VOICE_CLEAR_LAST_BOSS,
VOICE_SAVE_PRINCESS,
VOICE_CS_COMPLETE_DEMO,
VOICE_GET_PRIZE,
VOICE_FLOOR_FALL,
VOICE_NOTICE,
VOICE_MISS_PRINCESS,
VOICE_ACTIVE_TV,
VOICE_ACTIVE_RC
};
25 changes: 25 additions & 0 deletions include/game/bases/d_a_en_door.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#pragma once

#include <game/bases/d_enemy.hpp>

class daEnDoor_c : public dEn_c {
public:
virtual bool isClosed();
virtual bool isDummyOpen();
virtual void createMdl();
virtual void initAnm();
virtual void initCcData();
virtual void initialize();
virtual void waitProc();
virtual void setOpenAnm();
virtual void setOpenSE();
virtual void setCloseAnm();
virtual void setCloseSE();
virtual void setCloseMoveSE();
virtual void setWaitAnm();

u8 mPad[0xa8];
int m_5cc;
int m_5d0;
int m_5d4;
};
6 changes: 6 additions & 0 deletions include/game/bases/d_a_fireball_player.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#pragma once

class daFireBall_Player_c {
public:
static bool CheckFireBallLimit(int playerNo, int limitMode);
};
Loading