diff --git a/actors/common0.h b/actors/common0.h index 202c6d60..53c7f396 100644 --- a/actors/common0.h +++ b/actors/common0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef COMMON0_H +#define COMMON0_H #include "types.h" @@ -189,3 +190,5 @@ extern const Collision purple_switch_seg8_collision_0800C7A8[]; extern const GeoLayout test_platform_geo[]; extern const Gfx unknown_seg8_dl_08026260[]; extern const Collision unknown_seg8_collision_080262F8[]; + +#endif diff --git a/actors/common1.h b/actors/common1.h index 9239880d..a6663a19 100644 --- a/actors/common1.h +++ b/actors/common1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef COMMON1_H +#define COMMON1_H #include "types.h" @@ -246,3 +247,5 @@ extern const Gfx wooden_signpost_seg3_dl_0302DC40[]; extern const Gfx wooden_signpost_seg3_dl_0302DCD0[]; extern const Gfx wooden_signpost_seg3_dl_0302DD08[]; extern const Collision wooden_signpost_seg3_collision_0302DD80[]; + +#endif diff --git a/actors/group0.h b/actors/group0.h index 3409bbd4..44f8b05d 100644 --- a/actors/group0.h +++ b/actors/group0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP0_H +#define GROUP0_H #include "types.h" @@ -340,3 +341,5 @@ extern const Gfx white_particle_small_dl_begin[]; extern const Gfx white_particle_small_dl_end[]; extern const Gfx white_particle_small_dl[]; extern const Gfx white_particle_small_unused_dl[]; + +#endif diff --git a/actors/group1.h b/actors/group1.h index 047dcf4f..23990b04 100644 --- a/actors/group1.h +++ b/actors/group1.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP1_H +#define GROUP1_H #include "types.h" @@ -89,3 +90,5 @@ extern const Gfx yoshi_egg_seg5_dl_05009880[]; extern const Gfx yoshi_egg_seg5_dl_05009898[]; extern const Gfx yoshi_egg_seg5_dl_050098B0[]; extern const Gfx yoshi_egg_seg5_dl_050098C8[]; + +#endif diff --git a/actors/group10.h b/actors/group10.h index c1129d8f..6a518be2 100644 --- a/actors/group10.h +++ b/actors/group10.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP10_H +#define GROUP10_H #include "types.h" @@ -92,3 +93,5 @@ extern const Gfx yoshi_seg5_dl_050222A8[]; extern const Gfx yoshi_seg5_dl_05022408[]; extern const Gfx yoshi_seg5_dl_05022608[]; extern const struct Animation *const yoshi_seg5_anims_05024100[]; + +#endif diff --git a/actors/group11.h b/actors/group11.h index cb195f0d..6d6fdc43 100644 --- a/actors/group11.h +++ b/actors/group11.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP11_H +#define GROUP11_H #include "types.h" @@ -93,3 +94,5 @@ extern const Gfx wiggler_seg5_dl_0500E608[]; extern const Gfx wiggler_seg5_dl_0500E640[]; extern const Gfx wiggler_seg5_dl_0500E678[]; extern const struct Animation *const wiggler_seg5_anims_0500EC8C[]; + +#endif diff --git a/actors/group12.h b/actors/group12.h index 6d284c8e..02258c86 100644 --- a/actors/group12.h +++ b/actors/group12.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP12_H +#define GROUP12_H #include "types.h" @@ -133,3 +134,5 @@ extern const Gfx impact_smoke_seg6_dl_06062D18[]; extern const GeoLayout bowser_1_yellow_sphere_geo[]; extern const Gfx yellow_sphere_seg6_dl_0601F388[]; extern const Gfx yellow_sphere_seg6_dl_0601F3C0[]; + +#endif diff --git a/actors/group13.h b/actors/group13.h index e4eec4dc..6978503d 100644 --- a/actors/group13.h +++ b/actors/group13.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP13_H +#define GROUP13_H #include "types.h" @@ -98,3 +99,5 @@ extern const Gfx water_mine_seg6_dl_0600D3F8[]; extern const GeoLayout water_ring_geo[]; extern const Gfx water_ring_seg6_dl_06013AC0[]; extern const struct Animation *const water_ring_seg6_anims_06013F7C[]; + +#endif diff --git a/actors/group14.h b/actors/group14.h index ee99f0e1..f776dcd5 100644 --- a/actors/group14.h +++ b/actors/group14.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP14_H +#define GROUP14_H #include "types.h" @@ -131,3 +132,5 @@ extern const Gfx whomp_seg6_dl_0601FFA0[]; extern const Gfx whomp_seg6_dl_06020038[]; extern const struct Animation *const whomp_seg6_anims_06020A04[]; extern const Collision whomp_seg6_collision_06020A0C[]; + +#endif diff --git a/actors/group15.h b/actors/group15.h index f71a3d83..76f4a650 100644 --- a/actors/group15.h +++ b/actors/group15.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP15_H +#define GROUP15_H #include "types.h" @@ -84,3 +85,5 @@ extern const Gfx toad_seg6_dl_06008890[]; extern const Gfx toad_seg6_dl_06008A90[]; extern const Gfx toad_seg6_dl_06008BD8[]; extern const struct Animation *const toad_seg6_anims_0600FB58[]; + +#endif diff --git a/actors/group16.h b/actors/group16.h index 3a9efb2a..5ebea5df 100644 --- a/actors/group16.h +++ b/actors/group16.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP16_H +#define GROUP16_H #include "types.h" @@ -33,3 +34,5 @@ extern const Gfx moneybag_seg6_dl_06005750[]; extern const Gfx moneybag_seg6_dl_06005980[]; extern const Gfx moneybag_seg6_dl_060059F0[]; extern const struct Animation *const moneybag_seg6_anims_06005E5C[]; + +#endif diff --git a/actors/group17.h b/actors/group17.h index 4e68aa78..e28bc024 100644 --- a/actors/group17.h +++ b/actors/group17.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP17_H +#define GROUP17_H #include "types.h" @@ -100,3 +101,5 @@ extern const Gfx swoop_seg6_dl_06006BD0[]; extern const Gfx swoop_seg6_dl_06006CC8[]; extern const Gfx swoop_seg6_dl_06006D00[]; extern const struct Animation *const swoop_seg6_anims_060070D0[]; + +#endif diff --git a/actors/group2.h b/actors/group2.h index 5c58cc9f..d40c61fd 100644 --- a/actors/group2.h +++ b/actors/group2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP2_H +#define GROUP2_H #include "types.h" @@ -26,3 +27,5 @@ extern const Gfx bully_seg5_dl_05003EA8[]; extern const Gfx bully_seg5_dl_05003F80[]; extern const Gfx bully_seg5_dl_05003FC8[]; extern const struct Animation *const bully_seg5_anims_0500470C[]; + +#endif diff --git a/actors/group3.h b/actors/group3.h index 5f639105..e6154e11 100644 --- a/actors/group3.h +++ b/actors/group3.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP3_H +#define GROUP3_H #include "types.h" @@ -36,3 +37,5 @@ extern const GeoLayout water_bomb_geo[]; extern const GeoLayout water_bomb_shadow_geo[]; extern const Gfx water_bubble_seg5_dl_05010D30[]; extern const Gfx water_bubble_seg5_dl_05011000[]; + +#endif diff --git a/actors/group4.h b/actors/group4.h index 2f8d2f98..16b3aa49 100644 --- a/actors/group4.h +++ b/actors/group4.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP4_H +#define GROUP4_H #include "types.h" @@ -103,3 +104,5 @@ extern const struct Animation *const unagi_seg5_anims_05012824[]; // whirlpool extern const Gfx whirlpool_seg5_dl_05013B58[]; extern const Gfx whirlpool_seg5_dl_05013CB8[]; + +#endif diff --git a/actors/group5.h b/actors/group5.h index dc90c26e..9135cdb1 100644 --- a/actors/group5.h +++ b/actors/group5.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP5_H +#define GROUP5_H #include "types.h" @@ -80,3 +81,5 @@ extern const Gfx pokey_seg5_dl_050130B0[]; extern const Gfx tornado_seg5_dl_05014450[]; extern const Gfx tornado_seg5_dl_050145C0[]; extern const GeoLayout tweester_geo[]; + +#endif diff --git a/actors/group6.h b/actors/group6.h index 0110fe08..d8c6fc1c 100644 --- a/actors/group6.h +++ b/actors/group6.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP6_H +#define GROUP6_H #include "types.h" @@ -82,3 +83,5 @@ extern const Gfx ukiki_seg5_dl_0500CFF0[]; extern const Gfx ukiki_seg5_dl_0500D078[]; extern const Gfx ukiki_seg5_dl_0500D108[]; extern const struct Animation *const ukiki_seg5_anims_05015784[]; + +#endif diff --git a/actors/group7.h b/actors/group7.h index 5d4d908b..f5d9332f 100644 --- a/actors/group7.h +++ b/actors/group7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP7_H +#define GROUP7_H #include "types.h" @@ -59,3 +60,5 @@ extern const Gfx spindrift_seg5_dl_05002B30[]; extern const Gfx spindrift_seg5_dl_05002C98[]; extern const Gfx spindrift_seg5_dl_05002D08[]; extern const struct Animation *const spindrift_seg5_anims_05002D68[]; + +#endif diff --git a/actors/group8.h b/actors/group8.h index b3ca46eb..19b3956b 100644 --- a/actors/group8.h +++ b/actors/group8.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP8_H +#define GROUP8_H #include "types.h" @@ -24,3 +25,5 @@ extern const Gfx springboard_checkerboard_seg5_dl_050016B8[]; extern const Gfx springboard_spring_seg5_dl_05001800[]; extern const Gfx springboard_checkerboard_seg5_dl_05001900[]; extern const Collision springboard_collision_05001A28[]; + +#endif diff --git a/actors/group9.h b/actors/group9.h index aed61e10..3aa3eff7 100644 --- a/actors/group9.h +++ b/actors/group9.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GROUP9_H +#define GROUP9_H #include "types.h" @@ -79,3 +80,5 @@ extern const Gfx small_key_seg5_dl_05006A08[]; extern const Gfx small_key_seg5_dl_05006A28[]; extern const Gfx small_key_seg5_dl_05006A48[]; extern const Gfx small_key_seg5_dl_05006A68[]; + +#endif diff --git a/include/behavior_data.h b/include/behavior_data.h index 989959c5..aa665623 100644 --- a/include/behavior_data.h +++ b/include/behavior_data.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef BEHAVIOR_DATA_H +#define BEHAVIOR_DATA_H #include "types.h" @@ -529,3 +530,5 @@ extern const BehaviorScript bhvEndBirds1[]; extern const BehaviorScript bhvEndBirds2[]; extern const BehaviorScript bhvIntroScene[]; extern const BehaviorScript bhvUnusedFakeStar[]; + +#endif // BEHAVIOR_DATA_H diff --git a/include/command_macros_base.h b/include/command_macros_base.h index 95ec68a0..5a0aea51 100644 --- a/include/command_macros_base.h +++ b/include/command_macros_base.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef COMMAND_MACROS_BASE_H +#define COMMAND_MACROS_BASE_H #include "platform_info.h" @@ -23,3 +24,5 @@ #define CMD_PTR(a) ((uintptr_t)(a)) #define CMD_HHHHHH(a, b, c, d, e, f) CMD_HH(a, b), CMD_HH(c, d), CMD_HH(e, f) + +#endif // COMMAND_MACROS_BASE_H diff --git a/include/course_table.h b/include/course_table.h index 4eb88a12..ec2d4296 100644 --- a/include/course_table.h +++ b/include/course_table.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef COURSE_TABLE_H +#define COURSE_TABLE_H // Start of the 3 cap courses in a row. #define COURSE_CAP_COURSES COURSE_COTMC @@ -27,3 +28,5 @@ enum CourseNum #undef DEFINE_BONUS_COURSE #define COURSE_IS_MAIN_COURSE(cmd) (cmd >= COURSE_MIN && cmd <= COURSE_STAGES_MAX) + +#endif // COURSE_TABLE_H diff --git a/include/dialog_ids.h b/include/dialog_ids.h index 36abb4e3..2d9a2410 100644 --- a/include/dialog_ids.h +++ b/include/dialog_ids.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DIALOG_IDS_H +#define DIALOG_IDS_H enum DialogId { DIALOG_NONE = -1, @@ -174,3 +175,5 @@ enum DialogId { DIALOG_169, DIALOG_COUNT }; + +#endif // DIALOG_IDS_H diff --git a/include/eu_translation.h b/include/eu_translation.h index ea2f46d8..ab04abfb 100644 --- a/include/eu_translation.h +++ b/include/eu_translation.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef EU_TRANSLATION_H +#define EU_TRANSLATION_H // EU changes most text to arrays for each language. This define allows these // differences to be combined. @@ -15,3 +16,5 @@ extern void *act_name_table_eu_fr[]; extern void *dialog_table_eu_de[]; extern void *course_name_table_eu_de[]; extern void *act_name_table_eu_de[]; + +#endif // EU_TRANSLATION_H diff --git a/include/farcall.h b/include/farcall.h index bd79e09a..e8be2ae8 100644 --- a/include/farcall.h +++ b/include/farcall.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef __FARCALL_H__ +#define __FARCALL_H__ #ifdef __GNUC__ #define farcall(x) x @@ -11,6 +12,8 @@ #define near #endif +#endif + /* How to use: diff --git a/include/geo_commands.h b/include/geo_commands.h index bf86af16..4e8d7f54 100644 --- a/include/geo_commands.h +++ b/include/geo_commands.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GEO_COMMANDS_H +#define GEO_COMMANDS_H #include "command_macros_base.h" @@ -445,3 +446,6 @@ CMD_BBH(GEO_BONE_ID, layer, 0x0000), \ CMD_HHHHHH(tx, ty, tz, rx, ry, rz), \ CMD_PTR(displayList) + + +#endif // GEO_COMMANDS_H diff --git a/include/gfx_dimensions.h b/include/gfx_dimensions.h index d42019d9..de2af63c 100644 --- a/include/gfx_dimensions.h +++ b/include/gfx_dimensions.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GFX_DIMENSIONS_H +#define GFX_DIMENSIONS_H /* @@ -36,3 +37,5 @@ Note that RECT commands must be enhanced to support negative coordinates with th // If screen is taller than it is wide, radius should be equal to SCREEN_HEIGHT since we scale horizontally #define GFX_DIMENSIONS_FULL_RADIUS (SCREEN_HEIGHT * (GFX_DIMENSIONS_ASPECT_RATIO > 1 ? GFX_DIMENSIONS_ASPECT_RATIO : 1)) + +#endif // GFX_DIMENSIONS_H diff --git a/include/gzip.h b/include/gzip.h index aabea052..8ff67e6a 100644 --- a/include/gzip.h +++ b/include/gzip.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef __GZIP_H__ +#define __GZIP_H__ #ifndef NULL @@ -53,3 +54,6 @@ extern int flush_window(void); // // u32 expand_gzip(u8 *src_addr, u8 *dst_addr, u32 size, u32 outbytes_limit); + + +#endif diff --git a/include/helper_macros.h b/include/helper_macros.h index 92bf40a3..a994af6f 100644 --- a/include/helper_macros.h +++ b/include/helper_macros.h @@ -1,3 +1,6 @@ -#pragma once +#ifndef HELPER_MACROS_H +#define HELPER_MACROS_H #define LIST_NEXT_ITEM(curItem, type) ((type *)((s32)curItem + sizeof(type))) + +#endif // HELPER_MACROS_H diff --git a/include/hvqm/HVQM2File.h b/include/hvqm/HVQM2File.h index 669f4c17..d0107305 100644 --- a/include/hvqm/HVQM2File.h +++ b/include/hvqm/HVQM2File.h @@ -7,7 +7,8 @@ /* revision 1.1 1999-02-12 */ -#pragma once +#ifndef __HVQM2FILE_H__ +#define __HVQM2FILE_H__ #include @@ -117,3 +118,5 @@ typedef struct { #define HVQM2_NESTSIZE_L 70 /* Number of elements on long side */ #define HVQM2_NESTSIZE_S 38 /* Number of elements on shot side */ #define HVQM2_NESTSIZE (HVQM2_NESTSIZE_L * HVQM2_NESTSIZE_S) + +#endif /* __HVQM2FILE_H__ */ diff --git a/include/hvqm/HVQmd.h b/include/hvqm/HVQmd.h index b87fa04e..c537513a 100644 --- a/include/hvqm/HVQmd.h +++ b/include/hvqm/HVQmd.h @@ -7,7 +7,8 @@ /* revision 1.0 1998-10-14 */ -#pragma once +#ifndef __HVQMD_H__ +#define __HVQMD_H__ #include @@ -17,3 +18,5 @@ typedef u16 CARD16; typedef s16 INT16; typedef u32 CARD32; typedef s32 INT32; + +#endif /* __HVQMD_H__ */ diff --git a/include/hvqm/adpcmdec.h b/include/hvqm/adpcmdec.h index 0f2b489d..2e783944 100644 --- a/include/hvqm/adpcmdec.h +++ b/include/hvqm/adpcmdec.h @@ -7,7 +7,8 @@ /* revision 1.0 1998-12-17 */ -#pragma once +#ifndef __ADPCMDEC_H__ +#define __ADPCMDEC_H__ #include @@ -27,4 +28,6 @@ void adpcmDecode(void *instream, u32 format, u32 samples, s16 *outstream, u32 ex #define ADPCM_RESET 0 #define ADPCM_CONTINUE 1 +#endif /* __ADPCMDEC_H__ */ + /* end */ diff --git a/include/hvqm/hvqm2dec.h b/include/hvqm/hvqm2dec.h index 78c15136..2ef3ffd8 100644 --- a/include/hvqm/hvqm2dec.h +++ b/include/hvqm/hvqm2dec.h @@ -6,7 +6,8 @@ /* revision 1.2 1999-03-26 */ -#pragma once +#ifndef __HVQM2DEC_H__ +#define __HVQM2DEC_H__ #include #include @@ -98,4 +99,6 @@ extern u8 hvqm2sp1DataStart[], hvqm2sp1DataEnd[]; extern u8 hvqm2sp2TextStart[], hvqm2sp2TextEnd[]; extern u8 hvqm2sp2DataStart[], hvqm2sp2DataEnd[]; +#endif /* __HVQM2DEC_H__ */ + /* end */ diff --git a/include/ique/PR/PRimage.h b/include/ique/PR/PRimage.h index dd6d5ebe..85457713 100755 --- a/include/ique/PR/PRimage.h +++ b/include/ique/PR/PRimage.h @@ -6,7 +6,8 @@ * **************************************************************************/ -#pragma once +#ifndef __GL_IMAGE_H__ +#define __GL_IMAGE_H__ #ifdef __cplusplus extern "C" { #endif @@ -122,3 +123,4 @@ unsigned short *ibufalloc(); #ifdef __cplusplus } #endif +#endif /* !__GL_IMAGE_H__ */ diff --git a/include/ique/PR/R4300.h b/include/ique/PR/R4300.h index a0ff2446..95c5211b 100755 --- a/include/ique/PR/R4300.h +++ b/include/ique/PR/R4300.h @@ -18,7 +18,8 @@ * **************************************************************************/ -#pragma once +#ifndef __R4300_H__ +#define __R4300_H__ #include @@ -448,3 +449,5 @@ #define FPCSR_RM_RZ 0x00000001 /* round to zero */ #define FPCSR_RM_RP 0x00000002 /* round to positive infinity */ #define FPCSR_RM_RM 0x00000003 /* round to negative infinity */ + +#endif /* __R4300_H */ diff --git a/include/ique/PR/abi.h b/include/ique/PR/abi.h index 4c811756..b73cb726 100644 --- a/include/ique/PR/abi.h +++ b/include/ique/PR/abi.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _ABI_H_ +#define _ABI_H_ /************************************************************************** * * @@ -991,3 +992,5 @@ typedef short ENVMIX_STATE[40]; #endif #endif /* _LANGUAGE_C */ + +#endif /* !_ABI_H_ */ diff --git a/include/ique/PR/dbgdefs.h b/include/ique/PR/dbgdefs.h index ebf0f715..fa68983b 100755 --- a/include/ique/PR/dbgdefs.h +++ b/include/ique/PR/dbgdefs.h @@ -18,7 +18,8 @@ * **************************************************************************/ -#pragma once +#ifndef _DBGDEFS_H_ +#define _DBGDEFS_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -33,3 +34,5 @@ typedef unsigned char TVuchar; #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif diff --git a/include/ique/PR/em.h b/include/ique/PR/em.h index fb8d9f98..bf81f480 100755 --- a/include/ique/PR/em.h +++ b/include/ique/PR/em.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _EM_H_ +#define _EM_H_ /************************************************************************** * * @@ -97,3 +98,5 @@ extern void emPause(void); #endif /* _LANGUAGE_C */ + +#endif /* !_EM_H_ */ diff --git a/include/ique/PR/gbi-poslight.h b/include/ique/PR/gbi-poslight.h index 7eb1faa0..7b93aea0 100644 --- a/include/ique/PR/gbi-poslight.h +++ b/include/ique/PR/gbi-poslight.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _GBI_POSLIGHT_H_ +#define _GBI_POSLIGHT_H_ /* version 990705 */ #define G_LIGHTING_POSITIONAL 0x00400000 @@ -124,3 +125,5 @@ typedef struct { _gdSPDefPosLight(r5,g5,b5,x5,y5,z5,c5,l5,q5), \ _gdSPDefPosLight(r6,g6,b6,x6,y6,z6,c6,l6,q6), \ _gdSPDefPosLight(r7,g7,b7,x7,y7,z7,c7,l7,q7)} } + +#endif /* _GBI_POSLIGHT_H_ */ diff --git a/include/ique/PR/gbi.h b/include/ique/PR/gbi.h index 46ee5816..986de97c 100755 --- a/include/ique/PR/gbi.h +++ b/include/ique/PR/gbi.h @@ -17,7 +17,8 @@ * **************************************************************************/ -#pragma once +#ifndef _GBI_H_ +#define _GBI_H_ #include @@ -4799,3 +4800,6 @@ typedef union { #endif #endif /* _LANGUAGE_C */ + + +#endif /* _GBI_H_ */ diff --git a/include/ique/PR/gs2dex.h b/include/ique/PR/gs2dex.h index fe736d1e..cf982d0d 100755 --- a/include/ique/PR/gs2dex.h +++ b/include/ique/PR/gs2dex.h @@ -9,7 +9,8 @@ $Id: gs2dex.h,v 1.1.1.1 2002/05/02 03:28:24 blythe Exp $ ---------------------------------------------------------------------*/ -#pragma once +#ifndef _GS2DEX_H_ +#define _GS2DEX_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -39,66 +40,66 @@ extern "C" { /* Non scalable background plane */ typedef struct { - u16 imageX; /* �ƥ�������κ������ X ��ɸ (u10.5) */ - u16 imageW; /* �ƥ���������� (u10.2) */ - s16 frameX; /* ž�������ե졼��κ������(s10.2) */ - u16 frameW; /* ž�������ե졼����� (u10.2) */ + u16 imageX; /* ƥκ X ɸ (u10.5) */ + u16 imageW; /* ƥ (u10.2) */ + s16 frameX; /* žե졼κ(s10.2) */ + u16 frameW; /* žե졼 (u10.2) */ - u16 imageY; /* �ƥ�������κ������ Y ��ɸ (u10.5) */ - u16 imageH; /* �ƥ�������ι⤵ (u10.2) */ - s16 frameY; /* ž�������ե졼��κ������(s10.2) */ - u16 frameH; /* ž�������ե졼��ι⤵ (u10.2) */ + u16 imageY; /* ƥκ Y ɸ (u10.5) */ + u16 imageH; /* ƥι⤵ (u10.2) */ + s16 frameY; /* žե졼κ(s10.2) */ + u16 frameH; /* žե졼ι⤵ (u10.2) */ - u64 *imagePtr; /* DRAM ��Υƥ������㥽�������ɥ쥹 */ - u16 imageLoad; /* LoadBlock, LoadTile �Τɤ������Ѥ��뤫 */ - u8 imageFmt; /* �ƥ�����Υե����ޥå� G_IM_FMT_* */ - u8 imageSiz; /* �ƥ�����Υ����� G_IM_SIZ_* */ - u16 imagePal; /* �ѥ�å��ֹ� */ - u16 imageFlip; /* ���᡼���κ���ȿž G_BG_FLAG_FLIPS ��ȿž */ + u64 *imagePtr; /* DRAM Υƥ㥽ɥ쥹 */ + u16 imageLoad; /* LoadBlock, LoadTile ΤɤѤ뤫 */ + u8 imageFmt; /* ƥΥեޥå G_IM_FMT_* */ + u8 imageSiz; /* ƥΥ G_IM_SIZ_* */ + u16 imagePal; /* ѥåֹ */ + u16 imageFlip; /* ᡼κȿž G_BG_FLAG_FLIPS ȿž */ - /* �ʲ��Ͻ�����롼���� guS2DInitBg() ������ꤵ���Τǥ桼������ - �ꤹ��ɬ�פϤʤ� */ - u16 tmemW; /* frame 1 �饤��� TMEM �� Word ������ - LoadBlock �λ� GS_PIX2TMEM(imageW/4,imageSiz) - LoadTile �λ� GS_PIX2TMEM(frameW/4,imageSiz)+1 */ - u16 tmemH; /* ���٤˥����ɤǤ��� TMEM �⤵ (s13.2) 4���� - �̾�ƥ�������λ� 512/tmemW*4 - CI �ƥ�������λ� 256/tmemW*4 */ - u16 tmemLoadSH; /* SH �� - LoadBlock �λ� tmemSize/2-1 - LoadTile �λ� tmemW*16-1 */ - u16 tmemLoadTH; /* TH �� or Stride �� - LoadBlock �λ� GS_CALC_DXT(tmemW) - LoadTile �λ� tmemH-1 */ - u16 tmemSizeW; /* image 1 �饤��ʬ�� imagePtr �Υ����å��� - LoadBlock �λ� tmemW*2 - LoadTile �λ� GS_PIX2TMEM(imageW/4,imageSiz)*2 */ - u16 tmemSize; /* �����ɰ��ʬ�� imagePtr �Υ����å��� + /* ʲϽ롼 guS2DInitBg() ꤵΤǥ桼 + ꤹɬפϤʤ */ + u16 tmemW; /* frame 1 饤 TMEM Word + LoadBlock λ GS_PIX2TMEM(imageW/4,imageSiz) + LoadTile λ GS_PIX2TMEM(frameW/4,imageSiz)+1 */ + u16 tmemH; /* ٤˥ɤǤ TMEM ⤵ (s13.2) 4 + ̾ƥλ 512/tmemW*4 + CI ƥλ 256/tmemW*4 */ + u16 tmemLoadSH; /* SH + LoadBlock λ tmemSize/2-1 + LoadTile λ tmemW*16-1 */ + u16 tmemLoadTH; /* TH or Stride + LoadBlock λ GS_CALC_DXT(tmemW) + LoadTile λ tmemH-1 */ + u16 tmemSizeW; /* image 1 饤ʬ imagePtr Υå + LoadBlock λ tmemW*2 + LoadTile λ GS_PIX2TMEM(imageW/4,imageSiz)*2 */ + u16 tmemSize; /* ɰʬ imagePtr Υå = tmemSizeW*tmemH */ } uObjBg_t; /* 40 bytes */ /* Scalable background plane */ typedef struct { - u16 imageX; /* �ƥ�������κ������ X ��ɸ (u10.5) */ - u16 imageW; /* �ƥ���������� (u10.2) */ - s16 frameX; /* ž�������ե졼��κ������(s10.2) */ - u16 frameW; /* ž�������ե졼����� (u10.2) */ + u16 imageX; /* ƥκ X ɸ (u10.5) */ + u16 imageW; /* ƥ (u10.2) */ + s16 frameX; /* žե졼κ(s10.2) */ + u16 frameW; /* žե졼 (u10.2) */ - u16 imageY; /* �ƥ�������κ������ Y ��ɸ (u10.5) */ - u16 imageH; /* �ƥ�������ι⤵ (u10.2) */ - s16 frameY; /* ž�������ե졼��κ������(s10.2) */ - u16 frameH; /* ž�������ե졼��ι⤵ (u10.2) */ + u16 imageY; /* ƥκ Y ɸ (u10.5) */ + u16 imageH; /* ƥι⤵ (u10.2) */ + s16 frameY; /* žե졼κ(s10.2) */ + u16 frameH; /* žե졼ι⤵ (u10.2) */ - u64 *imagePtr; /* DRAM ��Υƥ������㥽�������ɥ쥹 */ - u16 imageLoad; /* LoadBlock, LoadTile �Τɤ������Ѥ��뤫 */ - u8 imageFmt; /* �ƥ�����Υե����ޥå� G_IM_FMT_* */ - u8 imageSiz; /* �ƥ�����Υ����� G_IM_SIZ_* */ - u16 imagePal; /* �ѥ�å��ֹ� */ - u16 imageFlip; /* ���᡼���κ���ȿž G_BG_FLAG_FLIPS ��ȿž */ + u64 *imagePtr; /* DRAM Υƥ㥽ɥ쥹 */ + u16 imageLoad; /* LoadBlock, LoadTile ΤɤѤ뤫 */ + u8 imageFmt; /* ƥΥեޥå G_IM_FMT_* */ + u8 imageSiz; /* ƥΥ G_IM_SIZ_* */ + u16 imagePal; /* ѥåֹ */ + u16 imageFlip; /* ᡼κȿž G_BG_FLAG_FLIPS ȿž */ - u16 scaleW; /* X �������������� (u5.10) */ - u16 scaleH; /* Y �������������� (u5.10) */ - s32 imageYorig; /* image �ˤ������������ (s20.5) */ + u16 scaleW; /* X (u5.10) */ + u16 scaleH; /* Y (u5.10) */ + s32 imageYorig; /* image ˤ (s20.5) */ u8 padding[4]; @@ -113,24 +114,24 @@ typedef union { /*---------------------------------------------------------------------------* * 2D Objects *---------------------------------------------------------------------------*/ -#define G_OBJ_FLAG_FLIPS 1<<0 /* S ����ȿž */ -#define G_OBJ_FLAG_FLIPT 1<<4 /* T ����ȿž */ +#define G_OBJ_FLAG_FLIPS 1<<0 /* S ȿž */ +#define G_OBJ_FLAG_FLIPT 1<<4 /* T ȿž */ typedef struct { - s16 objX; /* s10.2 OBJ ����ü X ��ɸ */ - u16 scaleW; /* u5.10 ��������������� */ - u16 imageW; /* u10.5 �ƥ���������� (S ������Ĺ��) */ - u16 paddingX; /* ̤���� ��� 0 */ - s16 objY; /* s10.2 OBJ ����ü Y ��ɸ */ - u16 scaleH; /* u5.10 �⤵������������� */ - u16 imageH; /* u10.5 �ƥ�������ι⤵ (T ������Ĺ��) */ - u16 paddingY; /* ̤���� ��� 0 */ - u16 imageStride; /* �ƥ�������ޤ��֤��� (64bit word ñ��) */ - u16 imageAdrs; /* TMEM ��Υƥ���������Ƭ���� (64bit word ñ��) */ - u8 imageFmt; /* �ƥ�����Υե����ޥå� G_IM_FMT_* */ - u8 imageSiz; /* �ƥ�����Υ����� G_IM_SIZ_* */ - u8 imagePal; /* �ѥ�å��ֹ� 0-7 */ - u8 imageFlags; /* ɽ���ե饰 G_OBJ_FLAG_FLIP* */ + s16 objX; /* s10.2 OBJ ü X ɸ */ + u16 scaleW; /* u5.10 */ + u16 imageW; /* u10.5 ƥ (S Ĺ) */ + u16 paddingX; /* ̤ 0 */ + s16 objY; /* s10.2 OBJ ü Y ɸ */ + u16 scaleH; /* u5.10 ⤵ */ + u16 imageH; /* u10.5 ƥι⤵ (T Ĺ) */ + u16 paddingY; /* ̤ 0 */ + u16 imageStride; /* ƥޤ֤ (64bit word ñ) */ + u16 imageAdrs; /* TMEM ΥƥƬ (64bit word ñ) */ + u8 imageFmt; /* ƥΥեޥå G_IM_FMT_* */ + u8 imageSiz; /* ƥΥ G_IM_SIZ_* */ + u8 imagePal; /* ѥåֹ 0-7 */ + u8 imageFlags; /* ɽե饰 G_OBJ_FLAG_FLIP* */ } uObjSprite_t; /* 24 bytes */ typedef union { @@ -175,12 +176,12 @@ typedef union { #define GS_TB_TLINE(pix,siz) (GS_CALC_DXT(GS_PIX2TMEM((pix),(siz)))) typedef struct { - u32 type; /* Type ���� G_OBJLT_TXTRBLOCK */ - u64 *image; /* DRAM ��Υƥ������㥽�������ɥ쥹 */ - u16 tmem; /* ��������� TMEM ��ɥ��ɥ쥹 (8byteWORD) */ - u16 tsize; /* Texture ������ �ޥ��� GS_TB_TSIZE() �ǻ��� */ - u16 tline; /* Texture 1 �饤���� �ޥ��� GS_TB_TLINE() �ǻ��� */ - u16 sid; /* STATE ID 4 ���ܿ��� 0,4,8,12 �Τɤ줫 */ + u32 type; /* Type G_OBJLT_TXTRBLOCK */ + u64 *image; /* DRAM Υƥ㥽ɥ쥹 */ + u16 tmem; /* TMEM ɥɥ쥹 (8byteWORD) */ + u16 tsize; /* Texture ޥ GS_TB_TSIZE() ǻ */ + u16 tline; /* Texture 1 饤 ޥ GS_TB_TLINE() ǻ */ + u16 sid; /* STATE ID 4 ܿ 0,4,8,12 Τɤ줫 */ u32 flag; /* STATE flag */ u32 mask; /* STATE mask */ } uObjTxtrBlock_t; /* 24 bytes */ @@ -189,12 +190,12 @@ typedef struct { #define GS_TT_THEIGHT(pix,siz) (((pix)<<2)-1) typedef struct { - u32 type; /* Type ���� G_OBJLT_TXTRTILE */ - u64 *image; /* DRAM ��Υƥ������㥽�������ɥ쥹 */ - u16 tmem; /* ��������� TMEM ��ɥ��ɥ쥹 (8byteWORD) */ - u16 twidth; /* Texture �� �ޥ��� GS_TT_TWIDTH() �ǻ��� */ - u16 theight; /* Texture �⤵ �ޥ��� GS_TT_THEIGHT() �ǻ��� */ - u16 sid; /* STATE ID 4 ���ܿ��� 0,4,8,12 �Τɤ줫 */ + u32 type; /* Type G_OBJLT_TXTRTILE */ + u64 *image; /* DRAM Υƥ㥽ɥ쥹 */ + u16 tmem; /* TMEM ɥɥ쥹 (8byteWORD) */ + u16 twidth; /* Texture ޥ GS_TT_TWIDTH() ǻ */ + u16 theight; /* Texture ⤵ ޥ GS_TT_THEIGHT() ǻ */ + u16 sid; /* STATE ID 4 ܿ 0,4,8,12 Τɤ줫 */ u32 flag; /* STATE flag */ u32 mask; /* STATE mask */ } uObjTxtrTile_t; /* 24 bytes */ @@ -203,12 +204,12 @@ typedef struct { #define GS_PAL_NUM(num) ((num)-1) typedef struct { - u32 type; /* Type ���� G_OBJLT_TLUT */ - u64 *image; /* DRAM ��Υƥ������㥽�������ɥ쥹 */ - u16 phead; /* ��������Ƭ�Υѥ�å��ֹ� 256 �ʾ� 511 �ʲ� */ - u16 pnum; /* �����ɤ���ѥ�åȿ� - 1 */ - u16 zero; /* ��� 0 ���������� */ - u16 sid; /* STATE ID 4 ���ܿ��� 0,4,8,12 �Τɤ줫 */ + u32 type; /* Type G_OBJLT_TLUT */ + u64 *image; /* DRAM Υƥ㥽ɥ쥹 */ + u16 phead; /* ƬΥѥåֹ 256 ʾ 511 ʲ */ + u16 pnum; /* ɤѥåȿ - 1 */ + u16 zero; /* 0 */ + u16 sid; /* STATE ID 4 ܿ 0,4,8,12 Τɤ줫 */ u32 flag; /* STATE flag */ u32 mask; /* STATE mask */ } uObjTxtrTLUT_t; /* 24 bytes */ @@ -321,7 +322,7 @@ typedef struct { /*---------------------------------------------------------------------------* * Set general status *---------------------------------------------------------------------------*/ -#define G_MW_GENSTAT 0x08 /* G_MW_FOG ��Ʊ���ͤʤΤ����� */ +#define G_MW_GENSTAT 0x08 /* G_MW_FOG ƱͤʤΤ */ #define gSPSetStatus(pkt, sid, val) \ gMoveWd((pkt), G_MW_GENSTAT, (sid), (val)) @@ -387,5 +388,6 @@ extern void guS2DInitBg(uObjBg *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif +#endif /* _GS2DEX_H_ */ /*======== End of gs2dex.h ========*/ diff --git a/include/ique/PR/gt.h b/include/ique/PR/gt.h index 1150ca89..b6bbb5e5 100755 --- a/include/ique/PR/gt.h +++ b/include/ique/PR/gt.h @@ -44,7 +44,8 @@ * **************************************************************************/ -#pragma once +#ifndef _GT_H_ +#define _GT_H_ /* this file should be #included AFTER gbi.h */ @@ -360,3 +361,5 @@ typedef union { #ifdef _LANGUAGE_MAKEROM #endif /* _LANGUAGE_MAKEROM */ + +#endif /* _GT_H_ */ diff --git a/include/ique/PR/gu.h b/include/ique/PR/gu.h index 76317677..a8d2d701 100755 --- a/include/ique/PR/gu.h +++ b/include/ique/PR/gu.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _GU_H_ +#define _GU_H_ /************************************************************************** * * @@ -264,3 +265,5 @@ void guSprite2DInit(uSprite *SpritePointer, int SourceImageBitSize, int SourceImageOffsetS, int SourceImageOffsetT); + +#endif /* !_GU_H_ */ diff --git a/include/ique/PR/gzsort.h b/include/ique/PR/gzsort.h index 9ee88c1e..edd3e1ed 100755 --- a/include/ique/PR/gzsort.h +++ b/include/ique/PR/gzsort.h @@ -6,7 +6,8 @@ $Id: gzsort.h,v 1.1.1.1 2002/05/02 03:28:24 blythe Exp $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _GZSORT_H_ +#define _GZSORT_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -627,5 +628,6 @@ extern u64 gspZSort_pl_fifoDataStart[], gspZSort_pl_fifoDataEnd[]; #ifdef _LANGUAGE_C_PLUS_PLUS } #endif +#endif /* _GZSORT_H_ */ /*======== End of gzsort.h ========*/ diff --git a/include/ique/PR/leo.h b/include/ique/PR/leo.h index 40fb203a..0cb43e32 100755 --- a/include/ique/PR/leo.h +++ b/include/ique/PR/leo.h @@ -7,7 +7,8 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _LEO_H_ +#define _LEO_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -275,3 +276,5 @@ extern void LeoBootGame(void *entry); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_LEO_H */ diff --git a/include/ique/PR/leosp.h b/include/ique/PR/leosp.h index 0de18dc7..a4897eed 100755 --- a/include/ique/PR/leosp.h +++ b/include/ique/PR/leosp.h @@ -7,7 +7,8 @@ * **************************************************************************/ -#pragma once +#ifndef _LEOSP_H_ +#define _LEOSP_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -45,3 +46,5 @@ extern s32 LeoSysReadWrite(LEOCmd *cmdBlock, s32 direction, #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_LEOSP_H */ diff --git a/include/ique/PR/libaudio.h b/include/ique/PR/libaudio.h index 44e919a6..cb7a5b19 100644 --- a/include/ique/PR/libaudio.h +++ b/include/ique/PR/libaudio.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _ULTRA64_LIBAUDIO_H_ +#define _ULTRA64_LIBAUDIO_H_ #include "abi.h" @@ -46,3 +47,5 @@ typedef struct } ALSeqFile; void alSeqFileNew(ALSeqFile *f, u8 *base); + +#endif diff --git a/include/ique/PR/mbi.h b/include/ique/PR/mbi.h index c58ca777..a63824e7 100755 --- a/include/ique/PR/mbi.h +++ b/include/ique/PR/mbi.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _MBI_H_ +#define _MBI_H_ /************************************************************************** * * @@ -95,3 +96,5 @@ #ifndef NULL #define NULL 0 #endif + +#endif /* !_MBI_H_ */ diff --git a/include/ique/PR/os.h b/include/ique/PR/os.h index 57711e88..a44ed17b 100755 --- a/include/ique/PR/os.h +++ b/include/ique/PR/os.h @@ -27,7 +27,8 @@ $Date: 2002/10/29 08:06:34 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_H_ +#define _OS_H_ #include #include @@ -103,3 +104,5 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_H */ diff --git a/include/ique/PR/os_ai.h b/include/ique/PR/os_ai.h index 77a42c9b..0aa0b0d7 100755 --- a/include/ique/PR/os_ai.h +++ b/include/ique/PR/os_ai.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_AI_H_ +#define _OS_AI_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -87,3 +88,5 @@ extern s32 osAiSetNextBuffer(void *, u32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_AI_H_ */ diff --git a/include/ique/PR/os_bb.h b/include/ique/PR/os_bb.h index 7787f77d..a7a92d89 100644 --- a/include/ique/PR/os_bb.h +++ b/include/ique/PR/os_bb.h @@ -6,7 +6,8 @@ $Date: 2004/06/28 22:34:42 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_BB_H_ +#define _OS_BB_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -106,3 +107,5 @@ extern void osBbRtcGet(u8* year, u8* month, u8* day, u8* dow, u8* hour, u8* min, #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_BB_H_ */ diff --git a/include/ique/PR/os_bb_export.h b/include/ique/PR/os_bb_export.h index d4c90ff7..49eae36b 100755 --- a/include/ique/PR/os_bb_export.h +++ b/include/ique/PR/os_bb_export.h @@ -2,7 +2,8 @@ Copyright (C) 2002 - 2004 BroadOn Communications. *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_BB_H_ +#define _OS_BB_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -25,3 +26,5 @@ extern void osBbRtcGet(u8* year, u8* month, u8* day, u8* dow, u8* hour, u8* min, #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_BB_H_ */ diff --git a/include/ique/PR/os_cache.h b/include/ique/PR/os_cache.h index ed51043f..71b35343 100755 --- a/include/ique/PR/os_cache.h +++ b/include/ique/PR/os_cache.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_CACHE_H_ +#define _OS_CACHE_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -91,3 +92,5 @@ extern void osWritebackDCacheAll(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_CACHE_H_ */ diff --git a/include/ique/PR/os_cont.h b/include/ique/PR/os_cont.h index c9e57f1b..bafdbc8a 100755 --- a/include/ique/PR/os_cont.h +++ b/include/ique/PR/os_cont.h @@ -27,7 +27,8 @@ $Date: 2004/10/29 00:51:42 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_CONT_H_ +#define _OS_CONT_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -214,3 +215,5 @@ extern void osContGetReadData(OSContPad *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_CONT_H_ */ diff --git a/include/ique/PR/os_convert.h b/include/ique/PR/os_convert.h index 406cf1ed..3f712545 100755 --- a/include/ique/PR/os_convert.h +++ b/include/ique/PR/os_convert.h @@ -27,7 +27,8 @@ $Date: 2002/10/29 08:06:34 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_CONVERT_H_ +#define _OS_CONVERT_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -106,3 +107,5 @@ extern void * osPhysicalToVirtual(u32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_CONVERT_H_ */ diff --git a/include/ique/PR/os_debug.h b/include/ique/PR/os_debug.h index d6c45a03..35a7bbb3 100755 --- a/include/ique/PR/os_debug.h +++ b/include/ique/PR/os_debug.h @@ -27,7 +27,8 @@ $Date: 2002/10/29 08:06:34 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_DEBUG_H_ +#define _OS_DEBUG_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -112,3 +113,5 @@ extern OSTime osThreadProfileReadTimeTh(OSThread*); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_DEBUG_H_ */ diff --git a/include/ique/PR/os_eeprom.h b/include/ique/PR/os_eeprom.h index 3e62542d..050b8a88 100755 --- a/include/ique/PR/os_eeprom.h +++ b/include/ique/PR/os_eeprom.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_EEPROM_H_ +#define _OS_EEPROM_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -102,3 +103,5 @@ extern s32 osEepromLongWrite(OSMesgQueue *, u8, u8 *, int); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_EEPROM_H_ */ diff --git a/include/ique/PR/os_error.h b/include/ique/PR/os_error.h index 7c380296..51d4c67a 100755 --- a/include/ique/PR/os_error.h +++ b/include/ique/PR/os_error.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_ERROR_H_ +#define _OS_ERROR_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -81,3 +82,5 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_ERROR_H_ */ diff --git a/include/ique/PR/os_exception.h b/include/ique/PR/os_exception.h index 2dea84ee..d546d5a0 100755 --- a/include/ique/PR/os_exception.h +++ b/include/ique/PR/os_exception.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_EXCEPTION_H_ +#define _OS_EXCEPTION_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -114,3 +115,5 @@ extern OSIntMask osSetIntMask(OSIntMask); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_EXCEPTION_H_ */ diff --git a/include/ique/PR/os_flash.h b/include/ique/PR/os_flash.h index 866d1542..8357a116 100755 --- a/include/ique/PR/os_flash.h +++ b/include/ique/PR/os_flash.h @@ -6,7 +6,8 @@ $Date: 2002/10/29 08:06:34 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_FLASH_H_ +#define _OS_FLASH_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -66,3 +67,5 @@ extern s32 osFlashCheckEraseEnd(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_FLASH_H_ */ diff --git a/include/ique/PR/os_gbpak.h b/include/ique/PR/os_gbpak.h index 3f69bfac..fa6aaddc 100755 --- a/include/ique/PR/os_gbpak.h +++ b/include/ique/PR/os_gbpak.h @@ -7,7 +7,8 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_GBPAK_H_ +#define _OS_GBPAK_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -102,3 +103,5 @@ extern s32 osGbpakCheckConnector(OSPfs *, u8 *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_GBPAK_H_ */ diff --git a/include/ique/PR/os_gio.h b/include/ique/PR/os_gio.h index 225a74a6..d274b97d 100755 --- a/include/ique/PR/os_gio.h +++ b/include/ique/PR/os_gio.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_GIO_H_ +#define _OS_GIO_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -81,3 +82,5 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_GIO_H_ */ diff --git a/include/ique/PR/os_host.h b/include/ique/PR/os_host.h index d4d0c48c..8cb72e74 100755 --- a/include/ique/PR/os_host.h +++ b/include/ique/PR/os_host.h @@ -27,7 +27,8 @@ $Date: 2004/06/28 22:34:42 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_HOST_H_ +#define _OS_HOST_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -165,3 +166,5 @@ extern void osResetRdb(); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_HOST_H_ */ diff --git a/include/ique/PR/os_internal.h b/include/ique/PR/os_internal.h index d02f7d13..ff2dc227 100755 --- a/include/ique/PR/os_internal.h +++ b/include/ique/PR/os_internal.h @@ -18,7 +18,8 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_H_ +#define _OS_INTERNAL_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -44,3 +45,5 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_H */ diff --git a/include/ique/PR/os_internal_debug.h b/include/ique/PR/os_internal_debug.h index d3ca89ef..24337b83 100755 --- a/include/ique/PR/os_internal_debug.h +++ b/include/ique/PR/os_internal_debug.h @@ -18,7 +18,8 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_DEBUG_H_ +#define _OS_INTERNAL_DEBUG_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -38,3 +39,5 @@ extern int __osAtomicDec(unsigned int *p); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_DEBUG_H */ diff --git a/include/ique/PR/os_internal_error.h b/include/ique/PR/os_internal_error.h index dc041b05..0607f873 100755 --- a/include/ique/PR/os_internal_error.h +++ b/include/ique/PR/os_internal_error.h @@ -18,7 +18,8 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_ERROR_H_ +#define _OS_INTERNAL_ERROR_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -40,3 +41,5 @@ extern OSThread * __osGetNextFaultedThread(OSThread *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_ERROR_H */ diff --git a/include/ique/PR/os_internal_exception.h b/include/ique/PR/os_internal_exception.h index be5fa8db..8f38e5cb 100755 --- a/include/ique/PR/os_internal_exception.h +++ b/include/ique/PR/os_internal_exception.h @@ -18,7 +18,8 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_EXCEPTION_H_ +#define _OS_INTERNAL_EXCEPTION_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -44,3 +45,5 @@ extern void __osResetGlobalIntMask(OSHWIntr); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_EXCEPTION_H */ diff --git a/include/ique/PR/os_internal_gio.h b/include/ique/PR/os_internal_gio.h index 0021bc44..4ad86fd0 100755 --- a/include/ique/PR/os_internal_gio.h +++ b/include/ique/PR/os_internal_gio.h @@ -18,7 +18,8 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_GIO_H_ +#define _OS_INTERNAL_GIO_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -40,3 +41,5 @@ extern void __osGIORawInterrupt(s32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_GIO_H */ diff --git a/include/ique/PR/os_internal_host.h b/include/ique/PR/os_internal_host.h index 9d802724..b5f7c6bb 100755 --- a/include/ique/PR/os_internal_host.h +++ b/include/ique/PR/os_internal_host.h @@ -18,7 +18,8 @@ $Date: 2002/05/02 03:28:24 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_HOST_H_ +#define _OS_INTERNAL_HOST_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -37,3 +38,5 @@ extern u32 __osRdbSend(u8 *buf, u32 size, u32 type); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_HOST_H */ diff --git a/include/ique/PR/os_internal_reg.h b/include/ique/PR/os_internal_reg.h index 825719b3..395655d8 100755 --- a/include/ique/PR/os_internal_reg.h +++ b/include/ique/PR/os_internal_reg.h @@ -18,7 +18,8 @@ $Date: 2002/10/29 08:06:34 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_REG_H_ +#define _OS_INTERNAL_REG_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -54,3 +55,5 @@ extern u32 __osGetFpcCsr(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_REG_H */ diff --git a/include/ique/PR/os_internal_rsp.h b/include/ique/PR/os_internal_rsp.h index 271a91d9..b2fbd082 100755 --- a/include/ique/PR/os_internal_rsp.h +++ b/include/ique/PR/os_internal_rsp.h @@ -18,7 +18,8 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_RSP_H_ +#define _OS_INTERNAL_RSP_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -43,3 +44,5 @@ extern s32 __osSpRawStartDma(s32, u32, void *, u32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_RSP_H */ diff --git a/include/ique/PR/os_internal_si.h b/include/ique/PR/os_internal_si.h index 8ffbaf29..6dccf6d6 100755 --- a/include/ique/PR/os_internal_si.h +++ b/include/ique/PR/os_internal_si.h @@ -18,7 +18,8 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_SI_H_ +#define _OS_INTERNAL_SI_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -41,3 +42,5 @@ extern s32 __osSiRawStartDma(s32, void *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_SI_H */ diff --git a/include/ique/PR/os_internal_thread.h b/include/ique/PR/os_internal_thread.h index 8ee5f2b1..a4d2e0fe 100755 --- a/include/ique/PR/os_internal_thread.h +++ b/include/ique/PR/os_internal_thread.h @@ -18,7 +18,8 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_THREAD_H_ +#define _OS_INTERNAL_THREAD_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -38,3 +39,5 @@ extern OSThread * __osGetActiveQueue(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_THREAD_H */ diff --git a/include/ique/PR/os_internal_tlb.h b/include/ique/PR/os_internal_tlb.h index 70e07569..9f0c18a2 100755 --- a/include/ique/PR/os_internal_tlb.h +++ b/include/ique/PR/os_internal_tlb.h @@ -18,7 +18,8 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_TLB_H_ +#define _OS_INTERNAL_TLB_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -42,3 +43,5 @@ extern u32 __osGetTLBLo1(s32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_TLB_H */ diff --git a/include/ique/PR/os_libc.h b/include/ique/PR/os_libc.h index a851851e..72417ebb 100755 --- a/include/ique/PR/os_libc.h +++ b/include/ique/PR/os_libc.h @@ -27,7 +27,8 @@ $Date: 2004/11/16 01:47:19 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_LIBC_H_ +#define _OS_LIBC_H_ #include "os_pfs.h" @@ -98,3 +99,5 @@ extern void osSyncPrintf(const char *fmt, ...); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_LIBC_H_ */ diff --git a/include/ique/PR/os_message.h b/include/ique/PR/os_message.h index f95fd934..3f93e3ff 100755 --- a/include/ique/PR/os_message.h +++ b/include/ique/PR/os_message.h @@ -27,7 +27,8 @@ $Date: 2004/06/28 22:34:42 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_MESSAGE_H_ +#define _OS_MESSAGE_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -162,3 +163,5 @@ extern void osSetEventMesg(OSEvent, OSMesgQueue *, OSMesg); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_MESSAGE_H_ */ diff --git a/include/ique/PR/os_motor.h b/include/ique/PR/os_motor.h index b4cc421f..d851f577 100755 --- a/include/ique/PR/os_motor.h +++ b/include/ique/PR/os_motor.h @@ -7,7 +7,8 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_MOTOR_H_ +#define _OS_MOTOR_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -78,3 +79,5 @@ extern s32 osMotorStart(OSPfs *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_MOTOR_H_ */ diff --git a/include/ique/PR/os_pfs.h b/include/ique/PR/os_pfs.h index ef1a7e38..38c70c05 100755 --- a/include/ique/PR/os_pfs.h +++ b/include/ique/PR/os_pfs.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_PFS_H_ +#define _OS_PFS_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -169,3 +170,5 @@ extern s32 osPfsNumFiles(OSPfs *, s32 *, s32 *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_PFS_H_ */ diff --git a/include/ique/PR/os_pi.h b/include/ique/PR/os_pi.h index 756c22fa..9df269f5 100755 --- a/include/ique/PR/os_pi.h +++ b/include/ique/PR/os_pi.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_PI_H_ +#define _OS_PI_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -219,3 +220,5 @@ extern s32 osEPiLinkHandle(OSPiHandle *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_PI_H_ */ diff --git a/include/ique/PR/os_rdp.h b/include/ique/PR/os_rdp.h index ae96543d..edc767c5 100755 --- a/include/ique/PR/os_rdp.h +++ b/include/ique/PR/os_rdp.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_RDP_H_ +#define _OS_RDP_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -87,3 +88,5 @@ extern s32 osDpSetNextBuffer(void *, u64); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_RDP_H_ */ diff --git a/include/ique/PR/os_reg.h b/include/ique/PR/os_reg.h index 7981a907..3ec0c5ab 100755 --- a/include/ique/PR/os_reg.h +++ b/include/ique/PR/os_reg.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_REG_H_ +#define _OS_REG_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -85,3 +86,5 @@ extern u32 osGetCount(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_REG_H_ */ diff --git a/include/ique/PR/os_rsp.h b/include/ique/PR/os_rsp.h index 4201a5d7..d02d544c 100755 --- a/include/ique/PR/os_rsp.h +++ b/include/ique/PR/os_rsp.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_RSP_H_ +#define _OS_RSP_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -81,3 +82,5 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_RSP_H_ */ diff --git a/include/ique/PR/os_si.h b/include/ique/PR/os_si.h index cf555132..de5094fc 100755 --- a/include/ique/PR/os_si.h +++ b/include/ique/PR/os_si.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_SI_H_ +#define _OS_SI_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -81,3 +82,5 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_SI_H_ */ diff --git a/include/ique/PR/os_system.h b/include/ique/PR/os_system.h index e0516728..168de781 100755 --- a/include/ique/PR/os_system.h +++ b/include/ique/PR/os_system.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_SYSTEM_H_ +#define _OS_SYSTEM_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -113,3 +114,5 @@ extern s32 osAfterPreNMI(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_SYSTEM_H_ */ diff --git a/include/ique/PR/os_thread.h b/include/ique/PR/os_thread.h index f4170a9c..4ca4cbdf 100755 --- a/include/ique/PR/os_thread.h +++ b/include/ique/PR/os_thread.h @@ -27,7 +27,8 @@ $Date: 2004/02/06 02:16:48 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_THREAD_H_ +#define _OS_THREAD_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -169,3 +170,5 @@ extern OSPri osGetThreadPri(OSThread *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_THREAD_H_ */ diff --git a/include/ique/PR/os_time.h b/include/ique/PR/os_time.h index b9707c46..f2dbf82a 100755 --- a/include/ique/PR/os_time.h +++ b/include/ique/PR/os_time.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_TIME_H_ +#define _OS_TIME_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -109,3 +110,5 @@ extern int osStopTimer(OSTimer *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_TIME_H_ */ diff --git a/include/ique/PR/os_tlb.h b/include/ique/PR/os_tlb.h index 34d5cf3a..a27ed30b 100755 --- a/include/ique/PR/os_tlb.h +++ b/include/ique/PR/os_tlb.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_TLB_H_ +#define _OS_TLB_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -102,3 +103,5 @@ extern void osSetTLBASID(s32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_TLB_H_ */ diff --git a/include/ique/PR/os_usb.h b/include/ique/PR/os_usb.h index eacff61b..f2961844 100755 --- a/include/ique/PR/os_usb.h +++ b/include/ique/PR/os_usb.h @@ -26,7 +26,8 @@ $Date: 2004/09/03 03:52:47 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_USB_H_ +#define _OS_USB_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -167,3 +168,5 @@ extern s32 osBbUsbDevWrite(OSBbUsbHandle, u8 *, s32, u64); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_USB_H_ */ diff --git a/include/ique/PR/os_version.h b/include/ique/PR/os_version.h index 0acc34d3..2be0c971 100755 --- a/include/ique/PR/os_version.h +++ b/include/ique/PR/os_version.h @@ -7,7 +7,10 @@ $Date: 2002/10/29 08:06:34 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_VERSION_H_ +#define _OS_VERSION_H_ #define OS_MAJOR_VERSION "2.0K" /* major version */ #define OS_MINOR_VERSION 0 /* patch level */ + +#endif /* !_OS_VERSION_H_ */ diff --git a/include/ique/PR/os_vi.h b/include/ique/PR/os_vi.h index 46c4b228..c00498e7 100755 --- a/include/ique/PR/os_vi.h +++ b/include/ique/PR/os_vi.h @@ -27,7 +27,8 @@ $Date: 2002/05/02 03:28:25 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_VI_H_ +#define _OS_VI_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -293,3 +294,5 @@ extern void osCreateViManager(OSPri); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_VI_H_ */ diff --git a/include/ique/PR/os_voice.h b/include/ique/PR/os_voice.h index db499d37..207eb6f9 100755 --- a/include/ique/PR/os_voice.h +++ b/include/ique/PR/os_voice.h @@ -7,7 +7,8 @@ $Date: 2002/10/29 08:06:34 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_VOICE_H_ +#define _OS_VOICE_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -103,3 +104,5 @@ extern void osVoiceCountSyllables(u8 *, u32 *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_VOICE_H_ */ diff --git a/include/ique/PR/ramrom.h b/include/ique/PR/ramrom.h index bd2989e6..7ac67d4c 100755 --- a/include/ique/PR/ramrom.h +++ b/include/ique/PR/ramrom.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _RAMROM_H +#define _RAMROM_H /************************************************************************** * * @@ -113,3 +114,5 @@ typedef struct { void __RamRomInit(int key, void *romaddr); void __RamRomDestroy(int key); #endif /* _EMULATOR */ + +#endif /* !_RAMROM_H */ diff --git a/include/ique/PR/rcp.h b/include/ique/PR/rcp.h index 6108e334..0a51d6c2 100755 --- a/include/ique/PR/rcp.h +++ b/include/ique/PR/rcp.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _RCP_H_ +#define _RCP_H_ /************************************************************************** * * @@ -879,3 +880,6 @@ The Indy development board use cartridge domain 1: IO_READ(SP_STATUS_REG)) #endif + +#endif /* _RCP_H_ */ + diff --git a/include/ique/PR/rdb.h b/include/ique/PR/rdb.h index c232dc52..c2b9775d 100755 --- a/include/ique/PR/rdb.h +++ b/include/ique/PR/rdb.h @@ -7,7 +7,8 @@ * **************************************************************************/ -#pragma once +#ifndef _RDB_H +#define _RDB_H /* U64 side address */ #define RDB_BASE_REG 0xc0000000 @@ -102,3 +103,5 @@ extern unsigned int __osRdbWriteOK; extern unsigned int __osRdbSendMessage; #endif /* _LANGUAGE_C */ + +#endif /* !_RDB_H */ diff --git a/include/ique/PR/region.h b/include/ique/PR/region.h index 0a64647b..f84d7c06 100755 --- a/include/ique/PR/region.h +++ b/include/ique/PR/region.h @@ -27,7 +27,8 @@ **************************************************************************/ -#pragma once +#ifndef _REGION_H_ +#define _REGION_H_ #ifdef _LANGUAGE_C_PLUS_PLUS @@ -115,3 +116,8 @@ extern s32 osGetRegionBufSize(void *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + + +#endif /* _REGION_H_ */ + + diff --git a/include/ique/PR/rmon.h b/include/ique/PR/rmon.h index 2d7ad5e7..e949a0f0 100755 --- a/include/ique/PR/rmon.h +++ b/include/ique/PR/rmon.h @@ -18,7 +18,8 @@ * **************************************************************************/ -#pragma once +#ifndef _RMON_H_ +#define _RMON_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -48,3 +49,5 @@ extern void rmonPrintf( const char *, ... ); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_H */ diff --git a/include/ique/PR/rsp.h b/include/ique/PR/rsp.h index dff1efc3..2ae03153 100755 --- a/include/ique/PR/rsp.h +++ b/include/ique/PR/rsp.h @@ -17,7 +17,8 @@ * **************************************************************************/ -#pragma once +#ifndef _RSP_H_ +#define _RSP_H_ 1 #define RSP_DMEM_BASE 0x04000000 #define RSP_IMEM_BASE 0x04001000 @@ -79,3 +80,6 @@ .name CMD_TMEM_BUSY, $c15 #endif + + +#endif diff --git a/include/ique/PR/rsp_ipc.h b/include/ique/PR/rsp_ipc.h index 1711f2db..7e5b74ff 100755 --- a/include/ique/PR/rsp_ipc.h +++ b/include/ique/PR/rsp_ipc.h @@ -15,7 +15,8 @@ * **************************************************************************/ -#pragma once +#ifndef _RSP_IPC_H_ +#define _RSP_IPC_H_ 1 #if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) @@ -64,3 +65,5 @@ extern int sem_signal(int id); extern int sem_op(int id, int value); #endif + +#endif diff --git a/include/ique/PR/sp.h b/include/ique/PR/sp.h index 58f1ce90..4d7737c6 100755 --- a/include/ique/PR/sp.h +++ b/include/ique/PR/sp.h @@ -20,7 +20,8 @@ * **************************************************************************/ -#pragma once +#ifndef _SP_H_ +#define _SP_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -191,3 +192,5 @@ void spFinish( Gfx **glistp ); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* _SP_H_ */ diff --git a/include/ique/PR/sptask.h b/include/ique/PR/sptask.h index f6bdaba2..ec4d8d4e 100755 --- a/include/ique/PR/sptask.h +++ b/include/ique/PR/sptask.h @@ -18,7 +18,8 @@ * **************************************************************************/ -#pragma once +#ifndef _SPTASK_H_ +#define _SPTASK_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -196,3 +197,5 @@ extern OSYieldResult osSpTaskYielded(OSTask *tp); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_SPTASK_H */ diff --git a/include/ique/PR/trace.h b/include/ique/PR/trace.h index fb3d7ff2..35dcd329 100755 --- a/include/ique/PR/trace.h +++ b/include/ique/PR/trace.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _TRACE_H_ +#define _TRACE_H_ /************************************************************************** @@ -75,3 +76,7 @@ extern unsigned long Dflags; /* Global debug flag */ * Extern function prototypes * */ + + +#endif /* _TRACE_H_ */ + diff --git a/include/ique/PR/ucode.h b/include/ique/PR/ucode.h index 8c730c9e..5389a017 100644 --- a/include/ique/PR/ucode.h +++ b/include/ique/PR/ucode.h @@ -18,7 +18,8 @@ * **************************************************************************/ -#pragma once +#ifndef _UCODE_H_ +#define _UCODE_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -258,3 +259,5 @@ extern u64 rspF3DDataStart[], rspF3DDataEnd[]; #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_UCODE_H */ diff --git a/include/ique/PR/ucode_debug.h b/include/ique/PR/ucode_debug.h index 518a2287..f71a255b 100755 --- a/include/ique/PR/ucode_debug.h +++ b/include/ique/PR/ucode_debug.h @@ -6,7 +6,8 @@ $Id: ucode_debug.h,v 1.1.1.1 2002/05/02 03:28:25 blythe Exp $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _UCODE_DEBUG_H_ +#define _UCODE_DEBUG_H_ #define DEBUG_DL_PTR() IO_READ(SP_DMEM_START+0xfc0) @@ -48,5 +49,6 @@ extern long long int gspS2DEX2d_xbusDataStart[], gspS2DEX2d_xbusDataEnd[]; #ifdef _LANGUAGE_C_PLUS_PLUS } #endif +#endif /* !_UCODE_DEBUG_H */ /*======== End of ucode_debug.h ========*/ diff --git a/include/ique/PR/ultraerror.h b/include/ique/PR/ultraerror.h index 774b7e5e..33fce660 100755 --- a/include/ique/PR/ultraerror.h +++ b/include/ique/PR/ultraerror.h @@ -26,7 +26,8 @@ * **************************************************************************/ -#pragma once +#ifndef __ULTRAERROR_H__ +#define __ULTRAERROR_H__ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -174,3 +175,5 @@ OSErrorHandler osSetErrorHandler(OSErrorHandler); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* __ULTRAERROR_H__ */ diff --git a/include/ique/PR/ultratypes.h b/include/ique/PR/ultratypes.h index f8bb0d49..057d6ffd 100644 --- a/include/ique/PR/ultratypes.h +++ b/include/ique/PR/ultratypes.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _ULTRATYPES_H_ +#define _ULTRATYPES_H_ /************************************************************************** @@ -91,3 +92,6 @@ typedef volatile s64 vs64; #ifndef NULL #define NULL (void *)0 #endif + +#endif /* _ULTRATYPES_H_ */ + diff --git a/include/ique/PR/uportals.h b/include/ique/PR/uportals.h index 1c2a19ac..1692497c 100755 --- a/include/ique/PR/uportals.h +++ b/include/ique/PR/uportals.h @@ -30,7 +30,8 @@ -#pragma once +#ifndef __ULTRAPORTALS_H__ +#define __ULTRAPORTALS_H__ #include #include "matrix.h" @@ -129,3 +130,5 @@ extern upLocateData upLocator; /* also extern by test_portals.h */ #ifdef __Cplusplus } #endif + +#endif diff --git a/include/ique/PR/verify.h b/include/ique/PR/verify.h index 204293ba..35141b3c 100755 --- a/include/ique/PR/verify.h +++ b/include/ique/PR/verify.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _VERIFY_H_ +#define _VERIFY_H_ /************************************************************************** * * @@ -115,3 +116,5 @@ struct CVGHeader { #define ZB_END_ADDR 0x125800 #define EVAN_START_ADDR 0x130000 #define EVAN_END_ADDR 0x140000 + +#endif /* !_VERIFY_H_ */ diff --git a/include/ique/ultra64.h b/include/ique/ultra64.h index 750d1d18..f6ebba04 100755 --- a/include/ique/ultra64.h +++ b/include/ique/ultra64.h @@ -19,7 +19,8 @@ * **************************************************************************/ -#pragma once +#ifndef _ULTRA64_H_ +#define _ULTRA64_H_ #include #include @@ -35,3 +36,5 @@ #include #include #include + +#endif diff --git a/include/level_commands.h b/include/level_commands.h index e315145f..630e46e6 100644 --- a/include/level_commands.h +++ b/include/level_commands.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef LEVEL_COMMANDS_H +#define LEVEL_COMMANDS_H #include "command_macros_base.h" @@ -360,3 +361,5 @@ #define GET_OR_SET(op, var) \ CMD_BBBB(0x3C, 0x04, op, var) + +#endif // LEVEL_COMMANDS_H diff --git a/include/level_misc_macros.h b/include/level_misc_macros.h index 72d37944..91ccd784 100644 --- a/include/level_misc_macros.h +++ b/include/level_misc_macros.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef LEVEL_MISC_MACROS_H +#define LEVEL_MISC_MACROS_H #define MACRO_OBJECT_WITH_BEH_PARAM(preset, yaw, posX, posY, posZ, behParam) \ ((s16)((yaw * 0x10 / 45) << 9) | (preset + 0x1F)), posX, posY, posZ, behParam @@ -23,3 +24,5 @@ #define TRAJECTORY_END() \ -1 + +#endif // LEVEL_MISC_MACROS_H diff --git a/include/level_table.h b/include/level_table.h index e1dfaa5e..3ad47eb7 100644 --- a/include/level_table.h +++ b/include/level_table.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef LEVEL_TABLE_H +#define LEVEL_TABLE_H // For LEVEL_NAME defines, see level_defines.h. // Please include this file if you want to use them. @@ -20,3 +21,5 @@ enum LevelNum #undef STUB_LEVEL #undef DEFINE_LEVEL + +#endif // LEVEL_TABLE_H diff --git a/include/libc/math.h b/include/libc/math.h index 19278c3b..8cea459b 100644 --- a/include/libc/math.h +++ b/include/libc/math.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MATH_H +#define MATH_H #define M_PI 3.14159265358979323846 @@ -8,3 +9,5 @@ float cosf(float); double cos(double); float sqrtf(float); + +#endif diff --git a/include/libc/stdarg.h b/include/libc/stdarg.h index 3ae8ac0a..aa7e3393 100644 --- a/include/libc/stdarg.h +++ b/include/libc/stdarg.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef STDARG_H +#define STDARG_H // When not building with IDO, use the builtin vaarg macros for portability. #ifndef __sgi @@ -38,3 +39,4 @@ typedef char *va_list; #define va_end(__list) #endif +#endif diff --git a/include/libc/stddef.h b/include/libc/stddef.h index b4f51cba..7e72a7bb 100644 --- a/include/libc/stddef.h +++ b/include/libc/stddef.h @@ -1,7 +1,10 @@ -#pragma once +#ifndef STDDEF_H +#define STDDEF_H #include "PR/ultratypes.h" #ifndef offsetof #define offsetof(st, m) ((size_t)&(((st *)0)->m)) #endif + +#endif diff --git a/include/libc/stdio.h b/include/libc/stdio.h index 248b40e7..1cd4d0a3 100644 --- a/include/libc/stdio.h +++ b/include/libc/stdio.h @@ -1,3 +1,6 @@ -#pragma once +#ifndef STDIO_H +#define STDIO_H extern int sprintf(char *s, const char *fmt, ...); + +#endif diff --git a/include/libc/stdlib.h b/include/libc/stdlib.h index d9e1ad70..c23b4542 100644 --- a/include/libc/stdlib.h +++ b/include/libc/stdlib.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef STDLIB_H +#define STDLIB_H typedef struct lldiv_t { @@ -14,3 +15,5 @@ typedef struct ldiv_t lldiv_t lldiv(long long num, long long denom); ldiv_t ldiv(long num, long denom); + +#endif diff --git a/include/libc/string.h b/include/libc/string.h index 3064251e..009d30f1 100644 --- a/include/libc/string.h +++ b/include/libc/string.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef STRING_H +#define STRING_H #include "PR/ultratypes.h" @@ -9,3 +10,5 @@ int memcmp(const void *buf1, const void *buf2, size_t count); void *memset(void* dst, int c, size_t count); char *strcat(char *str1, const char *str2); int strncmp(const char *str1, const char *str2, int n); + +#endif diff --git a/include/macro_preset_names.h b/include/macro_preset_names.h index 1f6fa03d..2700a8e8 100644 --- a/include/macro_preset_names.h +++ b/include/macro_preset_names.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MACRO_PRESET_NAMES_H +#define MACRO_PRESET_NAMES_H enum MacroPresets { macro_yellow_coin, @@ -368,3 +369,5 @@ enum MacroPresets { macro_empty_364, macro_empty_365 }; + +#endif // MACRO_PRESET_NAMES_H diff --git a/include/macro_presets.h b/include/macro_presets.h index 6e8736ee..698e3bdf 100644 --- a/include/macro_presets.h +++ b/include/macro_presets.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MACRO_PRESETS_H +#define MACRO_PRESETS_H #include "macro_preset_names.h" #include "behavior_data.h" @@ -379,3 +380,5 @@ struct MacroPreset MacroObjectPresets[] = { {bhvYellowCoin, MODEL_YELLOW_COIN, 0}, {bhvYellowCoin, MODEL_YELLOW_COIN, 0} }; + +#endif // MACRO_PRESETS_H diff --git a/include/macros.h b/include/macros.h index fc00c67f..cfa3a6d3 100644 --- a/include/macros.h +++ b/include/macros.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MACROS_H +#define MACROS_H #include "platform_info.h" @@ -70,4 +71,6 @@ #define MODE_NTSC 0 #define MODE_MPAL 1 -#define MODE_PAL 2 +#define MODE_PAL 2 + +#endif // MACROS_H diff --git a/include/make_const_nonconst.h b/include/make_const_nonconst.h index f27db465..dbe5031e 100644 --- a/include/make_const_nonconst.h +++ b/include/make_const_nonconst.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MAKE_CONST_NONCONST_H +#define MAKE_CONST_NONCONST_H #ifdef TARGET_N64 // IDO sometimes puts const variables in .rodata and sometimes in .data, which breaks ordering. @@ -6,3 +7,5 @@ // both IDO and gcc for TARGET_N64. #define const #endif + +#endif // MAKE_CONST_NONCONST_H diff --git a/include/mario_animation_ids.h b/include/mario_animation_ids.h index f06d689a..1d22d3d1 100644 --- a/include/mario_animation_ids.h +++ b/include/mario_animation_ids.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MARIO_ANIMATION_IDS_H +#define MARIO_ANIMATION_IDS_H /* Mario Animation IDs */ @@ -214,3 +215,5 @@ enum MarioAnimID /* 0xCF */ MARIO_ANIM_FORWARD_SPINNING_FLIP, /* 0xD0 */ MARIO_ANIM_TRIPLE_JUMP_FLY }; + +#endif // MARIO_ANIMATION_IDS_H diff --git a/include/mario_geo_switch_case_ids.h b/include/mario_geo_switch_case_ids.h index e06de50c..007d23b0 100644 --- a/include/mario_geo_switch_case_ids.h +++ b/include/mario_geo_switch_case_ids.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MARIO_GEO_SWITCH_CASE_IDS_H +#define MARIO_GEO_SWITCH_CASE_IDS_H /* Mario Geo-Switch-Case IDs */ @@ -40,3 +41,5 @@ enum MarioGrabPosGSCId /*0x02*/ GRAB_POS_HEAVY_OBJ, /*0x03*/ GRAB_POS_BOWSER }; + +#endif // MARIO_GEO_SWITCH_CASE_IDS_H diff --git a/include/model_ids.h b/include/model_ids.h index b7a69838..a8434c17 100644 --- a/include/model_ids.h +++ b/include/model_ids.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MODEL_IDS_H +#define MODEL_IDS_H #define ACT_1 (1 << 0) #define ACT_2 (1 << 1) @@ -581,3 +582,5 @@ #define MODEL_THI_WARP_PIPE MODEL_LEVEL_GEOMETRY_16 // warp_pipe_geo #define MODEL_VCUTM_WARP_PIPE MODEL_LEVEL_GEOMETRY_16 // warp_pipe_geo #define MODEL_CASTLE_GROUNDS_WARP_PIPE MODEL_LEVEL_GEOMETRY_16 // warp_pipe_geo + +#endif // MODEL_IDS_H diff --git a/include/moving_texture_macros.h b/include/moving_texture_macros.h index 09e0f0f0..a7067d6d 100644 --- a/include/moving_texture_macros.h +++ b/include/moving_texture_macros.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MOVING_TEXTURE_MACROS_H +#define MOVING_TEXTURE_MACROS_H #include "game/moving_texture.h" @@ -67,3 +68,5 @@ // End of moving texture load if movTexRotTris was used, only used in SSL #define MOV_TEX_ROT_END() \ 0, 0 + +#endif // MOVING_TEXTURE_MACROS_H diff --git a/include/n64/PR/PRimage.h b/include/n64/PR/PRimage.h index 5ece9de6..aacc6567 100644 --- a/include/n64/PR/PRimage.h +++ b/include/n64/PR/PRimage.h @@ -6,7 +6,8 @@ * **************************************************************************/ -#pragma once +#ifndef __GL_IMAGE_H__ +#define __GL_IMAGE_H__ #ifdef __cplusplus extern "C" { #endif @@ -122,3 +123,4 @@ unsigned short *ibufalloc(); #ifdef __cplusplus } #endif +#endif /* !__GL_IMAGE_H__ */ diff --git a/include/n64/PR/R4300.h b/include/n64/PR/R4300.h index 8962d712..fd70d07f 100644 --- a/include/n64/PR/R4300.h +++ b/include/n64/PR/R4300.h @@ -18,7 +18,8 @@ * **************************************************************************/ -#pragma once +#ifndef __R4300_H__ +#define __R4300_H__ #include @@ -448,3 +449,5 @@ #define FPCSR_RM_RZ 0x00000001 /* round to zero */ #define FPCSR_RM_RP 0x00000002 /* round to positive infinity */ #define FPCSR_RM_RM 0x00000003 /* round to negative infinity */ + +#endif /* __R4300_H */ diff --git a/include/n64/PR/abi.h b/include/n64/PR/abi.h index 4c811756..b73cb726 100644 --- a/include/n64/PR/abi.h +++ b/include/n64/PR/abi.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _ABI_H_ +#define _ABI_H_ /************************************************************************** * * @@ -991,3 +992,5 @@ typedef short ENVMIX_STATE[40]; #endif #endif /* _LANGUAGE_C */ + +#endif /* !_ABI_H_ */ diff --git a/include/n64/PR/gbi-poslight.h b/include/n64/PR/gbi-poslight.h index 7eb1faa0..7b93aea0 100644 --- a/include/n64/PR/gbi-poslight.h +++ b/include/n64/PR/gbi-poslight.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _GBI_POSLIGHT_H_ +#define _GBI_POSLIGHT_H_ /* version 990705 */ #define G_LIGHTING_POSITIONAL 0x00400000 @@ -124,3 +125,5 @@ typedef struct { _gdSPDefPosLight(r5,g5,b5,x5,y5,z5,c5,l5,q5), \ _gdSPDefPosLight(r6,g6,b6,x6,y6,z6,c6,l6,q6), \ _gdSPDefPosLight(r7,g7,b7,x7,y7,z7,c7,l7,q7)} } + +#endif /* _GBI_POSLIGHT_H_ */ diff --git a/include/n64/PR/gbi.h b/include/n64/PR/gbi.h index 93a61a0c..16968a8e 100644 --- a/include/n64/PR/gbi.h +++ b/include/n64/PR/gbi.h @@ -17,7 +17,8 @@ * **************************************************************************/ -#pragma once +#ifndef _GBI_H_ +#define _GBI_H_ #include #include @@ -4872,3 +4873,6 @@ typedef union { #endif #endif /* _LANGUAGE_C */ + + +#endif /* _GBI_H_ */ diff --git a/include/n64/PR/gs2dex.h b/include/n64/PR/gs2dex.h index 8acaa0e5..ced46855 100644 --- a/include/n64/PR/gs2dex.h +++ b/include/n64/PR/gs2dex.h @@ -9,7 +9,8 @@ $Id: gs2dex.h,v 1.21 1998/05/28 00:14:49 has Exp $ ---------------------------------------------------------------------*/ -#pragma once +#ifndef _GS2DEX_H_ +#define _GS2DEX_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -386,5 +387,6 @@ extern void guS2DInitBg(uObjBg *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif +#endif /* _GS2DEX_H_ */ /*======== End of gs2dex.h ========*/ diff --git a/include/n64/PR/gt.h b/include/n64/PR/gt.h index 32557b2a..09b6ba2d 100644 --- a/include/n64/PR/gt.h +++ b/include/n64/PR/gt.h @@ -44,7 +44,8 @@ * **************************************************************************/ -#pragma once +#ifndef _GT_H_ +#define _GT_H_ /* this file should be #included AFTER gbi.h */ @@ -360,3 +361,5 @@ typedef union { #ifdef _LANGUAGE_MAKEROM #endif /* _LANGUAGE_MAKEROM */ + +#endif /* _GT_H_ */ diff --git a/include/n64/PR/gu.h b/include/n64/PR/gu.h index d6b250e8..aa83ba08 100644 --- a/include/n64/PR/gu.h +++ b/include/n64/PR/gu.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _GU_H_ +#define _GU_H_ /************************************************************************** * * @@ -264,3 +265,5 @@ void guSprite2DInit(uSprite *SpritePointer, int SourceImageBitSize, int SourceImageOffsetS, int SourceImageOffsetT); + +#endif /* !_GU_H_ */ diff --git a/include/n64/PR/gzsort.h b/include/n64/PR/gzsort.h index d867eb87..eaa67ebf 100644 --- a/include/n64/PR/gzsort.h +++ b/include/n64/PR/gzsort.h @@ -6,7 +6,8 @@ $Id: gzsort.h,v 1.11 1998/01/06 01:28:21 yasu Exp $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _GZSORT_H_ +#define _GZSORT_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -625,5 +626,6 @@ extern u64 gspZSort_pl_fifoDataStart[], gspZSort_pl_fifoDataEnd[]; #ifdef _LANGUAGE_C_PLUS_PLUS } #endif +#endif /* _GZSORT_H_ */ /*======== End of gzsort.h ========*/ diff --git a/include/n64/PR/leo.h b/include/n64/PR/leo.h index 665d9435..96f2edd1 100644 --- a/include/n64/PR/leo.h +++ b/include/n64/PR/leo.h @@ -7,7 +7,8 @@ $Date: 1998/12/21 07:30:15 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _LEO_H_ +#define _LEO_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -275,3 +276,5 @@ extern void LeoBootGame(void *entry); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_LEO_H */ diff --git a/include/n64/PR/libaudio.h b/include/n64/PR/libaudio.h index 44e919a6..cb7a5b19 100644 --- a/include/n64/PR/libaudio.h +++ b/include/n64/PR/libaudio.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _ULTRA64_LIBAUDIO_H_ +#define _ULTRA64_LIBAUDIO_H_ #include "abi.h" @@ -46,3 +47,5 @@ typedef struct } ALSeqFile; void alSeqFileNew(ALSeqFile *f, u8 *base); + +#endif diff --git a/include/n64/PR/mbi.h b/include/n64/PR/mbi.h index abaeb8f9..ac900a54 100644 --- a/include/n64/PR/mbi.h +++ b/include/n64/PR/mbi.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _MBI_H_ +#define _MBI_H_ /************************************************************************** * * @@ -95,3 +96,5 @@ #ifndef NULL #define NULL 0 #endif + +#endif /* !_MBI_H_ */ diff --git a/include/n64/PR/os.h b/include/n64/PR/os.h index 046ec9c1..4b52dfb2 100644 --- a/include/n64/PR/os.h +++ b/include/n64/PR/os.h @@ -27,7 +27,8 @@ $Date: 2000/06/15 06:24:52 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_H_ +#define _OS_H_ #include #include @@ -103,3 +104,5 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_H */ diff --git a/include/n64/PR/os_ai.h b/include/n64/PR/os_ai.h index 547ea055..f89d87cf 100644 --- a/include/n64/PR/os_ai.h +++ b/include/n64/PR/os_ai.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:04 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_AI_H_ +#define _OS_AI_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -87,3 +88,5 @@ extern s32 osAiSetNextBuffer(void *, u32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_AI_H_ */ diff --git a/include/n64/PR/os_cache.h b/include/n64/PR/os_cache.h index 0eed2e79..54ed9230 100644 --- a/include/n64/PR/os_cache.h +++ b/include/n64/PR/os_cache.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:04 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_CACHE_H_ +#define _OS_CACHE_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -91,3 +92,5 @@ extern void osWritebackDCacheAll(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_CACHE_H_ */ diff --git a/include/n64/PR/os_cont.h b/include/n64/PR/os_cont.h index ebdf8289..a2bd8707 100644 --- a/include/n64/PR/os_cont.h +++ b/include/n64/PR/os_cont.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:05 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_CONT_H_ +#define _OS_CONT_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -202,3 +203,5 @@ extern void osContGetReadData(OSContPad *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_CONT_H_ */ diff --git a/include/n64/PR/os_convert.h b/include/n64/PR/os_convert.h index afe67760..0a5da10a 100644 --- a/include/n64/PR/os_convert.h +++ b/include/n64/PR/os_convert.h @@ -27,7 +27,8 @@ $Date: 1999/04/21 02:53:11 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_CONVERT_H_ +#define _OS_CONVERT_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -106,3 +107,5 @@ extern void * osPhysicalToVirtual(u32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_CONVERT_H_ */ diff --git a/include/n64/PR/os_debug.h b/include/n64/PR/os_debug.h index 76bda27a..076c4020 100644 --- a/include/n64/PR/os_debug.h +++ b/include/n64/PR/os_debug.h @@ -27,7 +27,9 @@ $Date: 1999/06/30 03:04:08 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_DEBUG_H_ +#define _OS_DEBUG_H_ + #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -112,3 +114,5 @@ extern OSTime osThreadProfileReadTimeTh(OSThread*); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_DEBUG_H_ */ diff --git a/include/n64/PR/os_eeprom.h b/include/n64/PR/os_eeprom.h index 9afb3997..b3bca814 100644 --- a/include/n64/PR/os_eeprom.h +++ b/include/n64/PR/os_eeprom.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:06 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_EEPROM_H_ +#define _OS_EEPROM_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -102,3 +103,5 @@ extern s32 osEepromLongWrite(OSMesgQueue *, u8, u8 *, int); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_EEPROM_H_ */ diff --git a/include/n64/PR/os_error.h b/include/n64/PR/os_error.h index 696e39ca..f4c3b83c 100644 --- a/include/n64/PR/os_error.h +++ b/include/n64/PR/os_error.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:06 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_ERROR_H_ +#define _OS_ERROR_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -81,3 +82,5 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_ERROR_H_ */ diff --git a/include/n64/PR/os_exception.h b/include/n64/PR/os_exception.h index 22be2673..245e5e69 100644 --- a/include/n64/PR/os_exception.h +++ b/include/n64/PR/os_exception.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:07 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_EXCEPTION_H_ +#define _OS_EXCEPTION_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -114,3 +115,5 @@ extern OSIntMask osSetIntMask(OSIntMask); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_EXCEPTION_H_ */ diff --git a/include/n64/PR/os_flash.h b/include/n64/PR/os_flash.h index e33191e5..4e0a129b 100644 --- a/include/n64/PR/os_flash.h +++ b/include/n64/PR/os_flash.h @@ -6,7 +6,8 @@ $Date: 2000/06/15 06:24:55 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_FLASH_H_ +#define _OS_FLASH_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -66,3 +67,5 @@ extern s32 osFlashCheckEraseEnd(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_FLASH_H_ */ diff --git a/include/n64/PR/os_gbpak.h b/include/n64/PR/os_gbpak.h index 1fd99a8f..0a999945 100644 --- a/include/n64/PR/os_gbpak.h +++ b/include/n64/PR/os_gbpak.h @@ -7,7 +7,8 @@ $Date: 1998/10/09 08:01:07 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_GBPAK_H_ +#define _OS_GBPAK_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -102,3 +103,5 @@ extern s32 osGbpakCheckConnector(OSPfs *, u8 *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_GBPAK_H_ */ diff --git a/include/n64/PR/os_gio.h b/include/n64/PR/os_gio.h index 125b6382..ad3c020f 100644 --- a/include/n64/PR/os_gio.h +++ b/include/n64/PR/os_gio.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:08 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_GIO_H_ +#define _OS_GIO_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -81,3 +82,5 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_GIO_H_ */ diff --git a/include/n64/PR/os_host.h b/include/n64/PR/os_host.h index ab3eb1bc..0cc1ae5b 100644 --- a/include/n64/PR/os_host.h +++ b/include/n64/PR/os_host.h @@ -27,7 +27,8 @@ $Date: 1999/06/24 09:23:06 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_HOST_H_ +#define _OS_HOST_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -156,3 +157,5 @@ extern void osInitRdb(u8 *sendBuf, u32 sendSize); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_HOST_H_ */ diff --git a/include/n64/PR/os_internal.h b/include/n64/PR/os_internal.h index 38659487..754d1ee2 100644 --- a/include/n64/PR/os_internal.h +++ b/include/n64/PR/os_internal.h @@ -18,7 +18,8 @@ $Date: 1998/10/09 08:01:09 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_H_ +#define _OS_INTERNAL_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -44,3 +45,5 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_H */ diff --git a/include/n64/PR/os_internal_debug.h b/include/n64/PR/os_internal_debug.h index ce3319c9..7b307d6e 100644 --- a/include/n64/PR/os_internal_debug.h +++ b/include/n64/PR/os_internal_debug.h @@ -18,7 +18,8 @@ $Date: 1998/10/09 08:01:09 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_DEBUG_H_ +#define _OS_INTERNAL_DEBUG_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -38,3 +39,5 @@ extern int __osAtomicDec(unsigned int *p); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_DEBUG_H */ diff --git a/include/n64/PR/os_internal_error.h b/include/n64/PR/os_internal_error.h index 0658943c..de188d23 100644 --- a/include/n64/PR/os_internal_error.h +++ b/include/n64/PR/os_internal_error.h @@ -18,7 +18,8 @@ $Date: 1998/10/09 08:01:10 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_ERROR_H_ +#define _OS_INTERNAL_ERROR_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -40,3 +41,5 @@ extern OSThread * __osGetNextFaultedThread(OSThread *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_ERROR_H */ diff --git a/include/n64/PR/os_internal_exception.h b/include/n64/PR/os_internal_exception.h index 41d49543..730dc935 100644 --- a/include/n64/PR/os_internal_exception.h +++ b/include/n64/PR/os_internal_exception.h @@ -18,7 +18,8 @@ $Date: 1998/10/09 08:01:10 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_EXCEPTION_H_ +#define _OS_INTERNAL_EXCEPTION_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -44,3 +45,5 @@ extern void __osResetGlobalIntMask(OSHWIntr); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_EXCEPTION_H */ diff --git a/include/n64/PR/os_internal_gio.h b/include/n64/PR/os_internal_gio.h index 2ff9e748..ff133850 100644 --- a/include/n64/PR/os_internal_gio.h +++ b/include/n64/PR/os_internal_gio.h @@ -18,7 +18,8 @@ $Date: 1998/10/09 08:01:11 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_GIO_H_ +#define _OS_INTERNAL_GIO_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -40,3 +41,5 @@ extern void __osGIORawInterrupt(s32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_GIO_H */ diff --git a/include/n64/PR/os_internal_host.h b/include/n64/PR/os_internal_host.h index 990fa96b..b6d19513 100644 --- a/include/n64/PR/os_internal_host.h +++ b/include/n64/PR/os_internal_host.h @@ -18,7 +18,8 @@ $Date: 1998/10/09 08:01:11 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_HOST_H_ +#define _OS_INTERNAL_HOST_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -37,3 +38,5 @@ extern u32 __osRdbSend(u8 *buf, u32 size, u32 type); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_HOST_H */ diff --git a/include/n64/PR/os_internal_reg.h b/include/n64/PR/os_internal_reg.h index 34f2c486..a1619981 100644 --- a/include/n64/PR/os_internal_reg.h +++ b/include/n64/PR/os_internal_reg.h @@ -18,7 +18,8 @@ $Date: 1999/03/10 12:19:14 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_REG_H_ +#define _OS_INTERNAL_REG_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -54,3 +55,5 @@ extern u32 __osGetFpcCsr(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_REG_H */ diff --git a/include/n64/PR/os_internal_rsp.h b/include/n64/PR/os_internal_rsp.h index 89b1815b..646e6679 100644 --- a/include/n64/PR/os_internal_rsp.h +++ b/include/n64/PR/os_internal_rsp.h @@ -18,7 +18,8 @@ $Date: 1998/10/09 08:01:12 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_RSP_H_ +#define _OS_INTERNAL_RSP_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -43,3 +44,5 @@ extern s32 __osSpRawStartDma(s32, u32, void *, u32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_RSP_H */ diff --git a/include/n64/PR/os_internal_si.h b/include/n64/PR/os_internal_si.h index d3636c84..d0eeedcc 100644 --- a/include/n64/PR/os_internal_si.h +++ b/include/n64/PR/os_internal_si.h @@ -18,7 +18,8 @@ $Date: 1998/10/09 08:01:13 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_SI_H_ +#define _OS_INTERNAL_SI_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -41,3 +42,5 @@ extern s32 __osSiRawStartDma(s32, void *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_SI_H */ diff --git a/include/n64/PR/os_internal_thread.h b/include/n64/PR/os_internal_thread.h index b70e7506..1305eb58 100644 --- a/include/n64/PR/os_internal_thread.h +++ b/include/n64/PR/os_internal_thread.h @@ -18,7 +18,8 @@ $Date: 1998/10/09 08:01:13 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_THREAD_H_ +#define _OS_INTERNAL_THREAD_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -38,3 +39,5 @@ extern OSThread * __osGetActiveQueue(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_THREAD_H */ diff --git a/include/n64/PR/os_internal_tlb.h b/include/n64/PR/os_internal_tlb.h index b7b05194..b92918ff 100644 --- a/include/n64/PR/os_internal_tlb.h +++ b/include/n64/PR/os_internal_tlb.h @@ -18,7 +18,8 @@ $Date: 1998/10/09 08:01:14 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_INTERNAL_TLB_H_ +#define _OS_INTERNAL_TLB_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -42,3 +43,5 @@ extern u32 __osGetTLBLo1(s32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_INTERNAL_TLB_H */ diff --git a/include/n64/PR/os_libc.h b/include/n64/PR/os_libc.h index ed61487b..ae7281fc 100644 --- a/include/n64/PR/os_libc.h +++ b/include/n64/PR/os_libc.h @@ -27,7 +27,8 @@ $Date: 1999/07/13 01:43:47 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_LIBC_H_ +#define _OS_LIBC_H_ #include "os_pfs.h" @@ -95,3 +96,5 @@ extern void osSyncPrintf(const char *fmt, ...); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_LIBC_H_ */ diff --git a/include/n64/PR/os_message.h b/include/n64/PR/os_message.h index eb320313..5bc565e3 100644 --- a/include/n64/PR/os_message.h +++ b/include/n64/PR/os_message.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:15 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_MESSAGE_H_ +#define _OS_MESSAGE_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -158,3 +159,5 @@ extern void osSetEventMesg(OSEvent, OSMesgQueue *, OSMesg); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_MESSAGE_H_ */ diff --git a/include/n64/PR/os_motor.h b/include/n64/PR/os_motor.h index 12c91634..f8dcbd5a 100644 --- a/include/n64/PR/os_motor.h +++ b/include/n64/PR/os_motor.h @@ -7,7 +7,8 @@ $Date: 1998/10/09 08:01:15 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_MOTOR_H_ +#define _OS_MOTOR_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -78,3 +79,5 @@ extern s32 osMotorStart(OSPfs *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_MOTOR_H_ */ diff --git a/include/n64/PR/os_pfs.h b/include/n64/PR/os_pfs.h index 1da74048..188f9d28 100644 --- a/include/n64/PR/os_pfs.h +++ b/include/n64/PR/os_pfs.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:16 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_PFS_H_ +#define _OS_PFS_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -169,3 +170,5 @@ extern s32 osPfsNumFiles(OSPfs *, s32 *, s32 *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_PFS_H_ */ diff --git a/include/n64/PR/os_pi.h b/include/n64/PR/os_pi.h index 794d7119..0c745978 100644 --- a/include/n64/PR/os_pi.h +++ b/include/n64/PR/os_pi.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:16 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_PI_H_ +#define _OS_PI_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -219,3 +220,5 @@ extern s32 osEPiLinkHandle(OSPiHandle *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_PI_H_ */ diff --git a/include/n64/PR/os_rdp.h b/include/n64/PR/os_rdp.h index 640192e8..6b3d288c 100644 --- a/include/n64/PR/os_rdp.h +++ b/include/n64/PR/os_rdp.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:16 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_RDP_H_ +#define _OS_RDP_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -87,3 +88,5 @@ extern s32 osDpSetNextBuffer(void *, u64); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_RDP_H_ */ diff --git a/include/n64/PR/os_reg.h b/include/n64/PR/os_reg.h index 8a247c95..50aa2188 100644 --- a/include/n64/PR/os_reg.h +++ b/include/n64/PR/os_reg.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:17 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_REG_H_ +#define _OS_REG_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -85,3 +86,5 @@ extern u32 osGetCount(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_REG_H_ */ diff --git a/include/n64/PR/os_rsp.h b/include/n64/PR/os_rsp.h index 226b371b..12116053 100644 --- a/include/n64/PR/os_rsp.h +++ b/include/n64/PR/os_rsp.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:17 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_RSP_H_ +#define _OS_RSP_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -81,3 +82,5 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_RSP_H_ */ diff --git a/include/n64/PR/os_si.h b/include/n64/PR/os_si.h index 8ea3ecb3..23b07c07 100644 --- a/include/n64/PR/os_si.h +++ b/include/n64/PR/os_si.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:18 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_SI_H_ +#define _OS_SI_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -81,3 +82,5 @@ extern "C" { #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_SI_H_ */ diff --git a/include/n64/PR/os_system.h b/include/n64/PR/os_system.h index ccd5adce..1179189a 100644 --- a/include/n64/PR/os_system.h +++ b/include/n64/PR/os_system.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:18 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_SYSTEM_H_ +#define _OS_SYSTEM_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -113,3 +114,5 @@ extern s32 osAfterPreNMI(void); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_SYSTEM_H_ */ diff --git a/include/n64/PR/os_thread.h b/include/n64/PR/os_thread.h index d386758d..7b82dc79 100644 --- a/include/n64/PR/os_thread.h +++ b/include/n64/PR/os_thread.h @@ -27,7 +27,8 @@ $Date: 1999/06/15 12:39:40 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_THREAD_H_ +#define _OS_THREAD_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -149,3 +150,5 @@ extern OSPri osGetThreadPri(OSThread *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_THREAD_H_ */ diff --git a/include/n64/PR/os_time.h b/include/n64/PR/os_time.h index 291b8e47..deaec659 100644 --- a/include/n64/PR/os_time.h +++ b/include/n64/PR/os_time.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:19 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_TIME_H_ +#define _OS_TIME_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -109,3 +110,5 @@ extern int osStopTimer(OSTimer *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_TIME_H_ */ diff --git a/include/n64/PR/os_tlb.h b/include/n64/PR/os_tlb.h index 2f892d04..2cdd5c9c 100644 --- a/include/n64/PR/os_tlb.h +++ b/include/n64/PR/os_tlb.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:20 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_TLB_H_ +#define _OS_TLB_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -102,3 +103,5 @@ extern void osSetTLBASID(s32); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_TLB_H_ */ diff --git a/include/n64/PR/os_version.h b/include/n64/PR/os_version.h index 966c9ef4..c485a438 100644 --- a/include/n64/PR/os_version.h +++ b/include/n64/PR/os_version.h @@ -7,7 +7,10 @@ $Date: 1999/06/17 01:33:01 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_VERSION_H_ +#define _OS_VERSION_H_ #define OS_MAJOR_VERSION "2.0K" /* major version */ #define OS_MINOR_VERSION 0 /* patch level */ + +#endif /* !_OS_VERSION_H_ */ diff --git a/include/n64/PR/os_vi.h b/include/n64/PR/os_vi.h index 00fd6a0b..5a17f258 100644 --- a/include/n64/PR/os_vi.h +++ b/include/n64/PR/os_vi.h @@ -27,7 +27,8 @@ $Date: 1998/10/09 08:01:20 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_VI_H_ +#define _OS_VI_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -293,3 +294,5 @@ extern void osCreateViManager(OSPri); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_VI_H_ */ diff --git a/include/n64/PR/os_voice.h b/include/n64/PR/os_voice.h index aeb13ae7..4e3cf6ec 100644 --- a/include/n64/PR/os_voice.h +++ b/include/n64/PR/os_voice.h @@ -7,7 +7,8 @@ $Date: 1999/07/13 08:36:42 $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _OS_VOICE_H_ +#define _OS_VOICE_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -103,3 +104,5 @@ extern void osVoiceCountSyllables(u8 *, u32 *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_VOICE_H_ */ diff --git a/include/n64/PR/ramrom.h b/include/n64/PR/ramrom.h index 85f7571f..42e5c2d5 100644 --- a/include/n64/PR/ramrom.h +++ b/include/n64/PR/ramrom.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _RAMROM_H +#define _RAMROM_H /************************************************************************** * * @@ -108,3 +109,5 @@ typedef struct { void __RamRomInit(int key, void *romaddr); void __RamRomDestroy(int key); #endif /* _EMULATOR */ + +#endif /* !_RAMROM_H */ diff --git a/include/n64/PR/rcp.h b/include/n64/PR/rcp.h index a09796f0..980f21f0 100644 --- a/include/n64/PR/rcp.h +++ b/include/n64/PR/rcp.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _RCP_H_ +#define _RCP_H_ /************************************************************************** * * @@ -879,3 +880,6 @@ The Indy development board use cartridge domain 1: IO_READ(SP_STATUS_REG)) #endif + +#endif /* _RCP_H_ */ + diff --git a/include/n64/PR/rdb.h b/include/n64/PR/rdb.h index 3cda3bdd..e0897493 100644 --- a/include/n64/PR/rdb.h +++ b/include/n64/PR/rdb.h @@ -7,7 +7,8 @@ * **************************************************************************/ -#pragma once +#ifndef _RDB_H +#define _RDB_H /* U64 side address */ #define RDB_BASE_REG 0xc0000000 @@ -88,3 +89,5 @@ extern unsigned int __osRdbWriteOK; extern unsigned int __osRdbSendMessage; #endif /* _LANGUAGE_C */ + +#endif /* !_RDB_H */ diff --git a/include/n64/PR/region.h b/include/n64/PR/region.h index 2466a40e..226e9a2c 100644 --- a/include/n64/PR/region.h +++ b/include/n64/PR/region.h @@ -27,7 +27,8 @@ **************************************************************************/ -#pragma once +#ifndef _REGION_H_ +#define _REGION_H_ #ifdef _LANGUAGE_C_PLUS_PLUS @@ -115,3 +116,8 @@ extern s32 osGetRegionBufSize(void *); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + + +#endif /* _REGION_H_ */ + + diff --git a/include/n64/PR/rmon.h b/include/n64/PR/rmon.h index 60c6b895..199e5699 100644 --- a/include/n64/PR/rmon.h +++ b/include/n64/PR/rmon.h @@ -18,7 +18,8 @@ * **************************************************************************/ -#pragma once +#ifndef _RMON_H_ +#define _RMON_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -34,3 +35,5 @@ extern void rmonPrintf( const char *, ... ); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_OS_H */ diff --git a/include/n64/PR/rsp.h b/include/n64/PR/rsp.h index e942ad0a..16f5ca34 100644 --- a/include/n64/PR/rsp.h +++ b/include/n64/PR/rsp.h @@ -17,7 +17,8 @@ * **************************************************************************/ -#pragma once +#ifndef _RSP_H_ +#define _RSP_H_ 1 #define RSP_DMEM_BASE 0x04000000 #define RSP_IMEM_BASE 0x04001000 @@ -79,3 +80,6 @@ .name CMD_TMEM_BUSY, $c15 #endif + + +#endif diff --git a/include/n64/PR/rsp_ipc.h b/include/n64/PR/rsp_ipc.h index 5b363838..af1a54d3 100644 --- a/include/n64/PR/rsp_ipc.h +++ b/include/n64/PR/rsp_ipc.h @@ -15,7 +15,8 @@ * **************************************************************************/ -#pragma once +#ifndef _RSP_IPC_H_ +#define _RSP_IPC_H_ 1 #if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) @@ -64,3 +65,5 @@ extern int sem_signal(int id); extern int sem_op(int id, int value); #endif + +#endif diff --git a/include/n64/PR/sp.h b/include/n64/PR/sp.h index 11e89483..8167ca23 100644 --- a/include/n64/PR/sp.h +++ b/include/n64/PR/sp.h @@ -20,7 +20,8 @@ * **************************************************************************/ -#pragma once +#ifndef _SP_H_ +#define _SP_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -191,3 +192,5 @@ void spFinish( Gfx **glistp ); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* _SP_H_ */ diff --git a/include/n64/PR/sptask.h b/include/n64/PR/sptask.h index 4ef20744..960cab9b 100644 --- a/include/n64/PR/sptask.h +++ b/include/n64/PR/sptask.h @@ -18,7 +18,8 @@ * **************************************************************************/ -#pragma once +#ifndef _SPTASK_H_ +#define _SPTASK_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -196,3 +197,5 @@ extern OSYieldResult osSpTaskYielded(OSTask *tp); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_SPTASK_H */ diff --git a/include/n64/PR/trace.h b/include/n64/PR/trace.h index 45b6b906..dc64a1a5 100644 --- a/include/n64/PR/trace.h +++ b/include/n64/PR/trace.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _TRACE_H_ +#define _TRACE_H_ /************************************************************************** @@ -75,3 +76,7 @@ extern unsigned long Dflags; /* Global debug flag */ * Extern function prototypes * */ + + +#endif /* _TRACE_H_ */ + diff --git a/include/n64/PR/ucode.h b/include/n64/PR/ucode.h index aa40e93b..7ca86216 100644 --- a/include/n64/PR/ucode.h +++ b/include/n64/PR/ucode.h @@ -18,7 +18,8 @@ * **************************************************************************/ -#pragma once +#ifndef _UCODE_H_ +#define _UCODE_H_ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -270,3 +271,5 @@ extern u64 rspF3DDataStart[], rspF3DDataEnd[]; #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* !_UCODE_H */ diff --git a/include/n64/PR/ucode_debug.h b/include/n64/PR/ucode_debug.h index b01dcc7f..189a7f21 100644 --- a/include/n64/PR/ucode_debug.h +++ b/include/n64/PR/ucode_debug.h @@ -6,7 +6,8 @@ $Id: ucode_debug.h,v 1.1 1998/12/25 01:06:21 has Exp $ *---------------------------------------------------------------------*/ -#pragma once +#ifndef _UCODE_DEBUG_H_ +#define _UCODE_DEBUG_H_ #define DEBUG_DL_PTR() IO_READ(SP_DMEM_START+0xfc0) @@ -48,5 +49,6 @@ extern long long int gspS2DEX2d_xbusDataStart[], gspS2DEX2d_xbusDataEnd[]; #ifdef _LANGUAGE_C_PLUS_PLUS } #endif +#endif /* !_UCODE_DEBUG_H */ /*======== End of ucode_debug.h ========*/ diff --git a/include/n64/PR/ultraerror.h b/include/n64/PR/ultraerror.h index 29ba0ad4..b05b24a6 100644 --- a/include/n64/PR/ultraerror.h +++ b/include/n64/PR/ultraerror.h @@ -26,7 +26,8 @@ * **************************************************************************/ -#pragma once +#ifndef __ULTRAERROR_H__ +#define __ULTRAERROR_H__ #ifdef _LANGUAGE_C_PLUS_PLUS extern "C" { @@ -174,3 +175,5 @@ OSErrorHandler osSetErrorHandler(OSErrorHandler); #ifdef _LANGUAGE_C_PLUS_PLUS } #endif + +#endif /* __ULTRAERROR_H__ */ diff --git a/include/n64/PR/ultratypes.h b/include/n64/PR/ultratypes.h index f8bb0d49..057d6ffd 100644 --- a/include/n64/PR/ultratypes.h +++ b/include/n64/PR/ultratypes.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _ULTRATYPES_H_ +#define _ULTRATYPES_H_ /************************************************************************** @@ -91,3 +92,6 @@ typedef volatile s64 vs64; #ifndef NULL #define NULL (void *)0 #endif + +#endif /* _ULTRATYPES_H_ */ + diff --git a/include/n64/PR/uportals.h b/include/n64/PR/uportals.h index 17ac1b5b..129c47ce 100644 --- a/include/n64/PR/uportals.h +++ b/include/n64/PR/uportals.h @@ -29,7 +29,9 @@ **************************************************************************/ -#pragma once + +#ifndef __ULTRAPORTALS_H__ +#define __ULTRAPORTALS_H__ #include #include "matrix.h" @@ -128,3 +130,5 @@ extern upLocateData upLocator; /* also extern by test_portals.h */ #ifdef __Cplusplus } #endif + +#endif diff --git a/include/n64/ultra64.h b/include/n64/ultra64.h index c828eee1..053db38e 100644 --- a/include/n64/ultra64.h +++ b/include/n64/ultra64.h @@ -19,7 +19,8 @@ * **************************************************************************/ -#pragma once +#ifndef _ULTRA64_H_ +#define _ULTRA64_H_ #include #include @@ -35,3 +36,5 @@ #include #include #include + +#endif diff --git a/include/object_constants.h b/include/object_constants.h index 9062cf89..fdc789e4 100644 --- a/include/object_constants.h +++ b/include/object_constants.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECT_CONSTANTS_H +#define OBJECT_CONSTANTS_H // This file contains macros that provide descriptive names for // field-specific and object-specific constants, e.g. actions. @@ -1139,3 +1140,5 @@ /* oBehParams2ndByte */ #define MR_BLIZZARD_STYPE_NO_CAP 0 #define MR_BLIZZARD_STYPE_JUMPING 1 + +#endif // OBJECT_CONSTANTS_H diff --git a/include/object_fields.h b/include/object_fields.h index 5b67c91e..d1a7f90d 100644 --- a/include/object_fields.h +++ b/include/object_fields.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECT_FIELDS_H +#define OBJECT_FIELDS_H /** * The array [0x88, 0x1C8) in struct Object consists of fields that can vary by @@ -1340,3 +1341,6 @@ os16112*/ #define /*0x10E*/ os1610E OBJECT_FIELD_S16(0x21, 1) #define /*0x110*/ os16110 OBJECT_FIELD_S16(0x22, 0) #define /*0x112*/ os16112 OBJECT_FIELD_S16(0x22, 1) + + +#endif // OBJECT_FIELDS_H diff --git a/include/platform_info.h b/include/platform_info.h index a3298879..310aa4d1 100644 --- a/include/platform_info.h +++ b/include/platform_info.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef PLATFORM_INFO_H +#define PLATFORM_INFO_H #ifdef TARGET_N64 #define IS_64_BIT 0 @@ -10,3 +11,5 @@ #endif #define DOUBLE_SIZE_ON_64_BIT(size) ((size) * (sizeof(void *) / 4)) + +#endif // PLATFORM_INFO_H diff --git a/include/prevent_bss_reordering.h b/include/prevent_bss_reordering.h index 29681003..51a85ade 100644 --- a/include/prevent_bss_reordering.h +++ b/include/prevent_bss_reordering.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef PREVENT_BSS_REORDERING_H +#define PREVENT_BSS_REORDERING_H /** * To determine variable order for .bss, the compiler sorts variables by their @@ -78,3 +79,5 @@ struct Dummy60 { int x; }; struct Dummy61 { int x; }; struct Dummy62 { int x; }; typedef int Dummy63; + +#endif // PREVENT_BSS_REORDERING_H diff --git a/include/rnc.h b/include/rnc.h index 5103f459..eb02f4e0 100755 --- a/include/rnc.h +++ b/include/rnc.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _IE_PACK_H +#define _IE_PACK_H typedef struct s_Propack { @@ -19,3 +20,5 @@ typedef struct s_Propack extern void Propack_UnpackM1(void *FilePtr, void *OutputBuffer); extern void Propack_UnpackM2(void *FilePtr, void *OutputBuffer); + +#endif // _IE_PACK_H diff --git a/include/segment_symbols.h b/include/segment_symbols.h index b7e10d2e..eba62dc8 100644 --- a/include/segment_symbols.h +++ b/include/segment_symbols.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SEGMENT_SYMBOLS_H +#define SEGMENT_SYMBOLS_H #ifndef NO_SEGMENTED_MEMORY #define DECLARE_SEGMENT(name) \ @@ -142,3 +143,5 @@ DECLARE_SEGMENT(translation_fr_mio0) #endif #endif + +#endif // SEGMENT_SYMBOLS_H diff --git a/include/segments.h b/include/segments.h index 18eb03a1..963cd3e3 100644 --- a/include/segments.h +++ b/include/segments.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SEGMENTS_H +#define SEGMENTS_H #ifndef LINKER #include "segment_symbols.h" @@ -27,3 +28,5 @@ #define SEG_POOL_START _framebuffersSegmentBssEnd // 0x0165000 in size #define POOL_SIZE RAM_END - SEG_POOL_START + +#endif // SEGMENTS_H diff --git a/include/seq_ids.h b/include/seq_ids.h index 666edd6f..8166de64 100644 --- a/include/seq_ids.h +++ b/include/seq_ids.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SEQ_IDS_H +#define SEQ_IDS_H // Sometimes a sequence id is represented as one of the below ids (the base id), // optionally OR'd with SEQ_VARIATION. @@ -45,3 +46,5 @@ enum SeqId { SEQ_EVENT_CUTSCENE_LAKITU, // 0x22 (not in JP) SEQ_COUNT }; + +#endif // SEQ_IDS_H diff --git a/include/sm64.h b/include/sm64.h index cf0b3069..e8471fda 100644 --- a/include/sm64.h +++ b/include/sm64.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SM64_H +#define SM64_H // Global header for Super Mario 64 @@ -464,3 +465,5 @@ U_CBUTTONS | D_CBUTTONS | L_CBUTTONS | R_CBUTTONS ) #define C_BUTTONS (U_CBUTTONS | D_CBUTTONS | L_CBUTTONS | R_CBUTTONS ) + +#endif // SM64_H diff --git a/include/sounds.h b/include/sounds.h index 67706bea..f40759ca 100644 --- a/include/sounds.h +++ b/include/sounds.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SOUNDS_H +#define SOUNDS_H // Sound Magic Definition: // First Byte (Upper Nibble): Sound Bank (not the same as audio bank!) @@ -591,3 +592,5 @@ #define SOUND_OBJ2_MONTY_MOLE_APPEAR /* 0x90678080 */ SOUND_ARG_LOAD(SOUND_BANK_OBJ2, 0x67, 0x80, SOUND_DISCRETE) #define SOUND_OBJ2_BOSS_DIALOG_GRUNT /* 0x90694080 */ SOUND_ARG_LOAD(SOUND_BANK_OBJ2, 0x69, 0x40, SOUND_DISCRETE) #define SOUND_OBJ2_MRI_SPINNING /* 0x906B0080 */ SOUND_ARG_LOAD(SOUND_BANK_OBJ2, 0x6B, 0x00, SOUND_DISCRETE) + +#endif // SOUNDS_H diff --git a/include/special_preset_names.h b/include/special_preset_names.h index d9457713..229d2878 100644 --- a/include/special_preset_names.h +++ b/include/special_preset_names.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SPECIAL_PRESET_NAMES_H +#define SPECIAL_PRESET_NAMES_H enum SpecialPresets { special_null_start, @@ -88,3 +89,5 @@ enum SpecialPresets { special_null_end = 0xFF }; + +#endif // SPECIAL_PRESET_NAMES_H diff --git a/include/special_presets.h b/include/special_presets.h index 52720e61..a9be6ec2 100644 --- a/include/special_presets.h +++ b/include/special_presets.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SPECIAL_PRESETS_H +#define SPECIAL_PRESETS_H #include "special_preset_names.h" #include "behavior_data.h" @@ -108,3 +109,5 @@ static struct SpecialPreset SpecialObjectPresets[] = {0x87, SPTYPE_PARAMS_AND_YROT , 0x00, MODEL_UNKNOWN_DOOR_2B, bhvDoorWarp}, {0xFF, SPTYPE_NO_YROT_OR_PARAMS , 0x00, MODEL_NONE, NULL} }; + +#endif // SPECIAL_PRESETS_H diff --git a/include/surface_terrains.h b/include/surface_terrains.h index 03afb334..6a13429b 100644 --- a/include/surface_terrains.h +++ b/include/surface_terrains.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SURFACE_TERRAINS_H +#define SURFACE_TERRAINS_H #include "config.h" @@ -225,3 +226,5 @@ // Water Box #define COL_WATER_BOX(id, x1, z1, x2, z2, y) id, x1, z1, x2, z2, y + +#endif // SURFACE_TERRAINS_H diff --git a/include/text_menu_strings.h.in b/include/text_menu_strings.h.in index 01acc300..3ac477eb 100644 --- a/include/text_menu_strings.h.in +++ b/include/text_menu_strings.h.in @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXT_MENU_STRINGS_H +#define TEXT_MENU_STRINGS_H // These strings use a different table defined in menu_hud_lut // Unlike text_strings.h.in, the charmap is different and @@ -13,3 +14,5 @@ #define TEXT_JPHUD_COPY_FILE _("ファイルコピーする") #define TEXT_JPHUD_ERASE_FILE _("ファイルけす") #define TEXT_JPHUD_SOUND_SELECT _("サウンドセレクト") + +#endif // TEXT_MENU_STRINGS_H diff --git a/include/text_strings.h.in b/include/text_strings.h.in index 88442809..c5ee3fa8 100644 --- a/include/text_strings.h.in +++ b/include/text_strings.h.in @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXT_STRINGS_H +#define TEXT_STRINGS_H #include "text_menu_strings.h" @@ -538,3 +539,5 @@ #define TEXT_MENU_NONE_DE _("") #define TEXT_MENU_STARS_DE _(" GEHEIME STERNE") #endif // VERSION_EU + +#endif // TEXT_STRINGS_H diff --git a/include/textures.h b/include/textures.h index 7b766d83..4df137cb 100644 --- a/include/textures.h +++ b/include/textures.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TEXTURES_H +#define TEXTURES_H #include #include @@ -276,3 +277,5 @@ extern const Gfx title_screen_bg_dl_0A000178[]; extern const Gfx title_screen_bg_dl_end[]; extern const u8 *const mario_title_texture_table[]; extern const u8 *const game_over_texture_table[]; + +#endif // TEXTURES_H diff --git a/include/types.h b/include/types.h index 94de29dc..dcce4d0b 100644 --- a/include/types.h +++ b/include/types.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TYPES_H +#define TYPES_H // This file contains various data types used in Super Mario 64 that don't yet // have an appropriate header. @@ -377,3 +378,5 @@ struct MarioState /*0xC0*/ f32 quicksandDepth; /*0xC4*/ f32 windGravity; }; + +#endif // TYPES_H diff --git a/levels/bbh/header.h b/levels/bbh/header.h index 271f2026..74f49d83 100644 --- a/levels/bbh/header.h +++ b/levels/bbh/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef BBH_HEADER_H +#define BBH_HEADER_H #include "types.h" #include "game/moving_texture.h" @@ -109,3 +110,5 @@ extern const struct MovtexQuadCollection bbh_movtex_merry_go_round_water_side[]; // script extern const LevelScript level_bbh_entry[]; + +#endif diff --git a/levels/bitdw/header.h b/levels/bitdw/header.h index 02c021f8..15dbd35d 100644 --- a/levels/bitdw/header.h +++ b/levels/bitdw/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef BITDW_HEADER_H +#define BITDW_HEADER_H #include "types.h" @@ -72,3 +73,5 @@ extern const Collision bitdw_seg7_collision_0700FD9C[]; // script extern const LevelScript level_bitdw_entry[]; + +#endif diff --git a/levels/bitfs/header.h b/levels/bitfs/header.h index cb984ed0..1958b163 100644 --- a/levels/bitfs/header.h +++ b/levels/bitfs/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef BITFS_HEADER_H +#define BITFS_HEADER_H #include "types.h" @@ -92,3 +93,5 @@ extern const Gfx bitfs_dl_lava_floor[]; // script extern const LevelScript level_bitfs_entry[]; + +#endif diff --git a/levels/bits/header.h b/levels/bits/header.h index e6030ae1..de32cf7c 100644 --- a/levels/bits/header.h +++ b/levels/bits/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef BITS_HEADER_H +#define BITS_HEADER_H #include "types.h" @@ -87,3 +88,5 @@ extern const Collision bits_seg7_collision_0701B734[]; // script extern const LevelScript level_bits_entry[]; + +#endif diff --git a/levels/bob/header.h b/levels/bob/header.h index 8ce256a9..207e07e5 100644 --- a/levels/bob/header.h +++ b/levels/bob/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef BOB_HEADER_H +#define BOB_HEADER_H #include "types.h" @@ -29,3 +30,5 @@ extern const Trajectory bob_seg7_trajectory_koopa[]; // script extern const LevelScript level_bob_entry[]; + +#endif diff --git a/levels/bowser_1/header.h b/levels/bowser_1/header.h index 40a7dc93..97119eeb 100644 --- a/levels/bowser_1/header.h +++ b/levels/bowser_1/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef BOWSER_1_HEADER_H +#define BOWSER_1_HEADER_H #include "types.h" @@ -11,3 +12,5 @@ extern const Collision bowser_1_seg7_collision_level[]; // script extern const LevelScript level_bowser_1_entry[]; + +#endif diff --git a/levels/bowser_2/header.h b/levels/bowser_2/header.h index 76435d4f..3d77b0b1 100644 --- a/levels/bowser_2/header.h +++ b/levels/bowser_2/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef BOWSER_2_HEADER_H +#define BOWSER_2_HEADER_H #include "types.h" @@ -15,3 +16,5 @@ extern const Collision bowser_2_seg7_collision_tilting_platform[]; // script extern const LevelScript level_bowser_2_entry[]; + +#endif diff --git a/levels/bowser_3/header.h b/levels/bowser_3/header.h index 74410e44..622aa5c2 100644 --- a/levels/bowser_3/header.h +++ b/levels/bowser_3/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef BOWSER_3_HEADER_H +#define BOWSER_3_HEADER_H #include "types.h" @@ -43,3 +44,5 @@ extern const Collision bowser_3_seg7_collision_07005038[]; // script extern const LevelScript level_bowser_3_entry[]; + +#endif diff --git a/levels/castle_courtyard/header.h b/levels/castle_courtyard/header.h index ae66e54e..d5a7e18c 100644 --- a/levels/castle_courtyard/header.h +++ b/levels/castle_courtyard/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef CASTLE_COURTYARD_HEADER_H +#define CASTLE_COURTYARD_HEADER_H #include "types.h" #include "game/moving_texture.h" @@ -18,3 +19,5 @@ extern const struct MovtexQuadCollection castle_courtyard_movtex_star_statue_wat // script extern const LevelScript level_castle_courtyard_entry[]; + +#endif diff --git a/levels/castle_grounds/header.h b/levels/castle_grounds/header.h index 68787bd5..5e32ed94 100644 --- a/levels/castle_grounds/header.h +++ b/levels/castle_grounds/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef CASTLE_GROUNDS_HEADER_H +#define CASTLE_GROUNDS_HEADER_H #include "types.h" #include "game/moving_texture.h" @@ -39,3 +40,5 @@ extern const Gfx castle_grounds_dl_waterfall[]; // script extern const LevelScript level_castle_grounds_entry[]; + +#endif diff --git a/levels/castle_inside/header.h b/levels/castle_inside/header.h index fb4d109c..dfd63923 100644 --- a/levels/castle_inside/header.h +++ b/levels/castle_inside/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef CASTLE_INSIDE_HEADER_H +#define CASTLE_INSIDE_HEADER_H #include "types.h" #include "game/paintings.h" @@ -152,3 +153,5 @@ extern const struct MovtexQuadCollection inside_castle_movtex_moat_water[]; // script extern const LevelScript level_castle_inside_entry[]; + +#endif diff --git a/levels/ccm/header.h b/levels/ccm/header.h index 42747626..7c35d003 100644 --- a/levels/ccm/header.h +++ b/levels/ccm/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef CCM_HEADER_H +#define CCM_HEADER_H #include "types.h" #include "game/moving_texture.h" @@ -55,3 +56,5 @@ extern const Trajectory ccm_seg7_trajectory_penguin_race[]; // script extern const LevelScript level_ccm_entry[]; + +#endif diff --git a/levels/cotmc/header.h b/levels/cotmc/header.h index 0d711a3d..d788998d 100644 --- a/levels/cotmc/header.h +++ b/levels/cotmc/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef COTMC_HEADER_H +#define COTMC_HEADER_H #include "types.h" @@ -18,3 +19,5 @@ extern const Gfx cotmc_dl_water[]; // script extern const LevelScript level_cotmc_entry[]; + +#endif diff --git a/levels/ddd/header.h b/levels/ddd/header.h index 1eafff10..0d946f1a 100644 --- a/levels/ddd/header.h +++ b/levels/ddd/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DDD_HEADER_H +#define DDD_HEADER_H #include "types.h" #include "game/moving_texture.h" @@ -38,3 +39,5 @@ extern const struct MovtexQuadCollection ddd_movtex_area2_water[]; // script extern const LevelScript level_ddd_entry[]; + +#endif diff --git a/levels/ending/header.h b/levels/ending/header.h index 236a97d3..30bee900 100644 --- a/levels/ending/header.h +++ b/levels/ending/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef ENDING_HEADER_H +#define ENDING_HEADER_H #include "types.h" @@ -18,3 +19,5 @@ extern const Gfx dl_cake_end_screen[]; // script extern const LevelScript level_ending_entry[]; + +#endif diff --git a/levels/entry.h b/levels/entry.h index 5910674c..2bfc2021 100644 --- a/levels/entry.h +++ b/levels/entry.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef ENTRY_H +#define ENTRY_H #include "types.h" // script extern const LevelScript level_script_entry[]; + +#endif diff --git a/levels/hmc/header.h b/levels/hmc/header.h index 3a98c93b..6cf715a6 100644 --- a/levels/hmc/header.h +++ b/levels/hmc/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef HMC_HEADER_H +#define HMC_HEADER_H #include "types.h" #include "game/moving_texture.h" @@ -88,3 +89,5 @@ extern const struct MovtexQuadCollection hmc_movtex_toxic_maze_mist[]; // script extern const LevelScript level_hmc_entry[]; + +#endif diff --git a/levels/intro/header.h b/levels/intro/header.h index 226606fe..5197daf0 100644 --- a/levels/intro/header.h +++ b/levels/intro/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INTRO_HEADER_H +#define INTRO_HEADER_H #include "types.h" @@ -24,3 +25,5 @@ extern const LevelScript script_intro_level_select[]; extern const LevelScript script_intro_main_level_entry_stop_music[]; extern const LevelScript script_intro_main_level_entry[]; extern const LevelScript script_intro_splash_screen[]; + +#endif diff --git a/levels/jrb/header.h b/levels/jrb/header.h index 3426d3b6..c6887382 100644 --- a/levels/jrb/header.h +++ b/levels/jrb/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef JRB_HEADER_H +#define JRB_HEADER_H #include "types.h" #include "game/moving_texture.h" @@ -61,3 +62,5 @@ extern const struct MovtexQuadCollection jrb_movtex_sinked_boat_water[]; // script extern const LevelScript level_jrb_entry[]; + +#endif diff --git a/levels/lll/header.h b/levels/lll/header.h index e85526e4..b558a9c6 100644 --- a/levels/lll/header.h +++ b/levels/lll/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef LLL_HEADER_H +#define LLL_HEADER_H #include "types.h" #include "game/moving_texture.h" @@ -126,3 +127,5 @@ extern const Gfx lll_dl_lavafall_volcano[]; // script extern const LevelScript level_lll_entry[]; + +#endif diff --git a/levels/menu/header.h b/levels/menu/header.h index 2c3927e3..59bfb341 100644 --- a/levels/menu/header.h +++ b/levels/menu/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MENU_HEADER_H +#define MENU_HEADER_H #include "types.h" @@ -47,3 +48,5 @@ extern const u8 eu_course_strings_de_table[]; // script extern const LevelScript level_main_menu_entry_file_select[]; extern const LevelScript level_main_menu_entry_act_select[]; + +#endif diff --git a/levels/pss/header.h b/levels/pss/header.h index 63da2160..830cae6a 100644 --- a/levels/pss/header.h +++ b/levels/pss/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef PSS_HEADER_H +#define PSS_HEADER_H #include "types.h" @@ -18,3 +19,5 @@ extern const MacroObject pss_seg7_macro_objs[]; // script extern const LevelScript level_pss_entry[]; + +#endif diff --git a/levels/rr/header.h b/levels/rr/header.h index f75a3396..162d3847 100644 --- a/levels/rr/header.h +++ b/levels/rr/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef RR_HEADER_H +#define RR_HEADER_H #include "types.h" @@ -108,3 +109,5 @@ extern const Trajectory rr_seg7_trajectory_0702EEE0[]; // script extern const LevelScript level_rr_entry[]; + +#endif diff --git a/levels/sa/header.h b/levels/sa/header.h index 5563139a..e8c5cf47 100644 --- a/levels/sa/header.h +++ b/levels/sa/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SA_HEADER_H +#define SA_HEADER_H #include "types.h" @@ -13,3 +14,5 @@ extern const MacroObject sa_seg7_macro_objs[]; // script extern const LevelScript level_sa_entry[]; + +#endif diff --git a/levels/scripts.h b/levels/scripts.h index 98192a7d..dc019682 100644 --- a/levels/scripts.h +++ b/levels/scripts.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SCRIPTS_H +#define SCRIPTS_H #include "types.h" #include "game/puppycam2.h" @@ -23,3 +24,5 @@ extern const LevelScript script_func_global_15[]; extern const LevelScript script_func_global_16[]; extern const LevelScript script_func_global_17[]; extern const LevelScript script_func_global_18[]; + +#endif diff --git a/levels/sl/header.h b/levels/sl/header.h index 7f06f528..457fb093 100644 --- a/levels/sl/header.h +++ b/levels/sl/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SL_HEADER_H +#define SL_HEADER_H #include "types.h" #include "game/moving_texture.h" @@ -35,3 +36,5 @@ extern const struct MovtexQuadCollection sl_movtex_water[]; // script extern const LevelScript level_sl_entry[]; + +#endif diff --git a/levels/ssl/header.h b/levels/ssl/header.h index 4e626b1e..a38845cd 100644 --- a/levels/ssl/header.h +++ b/levels/ssl/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SSL_HEADER_H +#define SSL_HEADER_H #include "types.h" #include "game/moving_texture.h" @@ -83,3 +84,5 @@ extern const Gfx ssl_dl_pyramid_sand_pathway_side_end[]; // script extern const LevelScript level_ssl_entry[]; + +#endif diff --git a/levels/thi/header.h b/levels/thi/header.h index 00f5f5ce..a3b7ea1a 100644 --- a/levels/thi/header.h +++ b/levels/thi/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef THI_HEADER_H +#define THI_HEADER_H #include "types.h" #include "game/moving_texture.h" @@ -37,3 +38,5 @@ extern const struct MovtexQuadCollection thi_movtex_area2_water[]; // script extern const LevelScript level_thi_entry[]; + +#endif diff --git a/levels/totwc/header.h b/levels/totwc/header.h index dc43858e..8579fa4b 100644 --- a/levels/totwc/header.h +++ b/levels/totwc/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TOTWC_HEADER_H +#define TOTWC_HEADER_H #include "types.h" @@ -16,3 +17,5 @@ extern const MacroObject totwc_seg7_macro_objs[]; // script extern const LevelScript level_totwc_entry[]; + +#endif diff --git a/levels/ttc/header.h b/levels/ttc/header.h index f77c958d..30edd607 100644 --- a/levels/ttc/header.h +++ b/levels/ttc/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TTC_HEADER_H +#define TTC_HEADER_H #include "types.h" @@ -63,3 +64,5 @@ extern const Gfx ttc_dl_surface_treadmill[]; // script extern const LevelScript level_ttc_entry[]; + +#endif diff --git a/levels/ttm/header.h b/levels/ttm/header.h index d6382f7b..3c060526 100644 --- a/levels/ttm/header.h +++ b/levels/ttm/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TTM_HEADER_H +#define TTM_HEADER_H #include "types.h" #include "game/moving_texture.h" @@ -109,3 +110,5 @@ extern const MacroObject ttm_seg7_area_4_macro_objs[]; // script extern const LevelScript level_ttm_entry[]; + +#endif diff --git a/levels/vcutm/header.h b/levels/vcutm/header.h index 7febcec2..eb88d731 100644 --- a/levels/vcutm/header.h +++ b/levels/vcutm/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef VCUTM_HEADER_H +#define VCUTM_HEADER_H #include "types.h" @@ -18,3 +19,5 @@ extern const Collision vcutm_seg7_collision_0700AC44[]; // script extern const LevelScript level_vcutm_entry[]; + +#endif diff --git a/levels/wdw/header.h b/levels/wdw/header.h index 35acb27d..63cddc3b 100644 --- a/levels/wdw/header.h +++ b/levels/wdw/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef WDW_HEADER_H +#define WDW_HEADER_H #include "types.h" #include "game/moving_texture.h" @@ -44,3 +45,5 @@ extern const struct MovtexQuadCollection wdw_movtex_area2_water[]; // script extern const LevelScript level_wdw_entry[]; + +#endif diff --git a/levels/wf/header.h b/levels/wf/header.h index 416593d8..44f3cf14 100644 --- a/levels/wf/header.h +++ b/levels/wf/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef WF_HEADER_H +#define WF_HEADER_H #include "types.h" #include "game/moving_texture.h" @@ -97,3 +98,5 @@ extern const struct MovtexQuadCollection wf_movtex_water[]; // script extern const LevelScript level_wf_entry[]; + +#endif diff --git a/levels/wmotr/header.h b/levels/wmotr/header.h index ee58aeea..d411d8c8 100644 --- a/levels/wmotr/header.h +++ b/levels/wmotr/header.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef WMOTR_HEADER_H +#define WMOTR_HEADER_H #include "types.h" @@ -14,3 +15,5 @@ extern const MacroObject wmotr_seg7_macro_objs[]; // script extern const LevelScript level_wmotr_entry[]; + +#endif diff --git a/src/audio/data.h b/src/audio/data.h index 503201f7..2e0c37aa 100644 --- a/src/audio/data.h +++ b/src/audio/data.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef AUDIO_DATA_H +#define AUDIO_DATA_H #include @@ -160,3 +161,5 @@ extern u16 D_SH_80315EF4; extern u16 D_SH_80315EF8; extern u16 D_SH_80315EFC; #endif + +#endif // AUDIO_DATA_H diff --git a/src/audio/effects.h b/src/audio/effects.h index 20c5a13e..a6de1ab9 100644 --- a/src/audio/effects.h +++ b/src/audio/effects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef AUDIO_EFFECTS_H +#define AUDIO_EFFECTS_H #include @@ -41,3 +42,5 @@ f32 adsr_update(struct AdsrState *adsr); #else s32 adsr_update(struct AdsrState *adsr); #endif + +#endif // AUDIO_EFFECTS_H diff --git a/src/audio/external.h b/src/audio/external.h index 46b9e6df..d26723ce 100644 --- a/src/audio/external.h +++ b/src/audio/external.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef AUDIO_EXTERNAL_H +#define AUDIO_EXTERNAL_H #include @@ -64,3 +65,5 @@ void sound_reset(u8 presetId); void audio_set_sound_mode(u8 arg0); void audio_init(void); // in load.c + +#endif // AUDIO_EXTERNAL_H diff --git a/src/audio/heap.h b/src/audio/heap.h index 1120005a..e8c839b7 100644 --- a/src/audio/heap.h +++ b/src/audio/heap.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef AUDIO_HEAP_H +#define AUDIO_HEAP_H #include @@ -139,3 +140,5 @@ u8 *func_sh_802f1d90(u32 size, s32 bank, u8 *arg2, s8 medium); void *unk_pool1_lookup(s32 poolIdx, s32 id); void *unk_pool1_alloc(s32 poolIndex, s32 arg1, u32 size); #endif + +#endif // AUDIO_HEAP_H diff --git a/src/audio/internal.h b/src/audio/internal.h index 56c5dd54..fb38a43e 100644 --- a/src/audio/internal.h +++ b/src/audio/internal.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef AUDIO_INTERNAL_H +#define AUDIO_INTERNAL_H #include @@ -896,3 +897,5 @@ struct UnkStruct80343D00 { extern s32 D_SH_80343CF0; extern struct UnkStruct80343D00 D_SH_80343D00; #endif + +#endif // AUDIO_INTERNAL_H diff --git a/src/audio/load.h b/src/audio/load.h index 23fe51c7..506e4202 100644 --- a/src/audio/load.h +++ b/src/audio/load.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef AUDIO_LOAD_H +#define AUDIO_LOAD_H #include @@ -110,3 +111,5 @@ void func_sh_802f30f4(s32 arg0, s32 arg1, s32 arg2, OSMesgQueue *arg3); void func_sh_802f3288(s32 idx); #endif + +#endif // AUDIO_LOAD_H diff --git a/src/audio/playback.h b/src/audio/playback.h index b60fbbb9..e2e15bf9 100644 --- a/src/audio/playback.h +++ b/src/audio/playback.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef AUDIO_PLAYBACK_H +#define AUDIO_PLAYBACK_H #include @@ -44,3 +45,6 @@ void note_set_frequency(struct Note *note, f32 frequency); void note_enable(struct Note *note); void note_disable(struct Note *note); #endif + + +#endif // AUDIO_PLAYBACK_H diff --git a/src/audio/seqplayer.h b/src/audio/seqplayer.h index 191ba26c..d2fc1344 100644 --- a/src/audio/seqplayer.h +++ b/src/audio/seqplayer.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef AUDIO_SEQPLAYER_H +#define AUDIO_SEQPLAYER_H #include @@ -13,3 +14,5 @@ void *audio_list_pop_back(struct AudioListItem *list); void process_sequences(s32 iterationsRemaining); void init_sequence_player(u32 player); void init_sequence_players(void); + +#endif // AUDIO_SEQPLAYER_H diff --git a/src/audio/synthesis.h b/src/audio/synthesis.h index 91b861b9..7ee69ad7 100644 --- a/src/audio/synthesis.h +++ b/src/audio/synthesis.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef AUDIO_SYNTHESIS_H +#define AUDIO_SYNTHESIS_H #include "internal.h" @@ -126,3 +127,5 @@ void note_set_frequency(struct Note *note, f32 frequency); void note_enable(struct Note *note); void note_disable(struct Note *note); #endif + +#endif // AUDIO_SYNTHESIS_H diff --git a/src/boot/slidec.h b/src/boot/slidec.h index 29dfc4fd..74d7c1fd 100644 --- a/src/boot/slidec.h +++ b/src/boot/slidec.h @@ -1,5 +1,8 @@ -#pragma once +#ifndef SLIDEC_H +#define SLIDEC_H void slidstart(unsigned char*, unsigned char *); void decompress(void *mio0, void *dest); + +#endif // SLIDEC_H diff --git a/src/buffers/buffers.h b/src/buffers/buffers.h index da2f7ef4..f063a023 100644 --- a/src/buffers/buffers.h +++ b/src/buffers/buffers.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef BUFFERS_H +#define BUFFERS_H #include #include @@ -33,3 +34,5 @@ extern u64 hvq_yieldbuf[]; /* RSP task yield buffer */ extern HVQM2Info hvq_spfifo[]; /* Data area for HVQM2 microcode */ extern u16 hvqwork[]; /* Work buffer for HVQM2 decoder */ extern u8 hvqbuf[]; /* Buffer for video records (HVQM2) */ + +#endif // BUFFERS_H diff --git a/src/buffers/framebuffers.h b/src/buffers/framebuffers.h index 7bfa11dc..39e86801 100644 --- a/src/buffers/framebuffers.h +++ b/src/buffers/framebuffers.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef FRAMEBUFFERS_H +#define FRAMEBUFFERS_H #include @@ -11,3 +12,5 @@ extern u16 gFrameBuffers[3][SCREEN_WIDTH * SCREEN_HEIGHT]; #define gFrameBuffer0 gFrameBuffers[0] #define gFrameBuffer1 gFrameBuffers[1] #define gFrameBuffer2 gFrameBuffers[2] + +#endif // FRAMEBUFFERS_H diff --git a/src/buffers/gfx_output_buffer.h b/src/buffers/gfx_output_buffer.h index 9ba2e87a..8f6ded2f 100644 --- a/src/buffers/gfx_output_buffer.h +++ b/src/buffers/gfx_output_buffer.h @@ -1,5 +1,8 @@ -#pragma once +#ifndef GFX_OUTPUT_BUFFER_H +#define GFX_OUTPUT_BUFFER_H #include extern u64 gGfxSPTaskOutputBuffer[0x2fc0]; + +#endif // GFX_OUTPUT_BUFFER_H diff --git a/src/buffers/zbuffer.h b/src/buffers/zbuffer.h index 17440610..bb02f597 100644 --- a/src/buffers/zbuffer.h +++ b/src/buffers/zbuffer.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef ZBUFFER_H +#define ZBUFFER_H #include @@ -6,3 +7,5 @@ #include "macros.h" extern u16 gZBuffer[SCREEN_WIDTH * SCREEN_HEIGHT]; + +#endif // ZBUFFER_H diff --git a/src/engine/behavior_script.h b/src/engine/behavior_script.h index 77f007b2..2d1ff214 100644 --- a/src/engine/behavior_script.h +++ b/src/engine/behavior_script.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef BEHAVIOR_SCRIPT_H +#define BEHAVIOR_SCRIPT_H #include @@ -23,3 +24,5 @@ float random_float(void); s32 random_sign(void); void cur_obj_update(void); + +#endif // BEHAVIOR_SCRIPT_H diff --git a/src/engine/extended_bounds.h b/src/engine/extended_bounds.h index 0323f13e..591a183e 100644 --- a/src/engine/extended_bounds.h +++ b/src/engine/extended_bounds.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef __EXTENDED_BOUNDS_H__ +#define __EXTENDED_BOUNDS_H__ /* Better Extended Bounds by anonymous_moose @@ -74,3 +75,6 @@ STATIC_ASSERT(LEVEL_BOUNDARY_MAX != 0, "You must set a valid extended bounds mod #define NOT_ENOUGH_ROOM_FOR_SURFACES (1 << 0) #define NOT_ENOUGH_ROOM_FOR_NODES (1 << 1) + + +#endif // __EXTENDED_BOUNDS_H__ diff --git a/src/engine/geo_layout.h b/src/engine/geo_layout.h index ba23837d..103311db 100644 --- a/src/engine/geo_layout.h +++ b/src/engine/geo_layout.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GEO_LAYOUT_H +#define GEO_LAYOUT_H #include @@ -76,3 +77,5 @@ void geo_layout_cmd_node_culling_radius(void); void geo_layout_cmd_bone(void); struct GraphNode *process_geo_layout(struct AllocOnlyPool *pool, void *segptr); + +#endif // GEO_LAYOUT_H diff --git a/src/engine/graph_node.h b/src/engine/graph_node.h index cbeee9e1..72a54511 100644 --- a/src/engine/graph_node.h +++ b/src/engine/graph_node.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GRAPH_NODE_H +#define GRAPH_NODE_H #include #include @@ -454,3 +455,5 @@ s16 *read_vec3s_to_vec3f(Vec3f, s16 *src); s16 *read_vec3s(Vec3s dst, s16 *src); s16 *read_vec3s_angle(Vec3s dst, s16 *src); void register_scene_graph_node(struct GraphNode *graphNode); + +#endif // GRAPH_NODE_H diff --git a/src/engine/level_script.h b/src/engine/level_script.h index 45befb03..d41a91c8 100644 --- a/src/engine/level_script.h +++ b/src/engine/level_script.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef LEVEL_SCRIPT_H +#define LEVEL_SCRIPT_H #include @@ -7,3 +8,5 @@ struct LevelCommand; extern u8 level_script_entry[]; struct LevelCommand *level_script_execute(struct LevelCommand *cmd); + +#endif // LEVEL_SCRIPT_H diff --git a/src/engine/math_util.h b/src/engine/math_util.h index 8c776a55..b4224fa9 100644 --- a/src/engine/math_util.h +++ b/src/engine/math_util.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MATH_UTIL_H +#define MATH_UTIL_H #include @@ -381,3 +382,5 @@ f32 atan2f(f32 a, f32 b); void spline_get_weights(Vec4f result, f32 t, UNUSED s32 c); void anim_spline_init(Vec4s *keyFrames); s32 anim_spline_poll(Vec3f result); + +#endif // MATH_UTIL_H diff --git a/src/engine/surface_collision.h b/src/engine/surface_collision.h index 72492df7..8982e2d5 100644 --- a/src/engine/surface_collision.h +++ b/src/engine/surface_collision.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SURFACE_COLLISION_H +#define SURFACE_COLLISION_H #include @@ -39,3 +40,5 @@ s32 find_water_level(s32 x, s32 z); s32 find_poison_gas_level(s32 x, s32 z); void debug_surface_list_info(f32 xPos, f32 zPos); void find_surface_on_ray(Vec3f orig, Vec3f dir, struct Surface **hit_surface, Vec3f hit_pos, s32 flags); + +#endif // SURFACE_COLLISION_H diff --git a/src/engine/surface_load.h b/src/engine/surface_load.h index f3011d45..0f8fea57 100644 --- a/src/engine/surface_load.h +++ b/src/engine/surface_load.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SURFACE_LOAD_H +#define SURFACE_LOAD_H #include @@ -39,3 +40,5 @@ u32 get_area_terrain_size(TerrainData *data); void load_area_terrain(s32 index, TerrainData *data, RoomData *surfaceRooms, s16 *macroObjects); void clear_dynamic_surfaces(void); void load_object_collision_model(void); + +#endif // SURFACE_LOAD_H diff --git a/src/game/area.h b/src/game/area.h index 30115c23..c8f073c4 100644 --- a/src/game/area.h +++ b/src/game/area.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef AREA_H +#define AREA_H #include @@ -171,3 +172,5 @@ void area_update_objects(void); void play_transition(s16 transType, s16 time, u8 red, u8 green, u8 blue); void play_transition_after_delay(s16 transType, s16 time, u8 red, u8 green, u8 blue, s16 delay); void render_game(void); + +#endif // AREA_H diff --git a/src/game/behavior_actions.h b/src/game/behavior_actions.h index 45dd7f4d..37701670 100644 --- a/src/game/behavior_actions.h +++ b/src/game/behavior_actions.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef BEHAVIOR_ACTIONS_H +#define BEHAVIOR_ACTIONS_H void spawn_mist_particles_variable(s32 count, s32 offsetY, f32 size); void bhv_spawn_star_no_level_exit(u32); @@ -573,3 +574,5 @@ Gfx *geo_scale_bowser_key(s32 run, struct GraphNode *node, UNUSED f32 mtx[4][4]) // Water splash extern struct WaterDropletParams gShallowWaterSplashDropletParams; extern struct WaterDropletParams gShallowWaterWaveDropletParams; + +#endif // BEHAVIOR_ACTIONS_H diff --git a/src/game/camera.h b/src/game/camera.h index b75e598c..da826ee4 100644 --- a/src/game/camera.h +++ b/src/game/camera.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef CAMERA_H +#define CAMERA_H #include @@ -765,3 +766,5 @@ void set_fov_shake_from_point_preset(u8 preset, f32 posX, f32 posY, f32 posZ); void obj_rotate_towards_point(struct Object *o, Vec3f point, s16 pitchOff, s16 yawOff, s16 pitchDiv, s16 yawDiv); Gfx *geo_camera_fov(s32 callContext, struct GraphNode *g, UNUSED void *context); + +#endif // CAMERA_H diff --git a/src/game/debug.h b/src/game/debug.h index 50848572..7e89296c 100644 --- a/src/game/debug.h +++ b/src/game/debug.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DEBUG_H +#define DEBUG_H #include @@ -23,3 +24,5 @@ void stub_debug_5(void); void try_print_debug_mario_object_info(void); void try_do_mario_debug_object_spawn(void); void try_print_debug_mario_level_info(void); + +#endif // DEBUG_H diff --git a/src/game/debug_box.h b/src/game/debug_box.h index 2b4bcc4d..2a8ba2f8 100644 --- a/src/game/debug_box.h +++ b/src/game/debug_box.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DEBUG_BOX_H +#define DEBUG_BOX_H #ifdef VISUAL_DEBUG @@ -36,3 +37,5 @@ void render_debug_boxes(s32 type); extern void visual_surface_loop(void); #endif + +#endif /* DEBUG_BOX_H */ diff --git a/src/game/debug_course.h b/src/game/debug_course.h index a1de9cc1..8d094e09 100644 --- a/src/game/debug_course.h +++ b/src/game/debug_course.h @@ -1,3 +1,6 @@ -#pragma once +#ifndef DEBUG_COURSE_H +#define DEBUG_COURSE_H void nop_change_course(void); + +#endif // DEBUG_COURSE_H diff --git a/src/game/envfx_bubbles.h b/src/game/envfx_bubbles.h index 9a72336d..024c3fe0 100644 --- a/src/game/envfx_bubbles.h +++ b/src/game/envfx_bubbles.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef ENVFX_BUBBLES_H +#define ENVFX_BUBBLES_H #include #include @@ -17,3 +18,5 @@ // Used to communicate from whirlpool behavior to envfx extern s16 gEnvFxBubbleConfig[10]; Gfx *envfx_update_bubbles(s32 mode, Vec3s marioPos, Vec3s camTo, Vec3s camFrom); + +#endif // ENVFX_BUBBLES_H diff --git a/src/game/envfx_snow.h b/src/game/envfx_snow.h index 5292f7e4..a8e1e9cb 100644 --- a/src/game/envfx_snow.h +++ b/src/game/envfx_snow.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef ENVFX_SNOW_H +#define ENVFX_SNOW_H #include #include "types.h" @@ -36,3 +37,5 @@ extern s16 gSnowParticleCount; Gfx *envfx_update_particles(s32 snowMode, Vec3s marioPos, Vec3s camTo, Vec3s camFrom); void orbit_from_positions(Vec3s from, Vec3s to, s16 *radius, s16 *pitch, s16 *yaw); void rotate_triangle_vertices(Vec3s vertex1, Vec3s vertex2, Vec3s vertex3, s16 pitch, s16 yaw); + +#endif // ENVFX_SNOW_H diff --git a/src/game/farcall_helpers.h b/src/game/farcall_helpers.h index 9aaddcef..d42daf15 100644 --- a/src/game/farcall_helpers.h +++ b/src/game/farcall_helpers.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJ_BEHAVIORS_2_NONSTATIC_H +#define OBJ_BEHAVIORS_2_NONSTATIC_H #include "object_fields.h" #include "object_constants.h" @@ -79,3 +80,5 @@ s32 obj_update_standard_actions(f32 scale); s32 obj_check_attacks(struct ObjectHitbox *hitbox, s32 attackedMarioAction); s32 obj_move_for_one_second(s32 endAction); void treat_far_home_as_mario(f32 threshold); + +#endif diff --git a/src/game/game_init.h b/src/game/game_init.h index 4be7423a..0c1d170d 100644 --- a/src/game/game_init.h +++ b/src/game/game_init.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GAME_INIT_H +#define GAME_INIT_H #include #include @@ -88,3 +89,5 @@ void end_master_display_list(void); void render_init(void); void select_gfx_pool(void); void display_and_vsync(void); + +#endif // GAME_INIT_H diff --git a/src/game/geo_misc.h b/src/game/geo_misc.h index 6c2dab63..904633af 100644 --- a/src/game/geo_misc.h +++ b/src/game/geo_misc.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GEO_MISC_H +#define GEO_MISC_H #include #include @@ -36,3 +37,5 @@ extern Gfx *geo_exec_cake_end_screen(s32 callContext, struct GraphNode *node, UN gDPLoadSync((dl)); \ gDPLoadBlock((dl), G_TX_LOADTILE, 0, 0, (width) * (height) - 1, CALC_DXT((width), G_IM_SIZ_16b_BYTES)) \ } + +#endif // GEO_MISC_H diff --git a/src/game/hud.h b/src/game/hud.h index 15082f9a..bfa44fa5 100644 --- a/src/game/hud.h +++ b/src/game/hud.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef HUD_H +#define HUD_H #include #include @@ -22,3 +23,5 @@ enum CameraHUDLut { void set_hud_camera_status(s16 status); void render_hud(void); + +#endif // HUD_H diff --git a/src/game/ingame_menu.h b/src/game/ingame_menu.h index 020a2d7d..30c17aa3 100644 --- a/src/game/ingame_menu.h +++ b/src/game/ingame_menu.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INGAME_MENU_H +#define INGAME_MENU_H #include @@ -162,3 +163,5 @@ void do_cutscene_handler(void); void render_hud_cannon_reticle(void); void reset_red_coins_collected(void); s16 render_menus_and_dialogs(void); + +#endif // INGAME_MENU_H diff --git a/src/game/interaction.h b/src/game/interaction.h index 27a7c25a..9fec1702 100644 --- a/src/game/interaction.h +++ b/src/game/interaction.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INTERACTION_H +#define INTERACTION_H #include @@ -120,3 +121,5 @@ u32 mario_check_object_grab(struct MarioState *m); u32 get_door_save_file_flag(struct Object *door); void mario_process_interactions(struct MarioState *m); void mario_handle_special_floors(struct MarioState *m); + +#endif // INTERACTION_H diff --git a/src/game/level_geo.h b/src/game/level_geo.h index 65b94235..e4b4016c 100644 --- a/src/game/level_geo.h +++ b/src/game/level_geo.h @@ -1,7 +1,10 @@ -#pragma once +#ifndef LEVEL_GEO_H +#define LEVEL_GEO_H #include #include Gfx *geo_envfx_main(s32 callContext, struct GraphNode *node, Mat4 mtxf); Gfx *geo_skybox_main(s32 callContext, struct GraphNode *node, UNUSED Mat4 *mtx); + +#endif // LEVEL_GEO_H diff --git a/src/game/level_update.h b/src/game/level_update.h index 1da93e5c..a8bd0e3c 100644 --- a/src/game/level_update.h +++ b/src/game/level_update.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef LEVEL_UPDATE_H +#define LEVEL_UPDATE_H #include @@ -137,3 +138,5 @@ s32 lvl_init_from_save_file(UNUSED s16 arg0, s32 levelNum); s32 lvl_set_current_level(UNUSED s16 arg0, s32 levelNum); s32 lvl_play_the_end_screen_sound(UNUSED s16 arg0, UNUSED s32 arg1); void basic_update(UNUSED s16 *arg); + +#endif // LEVEL_UPDATE_H diff --git a/src/game/macro_special_objects.h b/src/game/macro_special_objects.h index 96de3cac..1996aac5 100644 --- a/src/game/macro_special_objects.h +++ b/src/game/macro_special_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MACRO_SPECIAL_OBJECTS_H +#define MACRO_SPECIAL_OBJECTS_H #include @@ -16,3 +17,5 @@ void spawn_special_objects(s32 areaIndex, TerrainData **specialObjList); #ifdef NO_SEGMENTED_MEMORY u32 get_special_objects_size(s16 *data); #endif + +#endif // MACRO_SPECIAL_OBJECTS_H diff --git a/src/game/main.h b/src/game/main.h index f7fad8ba..e175a768 100644 --- a/src/game/main.h +++ b/src/game/main.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MAIN_H +#define MAIN_H #include "config.h" @@ -70,3 +71,5 @@ extern s8 gShowDebugText; void set_vblank_handler(s32 index, struct VblankHandler *handler, OSMesgQueue *queue, OSMesg *msg); void dispatch_audio_sptask(struct SPTask *spTask); void exec_display_list(struct SPTask *spTask); + +#endif // MAIN_H diff --git a/src/game/mario.h b/src/game/mario.h index 36033378..48d28655 100644 --- a/src/game/mario.h +++ b/src/game/mario.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MARIO_H +#define MARIO_H #include @@ -48,3 +49,5 @@ s32 set_water_plunge_action(struct MarioState *m); s32 execute_mario_action(UNUSED struct Object *o); void init_mario(void); void init_mario_from_save_file(void); + +#endif // MARIO_H diff --git a/src/game/mario_actions_airborne.h b/src/game/mario_actions_airborne.h index 8fb62552..116a20d0 100644 --- a/src/game/mario_actions_airborne.h +++ b/src/game/mario_actions_airborne.h @@ -1,7 +1,10 @@ -#pragma once +#ifndef MARIO_ACTIONS_AIRBORNE_H +#define MARIO_ACTIONS_AIRBORNE_H #include #include "types.h" s32 mario_execute_airborne_action(struct MarioState *m); + +#endif // MARIO_ACTIONS_AIRBORNE_H diff --git a/src/game/mario_actions_automatic.h b/src/game/mario_actions_automatic.h index 66519854..46855b32 100644 --- a/src/game/mario_actions_automatic.h +++ b/src/game/mario_actions_automatic.h @@ -1,7 +1,10 @@ -#pragma once +#ifndef MARIO_ACTIONS_AUTOMATIC_H +#define MARIO_ACTIONS_AUTOMATIC_H #include #include "types.h" s32 mario_execute_automatic_action(struct MarioState *m); + +#endif // MARIO_ACTIONS_AUTOMATIC_H diff --git a/src/game/mario_actions_cutscene.h b/src/game/mario_actions_cutscene.h index b9d1e73e..75a62929 100644 --- a/src/game/mario_actions_cutscene.h +++ b/src/game/mario_actions_cutscene.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MARIO_ACTIONS_CUTSCENE_H +#define MARIO_ACTIONS_CUTSCENE_H #include @@ -25,3 +26,5 @@ s32 set_mario_npc_dialog(s32 actionArg); s32 mario_execute_cutscene_action(struct MarioState *m); extern Vp sEndCutsceneVp; extern struct CreditsEntry *sDispCreditsEntry; + +#endif // MARIO_ACTIONS_CUTSCENE_H diff --git a/src/game/mario_actions_object.h b/src/game/mario_actions_object.h index 13845dcd..d398eabe 100644 --- a/src/game/mario_actions_object.h +++ b/src/game/mario_actions_object.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MARIO_ACTIONS_OBJECT_H +#define MARIO_ACTIONS_OBJECT_H #include @@ -6,3 +7,5 @@ s32 mario_update_punch_sequence(struct MarioState *m); s32 mario_execute_object_action(struct MarioState *m); + +#endif // MARIO_ACTIONS_OBJECT_H diff --git a/src/game/mario_actions_submerged.h b/src/game/mario_actions_submerged.h index 9ee09590..addef2fc 100644 --- a/src/game/mario_actions_submerged.h +++ b/src/game/mario_actions_submerged.h @@ -1,7 +1,10 @@ -#pragma once +#ifndef MARIO_ACTIONS_SUBMERGED_H +#define MARIO_ACTIONS_SUBMERGED_H #include #include "types.h" s32 mario_execute_submerged_action(struct MarioState *m); + +#endif // MARIO_ACTIONS_SUBMERGED_H diff --git a/src/game/mario_misc.h b/src/game/mario_misc.h index 8943c597..7053ca34 100644 --- a/src/game/mario_misc.h +++ b/src/game/mario_misc.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MARIO_MISC_H +#define MARIO_MISC_H #include @@ -29,3 +30,5 @@ Gfx *geo_mario_rotate_wing_cap_wings(s32 callContext, struct GraphNode *node, UN Gfx *geo_switch_mario_hand_grab_pos(s32 callContext, struct GraphNode *b, Mat4 *mtx); Gfx *geo_render_mirror_mario(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c); Gfx *geo_mirror_mario_backface_culling(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c); + +#endif // MARIO_MISC_H diff --git a/src/game/mario_step.h b/src/game/mario_step.h index 1948f1de..792445c0 100644 --- a/src/game/mario_step.h +++ b/src/game/mario_step.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MARIO_STEP_H +#define MARIO_STEP_H #include @@ -31,3 +32,5 @@ void stop_and_set_height_to_floor(struct MarioState *m); s32 stationary_ground_step(struct MarioState *m); s32 perform_ground_step(struct MarioState *m); s32 perform_air_step(struct MarioState *m, u32 stepArg); + +#endif // MARIO_STEP_H diff --git a/src/game/memory.h b/src/game/memory.h index ea4a5f4e..592ab2c7 100644 --- a/src/game/memory.h +++ b/src/game/memory.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MEMORY_H +#define MEMORY_H #include @@ -83,3 +84,5 @@ void mem_pool_free(struct MemoryPool *pool, void *addr); void *alloc_display_list(u32 size); void setup_dma_table_list(struct DmaHandlerList *list, void *srcAddr, void *buffer); s32 load_patchable_table(struct DmaHandlerList *list, s32 index); + +#endif // MEMORY_H diff --git a/src/game/moving_texture.h b/src/game/moving_texture.h index 10211a92..9d2e3db1 100644 --- a/src/game/moving_texture.h +++ b/src/game/moving_texture.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef MOVING_TEXTURE_H +#define MOVING_TEXTURE_H #include @@ -119,3 +120,5 @@ Gfx *geo_movtex_draw_colored_no_update(s32 callContext, struct GraphNode *node, Gfx *geo_movtex_draw_colored_2_no_update(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx); Gfx *geo_movtex_update_horizontal(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx); Gfx *geo_movtex_draw_colored_no_update(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx); + +#endif // MOVING_TEXTURE_H diff --git a/src/game/obj_behaviors.h b/src/game/obj_behaviors.h index c5278c02..bb4f740c 100644 --- a/src/game/obj_behaviors.h +++ b/src/game/obj_behaviors.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJ_BEHAVIORS_H +#define OBJ_BEHAVIORS_H #include @@ -160,3 +161,5 @@ void bhv_free_bowling_ball_loop(void); /* likely unused */ void bhv_rr_cruiser_wing_init(void); void bhv_rr_cruiser_wing_loop(void); void spawn_default_star(f32 x, f32 y, f32 z); + +#endif // OBJ_BEHAVIORS_H diff --git a/src/game/obj_behaviors_2.h b/src/game/obj_behaviors_2.h index a43d66ab..74c97b2c 100644 --- a/src/game/obj_behaviors_2.h +++ b/src/game/obj_behaviors_2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJ_BEHAVIORS_2_H +#define OBJ_BEHAVIORS_2_H #include @@ -18,3 +19,5 @@ void shelled_koopa_attack_handler(s32 attackType); void obj_spit_fire(s16 relativePosX, s16 relativePosY, s16 relativePosZ, f32 scale, s32 model, f32 startSpeed, f32 endSpeed, s16 movePitch); void obj_set_speed_to_zero(void); + +#endif // OBJ_BEHAVIORS_2_H diff --git a/src/game/object_collision.h b/src/game/object_collision.h index cbcfdac1..3357d197 100644 --- a/src/game/object_collision.h +++ b/src/game/object_collision.h @@ -1,3 +1,6 @@ -#pragma once +#ifndef OBJECT_COLLISION_H +#define OBJECT_COLLISION_H void detect_object_collisions(void); + +#endif // OBJECT_COLLISION_H diff --git a/src/game/object_helpers.h b/src/game/object_helpers.h index b02b819a..7040dcfa 100644 --- a/src/game/object_helpers.h +++ b/src/game/object_helpers.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECT_HELPERS_H +#define OBJECT_HELPERS_H #include @@ -284,3 +285,5 @@ void obj_set_model(struct Object *obj, s32 modelID); s32 obj_has_model(struct Object *obj, u16 modelID); u32 obj_get_model_id(struct Object *obj); // End of HackerSM64 stuff + +#endif // OBJECT_HELPERS_H diff --git a/src/game/object_list_processor.h b/src/game/object_list_processor.h index 176f09f3..1f2be9cd 100644 --- a/src/game/object_list_processor.h +++ b/src/game/object_list_processor.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef OBJECT_LIST_PROCESSOR_H +#define OBJECT_LIST_PROCESSOR_H #include @@ -119,3 +120,6 @@ void unload_objects_from_area(UNUSED s32 unused, s32 areaIndex); void spawn_objects_from_info(UNUSED s32 unused, struct SpawnInfo *spawnInfo); void clear_objects(void); void update_objects(UNUSED s32 unused); + + +#endif // OBJECT_LIST_PROCESSOR_H diff --git a/src/game/paintings.h b/src/game/paintings.h index 6910b069..3f4334b4 100644 --- a/src/game/paintings.h +++ b/src/game/paintings.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef PAINTINGS_H +#define PAINTINGS_H #include #include @@ -136,3 +137,5 @@ extern s8 gDddPaintingStatus; Gfx *geo_painting_draw(s32 callContext, struct GraphNode *node, UNUSED void *context); Gfx *geo_painting_update(s32 callContext, UNUSED struct GraphNode *node, UNUSED Mat4 c); + +#endif // PAINTINGS_H diff --git a/src/game/platform_displacement.h b/src/game/platform_displacement.h index 4a3894fb..5eef98d9 100644 --- a/src/game/platform_displacement.h +++ b/src/game/platform_displacement.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef PLATFORM_DISPLACEMENT_H +#define PLATFORM_DISPLACEMENT_H #include @@ -25,3 +26,5 @@ void set_mario_pos(f32 x, f32 y, f32 z); #endif void apply_mario_platform_displacement(void); void clear_mario_platform(void); + +#endif // PLATFORM_DISPLACEMENT_H diff --git a/src/game/print.h b/src/game/print.h index 1f3dc9d9..95597e8a 100644 --- a/src/game/print.h +++ b/src/game/print.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef PRINT_H +#define PRINT_H #include @@ -28,3 +29,5 @@ void print_text_fmt_int(s32 x, s32 y, const char *str, s32 n); void print_text(s32 x, s32 y, const char *str); void print_text_centered(s32 x, s32 y, const char *str); void render_text_labels(void); + +#endif // PRINT_H diff --git a/src/game/printf.h b/src/game/printf.h index f55ad455..5d798a19 100644 --- a/src/game/printf.h +++ b/src/game/printf.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _PRINTF_H_ +#define _PRINTF_H_ #include typedef struct @@ -32,3 +33,4 @@ typedef struct s32 _Printf(char *(*prout)(char *, const char *, size_t), char *dst, const char *fmt, va_list args); void _Litob(printf_struct *args, u8 type); void _Ldtob(printf_struct *args, u8 type); +#endif diff --git a/src/game/profiler.h b/src/game/profiler.h index 4fcce589..0bb66a58 100644 --- a/src/game/profiler.h +++ b/src/game/profiler.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef PROFILER_H +#define PROFILER_H #include #include @@ -46,3 +47,5 @@ void profiler_log_thread4_time(void); void profiler_log_gfx_time(enum ProfilerGfxEvent eventID); void profiler_log_vblank_time(void); void draw_profiler(void); + +#endif // PROFILER_H diff --git a/src/game/puppycam2.h b/src/game/puppycam2.h index 8b564539..158f5f5e 100644 --- a/src/game/puppycam2.h +++ b/src/game/puppycam2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef PUPPYCAM2_H +#define PUPPYCAM2_H #ifdef PUPPYCAM @@ -194,3 +195,5 @@ extern void puppycam_warp(f32 displacementX, f32 displacementY, f32 displacement extern s32 puppycam_move_spline(struct sPuppySpline splinePos[], struct sPuppySpline splineFocus[], s32 mode, s32 index); #endif + +#endif // PUPPYCAM2_H diff --git a/src/game/puppylights.h b/src/game/puppylights.h index 62481443..c8a642a7 100644 --- a/src/game/puppylights.h +++ b/src/game/puppylights.h @@ -1,6 +1,6 @@ -#pragma once - #ifdef PUPPYLIGHTS +#ifndef PUPPYLIGHTS_H +#define PUPPYLIGHTS_H #include "types.h" #include "command_macros_base.h" @@ -54,3 +54,4 @@ extern void puppylights_allocate(void); extern void delete_lights(void); #endif +#endif diff --git a/src/game/puppyprint.h b/src/game/puppyprint.h index e62492a5..cb54e509 100644 --- a/src/game/puppyprint.h +++ b/src/game/puppyprint.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef PUPPYPRINT_H +#define PUPPYPRINT_H #ifdef PUPPYPRINT @@ -73,3 +74,5 @@ extern void append_puppyprint_log(const char *str, ...); extern char consoleLogTable[LOG_BUFFER_SIZE][255]; #endif + +#endif // PUPPYPRINT_H diff --git a/src/game/rendering_graph_node.h b/src/game/rendering_graph_node.h index be122e98..d096a30a 100644 --- a/src/game/rendering_graph_node.h +++ b/src/game/rendering_graph_node.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef RENDERING_GRAPH_NODE_H +#define RENDERING_GRAPH_NODE_H #include @@ -54,3 +55,5 @@ extern f32 gWorldScale; void geo_process_node_and_siblings(struct GraphNode *firstNode); void geo_process_root(struct GraphNodeRoot *node, Vp *b, Vp *c, s32 clearColor); + +#endif // RENDERING_GRAPH_NODE_H diff --git a/src/game/rumble_init.h b/src/game/rumble_init.h index d565eba9..91951d95 100644 --- a/src/game/rumble_init.h +++ b/src/game/rumble_init.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef RUMBLE_INIT_H +#define RUMBLE_INIT_H #include @@ -22,3 +23,5 @@ void create_thread_6(void); void rumble_thread_update_vi(void); #endif // ENABLE_RUMBLE + +#endif // RUMBLE_INIT_H diff --git a/src/game/save_file.h b/src/game/save_file.h index 6daae8d2..46f3cc9d 100644 --- a/src/game/save_file.h +++ b/src/game/save_file.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SAVE_FILE_H +#define SAVE_FILE_H #include @@ -193,3 +194,5 @@ enum EuLanguages { void eu_set_language(u16 language); u16 eu_get_language(void); #endif + +#endif // SAVE_FILE_H diff --git a/src/game/screen_transition.h b/src/game/screen_transition.h index df00eedf..70b3c21a 100644 --- a/src/game/screen_transition.h +++ b/src/game/screen_transition.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SCREEN_TRANSITION_H +#define SCREEN_TRANSITION_H #include #include @@ -22,3 +23,5 @@ enum TextureTransitionType s32 render_screen_transition(s8 fadeTimer, s8 transType, u8 transTime, struct WarpTransitionData *transData); Gfx *geo_cannon_circle_base(s32 callContext, struct GraphNode *node, UNUSED Mat4 mtx); + +#endif // SCREEN_TRANSITION_H diff --git a/src/game/segment2.h b/src/game/segment2.h index 25415ae6..7eecce54 100644 --- a/src/game/segment2.h +++ b/src/game/segment2.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SEGMENT2_H +#define SEGMENT2_H #include #include @@ -62,3 +63,5 @@ extern Gfx dl_billboard_num_6[]; extern Gfx dl_billboard_num_7[]; extern Gfx dl_billboard_num_8[]; extern Gfx dl_billboard_num_9[]; + +#endif // SEGMENT2_H diff --git a/src/game/segment7.h b/src/game/segment7.h index f9d69aa2..c552be2e 100644 --- a/src/game/segment7.h +++ b/src/game/segment7.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SEGMENT7_H +#define SEGMENT7_H #include #include @@ -27,3 +28,5 @@ extern Gfx *intro_seg7_dl_main_logo; extern Gfx *intro_seg7_dl_copyright_trademark; extern f32 intro_seg7_table_scale_1[]; extern f32 intro_seg7_table_scale_2[]; + +#endif // SEGMENT7_H diff --git a/src/game/shadow.h b/src/game/shadow.h index 0e306a4f..528659a2 100644 --- a/src/game/shadow.h +++ b/src/game/shadow.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SHADOW_H +#define SHADOW_H #include #include @@ -49,3 +50,5 @@ extern s8 gMarioOnIceOrCarpet; * with the given initial solidity and "shadowType" (described above). */ Gfx *create_shadow_below_xyz(f32 xPos, f32 yPos, f32 zPos, s16 shadowScale, u8 shadowSolidity, s8 shadowType); + +#endif // SHADOW_H diff --git a/src/game/skybox.h b/src/game/skybox.h index c1769ec0..39220447 100644 --- a/src/game/skybox.h +++ b/src/game/skybox.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SKYBOX_H +#define SKYBOX_H #include #include @@ -6,3 +7,5 @@ Gfx *create_skybox_facing_camera(s8 player, s8 background, f32 fov, f32 posX, f32 posY, f32 posZ, f32 focX, f32 focY, f32 focZ); + +#endif // SKYBOX_H diff --git a/src/game/sound_init.h b/src/game/sound_init.h index dab73a69..a03c5d84 100644 --- a/src/game/sound_init.h +++ b/src/game/sound_init.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SOUND_INIT_H +#define SOUND_INIT_H #include @@ -37,3 +38,5 @@ void fadeout_cap_music(void); void stop_cap_music(void); void audio_game_loop_tick(void); void thread4_sound(UNUSED void *arg); + +#endif // SOUND_INIT_H diff --git a/src/game/spawn_object.h b/src/game/spawn_object.h index eec4ebe8..78ac92b8 100644 --- a/src/game/spawn_object.h +++ b/src/game/spawn_object.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SPAWN_OBJECT_H +#define SPAWN_OBJECT_H #include "types.h" @@ -6,3 +7,5 @@ void init_free_object_list(void); void clear_object_lists(struct ObjectNode *objLists); void unload_object(struct Object *obj); struct Object *create_object(const BehaviorScript *bhvScript); + +#endif // SPAWN_OBJECT_H diff --git a/src/game/spawn_sound.h b/src/game/spawn_sound.h index 322b8f56..c00a13be 100644 --- a/src/game/spawn_sound.h +++ b/src/game/spawn_sound.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SPAWN_SOUND_H +#define SPAWN_SOUND_H #include @@ -19,3 +20,5 @@ void cur_obj_play_sound_1(s32 soundMagic); void cur_obj_play_sound_2(s32 soundMagic); void create_sound_spawner(s32 soundMagic); void exec_anim_sound_state(struct SoundState *soundStates); + +#endif // SPAWN_SOUND_H diff --git a/src/game/sram.h b/src/game/sram.h index f1c51f91..98f13ac6 100644 --- a/src/game/sram.h +++ b/src/game/sram.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef SRAM_H +#define SRAM_H /*----------------------------------------------------------------------*/ @@ -25,3 +26,5 @@ extern int nuPiReadWriteSram(u32 addr, void* buf_ptr, u32 size, s32 flag); /*----------------------------------------------------------------------*/ #define nuPiWriteSram(addr, buf_ptr, size) \ nuPiReadWriteSram(addr, buf_ptr, size, OS_WRITE) + +#endif // SRAM_H \ No newline at end of file diff --git a/src/game/vc_check.h b/src/game/vc_check.h index 0260c402..71d29e23 100644 --- a/src/game/vc_check.h +++ b/src/game/vc_check.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef VC_CHECK_H +#define VC_CHECK_H #include "sm64.h" @@ -17,3 +18,5 @@ f32 round_double_to_float(f64); * RTZ will output not 1.0f, RTN will output exactly 1.0f */ #define IS_VC() (1.0f != round_double_to_float(0.9999999999999999)) + +#endif diff --git a/src/game/version.h b/src/game/version.h index 7eb9c82c..ba4d54b1 100644 --- a/src/game/version.h +++ b/src/game/version.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef VER_H +#define VER_H extern char __username__[]; extern char __datetime__[]; extern char __compiler__[]; extern char __linker__[]; + +#endif diff --git a/src/goddard/debug_utils.h b/src/goddard/debug_utils.h index 688c4517..4c2bcafb 100644 --- a/src/goddard/debug_utils.h +++ b/src/goddard/debug_utils.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_DEBUGGING_UTILS_H +#define GD_DEBUGGING_UTILS_H #include @@ -88,3 +89,5 @@ extern s32 gd_fread(s8 *, s32, s32, struct GdFile *); extern void gd_fclose(struct GdFile *); extern u32 gd_get_file_size(struct GdFile *); extern s32 gd_fread_line(char *, u32, struct GdFile *); + +#endif // GD_DEBUGGING_UTILS_H diff --git a/src/goddard/draw_objects.h b/src/goddard/draw_objects.h index cbd6eab9..efe0e53b 100644 --- a/src/goddard/draw_objects.h +++ b/src/goddard/draw_objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_DRAW_OBJECTS_H +#define GD_DRAW_OBJECTS_H #include @@ -45,3 +46,5 @@ void create_gddl_for_shapes(struct ObjGroup *grp); void map_face_materials(struct ObjGroup *faces, struct ObjGroup *mtls); void map_vertices(struct ObjGroup *facegrp, struct ObjGroup *vtxgrp); void update_view(struct ObjView *view); + +#endif // GD_DRAW_OBJECTS_H diff --git a/src/goddard/dynlist_proc.h b/src/goddard/dynlist_proc.h index 35e862c4..f4641baf 100644 --- a/src/goddard/dynlist_proc.h +++ b/src/goddard/dynlist_proc.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_DYNLIST_PROCESSOR_H +#define GD_DYNLIST_PROCESSOR_H #include @@ -94,3 +95,5 @@ void d_set_i_matrix(Mat4f *src); Mat4f *d_get_matrix_ptr(void); Mat4f *d_get_i_mtx_ptr(void); f32 d_calc_world_dist_btwn(struct GdObj *obj1, struct GdObj *obj2); + +#endif // GD_DYNLIST_PROCESSOR_H diff --git a/src/goddard/dynlists/animdata.h b/src/goddard/dynlists/animdata.h index 1aa81375..28e69269 100644 --- a/src/goddard/dynlists/animdata.h +++ b/src/goddard/dynlists/animdata.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_ANIMDATA_H +#define GD_ANIMDATA_H #include "../gd_types.h" #define END_ANIMDATA_INFO_ARR { -1, GD_ANIM_EMPTY, NULL } @@ -28,3 +29,5 @@ extern struct AnimDataInfo anim_mario_eyelid_right[]; extern struct AnimDataInfo anim_mario_intro[]; extern struct AnimDataInfo anim_silver_star[]; extern struct AnimDataInfo anim_red_star[]; + +#endif // GD_ANIMDATA_H diff --git a/src/goddard/dynlists/dynlist_macros.h b/src/goddard/dynlists/dynlist_macros.h index 58c40c64..cbde7263 100644 --- a/src/goddard/dynlists/dynlist_macros.h +++ b/src/goddard/dynlists/dynlist_macros.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_DYNLIST_MACROS_H +#define GD_DYNLIST_MACROS_H /* DynListCmd Macros */ @@ -397,3 +398,5 @@ /* Make a new Net from Shape double pointer PTR */ #define MakeNetFromShapePtrPtr(w1) \ { 55, {(void *)(w1)}, {0}, {0.0, 0.0, 0.0} } + +#endif // GD_DYNLIST_MACROS_H diff --git a/src/goddard/dynlists/dynlists.h b/src/goddard/dynlists/dynlists.h index 9afcc69c..c134a21c 100644 --- a/src/goddard/dynlists/dynlists.h +++ b/src/goddard/dynlists/dynlists.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_DYNLISTS_H +#define GD_DYNLISTS_H #include "../gd_types.h" @@ -143,3 +144,5 @@ extern struct DynList dynlist_mario_eyebrow_right_shape[]; extern struct DynList dynlist_mario_eyebrow_left_shape[]; extern struct DynList dynlist_mario_mustache_shape[]; extern struct DynList dynlist_mario_master[]; + +#endif // GD_DYNLISTS_H diff --git a/src/goddard/gd_macros.h b/src/goddard/gd_macros.h index a13a9393..299f2b61 100644 --- a/src/goddard/gd_macros.h +++ b/src/goddard/gd_macros.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_MACROS_H +#define GD_MACROS_H /** * @file gd_macros.h @@ -14,3 +15,5 @@ #ifndef ALIGN #define ALIGN(VAL_, ALIGNMENT_) (((VAL_) + ((ALIGNMENT_) - 1)) & ~((ALIGNMENT_) - 1)) #endif + +#endif // GD_MACROS_H diff --git a/src/goddard/gd_main.h b/src/goddard/gd_main.h index 7c1820aa..d4c8bc0b 100644 --- a/src/goddard/gd_main.h +++ b/src/goddard/gd_main.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_MAIN_H +#define GD_MAIN_H #include @@ -80,3 +81,5 @@ extern s32 gGdUseVtxNormal; // bss extern struct GdControl gGdCtrl; extern struct GdControl gGdCtrlPrev; + +#endif // GD_MAIN_H diff --git a/src/goddard/gd_math.h b/src/goddard/gd_math.h index 74835854..1028dc83 100644 --- a/src/goddard/gd_math.h +++ b/src/goddard/gd_math.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_MATH_H +#define GD_MATH_H #include @@ -51,3 +52,5 @@ void gd_mult_mat4f(const Mat4f *mA, const Mat4f *mB, Mat4f *dst); void gd_print_vec(UNUSED const char *prefix, const struct GdVec3f *vec); void gd_print_bounding_box(UNUSED const char *prefix, const struct GdBoundingBox *p); void gd_print_mtx(UNUSED const char *prefix, const Mat4f *mtx); + +#endif // GD_MATH_H diff --git a/src/goddard/gd_memory.h b/src/goddard/gd_memory.h index 57aadc67..ea6e6ff7 100644 --- a/src/goddard/gd_memory.h +++ b/src/goddard/gd_memory.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_MEMORY_H +#define GD_MEMORY_H #include @@ -30,3 +31,5 @@ extern void *gd_request_mem(u32 size, u8 permanence); extern struct GMemBlock *gd_add_mem_to_heap(u32 size, void *addr, u8 permanence); extern void init_mem_block_lists(void); extern void mem_stats(void); + +#endif // GD_MEMORY_H diff --git a/src/goddard/gd_types.h b/src/goddard/gd_types.h index f59c38e2..06a9ed4c 100644 --- a/src/goddard/gd_types.h +++ b/src/goddard/gd_types.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_TYPES_H +#define GD_TYPES_H #include @@ -651,3 +652,5 @@ struct ObjUnk200000 { /* 0x30 */ struct ObjVertex *unk30; //not sure; guessing for Unknown801781DC; 30 and 34 could switch with ObjZone /* 0x34 */ struct ObjFace *unk34; //not sure; guessing for Unknown801781DC }; /* sizeof = 0x38*/ + +#endif // GD_TYPES_H diff --git a/src/goddard/joints.h b/src/goddard/joints.h index 032b5d5c..a78c7a7a 100644 --- a/src/goddard/joints.h +++ b/src/goddard/joints.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_JOINTS_H +#define GD_JOINTS_H #include @@ -26,3 +27,5 @@ void reset_joint(struct ObjJoint *j); void func_80191824(struct ObjJoint *j); void func_80191E88(struct ObjGroup *grp); void reset_joint_counts(void); + +#endif // GD_JOINTS_H diff --git a/src/goddard/objects.h b/src/goddard/objects.h index b97d8263..20981ea4 100644 --- a/src/goddard/objects.h +++ b/src/goddard/objects.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_OBJECTS_H +#define GD_OBJECTS_H #include @@ -97,3 +98,5 @@ void move_lights_in_grp(struct ObjGroup *group); void proc_view_movement(struct ObjView *view); void reset_nets_and_gadgets(struct ObjGroup *group); void null_obj_lists(void); + +#endif // GD_OBJECTS_H diff --git a/src/goddard/old_menu.h b/src/goddard/old_menu.h index a0bb3396..bf6117f0 100644 --- a/src/goddard/old_menu.h +++ b/src/goddard/old_menu.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_OLD_MENU_H +#define GD_OLD_MENU_H #include @@ -10,3 +11,5 @@ struct ObjGadget *make_gadget(UNUSED s32 a0, s32 a1); void reset_gadget(struct ObjGadget *gdgt); void reset_gadgets_in_grp(struct ObjGroup *grp); struct ObjLabel *make_label(struct ObjValPtr *ptr, char *str, s32 a2, f32 x, f32 y, f32 z); + +#endif // GD_OLD_MENU_H diff --git a/src/goddard/particles.h b/src/goddard/particles.h index 18c598c3..3ea34999 100644 --- a/src/goddard/particles.h +++ b/src/goddard/particles.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_PARTICLES_H +#define GD_PARTICLES_H #include @@ -8,3 +9,5 @@ void func_801823A0(struct ObjNet *net); struct ObjParticle *make_particle(u32 a, s32 b, f32 x, f32 y, f32 z); void move_particles_in_grp(struct ObjGroup *group); + +#endif // GD_PARTICLES_H diff --git a/src/goddard/renderer.h b/src/goddard/renderer.h index f807274f..799f2164 100644 --- a/src/goddard/renderer.h +++ b/src/goddard/renderer.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_RENDERER_H +#define GD_RENDERER_H #include #include @@ -119,3 +120,5 @@ void store_in_pickbuf(s16 data); s32 get_cur_pickbuf_offset(UNUSED s16 *arg0); void set_vtx_tc_buf(f32 tcS, f32 tcT); struct GdObj *load_dynlist(struct DynList *dynlist); + +#endif // GD_RENDERER_H diff --git a/src/goddard/sfx.h b/src/goddard/sfx.h index 51e245ea..8865afc6 100644 --- a/src/goddard/sfx.h +++ b/src/goddard/sfx.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_SFX_H +#define GD_SFX_H #include @@ -20,3 +21,5 @@ void gd_reset_sfx(void); u32 gd_new_sfx_to_play(void); void gd_sfx_update(void); void gd_play_sfx(enum GdSfx sfx); + +#endif // GD_SFX_H diff --git a/src/goddard/shape_helper.h b/src/goddard/shape_helper.h index ad3a9336..8f52dcd8 100644 --- a/src/goddard/shape_helper.h +++ b/src/goddard/shape_helper.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_SHAPE_HELPER_H +#define GD_SHAPE_HELPER_H #include @@ -24,3 +25,5 @@ void animate_mario_head_normal(struct ObjAnimator *self); s32 load_mario_head(void (*aniFn)(struct ObjAnimator *)); void load_shapes2(void); struct ObjFace* make_face_with_colour(f32 r, f32 g, f32 b); + +#endif // GD_SHAPE_HELPER_H diff --git a/src/goddard/skin.h b/src/goddard/skin.h index 58f6f53c..428b3639 100644 --- a/src/goddard/skin.h +++ b/src/goddard/skin.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_SKIN_H +#define GD_SKIN_H #include @@ -15,3 +16,5 @@ void convert_net_verts(struct ObjNet *net); void move_nets(struct ObjGroup *group); void func_80193848(struct ObjGroup *group); void reset_net_count(void); + +#endif // GD_SKIN_H diff --git a/src/goddard/skin_movement.h b/src/goddard/skin_movement.h index 87d5df1d..c98c2c93 100644 --- a/src/goddard/skin_movement.h +++ b/src/goddard/skin_movement.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef GD_SKIN_MOVEMENT_H +#define GD_SKIN_MOVEMENT_H #include "gd_types.h" @@ -6,3 +7,5 @@ void scale_verts(struct ObjGroup *a0); void move_skin(struct ObjNet *net); void func_80181894(struct ObjJoint *joint); void reset_joint_weights(struct ObjJoint *joint); + +#endif // GD_SKIN_MOVEMENT_H diff --git a/src/hvqm/hvqm.h b/src/hvqm/hvqm.h index ae1f8a7e..867194d3 100644 --- a/src/hvqm/hvqm.h +++ b/src/hvqm/hvqm.h @@ -1,4 +1,6 @@ -#pragma once +#ifndef HVQM_H +#define HVQM_H + /* * Size of the data area for the HVQ microcode @@ -111,3 +113,6 @@ int get_cfb(); typedef u32 (*tkAudioProc)(void *pcmbuf); typedef tkAudioProc (*tkRewindProc)(void); + + +#endif // HVQM_H \ No newline at end of file diff --git a/src/libz/zconf.h b/src/libz/zconf.h index a238db6a..6caefe30 100644 --- a/src/libz/zconf.h +++ b/src/libz/zconf.h @@ -5,7 +5,8 @@ /* @(#) $Id: zconf.h,v 1.1 2004/06/24 00:04:39 jprincen Exp $ */ -#pragma once +#ifndef ZCONF_H +#define ZCONF_H /* * If you *really* need a unique prefix for all types and library functions, @@ -318,3 +319,5 @@ typedef uLong FAR uLongf; # pragma map(inflate_fast,"INFA") # pragma map(inflate_copyright,"INCOPY") #endif + +#endif /* ZCONF_H */ diff --git a/src/libz/zlib.h b/src/libz/zlib.h index 2d7f3d75..b4ca270a 100644 --- a/src/libz/zlib.h +++ b/src/libz/zlib.h @@ -28,7 +28,8 @@ (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). */ -#pragma once +#ifndef ZLIB_H +#define ZLIB_H #include "zconf.h" @@ -1184,9 +1185,9 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR *strm, int windowBits, ZLIB_VERSION, sizeof(z_stream)) -// #if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) -// struct internal_state {int dummy;}; /* hack for buggy compilers */ -// #endif +#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) + struct internal_state {int dummy;}; /* hack for buggy compilers */ +#endif ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); @@ -1194,3 +1195,5 @@ ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); #ifdef __cplusplus } #endif + +#endif /* ZLIB_H */ diff --git a/src/libz/zutil.c b/src/libz/zutil.c index 589946af..a5f0034d 100644 --- a/src/libz/zutil.c +++ b/src/libz/zutil.c @@ -7,9 +7,9 @@ #include "zutil.h" -// #ifndef NO_DUMMY_DECL -// struct internal_state {int dummy;}; /* for buggy compilers */ -// #endif +#ifndef NO_DUMMY_DECL +struct internal_state {int dummy;}; /* for buggy compilers */ +#endif #ifndef STDC extern void exit OF((int)); diff --git a/src/libz/zutil.h b/src/libz/zutil.h index 9d97abf6..872ef977 100644 --- a/src/libz/zutil.h +++ b/src/libz/zutil.h @@ -10,7 +10,8 @@ /* @(#) $Id: zutil.h,v 1.1 2004/06/24 00:04:39 jprincen Exp $ */ -#pragma once +#ifndef ZUTIL_H +#define ZUTIL_H #define ZLIB_INTERNAL #include "zlib.h" @@ -253,3 +254,5 @@ void zcfree OF((voidpf opaque, voidpf ptr)); (*((strm)->zalloc))((strm)->opaque, (items), (size)) #define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) #define TRY_FREE(s, p) {if (p) ZFREE(s, p);} + +#endif /* ZUTIL_H */ diff --git a/src/menu/debug_level_select.h b/src/menu/debug_level_select.h index 09bdc826..8ec23ebb 100644 --- a/src/menu/debug_level_select.h +++ b/src/menu/debug_level_select.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DEBUG_LEVEL_SELECT_H +#define DEBUG_LEVEL_SELECT_H #include @@ -12,3 +13,5 @@ extern const Gfx debug_level_select_dl_070048C8[]; extern const Gfx debug_level_select_dl_07005558[]; extern const Gfx debug_level_select_dl_070059F8[]; extern const Gfx debug_level_select_dl_070063B0[]; + +#endif // DEBUG_LEVEL_SELECT_H diff --git a/src/menu/file_select.h b/src/menu/file_select.h index 0fc95e9b..47f72844 100644 --- a/src/menu/file_select.h +++ b/src/menu/file_select.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef FILE_SELECT_H +#define FILE_SELECT_H #include #include @@ -135,3 +136,5 @@ void bhv_menu_button_manager_loop(void); Gfx *geo_file_select_strings_and_menu_cursor(s32 callContext, UNUSED struct GraphNode *node, UNUSED Mat4 mtx); s32 lvl_init_menu_values_and_cursor_pos(UNUSED s32 arg, UNUSED s32 unused); s32 lvl_update_obj_and_load_file_selected(UNUSED s32 arg, UNUSED s32 unused); + +#endif // FILE_SELECT_H diff --git a/src/menu/intro_geo.h b/src/menu/intro_geo.h index 5875f9ec..3f882621 100644 --- a/src/menu/intro_geo.h +++ b/src/menu/intro_geo.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef INTRO_GEO_H +#define INTRO_GEO_H #include #include @@ -17,3 +18,5 @@ Gfx *geo_intro_face_easter_egg(s32 state, struct GraphNode *node, UNUSED void *c #if ENABLE_RUMBLE Gfx *geo_intro_rumble_pak_graphic(s32 state, struct GraphNode *node, UNUSED void *context); #endif + +#endif // INTRO_GEO_H diff --git a/src/menu/star_select.h b/src/menu/star_select.h index f8b24a26..1fa7f39a 100644 --- a/src/menu/star_select.h +++ b/src/menu/star_select.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef STAR_SELECT_H +#define STAR_SELECT_H #include #include @@ -15,3 +16,5 @@ enum StarSelectorTypes Gfx *geo_act_selector_strings(s16 callContext, UNUSED struct GraphNode *node, UNUSED void *context); s32 lvl_init_act_selector_values_and_stars(UNUSED s32 arg, UNUSED s32 unused); s32 lvl_update_obj_and_load_act_button_actions(UNUSED s32 arg, UNUSED s32 unused); + +#endif // STAR_SELECT_H diff --git a/src/menu/title_screen.h b/src/menu/title_screen.h index 3a48912f..4893158f 100644 --- a/src/menu/title_screen.h +++ b/src/menu/title_screen.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef TITLE_SCREEN_H +#define TITLE_SCREEN_H #include @@ -12,3 +13,5 @@ enum LevelScriptIntroArgs { }; s32 lvl_intro_update(s16 arg, UNUSED s32 unusedArg); + +#endif // TITLE_SCREEN_H diff --git a/src/s2d_engine/config.h b/src/s2d_engine/config.h index 4eb86e61..e14f22cb 100644 --- a/src/s2d_engine/config.h +++ b/src/s2d_engine/config.h @@ -1,6 +1,7 @@ #include -#pragma once +#ifndef S2D_CONFIG_H +#define S2D_CONFIG_H /** * SET YOUR FONT NAME HERE @@ -93,3 +94,5 @@ extern char *proutSprintf(char *dst, const char *src, size_t count); #define TEX_RES 1 #define _NUM_CACHE (4096 / (TEX_WIDTH * TEX_HEIGHT * (TEX_BITDEPTH / 8))) + +#endif \ No newline at end of file diff --git a/src/s2d_engine/debug.h b/src/s2d_engine/debug.h index f7021f88..c2649ab6 100644 --- a/src/s2d_engine/debug.h +++ b/src/s2d_engine/debug.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef DEBUG_H +#define DEBUG_H // #define init_cond (CONTROLLER_HELD_INPUT & R_CBUTTONS) // #define tex_cond (CONTROLLER_HELD_INPUT & D_CBUTTONS) @@ -10,3 +11,5 @@ #define spr_cond (1) #define init_cond (1) #define deinit_cond (1) + +#endif diff --git a/src/s2d_engine/s2d_draw.h b/src/s2d_engine/s2d_draw.h index 879bfc83..4cd386e3 100644 --- a/src/s2d_engine/s2d_draw.h +++ b/src/s2d_engine/s2d_draw.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef S2D_DRAW_H +#define S2D_DRAW_H #include extern float myScale; @@ -18,3 +19,5 @@ extern void mtx_pipeline(uObjMtx *m, int x, int y); extern void draw_s2d_glyph(char c, int x, int y, uObjMtx *mt); extern void draw_s2d_shadow(char c, int x, int y, uObjMtx *ds); + +#endif \ No newline at end of file diff --git a/src/s2d_engine/s2d_error.h b/src/s2d_engine/s2d_error.h index 6810b06b..d4b5703a 100644 --- a/src/s2d_engine/s2d_error.h +++ b/src/s2d_engine/s2d_error.h @@ -1,6 +1,9 @@ -#pragma once +#ifndef S2D_ERROR_H +#define S2D_ERROR_H extern int s2d_check_align(int align); extern int s2d_check_str(const char *str); extern int s2d_error_y; + +#endif \ No newline at end of file diff --git a/src/usb/debug.h b/src/usb/debug.h index 98126c3d..d9c2f583 100644 --- a/src/usb/debug.h +++ b/src/usb/debug.h @@ -1,153 +1,156 @@ -#pragma once +#ifndef UNFL_DEBUG_H +#define UNFL_DEBUG_H -/********************************* - Settings macros -*********************************/ + /********************************* + Settings macros + *********************************/ -// Settings -#define DEBUG_MODE 1 // Enable/Disable debug mode -#define DEBUG_INIT_MSG 1 // Print a message when debug mode has initialized -#define USE_FAULTTHREAD 1 // Create a fault detection thread (libultra only) -#define OVERWRITE_OSPRINT 1 // Replaces osSyncPrintf calls with debug_printf (libultra only) -#define MAX_COMMANDS 25 // The max amount of user defined commands possible + // Settings + #define DEBUG_MODE 1 // Enable/Disable debug mode + #define DEBUG_INIT_MSG 1 // Print a message when debug mode has initialized + #define USE_FAULTTHREAD 1 // Create a fault detection thread (libultra only) + #define OVERWRITE_OSPRINT 1 // Replaces osSyncPrintf calls with debug_printf (libultra only) + #define MAX_COMMANDS 25 // The max amount of user defined commands possible -// Fault thread definitions (libultra only) -#define FAULT_THREAD_ID 13 -#define FAULT_THREAD_PRI 125 -#define FAULT_THREAD_STACK 0x2000 + // Fault thread definitions (libultra only) + #define FAULT_THREAD_ID 13 + #define FAULT_THREAD_PRI 125 + #define FAULT_THREAD_STACK 0x2000 -// USB thread definitions (libultra only) -#define USB_THREAD_ID 14 -#define USB_THREAD_PRI 126 -#define USB_THREAD_STACK 0x2000 + // USB thread definitions (libultra only) + #define USB_THREAD_ID 14 + #define USB_THREAD_PRI 126 + #define USB_THREAD_STACK 0x2000 -/********************************* - Debug Functions -*********************************/ + /********************************* + Debug Functions + *********************************/ -#if DEBUG_MODE + #if DEBUG_MODE - /*============================== - debug_initialize - Initializes the debug and USB library. - ==============================*/ + /*============================== + debug_initialize + Initializes the debug and USB library. + ==============================*/ - extern void debug_initialize(); + extern void debug_initialize(); - /*============================== - debug_printf - Prints a formatted message to the developer's command prompt. - Supports up to 256 characters. - @param A string to print - @param variadic arguments to print as well - ==============================*/ + /*============================== + debug_printf + Prints a formatted message to the developer's command prompt. + Supports up to 256 characters. + @param A string to print + @param variadic arguments to print as well + ==============================*/ - extern void debug_printf(const char* message, ...); + extern void debug_printf(const char* message, ...); - /*============================== - debug_dumpbinary - Dumps a binary file through USB - @param The file to dump - @param The size of the file - ==============================*/ + /*============================== + debug_dumpbinary + Dumps a binary file through USB + @param The file to dump + @param The size of the file + ==============================*/ - extern void debug_dumpbinary(void* file, int size); + extern void debug_dumpbinary(void* file, int size); - /*============================== - debug_screenshot - Sends the currently displayed framebuffer through USB. - DOES NOT PAUSE DRAWING THREAD! Using outside the drawing - thread may lead to a screenshot with visible tearing - ==============================*/ + /*============================== + debug_screenshot + Sends the currently displayed framebuffer through USB. + DOES NOT PAUSE DRAWING THREAD! Using outside the drawing + thread may lead to a screenshot with visible tearing + ==============================*/ - extern void debug_screenshot(); + extern void debug_screenshot(); - /*============================== - debug_assert - Halts the program if the expression fails. - @param The expression to test - ==============================*/ + /*============================== + debug_assert + Halts the program if the expression fails. + @param The expression to test + ==============================*/ - #define debug_assert(expr) (expr) ? ((void)0) : _debug_assert(#expr, __FILE__, __LINE__) + #define debug_assert(expr) (expr) ? ((void)0) : _debug_assert(#expr, __FILE__, __LINE__) - /*============================== - debug_pollcommands - Check the USB for incoming commands. - ==============================*/ + /*============================== + debug_pollcommands + Check the USB for incoming commands. + ==============================*/ - extern void debug_pollcommands(); + extern void debug_pollcommands(); - /*============================== - debug_addcommand - Adds a command for the USB to read. - @param The command name - @param The command description - @param The function pointer to execute - ==============================*/ + /*============================== + debug_addcommand + Adds a command for the USB to read. + @param The command name + @param The command description + @param The function pointer to execute + ==============================*/ - extern void debug_addcommand(char* command, char* description, char*(*execute)()); + extern void debug_addcommand(char* command, char* description, char*(*execute)()); - /*============================== - debug_parsecommand - Stores the next part of the incoming command into the provided buffer. - Make sure the buffer can fit the amount of data from debug_sizecommand! - If you pass NULL, it skips this command. - @param The buffer to store the data in - ==============================*/ + /*============================== + debug_parsecommand + Stores the next part of the incoming command into the provided buffer. + Make sure the buffer can fit the amount of data from debug_sizecommand! + If you pass NULL, it skips this command. + @param The buffer to store the data in + ==============================*/ - extern void debug_parsecommand(void* buffer); + extern void debug_parsecommand(void* buffer); - /*============================== - debug_sizecommand - Returns the size of the data from this part of the command. - @return The size of the data in bytes, or 0 - ==============================*/ + /*============================== + debug_sizecommand + Returns the size of the data from this part of the command. + @return The size of the data in bytes, or 0 + ==============================*/ - extern int debug_sizecommand(); + extern int debug_sizecommand(); - /*============================== - debug_printcommands - Prints a list of commands to the developer's command prompt. - ==============================*/ + /*============================== + debug_printcommands + Prints a list of commands to the developer's command prompt. + ==============================*/ - extern void debug_printcommands(); + extern void debug_printcommands(); - // Ignore this, use the macro instead - extern void _debug_assert(const char* expression, const char* file, int line); + // Ignore this, use the macro instead + extern void _debug_assert(const char* expression, const char* file, int line); - // Include usb.h automatically - #include "usb.h" + // Include usb.h automatically + #include "usb.h" -#else + #else - // Overwrite library functions with useless macros if debug mode is disabled - #define debug_initialize() - #define debug_printf(__VA_ARGS__) - #define debug_screenshot(a, b, c) - #define debug_assert(a) - #define debug_pollcommands() - #define debug_addcommand(a, b, c) - #define debug_parsecommand() NULL - #define debug_sizecommand() 0 - #define debug_printcommands() - #define usb_initialize() 0 - #define usb_getcart() 0 - #define usb_write(a, b, c) - #define usb_poll() 0 - #define usb_read(a, b) - #define usb_skip(a) - #define usb_rewind(a) - #define usb_purge() + // Overwrite library functions with useless macros if debug mode is disabled + #define debug_initialize() + #define debug_printf(__VA_ARGS__) + #define debug_screenshot(a, b, c) + #define debug_assert(a) + #define debug_pollcommands() + #define debug_addcommand(a, b, c) + #define debug_parsecommand() NULL + #define debug_sizecommand() 0 + #define debug_printcommands() + #define usb_initialize() 0 + #define usb_getcart() 0 + #define usb_write(a, b, c) + #define usb_poll() 0 + #define usb_read(a, b) + #define usb_skip(a) + #define usb_rewind(a) + #define usb_purge() -#endif + #endif + +#endif \ No newline at end of file diff --git a/src/usb/usb.h b/src/usb/usb.h index fce824e8..bcbe812b 100644 --- a/src/usb/usb.h +++ b/src/usb/usb.h @@ -1,118 +1,121 @@ -#pragma once +#ifndef UNFL_USB_H +#define UNFL_USB_H -/********************************* - DataType macros -*********************************/ + /********************************* + DataType macros + *********************************/ -// UNCOMMENT THE #DEFINE IF USING LIBDRAGON -//#define LIBDRAGON + // UNCOMMENT THE #DEFINE IF USING LIBDRAGON + //#define LIBDRAGON -// Settings -#define USE_OSRAW 0 // Use if you're doing USB operations without the PI Manager (libultra only) -#define DEBUG_ADDRESS_SIZE 8*1024*1024 // Max size of USB I/O. The bigger this value, the more ROM you lose! + // Settings + #define USE_OSRAW 0 // Use if you're doing USB operations without the PI Manager (libultra only) + #define DEBUG_ADDRESS_SIZE 8*1024*1024 // Max size of USB I/O. The bigger this value, the more ROM you lose! -// Cart definitions -#define CART_NONE 0 -#define CART_64DRIVE 1 -#define CART_EVERDRIVE 2 -#define CART_SC64 3 + // Cart definitions + #define CART_NONE 0 + #define CART_64DRIVE 1 + #define CART_EVERDRIVE 2 + #define CART_SC64 3 -// Data types defintions -#define DATATYPE_TEXT 0x01 -#define DATATYPE_RAWBINARY 0x02 -#define DATATYPE_HEADER 0x03 -#define DATATYPE_SCREENSHOT 0x04 + // Data types defintions + #define DATATYPE_TEXT 0x01 + #define DATATYPE_RAWBINARY 0x02 + #define DATATYPE_HEADER 0x03 + #define DATATYPE_SCREENSHOT 0x04 -extern int usb_datatype; -extern int usb_datasize; -extern int usb_dataleft; -extern int usb_readblock; + extern int usb_datatype; + extern int usb_datasize; + extern int usb_dataleft; + extern int usb_readblock; -/********************************* - Convenience macros -*********************************/ + /********************************* + Convenience macros + *********************************/ -// Use these to conveniently read the header from usb_poll() -#define USBHEADER_GETTYPE(header) ((header & 0xFF000000) >> 24) -#define USBHEADER_GETSIZE(header) ((header & 0x00FFFFFF)) + // Use these to conveniently read the header from usb_poll() + #define USBHEADER_GETTYPE(header) ((header & 0xFF000000) >> 24) + #define USBHEADER_GETSIZE(header) ((header & 0x00FFFFFF)) -/********************************* - USB Functions -*********************************/ + /********************************* + USB Functions + *********************************/ -/*============================== - usb_initialize - Initializes the USB buffers and pointers - @return 1 if the USB initialization was successful, 0 if not -==============================*/ + /*============================== + usb_initialize + Initializes the USB buffers and pointers + @return 1 if the USB initialization was successful, 0 if not + ==============================*/ -extern char usb_initialize(); + extern char usb_initialize(); -/*============================== - usb_getcart - Returns which flashcart is currently connected - @return The CART macro that corresponds to the identified flashcart -==============================*/ + /*============================== + usb_getcart + Returns which flashcart is currently connected + @return The CART macro that corresponds to the identified flashcart + ==============================*/ -extern char usb_getcart(); + extern char usb_getcart(); -/*============================== - usb_write - Writes data to the USB. - Will not write if there is data to read from USB - @param The DATATYPE that is being sent - @param A buffer with the data to send - @param The size of the data being sent -==============================*/ + /*============================== + usb_write + Writes data to the USB. + Will not write if there is data to read from USB + @param The DATATYPE that is being sent + @param A buffer with the data to send + @param The size of the data being sent + ==============================*/ -extern void usb_write(int datatype, const void* data, int size); + extern void usb_write(int datatype, const void* data, int size); -/*============================== - usb_poll - Returns the header of data being received via USB - The first byte contains the data type, the next 3 the number of bytes left to read - @return The data header, or 0 -==============================*/ + /*============================== + usb_poll + Returns the header of data being received via USB + The first byte contains the data type, the next 3 the number of bytes left to read + @return The data header, or 0 + ==============================*/ -extern unsigned long usb_poll(); + extern unsigned long usb_poll(); -/*============================== - usb_read - Reads bytes from USB into the provided buffer - @param The buffer to put the read data in - @param The number of bytes to read -==============================*/ + /*============================== + usb_read + Reads bytes from USB into the provided buffer + @param The buffer to put the read data in + @param The number of bytes to read + ==============================*/ -extern void usb_read(void* buffer, int size); + extern void usb_read(void* buffer, int size); -/*============================== - usb_skip - Skips a USB read by the specified amount of bytes - @param The number of bytes to skip -==============================*/ + /*============================== + usb_skip + Skips a USB read by the specified amount of bytes + @param The number of bytes to skip + ==============================*/ -extern void usb_skip(int nbytes); + extern void usb_skip(int nbytes); -/*============================== - usb_rewind - Rewinds a USB read by the specified amount of bytes - @param The number of bytes to rewind -==============================*/ + /*============================== + usb_rewind + Rewinds a USB read by the specified amount of bytes + @param The number of bytes to rewind + ==============================*/ -extern void usb_rewind(int nbytes); + extern void usb_rewind(int nbytes); -/*============================== - usb_purge - Purges the incoming USB data -==============================*/ + /*============================== + usb_purge + Purges the incoming USB data + ==============================*/ -extern void usb_purge(); + extern void usb_purge(); + +#endif \ No newline at end of file diff --git a/tools/hashtable.h b/tools/hashtable.h index 7a353bb0..91e5460e 100644 --- a/tools/hashtable.h +++ b/tools/hashtable.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef HASHTABLE_H_ +#define HASHTABLE_H_ typedef unsigned int (*HashFunc)(const void *item); typedef int (*HashValueCmpFunc)(const void *a, const void *b); @@ -8,3 +9,5 @@ struct HashTable *hashtable_new(HashFunc func, HashValueCmpFunc cmp, int size, i void hashtable_free(struct HashTable *ht); void hashtable_insert(struct HashTable *ht, const void *value); void *hashtable_query(struct HashTable *ht, const void *value); + +#endif // HASHTABLE_H_ diff --git a/tools/libmio0.h b/tools/libmio0.h index 75775205..5b38ac77 100644 --- a/tools/libmio0.h +++ b/tools/libmio0.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef LIBMIO0_H_ +#define LIBMIO0_H_ // defines @@ -45,3 +46,5 @@ int mio0_decode_file(const char *in_file, unsigned long offset, const char *out_ // in_file: input filename containing raw data to be encoded // out_file: output filename to write MIO0 compressed data to int mio0_encode_file(const char *in_file, const char *out_file); + +#endif // LIBMIO0_H_ diff --git a/tools/n64cksum.h b/tools/n64cksum.h index 9125a37d..cf6b9ba4 100644 --- a/tools/n64cksum.h +++ b/tools/n64cksum.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef N64CKSUM_H_ +#define N64CKSUM_H_ #include @@ -11,3 +12,5 @@ void n64cksum_calc_6102(unsigned char *buf, unsigned int cksum[]); // buf: buffer containing ROM data // checksums are written into the buffer void n64cksum_update_checksums(uint8_t *buf); + +#endif // N64CKSUM_H_ diff --git a/tools/n64graphics.h b/tools/n64graphics.h index 61cf33c7..9ced50e7 100644 --- a/tools/n64graphics.h +++ b/tools/n64graphics.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef N64GRAPHICS_H_ +#define N64GRAPHICS_H_ #include @@ -95,3 +96,5 @@ const char *n64graphics_get_read_version(void); // get version of underlying graphics writing library const char *n64graphics_get_write_version(void); + +#endif // N64GRAPHICS_H_ diff --git a/tools/n64graphics_ci_dir/n64graphics_ci.h b/tools/n64graphics_ci_dir/n64graphics_ci.h index 6bb16c01..91423143 100644 --- a/tools/n64graphics_ci_dir/n64graphics_ci.h +++ b/tools/n64graphics_ci_dir/n64graphics_ci.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef N64GRAPHICS_CI_H_ +#define N64GRAPHICS_CI_H_ #include @@ -37,3 +38,5 @@ const char *n64graphics_get_read_version(void); // get version of underlying graphics writing library const char *n64graphics_get_write_version(void); + +#endif diff --git a/tools/n64graphics_ci_dir/utils.h b/tools/n64graphics_ci_dir/utils.h index 4e80bfb0..f038653f 100644 --- a/tools/n64graphics_ci_dir/utils.h +++ b/tools/n64graphics_ci_dir/utils.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef UTILS_H_ +#define UTILS_H_ #include @@ -148,3 +149,5 @@ void dir_list_free(dir_list *list); // suffix: string to see if 'str' ends with // returns 1 if 'str' ends with 'suffix' int str_ends_with(const char *str, const char *suffix); + +#endif // UTILS_H_ diff --git a/tools/utf8.h b/tools/utf8.h index 69a38226..113bb73e 100644 --- a/tools/utf8.h +++ b/tools/utf8.h @@ -1,3 +1,6 @@ -#pragma once +#ifndef UTF8_H_ +#define UTF8_H_ char *utf8_decode(char *str, uint32_t *codep); + +#endif // UTF8_H_ diff --git a/tools/utils.h b/tools/utils.h index 0b5a1a02..f5675f03 100644 --- a/tools/utils.h +++ b/tools/utils.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef UTILS_H_ +#define UTILS_H_ #include #include @@ -147,3 +148,5 @@ void dir_list_free(dir_list *list); // suffix: string to see if 'str' ends with // returns 1 if 'str' ends with 'suffix' int str_ends_with(const char *str, const char *suffix); + +#endif // UTILS_H_