Skip to content

Commit 8636485

Browse files
committed
Directly exported symbols
1 parent a6162df commit 8636485

11 files changed

Lines changed: 816 additions & 818 deletions

src/game/behavior_actions.h

Lines changed: 557 additions & 557 deletions
Large diffs are not rendered by default.

src/game/level_geo.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#define LEVEL_GEO_H
33

44
#include <libultra/types.h>
5-
#include <libultra/gbi.h>
5+
#include <libultra/gbi.h>
66

7-
Gfx *geo_envfx_main(s32 callContext, struct GraphNode *node, Mat4 mtxf);
8-
Gfx *geo_skybox_main(s32 callContext, struct GraphNode *node, UNUSED Mat4 *mtx);
7+
extern_s Gfx *geo_envfx_main(s32 callContext, struct GraphNode *node, Mat4 mtxf);
8+
extern_s Gfx *geo_skybox_main(s32 callContext, struct GraphNode *node, UNUSED Mat4 *mtx);
99

1010
#endif // LEVEL_GEO_H

src/game/mario_actions_cutscene.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
#define MARIO_DIALOG_STATUS_START 1
1818
#define MARIO_DIALOG_STATUS_SPEAK 2
1919

20-
void print_displaying_credits_entry(void);
21-
void bhv_end_peach_loop(void);
22-
void bhv_end_toad_loop(void);
23-
s32 geo_switch_peach_eyes(s32 run, struct GraphNode *node, UNUSED s32 a2);
24-
s32 mario_ready_to_speak(void);
25-
s32 set_mario_npc_dialog(s32 actionArg);
26-
s32 mario_execute_cutscene_action(struct MarioState *m);
20+
extern_s void print_displaying_credits_entry(void);
21+
extern_s void bhv_end_peach_loop(void);
22+
extern_s void bhv_end_toad_loop(void);
23+
extern_s s32 geo_switch_peach_eyes(s32 run, struct GraphNode *node, UNUSED s32 a2);
24+
extern_s s32 mario_ready_to_speak(void);
25+
extern_s s32 set_mario_npc_dialog(s32 actionArg);
26+
extern_s s32 mario_execute_cutscene_action(struct MarioState *m);
2727

2828
#endif // MARIO_ACTIONS_CUTSCENE_H

src/game/mario_misc.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@
99
extern_s struct GraphNodeObject gMirrorMario;
1010
extern_s struct MarioBodyState gBodyStates[2];
1111

12-
Gfx *geo_draw_mario_head_goddard(s32 callContext, struct GraphNode *node, Mat4 *c);
13-
void bhv_toad_message_loop(void);
14-
void bhv_toad_message_init(void);
15-
void bhv_unlock_door_star_init(void);
16-
void bhv_unlock_door_star_loop(void);
17-
Gfx *geo_mirror_mario_set_alpha(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
18-
Gfx *geo_switch_mario_stand_run(s32 callContext, struct GraphNode *node, UNUSED Mat4 *mtx);
19-
Gfx *geo_switch_mario_eyes(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
20-
Gfx *geo_mario_tilt_torso(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
21-
Gfx *geo_mario_head_rotation(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
22-
Gfx *geo_switch_mario_hand(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
23-
Gfx *geo_mario_hand_foot_scaler(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
24-
Gfx *geo_switch_mario_cap_effect(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
25-
Gfx *geo_switch_mario_cap_on_off(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
26-
Gfx *geo_mario_rotate_wing_cap_wings(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
27-
Gfx *geo_switch_mario_hand_grab_pos(s32 callContext, struct GraphNode *b, Mat4 *mtx);
28-
Gfx *geo_render_mirror_mario(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
29-
Gfx *geo_mirror_mario_backface_culling(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
30-
Gfx* geo_mario_set_player_colors(s32 callContext, struct GraphNode* node, UNUSED Mat4* c);
12+
extern_s Gfx *geo_draw_mario_head_goddard(s32 callContext, struct GraphNode *node, Mat4 *c);
13+
extern_s void bhv_toad_message_loop(void);
14+
extern_s void bhv_toad_message_init(void);
15+
extern_s void bhv_unlock_door_star_init(void);
16+
extern_s void bhv_unlock_door_star_loop(void);
17+
extern_s Gfx *geo_mirror_mario_set_alpha(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
18+
extern_s Gfx *geo_switch_mario_stand_run(s32 callContext, struct GraphNode *node, UNUSED Mat4 *mtx);
19+
extern_s Gfx *geo_switch_mario_eyes(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
20+
extern_s Gfx *geo_mario_tilt_torso(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
21+
extern_s Gfx *geo_mario_head_rotation(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
22+
extern_s Gfx *geo_switch_mario_hand(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
23+
extern_s Gfx *geo_mario_hand_foot_scaler(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
24+
extern_s Gfx *geo_switch_mario_cap_effect(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
25+
extern_s Gfx *geo_switch_mario_cap_on_off(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
26+
extern_s Gfx *geo_mario_rotate_wing_cap_wings(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
27+
extern_s Gfx *geo_switch_mario_hand_grab_pos(s32 callContext, struct GraphNode *b, Mat4 *mtx);
28+
extern_s Gfx *geo_render_mirror_mario(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
29+
extern_s Gfx *geo_mirror_mario_backface_culling(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c);
30+
extern_s Gfx* geo_mario_set_player_colors(s32 callContext, struct GraphNode* node, UNUSED Mat4* c);
3131

3232
#endif // MARIO_MISC_H

src/game/moving_texture.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,14 @@ extern_s f32 gPaintingMarioYEntry;
110110
#define MOVTEX_TREADMILL_BIG (0 | MOVTEX_AREA_TTC)
111111
#define MOVTEX_TREADMILL_SMALL (1 | MOVTEX_AREA_TTC)
112112

113-
Gfx *geo_wdw_set_initial_water_level(s32 callContext, UNUSED struct GraphNode *node, UNUSED Mat4 mtx);
114-
Gfx *geo_movtex_pause_control(s32 callContext, UNUSED struct GraphNode *node, UNUSED Mat4 mtx);
115-
Gfx *geo_movtex_draw_water_regions(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx);
116-
Gfx *geo_movtex_draw_nocolor(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx);
117-
Gfx *geo_movtex_draw_colored(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx);
118-
Gfx *geo_movtex_draw_colored_no_update(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx);
119-
Gfx *geo_movtex_draw_colored_2_no_update(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx);
120-
Gfx *geo_movtex_update_horizontal(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx);
121-
Gfx *geo_movtex_draw_colored_no_update(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx);
113+
extern_s Gfx *geo_wdw_set_initial_water_level(s32 callContext, UNUSED struct GraphNode *node, UNUSED Mat4 mtx);
114+
extern_s Gfx *geo_movtex_pause_control(s32 callContext, UNUSED struct GraphNode *node, UNUSED Mat4 mtx);
115+
extern_s Gfx *geo_movtex_draw_water_regions(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx);
116+
extern_s Gfx *geo_movtex_draw_nocolor(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx);
117+
extern_s Gfx *geo_movtex_draw_colored(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx);
118+
extern_s Gfx *geo_movtex_draw_colored_no_update(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx);
119+
extern_s Gfx *geo_movtex_draw_colored_2_no_update(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx);
120+
extern_s Gfx *geo_movtex_update_horizontal(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx);
121+
extern_s Gfx *geo_movtex_draw_colored_no_update(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx);
122122

123123
#endif // MOVING_TEXTURE_H

0 commit comments

Comments
 (0)