diff --git a/INSTALL.md b/INSTALL.md index 1f7a0b1168..d0cf3a8c39 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -26,7 +26,7 @@ Install build dependencies: ``` > **NOTE:** On Mac, if you get an error that looks like -> +> >```sh >Error: Cannot install md5sha1sum because conflicting formulae are installed. > coreutils: because both install `md5sum` and `sha1sum` binaries diff --git a/include/PR/PRimage.h b/include/PR/PRimage.h index 145e9326c4..00ad8b7d38 100755 --- a/include/PR/PRimage.h +++ b/include/PR/PRimage.h @@ -26,13 +26,13 @@ extern "C" { #define IMAGIC 0732 /* colormap of images */ -#define CM_NORMAL 0 /* file contains rows of values which - * are either RGB values (zsize == 3) +#define CM_NORMAL 0 /* file contains rows of values which + * are either RGB values (zsize == 3) * or greyramp values (zsize == 1) */ #define CM_DITHERED 1 #define CM_SCREEN 2 /* file contains data which is a screen - * image; getrow returns buffer which - * can be displayed directly with + * image; getrow returns buffer which + * can be displayed directly with * writepixels */ #define CM_COLORMAP 3 /* a colormap file */ @@ -64,7 +64,7 @@ typedef struct { unsigned short zsize; unsigned long min; unsigned long max; - unsigned long wastebytes; + unsigned long wastebytes; char name[80]; unsigned long colormap; @@ -91,7 +91,7 @@ IMAGE *icreate(); * IMAGE *fiopen(int f, char *mode, unsigned int type, unsigned int dim, * unsigned int xsize, unsigned int ysize, unsigned int zsize); * - * ...while iopen and fiopen can take an extended set of parameters, the + * ...while iopen and fiopen can take an extended set of parameters, the * last five are optional, so a more correct prototype would be: * */ @@ -99,7 +99,7 @@ IMAGE *iopen(char *file, char *mode, ...); IMAGE *fiopen(int f, char *mode, ...); /* - * + * * unsigned short *ibufalloc(IMAGE *image); * int ifilbuf(IMAGE *image); * int iflush(IMAGE *image); diff --git a/include/PR/R4300.h b/include/PR/R4300.h index 0c25f1d581..51fe7097ab 100755 --- a/include/PR/R4300.h +++ b/include/PR/R4300.h @@ -424,10 +424,10 @@ #endif /* _LANGUAGE_ASSEMBLY */ /* - * floating-point status register + * floating-point status register */ #define FPCSR_FS 0x01000000 /* flush denorm to zero */ -#define FPCSR_C 0x00800000 /* condition bit */ +#define FPCSR_C 0x00800000 /* condition bit */ #define FPCSR_CE 0x00020000 /* cause: unimplemented operation */ #define FPCSR_CV 0x00010000 /* cause: invalid operation */ #define FPCSR_CZ 0x00008000 /* cause: division by zero */ diff --git a/include/PR/abi.h b/include/PR/abi.h index 02d440d357..fad870895d 100755 --- a/include/PR/abi.h +++ b/include/PR/abi.h @@ -24,10 +24,10 @@ /* * Header file for the Audio Binary Interface. * This is included in the Media Binary Interface file - * mbi.h. + * mbi.h. * * This file follows the framework used for graphics. - * + * */ /* Audio commands: */ @@ -205,7 +205,7 @@ typedef struct { unsigned int pad2:16; unsigned int addr; } Asetloop; - + /* * Generic Acmd Packet */ @@ -385,7 +385,7 @@ typedef short ENVMIX_STATE[40]; _a->words.w0 = _SHIFTL(A_SETLOOP, 24, 8); \ _a->words.w1 = (unsigned int)(a); \ } - + #define aDMEMMove(pkt, i, o, c) \ { \ Acmd *_a = (Acmd *)pkt; \ diff --git a/include/PR/gs2dex.h b/include/PR/gs2dex.h index ced468555a..86c3915be6 100755 --- a/include/PR/gs2dex.h +++ b/include/PR/gs2dex.h @@ -1,11 +1,11 @@ /*--------------------------------------------------------------------- Copyright (C) 1997, Nintendo. - + File gs2dex.h Coded by Yoshitaka Yasumoto. Jul 31, 1997. - Modified by + Modified by Comments Header file for S2DEX ucode. - + $Id: gs2dex.h,v 1.21 1998/05/28 00:14:49 has Exp $ ---------------------------------------------------------------------*/ @@ -40,12 +40,12 @@ extern "C" { /* Non scalable background plane */ typedef struct { - u16 imageX; /* x-coordinate of upper-left position of texture (u10.5) */ + u16 imageX; /* x-coordinate of upper-left position of texture (u10.5) */ u16 imageW; /* width of the texture (u10.2) */ s16 frameX; /* upper-left position of transferred frame (s10.2) */ u16 frameW; /* width of transferred frame (u10.2) */ - u16 imageY; /* y-coordinate of upper-left position of texture (u10.5) */ + u16 imageY; /* y-coordinate of upper-left position of texture (u10.5) */ u16 imageH; /* height of the texture (u10.2) */ s16 frameY; /* upper-left position of transferred frame (s10.2) */ u16 frameH; /* height of transferred frame (u10.2) */ @@ -58,7 +58,7 @@ typedef struct { u16 imageFlip; /* right & left image inversion (Inverted by G_BG_FLAG_FLIPS) */ /* The following is set in the initialization routine guS2DInitBg(). There is no need for the user to set it. */ - u16 tmemW; /* TMEM width and Word size of frame 1 line. + u16 tmemW; /* TMEM width and Word size of frame 1 line. At LoadBlock, GS_PIX2TMEM(imageW/4,imageSiz) At LoadTile GS_PIX2TMEM(frameW/4,imageSiz)+1 */ u16 tmemH; /* height of TMEM loadable at a time (s13.2) 4 times value @@ -67,24 +67,24 @@ typedef struct { u16 tmemLoadSH; /* SH value At LoadBlock, tmemSize/2-1 At LoadTile, tmemW*16-1 */ - u16 tmemLoadTH; /* TH value or Stride value + u16 tmemLoadTH; /* TH value or Stride value At LoadBlock, GS_CALC_DXT(tmemW) At LoadTile, tmemH-1 */ - u16 tmemSizeW; /* skip value of imagePtr for image 1-line + u16 tmemSizeW; /* skip value of imagePtr for image 1-line At LoadBlock, tmemW*2 At LoadTile, GS_PIX2TMEM(imageW/4,imageSiz)*2 */ - u16 tmemSize; /* skip value of imagePtr for 1-loading + u16 tmemSize; /* skip value of imagePtr for 1-loading = tmemSizeW*tmemH */ } uObjBg_t; /* 40 bytes */ /* Scalable background plane */ typedef struct { - u16 imageX; /* x-coordinate of upper-left position of texture (u10.5) */ + u16 imageX; /* x-coordinate of upper-left position of texture (u10.5) */ u16 imageW; /* width of texture (u10.2) */ s16 frameX; /* upper-left position of transferred frame (s10.2) */ u16 frameW; /* width of transferred frame (u10.2) */ - u16 imageY; /* y-coordinate of upper-left position of texture (u10.5) */ + u16 imageY; /* y-coordinate of upper-left position of texture (u10.5) */ u16 imageH; /* height of texture (u10.2) */ s16 frameY; /* upper-left position of transferred frame (s10.2) */ u16 frameH; /* height of transferred frame (u10.2) */ @@ -99,9 +99,9 @@ typedef struct { u16 scaleW; /* scale value of X-direction (u5.10) */ u16 scaleH; /* scale value of Y-direction (u5.10) */ s32 imageYorig; /* start point of drawing on image (s20.5) */ - + u8 padding[4]; - + } uObjScaleBg_t; /* 40 bytes */ typedef union { @@ -126,7 +126,7 @@ typedef struct { u16 imageH; /* u10.5 height of u10.5 texture (length of T-direction) */ u16 paddingY; /* Unused - Always 0 */ u16 imageStride; /* folding width of texel (In units of 64bit word) */ - u16 imageAdrs; /* texture header position in TMEM (In units of 64bit word) */ + u16 imageAdrs; /* texture header position in TMEM (In units of 64bit word) */ u8 imageFmt; /* format of texel - G_IM_FMT_* */ u8 imageSiz; /* size of texel - G_IM_SIZ_* */ u8 imagePal; /* pallet number (0-7) */ @@ -362,7 +362,7 @@ typedef struct { #define G_RM_AA_XLU_SPRITE2 G_RM_AA_XLU_SURF2 /*===========================================================================* - * External functions + * External functions *===========================================================================*/ extern u64 gspS2DEX_fifoTextStart[], gspS2DEX_fifoTextEnd[]; extern u64 gspS2DEX_fifoDataStart[], gspS2DEX_fifoDataEnd[]; diff --git a/include/PR/gt.h b/include/PR/gt.h index dbf09457d8..950a08709a 100755 --- a/include/PR/gt.h +++ b/include/PR/gt.h @@ -61,12 +61,12 @@ extern "C" { * for the microcode. */ -/* +/* * object state field: rendState * * This flag word is built up out of the bits from a * subset of the G_SETGEOMETRYMODE flags from gbi.h. - * + * * When each of these bits is '1', the comments below explain * the effect on the triangles. */ @@ -83,7 +83,7 @@ extern "C" { * texture tile. */ -/* +/* * object state field: flag * * This is a group of what would be pad bits. We use them for some @@ -105,7 +105,7 @@ extern long long int gspTurbo3D_fifoTextStart[], gspTurbo3D_fifoTextEnd[]; extern long long int gspTurbo3D_fifoDataStart[], gspTurbo3D_fifoDataEnd[]; /* - * This is the global state structure. It's definition carefully + * This is the global state structure. It's definition carefully * matches the ucode, so if this structure changes, you must also change * the ucode. */ @@ -188,8 +188,8 @@ typedef union { * * NOTE: The triangle list MUST be aligned to an 8-byte boundary. * Since this structure is only 4 bytes, we are REQUIRING that - * this structure only be used as an array of triangles, and we - * depend on the MIPS C compiler (which always aligns arrays to + * this structure only be used as an array of triangles, and we + * depend on the MIPS C compiler (which always aligns arrays to * 8-byte boundaries). THIS IS DANGEROUS!!!! * */ @@ -244,10 +244,10 @@ typedef union { * requires the RDP othermode command to be cached by the host, * therefore we provide a different interface in libultra to help cache * this in the gt state (this word is just bits, you could pack them - * on your own). + * on your own). * - * gtStateSetOthermode() accomplishs this, taking as arguments - * the state, one of the following mode enums, and a piece of data + * gtStateSetOthermode() accomplishs this, taking as arguments + * the state, one of the following mode enums, and a piece of data * (othermode parameters from gbi.h). * * By definition, the othermode word from the gt state structure is sent @@ -255,11 +255,11 @@ typedef union { * othermode is *always* sent. * * Stated another way, NONE of the gbi RDP othermode commands equivalent - * to those listed here are allowed in the rdpCmd[] field of the + * to those listed here are allowed in the rdpCmd[] field of the * gt state structure. * * Notice also that many of these commands do not make sense for - * the turbo ucode (they control features not supported, like mip-mapping). + * the turbo ucode (they control features not supported, like mip-mapping). * They are only included here for completeness. * */ @@ -288,7 +288,7 @@ typedef enum { */ extern void gtStateSetOthermode(Gfx *om, gtStateOthermode_t mode, int data); -/* +/* * This call dumps a turbo display list for use with gbi2mem and RSPSIM */ #define GT_DUMPTURBO_HANGAFTER 64 diff --git a/include/PR/leo.h b/include/PR/leo.h index 96f2edd1de..06aeb00dce 100755 --- a/include/PR/leo.h +++ b/include/PR/leo.h @@ -1,7 +1,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. - + $RCSfile: leo.h,v $ $Revision: 1.29 $ $Date: 1998/12/21 07:30:15 $ @@ -107,7 +107,7 @@ typedef struct u8 sleep_time; u32 reserve3; } modeselect; - + } data; } LEOCmd; @@ -179,7 +179,7 @@ typedef struct #define LEO_ERROR_NO_SEEK_COMPLETE 21 #define LEO_ERROR_WRITE_FAULT 22 #define LEO_ERROR_UNRECOVERED_READ_ERROR 23 -#define LEO_ERROR_NO_REFERENCE_POSITION_FOUND 24 +#define LEO_ERROR_NO_REFERENCE_POSITION_FOUND 24 #define LEO_ERROR_TRACK_FOLLOWING_ERROR 25 #define LEO_ERROR_TRACKING_OR_SPDL_SERVO_FAILURE 25 #define LEO_ERROR_INVALID_COMMAND_OPERATION_CODE 31 diff --git a/include/PR/leoappli.h b/include/PR/leoappli.h index 619fbc0839..b091f83166 100755 --- a/include/PR/leoappli.h +++ b/include/PR/leoappli.h @@ -107,7 +107,7 @@ extern s32 LeoResetClear(void); #define LEO_SENSE_NO_SEEK_COMPLETE 21 #define LEO_SENSE_WRITE_FAULT 22 #define LEO_SENSE_UNRECOVERED_READ_ERROR 23 -#define LEO_SENSE_NO_REFERENCE_POSITION_FOUND 24 +#define LEO_SENSE_NO_REFERENCE_POSITION_FOUND 24 #define LEO_SENSE_TRACK_FOLLOWING_ERROR 25 #define LEO_SENSE_TRACKING_OR_SPDL_SERVO_FAILURE 25 #define LEO_SENSE_INVALID_COMMAND_OPERATION_CODE 31 diff --git a/include/PR/n_libaudio.h b/include/PR/n_libaudio.h index 90ac3144c8..726923cf4f 100755 --- a/include/PR/n_libaudio.h +++ b/include/PR/n_libaudio.h @@ -29,7 +29,7 @@ extern "C" { #include #include - + /* * Synthesis driver stuff */ @@ -59,10 +59,10 @@ typedef struct { ALHeap *heap; struct ALParam_s *paramList; struct N_ALMainBus_s *mainBus; - struct N_ALAuxBus_s *auxBus; + struct N_ALAuxBus_s *auxBus; s32 numPVoices; s32 maxAuxBusses; - s32 outputRate; + s32 outputRate; s32 maxOutSamples; s32 sv_dramout; s32 sv_first; diff --git a/include/PR/os.h b/include/PR/os.h index 0c4b0d578e..c3f9c72008 100755 --- a/include/PR/os.h +++ b/include/PR/os.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os.h,v $ $Revision: 1.167 $ $Date: 1999/01/18 13:17:43 $ @@ -81,8 +81,8 @@ extern "C" { #define OS_MIN_STACKSIZE 72 -/* - * Leo Disk +/* + * Leo Disk */ /* transfer mode */ diff --git a/include/PR/os_ai.h b/include/PR/os_ai.h index f89d87cfe5..93160921f5 100755 --- a/include/PR/os_ai.h +++ b/include/PR/os_ai.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_ai.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:04 $ diff --git a/include/PR/os_cache.h b/include/PR/os_cache.h index 54ed92300a..7b8a24bff1 100755 --- a/include/PR/os_cache.h +++ b/include/PR/os_cache.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_cache.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:04 $ diff --git a/include/PR/os_cont.h b/include/PR/os_cont.h index 2754f2504a..de0047c64c 100755 --- a/include/PR/os_cont.h +++ b/include/PR/os_cont.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_cont.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:05 $ @@ -47,7 +47,7 @@ extern "C" { */ /* - * Structure for controllers + * Structure for controllers */ typedef struct { @@ -96,7 +96,7 @@ typedef struct { #ifdef _HW_VERSION_1 #define CONT_FRAME_ERROR 0x2 #define CONT_COLLISION_ERROR 0x1 -#endif +#endif /* Controller type */ diff --git a/include/PR/os_convert.h b/include/PR/os_convert.h index 0a5da10a86..3797d1b53f 100755 --- a/include/PR/os_convert.h +++ b/include/PR/os_convert.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_convert.h,v $ $Revision: 1.2 $ $Date: 1999/04/21 02:53:11 $ diff --git a/include/PR/os_debug.h b/include/PR/os_debug.h index f8f5a89abe..e8bc8b6600 100755 --- a/include/PR/os_debug.h +++ b/include/PR/os_debug.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_debug.h,v $ $Revision: 1.4 $ $Date: 1999/06/30 03:04:08 $ @@ -45,7 +45,7 @@ extern "C" { */ /* - * Structure for Profiler + * Structure for Profiler */ typedef struct { u16 *histo_base; /* histogram base */ diff --git a/include/PR/os_eeprom.h b/include/PR/os_eeprom.h index b3bca81444..47c6dd29f8 100755 --- a/include/PR/os_eeprom.h +++ b/include/PR/os_eeprom.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_eeprom.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:06 $ diff --git a/include/PR/os_error.h b/include/PR/os_error.h index f4c3b83c5f..31203e0fcc 100755 --- a/include/PR/os_error.h +++ b/include/PR/os_error.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_error.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:06 $ diff --git a/include/PR/os_gbpak.h b/include/PR/os_gbpak.h index 0a9999450c..e2a696aac3 100755 --- a/include/PR/os_gbpak.h +++ b/include/PR/os_gbpak.h @@ -1,7 +1,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. - + $RCSfile: os_gbpak.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:07 $ diff --git a/include/PR/os_gio.h b/include/PR/os_gio.h index ad3c020fac..093b7cb95a 100755 --- a/include/PR/os_gio.h +++ b/include/PR/os_gio.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_gio.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:08 $ diff --git a/include/PR/os_host.h b/include/PR/os_host.h index 0cc1ae5b95..cfe93da85d 100755 --- a/include/PR/os_host.h +++ b/include/PR/os_host.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_host.h,v $ $Revision: 1.3 $ $Date: 1999/06/24 09:23:06 $ diff --git a/include/PR/os_internal_debug.h b/include/PR/os_internal_debug.h index 7b307d6e38..856809561e 100755 --- a/include/PR/os_internal_debug.h +++ b/include/PR/os_internal_debug.h @@ -12,7 +12,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_internal_debug.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:09 $ diff --git a/include/PR/os_internal_error.h b/include/PR/os_internal_error.h index de188d2398..666fbf4b4d 100755 --- a/include/PR/os_internal_error.h +++ b/include/PR/os_internal_error.h @@ -12,7 +12,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_internal_error.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:10 $ diff --git a/include/PR/os_internal_exception.h b/include/PR/os_internal_exception.h index 730dc9352d..1568fd57f1 100755 --- a/include/PR/os_internal_exception.h +++ b/include/PR/os_internal_exception.h @@ -12,7 +12,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_internal_exception.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:10 $ diff --git a/include/PR/os_internal_gio.h b/include/PR/os_internal_gio.h index ff133850ff..0f42e4798a 100755 --- a/include/PR/os_internal_gio.h +++ b/include/PR/os_internal_gio.h @@ -12,7 +12,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_internal_gio.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:11 $ diff --git a/include/PR/os_internal_host.h b/include/PR/os_internal_host.h index b6d195130d..08cdde06f5 100755 --- a/include/PR/os_internal_host.h +++ b/include/PR/os_internal_host.h @@ -12,7 +12,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_internal_host.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:11 $ diff --git a/include/PR/os_internal_rsp.h b/include/PR/os_internal_rsp.h index 646e667960..617824e261 100755 --- a/include/PR/os_internal_rsp.h +++ b/include/PR/os_internal_rsp.h @@ -12,7 +12,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_internal_rsp.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:12 $ diff --git a/include/PR/os_internal_si.h b/include/PR/os_internal_si.h index d0eeedccb6..db0e6a6d10 100755 --- a/include/PR/os_internal_si.h +++ b/include/PR/os_internal_si.h @@ -12,7 +12,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_internal_si.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:13 $ diff --git a/include/PR/os_internal_thread.h b/include/PR/os_internal_thread.h index 1305eb58b8..958925136c 100755 --- a/include/PR/os_internal_thread.h +++ b/include/PR/os_internal_thread.h @@ -12,7 +12,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_internal_thread.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:13 $ diff --git a/include/PR/os_internal_tlb.h b/include/PR/os_internal_tlb.h index b92918ffe7..3bb36f319e 100755 --- a/include/PR/os_internal_tlb.h +++ b/include/PR/os_internal_tlb.h @@ -12,7 +12,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_internal_tlb.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:14 $ diff --git a/include/PR/os_libc.h b/include/PR/os_libc.h index 35d0e8e6f6..0a84baddac 100755 --- a/include/PR/os_libc.h +++ b/include/PR/os_libc.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_libc.h,v $ $Revision: 1.3 $ $Date: 1999/07/13 01:43:47 $ diff --git a/include/PR/os_motor.h b/include/PR/os_motor.h index f8dcbd5a32..5377b88b12 100755 --- a/include/PR/os_motor.h +++ b/include/PR/os_motor.h @@ -1,7 +1,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. - + $RCSfile: os_motor.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:15 $ diff --git a/include/PR/os_rdp.h b/include/PR/os_rdp.h index 6b3d288cef..198c756a3e 100755 --- a/include/PR/os_rdp.h +++ b/include/PR/os_rdp.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_rdp.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:16 $ diff --git a/include/PR/os_reg.h b/include/PR/os_reg.h index 50aa218815..2049a60a6d 100755 --- a/include/PR/os_reg.h +++ b/include/PR/os_reg.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_reg.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:17 $ diff --git a/include/PR/os_rsp.h b/include/PR/os_rsp.h index 12116053e1..5c983117ce 100755 --- a/include/PR/os_rsp.h +++ b/include/PR/os_rsp.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_rsp.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:17 $ diff --git a/include/PR/os_si.h b/include/PR/os_si.h index 23b07c078c..e1d1d09b63 100755 --- a/include/PR/os_si.h +++ b/include/PR/os_si.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_si.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:18 $ diff --git a/include/PR/os_time.h b/include/PR/os_time.h index deaec659c2..5bbd9b3e8d 100755 --- a/include/PR/os_time.h +++ b/include/PR/os_time.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_time.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:19 $ @@ -47,7 +47,7 @@ extern "C" { */ /* - * Structure for time value + * Structure for time value */ typedef u64 OSTime; diff --git a/include/PR/os_tlb.h b/include/PR/os_tlb.h index 2cdd5c9c6c..a4ea6fa0c6 100755 --- a/include/PR/os_tlb.h +++ b/include/PR/os_tlb.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_tlb.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:20 $ diff --git a/include/PR/os_version.h b/include/PR/os_version.h index c485a4382d..dd3f566927 100755 --- a/include/PR/os_version.h +++ b/include/PR/os_version.h @@ -1,7 +1,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. - + $RCSfile: os_version.h,v $ $Revision: 1.2 $ $Date: 1999/06/17 01:33:01 $ diff --git a/include/PR/os_vi.h b/include/PR/os_vi.h index 5a17f2587e..2ac9d99394 100755 --- a/include/PR/os_vi.h +++ b/include/PR/os_vi.h @@ -21,7 +21,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. (Originated by SGI) - + $RCSfile: os_vi.h,v $ $Revision: 1.1 $ $Date: 1998/10/09 08:01:20 $ @@ -69,7 +69,7 @@ typedef struct { typedef struct { u32 origin; u32 yScale; - u32 vStart; + u32 vStart; u32 vBurst; u32 vIntr; } OSViFieldRegs; diff --git a/include/PR/os_voice.h b/include/PR/os_voice.h index 4e3cf6ec48..6273a2cfb6 100755 --- a/include/PR/os_voice.h +++ b/include/PR/os_voice.h @@ -1,7 +1,7 @@ /*---------------------------------------------------------------------* Copyright (C) 1998 Nintendo. - + $RCSfile: os_voice.h,v $ $Revision: 1.2 $ $Date: 1999/07/13 08:36:42 $ @@ -40,7 +40,7 @@ typedef struct { /* Voice Recognition System */ u16 answer[5]; u16 distance[5]; } OSVoiceData; - + #endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ diff --git a/include/PR/ramrom.h b/include/PR/ramrom.h index 7e04a8ea5d..a5c203abe1 100755 --- a/include/PR/ramrom.h +++ b/include/PR/ramrom.h @@ -23,7 +23,7 @@ /* * Defines for the GIO card in the Nintendo Development Station - * + * * The RAM on the GIO card acts as ROM for the game * Interrupts available between the game and the Indy host * @@ -62,7 +62,7 @@ #else #define RAMROM_BOOTSTRAP_OFFSET 0x400 #define RAMROM_GAME_OFFSET 0x2000 -#endif +#endif #define RAMROM_CLOCKRATE_OFFSET 0x4 #define RAMROM_CLOCKRATE_MASK 0xfffffff0 #define RAMROM_BOOTADDR_OFFSET 0x8 diff --git a/include/PR/rdb.h b/include/PR/rdb.h index 78d7b20e01..099fe5ef14 100755 --- a/include/PR/rdb.h +++ b/include/PR/rdb.h @@ -37,7 +37,7 @@ #define RDB_TYPE_HtoG_DEBUG 14 #define RDB_TYPE_HtoG_DEBUG_CT 15 #define RDB_TYPE_HtoG_DATA 16 -#define RDB_TYPE_HtoG_DATA_DONE 17 +#define RDB_TYPE_HtoG_DATA_DONE 17 #define RDB_TYPE_HtoG_REQ_RAMROM 18 #define RDB_TYPE_HtoG_FREE_RAMROM 19 #define RDB_TYPE_HtoG_KDEBUG 20 diff --git a/include/PR/region.h b/include/PR/region.h index 574e0b6a17..febbf5ce98 100755 --- a/include/PR/region.h +++ b/include/PR/region.h @@ -40,20 +40,20 @@ extern "C" { /*************************************** * - * Global defines + * Global defines * */ /* Alignment sizes */ #define ALIGNSZ (sizeof(long long)) /* 8 bytes */ -#define ALIGNOFFST (ALIGNSZ-1) +#define ALIGNOFFST (ALIGNSZ-1) /* size for storing index to free buffer */ -#define BUF_CTRL_SIZE ALIGNSZ +#define BUF_CTRL_SIZE ALIGNSZ /* Max bufcount = 32K */ -#define MAX_BUFCOUNT 0x8000 +#define MAX_BUFCOUNT 0x8000 /* code for last free buffer */ -#define BUF_FREE_WO_NEXT 0x8000 +#define BUF_FREE_WO_NEXT 0x8000 /* * Global defines for alignment size (default is 8-byte alignment) @@ -82,15 +82,15 @@ extern "C" { * */ /* - * Structure for region header/control area + * Structure for region header/control area */ typedef struct _Region_s { u8 *r_startBufferAddress; /* start address to data buffer */ u8 *r_endAddress; /* end address of region */ s32 r_bufferSize; /* size of buffers for this region */ - s32 r_bufferCount; /* up to 32K entries; MSB is used for + s32 r_bufferCount; /* up to 32K entries; MSB is used for setting end-of-list/used */ - u16 r_freeList; /* point to array index of first + u16 r_freeList; /* point to array index of first available memory buffer */ u16 r_alignSize; /* alignment size (# of bytes) */ } OSRegion; @@ -107,10 +107,10 @@ typedef struct _Region_s { * */ extern void *osCreateRegion(void *, u32, u32, u32); -extern void *osMalloc(void *); -extern void osFree(void *, void *); -extern s32 osGetRegionBufCount(void *); -extern s32 osGetRegionBufSize(void *); +extern void *osMalloc(void *); +extern void osFree(void *, void *); +extern s32 osGetRegionBufCount(void *); +extern s32 osGetRegionBufSize(void *); #ifdef _LANGUAGE_C_PLUS_PLUS diff --git a/include/PR/sptask.h b/include/PR/sptask.h index f31dd83326..bbddd46afc 100755 --- a/include/PR/sptask.h +++ b/include/PR/sptask.h @@ -50,7 +50,7 @@ extern "C" { * - pointer to ucode * - size of ucode * - pointer to initial DMEM data - * - size of initial DMEM data + * - size of initial DMEM data * - pointer to DRAM stack * - size of DRAM stack (max) * - pointer to output buffer @@ -131,7 +131,7 @@ typedef u32 OSYieldResult; #define OS_TASK_USR3 0x0080 /* - * Size of Yield buffer. The taskHdrPtr->t.yield_data_ptr must point to a + * Size of Yield buffer. The taskHdrPtr->t.yield_data_ptr must point to a * buffer of this size. (The size is in bytes). ONLY If the task will NEVER * yield it may be a null pointer. The buffer must be aligned to a 64 bit * boundary. The taskHdrPtr->t.yield_data_ptr must be set to point to the diff --git a/include/PR/ucode.h b/include/PR/ucode.h index 735f914954..544b647b06 100755 --- a/include/PR/ucode.h +++ b/include/PR/ucode.h @@ -58,7 +58,7 @@ extern "C" { * fixed per release. */ #define SP_UCODE_DATA_SIZE 2048 - + /************************************************************************** * @@ -67,7 +67,7 @@ extern "C" { */ /* - * Symbols generated by "rsp2elf", included by "makerom" that indicate + * Symbols generated by "rsp2elf", included by "makerom" that indicate * the location and size of the SP microcode objects. The ucode objects * are loaded as part of the codesegment (arbitrary, could do other * ways) diff --git a/include/PR/ucode_debug.h b/include/PR/ucode_debug.h index 189a7f2186..e2e5d5902f 100755 --- a/include/PR/ucode_debug.h +++ b/include/PR/ucode_debug.h @@ -1,9 +1,9 @@ /*---------------------------------------------------------------------* Copyright (C) 1998, Nintendo. - + File ucode_debug.h Coded by Yoshitaka Yasumoto. Nov 15, 1998. - + $Id: ucode_debug.h,v 1.1 1998/12/25 01:06:21 has Exp $ *---------------------------------------------------------------------*/ #ifndef _UCODE_DEBUG_H_ diff --git a/include/PR/ultralog.h b/include/PR/ultralog.h index ebd7630e42..46fcfd274d 100755 --- a/include/PR/ultralog.h +++ b/include/PR/ultralog.h @@ -39,7 +39,7 @@ extern "C" { #define OS_LOG_MAGIC 0x20736a73 #define OS_LOG_FLOAT(x) (*(int *) &(x)) #define OS_LOG_VERSION 1 - + typedef struct { u32 magic; /* log identifier */ u32 len; /* length of log data + log structure */ diff --git a/include/saved_byte_names.h b/include/saved_byte_names.h index 1b072a074c..20075c109e 100644 --- a/include/saved_byte_names.h +++ b/include/saved_byte_names.h @@ -1,516 +1,516 @@ #include "script_api/macros.h" enum GameBytes { - GB_StoryProgress = GameByte(0x000), + GB_StoryProgress = GameByte(0x000), GB_Unused_EVT_01 = GameByte(0x001), ///< copied from GameStatus->unk_A9 by Function_80035E54 during save file load - GB_Unused_EVT_02 = GameByte(0x002), - GB_Unused_EVT_03 = GameByte(0x003), - GB_Unused_EVT_04 = GameByte(0x004), - GB_Unused_EVT_05 = GameByte(0x005), - GB_Unused_EVT_06 = GameByte(0x006), - GB_Unused_EVT_07 = GameByte(0x007), - GB_Unused_EVT_08 = GameByte(0x008), - GB_Unused_EVT_09 = GameByte(0x009), - GB_Unused_EVT_0A = GameByte(0x00A), - GB_Unused_EVT_0B = GameByte(0x00B), - GB_KMR20_MarioReadDiaryFlags_00 = GameByte(0x00C), - GB_KMR20_MarioReadDiaryFlags_01 = GameByte(0x00D), - GB_KMR20_MarioReadLetterFlags_00 = GameByte(0x00E), - GB_KMR20_MarioReadLetterFlags_01 = GameByte(0x00F), - GB_Unused_KMR_04 = GameByte(0x010), - GB_Unused_KMR_05 = GameByte(0x011), - GB_Unused_KMR_06 = GameByte(0x012), - GB_Unused_KMR_07 = GameByte(0x013), - GB_Unused_KMR_08 = GameByte(0x014), - GB_Unused_KMR_09 = GameByte(0x015), - GB_Unused_KMR_0A = GameByte(0x016), - GB_Unused_KMR_0B = GameByte(0x017), - GB_Unused_KMR_0C = GameByte(0x018), - GB_Unused_KMR_0D = GameByte(0x019), - GB_Unused_KMR_0E = GameByte(0x01A), - GB_MAC01_Merlon_SpinJumpCount = GameByte(0x01B), - GB_MAC00_DojoRank = GameByte(0x01C), + GB_Unused_EVT_02 = GameByte(0x002), + GB_Unused_EVT_03 = GameByte(0x003), + GB_Unused_EVT_04 = GameByte(0x004), + GB_Unused_EVT_05 = GameByte(0x005), + GB_Unused_EVT_06 = GameByte(0x006), + GB_Unused_EVT_07 = GameByte(0x007), + GB_Unused_EVT_08 = GameByte(0x008), + GB_Unused_EVT_09 = GameByte(0x009), + GB_Unused_EVT_0A = GameByte(0x00A), + GB_Unused_EVT_0B = GameByte(0x00B), + GB_KMR20_MarioReadDiaryFlags_00 = GameByte(0x00C), + GB_KMR20_MarioReadDiaryFlags_01 = GameByte(0x00D), + GB_KMR20_MarioReadLetterFlags_00 = GameByte(0x00E), + GB_KMR20_MarioReadLetterFlags_01 = GameByte(0x00F), + GB_Unused_KMR_04 = GameByte(0x010), + GB_Unused_KMR_05 = GameByte(0x011), + GB_Unused_KMR_06 = GameByte(0x012), + GB_Unused_KMR_07 = GameByte(0x013), + GB_Unused_KMR_08 = GameByte(0x014), + GB_Unused_KMR_09 = GameByte(0x015), + GB_Unused_KMR_0A = GameByte(0x016), + GB_Unused_KMR_0B = GameByte(0x017), + GB_Unused_KMR_0C = GameByte(0x018), + GB_Unused_KMR_0D = GameByte(0x019), + GB_Unused_KMR_0E = GameByte(0x01A), + GB_MAC01_Merlon_SpinJumpCount = GameByte(0x01B), + GB_MAC00_DojoRank = GameByte(0x01C), GB_MAC03_LilOinkCount = GameByte(0x01D), ///< 0 = none. 1 = ready, 2 = broken - GB_MAC03_LilOink_00 = GameByte(0x01E), - GB_MAC03_LilOink_01 = GameByte(0x01F), - GB_MAC03_LilOink_02 = GameByte(0x020), - GB_MAC03_LilOink_03 = GameByte(0x021), - GB_MAC03_LilOink_04 = GameByte(0x022), - GB_MAC03_LilOink_05 = GameByte(0x023), - GB_MAC03_LilOink_06 = GameByte(0x024), - GB_MAC03_LilOink_07 = GameByte(0x025), - GB_MAC03_LilOink_08 = GameByte(0x026), - GB_MAC03_LilOink_09 = GameByte(0x027), - GB_MAC03_LilOink_0A = GameByte(0x028), - GB_MAC01_Rowf_Badge0 = GameByte(0x029), - GB_MAC01_Rowf_Badge1 = GameByte(0x02A), - GB_MAC01_Rowf_Badge2 = GameByte(0x02B), - GB_MAC01_Rowf_NumBadges = GameByte(0x02C), - GB_MAC03_LilOinkCapsuleState = GameByte(0x02D), - GB_Unused_MAC_13 = GameByte(0x02E), - GB_Unused_MAC_14 = GameByte(0x02F), - GB_Unused_MAC_15 = GameByte(0x030), - GB_Unused_MAC_16 = GameByte(0x031), - GB_Unused_MAC_17 = GameByte(0x032), - GB_Unused_MAC_18 = GameByte(0x033), - GB_Unused_MAC_19 = GameByte(0x034), - GB_Unused_MAC_1A = GameByte(0x035), - GB_Unused_MAC_1B = GameByte(0x036), - GB_Unused_MAC_1C = GameByte(0x037), - GB_TIK15_RipCheato_PurchaseCount = GameByte(0x038), - GB_Unused_TIK_01 = GameByte(0x039), - GB_Unused_TIK_02 = GameByte(0x03A), - GB_Unused_TIK_03 = GameByte(0x03B), - GB_Unused_TIK_04 = GameByte(0x03C), - GB_Unused_TIK_05 = GameByte(0x03D), - GB_Unused_TIK_06 = GameByte(0x03E), - GB_Unused_TIK_07 = GameByte(0x03F), - GB_Unused_TIK_08 = GameByte(0x040), - GB_Unused_TIK_09 = GameByte(0x041), - GB_Unused_TIK_0A = GameByte(0x042), - GB_Unused_KGR_00 = GameByte(0x043), - GB_Unused_KGR_01 = GameByte(0x044), - GB_Unused_KGR_02 = GameByte(0x045), - GB_Unused_KGR_03 = GameByte(0x046), - GB_Unused_KGR_04 = GameByte(0x047), - GB_Unused_KGR_05 = GameByte(0x048), - GB_Unused_KGR_06 = GameByte(0x049), - GB_Unused_KGR_07 = GameByte(0x04A), - GB_Unused_KGR_08 = GameByte(0x04B), - GB_Unused_KGR_09 = GameByte(0x04C), - GB_Unused_KKJ_00 = GameByte(0x04D), + GB_MAC03_LilOink_00 = GameByte(0x01E), + GB_MAC03_LilOink_01 = GameByte(0x01F), + GB_MAC03_LilOink_02 = GameByte(0x020), + GB_MAC03_LilOink_03 = GameByte(0x021), + GB_MAC03_LilOink_04 = GameByte(0x022), + GB_MAC03_LilOink_05 = GameByte(0x023), + GB_MAC03_LilOink_06 = GameByte(0x024), + GB_MAC03_LilOink_07 = GameByte(0x025), + GB_MAC03_LilOink_08 = GameByte(0x026), + GB_MAC03_LilOink_09 = GameByte(0x027), + GB_MAC03_LilOink_0A = GameByte(0x028), + GB_MAC01_Rowf_Badge0 = GameByte(0x029), + GB_MAC01_Rowf_Badge1 = GameByte(0x02A), + GB_MAC01_Rowf_Badge2 = GameByte(0x02B), + GB_MAC01_Rowf_NumBadges = GameByte(0x02C), + GB_MAC03_LilOinkCapsuleState = GameByte(0x02D), + GB_Unused_MAC_13 = GameByte(0x02E), + GB_Unused_MAC_14 = GameByte(0x02F), + GB_Unused_MAC_15 = GameByte(0x030), + GB_Unused_MAC_16 = GameByte(0x031), + GB_Unused_MAC_17 = GameByte(0x032), + GB_Unused_MAC_18 = GameByte(0x033), + GB_Unused_MAC_19 = GameByte(0x034), + GB_Unused_MAC_1A = GameByte(0x035), + GB_Unused_MAC_1B = GameByte(0x036), + GB_Unused_MAC_1C = GameByte(0x037), + GB_TIK15_RipCheato_PurchaseCount = GameByte(0x038), + GB_Unused_TIK_01 = GameByte(0x039), + GB_Unused_TIK_02 = GameByte(0x03A), + GB_Unused_TIK_03 = GameByte(0x03B), + GB_Unused_TIK_04 = GameByte(0x03C), + GB_Unused_TIK_05 = GameByte(0x03D), + GB_Unused_TIK_06 = GameByte(0x03E), + GB_Unused_TIK_07 = GameByte(0x03F), + GB_Unused_TIK_08 = GameByte(0x040), + GB_Unused_TIK_09 = GameByte(0x041), + GB_Unused_TIK_0A = GameByte(0x042), + GB_Unused_KGR_00 = GameByte(0x043), + GB_Unused_KGR_01 = GameByte(0x044), + GB_Unused_KGR_02 = GameByte(0x045), + GB_Unused_KGR_03 = GameByte(0x046), + GB_Unused_KGR_04 = GameByte(0x047), + GB_Unused_KGR_05 = GameByte(0x048), + GB_Unused_KGR_06 = GameByte(0x049), + GB_Unused_KGR_07 = GameByte(0x04A), + GB_Unused_KGR_08 = GameByte(0x04B), + GB_Unused_KGR_09 = GameByte(0x04C), + GB_Unused_KKJ_00 = GameByte(0x04D), GB_KKJ_LastPartner = GameByte(0x04E), ///< peach missions need to remember Mario's last partner GB_KKJ_CaughtCount = GameByte(0x04F), ///< how many times peach is caught for each mission - GB_Unused_KKJ_03 = GameByte(0x050), - GB_Unused_KKJ_04 = GameByte(0x051), - GB_Unused_KKJ_05 = GameByte(0x052), - GB_Unused_KKJ_06 = GameByte(0x053), - GB_Unused_KKJ_07 = GameByte(0x054), - GB_Unused_KKJ_08 = GameByte(0x055), - GB_Unused_KKJ_09 = GameByte(0x056), - GB_Unused_KKJ_0A = GameByte(0x057), - GB_Unused_KKJ_0B = GameByte(0x058), - GB_Unused_KKJ_0C = GameByte(0x059), - GB_Unused_HOS_00 = GameByte(0x05A), - GB_Unused_HOS_01 = GameByte(0x05B), - GB_Unused_HOS_02 = GameByte(0x05C), - GB_Unused_HOS_03 = GameByte(0x05D), - GB_Unused_HOS_04 = GameByte(0x05E), - GB_Unused_HOS_05 = GameByte(0x05F), - GB_Unused_HOS_06 = GameByte(0x060), - GB_Unused_HOS_07 = GameByte(0x061), - GB_Unused_HOS_08 = GameByte(0x062), - GB_Unused_HOS_09 = GameByte(0x063), - GB_Unused_NOK_00 = GameByte(0x064), - GB_Unused_NOK_01 = GameByte(0x065), - GB_Unused_NOK_02 = GameByte(0x066), - GB_Unused_NOK_03 = GameByte(0x067), - GB_Unused_NOK_04 = GameByte(0x068), - GB_Unused_NOK_05 = GameByte(0x069), - GB_Unused_NOK_06 = GameByte(0x06A), - GB_Unused_NOK_07 = GameByte(0x06B), - GB_Unused_NOK_08 = GameByte(0x06C), - GB_Unused_NOK_09 = GameByte(0x06D), - GB_Unused_NOK_0A = GameByte(0x06E), - GB_Unused_NOK_0B = GameByte(0x06F), - GB_Unused_TRD_00 = GameByte(0x070), - GB_Unused_TRD_01 = GameByte(0x071), - GB_Unused_TRD_02 = GameByte(0x072), - GB_Unused_TRD_03 = GameByte(0x073), - GB_Unused_TRD_04 = GameByte(0x074), - GB_Unused_TRD_05 = GameByte(0x075), - GB_Unused_TRD_06 = GameByte(0x076), - GB_Unused_TRD_07 = GameByte(0x077), - GB_Unused_TRD_08 = GameByte(0x078), - GB_Unused_TRD_09 = GameByte(0x079), - GB_IWA10_ReturnedLetterCount = GameByte(0x07A), - GB_IWA00_Whacka_HitCount = GameByte(0x07B), - GB_Unused_IWA_02 = GameByte(0x07C), - GB_Unused_IWA_03 = GameByte(0x07D), - GB_Unused_IWA_04 = GameByte(0x07E), - GB_Unused_IWA_05 = GameByte(0x07F), - GB_Unused_IWA_06 = GameByte(0x080), - GB_Unused_IWA_07 = GameByte(0x081), - GB_Unused_IWA_08 = GameByte(0x082), - GB_Unused_IWA_09 = GameByte(0x083), - GB_Unused_IWA_0A = GameByte(0x084), - GB_Unused_IWA_0B = GameByte(0x085), - GB_DRO02_SheekGiftCount = GameByte(0x086), - GB_DRO02_SheekLemonGiftCount = GameByte(0x087), - GB_Unused_DRO_02 = GameByte(0x088), - GB_Unused_DRO_03 = GameByte(0x089), - GB_Unused_DRO_04 = GameByte(0x08A), - GB_Unused_DRO_05 = GameByte(0x08B), - GB_Unused_DRO_06 = GameByte(0x08C), - GB_Unused_DRO_07 = GameByte(0x08D), - GB_Unused_DRO_08 = GameByte(0x08E), - GB_Unused_DRO_09 = GameByte(0x08F), - GB_Unused_DRO_0A = GameByte(0x090), - GB_Unused_DRO_0B = GameByte(0x091), - GB_Unused_SBK_00 = GameByte(0x092), - GB_Unused_SBK_01 = GameByte(0x093), - GB_Unused_SBK_02 = GameByte(0x094), - GB_Unused_SBK_03 = GameByte(0x095), - GB_Unused_SBK_04 = GameByte(0x096), - GB_Unused_SBK_05 = GameByte(0x097), - GB_Unused_SBK_06 = GameByte(0x098), - GB_Unused_SBK_07 = GameByte(0x099), - GB_Unused_SBK_08 = GameByte(0x09A), - GB_Unused_SBK_09 = GameByte(0x09B), + GB_Unused_KKJ_03 = GameByte(0x050), + GB_Unused_KKJ_04 = GameByte(0x051), + GB_Unused_KKJ_05 = GameByte(0x052), + GB_Unused_KKJ_06 = GameByte(0x053), + GB_Unused_KKJ_07 = GameByte(0x054), + GB_Unused_KKJ_08 = GameByte(0x055), + GB_Unused_KKJ_09 = GameByte(0x056), + GB_Unused_KKJ_0A = GameByte(0x057), + GB_Unused_KKJ_0B = GameByte(0x058), + GB_Unused_KKJ_0C = GameByte(0x059), + GB_Unused_HOS_00 = GameByte(0x05A), + GB_Unused_HOS_01 = GameByte(0x05B), + GB_Unused_HOS_02 = GameByte(0x05C), + GB_Unused_HOS_03 = GameByte(0x05D), + GB_Unused_HOS_04 = GameByte(0x05E), + GB_Unused_HOS_05 = GameByte(0x05F), + GB_Unused_HOS_06 = GameByte(0x060), + GB_Unused_HOS_07 = GameByte(0x061), + GB_Unused_HOS_08 = GameByte(0x062), + GB_Unused_HOS_09 = GameByte(0x063), + GB_Unused_NOK_00 = GameByte(0x064), + GB_Unused_NOK_01 = GameByte(0x065), + GB_Unused_NOK_02 = GameByte(0x066), + GB_Unused_NOK_03 = GameByte(0x067), + GB_Unused_NOK_04 = GameByte(0x068), + GB_Unused_NOK_05 = GameByte(0x069), + GB_Unused_NOK_06 = GameByte(0x06A), + GB_Unused_NOK_07 = GameByte(0x06B), + GB_Unused_NOK_08 = GameByte(0x06C), + GB_Unused_NOK_09 = GameByte(0x06D), + GB_Unused_NOK_0A = GameByte(0x06E), + GB_Unused_NOK_0B = GameByte(0x06F), + GB_Unused_TRD_00 = GameByte(0x070), + GB_Unused_TRD_01 = GameByte(0x071), + GB_Unused_TRD_02 = GameByte(0x072), + GB_Unused_TRD_03 = GameByte(0x073), + GB_Unused_TRD_04 = GameByte(0x074), + GB_Unused_TRD_05 = GameByte(0x075), + GB_Unused_TRD_06 = GameByte(0x076), + GB_Unused_TRD_07 = GameByte(0x077), + GB_Unused_TRD_08 = GameByte(0x078), + GB_Unused_TRD_09 = GameByte(0x079), + GB_IWA10_ReturnedLetterCount = GameByte(0x07A), + GB_IWA00_Whacka_HitCount = GameByte(0x07B), + GB_Unused_IWA_02 = GameByte(0x07C), + GB_Unused_IWA_03 = GameByte(0x07D), + GB_Unused_IWA_04 = GameByte(0x07E), + GB_Unused_IWA_05 = GameByte(0x07F), + GB_Unused_IWA_06 = GameByte(0x080), + GB_Unused_IWA_07 = GameByte(0x081), + GB_Unused_IWA_08 = GameByte(0x082), + GB_Unused_IWA_09 = GameByte(0x083), + GB_Unused_IWA_0A = GameByte(0x084), + GB_Unused_IWA_0B = GameByte(0x085), + GB_DRO02_SheekGiftCount = GameByte(0x086), + GB_DRO02_SheekLemonGiftCount = GameByte(0x087), + GB_Unused_DRO_02 = GameByte(0x088), + GB_Unused_DRO_03 = GameByte(0x089), + GB_Unused_DRO_04 = GameByte(0x08A), + GB_Unused_DRO_05 = GameByte(0x08B), + GB_Unused_DRO_06 = GameByte(0x08C), + GB_Unused_DRO_07 = GameByte(0x08D), + GB_Unused_DRO_08 = GameByte(0x08E), + GB_Unused_DRO_09 = GameByte(0x08F), + GB_Unused_DRO_0A = GameByte(0x090), + GB_Unused_DRO_0B = GameByte(0x091), + GB_Unused_SBK_00 = GameByte(0x092), + GB_Unused_SBK_01 = GameByte(0x093), + GB_Unused_SBK_02 = GameByte(0x094), + GB_Unused_SBK_03 = GameByte(0x095), + GB_Unused_SBK_04 = GameByte(0x096), + GB_Unused_SBK_05 = GameByte(0x097), + GB_Unused_SBK_06 = GameByte(0x098), + GB_Unused_SBK_07 = GameByte(0x099), + GB_Unused_SBK_08 = GameByte(0x09A), + GB_Unused_SBK_09 = GameByte(0x09B), GB_ISK11_ItemSocket1 = GameByte(0x09C), ///< currently stored itemID (invalid for itemIDs > 0xFF) GB_ISK11_ItemSocket2 = GameByte(0x09D), ///< currently stored itemID (invalid for itemIDs > 0xFF) GB_ISK11_ItemSocket3 = GameByte(0x09E), ///< currently stored itemID (invalid for itemIDs > 0xFF) GB_ISK11_ItemSocket4 = GameByte(0x09F), ///< currently stored itemID (invalid for itemIDs > 0xFF) GB_ISK11_ItemSocket5 = GameByte(0x0A0), ///< currently stored itemID (invalid for itemIDs > 0xFF) - GB_Unused_ISK_05 = GameByte(0x0A1), - GB_Unused_ISK_06 = GameByte(0x0A2), - GB_Unused_ISK_07 = GameByte(0x0A3), - GB_Unused_ISK_08 = GameByte(0x0A4), - GB_Unused_ISK_09 = GameByte(0x0A5), - GB_Unused_ISK_0A = GameByte(0x0A6), - GB_Unused_ISK_0B = GameByte(0x0A7), - GB_Unused_ISK_0C = GameByte(0x0A8), - GB_Unused_ISK_0D = GameByte(0x0A9), - GB_Unused_ISK_0E = GameByte(0x0AA), - GB_MIM_CurrentMapID = GameByte(0x0AB), - GB_Unused_MIM_01 = GameByte(0x0AC), - GB_Unused_MIM_02 = GameByte(0x0AD), - GB_Unused_MIM_03 = GameByte(0x0AE), - GB_Unused_MIM_04 = GameByte(0x0AF), - GB_Unused_MIM_05 = GameByte(0x0B0), - GB_Unused_MIM_06 = GameByte(0x0B1), - GB_Unused_MIM_07 = GameByte(0x0B2), - GB_Unused_MIM_08 = GameByte(0x0B3), - GB_Unused_MIM_09 = GameByte(0x0B4), - GB_Unused_MIM_0A = GameByte(0x0B5), + GB_Unused_ISK_05 = GameByte(0x0A1), + GB_Unused_ISK_06 = GameByte(0x0A2), + GB_Unused_ISK_07 = GameByte(0x0A3), + GB_Unused_ISK_08 = GameByte(0x0A4), + GB_Unused_ISK_09 = GameByte(0x0A5), + GB_Unused_ISK_0A = GameByte(0x0A6), + GB_Unused_ISK_0B = GameByte(0x0A7), + GB_Unused_ISK_0C = GameByte(0x0A8), + GB_Unused_ISK_0D = GameByte(0x0A9), + GB_Unused_ISK_0E = GameByte(0x0AA), + GB_MIM_CurrentMapID = GameByte(0x0AB), + GB_Unused_MIM_01 = GameByte(0x0AC), + GB_Unused_MIM_02 = GameByte(0x0AD), + GB_Unused_MIM_03 = GameByte(0x0AE), + GB_Unused_MIM_04 = GameByte(0x0AF), + GB_Unused_MIM_05 = GameByte(0x0B0), + GB_Unused_MIM_06 = GameByte(0x0B1), + GB_Unused_MIM_07 = GameByte(0x0B2), + GB_Unused_MIM_08 = GameByte(0x0B3), + GB_Unused_MIM_09 = GameByte(0x0B4), + GB_Unused_MIM_0A = GameByte(0x0B5), GB_OBK07_SelectedRecord = GameByte(0x0B6), ///< seems there were more than one at some point - GB_Unused_OBK_01 = GameByte(0x0B7), - GB_Unused_OBK_02 = GameByte(0x0B8), - GB_Unused_OBK_03 = GameByte(0x0B9), - GB_Unused_OBK_04 = GameByte(0x0BA), - GB_Unused_OBK_05 = GameByte(0x0BB), - GB_Unused_OBK_06 = GameByte(0x0BC), - GB_Unused_OBK_07 = GameByte(0x0BD), - GB_Unused_OBK_08 = GameByte(0x0BE), - GB_Unused_OBK_09 = GameByte(0x0BF), - GB_Unused_OBK_0A = GameByte(0x0C0), - GB_Unused_ARN_00 = GameByte(0x0C1), - GB_Unused_ARN_01 = GameByte(0x0C2), - GB_Unused_ARN_02 = GameByte(0x0C3), - GB_Unused_ARN_03 = GameByte(0x0C4), - GB_Unused_ARN_04 = GameByte(0x0C5), - GB_Unused_ARN_05 = GameByte(0x0C6), - GB_Unused_ARN_06 = GameByte(0x0C7), - GB_Unused_ARN_07 = GameByte(0x0C8), - GB_Unused_ARN_08 = GameByte(0x0C9), - GB_Unused_ARN_09 = GameByte(0x0CA), + GB_Unused_OBK_01 = GameByte(0x0B7), + GB_Unused_OBK_02 = GameByte(0x0B8), + GB_Unused_OBK_03 = GameByte(0x0B9), + GB_Unused_OBK_04 = GameByte(0x0BA), + GB_Unused_OBK_05 = GameByte(0x0BB), + GB_Unused_OBK_06 = GameByte(0x0BC), + GB_Unused_OBK_07 = GameByte(0x0BD), + GB_Unused_OBK_08 = GameByte(0x0BE), + GB_Unused_OBK_09 = GameByte(0x0BF), + GB_Unused_OBK_0A = GameByte(0x0C0), + GB_Unused_ARN_00 = GameByte(0x0C1), + GB_Unused_ARN_01 = GameByte(0x0C2), + GB_Unused_ARN_02 = GameByte(0x0C3), + GB_Unused_ARN_03 = GameByte(0x0C4), + GB_Unused_ARN_04 = GameByte(0x0C5), + GB_Unused_ARN_05 = GameByte(0x0C6), + GB_Unused_ARN_06 = GameByte(0x0C7), + GB_Unused_ARN_07 = GameByte(0x0C8), + GB_Unused_ARN_08 = GameByte(0x0C9), + GB_Unused_ARN_09 = GameByte(0x0CA), GB_ARN_Tubba_MapID = GameByte(0x0CB), ///< current map ID for Tubba's location in his manor - GB_Unused_DGB_01 = GameByte(0x0CC), - GB_Unused_DGB_02 = GameByte(0x0CD), - GB_Unused_DGB_03 = GameByte(0x0CE), - GB_Unused_DGB_04 = GameByte(0x0CF), - GB_Unused_DGB_05 = GameByte(0x0D0), - GB_Unused_DGB_06 = GameByte(0x0D1), - GB_Unused_DGB_07 = GameByte(0x0D2), - GB_Unused_DGB_08 = GameByte(0x0D3), - GB_Unused_DGB_09 = GameByte(0x0D4), - GB_Unused_DGB_0A = GameByte(0x0D5), - GB_Unused_OMO_00 = GameByte(0x0D6), - GB_OMO_TrainDestination = GameByte(0x0D7), - GB_OMO_PeachChoice1 = GameByte(0x0D8), - GB_OMO_PeachChoice2 = GameByte(0x0D9), - GB_OMO_PeachChoice3 = GameByte(0x0DA), - GB_Unused_OMO_05 = GameByte(0x0DB), - GB_Unused_OMO_06 = GameByte(0x0DC), - GB_Unused_OMO_07 = GameByte(0x0DD), - GB_Unused_OMO_08 = GameByte(0x0DE), - GB_Unused_OMO_09 = GameByte(0x0DF), - GB_Unused_OMO_0A = GameByte(0x0E0), - GB_Unused_OMO_0B = GameByte(0x0E1), - GB_Unused_OMO_0C = GameByte(0x0E2), - GB_Unused_OMO_0D = GameByte(0x0E3), - GB_Unused_OMO_0E = GameByte(0x0E4), - GB_Unused_JAN_00 = GameByte(0x0E5), - GB_Unused_JAN_01 = GameByte(0x0E6), - GB_Unused_JAN_02 = GameByte(0x0E7), - GB_Unused_JAN_03 = GameByte(0x0E8), - GB_Unused_JAN_04 = GameByte(0x0E9), - GB_Unused_JAN_05 = GameByte(0x0EA), - GB_Unused_JAN_06 = GameByte(0x0EB), - GB_Unused_JAN_07 = GameByte(0x0EC), - GB_Unused_JAN_08 = GameByte(0x0ED), - GB_Unused_JAN_09 = GameByte(0x0EE), - GB_Unused_KZN_00 = GameByte(0x0EF), - GB_Unused_KZN_01 = GameByte(0x0F0), - GB_Unused_KZN_02 = GameByte(0x0F1), - GB_Unused_KZN_03 = GameByte(0x0F2), - GB_Unused_KZN_04 = GameByte(0x0F3), - GB_Unused_KZN_05 = GameByte(0x0F4), - GB_Unused_KZN_06 = GameByte(0x0F5), - GB_Unused_KZN_07 = GameByte(0x0F6), - GB_Unused_KZN_08 = GameByte(0x0F7), - GB_Unused_KZN_09 = GameByte(0x0F8), - GB_Unused_FLO_00 = GameByte(0x0F9), - GB_Unused_FLO_01 = GameByte(0x0FA), - GB_Unused_FLO_02 = GameByte(0x0FB), - GB_FLO18_MachineDamage_Left = GameByte(0x0FC), - GB_FLO18_MachineDamage_Right = GameByte(0x0FD), - GB_Unused_FLO_05 = GameByte(0x0FE), - GB_Unused_FLO_06 = GameByte(0x0FF), - GB_Unused_FLO_07 = GameByte(0x100), - GB_Unused_FLO_08 = GameByte(0x101), - GB_Unused_FLO_09 = GameByte(0x102), - GB_Unused_FLO_0A = GameByte(0x103), - GB_Unused_FLO_0B = GameByte(0x104), - GB_Unused_FLO_0C = GameByte(0x105), - GB_Unused_FLO_0D = GameByte(0x106), - GB_Unused_FLO_0E = GameByte(0x107), + GB_Unused_DGB_01 = GameByte(0x0CC), + GB_Unused_DGB_02 = GameByte(0x0CD), + GB_Unused_DGB_03 = GameByte(0x0CE), + GB_Unused_DGB_04 = GameByte(0x0CF), + GB_Unused_DGB_05 = GameByte(0x0D0), + GB_Unused_DGB_06 = GameByte(0x0D1), + GB_Unused_DGB_07 = GameByte(0x0D2), + GB_Unused_DGB_08 = GameByte(0x0D3), + GB_Unused_DGB_09 = GameByte(0x0D4), + GB_Unused_DGB_0A = GameByte(0x0D5), + GB_Unused_OMO_00 = GameByte(0x0D6), + GB_OMO_TrainDestination = GameByte(0x0D7), + GB_OMO_PeachChoice1 = GameByte(0x0D8), + GB_OMO_PeachChoice2 = GameByte(0x0D9), + GB_OMO_PeachChoice3 = GameByte(0x0DA), + GB_Unused_OMO_05 = GameByte(0x0DB), + GB_Unused_OMO_06 = GameByte(0x0DC), + GB_Unused_OMO_07 = GameByte(0x0DD), + GB_Unused_OMO_08 = GameByte(0x0DE), + GB_Unused_OMO_09 = GameByte(0x0DF), + GB_Unused_OMO_0A = GameByte(0x0E0), + GB_Unused_OMO_0B = GameByte(0x0E1), + GB_Unused_OMO_0C = GameByte(0x0E2), + GB_Unused_OMO_0D = GameByte(0x0E3), + GB_Unused_OMO_0E = GameByte(0x0E4), + GB_Unused_JAN_00 = GameByte(0x0E5), + GB_Unused_JAN_01 = GameByte(0x0E6), + GB_Unused_JAN_02 = GameByte(0x0E7), + GB_Unused_JAN_03 = GameByte(0x0E8), + GB_Unused_JAN_04 = GameByte(0x0E9), + GB_Unused_JAN_05 = GameByte(0x0EA), + GB_Unused_JAN_06 = GameByte(0x0EB), + GB_Unused_JAN_07 = GameByte(0x0EC), + GB_Unused_JAN_08 = GameByte(0x0ED), + GB_Unused_JAN_09 = GameByte(0x0EE), + GB_Unused_KZN_00 = GameByte(0x0EF), + GB_Unused_KZN_01 = GameByte(0x0F0), + GB_Unused_KZN_02 = GameByte(0x0F1), + GB_Unused_KZN_03 = GameByte(0x0F2), + GB_Unused_KZN_04 = GameByte(0x0F3), + GB_Unused_KZN_05 = GameByte(0x0F4), + GB_Unused_KZN_06 = GameByte(0x0F5), + GB_Unused_KZN_07 = GameByte(0x0F6), + GB_Unused_KZN_08 = GameByte(0x0F7), + GB_Unused_KZN_09 = GameByte(0x0F8), + GB_Unused_FLO_00 = GameByte(0x0F9), + GB_Unused_FLO_01 = GameByte(0x0FA), + GB_Unused_FLO_02 = GameByte(0x0FB), + GB_FLO18_MachineDamage_Left = GameByte(0x0FC), + GB_FLO18_MachineDamage_Right = GameByte(0x0FD), + GB_Unused_FLO_05 = GameByte(0x0FE), + GB_Unused_FLO_06 = GameByte(0x0FF), + GB_Unused_FLO_07 = GameByte(0x100), + GB_Unused_FLO_08 = GameByte(0x101), + GB_Unused_FLO_09 = GameByte(0x102), + GB_Unused_FLO_0A = GameByte(0x103), + GB_Unused_FLO_0B = GameByte(0x104), + GB_Unused_FLO_0C = GameByte(0x105), + GB_Unused_FLO_0D = GameByte(0x106), + GB_Unused_FLO_0E = GameByte(0x107), GB_SAM09_ItemSocket1_LowerByte = GameByte(0x108), ///< currently stored itemID (invalid for itemIDs > 0xFF) GB_SAM09_ItemSocket1_UpperByte = GameByte(0x109), ///< currently stored itemID (invalid for itemIDs > 0xFF) GB_SAM09_ItemSocket2_LowerByte = GameByte(0x10A), ///< currently stored itemID (invalid for itemIDs > 0xFF) GB_SAM09_ItemSocket2_UpperByte = GameByte(0x10B), ///< currently stored itemID (invalid for itemIDs > 0xFF) GB_SAM09_ItemSocket3_LowerByte = GameByte(0x10C), ///< currently stored itemID (invalid for itemIDs > 0xFF) GB_SAM09_ItemSocket3_UpperByte = GameByte(0x10D), ///< currently stored itemID (invalid for itemIDs > 0xFF) - GB_SAM11_FrozenPondDamage = GameByte(0x10E), - GB_Unused_SAM_07 = GameByte(0x10F), - GB_Unused_SAM_08 = GameByte(0x110), - GB_Unused_SAM_09 = GameByte(0x111), - GB_Unused_SAM_0A = GameByte(0x112), - GB_Unused_SAM_0B = GameByte(0x113), - GB_Unused_SAM_0C = GameByte(0x114), - GB_Unused_SAM_0D = GameByte(0x115), - GB_Unused_SAM_0E = GameByte(0x116), - GB_Unused_SAM_0F = GameByte(0x117), - GB_Unused_SAM_10 = GameByte(0x118), - GB_Unused_SAM_11 = GameByte(0x119), - GB_Unused_SAM_12 = GameByte(0x11A), - GB_Unused_PRA_00 = GameByte(0x11B), - GB_PRA18_ClubbasDefeated = GameByte(0x11C), + GB_SAM11_FrozenPondDamage = GameByte(0x10E), + GB_Unused_SAM_07 = GameByte(0x10F), + GB_Unused_SAM_08 = GameByte(0x110), + GB_Unused_SAM_09 = GameByte(0x111), + GB_Unused_SAM_0A = GameByte(0x112), + GB_Unused_SAM_0B = GameByte(0x113), + GB_Unused_SAM_0C = GameByte(0x114), + GB_Unused_SAM_0D = GameByte(0x115), + GB_Unused_SAM_0E = GameByte(0x116), + GB_Unused_SAM_0F = GameByte(0x117), + GB_Unused_SAM_10 = GameByte(0x118), + GB_Unused_SAM_11 = GameByte(0x119), + GB_Unused_SAM_12 = GameByte(0x11A), + GB_Unused_PRA_00 = GameByte(0x11B), + GB_PRA18_ClubbasDefeated = GameByte(0x11C), GB_PRA19_TutorialState = GameByte(0x11D), ///< 0/1/2 for the action performed by the reflection GB_PRA_TwinStatueState = GameByte(0x11E), ///< 0/1/2 - GB_Unused_PRA_04 = GameByte(0x11F), - GB_Unused_PRA_05 = GameByte(0x120), - GB_Unused_PRA_06 = GameByte(0x121), - GB_Unused_PRA_07 = GameByte(0x122), - GB_Unused_PRA_08 = GameByte(0x123), - GB_Unused_PRA_09 = GameByte(0x124), - GB_Unused_PRA_0A = GameByte(0x125), - GB_Unused_PRA_0B = GameByte(0x126), - GB_Unused_PRA_0C = GameByte(0x127), - GB_Unused_PRA_0D = GameByte(0x128), - GB_KPA_WaterLevel = GameByte(0x129), + GB_Unused_PRA_04 = GameByte(0x11F), + GB_Unused_PRA_05 = GameByte(0x120), + GB_Unused_PRA_06 = GameByte(0x121), + GB_Unused_PRA_07 = GameByte(0x122), + GB_Unused_PRA_08 = GameByte(0x123), + GB_Unused_PRA_09 = GameByte(0x124), + GB_Unused_PRA_0A = GameByte(0x125), + GB_Unused_PRA_0B = GameByte(0x126), + GB_Unused_PRA_0C = GameByte(0x127), + GB_Unused_PRA_0D = GameByte(0x128), + GB_KPA_WaterLevel = GameByte(0x129), GB_KPA81_BowserDoorState = GameByte(0x12A), ///< 0/1/2 GB_KPA82_BowserDoorState = GameByte(0x12B), ///< 0/1 GB_KPA83_BowserDoorState = GameByte(0x12C), ///< 0/1 - GB_KPA111_StatuePosition = GameByte(0x12D), - GB_KPA113_StatuePosition = GameByte(0x12E), - GB_KPA115_StatuePosition = GameByte(0x12F), - GB_KPA04_StatuePosition = GameByte(0x130), - GB_Unused_KPA_08 = GameByte(0x131), - GB_Unused_KPA_09 = GameByte(0x132), - GB_Unused_KPA_0A = GameByte(0x133), - GB_Unused_KPA_0B = GameByte(0x134), - GB_Unused_KPA_0C = GameByte(0x135), - GB_Unused_KPA_0D = GameByte(0x136), - GB_Unused_KPA_0E = GameByte(0x137), - GB_Unused_KPA_0F = GameByte(0x138), - GB_Unused_KPA_10 = GameByte(0x139), - GB_Unused_KPA_11 = GameByte(0x13A), - GB_Unused_OSR_00 = GameByte(0x13B), - GB_Unused_OSR_01 = GameByte(0x13C), - GB_Unused_OSR_02 = GameByte(0x13D), - GB_Unused_OSR_03 = GameByte(0x13E), - GB_Unused_OSR_04 = GameByte(0x13F), - GB_Unused_OSR_05 = GameByte(0x140), - GB_Unused_OSR_06 = GameByte(0x141), - GB_Unused_OSR_07 = GameByte(0x142), - GB_Unused_OSR_08 = GameByte(0x143), - GB_Unused_OSR_09 = GameByte(0x144), - GB_Unused_END_00 = GameByte(0x145), - GB_Unused_END_01 = GameByte(0x146), - GB_Unused_END_02 = GameByte(0x147), - GB_Unused_END_03 = GameByte(0x148), - GB_Unused_END_04 = GameByte(0x149), - GB_Unused_END_05 = GameByte(0x14A), - GB_Unused_END_06 = GameByte(0x14B), - GB_Unused_END_07 = GameByte(0x14C), - GB_Unused_END_08 = GameByte(0x14D), - GB_Unused_END_09 = GameByte(0x14E), - GB_Unused_END_0A = GameByte(0x14F), - GB_Unused_BAT_00 = GameByte(0x150), - GB_Unused_BAT_01 = GameByte(0x151), - GB_Unused_BAT_02 = GameByte(0x152), - GB_Unused_BAT_03 = GameByte(0x153), - GB_Unused_BAT_04 = GameByte(0x154), - GB_Unused_BAT_05 = GameByte(0x155), - GB_Unused_BAT_06 = GameByte(0x156), - GB_Unused_BAT_07 = GameByte(0x157), - GB_Unused_BAT_08 = GameByte(0x158), - GB_Unused_BAT_09 = GameByte(0x159), + GB_KPA111_StatuePosition = GameByte(0x12D), + GB_KPA113_StatuePosition = GameByte(0x12E), + GB_KPA115_StatuePosition = GameByte(0x12F), + GB_KPA04_StatuePosition = GameByte(0x130), + GB_Unused_KPA_08 = GameByte(0x131), + GB_Unused_KPA_09 = GameByte(0x132), + GB_Unused_KPA_0A = GameByte(0x133), + GB_Unused_KPA_0B = GameByte(0x134), + GB_Unused_KPA_0C = GameByte(0x135), + GB_Unused_KPA_0D = GameByte(0x136), + GB_Unused_KPA_0E = GameByte(0x137), + GB_Unused_KPA_0F = GameByte(0x138), + GB_Unused_KPA_10 = GameByte(0x139), + GB_Unused_KPA_11 = GameByte(0x13A), + GB_Unused_OSR_00 = GameByte(0x13B), + GB_Unused_OSR_01 = GameByte(0x13C), + GB_Unused_OSR_02 = GameByte(0x13D), + GB_Unused_OSR_03 = GameByte(0x13E), + GB_Unused_OSR_04 = GameByte(0x13F), + GB_Unused_OSR_05 = GameByte(0x140), + GB_Unused_OSR_06 = GameByte(0x141), + GB_Unused_OSR_07 = GameByte(0x142), + GB_Unused_OSR_08 = GameByte(0x143), + GB_Unused_OSR_09 = GameByte(0x144), + GB_Unused_END_00 = GameByte(0x145), + GB_Unused_END_01 = GameByte(0x146), + GB_Unused_END_02 = GameByte(0x147), + GB_Unused_END_03 = GameByte(0x148), + GB_Unused_END_04 = GameByte(0x149), + GB_Unused_END_05 = GameByte(0x14A), + GB_Unused_END_06 = GameByte(0x14B), + GB_Unused_END_07 = GameByte(0x14C), + GB_Unused_END_08 = GameByte(0x14D), + GB_Unused_END_09 = GameByte(0x14E), + GB_Unused_END_0A = GameByte(0x14F), + GB_Unused_BAT_00 = GameByte(0x150), + GB_Unused_BAT_01 = GameByte(0x151), + GB_Unused_BAT_02 = GameByte(0x152), + GB_Unused_BAT_03 = GameByte(0x153), + GB_Unused_BAT_04 = GameByte(0x154), + GB_Unused_BAT_05 = GameByte(0x155), + GB_Unused_BAT_06 = GameByte(0x156), + GB_Unused_BAT_07 = GameByte(0x157), + GB_Unused_BAT_08 = GameByte(0x158), + GB_Unused_BAT_09 = GameByte(0x159), GB_KootFavor_State = GameByte(0x15A), ///< 0 = none, 1 = rejected, 2 = accepted - GB_KootFavor_Completed = GameByte(0x15B), + GB_KootFavor_Completed = GameByte(0x15B), GB_KootFavor_Current = GameByte(0x15C), ///< 0 if none active - GB_MAC02_CurrentBulletin = GameByte(0x15D), + GB_MAC02_CurrentBulletin = GameByte(0x15D), GB_ChuckQuizmo_Town = GameByte(0x15E), ///< 0-6, doesnt correspond to areaID GB_ChuckQuizmo_Map = GameByte(0x15F), ///< doesnt correspond to mapID - GB_CompletedQuizzes = GameByte(0x160), - GB_HOS06_Merlow_PurchaseCount = GameByte(0x161), - GB_TradingEvent_Count = GameByte(0x162), - GB_Unused_NPC_09 = GameByte(0x163), - GB_Unused_NPC_0A = GameByte(0x164), - GB_Unused_NPC_0B = GameByte(0x165), - GB_Unused_NPC_0C = GameByte(0x166), - GB_Unused_NPC_0D = GameByte(0x167), - GB_Unused_NPC_0E = GameByte(0x168), - GB_Unused_NPC_0F = GameByte(0x169), - GB_Unused_NPC_10 = GameByte(0x16A), - GB_Unused_NPC_11 = GameByte(0x16B), - GB_Unused_NPC_12 = GameByte(0x16C), - GB_Tattles_00 = GameByte(0x16D), - GB_Tattles_01 = GameByte(0x16E), - GB_Tattles_02 = GameByte(0x16F), - GB_Tattles_03 = GameByte(0x170), - GB_Tattles_04 = GameByte(0x171), - GB_Tattles_05 = GameByte(0x172), - GB_Tattles_06 = GameByte(0x173), - GB_Tattles_07 = GameByte(0x174), - GB_Tattles_08 = GameByte(0x175), - GB_Tattles_09 = GameByte(0x176), - GB_Tattles_0A = GameByte(0x177), - GB_Tattles_0B = GameByte(0x178), - GB_Tattles_0C = GameByte(0x179), - GB_Tattles_0D = GameByte(0x17A), - GB_Tattles_0E = GameByte(0x17B), - GB_Tattles_0F = GameByte(0x17C), - GB_Tattles_10 = GameByte(0x17D), - GB_Tattles_11 = GameByte(0x17E), - GB_Tattles_12 = GameByte(0x17F), - GB_Tattles_13 = GameByte(0x180), - GB_Tattles_14 = GameByte(0x181), - GB_Tattles_15 = GameByte(0x182), - GB_Tattles_16 = GameByte(0x183), - GB_Tattles_17 = GameByte(0x184), - GB_Tattles_18 = GameByte(0x185), - GB_Tattles_19 = GameByte(0x186), - GB_Tattles_1A = GameByte(0x187), - GB_Tattles_1B = GameByte(0x188), - GB_Tattles_1C = GameByte(0x189), + GB_CompletedQuizzes = GameByte(0x160), + GB_HOS06_Merlow_PurchaseCount = GameByte(0x161), + GB_TradingEvent_Count = GameByte(0x162), + GB_Unused_NPC_09 = GameByte(0x163), + GB_Unused_NPC_0A = GameByte(0x164), + GB_Unused_NPC_0B = GameByte(0x165), + GB_Unused_NPC_0C = GameByte(0x166), + GB_Unused_NPC_0D = GameByte(0x167), + GB_Unused_NPC_0E = GameByte(0x168), + GB_Unused_NPC_0F = GameByte(0x169), + GB_Unused_NPC_10 = GameByte(0x16A), + GB_Unused_NPC_11 = GameByte(0x16B), + GB_Unused_NPC_12 = GameByte(0x16C), + GB_Tattles_00 = GameByte(0x16D), + GB_Tattles_01 = GameByte(0x16E), + GB_Tattles_02 = GameByte(0x16F), + GB_Tattles_03 = GameByte(0x170), + GB_Tattles_04 = GameByte(0x171), + GB_Tattles_05 = GameByte(0x172), + GB_Tattles_06 = GameByte(0x173), + GB_Tattles_07 = GameByte(0x174), + GB_Tattles_08 = GameByte(0x175), + GB_Tattles_09 = GameByte(0x176), + GB_Tattles_0A = GameByte(0x177), + GB_Tattles_0B = GameByte(0x178), + GB_Tattles_0C = GameByte(0x179), + GB_Tattles_0D = GameByte(0x17A), + GB_Tattles_0E = GameByte(0x17B), + GB_Tattles_0F = GameByte(0x17C), + GB_Tattles_10 = GameByte(0x17D), + GB_Tattles_11 = GameByte(0x17E), + GB_Tattles_12 = GameByte(0x17F), + GB_Tattles_13 = GameByte(0x180), + GB_Tattles_14 = GameByte(0x181), + GB_Tattles_15 = GameByte(0x182), + GB_Tattles_16 = GameByte(0x183), + GB_Tattles_17 = GameByte(0x184), + GB_Tattles_18 = GameByte(0x185), + GB_Tattles_19 = GameByte(0x186), + GB_Tattles_1A = GameByte(0x187), + GB_Tattles_1B = GameByte(0x188), + GB_Tattles_1C = GameByte(0x189), GB_FinalBowserHP = GameByte(0x18A), ///< Used by final bowser to remember HP between first and second phase - GB_Unused_BTL_1E = GameByte(0x18B), - GB_Unused_BTL_1F = GameByte(0x18C), - GB_Unused_BTL_20 = GameByte(0x18D), - GB_Unused_BTL_21 = GameByte(0x18E), - GB_Unused_BTL_22 = GameByte(0x18F), - GB_Unused_BTL_23 = GameByte(0x190), - GB_Unused_BTL_24 = GameByte(0x191), - GB_Unused_BTL_25 = GameByte(0x192), - GB_Unused_BTL_26 = GameByte(0x193), - GB_Unused_BTL_27 = GameByte(0x194), - GB_Unused_FBTL_00 = GameByte(0x195), - GB_Unused_FBTL_01 = GameByte(0x196), - GB_Unused_FBTL_02 = GameByte(0x197), - GB_Unused_FBTL_03 = GameByte(0x198), - GB_Unused_FBTL_04 = GameByte(0x199), - GB_Unused_FBTL_05 = GameByte(0x19A), - GB_Unused_FBTL_06 = GameByte(0x19B), - GB_Unused_FBTL_07 = GameByte(0x19C), - GB_Unused_FBTL_08 = GameByte(0x19D), - GB_Unused_FBTL_09 = GameByte(0x19E), - GB_Unused_DOKAN_00 = GameByte(0x19F), - GB_Unused_DOKAN_01 = GameByte(0x1A0), - GB_Unused_DOKAN_02 = GameByte(0x1A1), - GB_Unused_DOKAN_03 = GameByte(0x1A2), - GB_Unused_DOKAN_04 = GameByte(0x1A3), - GB_Unused_DOKAN_05 = GameByte(0x1A4), - GB_Unused_DOKAN_06 = GameByte(0x1A5), - GB_Unused_DOKAN_07 = GameByte(0x1A6), - GB_Unused_DOKAN_08 = GameByte(0x1A7), - GB_Unused_DOKAN_09 = GameByte(0x1A8), - GB_WorldLocation = GameByte(0x1A9), - GB_Unused_MAP_01 = GameByte(0x1AA), - GB_Unused_MAP_02 = GameByte(0x1AB), - GB_Unused_MAP_03 = GameByte(0x1AC), - GB_Unused_MAP_04 = GameByte(0x1AD), - GB_Unused_MAP_05 = GameByte(0x1AE), - GB_Unused_MAP_06 = GameByte(0x1AF), - GB_Unused_MAP_07 = GameByte(0x1B0), - GB_Unused_MAP_08 = GameByte(0x1B1), - GB_Unused_MAP_09 = GameByte(0x1B2), - GB_Unused_MAP_0A = GameByte(0x1B3), - GB_Unused_1B4 = GameByte(0x1B4), - GB_Unused_1B5 = GameByte(0x1B5), - GB_Unused_1B6 = GameByte(0x1B6), - GB_Unused_1B7 = GameByte(0x1B7), - GB_Unused_1B8 = GameByte(0x1B8), - GB_Unused_1B9 = GameByte(0x1B9), - GB_Unused_1BA = GameByte(0x1BA), - GB_Unused_1BB = GameByte(0x1BB), - GB_Unused_1BC = GameByte(0x1BC), - GB_Unused_1BD = GameByte(0x1BD), - GB_Unused_1BE = GameByte(0x1BE), - GB_Unused_1BF = GameByte(0x1BF), - GB_Unused_1C0 = GameByte(0x1C0), - GB_Unused_1C1 = GameByte(0x1C1), - GB_Unused_1C2 = GameByte(0x1C2), - GB_Unused_1C3 = GameByte(0x1C3), - GB_Unused_1C4 = GameByte(0x1C4), - GB_Unused_1C5 = GameByte(0x1C5), - GB_Unused_1C6 = GameByte(0x1C6), - GB_Unused_1C7 = GameByte(0x1C7), - GB_Unused_1C8 = GameByte(0x1C8), - GB_Unused_1C9 = GameByte(0x1C9), - GB_Unused_1CA = GameByte(0x1CA), - GB_Unused_1CB = GameByte(0x1CB), - GB_Unused_1CC = GameByte(0x1CC), - GB_Unused_1CD = GameByte(0x1CD), - GB_Unused_1CE = GameByte(0x1CE), - GB_Unused_1CF = GameByte(0x1CF), - GB_Unused_1D0 = GameByte(0x1D0), - GB_Unused_1D1 = GameByte(0x1D1), - GB_Unused_1D2 = GameByte(0x1D2), - GB_Unused_1D3 = GameByte(0x1D3), - GB_Unused_1D4 = GameByte(0x1D4), - GB_Unused_1D5 = GameByte(0x1D5), - GB_Unused_1D6 = GameByte(0x1D6), - GB_Unused_1D7 = GameByte(0x1D7), - GB_Unused_1D8 = GameByte(0x1D8), - GB_Unused_1D9 = GameByte(0x1D9), - GB_Unused_1DA = GameByte(0x1DA), - GB_Unused_1DB = GameByte(0x1DB), - GB_Unused_1DC = GameByte(0x1DC), - GB_Unused_1DD = GameByte(0x1DD), - GB_Unused_1DE = GameByte(0x1DE), - GB_Unused_1DF = GameByte(0x1DF), - GB_Unused_1E0 = GameByte(0x1E0), - GB_Unused_1E1 = GameByte(0x1E1), - GB_Unused_1E2 = GameByte(0x1E2), - GB_Unused_1E3 = GameByte(0x1E3), - GB_Unused_1E4 = GameByte(0x1E4), - GB_Unused_1E5 = GameByte(0x1E5), - GB_Unused_1E6 = GameByte(0x1E6), - GB_Unused_1E7 = GameByte(0x1E7), - GB_Unused_1E8 = GameByte(0x1E8), - GB_Unused_1E9 = GameByte(0x1E9), - GB_Unused_1EA = GameByte(0x1EA), - GB_Unused_1EB = GameByte(0x1EB), - GB_Unused_1EC = GameByte(0x1EC), - GB_Unused_1ED = GameByte(0x1ED), - GB_Unused_1EE = GameByte(0x1EE), - GB_Unused_1EF = GameByte(0x1EF), - GB_Unused_1F0 = GameByte(0x1F0), - GB_Unused_1F1 = GameByte(0x1F1), - GB_Unused_1F2 = GameByte(0x1F2), - GB_Unused_1F3 = GameByte(0x1F3), - GB_Unused_1F4 = GameByte(0x1F4), - GB_Unused_1F5 = GameByte(0x1F5), - GB_Unused_1F6 = GameByte(0x1F6), - GB_Unused_1F7 = GameByte(0x1F7), - GB_Unused_1F8 = GameByte(0x1F8), - GB_Unused_1F9 = GameByte(0x1F9), - GB_Unused_1FA = GameByte(0x1FA), - GB_Unused_1FB = GameByte(0x1FB), - GB_Unused_1FC = GameByte(0x1FC), - GB_Unused_1FD = GameByte(0x1FD), - GB_Unused_1FE = GameByte(0x1FE), + GB_Unused_BTL_1E = GameByte(0x18B), + GB_Unused_BTL_1F = GameByte(0x18C), + GB_Unused_BTL_20 = GameByte(0x18D), + GB_Unused_BTL_21 = GameByte(0x18E), + GB_Unused_BTL_22 = GameByte(0x18F), + GB_Unused_BTL_23 = GameByte(0x190), + GB_Unused_BTL_24 = GameByte(0x191), + GB_Unused_BTL_25 = GameByte(0x192), + GB_Unused_BTL_26 = GameByte(0x193), + GB_Unused_BTL_27 = GameByte(0x194), + GB_Unused_FBTL_00 = GameByte(0x195), + GB_Unused_FBTL_01 = GameByte(0x196), + GB_Unused_FBTL_02 = GameByte(0x197), + GB_Unused_FBTL_03 = GameByte(0x198), + GB_Unused_FBTL_04 = GameByte(0x199), + GB_Unused_FBTL_05 = GameByte(0x19A), + GB_Unused_FBTL_06 = GameByte(0x19B), + GB_Unused_FBTL_07 = GameByte(0x19C), + GB_Unused_FBTL_08 = GameByte(0x19D), + GB_Unused_FBTL_09 = GameByte(0x19E), + GB_Unused_DOKAN_00 = GameByte(0x19F), + GB_Unused_DOKAN_01 = GameByte(0x1A0), + GB_Unused_DOKAN_02 = GameByte(0x1A1), + GB_Unused_DOKAN_03 = GameByte(0x1A2), + GB_Unused_DOKAN_04 = GameByte(0x1A3), + GB_Unused_DOKAN_05 = GameByte(0x1A4), + GB_Unused_DOKAN_06 = GameByte(0x1A5), + GB_Unused_DOKAN_07 = GameByte(0x1A6), + GB_Unused_DOKAN_08 = GameByte(0x1A7), + GB_Unused_DOKAN_09 = GameByte(0x1A8), + GB_WorldLocation = GameByte(0x1A9), + GB_Unused_MAP_01 = GameByte(0x1AA), + GB_Unused_MAP_02 = GameByte(0x1AB), + GB_Unused_MAP_03 = GameByte(0x1AC), + GB_Unused_MAP_04 = GameByte(0x1AD), + GB_Unused_MAP_05 = GameByte(0x1AE), + GB_Unused_MAP_06 = GameByte(0x1AF), + GB_Unused_MAP_07 = GameByte(0x1B0), + GB_Unused_MAP_08 = GameByte(0x1B1), + GB_Unused_MAP_09 = GameByte(0x1B2), + GB_Unused_MAP_0A = GameByte(0x1B3), + GB_Unused_1B4 = GameByte(0x1B4), + GB_Unused_1B5 = GameByte(0x1B5), + GB_Unused_1B6 = GameByte(0x1B6), + GB_Unused_1B7 = GameByte(0x1B7), + GB_Unused_1B8 = GameByte(0x1B8), + GB_Unused_1B9 = GameByte(0x1B9), + GB_Unused_1BA = GameByte(0x1BA), + GB_Unused_1BB = GameByte(0x1BB), + GB_Unused_1BC = GameByte(0x1BC), + GB_Unused_1BD = GameByte(0x1BD), + GB_Unused_1BE = GameByte(0x1BE), + GB_Unused_1BF = GameByte(0x1BF), + GB_Unused_1C0 = GameByte(0x1C0), + GB_Unused_1C1 = GameByte(0x1C1), + GB_Unused_1C2 = GameByte(0x1C2), + GB_Unused_1C3 = GameByte(0x1C3), + GB_Unused_1C4 = GameByte(0x1C4), + GB_Unused_1C5 = GameByte(0x1C5), + GB_Unused_1C6 = GameByte(0x1C6), + GB_Unused_1C7 = GameByte(0x1C7), + GB_Unused_1C8 = GameByte(0x1C8), + GB_Unused_1C9 = GameByte(0x1C9), + GB_Unused_1CA = GameByte(0x1CA), + GB_Unused_1CB = GameByte(0x1CB), + GB_Unused_1CC = GameByte(0x1CC), + GB_Unused_1CD = GameByte(0x1CD), + GB_Unused_1CE = GameByte(0x1CE), + GB_Unused_1CF = GameByte(0x1CF), + GB_Unused_1D0 = GameByte(0x1D0), + GB_Unused_1D1 = GameByte(0x1D1), + GB_Unused_1D2 = GameByte(0x1D2), + GB_Unused_1D3 = GameByte(0x1D3), + GB_Unused_1D4 = GameByte(0x1D4), + GB_Unused_1D5 = GameByte(0x1D5), + GB_Unused_1D6 = GameByte(0x1D6), + GB_Unused_1D7 = GameByte(0x1D7), + GB_Unused_1D8 = GameByte(0x1D8), + GB_Unused_1D9 = GameByte(0x1D9), + GB_Unused_1DA = GameByte(0x1DA), + GB_Unused_1DB = GameByte(0x1DB), + GB_Unused_1DC = GameByte(0x1DC), + GB_Unused_1DD = GameByte(0x1DD), + GB_Unused_1DE = GameByte(0x1DE), + GB_Unused_1DF = GameByte(0x1DF), + GB_Unused_1E0 = GameByte(0x1E0), + GB_Unused_1E1 = GameByte(0x1E1), + GB_Unused_1E2 = GameByte(0x1E2), + GB_Unused_1E3 = GameByte(0x1E3), + GB_Unused_1E4 = GameByte(0x1E4), + GB_Unused_1E5 = GameByte(0x1E5), + GB_Unused_1E6 = GameByte(0x1E6), + GB_Unused_1E7 = GameByte(0x1E7), + GB_Unused_1E8 = GameByte(0x1E8), + GB_Unused_1E9 = GameByte(0x1E9), + GB_Unused_1EA = GameByte(0x1EA), + GB_Unused_1EB = GameByte(0x1EB), + GB_Unused_1EC = GameByte(0x1EC), + GB_Unused_1ED = GameByte(0x1ED), + GB_Unused_1EE = GameByte(0x1EE), + GB_Unused_1EF = GameByte(0x1EF), + GB_Unused_1F0 = GameByte(0x1F0), + GB_Unused_1F1 = GameByte(0x1F1), + GB_Unused_1F2 = GameByte(0x1F2), + GB_Unused_1F3 = GameByte(0x1F3), + GB_Unused_1F4 = GameByte(0x1F4), + GB_Unused_1F5 = GameByte(0x1F5), + GB_Unused_1F6 = GameByte(0x1F6), + GB_Unused_1F7 = GameByte(0x1F7), + GB_Unused_1F8 = GameByte(0x1F8), + GB_Unused_1F9 = GameByte(0x1F9), + GB_Unused_1FA = GameByte(0x1FA), + GB_Unused_1FB = GameByte(0x1FB), + GB_Unused_1FC = GameByte(0x1FC), + GB_Unused_1FD = GameByte(0x1FD), + GB_Unused_1FE = GameByte(0x1FE), GB_Unused_1FF = GameByte(0x1FF), }; diff --git a/include/stdlib/varargs.h b/include/stdlib/varargs.h index 410d06aac6..1aa047f3fc 100644 --- a/include/stdlib/varargs.h +++ b/include/stdlib/varargs.h @@ -65,7 +65,7 @@ #ifdef _ANSI_STDARG_H_ #define _VA_LIST_ #endif -#define _ANSI_STDARG_H_ +#define _ANSI_STDARG_H_ #undef va_alist #undef va_dcl diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c index 60346bdc04..87ae7f56df 100644 --- a/src/8a860_len_3f30.c +++ b/src/8a860_len_3f30.c @@ -1207,7 +1207,7 @@ void popup_menu_draw_menu_contents(s32* userData, s32 baseX, s32 baseY, s32 widt case POPUP_MENU_UPGRADE_PARTNER: for (j = 0; j < ARRAY_COUNT(D_80109890); j++) { id = PopupMenu_PartnerLevelHEID; - + if (gPopupMenu->enabled[i]) { hud_element_set_script(id, D_80109890[j]); } else { @@ -1233,13 +1233,13 @@ void popup_menu_draw_menu_contents(s32* userData, s32 baseX, s32 baseY, s32 widt y += LINE_HEIGHT; if (i == 0) { y += offset; - } + } } } x = baseX + 24; y = baseY + D_8010D658 + 8; - offset = 0; + offset = 0; if (gPopupMenu->popupType == POPUP_MENU_THROW_AWAY_ITEM) { y = baseY + D_8010D658 + 6; offset = 2; @@ -1321,7 +1321,7 @@ void popup_menu_draw_menu_contents(s32* userData, s32 baseX, s32 baseY, s32 widt } break; } - + v0 = (PopupMenu_SelectedIndex - PopupMenu_FirstDisplayIndex) * LINE_HEIGHT; x = baseX + 8; y = baseY + 9 + v0; @@ -1603,7 +1603,7 @@ void func_800F4D28(s32* userData, s32 x, s32 y) { } hud_element_draw_clipped(hudElement); - + hudElement = PopupMenu_TimesHEID; hud_element_set_render_pos(hudElement, x + 26, y + 11); hud_element_set_alpha(hudElement, PopupMenu_Alpha); diff --git a/src/battle/move/hammer/shell_crack.c b/src/battle/move/hammer/shell_crack.c index b70b6c122c..b64b07cc89 100644 --- a/src/battle/move/hammer/shell_crack.c +++ b/src/battle/move/hammer/shell_crack.c @@ -11,10 +11,10 @@ API_CALLABLE(func_802A10A4_77F2E4) { s32 i; for (i = 0; i < 20; i++) { - fx_floating_cloud_puff(0, - (playerActorState->goalPos.x + (f32) rand_int(30)) - 15.0f, - (playerActorState->goalPos.y + (f32) rand_int(20)) - 15.0f, - playerActorState->goalPos.z + 5.0f, 1.0f, 25); + fx_floating_cloud_puff(0, + (playerActorState->goalPos.x + (f32) rand_int(30)) - 15.0f, + (playerActorState->goalPos.y + (f32) rand_int(20)) - 15.0f, + playerActorState->goalPos.z + 5.0f, 1.0f, 25); } return ApiStatus_DONE2; diff --git a/src/battle/move/jump/demo_power_bounce.c b/src/battle/move/jump/demo_power_bounce.c index 6a585c955e..d04e6c0589 100644 --- a/src/battle/move/jump/demo_power_bounce.c +++ b/src/battle/move/jump/demo_power_bounce.c @@ -8,7 +8,7 @@ #include "battle/common/move/JumpSupport.inc.c" s32 N(DifficultyTable)[] = { - 7, 6, 5, 4, 3, 2, 1, 0 + 7, 6, 5, 4, 3, 2, 1, 0 }; s32 N(BaseHitChance) = 200; diff --git a/src/battle_cam.c b/src/battle_cam.c index 296c21f837..0406cda360 100644 --- a/src/battle_cam.c +++ b/src/battle_cam.c @@ -1529,7 +1529,7 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomLength = 200; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - + BattleCam_BoomZOffset = 15; BattleCam_BoomYaw = 0; preset = &CamPreset_F; diff --git a/src/common/SetAngleClamped.inc.c b/src/common/SetAngleClamped.inc.c index 9ac922f726..a48450c138 100644 --- a/src/common/SetAngleClamped.inc.c +++ b/src/common/SetAngleClamped.inc.c @@ -6,7 +6,7 @@ API_CALLABLE(N(SetAngleClamped)) { f32 x1 = evt_get_float_variable(script, *args++); f32 z1 = evt_get_float_variable(script, *args++); f32 x2 = evt_get_float_variable(script, *args++); - f32 z2 = evt_get_float_variable(script, *args++); + f32 z2 = evt_get_float_variable(script, *args++); f32 angle = clamp_angle(atan2(x1, z1, x2, z2)); evt_set_float_variable(script, var, angle); diff --git a/src/common/UnkActorPosFunc.inc.c b/src/common/UnkActorPosFunc.inc.c index dc72e0a093..7c9a771a46 100644 --- a/src/common/UnkActorPosFunc.inc.c +++ b/src/common/UnkActorPosFunc.inc.c @@ -16,7 +16,7 @@ API_CALLABLE(N(UnkActorPosFunc)) { } else { play_movement_dust_effects(1, actor->state.currentPos.x, actor->state.currentPos.y, actor->state.currentPos.z, actor->state.angle); } - + actorState->speed /= 1.5; actor->currentPos.x = actorState->currentPos.x; actor->currentPos.y = actorState->currentPos.y; diff --git a/src/common/UnkActorSizeFunc.inc.c b/src/common/UnkActorSizeFunc.inc.c index 24dec33f4e..2ed51267c6 100644 --- a/src/common/UnkActorSizeFunc.inc.c +++ b/src/common/UnkActorSizeFunc.inc.c @@ -21,7 +21,7 @@ API_CALLABLE(N(UnkActorSizeFunc)) { if (targetActorSizeY < targetActorSizeX) { targetActorLargerDimension = targetActorSizeX; } - + script->varTable[3] = targetActorLargerDimension + 126; return ApiStatus_DONE2; } diff --git a/src/effects/explosion.c b/src/effects/explosion.c index 2e45d6c9e3..e24b30698e 100644 --- a/src/effects/explosion.c +++ b/src/effects/explosion.c @@ -38,7 +38,7 @@ void explosion_main(s32 type, f32 x, f32 y, f32 z) { bpPtr->renderWorld = explosion_render; bpPtr->unk_14 = NULL; bpPtr->effectID = EFFECT_EXPLOSION; - + effect = shim_create_effect_instance(bpPtr); effect->numParts = numParts; diff --git a/src/effects/flower_splash.c b/src/effects/flower_splash.c index f3c2814be6..4a20c9669b 100644 --- a/src/effects/flower_splash.c +++ b/src/effects/flower_splash.c @@ -80,7 +80,7 @@ void flower_splash_main(f32 posX, f32 posY, f32 posZ, f32 angle) { part->scale.x = 1.0f; part->scale.y = 1.0f; part->scale.z = 1.0f; - + part->primAlpha = 255; part->timeLeft = 60; diff --git a/src/effects/flower_trail.c b/src/effects/flower_trail.c index d61fb276df..057998aaf0 100644 --- a/src/effects/flower_trail.c +++ b/src/effects/flower_trail.c @@ -72,7 +72,7 @@ void flower_trail_main(s32 triggeredByNpc, f32 posX, f32 posY, f32 posZ, f32 ang part->alive = TRUE; part->triggeredByNpc = triggeredByNpc; part->unk_7C = 0.0f; - + part->pos.x = posX; part->pos.y = posY; part->pos.z = posZ; diff --git a/src/effects/gather_energy_pink.c b/src/effects/gather_energy_pink.c index 8fb990441f..ee152b9743 100644 --- a/src/effects/gather_energy_pink.c +++ b/src/effects/gather_energy_pink.c @@ -36,7 +36,7 @@ void gather_energy_pink_main(s32 type, f32 posX, f32 posY, f32 posZ, f32 scale, effect->numParts = numParts; data = effect->data.gatherEnergyPink = shim_general_heap_malloc(sizeof(*data)); ASSERT (data != NULL); - + data->unk_00 = type; data->unk_28 = duration; data->unk_2C = 0; @@ -63,7 +63,7 @@ void gather_energy_pink_main(s32 type, f32 posX, f32 posY, f32 posZ, f32 scale, data->unk_50 = 0; data->unk_54 = 0; - + if (type == 1) { data->unk_3C = 96; data->unk_20 = scale; diff --git a/src/effects/ice_pillar.c b/src/effects/ice_pillar.c index 439064e9ce..27f7ccbad7 100644 --- a/src/effects/ice_pillar.c +++ b/src/effects/ice_pillar.c @@ -71,7 +71,7 @@ void ice_pillar_update(EffectInstance* effect) { s32 timeLeft; s32 lifeTime; s32 i; - + if (effect->flags & 0x10) { effect->flags &= ~0x10; data->timeLeft = 16; @@ -85,16 +85,16 @@ void ice_pillar_update(EffectInstance* effect) { if (data->timeLeft < 0) { shim_load_effect(EFFECT_ICE_SHARD); - + for (i = 0; i < 20; i++) { EffectInstance* iceShard; iceShard = ice_shard_main( - (i % 2) + 2, - (data->pos.x + shim_rand_int(20)) - 10.0f, - data->pos.y + (shim_rand_int(40) * data->scale), - data->pos.z + 3.0f, - (data->scale * ((shim_rand_int(10) * 0.7 * 0.1) + 0.3)), + (i % 2) + 2, + (data->pos.x + shim_rand_int(20)) - 10.0f, + data->pos.y + (shim_rand_int(40) * data->scale), + data->pos.z + 3.0f, + (data->scale * ((shim_rand_int(10) * 0.7 * 0.1) + 0.3)), i + 30 ); iceShard->data.iceShard->animFrame = shim_rand_int(10) * 0.1; @@ -152,7 +152,7 @@ void ice_pillar_appendGfx(void* effect) { s32 alpha = data->prim.a; Matrix4f sp10, sp50; Camera* camera; - + gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); @@ -162,7 +162,7 @@ void ice_pillar_appendGfx(void* effect) { shim_guMtxCatF(sp50, sp10, sp10); shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->prim.r, data->prim.g, data->prim.b, alpha); diff --git a/src/effects/shockwave.c b/src/effects/shockwave.c index e80a9a9878..e4eaa028ab 100644 --- a/src/effects/shockwave.c +++ b/src/effects/shockwave.c @@ -304,23 +304,23 @@ void shockwave_appendGfx(void* effect) { envG2 = envG >> 2; envB2 = envB >> 2; } - + gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, dlist2); - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, + shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, data->pos.x, data->pos.y, data->pos.z); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); primA = data->alpha; savedGfxPos = gMainGfxPos; gMainGfxPos++; savedGfxPos2 = gMainGfxPos; - + data++; for (i = 1; i < ((EffectInstance*) effect)->numParts; i++, data++) { if (data->unk_4C >= 0) { @@ -336,7 +336,7 @@ void shockwave_appendGfx(void* effect) { gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0, (s32) data->unk_3C, 0x00FC, (s32) data->unk_3C + 0x7C); gDPSetTileSize(gMainGfxPos++, 1, 0, (s32) data->unk_44, 0x007C, (s32) data->unk_44 + 0x7C); - gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, dlist); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); diff --git a/src/effects/sun.c b/src/effects/sun.c index 100317baf3..caab0b8454 100644 --- a/src/effects/sun.c +++ b/src/effects/sun.c @@ -33,13 +33,13 @@ EffectInstance* sun_main(s32 shineFromRight, f32 offsetX, f32 offsetY, f32 offse bp.unk_00 = 0; bp.unk_14 = NULL; bp.effectID = EFFECT_SUN; - + effect = shim_create_effect_instance(&bp); effect->numParts = numParts; - + data = effect->data.sun = shim_general_heap_malloc(sizeof(*data)); ASSERT(data != NULL); - + data->shineFromRight = shineFromRight; data->lifeTime = 0; if (duration <= 0) { @@ -64,7 +64,7 @@ EffectInstance* sun_main(s32 shineFromRight, f32 offsetX, f32 offsetY, f32 offse } data->targetAlpha = 255; data->alpha = 0; - + return effect; } @@ -83,7 +83,7 @@ void sun_update(EffectInstance* effect) { if (data->timeLeft < 1000) { data->timeLeft--; } - + data->lifeTime++; if (data->lifeTime > 90*60*60) { data->lifeTime = 256; @@ -92,7 +92,7 @@ void sun_update(EffectInstance* effect) { shim_remove_effect(effect); return; } - + time = data->lifeTime; if (data->timeLeft < 16) { data->alpha -= 16; @@ -105,7 +105,7 @@ void sun_update(EffectInstance* effect) { } else if (data->targetAlpha > 255) { data->targetAlpha = 255; } - + if (data->alpha > data->targetAlpha) { data->alpha -= 8; if (data->alpha < data->targetAlpha) { @@ -154,21 +154,21 @@ void sun_appendGfx(void* argEffect) { s32 offsetS; s32 fromRight; s32 i; - + data = effect->data.sun; alpha = data->alpha; fromRight = data->shineFromRight; - + if (alpha != 0) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x9, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); - + if (!fromRight) { shim_guOrthoF(mtx, -1600.0f, 1600.0f, -1200.0f, 1200.0f, -100.0f, 100.0f, 1.0f); } else { shim_guOrthoF(mtx, 1600.0f, -1600.0f, -1200.0f, 1200.0f, -100.0f, 100.0f, 1.0f); } - + shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); @@ -176,7 +176,7 @@ void sun_appendGfx(void* argEffect) { shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primColor.r, data->primColor.g, data->primColor.b, alpha >> 1); gDPSetEnvColor(gMainGfxPos++, data->envColor.r, data->envColor.g, data->envColor.b, data->envColor.a); gSPDisplayList(gMainGfxPos++, D_E0120794[0]); diff --git a/src/effects/water_block.c b/src/effects/water_block.c index 5a8baf6c26..31ea2bb044 100644 --- a/src/effects/water_block.c +++ b/src/effects/water_block.c @@ -226,7 +226,7 @@ void water_block_appendGfx(void *effect) { Vtx* var_fp; s32 temp_s0; s32 i; - + gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); shim_guTranslateF(sp20, data->pos.x, data->pos.y, data->pos.z); @@ -239,7 +239,7 @@ void water_block_appendGfx(void *effect) { gMainGfxPos = &gMainGfxPos[80]; temp_s0 = gGameStatusPtr->frameCounter * 4; - + for (var_s6 = D_E00B4CF0, i = 0, var_fp = spA8; i < 40; i++, var_s6++, var_fp++) { f32 x = var_s6->unk_00 * 10; f32 y = var_s6->unk_01 * 10; @@ -257,7 +257,7 @@ void water_block_appendGfx(void *effect) { var_fp->v.ob[0] = x; var_fp->v.ob[1] = y; var_fp->v.ob[2] = z; - + var_fp->v.tc[0] = var_s6->unk_04; var_fp->v.tc[1] = var_s6->unk_06; @@ -289,14 +289,14 @@ void water_block_appendGfx(void *effect) { gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, spA4 * 0.3); gSPClearGeometryMode(gMainGfxPos++, G_CULL_BOTH); gSPSetGeometryMode(gMainGfxPos++, G_CULL_BACK); - + gSPVertex(gMainGfxPos++, spA8, 30, 0); gSPDisplayList(gMainGfxPos++, D_090004D8_3B70C8); gSPVertex(gMainGfxPos++, &spA8[28], 12, 0); - gSPDisplayList(gMainGfxPos++, D_09000538_3B7128) + gSPDisplayList(gMainGfxPos++, D_09000538_3B7128) gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/water_splash.c b/src/effects/water_splash.c index f666a49a45..d6201a2882 100644 --- a/src/effects/water_splash.c +++ b/src/effects/water_splash.c @@ -175,7 +175,7 @@ void water_splash_appendGfx(void* effect) { s32 temp_fp = data->unk_04.y; Camera* currentCamera = &gCameras[gCurrentCameraID]; s32 i; - + gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, OS_K0_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); shim_guTranslateF(sp10, sp94, temp_fp, data->unk_04.z); @@ -185,7 +185,7 @@ void water_splash_appendGfx(void* effect) { gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, currentCamera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000100_3BCB90); - + data++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, data++) { s32 temp_t2 = (s32)data->unk_04.x + sp94; @@ -196,17 +196,17 @@ void water_splash_appendGfx(void* effect) { } else { temp_t2 = temp_t2 & 0x7F; } - + if (temp_t3 > 0) { temp_t3 = -(temp_t3 & 0x3F); } else { temp_t3 = temp_t3 & 0x3F; } - gDPLoadMultiTile(gMainGfxPos++, OS_K0_TO_PHYSICAL(nuGfxCfb_ptr), 0x100, 1, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, 0, + gDPLoadMultiTile(gMainGfxPos++, OS_K0_TO_PHYSICAL(nuGfxCfb_ptr), 0x100, 1, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, 0, temp_t2 + 0xA0, temp_t3 + 0x78, temp_t2 + 0xBF, temp_t3 + 0x97, 0, G_TX_WRAP, G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); - + shim_guTranslateF(sp10, data->unk_04.x, data->unk_04.y, data->unk_04.z); shim_guScaleF(sp50, data->unk_34, data->unk_34, data->unk_34); shim_guMtxCatF(sp50, sp10, sp10); diff --git a/src/effects/whirlwind.c b/src/effects/whirlwind.c index 7673116630..fab9a86324 100644 --- a/src/effects/whirlwind.c +++ b/src/effects/whirlwind.c @@ -165,7 +165,7 @@ void whirlwind_appendGfx(void* effect) { s32 i; EffectInstance* eff = (EffectInstance*)effect; WhirlwindFXData* data = eff->data.whirlwind; - + spA0 = data->unk_10; primAlpha = data->primAlpha >> 1; spB8 = data->unk_34; @@ -206,7 +206,7 @@ void whirlwind_appendGfx(void* effect) { // Reserve 0x88 bytes (17 commands, including this one) for a separate dynamically generated display list gSPBranchList(gMainGfxPos, &gMainGfxPos[17]); - + // Get a reference to the dynamically generated display list triangleDisplayList = ++gMainGfxPos; diff --git a/src/imgfx.c b/src/imgfx.c index 9b680064a5..b770870189 100644 --- a/src/imgfx.c +++ b/src/imgfx.c @@ -999,7 +999,7 @@ void imgfx_appendGfx_mesh(ImgFXState* state, Matrix4f mtx) { primAlpha = state->ints.hologram.alphaAmt * ifxImgAlpha; // color: blend texure and noise // alpha: texure * prim - gDPSetCombineMode(gMainGfxPos++, PM_CC_IMGFX_HOLOGRAM, PM_CC_IMGFX_HOLOGRAM); + gDPSetCombineMode(gMainGfxPos++, PM_CC_IMGFX_HOLOGRAM, PM_CC_IMGFX_HOLOGRAM); gDPSetPrimColor(gMainGfxPos++, 0, 0, state->ints.hologram.noiseAmt, state->ints.hologram.noiseAmt, diff --git a/src/os/crc.c b/src/os/crc.c index c3c285661f..a4e3ab0582 100644 --- a/src/os/crc.c +++ b/src/os/crc.c @@ -17,7 +17,7 @@ u8 __osContAddressCrc(u16 addr) { } else if (temp & 0x20) { temp ^= 0x15; } - + i >>= 1; } diff --git a/src/os/nusys/nucontrmbmgr.c b/src/os/nusys/nucontrmbmgr.c index 683eb82f23..d57f9d42c2 100644 --- a/src/os/nusys/nucontrmbmgr.c +++ b/src/os/nusys/nucontrmbmgr.c @@ -10,8 +10,8 @@ s32 contRmbForceStopEndMesg(NUSiCommonMesg* mesg); u32 nuContRmbSearchTime = 300; -s32 (*D_80093CE4[])(NUSiCommonMesg*) = { - contRmbRetrace, contRmbCheckMesg, contRmbStartMesg, contRmbStopMesg, contRmbForceStopMesg, contRmbForceStopEndMesg, +s32 (*D_80093CE4[])(NUSiCommonMesg*) = { + contRmbRetrace, contRmbCheckMesg, contRmbStartMesg, contRmbStopMesg, contRmbForceStopMesg, contRmbForceStopEndMesg, NULL }; diff --git a/src/os/vi.c b/src/os/vi.c index 92a11d5e81..1842d5eba3 100644 --- a/src/os/vi.c +++ b/src/os/vi.c @@ -38,10 +38,10 @@ void __osViInit(void) { } else { __osViNext->modep = &osViModeNtscLan1; } - + __osViNext->state = VI_STATE_BLACK; __osViNext->control = __osViNext->modep->comRegs.ctrl; - + while (IO_READ(VI_CURRENT_REG) > 10) { //wait for vsync? } diff --git a/src/os/xldtob.c b/src/os/xldtob.c index 38e5d50572..53bd79d823 100644 --- a/src/os/xldtob.c +++ b/src/os/xldtob.c @@ -82,9 +82,9 @@ void _Ldtob(_Pft* px, char code) { } } else if (xexp > 0) { f64 factor = 1; - + xexp &= ~3; - + for (n = xexp, i = 0; n > 0; n >>= 1, i++) { if (n & 1) { factor *= pows[i]; @@ -95,15 +95,15 @@ void _Ldtob(_Pft* px, char code) { } { int gen = px->prec + ((code == 'f') ? 10 + xexp : 6); - + if (gen > 0x13) { gen = 0x13; } - + for (*p++ = '0'; gen > 0 && 0 < ldval; p += 8) { int j; int lo = ldval; - + if ((gen -= 8) > 0) { ldval = (ldval - lo) * 1e8; } @@ -112,7 +112,7 @@ void _Ldtob(_Pft* px, char code) { ldiv_t qr = ldiv(lo, 10); *--p = qr.rem + '0', lo = qr.quot; } - + while (--j >= 0) { *--p = '0'; } @@ -125,7 +125,7 @@ void _Ldtob(_Pft* px, char code) { } nsig = px->prec + ((code == 'f') ? xexp + 1 : ((code == 'e' || code == 'E') ? 1 : 0)); - + if (gen < nsig) { nsig = gen; } @@ -141,7 +141,7 @@ void _Ldtob(_Pft* px, char code) { if (drop == '9') { ++p[n]; } - + if (n < 0) { --p, ++nsig, ++xexp; } diff --git a/src/os/xlitob.c b/src/os/xlitob.c index 1dda46497e..c6f1d37a4e 100644 --- a/src/os/xlitob.c +++ b/src/os/xlitob.c @@ -36,7 +36,7 @@ void _Litob(_Pft *args, char type) { while (args->v.ll > 0 && i > 0) { lldiv_t qr = lldiv(args->v.ll, base); - + args->v.ll = qr.quot; buff[--i] = digs[qr.rem]; } @@ -51,7 +51,7 @@ void _Litob(_Pft *args, char type) { if (args->prec < 0 && (args->flags & (FLAGS_ZERO | FLAGS_MINUS)) == FLAGS_ZERO) { i = args->width - args->n0 - args->nz0 - args->n1; - + if (i > 0) { args->nz0 += i; } diff --git a/src/os/xprintf.c b/src/os/xprintf.c index cfe5aee2c0..3a18c2e271 100644 --- a/src/os/xprintf.c +++ b/src/os/xprintf.c @@ -44,7 +44,7 @@ int _Printf(outfun prout, char *arg, const char *fmt, va_list args) { static const char fchar[] = {' ', '+', '-', '#', '0', '\0'}; static const int fbit[] = {FLAGS_SPACE, FLAGS_PLUS, FLAGS_MINUS, FLAGS_HASH, FLAGS_ZERO, 0}; char ac[32]; - + x.nchar = 0; for (;;) { @@ -53,15 +53,15 @@ int _Printf(outfun prout, char *arg, const char *fmt, va_list args) { for (c = *s; c != 0 && c != '%';) { c = *++s; } - + PUT(fmt, s - fmt); - + if (c == 0) { return x.nchar; } - + fmt = ++s; - + for (x.flags = 0; (t = strchr(fchar, *s)) != NULL; s++) { x.flags |= fbit[t - fchar]; } @@ -88,7 +88,7 @@ int _Printf(outfun prout, char *arg, const char *fmt, va_list args) { } x.qual = strchr("hlL", *s) ? *s++ : '\0'; - + if (x.qual == 'l' && *s == 'l') { x.qual = 'L'; ++s; @@ -96,22 +96,22 @@ int _Printf(outfun prout, char *arg, const char *fmt, va_list args) { _Putfld(&x, &args, *s, ac); x.width -= x.n0 + x.nz0 + x.n1 + x.nz1 + x.n2 + x.nz2; - + if (!(x.flags & FLAGS_MINUS)) { PAD(spaces, x.width); } - + PUT(ac, x.n0); PAD(zeroes, x.nz0); PUT(x.s, x.n1); PAD(zeroes, x.nz1); PUT(x.s + x.n1, x.n2); PAD(zeroes, x.nz2); - + if (x.flags & FLAGS_MINUS) { PAD(spaces, x.width); } - + fmt = s + 1; } return 0; @@ -219,11 +219,11 @@ static void _Putfld(_Pft *x, va_list *args, char type, char *buff) { case 's': x->s = va_arg(*args, char *); x->n1 = strlen(x->s); - + if (x->prec >= 0 && x->n1 > x->prec) { x->n1 = x->prec; } - + break; case '%': buff[x->n0++] = '%'; diff --git a/src/pause/pause_stats.c b/src/pause/pause_stats.c index d6825db984..0b1f1d335b 100644 --- a/src/pause/pause_stats.c +++ b/src/pause/pause_stats.c @@ -441,7 +441,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, break; } } - + // get number of total power increments powFullBars = playerData->maxStarPower; powIncrements = 8 * powFullBars; @@ -530,7 +530,7 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, hud_element_draw_next(powHudElemID); } powIncIdx++; - + if (curIncrement >= powIncrements) { break; } diff --git a/src/world/action/misc.c b/src/world/action/misc.c index 29a08eae2a..f1d89ef5d1 100644 --- a/src/world/action/misc.c +++ b/src/world/action/misc.c @@ -8,7 +8,7 @@ BSS f32 D_802B6770_E27C80; void action_update_ride(void) { PartnerStatus* partnerStatus = &gPartnerStatus; PlayerStatus* playerStatus = &gPlayerStatus; - + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { playerStatus->flags &= ~(PS_FLAG_ACTION_STATE_CHANGED | PS_FLAG_ARMS_RAISED | PS_FLAG_AIRBORNE); playerStatus->actionSubstate = 0; diff --git a/src/world/area_dro/dro_01/dro_01_7_foliage.c b/src/world/area_dro/dro_01/dro_01_7_foliage.c index 23b6d34a0d..d6b6ade54d 100644 --- a/src/world/area_dro/dro_01/dro_01_7_foliage.c +++ b/src/world/area_dro/dro_01/dro_01_7_foliage.c @@ -6,7 +6,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o799); FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o800); FoliageDropList N(Tree1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, diff --git a/src/world/area_end/end_01/credits_jobs_pal.inc.c b/src/world/area_end/end_01/credits_jobs_pal.inc.c index 6f442cb14d..bd7d24288d 100644 --- a/src/world/area_end/end_01/credits_jobs_pal.inc.c +++ b/src/world/area_end/end_01/credits_jobs_pal.inc.c @@ -227,4 +227,4 @@ CreditsEntry N(Credits_Jobs)[] = { .perCharDelayOut = 0, .next = -1, }, -}; \ No newline at end of file +}; diff --git a/src/world/area_end/end_01/credits_names_pal.inc.c b/src/world/area_end/end_01/credits_names_pal.inc.c index 0e37e0ffb5..007db8d61f 100644 --- a/src/world/area_end/end_01/credits_names_pal.inc.c +++ b/src/world/area_end/end_01/credits_names_pal.inc.c @@ -580,4 +580,4 @@ CreditsEntry N(Credits_Names)[] = { .perCharDelayOut = 0, .next = -1, }, -}; \ No newline at end of file +}; diff --git a/src/world/area_flo/flo_03/flo_03_4_foliage.c b/src/world/area_flo/flo_03/flo_03_4_foliage.c index 504f42d47c..09bae8673f 100644 --- a/src/world/area_flo/flo_03/flo_03_4_foliage.c +++ b/src/world/area_flo/flo_03/flo_03_4_foliage.c @@ -6,7 +6,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o170); FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o157); FoliageDropList N(Tree1_Drops) = { - .count = 2, + .count = 2, .drops = { { .itemID = ITEM_RED_BERRY, diff --git a/src/world/area_flo/flo_08/flo_08_5_foliage.c b/src/world/area_flo/flo_08/flo_08_5_foliage.c index 1fa1003cf9..f9f1fafcf2 100644 --- a/src/world/area_flo/flo_08/flo_08_5_foliage.c +++ b/src/world/area_flo/flo_08/flo_08_5_foliage.c @@ -6,7 +6,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o133); FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o132); FoliageDropList N(Tree1_Drops) = { - .count = 2, + .count = 2, .drops = { { .itemID = ITEM_BLUE_BERRY, diff --git a/src/world/area_flo/flo_10/flo_10_6_waterfx.c b/src/world/area_flo/flo_10/flo_10_6_waterfx.c index 5dc0c1c66a..2085d39c74 100644 --- a/src/world/area_flo/flo_10/flo_10_6_waterfx.c +++ b/src/world/area_flo/flo_10/flo_10_6_waterfx.c @@ -3,7 +3,7 @@ #include "model.h" s32 N(WavePhase) = { - 0 + 0 }; // unused wavy distortion effect for edge water -- unclear how it would have been used diff --git a/src/world/area_flo/flo_10/flo_10_7_foliage.c b/src/world/area_flo/flo_10/flo_10_7_foliage.c index 845dfdc565..dd7b4ee3b3 100644 --- a/src/world/area_flo/flo_10/flo_10_7_foliage.c +++ b/src/world/area_flo/flo_10/flo_10_7_foliage.c @@ -6,7 +6,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o47, MODEL_o48, FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o88); FoliageDropList N(Tree1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_JAMMIN_JELLY, diff --git a/src/world/area_flo/flo_12/flo_12_1_music.c b/src/world/area_flo/flo_12/flo_12_1_music.c index 1c6bd2255a..8acf9d369b 100644 --- a/src/world/area_flo/flo_12/flo_12_1_music.c +++ b/src/world/area_flo/flo_12/flo_12_1_music.c @@ -16,7 +16,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_END }; -EvtScript N(EVS_PushFlowerSong) = { +EvtScript N(EVS_PushFlowerSong) = { EVT_CALL(PushSong, SONG_FLOWER_NPC_THEME, 3) EVT_RETURN EVT_END diff --git a/src/world/area_flo/flo_21/flo_21_3_clouds.c b/src/world/area_flo/flo_21/flo_21_3_clouds.c index 19a4a4bd04..2fe8127913 100644 --- a/src/world/area_flo/flo_21/flo_21_3_clouds.c +++ b/src/world/area_flo/flo_21/flo_21_3_clouds.c @@ -1,14 +1,14 @@ #include "flo_21.h" s32 N(UnusedScaleVectors)[] = { - EVT_FLOAT(1.0), EVT_FLOAT(1.0), + EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.1), EVT_FLOAT(1.1), - EVT_FLOAT(1.1), EVT_FLOAT(1.1), EVT_FLOAT(1.1), EVT_FLOAT(1.1), - EVT_FLOAT(1.0), EVT_FLOAT(1.0), - EVT_FLOAT(1.0), EVT_FLOAT(1.0), + EVT_FLOAT(1.1), EVT_FLOAT(1.1), + EVT_FLOAT(1.0), EVT_FLOAT(1.0), + EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(0.9), EVT_FLOAT(0.9), EVT_FLOAT(0.9), EVT_FLOAT(0.9), diff --git a/src/world/area_flo/flo_24/flo_24_3_foliage.c b/src/world/area_flo/flo_24/flo_24_3_foliage.c index 608fb2828e..16ed4483ee 100644 --- a/src/world/area_flo/flo_24/flo_24_3_foliage.c +++ b/src/world/area_flo/flo_24/flo_24_3_foliage.c @@ -6,7 +6,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o125, MODEL_o12 FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o124); FoliageDropList N(Tree1_Drops) = { - .count = 2, + .count = 2, .drops = { { .itemID = ITEM_BUBBLE_BERRY, diff --git a/src/world/area_flo/flo_25/flo_25_5_foliage.c b/src/world/area_flo/flo_25/flo_25_5_foliage.c index 52be9c3793..6a67499161 100644 --- a/src/world/area_flo/flo_25/flo_25_5_foliage.c +++ b/src/world/area_flo/flo_25/flo_25_5_foliage.c @@ -6,7 +6,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o43, MODEL_o44, FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o42); FoliageDropList N(Tree1_Drops) = { - .count = 2, + .count = 2, .drops = { { .itemID = ITEM_YELLOW_BERRY, diff --git a/src/world/area_hos/hos.h b/src/world/area_hos/hos.h index 45b97f5ea3..21392c77cd 100644 --- a/src/world/area_hos/hos.h +++ b/src/world/area_hos/hos.h @@ -20,7 +20,7 @@ enum { AB_HOS_Unused_F = AreaByte(15), }; -enum { +enum { AF_HOS06_BadgeHints = AreaFlag(3), AF_HOS06_SuperBlocksHints = AreaFlag(100), AF_HOS06_StarPieceHints = AreaFlag(116), diff --git a/src/world/area_hos/hos_06/hos_06_6_chest.c b/src/world/area_hos/hos_06/hos_06_6_chest.c index 8b296b21d1..0a7b125c74 100644 --- a/src/world/area_hos/hos_06/hos_06_6_chest.c +++ b/src/world/area_hos/hos_06/hos_06_6_chest.c @@ -34,7 +34,7 @@ s32 N(ChestItems)[] = { ITEM_SHOOTING_STAR, ITEM_DEEP_FOCUS1, ITEM_LAST_STAND, - ITEM_JAMMIN_JELLY, + ITEM_JAMMIN_JELLY, }; // end modified Chest.inc.c diff --git a/src/world/area_isk/isk_07/isk_07_3_npc.c b/src/world/area_isk/isk_07/isk_07_3_npc.c index 861c52d369..e52ac99afe 100644 --- a/src/world/area_isk/isk_07/isk_07_3_npc.c +++ b/src/world/area_isk/isk_07/isk_07_3_npc.c @@ -23,7 +23,7 @@ API_CALLABLE(N(IsLastEnemy)) { } } } - + if (livingEncounters != 1) { return ApiStatus_DONE2; } else { diff --git a/src/world/area_isk/isk_13/isk_13_3_npc.c b/src/world/area_isk/isk_13/isk_13_3_npc.c index 700904867d..a4de81d501 100644 --- a/src/world/area_isk/isk_13/isk_13_3_npc.c +++ b/src/world/area_isk/isk_13/isk_13_3_npc.c @@ -24,13 +24,13 @@ void N(func_80241610_990DF0)(void) { ImgFXTexture ifxImg; SpriteRasterInfo spriteRaster; Matrix4f transformMtx, tempMtx; - + gSPViewport(gMainGfxPos++, &cam->vp); if (!(cam->flags & CAMERA_FLAG_ORTHO)) { gSPPerspNormalize(gMainGfxPos++, cam->perspNorm); } guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); - + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); gDPPipeSync(gMainGfxPos++); @@ -47,7 +47,7 @@ void N(func_80241610_990DF0)(void) { gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); - + guTranslateF(transformMtx, ambush->pos.x, ambush->pos.y, ambush->pos.z); guRotateF(tempMtx, ambush->rot.y + gCameras[gCurrentCameraID].currentYaw + ambush->renderYaw, 0.0f, 1.0f, 0.0f); guMtxCatF(tempMtx, transformMtx, transformMtx); @@ -60,7 +60,7 @@ void N(func_80241610_990DF0)(void) { guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - + if (ambush->useBitingAnim) { if ((gGameStatusPtr->frameCounter % 10) < 5) { ambush->rasterIndex = 0; @@ -76,7 +76,7 @@ void N(func_80241610_990DF0)(void) { ifxImg.xOffset = -(spriteRaster.width / 2); ifxImg.yOffset = (spriteRaster.height / 2); ifxImg.alpha = 255; - + imgfx_update(ambush->imgfxIdx, IMGFX_SET_TINT, ambush->color.r, ambush->color.g, ambush->color.b, ambush->color.a, 0); imgfx_appendGfx_component(ambush->imgfxIdx, &ifxImg, 0, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); @@ -86,7 +86,7 @@ API_CALLABLE(N(func_80241BA8_991388)) { StoneChompAmbushIsk13* ambush; SpriteRasterInfo rasterInfo; Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - + ambush = heap_malloc(sizeof(*ambush)); ambush->useBitingAnim = FALSE; ambush->spriteIndex = SPR_StoneChomp; @@ -110,7 +110,7 @@ API_CALLABLE(N(func_80241BA8_991388)) { ambush->color.b = 255.0f; ambush->color.a = 0.0f; ambush->imgfxIdx = 0; - + ambush->workerID = create_worker_frontUI(NULL, N(func_80241610_990DF0)); evt_set_variable(script, MV_AmbushPtr, (s32) ambush); return ApiStatus_DONE2; @@ -128,7 +128,7 @@ API_CALLABLE(N(func_80241D38_991518)) { s32 y = evt_get_float_variable(script, *args++); s32 z = evt_get_float_variable(script, *args++); StoneChompAmbushIsk13* ambush = (StoneChompAmbushIsk13*) evt_get_variable(script, MV_AmbushPtr); - + ambush->pos.x = x; ambush->pos.y = y + ambush->height * SPRITE_WORLD_SCALE_D * 0.5; ambush->pos.z = z; @@ -141,7 +141,7 @@ API_CALLABLE(N(func_80241E34_991614)) { s32 y = evt_get_float_variable(script, *args++); s32 z = evt_get_float_variable(script, *args++); StoneChompAmbushIsk13* ambush = (StoneChompAmbushIsk13*) evt_get_variable(script, MV_AmbushPtr); - + ambush->rot.x = x; ambush->rot.y = y; ambush->rot.z = z; @@ -155,7 +155,7 @@ API_CALLABLE(N(func_80241EF8_9916D8)) { f32 g = evt_get_float_variable(script, *args++); f32 b = evt_get_float_variable(script, *args++); f32 a = evt_get_float_variable(script, *args++); - + if (r < 0.0f) { r = 0.0f; } diff --git a/src/world/area_isk/isk_14/isk_14_3_npc.c b/src/world/area_isk/isk_14/isk_14_3_npc.c index d43d3114b9..09b3b1e0b6 100644 --- a/src/world/area_isk/isk_14/isk_14_3_npc.c +++ b/src/world/area_isk/isk_14/isk_14_3_npc.c @@ -47,7 +47,7 @@ void N(func_80241610_993D40)(void) { gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); - + guTranslateF(transformMtx, ambush->pos.x, ambush->pos.y, ambush->pos.z); guRotateF(tempMtx, ambush->rot.y + gCameras[gCurrentCameraID].currentYaw + ambush->renderYaw, 0.0f, 1.0f, 0.0f); guMtxCatF(tempMtx, transformMtx, transformMtx); @@ -60,7 +60,7 @@ void N(func_80241610_993D40)(void) { guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - + spr_get_npc_raster_info(&spriteRaster, ambush->spriteIndex, ambush->rasterIndex); ifxImg.raster = spriteRaster.raster; ifxImg.palette = spriteRaster.defaultPal; @@ -69,7 +69,7 @@ void N(func_80241610_993D40)(void) { ifxImg.xOffset = -(spriteRaster.width / 2); ifxImg.yOffset = spriteRaster.height; ifxImg.alpha = 255; - + imgfx_appendGfx_component(ambush->imgfxIdx, &ifxImg, 0, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -78,7 +78,7 @@ API_CALLABLE(N(func_80241AF0_994220)) { StoneChompAmbushIsk14* ambush = &N(ChompAmbush); SpriteRasterInfo rasterInfo; Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - + ambush->spriteIndex = SPR_StoneChomp; ambush->rasterIndex = 0; spr_get_npc_raster_info(&rasterInfo, ambush->spriteIndex, ambush->rasterIndex); diff --git a/src/world/area_iwa/iwa_03/iwa_03_2_entity.c b/src/world/area_iwa/iwa_03/iwa_03_2_entity.c index 545872f880..3d37d573d4 100644 --- a/src/world/area_iwa/iwa_03/iwa_03_2_entity.c +++ b/src/world/area_iwa/iwa_03/iwa_03_2_entity.c @@ -7,7 +7,7 @@ MAP_RODATA_PAD(1,entity); API_CALLABLE(N(MonitorPlayerAltitude)) { s32 result = -1; - + if (gPlayerStatus.lastGoodPosition.y > 200.0) { result = 0; } diff --git a/src/world/area_iwa/iwa_04/iwa_04_3_entity.c b/src/world/area_iwa/iwa_04/iwa_04_3_entity.c index 6f5bb5a33b..b7870d07a1 100644 --- a/src/world/area_iwa/iwa_04/iwa_04_3_entity.c +++ b/src/world/area_iwa/iwa_04/iwa_04_3_entity.c @@ -3,7 +3,7 @@ API_CALLABLE(N(MonitorPlayerAltitude)) { s32 status = -1; - + if (gPlayerStatus.lastGoodPosition.y > -100.0) { status = 0; } @@ -13,7 +13,7 @@ API_CALLABLE(N(MonitorPlayerAltitude)) { if (status >= 0) { evt_set_variable(script, MV_PlayerCliffLevel, status); } - + return ApiStatus_BLOCK; } diff --git a/src/world/area_iwa/iwa_10/iwa_10_8_foliage.c b/src/world/area_iwa/iwa_10/iwa_10_8_foliage.c index 6d11b0a049..9ecd166d13 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_8_foliage.c +++ b/src/world/area_iwa/iwa_10/iwa_10_8_foliage.c @@ -5,7 +5,7 @@ FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_k4); FoliageDropList N(Bush1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -33,7 +33,7 @@ SearchBushConfig N(SearchBush_Bush1) = { FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_k5); FoliageDropList N(Bush2_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -61,7 +61,7 @@ SearchBushConfig N(SearchBush_Bush2) = { FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_k6); FoliageDropList N(Bush3_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -89,7 +89,7 @@ SearchBushConfig N(SearchBush_Bush3) = { FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_k7); FoliageDropList N(Bush4_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_EGG, diff --git a/src/world/area_iwa/iwa_11/iwa_11_4_scenery.c b/src/world/area_iwa/iwa_11/iwa_11_4_scenery.c index a5a35c37e1..55195ec582 100644 --- a/src/world/area_iwa/iwa_11/iwa_11_4_scenery.c +++ b/src/world/area_iwa/iwa_11/iwa_11_4_scenery.c @@ -8,7 +8,7 @@ s32 N(TrackSections)[NUM_SECTIONS] = { MODEL_field_c, MODEL_field_d, MODEL_field_e, - MODEL_field_f, + MODEL_field_f, }; s32 N(SectionOffsets)[][NUM_SECTIONS + 1] = { @@ -31,18 +31,18 @@ s32 N(SectionOffsets)[][NUM_SECTIONS + 1] = { API_CALLABLE(N(GetSectionPosOffsets)) { s32 value = script->varTable[0]; s32 index, i; - + for (i = 0; i < ARRAY_COUNT(N(SectionOffsets)); i++) { if (value < N(SectionOffsets)[i][0]) { break; } } index = i - 1; - + for (i = 0; i < NUM_SECTIONS; i++) { script->varTable[i + 5] = N(SectionOffsets)[index][i + 1]; } - + return ApiStatus_DONE2; } diff --git a/src/world/area_jan/jan_00/jan_00_5_foliage.c b/src/world/area_jan/jan_00/jan_00_5_foliage.c index 46e386f8c4..9ab655c769 100644 --- a/src/world/area_jan/jan_00/jan_00_5_foliage.c +++ b/src/world/area_jan/jan_00/jan_00_5_foliage.c @@ -7,7 +7,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o241, MODEL_o24 FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o240); FoliageDropList N(Tree1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COCONUT, diff --git a/src/world/area_jan/jan_01/jan_01_5_foliage.c b/src/world/area_jan/jan_01/jan_01_5_foliage.c index 085be381ee..01cfad54d6 100644 --- a/src/world/area_jan/jan_01/jan_01_5_foliage.c +++ b/src/world/area_jan/jan_01/jan_01_5_foliage.c @@ -19,7 +19,7 @@ FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o85, MODEL_o86) FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o84); FoliageDropList N(Tree2_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COCONUT, @@ -45,7 +45,7 @@ FoliageModelList N(Tree3_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o79, MODEL_o80) FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o78); FoliageDropList N(Tree3_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COCONUT, @@ -71,7 +71,7 @@ FoliageModelList N(Tree4_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o82, MODEL_o83) FoliageModelList N(Tree4_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o81); FoliageDropList N(Tree4_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COCONUT, @@ -97,7 +97,7 @@ FoliageModelList N(Tree5_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o88, MODEL_o89) FoliageModelList N(Tree5_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o87); FoliageDropList N(Tree5_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COCONUT, @@ -123,7 +123,7 @@ FoliageModelList N(Tree6_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o104, MODEL_o10 FoliageModelList N(Tree6_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o103); FoliageDropList N(Tree6_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COCONUT, @@ -149,7 +149,7 @@ FoliageModelList N(Tree7_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o113, MODEL_o11 FoliageModelList N(Tree7_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o112); FoliageDropList N(Tree7_DropsA) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_STAR_PIECE, @@ -162,7 +162,7 @@ FoliageDropList N(Tree7_DropsA) = { }; FoliageDropList N(Tree7_DropsB) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COCONUT, diff --git a/src/world/area_jan/jan_02/jan_02_5_foliage.c b/src/world/area_jan/jan_02/jan_02_5_foliage.c index 7b9f96d355..b20ca307bd 100644 --- a/src/world/area_jan/jan_02/jan_02_5_foliage.c +++ b/src/world/area_jan/jan_02/jan_02_5_foliage.c @@ -19,7 +19,7 @@ FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o260, MODEL_o26 FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o259); FoliageDropList N(Tree2_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COCONUT, @@ -46,7 +46,7 @@ FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o280); FoliageDropList N(Tree3_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COCONUT, diff --git a/src/world/area_jan/jan_03/jan_03_4_npc.c b/src/world/area_jan/jan_03/jan_03_4_npc.c index a86e254af4..d227609c34 100644 --- a/src/world/area_jan/jan_03/jan_03_4_npc.c +++ b/src/world/area_jan/jan_03/jan_03_4_npc.c @@ -31,7 +31,7 @@ MAP_STATIC_PAD(1,key_item); s32 N(RedYoshiKidLetters)[] = { ITEM_LETTER_CHAIN_YOSHI_KID, - ITEM_NONE + ITEM_NONE }; EvtScript N(EVS_LetterPrompt_RedYoshiKid) = { @@ -47,7 +47,7 @@ EvtScript N(EVS_LetterPrompt_RedYoshiKid) = { s32 N(KoloradoLetters)[] = { ITEM_LETTER_TO_KOLORADO, - ITEM_NONE + ITEM_NONE }; EvtScript N(EVS_LetterPrompt_Kolorado) = { @@ -620,7 +620,7 @@ EvtScript N(EVS_NpcInit_Raven) = { s32 N(VolcanoVaseList)[] = { ITEM_VOLCANO_VASE, - -1 + -1 }; EvtScript N(EVS_NpcInteract_Kolorado) = { diff --git a/src/world/area_jan/jan_03/jan_03_7_foliage.c b/src/world/area_jan/jan_03/jan_03_7_foliage.c index 2729307d2e..e3f17baf67 100644 --- a/src/world/area_jan/jan_03/jan_03_7_foliage.c +++ b/src/world/area_jan/jan_03/jan_03_7_foliage.c @@ -6,7 +6,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o351, MODEL_o35 FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o350); FoliageDropList N(Tree1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COCONUT, diff --git a/src/world/area_jan/jan_04/jan_04_6_trees.c b/src/world/area_jan/jan_04/jan_04_6_trees.c index 7983158c4b..6b96752846 100644 --- a/src/world/area_jan/jan_04/jan_04_6_trees.c +++ b/src/world/area_jan/jan_04/jan_04_6_trees.c @@ -30,7 +30,7 @@ FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o101, MODEL_o10 FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o100); FoliageDropList N(Tree2_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_LETTER_TO_RUSS_T, diff --git a/src/world/area_jan/jan_05/jan_05_4_bushes.c b/src/world/area_jan/jan_05/jan_05_4_bushes.c index a0be8f2def..b765b0a179 100644 --- a/src/world/area_jan/jan_05/jan_05_4_bushes.c +++ b/src/world/area_jan/jan_05/jan_05_4_bushes.c @@ -32,7 +32,7 @@ EvtScript N(EVS_MoveBushes) = { FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o63); FoliageDropList N(Bush1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -59,7 +59,7 @@ SearchBushConfig N(SearchBush_Bush1) = { FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o141); FoliageDropList N(Bush2_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, diff --git a/src/world/area_jan/jan_05/jan_05_6_trees.c b/src/world/area_jan/jan_05/jan_05_6_trees.c index 2b483222d5..7f7fea289c 100644 --- a/src/world/area_jan/jan_05/jan_05_6_trees.c +++ b/src/world/area_jan/jan_05/jan_05_6_trees.c @@ -50,7 +50,7 @@ FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o89, MODEL_o90, FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o88); FoliageDropList N(Tree2_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, diff --git a/src/world/area_jan/jan_06/jan_06_4_trees.c b/src/world/area_jan/jan_06/jan_06_4_trees.c index 85afe3a642..48ac8a5f72 100644 --- a/src/world/area_jan/jan_06/jan_06_4_trees.c +++ b/src/world/area_jan/jan_06/jan_06_4_trees.c @@ -8,7 +8,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_g35); FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o97); FoliageDropList N(Tree1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, diff --git a/src/world/area_jan/jan_07/jan_07_4_trees.c b/src/world/area_jan/jan_07/jan_07_4_trees.c index 945fd0e58d..ecb1597d84 100644 --- a/src/world/area_jan/jan_07/jan_07_4_trees.c +++ b/src/world/area_jan/jan_07/jan_07_4_trees.c @@ -8,7 +8,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o7, MODEL_o8, MO FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o6); FoliageDropList N(Tree1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, diff --git a/src/world/area_jan/jan_08/jan_08_3_bushes.c b/src/world/area_jan/jan_08/jan_08_3_bushes.c index 9bce1e0aa1..c9ec619445 100644 --- a/src/world/area_jan/jan_08/jan_08_3_bushes.c +++ b/src/world/area_jan/jan_08/jan_08_3_bushes.c @@ -88,7 +88,7 @@ EvtScript N(EVS_Inspect_FlipBush) = { FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o59);; FoliageDropList N(Bush1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -115,7 +115,7 @@ SearchBushConfig N(SearchBush_Bush1) = { FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o164);; FoliageDropList N(Bush2_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, diff --git a/src/world/area_jan/jan_08/jan_08_6_trees.c b/src/world/area_jan/jan_08/jan_08_6_trees.c index dd2eb63caa..7b9ddf44c8 100644 --- a/src/world/area_jan/jan_08/jan_08_6_trees.c +++ b/src/world/area_jan/jan_08/jan_08_6_trees.c @@ -30,7 +30,7 @@ FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o138, MODEL_o13 FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o137); FoliageDropList N(Tree2_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -65,7 +65,7 @@ FoliageModelList N(Tree3_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o150, MODEL_o15 FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o149); FoliageDropList N(Tree3_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, diff --git a/src/world/area_jan/jan_09/jan_09_2_bushes.c b/src/world/area_jan/jan_09/jan_09_2_bushes.c index a8821f86e5..aa34cc61cc 100644 --- a/src/world/area_jan/jan_09/jan_09_2_bushes.c +++ b/src/world/area_jan/jan_09/jan_09_2_bushes.c @@ -173,7 +173,7 @@ EvtScript N(EVS_802440C0) = { FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o78); FoliageDropList N(Bush1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -256,7 +256,7 @@ SearchBushConfig N(SearchBush_Bush5) = { FoliageModelList N(Bush6_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o155); FoliageDropList N(Bush6_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, diff --git a/src/world/area_jan/jan_09/jan_09_4_trees.c b/src/world/area_jan/jan_09/jan_09_4_trees.c index 05f385c2d6..bba626c04f 100644 --- a/src/world/area_jan/jan_09/jan_09_4_trees.c +++ b/src/world/area_jan/jan_09/jan_09_4_trees.c @@ -30,7 +30,7 @@ FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o136, MODEL_o13 FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o135); FoliageDropList N(Tree2_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -65,7 +65,7 @@ FoliageModelList N(Tree3_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o130, MODEL_o13 FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o129); FoliageDropList N(Tree3_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_FRIGHT_JAR, diff --git a/src/world/area_jan/jan_12/jan_12_3_trees.c b/src/world/area_jan/jan_12/jan_12_3_trees.c index 137a907824..ec13f10d3a 100644 --- a/src/world/area_jan/jan_12/jan_12_3_trees.c +++ b/src/world/area_jan/jan_12/jan_12_3_trees.c @@ -8,7 +8,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o6, MODEL_o62, FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o35); FoliageDropList N(Tree1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, diff --git a/src/world/area_jan/jan_13/jan_13_2_puzzle.c b/src/world/area_jan/jan_13/jan_13_2_puzzle.c index 3bfb5b04e6..b30c9874b5 100644 --- a/src/world/area_jan/jan_13/jan_13_2_puzzle.c +++ b/src/world/area_jan/jan_13/jan_13_2_puzzle.c @@ -220,7 +220,7 @@ Vec3i N(GeyserSoundPositions)[] = { { -400 + POS_2_I * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2), 0, -150 + POS_2_J * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2) }, { -400 + POS_3_I * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2), 0, -150 + POS_3_J * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2) }, { -400 + POS_4_I * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2), 0, -150 + POS_4_J * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2) }, - { 37, 0, -138 }, + { 37, 0, -138 }, }; EvtScript N(EVS_ManageGeyserSounds) = { diff --git a/src/world/area_jan/jan_13/jan_13_3_trees.c b/src/world/area_jan/jan_13/jan_13_3_trees.c index b7eca78e5d..9e543f08c9 100644 --- a/src/world/area_jan/jan_13/jan_13_3_trees.c +++ b/src/world/area_jan/jan_13/jan_13_3_trees.c @@ -8,7 +8,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o54, MODEL_o55, FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o53); FoliageDropList N(Tree1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, diff --git a/src/world/area_jan/jan_15/jan_15_3_trees.c b/src/world/area_jan/jan_15/jan_15_3_trees.c index ed695d8227..92d826d0cd 100644 --- a/src/world/area_jan/jan_15/jan_15_3_trees.c +++ b/src/world/area_jan/jan_15/jan_15_3_trees.c @@ -30,7 +30,7 @@ FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o65, MODEL_o66, FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o64); FoliageDropList N(Tree2_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, diff --git a/src/world/area_kkj/common/SetAvailableDisguise.inc.c b/src/world/area_kkj/common/SetAvailableDisguise.inc.c index 09c5bf083f..ced4a3b7d7 100644 --- a/src/world/area_kkj/common/SetAvailableDisguise.inc.c +++ b/src/world/area_kkj/common/SetAvailableDisguise.inc.c @@ -2,7 +2,7 @@ API_CALLABLE(N(SetAvailableDisguise)) { Bytecode* args = script->ptrReadPos; - + gPlayerStatus.availableDisguiseType = evt_get_float_variable(script, *args++); return ApiStatus_DONE2; } diff --git a/src/world/area_kkj/kkj_17/kkj_17_3_chest.c b/src/world/area_kkj/kkj_17/kkj_17_3_chest.c index 1a288136f2..086b84ec2f 100644 --- a/src/world/area_kkj/kkj_17/kkj_17_3_chest.c +++ b/src/world/area_kkj/kkj_17/kkj_17_3_chest.c @@ -32,7 +32,7 @@ s32 N(ChestItems)[] = { ITEM_SHOOTING_STAR, ITEM_DEEP_FOCUS1, ITEM_LAST_STAND, - ITEM_JAMMIN_JELLY, + ITEM_JAMMIN_JELLY, }; // end modified Chest.inc.c diff --git a/src/world/area_kkj/kkj_19/kkj_19_2_main.c b/src/world/area_kkj/kkj_19/kkj_19_2_main.c index 305fb579f4..488ae91b06 100644 --- a/src/world/area_kkj/kkj_19/kkj_19_2_main.c +++ b/src/world/area_kkj/kkj_19/kkj_19_2_main.c @@ -94,7 +94,7 @@ EvtScript N(EVS_TouchFloor_IngredientStation) = { WindowStyleCustom N(IngredientNameWS) = { .background = {}, .corners = { - .imgData = ui_box_corners5_png, + .imgData = ui_box_corners5_png, .fmt = G_IM_FMT_IA, .bitDepth = G_IM_SIZ_8b, .size1 = { 16, 8}, @@ -105,7 +105,7 @@ WindowStyleCustom N(IngredientNameWS) = { }, .opaqueCombineMode = gsDPSetCombineLERP( 1, 0, TEXEL1, 0, 0, 0, 0, TEXEL1, - PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED), + PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED), .transparentCombineMode = gsDPSetCombineLERP( 1, 0, TEXEL1, 0, TEXEL1, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED), diff --git a/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c b/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c index 5cbd62c668..897bb4afd0 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c +++ b/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c @@ -73,7 +73,7 @@ EvtScript N(EVS_BowserTauntMario) = { s32 N(HoverYOffsets)[] = { 1, 2, 3, 2, 1, - -1, -2, -3, -2, -1, + -1, -2, -3, -2, -1, }; EvtScript N(EVS_NpcIdle_Bowser_Body) = { diff --git a/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c b/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c index 160f83e936..ebb31db2b6 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c +++ b/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c @@ -50,7 +50,7 @@ EvtScript N(EVS_NpcDefeat_Bowser) = { }; s32 N(FlyingKammyHoverOffsets)[] = { - 1, 2, 3, 2, 1, -1, -2, -3, -2, -1, + 1, 2, 3, 2, 1, -1, -2, -3, -2, -1, }; EvtScript N(EVS_NpcAux_Kammy_Broom) = { diff --git a/src/world/area_kkj/kkj_25/kkj_25_4_npc_final.c b/src/world/area_kkj/kkj_25/kkj_25_4_npc_final.c index 0b5be4ef5c..a8394477e5 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_4_npc_final.c +++ b/src/world/area_kkj/kkj_25/kkj_25_4_npc_final.c @@ -11,7 +11,7 @@ #include "world/common/npc/Twink.h" s32 N(FlyingKammyHoverOffsets)[] = { - 1, 2, 3, 2, 1, -1, -2, -3, -2, -1, + 1, 2, 3, 2, 1, -1, -2, -3, -2, -1, }; EvtScript N(EVS_NpcAux_Kammy_Broom) = { diff --git a/src/world/area_kkj/kkj_25/kkj_25_5_arena.c b/src/world/area_kkj/kkj_25/kkj_25_5_arena.c index f16d0042e7..3e6f23ba2e 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_5_arena.c +++ b/src/world/area_kkj/kkj_25/kkj_25_5_arena.c @@ -103,7 +103,7 @@ s32 N(BridgeModels)[] = { MODEL_g45, MODEL_g44, MODEL_g43, - MODEL_g42, + MODEL_g42, MODEL_g41, MODEL_g40, MODEL_g39, @@ -111,7 +111,7 @@ s32 N(BridgeModels)[] = { MODEL_g37, MODEL_g36, MODEL_g35, - MODEL_g34, + MODEL_g34, }; EvtScript N(EVS_Scene_BowserTrapsMario) = { @@ -285,7 +285,7 @@ Vec3i N(PowerUpBoltOrigins2)[] = { { 330, 160, 50 }, { 360, 160, -50 }, { 370, 160, 50 }, - { 330, 160, -50 }, + { 330, 160, -50 }, }; EvtScript N(EVS_Scene_ActivateMachine) = { diff --git a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c index 4ec4e8a8ed..407285f2f9 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c +++ b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c @@ -181,16 +181,16 @@ EvtScript N(EVS_ManageShaking) = { // x, y, z, delay s32 N(ChainExplosionLocations)[][4] = { { 400, -10, 400, 20 }, - { 350, -50, 370, 25 }, + { 350, -50, 370, 25 }, { 300, -30, 340, 25 }, - { 350, -40, 310, 20 }, + { 350, -40, 310, 20 }, { 300, -80, 280, 20 }, - { 280, -60, 250, 20 }, + { 280, -60, 250, 20 }, { 300, -50, 220, 20 }, - { 250, -100, 190, 20 }, + { 250, -100, 190, 20 }, { 280, -70, 160, 20 }, - { 250, -50, 130, 20 }, - { 230, -100, 100, 20 }, + { 250, -50, 130, 20 }, + { 230, -100, 100, 20 }, }; EvtScript N(EVS_BowserAndKammyBlownAway) = { diff --git a/src/world/area_kkj/kkj_26/kkj_26_1_main.c b/src/world/area_kkj/kkj_26/kkj_26_1_main.c index 720e298c29..9311f930dc 100644 --- a/src/world/area_kkj/kkj_26/kkj_26_1_main.c +++ b/src/world/area_kkj/kkj_26/kkj_26_1_main.c @@ -9,7 +9,7 @@ EvtScript N(EVS_GotoMap_hos_00_1) = { EVT_CALL(GotoMapSpecial, EVT_PTR("hos_00"), hos_00_ENTRY_1, TRANSITION_END_PEACH_INTERLUDE) EVT_WAIT(100) }; - + EvtScript N(EVS_ExitDoors_kkj_14_1) = { EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) diff --git a/src/world/area_kmr/kmr_02/kmr_02.h b/src/world/area_kmr/kmr_02/kmr_02.h index 2270edd98d..7247762369 100644 --- a/src/world/area_kmr/kmr_02/kmr_02.h +++ b/src/world/area_kmr/kmr_02/kmr_02.h @@ -48,7 +48,7 @@ enum { #endif }; -enum { +enum { MF_SpawnFlag_BushCoin = MapFlag(10), MF_SpawnFlag_Goomnut = MapFlag(11), }; diff --git a/src/world/area_kmr/kmr_02/kmr_02_8_foliage.c b/src/world/area_kmr/kmr_02/kmr_02_8_foliage.c index a69806bed5..13c309dc3d 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_8_foliage.c +++ b/src/world/area_kmr/kmr_02/kmr_02_8_foliage.c @@ -19,7 +19,7 @@ SearchBushConfig N(SearchBush_Bush1) = { FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_kusa2); FoliageDropList N(Bush2_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -62,7 +62,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_midori); FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_kiki); FoliageDropList N(Tree1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_GOOMNUT, diff --git a/src/world/area_kmr/kmr_02/wander_territories.inc.c b/src/world/area_kmr/kmr_02/wander_territories.inc.c index 233e5ff309..9ae91f61c7 100644 --- a/src/world/area_kmr/kmr_02/wander_territories.inc.c +++ b/src/world/area_kmr/kmr_02/wander_territories.inc.c @@ -46,7 +46,7 @@ EnemyTerritoryWander* N(WanderTerritories)[] = { &N(WanderTerritory0), &N(WanderTerritory1), &N(WanderTerritory2), - &N(WanderTerritory3), + &N(WanderTerritory3), }; API_CALLABLE(N(SetWanderTerritory)) { diff --git a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c index 17a3c35f7d..59085ef498 100644 --- a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c +++ b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c @@ -138,7 +138,7 @@ EvtScript N(EVS_OnSearchBush8) = { FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o181); FoliageDropList N(Bush1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -166,7 +166,7 @@ SearchBushConfig N(SearchBush_Bush1) = { FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o212); FoliageDropList N(Bush2_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -194,7 +194,7 @@ SearchBushConfig N(SearchBush_Bush2) = { FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o235); FoliageDropList N(Bush3_Drops) = { - .count = 2, + .count = 2, .drops = { { .itemID = ITEM_COIN, @@ -229,7 +229,7 @@ SearchBushConfig N(SearchBush_Bush3) = { FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o182); FoliageDropList N(Bush4_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -257,7 +257,7 @@ SearchBushConfig N(SearchBush_Bush4) = { FoliageModelList N(Bush5_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o205); FoliageDropList N(Bush5_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -335,7 +335,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o237); FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o236); FoliageDropList N(Tree1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -370,7 +370,7 @@ FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o194); FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o193); FoliageDropList N(Tree2_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, diff --git a/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c b/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c index df8ad76eb7..9bd2c5a973 100644 --- a/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c +++ b/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c @@ -23,12 +23,12 @@ void N(appendGfx_sticker)(void* renderData) { ImgFXTexture ifxImg; Matrix4f mtxTransform; Matrix4f mtxTemp; - + StickerData* sticker = (StickerData*) evt_get_variable(NULL, MV_StickerData); IMG_PTR img = (IMG_PTR) evt_get_variable(NULL, MV_StickerImage); PAL_PTR pal = (PAL_PTR) evt_get_variable(NULL, MV_StickerPalette); u32 imgfxFlags = IMGFX_FLAG_400; - + gDPPipeSync(gMainGfxPos++); guTranslateF(mtxTransform, sticker->pos.x, sticker->pos.y, sticker->pos.z); guRotateF(mtxTemp, sticker->yaw, 0.0f, 1.0f, 0.0f); @@ -40,7 +40,7 @@ void N(appendGfx_sticker)(void* renderData) { guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - + ifxImg.raster = img; ifxImg.palette = pal; ifxImg.width = 32; @@ -48,13 +48,13 @@ void N(appendGfx_sticker)(void* renderData) { ifxImg.xOffset = -16; ifxImg.yOffset = 16; ifxImg.alpha = 255; - + if (sticker->yaw != 0.0 || sticker->pitch != 0.0) { imgfxFlags |= IMGFX_FLAG_2000; } imgfx_update(0, IMGFX_CLEAR, 0, 0, 0, 0, 0); imgfx_appendGfx_component(0, &ifxImg, imgfxFlags, mtxTransform); - + gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -106,7 +106,7 @@ API_CALLABLE(N(CreateSticker)) { (u8*) (iconBase + gItemIconPaletteOffsets[itemID]), (u8*) (iconPalEnd + gItemIconPaletteOffsets[itemID]), iconPal); - + sticker->imgfxIdx = imgfx_get_free_instances(1); sticker->workerID = create_worker_world(NULL, N(worker_render_sticker)); evt_set_variable(script, MV_StickerData, (s32) sticker); @@ -121,7 +121,7 @@ API_CALLABLE(N(SetStickerPos)) { f32 y = evt_get_float_variable(script, *args++); f32 z = evt_get_float_variable(script, *args++); StickerData* sticker = (StickerData*) evt_get_variable(script, MV_StickerData); - + sticker->pos.x = x; sticker->pos.y = y; sticker->pos.z = z; @@ -143,11 +143,11 @@ API_CALLABLE(N(JumpStickerTo)) { Bytecode* args = script->ptrReadPos; StickerData* data = (StickerData*) evt_get_variable(script, MV_StickerData); f32 x, y, z, dist; - + if (isInitialCall) { script->functionTemp[0] = 0; } - + if (script->functionTemp[0] == 0) { x = evt_get_float_variable(script, *args++); y = evt_get_float_variable(script, *args++) + 12.0f; @@ -168,16 +168,16 @@ API_CALLABLE(N(JumpStickerTo)) { } else { data->moveSpeed = dist / data->duration; } - + data->fallSpeed = (data->gravity * data->duration * 0.5f) + y / data->duration; script->functionTemp[0] = 1; } - + data->pos.x = data->pos.x + data->moveSpeed * sin_deg(data->moveAngle); data->pos.z = data->pos.z - data->moveSpeed * cos_deg(data->moveAngle); data->pos.y = data->pos.y + data->fallSpeed; data->fallSpeed -= data->gravity; - + data->duration--; if (data->duration < 0) { data->fallSpeed = 0.0f; @@ -194,7 +194,7 @@ API_CALLABLE(N(SetStickerGravity)) { Bytecode* args = script->ptrReadPos; f32 gravity = evt_get_float_variable(script, *args++); StickerData* data = (StickerData*) evt_get_variable(script, MV_StickerData); - + data->gravity = gravity; return ApiStatus_DONE2; } diff --git a/src/world/area_kmr/kmr_11/kmr_11_7_foliage.c b/src/world/area_kmr/kmr_11/kmr_11_7_foliage.c index bb4c5821cd..2252a7c6f2 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_7_foliage.c +++ b/src/world/area_kmr/kmr_11/kmr_11_7_foliage.c @@ -48,7 +48,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o349); FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o352); FoliageDropList N(Tree1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_STAR_PIECE, @@ -84,7 +84,7 @@ FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o458); FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o461); FoliageDropList N(Tree2_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, diff --git a/src/world/area_kmr/kmr_11/kmr_11_8_fortress_skeleton.c b/src/world/area_kmr/kmr_11/kmr_11_8_fortress_skeleton.c index bf3a737344..5b7079553d 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_8_fortress_skeleton.c +++ b/src/world/area_kmr/kmr_11/kmr_11_8_fortress_skeleton.c @@ -704,30 +704,30 @@ StaticAnimatorNode N(D_802481F0_8E22F0) = { StaticAnimatorNode* N(AnimSkeleton_Fortress)[] = { &N(D_802481F0_8E22F0), &N(D_802481C4_8E22C4), &N(D_80248198_8E2298), &N(D_8024816C_8E226C), - &N(D_80248140_8E2240), &N(D_80248114_8E2214), &N(D_802480E8_8E21E8), &N(D_802480BC_8E21BC), + &N(D_80248140_8E2240), &N(D_80248114_8E2214), &N(D_802480E8_8E21E8), &N(D_802480BC_8E21BC), &N(D_80248090_8E2190), &N(D_80248064_8E2164), &N(D_80248038_8E2138), &N(D_8024800C_8E210C), - &N(D_80247FE0_8E20E0), &N(D_80247FB4_8E20B4), &N(D_80247F88_8E2088), &N(D_80247F5C_8E205C), + &N(D_80247FE0_8E20E0), &N(D_80247FB4_8E20B4), &N(D_80247F88_8E2088), &N(D_80247F5C_8E205C), &N(D_80247F30_8E2030), &N(D_80247F04_8E2004), &N(D_80247ED8_8E1FD8), &N(D_80247EAC_8E1FAC), - &N(D_80247E80_8E1F80), &N(D_80247E54_8E1F54), &N(D_80247E28_8E1F28), &N(D_80247DFC_8E1EFC), + &N(D_80247E80_8E1F80), &N(D_80247E54_8E1F54), &N(D_80247E28_8E1F28), &N(D_80247DFC_8E1EFC), &N(D_80247DD0_8E1ED0), &N(D_80247DA4_8E1EA4), &N(D_80247D78_8E1E78), &N(D_80247D4C_8E1E4C), - &N(D_80247D20_8E1E20), &N(D_80247CF4_8E1DF4), &N(D_80247CC8_8E1DC8), &N(D_80247C9C_8E1D9C), + &N(D_80247D20_8E1E20), &N(D_80247CF4_8E1DF4), &N(D_80247CC8_8E1DC8), &N(D_80247C9C_8E1D9C), &N(D_80247C70_8E1D70), &N(D_80247C44_8E1D44), &N(D_80247C18_8E1D18), &N(D_80247BEC_8E1CEC), - &N(D_80247BC0_8E1CC0), &N(D_80247B94_8E1C94), &N(D_80247B68_8E1C68), &N(D_80247B3C_8E1C3C), + &N(D_80247BC0_8E1CC0), &N(D_80247B94_8E1C94), &N(D_80247B68_8E1C68), &N(D_80247B3C_8E1C3C), &N(D_80247B10_8E1C10), &N(D_80247AE4_8E1BE4), &N(D_80247AB8_8E1BB8), &N(D_80247A8C_8E1B8C), - &N(D_80247A60_8E1B60), &N(D_80247A34_8E1B34), &N(D_80247A08_8E1B08), &N(D_802479DC_8E1ADC), + &N(D_80247A60_8E1B60), &N(D_80247A34_8E1B34), &N(D_80247A08_8E1B08), &N(D_802479DC_8E1ADC), &N(D_802479B0_8E1AB0), &N(D_80247984_8E1A84), &N(D_80247958_8E1A58), &N(D_8024792C_8E1A2C), - &N(D_80247900_8E1A00), &N(D_802478D4_8E19D4), &N(D_802478A8_8E19A8), &N(D_8024787C_8E197C), + &N(D_80247900_8E1A00), &N(D_802478D4_8E19D4), &N(D_802478A8_8E19A8), &N(D_8024787C_8E197C), &N(D_80247850_8E1950), &N(D_80247824_8E1924), &N(D_802477F8_8E18F8), &N(D_802477CC_8E18CC), - &N(D_802477A0_8E18A0), &N(D_80247774_8E1874), &N(D_80247748_8E1848), &N(D_8024771C_8E181C), + &N(D_802477A0_8E18A0), &N(D_80247774_8E1874), &N(D_80247748_8E1848), &N(D_8024771C_8E181C), &N(D_802476F0_8E17F0), &N(D_802476C4_8E17C4), &N(D_80247698_8E1798), &N(D_8024766C_8E176C), - &N(D_80247640_8E1740), &N(D_80247614_8E1714), &N(D_802475E8_8E16E8), &N(D_802475BC_8E16BC), + &N(D_80247640_8E1740), &N(D_80247614_8E1714), &N(D_802475E8_8E16E8), &N(D_802475BC_8E16BC), &N(D_80247590_8E1690), &N(D_80247564_8E1664), &N(D_80247538_8E1638), &N(D_8024750C_8E160C), - &N(D_802474E0_8E15E0), &N(D_802474B4_8E15B4), &N(D_80247488_8E1588), &N(D_8024745C_8E155C), + &N(D_802474E0_8E15E0), &N(D_802474B4_8E15B4), &N(D_80247488_8E1588), &N(D_8024745C_8E155C), &N(D_80247430_8E1530), &N(D_80247404_8E1504), &N(D_802473D8_8E14D8), &N(D_802473AC_8E14AC), - &N(D_80247380_8E1480), &N(D_80247354_8E1454), &N(D_80247328_8E1428), &N(D_802472FC_8E13FC), + &N(D_80247380_8E1480), &N(D_80247354_8E1454), &N(D_80247328_8E1428), &N(D_802472FC_8E13FC), &N(D_802472D0_8E13D0), &N(D_802472A4_8E13A4), &N(D_80247278_8E1378), &N(D_8024724C_8E134C), - &N(D_80247220_8E1320), &N(D_802471F4_8E12F4), &N(D_802471C8_8E12C8), &N(D_8024719C_8E129C), + &N(D_80247220_8E1320), &N(D_802471F4_8E12F4), &N(D_802471C8_8E12C8), &N(D_8024719C_8E129C), &N(D_80247170_8E1270), &N(D_80247144_8E1244), &N(D_80247118_8E1218), &N(D_802470EC_8E11EC), - &N(D_802470C0_8E11C0), &N(D_80247094_8E1194), &N(D_80247068_8E1168), &N(D_8024703C_8E113C), + &N(D_802470C0_8E11C0), &N(D_80247094_8E1194), &N(D_80247068_8E1168), &N(D_8024703C_8E113C), &N(D_80247010_8E1110), NULL }; diff --git a/src/world/area_kmr/kmr_20/kmr_20_13_records.c b/src/world/area_kmr/kmr_20/kmr_20_13_records.c index 6a319af399..59f8ceec1d 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_13_records.c +++ b/src/world/area_kmr/kmr_20/kmr_20_13_records.c @@ -54,7 +54,7 @@ s32 N(RecipeFoundVars)[] = { GF_MAC02_DiscoveredRecipe_2D, GF_MAC02_DiscoveredRecipe_2F, GF_MAC02_DiscoveredRecipe_30, GF_MAC02_DiscoveredRecipe_31, GF_MAC02_DiscoveredRecipe_32, GF_MAC02_DiscoveredRecipe_33, - 0 + 0 }; void N(appendGfx_records_impl)(GameRecords* records, s32 alpha) { diff --git a/src/world/area_kmr/kmr_22/kmr_22_1_main.c b/src/world/area_kmr/kmr_22/kmr_22_1_main.c index c77cd40999..b29d894a34 100644 --- a/src/world/area_kmr/kmr_22/kmr_22_1_main.c +++ b/src/world/area_kmr/kmr_22/kmr_22_1_main.c @@ -19,7 +19,7 @@ s16 N(AnimTextOffsets)[CHUNK_SIZE * 2] = { 5, 3, 2, 1, #else 310, 290, 270, 250, 230, - 210, 190, 170, 150, 130, + 210, 190, 170, 150, 130, 110, 90, 70, 50, 32, 16, 8, 4, 2, 1, #endif diff --git a/src/world/area_kmr/kmr_24/kmr_24_1_main.c b/src/world/area_kmr/kmr_24/kmr_24_1_main.c index 2d33eb2f6b..3023ede92d 100644 --- a/src/world/area_kmr/kmr_24/kmr_24_1_main.c +++ b/src/world/area_kmr/kmr_24/kmr_24_1_main.c @@ -4,15 +4,15 @@ API_CALLABLE(N(ExitGame)) { s16 progress; s16 result; - + if (isInitialCall) { set_map_transition_effect(TRANSITION_BEGIN_OR_END_GAME); script->functionTemp[1] = 0; } - + progress = script->functionTemp[1]; result = update_exit_map_screen_overlay(&progress); - + if (result == 0) { script->functionTemp[1] = progress; return ApiStatus_BLOCK; diff --git a/src/world/area_kpa/kpa_52/kpa_52.h b/src/world/area_kpa/kpa_52/kpa_52.h index a08ba07454..31847fb88f 100644 --- a/src/world/area_kpa/kpa_52/kpa_52.h +++ b/src/world/area_kpa/kpa_52/kpa_52.h @@ -29,7 +29,7 @@ enum { }; enum { - MV_PadlockEntityID = MapVar(0), + MV_PadlockEntityID = MapVar(0), }; #define NAMESPACE kpa_52 diff --git a/src/world/area_kpa/kpa_96/kpa_96_3_npc.c b/src/world/area_kpa/kpa_96/kpa_96_3_npc.c index 089040c333..cb9cccbc36 100644 --- a/src/world/area_kpa/kpa_96/kpa_96_3_npc.c +++ b/src/world/area_kpa/kpa_96/kpa_96_3_npc.c @@ -8,7 +8,7 @@ s32 N(ShopMessages)[] = { [SHOP_MSG_GREETING ] MSG_Shop_04_KPA96, [SHOP_MSG_INSTRUCTIONS ] MSG_Shop_05_KPA96, [SHOP_MSG_NOTHING_TO_SELL ] MSG_Shop_06_KPA96, - [SHOP_MSG_SELL_WHICH ] MSG_Shop_07_KPA96, + [SHOP_MSG_SELL_WHICH ] MSG_Shop_07_KPA96, [SHOP_MSG_SELL_CONFIRM ] MSG_Shop_08_KPA96, [SHOP_MSG_SELL_CANCEL ] MSG_Shop_09_KPA96, [SHOP_MSG_SELL_MORE ] MSG_Shop_0A_KPA96, @@ -16,14 +16,14 @@ s32 N(ShopMessages)[] = { [SHOP_MSG_NOTHING_TO_CHECK ] MSG_Shop_0C_KPA96, [SHOP_MSG_NO_CHECK_ROOM ] MSG_Shop_0D_KPA96, [SHOP_MSG_CHECK_WHICH ] MSG_Shop_0E_KPA96, - [SHOP_MSG_CHECK_ACCEPTED ] MSG_Shop_0F_KPA96, + [SHOP_MSG_CHECK_ACCEPTED ] MSG_Shop_0F_KPA96, [SHOP_MSG_CHECK_MORE ] MSG_Shop_10_KPA96, [SHOP_MSG_NOTHING_TO_CLAIM ] MSG_Shop_11_KPA96, [SHOP_MSG_NO_CLAIM_ROOM ] MSG_Shop_12_KPA96, [SHOP_MSG_CLAIM_WHICH ] MSG_Shop_13_KPA96, [SHOP_MSG_CLAIM_ACCEPTED ] MSG_Shop_14_KPA96, [SHOP_MSG_CLAIM_MORE ] MSG_Shop_15_KPA96, - [SHOP_MSG_FAREWELL ] MSG_Shop_16_KPA96, + [SHOP_MSG_FAREWELL ] MSG_Shop_16_KPA96, }; ShopItemData N(Inventory)[] = { @@ -37,14 +37,14 @@ ShopItemData N(Inventory)[] = { }; ShopSellPriceData N(PriceList)[] = { - { .itemID = ITEM_FRIGHT_JAR, .sellPrice = 15 }, - { .itemID = ITEM_EGG_MISSILE, .sellPrice = 30 }, - { .itemID = ITEM_PEBBLE, .sellPrice = 20 }, - { .itemID = ITEM_MISTAKE, .sellPrice = 20 }, - { .itemID = ITEM_LIFE_SHROOM, .sellPrice = 25 }, - { .itemID = ITEM_SHOOTING_STAR, .sellPrice = 20 }, - { .itemID = ITEM_SUPER_SODA, .sellPrice = 10 }, - { .itemID = ITEM_STOP_WATCH, .sellPrice = 20 }, + { .itemID = ITEM_FRIGHT_JAR, .sellPrice = 15 }, + { .itemID = ITEM_EGG_MISSILE, .sellPrice = 30 }, + { .itemID = ITEM_PEBBLE, .sellPrice = 20 }, + { .itemID = ITEM_MISTAKE, .sellPrice = 20 }, + { .itemID = ITEM_LIFE_SHROOM, .sellPrice = 25 }, + { .itemID = ITEM_SHOOTING_STAR, .sellPrice = 20 }, + { .itemID = ITEM_SUPER_SODA, .sellPrice = 10 }, + { .itemID = ITEM_STOP_WATCH, .sellPrice = 20 }, {} }; @@ -60,12 +60,12 @@ EvtScript N(EVS_OnBuy) = { }; ShopItemLocation N(ItemPositions)[] = { - { .posModelID = MODEL_o831, .triggerColliderID = COLLIDER_o865 }, - { .posModelID = MODEL_o832, .triggerColliderID = COLLIDER_o864 }, - { .posModelID = MODEL_o833, .triggerColliderID = COLLIDER_o863 }, - { .posModelID = MODEL_o834, .triggerColliderID = COLLIDER_o862 }, - { .posModelID = MODEL_o835, .triggerColliderID = COLLIDER_o861 }, - { .posModelID = MODEL_o836, .triggerColliderID = COLLIDER_o860 }, + { .posModelID = MODEL_o831, .triggerColliderID = COLLIDER_o865 }, + { .posModelID = MODEL_o832, .triggerColliderID = COLLIDER_o864 }, + { .posModelID = MODEL_o833, .triggerColliderID = COLLIDER_o863 }, + { .posModelID = MODEL_o834, .triggerColliderID = COLLIDER_o862 }, + { .posModelID = MODEL_o835, .triggerColliderID = COLLIDER_o861 }, + { .posModelID = MODEL_o836, .triggerColliderID = COLLIDER_o860 }, }; ShopOwner N(Owner) = { diff --git a/src/world/area_kzn/kzn_03/kzn_03_3_entity.c b/src/world/area_kzn/kzn_03/kzn_03_3_entity.c index fe89b4f541..7674027485 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_3_entity.c +++ b/src/world/area_kzn/kzn_03/kzn_03_3_entity.c @@ -6,7 +6,7 @@ API_CALLABLE(N(IsPlayerOnFirstCliff)) { s32 result = -1; - + if (gPlayerStatus.lastGoodPosition.y > 800.0) { result = 0; } @@ -16,7 +16,7 @@ API_CALLABLE(N(IsPlayerOnFirstCliff)) { if (result >= 0) { evt_set_variable(script, MV_PlayerCliffState, result); } - + return ApiStatus_BLOCK; } diff --git a/src/world/area_kzn/kzn_08/kzn_08_4_extra.c b/src/world/area_kzn/kzn_08/kzn_08_4_extra.c index 41bbdd388d..19f7f52ea9 100644 --- a/src/world/area_kzn/kzn_08/kzn_08_4_extra.c +++ b/src/world/area_kzn/kzn_08/kzn_08_4_extra.c @@ -13,12 +13,12 @@ API_CALLABLE(N(func_80243EE0_C75360)) { script->functionTemp[0] = 255; script->functionTemp[1] = FALSE; } - + set_screen_overlay_center_worldpos(SCREEN_LAYER_BACK, 1, playerStatus->position.x, playerStatus->position.y + 8.0f, playerStatus->position.z); get_model_fog_color_parameters(&primR, &primG, &primB, &primA, &fogR, &fogG, &fogB, &fogStart, &fogEnd); - + alpha = (((995 - fogStart) - 70.0f) * 255.0f) / 30.0f; if (alpha > 255.0f) { alpha = 255.0f; diff --git a/src/world/area_mac/mac_00/mac_00_6_shop.c b/src/world/area_mac/mac_00/mac_00_6_shop.c index b527d86e22..23713ff8e8 100644 --- a/src/world/area_mac/mac_00/mac_00_6_shop.c +++ b/src/world/area_mac/mac_00/mac_00_6_shop.c @@ -1,29 +1,29 @@ #include "mac_00.h" s32 N(ShopMessages)[] = { - [SHOP_MSG_BUY_CONFIRM ] MSG_Shop_00_MAC00, + [SHOP_MSG_BUY_CONFIRM ] MSG_Shop_00_MAC00, [SHOP_MSG_NOT_ENOUGH_COINS ] MSG_Shop_01_MAC00, [SHOP_MSG_NOT_ENOUGH_ROOM ] MSG_Shop_02_MAC00, [SHOP_MSG_BUY_THANK_YOU ] MSG_Shop_03_MAC00, [SHOP_MSG_GREETING ] MSG_Shop_04_MAC00, [SHOP_MSG_INSTRUCTIONS ] MSG_Shop_05_MAC00, [SHOP_MSG_NOTHING_TO_SELL ] MSG_Shop_06_MAC00, - [SHOP_MSG_SELL_WHICH ] MSG_Shop_07_MAC00, - [SHOP_MSG_SELL_CONFIRM ] MSG_Shop_08_MAC00, + [SHOP_MSG_SELL_WHICH ] MSG_Shop_07_MAC00, + [SHOP_MSG_SELL_CONFIRM ] MSG_Shop_08_MAC00, [SHOP_MSG_SELL_CANCEL ] MSG_Shop_09_MAC00, [SHOP_MSG_SELL_MORE ] MSG_Shop_0A_MAC00, [SHOP_MSG_SELL_THANKS ] MSG_Shop_0B_MAC00, [SHOP_MSG_NOTHING_TO_CHECK ] MSG_Shop_0C_MAC00, [SHOP_MSG_NO_CHECK_ROOM ] MSG_Shop_0D_MAC00, [SHOP_MSG_CHECK_WHICH ] MSG_Shop_0E_MAC00, - [SHOP_MSG_CHECK_ACCEPTED ] MSG_Shop_0F_MAC00, - [SHOP_MSG_CHECK_MORE ] MSG_Shop_10_MAC00, + [SHOP_MSG_CHECK_ACCEPTED ] MSG_Shop_0F_MAC00, + [SHOP_MSG_CHECK_MORE ] MSG_Shop_10_MAC00, [SHOP_MSG_NOTHING_TO_CLAIM ] MSG_Shop_11_MAC00, [SHOP_MSG_NO_CLAIM_ROOM ] MSG_Shop_12_MAC00, [SHOP_MSG_CLAIM_WHICH ] MSG_Shop_13_MAC00, [SHOP_MSG_CLAIM_ACCEPTED ] MSG_Shop_14_MAC00, [SHOP_MSG_CLAIM_MORE ] MSG_Shop_15_MAC00, - [SHOP_MSG_FAREWELL ] MSG_Shop_16_MAC00, + [SHOP_MSG_FAREWELL ] MSG_Shop_16_MAC00, }; ShopItemData N(Inventory)[] = { diff --git a/src/world/area_mac/mac_01/mac_01_13_foliage.c b/src/world/area_mac/mac_01/mac_01_13_foliage.c index 12d2a0d05b..435b2efeab 100644 --- a/src/world/area_mac/mac_01/mac_01_13_foliage.c +++ b/src/world/area_mac/mac_01/mac_01_13_foliage.c @@ -3,7 +3,7 @@ #include "common/foliage.inc.c" FoliageDropList N(Tree1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_STAR_PIECE, diff --git a/src/world/area_mac/mac_01/mac_01_4_rooms.c b/src/world/area_mac/mac_01/mac_01_4_rooms.c index 9b2492f1c3..853792f6fd 100644 --- a/src/world/area_mac/mac_01/mac_01_4_rooms.c +++ b/src/world/area_mac/mac_01/mac_01_4_rooms.c @@ -231,7 +231,7 @@ EvtScript N(EVS_SetupRooms) = { EVT_PTR(N(EVS_RoomListener_ToadHouse)), COLLIDER_deilit2, COLLIDER_deilit2u, - MODEL_kinopi, + MODEL_kinopi, EVT_PTR(N(InsideNPCs_ToadHouse))) // merlon's house EVT_CALL(CreateMapRoom, diff --git a/src/world/area_mac/mac_01/mac_01_5_shop.c b/src/world/area_mac/mac_01/mac_01_5_shop.c index da95eaf90e..249f8e3f1d 100644 --- a/src/world/area_mac/mac_01/mac_01_5_shop.c +++ b/src/world/area_mac/mac_01/mac_01_5_shop.c @@ -26,7 +26,7 @@ API_CALLABLE(N(CreateShopInventory)) { s32 available; s32 count; s32 i; - + ShopItemData* inventory = heap_malloc(4 * sizeof(ShopItemData)); s32* buyFlags = heap_malloc(3 * sizeof(s32)); buyFlags[0] = 0; @@ -36,7 +36,7 @@ API_CALLABLE(N(CreateShopInventory)) { inventory[1].itemID = 0; inventory[2].itemID = 0; inventory[3].itemID = 0; - + if (!evt_get_variable(script, GF_MAC01_RowfBadgesChosen)) { available = 0; for (i = 0; i < (u32) ARRAY_COUNT(options); i++) { @@ -46,7 +46,7 @@ API_CALLABLE(N(CreateShopInventory)) { options[available++] = i; } } - + count = 0; while (available != 0) { randIdx = rand_int(available - 1); @@ -57,7 +57,7 @@ API_CALLABLE(N(CreateShopInventory)) { inventory[count].price = gItemTable[itemID].sellValue; inventory[count].descMsg = mac_01_RowfBadgeInventory[shopIdx].descMsg; buyFlags[count] = varBaseHasBought + shopIdx; - + evt_set_variable(script, GB_MAC01_Rowf_Badge0 + count, shopIdx); count++; @@ -84,7 +84,7 @@ API_CALLABLE(N(CreateShopInventory)) { } script->varTable[3] = TRUE; } - + script->varTable[0] = count; script->varTablePtr[1] = buyFlags; script->varTablePtr[2] = inventory; @@ -99,7 +99,7 @@ s32 N(ShopMessages)[] = { [SHOP_MSG_GREETING ] MSG_Shop_04_MAC00, [SHOP_MSG_INSTRUCTIONS ] MSG_Shop_05_MAC00, [SHOP_MSG_NOTHING_TO_SELL ] MSG_Shop_06_MAC00, - [SHOP_MSG_SELL_WHICH ] MSG_Shop_07_MAC00, + [SHOP_MSG_SELL_WHICH ] MSG_Shop_07_MAC00, [SHOP_MSG_SELL_CONFIRM ] MSG_Shop_08_MAC00, [SHOP_MSG_SELL_CANCEL ] MSG_Shop_09_MAC00, [SHOP_MSG_SELL_MORE ] MSG_Shop_0A_MAC00, @@ -107,14 +107,14 @@ s32 N(ShopMessages)[] = { [SHOP_MSG_NOTHING_TO_CHECK ] MSG_Shop_0C_MAC00, [SHOP_MSG_NO_CHECK_ROOM ] MSG_Shop_0D_MAC00, [SHOP_MSG_CHECK_WHICH ] MSG_Shop_0E_MAC00, - [SHOP_MSG_CHECK_ACCEPTED ] MSG_Shop_0F_MAC00, + [SHOP_MSG_CHECK_ACCEPTED ] MSG_Shop_0F_MAC00, [SHOP_MSG_CHECK_MORE ] MSG_Shop_10_MAC00, [SHOP_MSG_NOTHING_TO_CLAIM ] MSG_Shop_11_MAC00, [SHOP_MSG_NO_CLAIM_ROOM ] MSG_Shop_12_MAC00, [SHOP_MSG_CLAIM_WHICH ] MSG_Shop_13_MAC00, [SHOP_MSG_CLAIM_ACCEPTED ] MSG_Shop_14_MAC00, [SHOP_MSG_CLAIM_MORE ] MSG_Shop_15_MAC00, - [SHOP_MSG_FAREWELL ] MSG_Shop_16_MAC01, + [SHOP_MSG_FAREWELL ] MSG_Shop_16_MAC01, }; ShopSellPriceData N(RowfDummyPriceList)[] = { @@ -165,9 +165,9 @@ ShopItemData N(RowfBadgeInventory)[] = { }; ShopItemLocation N(RowfItemPositions)[] = { - { .posModelID = MODEL_b3, .triggerColliderID = COLLIDER_b3 }, - { .posModelID = MODEL_b2, .triggerColliderID = COLLIDER_b2 }, - { .posModelID = MODEL_b1, .triggerColliderID = COLLIDER_b1 }, + { .posModelID = MODEL_b3, .triggerColliderID = COLLIDER_b3 }, + { .posModelID = MODEL_b2, .triggerColliderID = COLLIDER_b2 }, + { .posModelID = MODEL_b1, .triggerColliderID = COLLIDER_b1 }, }; ShopOwner N(ShopOwnerRowf) = { diff --git a/src/world/area_mac/mac_04/mac_04_5_shop.c b/src/world/area_mac/mac_04/mac_04_5_shop.c index a3ffa81c44..8c6f827b17 100644 --- a/src/world/area_mac/mac_04/mac_04_5_shop.c +++ b/src/world/area_mac/mac_04/mac_04_5_shop.c @@ -8,7 +8,7 @@ s32 N(ShopMessages)[] = { [SHOP_MSG_GREETING ] MSG_Shop_04_MAC04, [SHOP_MSG_INSTRUCTIONS ] MSG_Shop_05_MAC04, [SHOP_MSG_NOTHING_TO_SELL ] MSG_Shop_06_MAC04, - [SHOP_MSG_SELL_WHICH ] MSG_Shop_07_MAC04, + [SHOP_MSG_SELL_WHICH ] MSG_Shop_07_MAC04, [SHOP_MSG_SELL_CONFIRM ] MSG_Shop_08_MAC04, [SHOP_MSG_SELL_CANCEL ] MSG_Shop_09_MAC04, [SHOP_MSG_SELL_MORE ] MSG_Shop_0A_MAC04, @@ -16,14 +16,14 @@ s32 N(ShopMessages)[] = { [SHOP_MSG_NOTHING_TO_CHECK ] MSG_Shop_0C_MAC04, [SHOP_MSG_NO_CHECK_ROOM ] MSG_Shop_0D_MAC04, [SHOP_MSG_CHECK_WHICH ] MSG_Shop_0E_MAC04, - [SHOP_MSG_CHECK_ACCEPTED ] MSG_Shop_0F_MAC04, + [SHOP_MSG_CHECK_ACCEPTED ] MSG_Shop_0F_MAC04, [SHOP_MSG_CHECK_MORE ] MSG_Shop_10_MAC04, [SHOP_MSG_NOTHING_TO_CLAIM ] MSG_Shop_11_MAC04, [SHOP_MSG_NO_CLAIM_ROOM ] MSG_Shop_12_MAC04, [SHOP_MSG_CLAIM_WHICH ] MSG_Shop_13_MAC04, [SHOP_MSG_CLAIM_ACCEPTED ] MSG_Shop_14_MAC04, [SHOP_MSG_CLAIM_MORE ] MSG_Shop_15_MAC04, - [SHOP_MSG_FAREWELL ] MSG_Shop_16_MAC04, + [SHOP_MSG_FAREWELL ] MSG_Shop_16_MAC04, }; ShopItemData N(Inventory)[] = { @@ -58,12 +58,12 @@ EvtScript N(EVS_OnBuy) = { }; ShopItemLocation N(ItemPositions)[] = { - { .posModelID = MODEL_mono1, .triggerColliderID = COLLIDER_mono1 }, - { .posModelID = MODEL_mono2, .triggerColliderID = COLLIDER_mono2 }, - { .posModelID = MODEL_mono3, .triggerColliderID = COLLIDER_mono3 }, - { .posModelID = MODEL_mono4, .triggerColliderID = COLLIDER_mono4 }, - { .posModelID = MODEL_mono5, .triggerColliderID = COLLIDER_mono5 }, - { .posModelID = MODEL_mono6, .triggerColliderID = COLLIDER_mono6 }, + { .posModelID = MODEL_mono1, .triggerColliderID = COLLIDER_mono1 }, + { .posModelID = MODEL_mono2, .triggerColliderID = COLLIDER_mono2 }, + { .posModelID = MODEL_mono3, .triggerColliderID = COLLIDER_mono3 }, + { .posModelID = MODEL_mono4, .triggerColliderID = COLLIDER_mono4 }, + { .posModelID = MODEL_mono5, .triggerColliderID = COLLIDER_mono5 }, + { .posModelID = MODEL_mono6, .triggerColliderID = COLLIDER_mono6 }, }; ShopOwner N(Owner) = { diff --git a/src/world/area_mac/mac_04/npc_harry_t.inc.c b/src/world/area_mac/mac_04/npc_harry_t.inc.c index b5404e0654..eea680deb3 100644 --- a/src/world/area_mac/mac_04/npc_harry_t.inc.c +++ b/src/world/area_mac/mac_04/npc_harry_t.inc.c @@ -1,6 +1,6 @@ s32 N(ItemList_StoreroomKey)[] = { ITEM_STOREROOM_KEY, - ITEM_NONE + ITEM_NONE }; EvtScript N(EVS_NpcInteract_HarryT) = { diff --git a/src/world/area_mac/mac_05/mac_05_7_club64_sign.c b/src/world/area_mac/mac_05/mac_05_7_club64_sign.c index 395fa20ca3..468e01c875 100644 --- a/src/world/area_mac/mac_05/mac_05_7_club64_sign.c +++ b/src/world/area_mac/mac_05/mac_05_7_club64_sign.c @@ -8,7 +8,7 @@ void N(hsl_to_rgb)(f32 hue, f32 saturation, f32 lightness, f32* outR, f32* outG, f32 hueSector; f32 p, q, m; f32 s, t; - + if (lightness <= 0.5f) { q = lightness * (1.0 + saturation); } else { @@ -21,14 +21,14 @@ void N(hsl_to_rgb)(f32 hue, f32 saturation, f32 lightness, f32* outR, f32* outG, *outR = 0.0f; return; } - + hue *= 6.0f; hueSector = (s32) hue; p = (2 * lightness) - q; m = q * ((q - p) / q) * (hue - hueSector); s = p + m; t = q - m; - + switch ((s32) hueSector) { case 0: *outR = q; diff --git a/src/world/area_mac/machi/machi_1_tables.c b/src/world/area_mac/machi/machi_1_tables.c index 8ee725a9b5..5502bad11e 100644 --- a/src/world/area_mac/machi/machi_1_tables.c +++ b/src/world/area_mac/machi/machi_1_tables.c @@ -41,7 +41,7 @@ GameVarRange N(GameByteTable)[] = { VAR_RANGE_BYTE("GSW FBTL", GB_Unused_FBTL_00, GB_Unused_DOKAN_00, GB_Unused_FBTL_00), VAR_RANGE_BYTE("GSW DOKAN", GB_Unused_DOKAN_00, GB_WorldLocation, GB_Unused_DOKAN_00), VAR_RANGE_BYTE("GSW MAP", GB_WorldLocation, GB_Unused_1B4, GB_Unused_MAP_01), - {} + {} }; #define VAR_RANGE_FLAG(s, firstVar, nextRange, nextVar) \ @@ -85,5 +85,5 @@ GameVarRange N(GameFlagTable)[] = { VAR_RANGE_FLAG("GSWF FBTL", GF_FBTL_00, GF_TIK01_WarpPipes, GF_Unused_FBTL_4B), VAR_RANGE_FLAG("GSWF DOKAN", GF_TIK01_WarpPipes, GF_MAP_ToadTown, GF_Unused_DOKAN_09), VAR_RANGE_FLAG("GSWF MAP", GF_MAP_ToadTown, GF_Unused_7E0, GF_Unused_MAP_22), - {} + {} }; diff --git a/src/world/area_mac/machi/machi_2_main.c b/src/world/area_mac/machi/machi_2_main.c index e8d1625308..55d4c00035 100644 --- a/src/world/area_mac/machi/machi_2_main.c +++ b/src/world/area_mac/machi/machi_2_main.c @@ -3,7 +3,7 @@ API_CALLABLE(N(CheckGameVarRanges)) { GameVarRange* bytes; GameVarRange* flags; - + bytes = N(GameByteTable); while (TRUE) { if (bytes->name == 0) { @@ -12,7 +12,7 @@ API_CALLABLE(N(CheckGameVarRanges)) { // release version does nothing bytes++; } - + flags = N(GameFlagTable); while (TRUE) { if (flags->name == 0) { @@ -21,7 +21,7 @@ API_CALLABLE(N(CheckGameVarRanges)) { // release version does nothing flags++; } - + return 2; } diff --git a/src/world/area_mgm/mgm_01/mgm_01_4_images.c b/src/world/area_mgm/mgm_01/mgm_01_4_images.c index 031b595791..3c31dba34f 100644 --- a/src/world/area_mgm/mgm_01/mgm_01_4_images.c +++ b/src/world/area_mgm/mgm_01/mgm_01_4_images.c @@ -18,32 +18,32 @@ MessageImageData N(MsgImgs_Panels)[] = { { - .raster = N(panel_1_coin_img), - .palette = N(panel_1_coin_pal), + .raster = N(panel_1_coin_img), + .palette = N(panel_1_coin_pal), .width = N(panel_1_coin_img_width), .height = N(panel_1_coin_img_height), .format = G_IM_FMT_CI, .bitDepth = G_IM_SIZ_4b, }, { - .raster = N(panel_5_coins_img), - .palette = N(panel_5_coins_pal), + .raster = N(panel_5_coins_img), + .palette = N(panel_5_coins_pal), .width = N(panel_5_coins_img_width), .height = N(panel_5_coins_img_height), .format = G_IM_FMT_CI, .bitDepth = G_IM_SIZ_4b, }, { - .raster = N(panel_times_5_img), - .palette = N(panel_times_5_pal), + .raster = N(panel_times_5_img), + .palette = N(panel_times_5_pal), .width = N(panel_times_5_img_width), .height = N(panel_times_5_img_height), .format = G_IM_FMT_CI, .bitDepth = G_IM_SIZ_4b, }, { - .raster = N(panel_bowser_img), - .palette = N(panel_bowser_pal), + .raster = N(panel_bowser_img), + .palette = N(panel_bowser_pal), .width = N(panel_bowser_img_width), .height = N(panel_bowser_img_height), .format = G_IM_FMT_CI, diff --git a/src/world/area_mgm/mgm_02/mgm_02_3_images.c b/src/world/area_mgm/mgm_02/mgm_02_3_images.c index 8abfd79e4e..ed941c931a 100644 --- a/src/world/area_mgm/mgm_02/mgm_02_3_images.c +++ b/src/world/area_mgm/mgm_02/mgm_02_3_images.c @@ -6,8 +6,8 @@ MessageImageData N(MsgImg_PeachPanel)[] = { { - .raster = N(panel_peach_img), - .palette = N(panel_peach_pal), + .raster = N(panel_peach_img), + .palette = N(panel_peach_pal), .width = N(panel_peach_img_width), .height = N(panel_peach_img_height), .format = G_IM_FMT_CI, diff --git a/src/world/area_mim/mim_11/mim_11_6_foliage.c b/src/world/area_mim/mim_11/mim_11_6_foliage.c index ca61c37d92..1d26e0e01a 100644 --- a/src/world/area_mim/mim_11/mim_11_6_foliage.c +++ b/src/world/area_mim/mim_11/mim_11_6_foliage.c @@ -5,7 +5,7 @@ FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o182); FoliageDropList N(Bush1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_STRANGE_LEAF, diff --git a/src/world/area_nok/nok_01/nok_01_4_npc.c b/src/world/area_nok/nok_01/nok_01_4_npc.c index f075d1f77a..db9898b8ba 100644 --- a/src/world/area_nok/nok_01/nok_01_4_npc.c +++ b/src/world/area_nok/nok_01/nok_01_4_npc.c @@ -132,25 +132,25 @@ Vec2i N(FuzzyJumpPath1)[] = { { -255, 399 }, { -100, 430 }, { -91, 475 }, - { 0, 470 }, + { 0, 470 }, { 56, 470 }, { 120, 470 }, { 200, 473 }, - { 250, 400 }, + { 250, 400 }, { 308, 362 }, { 370, 280 }, { 446, 236 }, - { 444, 110 }, + { 444, 110 }, { 448, 53 }, { 330, 60 }, { 273, 74 }, - { 200, 80 }, + { 200, 80 }, { 135, 108 }, { 30, 140 }, { -47, 185 }, - { -100, 240 }, + { -100, 240 }, { -170, 324 }, - { -210, 360 }, + { -210, 360 }, }; Vec2i N(FuzzyJumpPath2)[] = { diff --git a/src/world/area_nok/nok_01/nok_01_8_foliage.c b/src/world/area_nok/nok_01/nok_01_8_foliage.c index 215f46dea0..725d0514a9 100644 --- a/src/world/area_nok/nok_01/nok_01_8_foliage.c +++ b/src/world/area_nok/nok_01/nok_01_8_foliage.c @@ -5,7 +5,7 @@ FoliageModelList N(Bush5_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o315); FoliageDropList N(Bush5_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -24,7 +24,7 @@ SearchBushConfig N(SearchBush_Bush5) = { FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o322, MODEL_o320); FoliageDropList N(Bush3_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_KOOT_GLASSES, @@ -73,7 +73,7 @@ SearchBushConfig N(SearchBush_Bush6) = { FoliageModelList N(Bush7_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o391); FoliageDropList N(Bush7_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_DRIED_SHROOM, @@ -92,7 +92,7 @@ SearchBushConfig N(SearchBush_Bush7) = { FoliageModelList N(Bush8_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o392); FoliageDropList N(Bush8_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_KOOPA_LEAF, @@ -112,7 +112,7 @@ SearchBushConfig N(SearchBush_Bush8) = { FoliageModelList N(Bush9_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o393, MODEL_o402); FoliageDropList N(Bush9_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, @@ -132,7 +132,7 @@ SearchBushConfig N(SearchBush_Bush9) = { FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o394, MODEL_o399, MODEL_o400, MODEL_o401); FoliageDropList N(Bush1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_KOOT_EMPTY_WALLET, diff --git a/src/world/area_nok/nok_02/nok_02_6_npc.c b/src/world/area_nok/nok_02/nok_02_6_npc.c index bbfd7993bf..9b900e795d 100644 --- a/src/world/area_nok/nok_02/nok_02_6_npc.c +++ b/src/world/area_nok/nok_02/nok_02_6_npc.c @@ -20,7 +20,7 @@ MAP_STATIC_PAD(1,key_item); #include "world/common/complete/LetterDelivery.inc.c" s32 N(LetterList_Kolorado)[] = { - ITEM_LETTER_TO_KOLORADO, ITEM_NONE + ITEM_LETTER_TO_KOLORADO, ITEM_NONE }; EvtScript N(EVS_LetterPrompt_Kolorado) = { diff --git a/src/world/area_nok/nok_02/nok_02_9_foliage.c b/src/world/area_nok/nok_02/nok_02_9_foliage.c index 7b4af86cf5..c8e284d4af 100644 --- a/src/world/area_nok/nok_02/nok_02_9_foliage.c +++ b/src/world/area_nok/nok_02/nok_02_9_foliage.c @@ -5,7 +5,7 @@ FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o443, MODEL_o460); FoliageDropList N(Bush1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_KOOPA_LEAF, @@ -87,7 +87,7 @@ SearchBushConfig N(SearchBush_Bush5) = { FoliageModelList N(Bush6_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o448, MODEL_o314); FoliageDropList N(Bush6_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_COIN, diff --git a/src/world/area_nok/nok_04/nok_04_4_npc.c b/src/world/area_nok/nok_04/nok_04_4_npc.c index 8d6e98b814..0f97c09fbf 100644 --- a/src/world/area_nok/nok_04/nok_04_4_npc.c +++ b/src/world/area_nok/nok_04/nok_04_4_npc.c @@ -34,7 +34,7 @@ s32 N(TreeHidingSpotPositions)[] = { -82, 101, 130, 38, 164, 130, 158, 135, 157, - 281, 156, 202, + 281, 156, 202, }; #include "common/CosInterpMinMax.inc.c" diff --git a/src/world/area_nok/nok_15/nok_15_5_foliage.c b/src/world/area_nok/nok_15/nok_15_5_foliage.c index 1cd810e0db..9fd731818d 100644 --- a/src/world/area_nok/nok_15/nok_15_5_foliage.c +++ b/src/world/area_nok/nok_15/nok_15_5_foliage.c @@ -6,7 +6,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_ha); FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_moku); FoliageDropList N(Tree1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_STAR_PIECE, diff --git a/src/world/area_obk/obk_01/obk_01_6_npc.c b/src/world/area_obk/obk_01/obk_01_6_npc.c index a653834bee..b6a1af1625 100644 --- a/src/world/area_obk/obk_01/obk_01_6_npc.c +++ b/src/world/area_obk/obk_01/obk_01_6_npc.c @@ -9,7 +9,7 @@ s32 N(LetterList_Franky)[] = { ITEM_LETTER_CHAIN_FRANKY, - ITEM_NONE + ITEM_NONE }; EvtScript N(EVS_LetterPrompt_Franky) = { diff --git a/src/world/area_obk/obk_03/obk_03_3_shop.c b/src/world/area_obk/obk_03/obk_03_3_shop.c index 7e111e9fff..fbd7caf4b3 100644 --- a/src/world/area_obk/obk_03/obk_03_3_shop.c +++ b/src/world/area_obk/obk_03/obk_03_3_shop.c @@ -8,7 +8,7 @@ s32 N(ShopMessages)[] = { [SHOP_MSG_GREETING ] MSG_Shop_04_OBK03, [SHOP_MSG_INSTRUCTIONS ] MSG_Shop_05_OBK03, [SHOP_MSG_NOTHING_TO_SELL ] MSG_Shop_06_OBK03, - [SHOP_MSG_SELL_WHICH ] MSG_Shop_07_OBK03, + [SHOP_MSG_SELL_WHICH ] MSG_Shop_07_OBK03, [SHOP_MSG_SELL_CONFIRM ] MSG_Shop_08_OBK03, [SHOP_MSG_SELL_CANCEL ] MSG_Shop_09_OBK03, [SHOP_MSG_SELL_MORE ] MSG_Shop_0A_OBK03, @@ -16,14 +16,14 @@ s32 N(ShopMessages)[] = { [SHOP_MSG_NOTHING_TO_CHECK ] MSG_Shop_0C_OBK03, [SHOP_MSG_NO_CHECK_ROOM ] MSG_Shop_0D_OBK03, [SHOP_MSG_CHECK_WHICH ] MSG_Shop_0E_OBK03, - [SHOP_MSG_CHECK_ACCEPTED ] MSG_Shop_0F_OBK03, + [SHOP_MSG_CHECK_ACCEPTED ] MSG_Shop_0F_OBK03, [SHOP_MSG_CHECK_MORE ] MSG_Shop_10_OBK03, [SHOP_MSG_NOTHING_TO_CLAIM ] MSG_Shop_11_OBK03, [SHOP_MSG_NO_CLAIM_ROOM ] MSG_Shop_12_OBK03, [SHOP_MSG_CLAIM_WHICH ] MSG_Shop_13_OBK03, [SHOP_MSG_CLAIM_ACCEPTED ] MSG_Shop_14_OBK03, [SHOP_MSG_CLAIM_MORE ] MSG_Shop_15_OBK03, - [SHOP_MSG_FAREWELL ] MSG_Shop_16_OBK03, + [SHOP_MSG_FAREWELL ] MSG_Shop_16_OBK03, }; ShopItemData N(Inventory)[] = { diff --git a/src/world/area_obk/obk_09/obk_09_4_npc.c b/src/world/area_obk/obk_09/obk_09_4_npc.c index ec097b7279..a2c16bdde4 100644 --- a/src/world/area_obk/obk_09/obk_09_4_npc.c +++ b/src/world/area_obk/obk_09/obk_09_4_npc.c @@ -37,7 +37,7 @@ API_CALLABLE(N(ImprisonedCardUpdate)) { effect->data.spiritCard->pos.x = card->pos.x; effect->data.spiritCard->pos.y = card->pos.y; effect->data.spiritCard->pos.z = card->pos.z; - + card->rot.y = clamp_angle(card->rot.y + 6.6f); effect->data.spiritCard->yaw = card->rot.y; diff --git a/src/world/area_omo/omo_03/omo_03_6_train.c b/src/world/area_omo/omo_03/omo_03_6_train.c index 0f81c45c76..98a4ef8008 100644 --- a/src/world/area_omo/omo_03/omo_03_6_train.c +++ b/src/world/area_omo/omo_03/omo_03_6_train.c @@ -5,11 +5,11 @@ #include "../common/TrainStationSwitches.inc.c" Vec2i N(D_80246080_DAB2C0) = { - 170, -115 + 170, -115 }; Vec2i N(D_80246088_DAB2C8) = { - -383, -240 + -383, -240 }; Vec2i N(D_80246090_DAB2D0)[] = { @@ -18,18 +18,18 @@ Vec2i N(D_80246090_DAB2D0)[] = { }; s32 N(D_802460A0_DAB2E0)[] = { - EVT_FLOAT(-298.93), EVT_FLOAT(-288.62), EVT_FLOAT(140.0), - EVT_FLOAT(-262.5), EVT_FLOAT(-245.336), EVT_FLOAT(0.0), - EVT_FLOAT(-175.0), EVT_FLOAT(169.89), EVT_FLOAT(-220.49), - -1, -1, -1 + EVT_FLOAT(-298.93), EVT_FLOAT(-288.62), EVT_FLOAT(140.0), + EVT_FLOAT(-262.5), EVT_FLOAT(-245.336), EVT_FLOAT(0.0), + EVT_FLOAT(-175.0), EVT_FLOAT(169.89), EVT_FLOAT(-220.49), + -1, -1, -1 }; s32 N(D_802460D0_DAB310)[] = { - EVT_FLOAT(-298.93), EVT_FLOAT(-288.62), EVT_FLOAT(140.0), - EVT_FLOAT(-262.5), EVT_FLOAT(-245.336), EVT_FLOAT(0.0), - EVT_FLOAT(-175.0), EVT_FLOAT(262.5), EVT_FLOAT(-245.336), - EVT_FLOAT(479.165), EVT_FLOAT(-503.546), - -1, -1, -1 + EVT_FLOAT(-298.93), EVT_FLOAT(-288.62), EVT_FLOAT(140.0), + EVT_FLOAT(-262.5), EVT_FLOAT(-245.336), EVT_FLOAT(0.0), + EVT_FLOAT(-175.0), EVT_FLOAT(262.5), EVT_FLOAT(-245.336), + EVT_FLOAT(479.165), EVT_FLOAT(-503.546), + -1, -1, -1 }; EvtScript N(EVS_80246108) = { @@ -103,10 +103,10 @@ EvtScript N(EVS_80246108) = { }; s32 N(D_80246510_DAB750)[] = { - EVT_FLOAT(131.251), EVT_FLOAT(-210.168), EVT_FLOAT(74.997), - EVT_FLOAT(262.5), EVT_FLOAT(-245.336), EVT_FLOAT(479.165), - EVT_FLOAT(-503.546), - -1, -1, -1 + EVT_FLOAT(131.251), EVT_FLOAT(-210.168), EVT_FLOAT(74.997), + EVT_FLOAT(262.5), EVT_FLOAT(-245.336), EVT_FLOAT(479.165), + EVT_FLOAT(-503.546), + -1, -1, -1 }; EvtScript N(D_80246538_DAB778) = { @@ -139,11 +139,11 @@ EvtScript N(D_80246538_DAB778) = { }; s32 N(D_802466C0_DAB900)[] = { - EVT_FLOAT(131.251), EVT_FLOAT(-210.168), EVT_FLOAT(254.997), - EVT_FLOAT(0.0), EVT_FLOAT(-175.0), EVT_FLOAT(-262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), - EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), - -1, -1, -1 + EVT_FLOAT(131.251), EVT_FLOAT(-210.168), EVT_FLOAT(254.997), + EVT_FLOAT(0.0), EVT_FLOAT(-175.0), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), + EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), + -1, -1, -1 }; EvtScript N(D_802466F8_DAB938) = { @@ -176,19 +176,19 @@ EvtScript N(D_802466F8_DAB938) = { }; s32 N(D_80246880_DABAC0)[] = { - EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), - EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(92.61), EVT_FLOAT(-199.49), - -1, -1, -1 + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), + EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(92.61), EVT_FLOAT(-199.49), + -1, -1, -1 }; s32 N(D_802468B0_DABAF0)[] = { - EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), - EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), - EVT_FLOAT(-262.5), EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), - EVT_FLOAT(-353.688), EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), - -1, -1, -1 + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), + EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), + EVT_FLOAT(-262.5), EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), + EVT_FLOAT(-353.688), EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), + -1, -1, -1 }; EvtScript N(D_802468F8_DABB38) = { @@ -246,27 +246,27 @@ EvtScript N(D_802468F8_DABB38) = { }; s32 N(D_80246BE0_DABE20)[] = { - EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), - EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), + EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), + EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), EVT_FLOAT(169.89), EVT_FLOAT(-220.49), - -1, -1, -1 + -1, -1, -1 }; s32 N(D_80246C18_DABE58)[] = { - EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), - EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-273.25), - EVT_FLOAT(-257.95), - -1, -1, -1 + EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), + EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-273.25), + EVT_FLOAT(-257.95), + -1, -1, -1 }; s32 N(D_80246C40_DABE80)[] = { - EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), - EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), - EVT_FLOAT(262.5), EVT_FLOAT(-245.336), EVT_FLOAT(479.165), - EVT_FLOAT(-503.546), - -1, -1, -1 + EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), + EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), + EVT_FLOAT(262.5), EVT_FLOAT(-245.336), EVT_FLOAT(479.165), + EVT_FLOAT(-503.546), + -1, -1, -1 }; EvtScript N(D_80246C80_DABEC0) = { @@ -339,11 +339,11 @@ EvtScript N(D_80246C80_DABEC0) = { }; s32 N(D_80247044_DAC284)[] = { - 3, 2, 1, + 3, 2, 1, }; s32 N(D_80247050_DAC290)[] = { - 1, 2, 3, + 1, 2, 3, }; EvtScript N(EVS_8024705C) = { @@ -422,8 +422,8 @@ EvtScript N(EVS_8024705C) = { }; s32 N(D_80247454_DAC694)[] = { - EVT_FLOAT(131.251), EVT_FLOAT(-210.168), EVT_FLOAT(74.997), - -1, -1, -1 + EVT_FLOAT(131.251), EVT_FLOAT(-210.168), EVT_FLOAT(74.997), + -1, -1, -1 }; EvtScript N(EVS_8024746C) = { diff --git a/src/world/area_omo/omo_04/omo_04_4_entity.c b/src/world/area_omo/omo_04/omo_04_4_entity.c index 3b52782fd6..95d4089f23 100644 --- a/src/world/area_omo/omo_04/omo_04_4_entity.c +++ b/src/world/area_omo/omo_04/omo_04_4_entity.c @@ -35,7 +35,7 @@ Vec3i N(StarBoxLaunchTargets)[] = { { -647, 80, 132 }, { -507, 80, 132 }, { 672, 105, 132 }, - { 927, 80, -87 }, + { 927, 80, -87 }, }; EvtScript N(EVS_StarBoxLaunch_Impl) = { @@ -117,7 +117,7 @@ API_CALLABLE(N(func_802402F4_DAD6F4)) { f32 playerVz = gPlayerStatus.currentSpeed * 5.0f * -cos_deg(gPlayerStatus.targetYaw); script->varTable[0] = (gPlayerStatus.position.x + playerVx); script->varTable[1] = (gPlayerStatus.position.z + playerVz); - + return ApiStatus_DONE2; } diff --git a/src/world/area_omo/omo_06/omo_06_4_train.c b/src/world/area_omo/omo_06/omo_06_4_train.c index f3db4c39d7..09fc510e5e 100644 --- a/src/world/area_omo/omo_06/omo_06_4_train.c +++ b/src/world/area_omo/omo_06/omo_06_4_train.c @@ -8,10 +8,10 @@ Vec2i N(D_80244160_DBBA70) = { }; s32 N(D_80244168_DBBA78)[] = { - EVT_FLOAT(-1.825), EVT_FLOAT(-35.275), EVT_FLOAT(66.038), - EVT_FLOAT(162.917), EVT_FLOAT(-108.494), EVT_FLOAT(353.442), - EVT_FLOAT(-353.717), EVT_FLOAT(414.885), EVT_FLOAT(-426.942), - -1, -1, -1 + EVT_FLOAT(-1.825), EVT_FLOAT(-35.275), EVT_FLOAT(66.038), + EVT_FLOAT(162.917), EVT_FLOAT(-108.494), EVT_FLOAT(353.442), + EVT_FLOAT(-353.717), EVT_FLOAT(414.885), EVT_FLOAT(-426.942), + -1, -1, -1 }; EvtScript N(D_80244198_DBBAA8) = { @@ -43,10 +43,10 @@ EvtScript N(D_80244198_DBBAA8) = { }; s32 N(D_80244308_DBBC18)[] = { - EVT_FLOAT(-1.825), EVT_FLOAT(-35.275), EVT_FLOAT(246.038), - EVT_FLOAT(-166.506), EVT_FLOAT(37.917), EVT_FLOAT(-500.0), - EVT_FLOAT(0.279), EVT_FLOAT(-600.0), EVT_FLOAT(0.558), - -1, -1, -1 + EVT_FLOAT(-1.825), EVT_FLOAT(-35.275), EVT_FLOAT(246.038), + EVT_FLOAT(-166.506), EVT_FLOAT(37.917), EVT_FLOAT(-500.0), + EVT_FLOAT(0.279), EVT_FLOAT(-600.0), EVT_FLOAT(0.558), + -1, -1, -1 }; EvtScript N(D_80244338_DBBC48) = { @@ -78,18 +78,18 @@ EvtScript N(D_80244338_DBBC48) = { }; s32 N(D_802444A8_DBBDB8)[] = { - EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.925), - EVT_FLOAT(353.442), EVT_FLOAT(-353.717), EVT_FLOAT(162.917), - EVT_FLOAT(-108.494), EVT_FLOAT(-38.38), EVT_FLOAT(-19.05), + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.925), + EVT_FLOAT(353.442), EVT_FLOAT(-353.717), EVT_FLOAT(162.917), + EVT_FLOAT(-108.494), EVT_FLOAT(-38.38), EVT_FLOAT(-19.05), -1, -1, -1 }; s32 N(D_802444D8_DBBDE8)[] = { - EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.925), - EVT_FLOAT(353.442), EVT_FLOAT(-353.717), EVT_FLOAT(162.917), - EVT_FLOAT(-108.494), EVT_FLOAT(-166.506), EVT_FLOAT(37.917), - EVT_FLOAT(-500.0), EVT_FLOAT(0.279), EVT_FLOAT(-600.0), - EVT_FLOAT(0.558), -1, -1, -1 + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.925), + EVT_FLOAT(353.442), EVT_FLOAT(-353.717), EVT_FLOAT(162.917), + EVT_FLOAT(-108.494), EVT_FLOAT(-166.506), EVT_FLOAT(37.917), + EVT_FLOAT(-500.0), EVT_FLOAT(0.279), EVT_FLOAT(-600.0), + EVT_FLOAT(0.558), -1, -1, -1 }; EvtScript N(D_80244518_DBBE28) = { @@ -145,19 +145,19 @@ EvtScript N(D_80244518_DBBE28) = { }; s32 N(D_802447D0_DBC0E0)[] = { - EVT_FLOAT(-600.0), EVT_FLOAT(0.558), EVT_FLOAT(89.875), - EVT_FLOAT(-500.0), EVT_FLOAT(0.279), EVT_FLOAT(-166.506), - EVT_FLOAT(37.917), EVT_FLOAT(34.74), EVT_FLOAT(-51.5), - -1, -1, -1 + EVT_FLOAT(-600.0), EVT_FLOAT(0.558), EVT_FLOAT(89.875), + EVT_FLOAT(-500.0), EVT_FLOAT(0.279), EVT_FLOAT(-166.506), + EVT_FLOAT(37.917), EVT_FLOAT(34.74), EVT_FLOAT(-51.5), + -1, -1, -1 }; s32 N(D_80244800_DBC110)[] = { - EVT_FLOAT(-600.0), EVT_FLOAT(0.558), EVT_FLOAT(89.875), - EVT_FLOAT(-500.0), EVT_FLOAT(0.279), EVT_FLOAT(-166.506), - EVT_FLOAT(37.917), EVT_FLOAT(162.917), EVT_FLOAT(-108.494), - EVT_FLOAT(353.442), EVT_FLOAT(-353.717), EVT_FLOAT(414.885), + EVT_FLOAT(-600.0), EVT_FLOAT(0.558), EVT_FLOAT(89.875), + EVT_FLOAT(-500.0), EVT_FLOAT(0.279), EVT_FLOAT(-166.506), + EVT_FLOAT(37.917), EVT_FLOAT(162.917), EVT_FLOAT(-108.494), + EVT_FLOAT(353.442), EVT_FLOAT(-353.717), EVT_FLOAT(414.885), EVT_FLOAT(-426.942), - -1, -1, -1 + -1, -1, -1 }; EvtScript N(D_80244840_DBC150) = { @@ -213,11 +213,11 @@ EvtScript N(D_80244840_DBC150) = { }; s32 N(D_80244AF8_DBC408)[] = { - 0, 3, 2, + 0, 3, 2, }; s32 N(D_80244B04_DBC414)[] = { - 2, 3, 0, + 2, 3, 0, }; EvtScript N(D_80244B10_DBC420) = { @@ -298,7 +298,7 @@ EvtScript N(D_80244B10_DBC420) = { s32 N(D_80244F28_DBC838)[] = { EVT_FLOAT(-1.825), EVT_FLOAT(-35.275), EVT_FLOAT(66.038), - -1, -1, -1 + -1, -1, -1 }; EvtScript N(EVS_80244F40) = { diff --git a/src/world/area_omo/omo_08/omo_08_4_train.c b/src/world/area_omo/omo_08/omo_08_4_train.c index 0c1efd5bc5..6b2451b00a 100644 --- a/src/world/area_omo/omo_08/omo_08_4_train.c +++ b/src/world/area_omo/omo_08/omo_08_4_train.c @@ -4,14 +4,14 @@ #include "../common/TrainStationSwitches.inc.c" Vec2i N(D_80246740_DCAB10) = { - -145, -110 + -145, -110 }; s32 N(D_80246748_DCAB18)[] = { - EVT_FLOAT(-131.227), EVT_FLOAT(-210.271), EVT_FLOAT(105.004), - EVT_FLOAT(0.0), EVT_FLOAT(-175.0), EVT_FLOAT(262.5), + EVT_FLOAT(-131.227), EVT_FLOAT(-210.271), EVT_FLOAT(105.004), + EVT_FLOAT(0.0), EVT_FLOAT(-175.0), EVT_FLOAT(262.5), EVT_FLOAT(-245.336), EVT_FLOAT(479.165), EVT_FLOAT(-503.546), - -1, -1, -1 + -1, -1, -1 }; EvtScript N(D_80246778_DCAB48) = { @@ -46,7 +46,7 @@ s32 N(D_802468E8_DCACB8)[] = { EVT_FLOAT(-131.227), EVT_FLOAT(-210.271), EVT_FLOAT(285.004), EVT_FLOAT(-262.5), EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), - -1, -1, -1 + -1, -1, -1 }; EvtScript N(D_80246918_DCACE8) = { @@ -78,20 +78,20 @@ EvtScript N(D_80246918_DCACE8) = { }; s32 N(D_80246A88_DCAE58)[] = { - EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), - EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), + EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), EVT_FLOAT(-169.87), EVT_FLOAT(-220.59), - -1, -1, -1 + -1, -1, -1 }; s32 N(D_80246AC0_DCAE90)[] = { - EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), - EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), - EVT_FLOAT(-262.5), EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), + EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), + EVT_FLOAT(-262.5), EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), - -1, -1, -1 + -1, -1, -1 }; EvtScript N(D_80246B08_DCAED8) = { @@ -147,19 +147,19 @@ EvtScript N(D_80246B08_DCAED8) = { }; s32 N(D_80246DC0_DCB190)[] = { - EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), - EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), + EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), + EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), EVT_FLOAT(-245.336), EVT_FLOAT(-92.58), EVT_FLOAT(-199.95), - -1, -1, -1 + -1, -1, -1 }; s32 N(D_80246DF0_DCB1C0)[] = { - EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), - EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), - EVT_FLOAT(262.5), EVT_FLOAT(-245.336), EVT_FLOAT(479.165), + EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), + EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), + EVT_FLOAT(262.5), EVT_FLOAT(-245.336), EVT_FLOAT(479.165), EVT_FLOAT(-503.546), - -1, -1, -1 + -1, -1, -1 }; EvtScript N(D_80246E30_DCB200) = { @@ -215,11 +215,11 @@ EvtScript N(D_80246E30_DCB200) = { }; s32 N(D_802470E8_DCB4B8)[] = { - 1, 0, 3, + 1, 0, 3, }; s32 N(D_802470F4_DCB4C4)[] = { - 3, 0, 1, + 3, 0, 1, }; EvtScript N(EVS_80247100) = { @@ -285,7 +285,7 @@ EvtScript N(EVS_80247100) = { s32 N(D_80247438_DCB808)[] = { EVT_FLOAT(-131.227), EVT_FLOAT(-210.271), EVT_FLOAT(105.004), - -1, -1, -1 + -1, -1, -1 }; EvtScript N(EVS_SetupTrain) = { diff --git a/src/world/area_omo/omo_09/omo_09_3_conveyors.c b/src/world/area_omo/omo_09/omo_09_3_conveyors.c index dba0b28f4d..3853d45152 100644 --- a/src/world/area_omo/omo_09/omo_09_3_conveyors.c +++ b/src/world/area_omo/omo_09/omo_09_3_conveyors.c @@ -4,7 +4,7 @@ s32 N(ConveyorColliders)[4] = { COLLIDER_o904, COLLIDER_o906, COLLIDER_o907, - COLLIDER_o911 + COLLIDER_o911 }; //TODO Vec2f[4] diff --git a/src/world/area_omo/omo_09/omo_09_5_gizmos.c b/src/world/area_omo/omo_09/omo_09_5_gizmos.c index 9795ef531a..109e4d0d4c 100644 --- a/src/world/area_omo/omo_09/omo_09_5_gizmos.c +++ b/src/world/area_omo/omo_09/omo_09_5_gizmos.c @@ -81,12 +81,12 @@ typedef struct MovingBlock { } MovingBlock; // size = 0x10 MovingBlock N(MovingBlockPlatforms)[] = { - { COLLIDER_u1, MODEL_u1, 40, 41 }, - { COLLIDER_u2, MODEL_u2, 60, 51 }, - { COLLIDER_u3, MODEL_u3, 70, 1 }, - { COLLIDER_u4, MODEL_u4, 30, 61 }, - { COLLIDER_u5, MODEL_u5, 50, 71 }, - { COLLIDER_u6, MODEL_u6, 70, 101 }, + { COLLIDER_u1, MODEL_u1, 40, 41 }, + { COLLIDER_u2, MODEL_u2, 60, 51 }, + { COLLIDER_u3, MODEL_u3, 70, 1 }, + { COLLIDER_u4, MODEL_u4, 30, 61 }, + { COLLIDER_u5, MODEL_u5, 50, 71 }, + { COLLIDER_u6, MODEL_u6, 70, 101 }, }; API_CALLABLE(N(AwaitPlayerNearPlatforms)) { diff --git a/src/world/area_omo/omo_10/omo_10_4_train.c b/src/world/area_omo/omo_10/omo_10_4_train.c index a01ca8c93a..b3858861c7 100644 --- a/src/world/area_omo/omo_10/omo_10_4_train.c +++ b/src/world/area_omo/omo_10/omo_10_4_train.c @@ -4,14 +4,14 @@ #include "../common/TrainStationSwitches.inc.c" Vec2i N(D_80243AC0_DDB470) = { - 10, -105 + 10, -105 }; s32 N(D_80243AC8_DDB478)[] = { - EVT_FLOAT(-2.266), EVT_FLOAT(-209.494), EVT_FLOAT(90.0), - EVT_FLOAT(124.202), EVT_FLOAT(-209.494), EVT_FLOAT(262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(479.165), EVT_FLOAT(-503.546), - -1, -1, -1 + EVT_FLOAT(-2.266), EVT_FLOAT(-209.494), EVT_FLOAT(90.0), + EVT_FLOAT(124.202), EVT_FLOAT(-209.494), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(479.165), EVT_FLOAT(-503.546), + -1, -1, -1 }; EvtScript N(D_80243AF8_DDB4A8) = { @@ -43,11 +43,11 @@ EvtScript N(D_80243AF8_DDB4A8) = { }; s32 N(D_80243C68_DDB618)[] = { - EVT_FLOAT(-2.266), EVT_FLOAT(-209.494), EVT_FLOAT(270.0), - EVT_FLOAT(-128.733), EVT_FLOAT(-209.494), EVT_FLOAT(-262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), - EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), - -1, -1, -1 + EVT_FLOAT(-2.266), EVT_FLOAT(-209.494), EVT_FLOAT(270.0), + EVT_FLOAT(-128.733), EVT_FLOAT(-209.494), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), + EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), + -1, -1, -1 }; EvtScript N(D_80243CA0_DDB650) = { @@ -79,21 +79,21 @@ EvtScript N(D_80243CA0_DDB650) = { }; s32 N(D_80243E10_DDB7C0)[] = { - EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), - EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(124.202), EVT_FLOAT(-209.494), - EVT_FLOAT(-42.27), EVT_FLOAT(-209.49), - -1, -1, -1 + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), + EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(124.202), EVT_FLOAT(-209.494), + EVT_FLOAT(-42.27), EVT_FLOAT(-209.49), + -1, -1, -1 }; s32 N(D_80243E48_DDB7F8)[] = { - EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), - EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(124.202), EVT_FLOAT(-209.494), - EVT_FLOAT(-128.733), EVT_FLOAT(-209.494), EVT_FLOAT(-262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), - EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), - -1, -1, -1 + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), + EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(124.202), EVT_FLOAT(-209.494), + EVT_FLOAT(-128.733), EVT_FLOAT(-209.494), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), + EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), + -1, -1, -1 }; EvtScript N(D_80243E98_DDB848) = { @@ -149,20 +149,20 @@ EvtScript N(D_80243E98_DDB848) = { }; s32 N(D_80244150_DDBB00)[] = { - EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), - EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(-128.733), EVT_FLOAT(-209.494), - EVT_FLOAT(37.73), EVT_FLOAT(-209.49), - -1, -1, -1 + EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), + EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(-128.733), EVT_FLOAT(-209.494), + EVT_FLOAT(37.73), EVT_FLOAT(-209.49), + -1, -1, -1 }; s32 N(D_80244188_DDBB38)[] = { - EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), - EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(-128.733), EVT_FLOAT(-209.494), - EVT_FLOAT(124.202), EVT_FLOAT(-209.494), EVT_FLOAT(262.5), - EVT_FLOAT(-245.336), EVT_FLOAT(479.165), EVT_FLOAT(-503.546), - -1, -1, -1 + EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), + EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(-128.733), EVT_FLOAT(-209.494), + EVT_FLOAT(124.202), EVT_FLOAT(-209.494), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(479.165), EVT_FLOAT(-503.546), + -1, -1, -1 }; EvtScript N(D_802441D0_DDBB80) = { @@ -218,11 +218,11 @@ EvtScript N(D_802441D0_DDBB80) = { }; s32 N(D_80244488_DDBE38)[] = { - 2, 1, 0, + 2, 1, 0, }; s32 N(D_80244494_DDBE44)[] = { - 0, 1, 2, + 0, 1, 2, }; EvtScript N(D_802444A0_DDBE50) = { @@ -266,8 +266,8 @@ EvtScript N(D_802444A0_DDBE50) = { }; s32 N(D_802446B8_DDC068)[] = { - EVT_FLOAT(-2.266), EVT_FLOAT(-209.494), EVT_FLOAT(90.0), - -1, -1, -1 + EVT_FLOAT(-2.266), EVT_FLOAT(-209.494), EVT_FLOAT(90.0), + -1, -1, -1 }; EvtScript N(EVS_SetupTrain) = { diff --git a/src/world/area_omo/omo_16/omo_16_2_train.c b/src/world/area_omo/omo_16/omo_16_2_train.c index f0419ca384..b2bc57bfac 100644 --- a/src/world/area_omo/omo_16/omo_16_2_train.c +++ b/src/world/area_omo/omo_16/omo_16_2_train.c @@ -67,12 +67,12 @@ EvtScript N(D_802428CC_DEE79C) = { s32 N(D_80242984_DEE854)[] = { -1550, EVT_FLOAT(0.0), EVT_FLOAT(90.0), 1550, EVT_FLOAT(0.0), - -1, -1, -1 + -1, -1, -1 }; s32 N(D_802429A4_DEE874)[] = { 1550, EVT_FLOAT(0.0), EVT_FLOAT(270.0), -1550, EVT_FLOAT(0.0), - -1, -1, -1 + -1, -1, -1 }; API_CALLABLE(N(CheckForSceneSkip)) { diff --git a/src/world/area_osr/osr_03/osr_03_6_ending.c b/src/world/area_osr/osr_03/osr_03_6_ending.c index 93d4cef8d5..c6823bcff1 100644 --- a/src/world/area_osr/osr_03/osr_03_6_ending.c +++ b/src/world/area_osr/osr_03/osr_03_6_ending.c @@ -15,7 +15,7 @@ API_CALLABLE(N(FlashScreenWhite)) { break; } script->functionTemp[1] += 64; - if (script->functionTemp[1] < 256) { + if (script->functionTemp[1] < 256) { break; } script->functionTemp[1] = 255; @@ -40,7 +40,7 @@ API_CALLABLE(N(BigExplosionRumble)) { Bytecode* args = script->ptrReadPos; f32 frequency; s32 duration; - + if (isInitialCall) { duration = evt_get_variable(script, *args++); frequency = 2.0f * evt_get_float_variable(script, *args++); @@ -48,16 +48,16 @@ API_CALLABLE(N(BigExplosionRumble)) { if (frequency > 10.0f) { frequency = 10.0f; } - + start_rumble((u8) ((frequency / 10.0f) * 256.0f), (duration & 0xFFFF) * 2); } - - script->functionTemp[0]--; + + script->functionTemp[0]--; if (script->functionTemp[0] == 0) { return ApiStatus_DONE1; } - + return ApiStatus_BLOCK; } @@ -84,7 +84,7 @@ s32 N(ExplosionPositions)[] = { -400, -400, 450, 0, -720, 620, -270, -700, 470, - 320, -460, 530, + 320, -460, 530, }; EvtScript N(EVS_PlayExplosionFX) = { diff --git a/src/world/area_osr/osr_04/osr_04_2_assault.c b/src/world/area_osr/osr_04/osr_04_2_assault.c index 87db05458e..1b0eed6d11 100644 --- a/src/world/area_osr/osr_04/osr_04_2_assault.c +++ b/src/world/area_osr/osr_04/osr_04_2_assault.c @@ -58,7 +58,7 @@ s32 N(ThickTileSpawnPositions)[] = { -230, 1010, 50 * DT, -500, 940, 40 * DT, -350, 600, 55 * DT, - -1, + -1, }; EvtScript N(EVS_DropDebris_ThickTiles) = { @@ -105,7 +105,7 @@ s32 N(LeafClumpSpawnPositions)[] = { -350, 600, 60 * DT, -230, 1200, 40 * DT, -340, 960, 40 * DT, - -1, + -1, }; EvtScript N(EVS_DropDebris_Leaves) = { diff --git a/src/world/area_sam/sam_01/sam_01_3_rooms.c b/src/world/area_sam/sam_01/sam_01_3_rooms.c index 423d61f551..9c46b2caac 100644 --- a/src/world/area_sam/sam_01/sam_01_3_rooms.c +++ b/src/world/area_sam/sam_01/sam_01_3_rooms.c @@ -208,7 +208,7 @@ s32 N(InteriorNPCs_MayorAfter)[] = { NPC_MayorPenguinWife, NPC_PenguinPatrol, NPC_Herringway, - -1 + -1 }; s32 N(InteriorNPCs_MiddleHouse)[] = { diff --git a/src/world/area_sam/sam_01/sam_01_4_npc.c b/src/world/area_sam/sam_01/sam_01_4_npc.c index 3ff6a2ff16..8fbdd715ef 100644 --- a/src/world/area_sam/sam_01/sam_01_4_npc.c +++ b/src/world/area_sam/sam_01/sam_01_4_npc.c @@ -15,7 +15,7 @@ MAP_STATIC_PAD(1,key_item); s32 N(MayorLetterList)[] = { ITEM_LETTER_TO_MAYOR_PENGUIN, - ITEM_NONE + ITEM_NONE }; EvtScript N(EVS_LetterPrompt_Mayor) = { diff --git a/src/world/area_sam/sam_02/sam_02_6_shop.c b/src/world/area_sam/sam_02/sam_02_6_shop.c index e9dcafd66a..468bb37308 100644 --- a/src/world/area_sam/sam_02/sam_02_6_shop.c +++ b/src/world/area_sam/sam_02/sam_02_6_shop.c @@ -4,23 +4,23 @@ s32 N(ShopMessages)[] = { [SHOP_MSG_BUY_CONFIRM ] MSG_Shop_00_SAM02, [SHOP_MSG_NOT_ENOUGH_COINS ] MSG_Shop_01_SAM02, [SHOP_MSG_NOT_ENOUGH_ROOM ] MSG_Shop_02_SAM02, - [SHOP_MSG_BUY_THANK_YOU ] MSG_Shop_03_SAM02, + [SHOP_MSG_BUY_THANK_YOU ] MSG_Shop_03_SAM02, [SHOP_MSG_GREETING ] MSG_Shop_04_SAM02, [SHOP_MSG_INSTRUCTIONS ] MSG_Shop_05_SAM02, [SHOP_MSG_NOTHING_TO_SELL ] MSG_Shop_06_SAM02, - [SHOP_MSG_SELL_WHICH ] MSG_Shop_07_SAM02, + [SHOP_MSG_SELL_WHICH ] MSG_Shop_07_SAM02, [SHOP_MSG_SELL_CONFIRM ] MSG_Shop_08_SAM02, [SHOP_MSG_SELL_CANCEL ] MSG_Shop_09_SAM02, [SHOP_MSG_SELL_MORE ] MSG_Shop_0A_SAM02, - [SHOP_MSG_SELL_THANKS ] MSG_Shop_0B_SAM02, + [SHOP_MSG_SELL_THANKS ] MSG_Shop_0B_SAM02, [SHOP_MSG_NOTHING_TO_CHECK ] MSG_Shop_0C_SAM02, [SHOP_MSG_NO_CHECK_ROOM ] MSG_Shop_0D_SAM02, [SHOP_MSG_CHECK_WHICH ] MSG_Shop_0E_SAM02, - [SHOP_MSG_CHECK_ACCEPTED ] MSG_Shop_0F_SAM02, + [SHOP_MSG_CHECK_ACCEPTED ] MSG_Shop_0F_SAM02, [SHOP_MSG_CHECK_MORE ] MSG_Shop_10_SAM02, [SHOP_MSG_NOTHING_TO_CLAIM ] MSG_Shop_11_SAM02, [SHOP_MSG_NO_CLAIM_ROOM ] MSG_Shop_12_SAM02, - [SHOP_MSG_CLAIM_WHICH ] MSG_Shop_13_SAM02, + [SHOP_MSG_CLAIM_WHICH ] MSG_Shop_13_SAM02, [SHOP_MSG_CLAIM_ACCEPTED ] MSG_Shop_14_SAM02, [SHOP_MSG_CLAIM_MORE ] MSG_Shop_15_SAM02, [SHOP_MSG_FAREWELL ] MSG_Shop_16_SAM02, @@ -37,24 +37,24 @@ ShopItemData N(Inventory)[] = { }; ShopSellPriceData N(PriceList)[] = { - { .itemID = ITEM_FIRE_FLOWER, .sellPrice = 8 }, - { .itemID = ITEM_BLAND_MEAL, .sellPrice = 15 }, - { .itemID = ITEM_YUMMY_MEAL, .sellPrice = 20 }, - { .itemID = ITEM_DELUXE_FEAST, .sellPrice = 70 }, - { .itemID = ITEM_FROZEN_FRIES, .sellPrice = 18 }, - { .itemID = ITEM_POTATO_SALAD, .sellPrice = 10 }, + { .itemID = ITEM_FIRE_FLOWER, .sellPrice = 8 }, + { .itemID = ITEM_BLAND_MEAL, .sellPrice = 15 }, + { .itemID = ITEM_YUMMY_MEAL, .sellPrice = 20 }, + { .itemID = ITEM_DELUXE_FEAST, .sellPrice = 70 }, + { .itemID = ITEM_FROZEN_FRIES, .sellPrice = 18 }, + { .itemID = ITEM_POTATO_SALAD, .sellPrice = 10 }, {}, }; s32 N(UnknownData)[] = { - ITEM_FIRE_FLOWER, 5, + ITEM_FIRE_FLOWER, 5, ITEM_SNOWMAN_DOLL, 5, - ITEM_THUNDER_RAGE, 5, - ITEM_SHOOTING_STAR, 10, - ITEM_DUSTY_HAMMER, 3, - ITEM_PEBBLE, 3, + ITEM_THUNDER_RAGE, 5, + ITEM_SHOOTING_STAR, 10, + ITEM_DUSTY_HAMMER, 3, + ITEM_PEBBLE, 3, ITEM_STONE_CAP, 5, - ITEM_VOLT_SHROOM, ITEM_VOLT_SHROOM, + ITEM_VOLT_SHROOM, ITEM_VOLT_SHROOM, }; EvtScript N(EVS_OnBuy) = { diff --git a/src/world/area_sam/sam_03/sam_03_3_npc1.c b/src/world/area_sam/sam_03/sam_03_3_npc1.c index 00cd02c09d..552d517e1a 100644 --- a/src/world/area_sam/sam_03/sam_03_3_npc1.c +++ b/src/world/area_sam/sam_03/sam_03_3_npc1.c @@ -4,7 +4,7 @@ API_CALLABLE(N(GetAngleToPlayer)) { Npc* npc = get_npc_unsafe(NPC_JrTroopa); - + script->varTable[0] = atan2(npc->pos.x, npc->pos.z, gPlayerStatus.position.x, gPlayerStatus.position.z); return ApiStatus_DONE2; } diff --git a/src/world/area_sam/sam_04/sam_04_3_snowmen.c b/src/world/area_sam/sam_04/sam_04_3_snowmen.c index ae36bc6938..ac4ac855b6 100644 --- a/src/world/area_sam/sam_04/sam_04_3_snowmen.c +++ b/src/world/area_sam/sam_04/sam_04_3_snowmen.c @@ -33,7 +33,7 @@ s32* N(SnowmanModelSets)[] = { N(CloneSet3), N(CloneSet4), N(CloneSet5), - N(OriginalModels), + N(OriginalModels), }; EvtScript N(EVS_SetSnowmanPosition) = { diff --git a/src/world/area_sam/sam_05/sam_05_5_scenes.c b/src/world/area_sam/sam_05/sam_05_5_scenes.c index bcfa6369c6..3136164864 100644 --- a/src/world/area_sam/sam_05/sam_05_5_scenes.c +++ b/src/world/area_sam/sam_05/sam_05_5_scenes.c @@ -102,22 +102,22 @@ EvtScript N(EVS_Scene_MonstarAppears) = { // npcID followed by initial pos Vec3i s32 N(StarKidList)[] = { NPC_StarKid_01, 615, 129, 0, - NPC_StarKid_02, 612, 157, 2, + NPC_StarKid_02, 612, 157, 2, NPC_StarKid_03, 606, 146, 4, - NPC_StarKid_04, 649, 140, 6, + NPC_StarKid_04, 649, 140, 6, NPC_StarKid_05, 625, 145, 0, - NPC_StarKid_06, 580, 131, 4, + NPC_StarKid_06, 580, 131, 4, NPC_StarKid_07, 630, 88, 6, - NPC_StarKid_08, 635, 134, 0, + NPC_StarKid_08, 635, 134, 0, NPC_StarKid_09, 625, 121, 2, - NPC_StarKid_10, 590, 122, 4, + NPC_StarKid_10, 590, 122, 4, NPC_StarKid_11, 595, 108, 6, - NPC_StarKid_12, 600, 132, 0, + NPC_StarKid_12, 600, 132, 0, NPC_StarKid_13, 604, 99, 2, - NPC_StarKid_14, 610, 114, 4, + NPC_StarKid_14, 610, 114, 4, NPC_StarKid_15, 635, 112, 6, - NPC_StarKid_16, 620, 96, 0, - -1, + NPC_StarKid_16, 620, 96, 0, + -1, }; Vec3f N(RelativeFleePath)[] = { diff --git a/src/world/area_sam/sam_12/sam_12_4_scenes.c b/src/world/area_sam/sam_12/sam_12_4_scenes.c index f825466f51..33cb591411 100644 --- a/src/world/area_sam/sam_12/sam_12_4_scenes.c +++ b/src/world/area_sam/sam_12/sam_12_4_scenes.c @@ -52,7 +52,7 @@ s32 N(FlickeringStaticAmts)[] = { EVT_FLOAT(80.0), EVT_FLOAT(70.0), EVT_FLOAT(60.0), - EVT_FLOAT(50.0), + EVT_FLOAT(50.0), }; EvtScript N(EVS_MerlarFlickering) = { diff --git a/src/world/area_tik/tik_03/tik_03_4_platforms.c b/src/world/area_tik/tik_03/tik_03_4_platforms.c index e1f04f3737..80f3283746 100644 --- a/src/world/area_tik/tik_03/tik_03_4_platforms.c +++ b/src/world/area_tik/tik_03/tik_03_4_platforms.c @@ -4,7 +4,7 @@ s32 N(PlatformColliders)[] = { COLLIDER_1, COLLIDER_2, COLLIDER_3, - COLLIDER_4, + COLLIDER_4, }; API_CALLABLE(N(PausePlatformsDuringPound)) { diff --git a/src/world/area_trd/trd_06/trd_06_2_falling.c b/src/world/area_trd/trd_06/trd_06_2_falling.c index 73c2ce63b5..2021eeb09f 100644 --- a/src/world/area_trd/trd_06/trd_06_2_falling.c +++ b/src/world/area_trd/trd_06/trd_06_2_falling.c @@ -49,7 +49,7 @@ void N(appendGfx_FallingSprite)(void) { guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - + //TODO use SPR_RASTER_Mario8_XYZ here once they are defined if (!falling->animationEnabled) { falling->playerSpriteID = SPR_MarioW2; @@ -93,7 +93,7 @@ API_CALLABLE(N(InitializeFallingSprite)) { falling->scale.x = SPRITE_WORLD_SCALE_F; falling->scale.y = SPRITE_WORLD_SCALE_F; falling->scale.z = SPRITE_WORLD_SCALE_F; - + falling->imgfxIdx = imgfx_get_free_instances(1); falling->workerID = create_worker_world(0, &N(appendGfx_FallingSprite)); return ApiStatus_DONE2; @@ -152,7 +152,7 @@ API_CALLABLE(N(InitializeFallingPartner)) { API_CALLABLE(N(InitializeGetUp)) { FallingSprite* falling = &N(Falling); - + falling->playerSpriteID = SPR_Mario1; falling->rasterID = 0; return ApiStatus_DONE2; diff --git a/src/world/area_trd/trd_07/trd_07_3_magic_doors.c b/src/world/area_trd/trd_07/trd_07_3_magic_doors.c index acc6c8a61d..14c9989f8b 100644 --- a/src/world/area_trd/trd_07/trd_07_3_magic_doors.c +++ b/src/world/area_trd/trd_07/trd_07_3_magic_doors.c @@ -6,7 +6,7 @@ API_CALLABLE(N(GetPointsWithCamRelativeOffset)) { f32 posX = evt_get_float_variable(script, *args++); f32 posZ = evt_get_float_variable(script, *args++); f32 angle = evt_get_float_variable(script, *args++); - + script->varTable[0] = EVT_FLOAT_TO_FIXED(posX + (sin_deg(clamp_angle(gCameras[CAM_DEFAULT].currentYaw + angle + 270.0f)) * 1000.0f)); script->varTable[1] = EVT_FLOAT_TO_FIXED(posZ - (cos_deg(clamp_angle(gCameras[CAM_DEFAULT].currentYaw + angle + 270.0f)) * 1000.0f)); script->varTable[2] = EVT_FLOAT_TO_FIXED(posX + (sin_deg(clamp_angle(gCameras[CAM_DEFAULT].currentYaw + angle + 90.0f)) * 1000.0f)); diff --git a/src/world/area_tst/tst_04/tst_04_1_main.c b/src/world/area_tst/tst_04/tst_04_1_main.c index 8a3057f917..6dc3143ac6 100644 --- a/src/world/area_tst/tst_04/tst_04_1_main.c +++ b/src/world/area_tst/tst_04/tst_04_1_main.c @@ -33,28 +33,28 @@ API_CALLABLE(N(PushPartnerTest)) { f32 dist; f32 x0, x1; f32 z0, z1; - + if (npc == NULL) { return ApiStatus_DONE2; } - + dist = dist2D(npc->pos.x, npc->pos.z, -250.0f, -100.0f); - + angle = evt_get_variable(script, LVar0) - 1; sinAngle = sin_rad(DEG_TO_RAD(angle)); cosAngle = cos_rad(DEG_TO_RAD(angle)); x0 = dist * cosAngle; z0 = dist * -sinAngle; - + angle = evt_get_variable(script, LVar0); sinAngle = sin_rad(DEG_TO_RAD(angle)); cosAngle = cos_rad(DEG_TO_RAD(angle)); x1 = dist * cosAngle; z1 = dist * -sinAngle; - + npc->pos.x += x1 - x0; npc->pos.z += z1 - z0; - + return ApiStatus_DONE2; } diff --git a/src/world/common/atomic/BetaFloorPanels.inc.c b/src/world/common/atomic/BetaFloorPanels.inc.c index 971e0e717b..fb3d785bc4 100644 --- a/src/world/common/atomic/BetaFloorPanels.inc.c +++ b/src/world/common/atomic/BetaFloorPanels.inc.c @@ -30,7 +30,7 @@ API_CALLABLE(N(CheckShouldFlipFloor)) { f32 distance = dist2D( playerStatus->position.x, playerStatus->position.z, script->array[2], script->array[4]); - + script->varTable[0] = 0; if (distance < 112.5f) { script->varTable[0] = 2; diff --git a/src/world/common/atomic/CreateDarkness.inc.c b/src/world/common/atomic/CreateDarkness.inc.c index de5a1b6724..211732bc25 100644 --- a/src/world/common/atomic/CreateDarkness.inc.c +++ b/src/world/common/atomic/CreateDarkness.inc.c @@ -8,9 +8,9 @@ API_CALLABLE(N(DarkRoomUpdate)) { script->functionTemp[0] = 255; script->functionTemp[1] = FALSE; } - + set_screen_overlay_center_worldpos(SCREEN_LAYER_BACK, 1, playerStatus->position.x, playerStatus->position.y + 8.0f, playerStatus->position.z); - + if (gPartnerStatus.partnerActionState != PARTNER_ACTION_NONE) { if (playerData->currentPartner == PARTNER_WATT) { if (!script->functionTemp[1]) { @@ -36,10 +36,10 @@ API_CALLABLE(N(DarkRoomUpdate)) { } else { script->functionTemp[0] = 255; } - + set_screen_overlay_alpha(SCREEN_LAYER_BACK, script->functionTemp[0]); set_screen_overlay_params_back(OVERLAY_WORLD_DARKNESS, 255.0f); - + return ApiStatus_BLOCK; } diff --git a/src/world/common/atomic/ToadHouse.inc.c b/src/world/common/atomic/ToadHouse.inc.c index f1d892f3a5..846c58c6da 100644 --- a/src/world/common/atomic/ToadHouse.inc.c +++ b/src/world/common/atomic/ToadHouse.inc.c @@ -34,7 +34,7 @@ API_CALLABLE(N(ToadHouse_CamSetFOV)) { API_CALLABLE(N(ToadHouse_AwaitScriptComplete)) { Bytecode* args = script->ptrReadPos; s32 waitingScriptID = evt_get_variable(script, *args++); - + if (!does_script_exist(waitingScriptID)) { return ApiStatus_DONE2; } else { diff --git a/src/world/common/atomic/WhaleAnim.inc.c b/src/world/common/atomic/WhaleAnim.inc.c index 3cf15f9b63..076694b49c 100644 --- a/src/world/common/atomic/WhaleAnim.inc.c +++ b/src/world/common/atomic/WhaleAnim.inc.c @@ -52,7 +52,7 @@ void N(unkVtxFunc001)(Vtx* firstVertex, Vtx* copiedVertices, s32 numVertices, s3 f32 newX, newY; f32 angle; s32 offset; - + wagPhase = *wagPhasePtr; switch (get_npc_safe(NPC_Whale)->currentAnim) { case ANIM_Kolorado_Still: @@ -79,7 +79,7 @@ void N(unkVtxFunc001)(Vtx* firstVertex, Vtx* copiedVertices, s32 numVertices, s3 for (i = 0; i < numVertices; i++) { vtxPos = firstVertex[i].v.ob; offset = 30; - + if (vtxPos[0] > 30) { newX = 0.0f; newY = 0.0f; @@ -96,7 +96,7 @@ void N(unkVtxFunc001)(Vtx* firstVertex, Vtx* copiedVertices, s32 numVertices, s3 angle = (j / 15.0f) + ((j / 40.0f) * sin_deg(wagPhase)); newX += bendFrac * cos_rad(angle); newY += bendFrac * sin_rad(angle); - + copiedVertices[i].v.ob[0] = newX; copiedVertices[i].v.ob[1] = vtxPos[1] + newY; } diff --git a/src/world/common/atomic/WhaleGeyser.inc.c b/src/world/common/atomic/WhaleGeyser.inc.c index 41da05169b..3b7bfade9b 100644 --- a/src/world/common/atomic/WhaleGeyser.inc.c +++ b/src/world/common/atomic/WhaleGeyser.inc.c @@ -24,7 +24,7 @@ API_CALLABLE(N(SetWhaleGeyserPos)) { f32 x = evt_get_float_variable(script, *args++); f32 y = evt_get_float_variable(script, *args++); f32 z = evt_get_float_variable(script, *args++); - + effect->data.unk_3D->pos.x = x; effect->data.unk_3D->pos.y = y; effect->data.unk_3D->pos.z = z; diff --git a/src/world/common/enemy/SpearGuy_Wander.inc.c b/src/world/common/enemy/SpearGuy_Wander.inc.c index 18a6669760..41927364e2 100644 --- a/src/world/common/enemy/SpearGuy_Wander.inc.c +++ b/src/world/common/enemy/SpearGuy_Wander.inc.c @@ -10,14 +10,14 @@ AnimID N(ExtraAnims_SpearGuy)[] = { ANIM_SpearGuy_Anim07, ANIM_SpearGuy_Anim0F, ANIM_SpearGuy_Anim10, - ANIM_SpearGuy_Anim1A, + ANIM_SpearGuy_Anim1A, ANIM_SpearGuy_Anim1B, ANIM_LIST_END }; AnimID N(ExtraAnims_SpearGuy_Hitbox)[] = { ANIM_SpearGuy_Anim00, - ANIM_LIST_END, + ANIM_LIST_END, }; EvtScript N(EVS_NpcDefeat_SpearGuy_Hitbox) = { diff --git a/src/world/common/enemy/ai/BulletBillAI.inc.c b/src/world/common/enemy/ai/BulletBillAI.inc.c index e08bd441bc..9a33e409f7 100644 --- a/src/world/common/enemy/ai/BulletBillAI.inc.c +++ b/src/world/common/enemy/ai/BulletBillAI.inc.c @@ -45,7 +45,7 @@ API_CALLABLE(N(BulletBillAI_Main)) { Npc* blasterNpc; f32 nextX, nextZ; f32 deltaY; - + if (isInitialCall || enemy->VAR_PROJECTILE_HITBOX_STATE == PROJECTILE_HITBOX_STATE_DONE) { script->AI_TEMP_STATE = AI_STATE_BULLET_INIT; npc->duration = 0; @@ -55,7 +55,7 @@ API_CALLABLE(N(BulletBillAI_Main)) { enemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_NONE; enemy->AI_VAR_BULLET_BLASTER = -1; } - + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { if (enemy->aiSuspendTime != 0) { return 0; @@ -158,7 +158,7 @@ API_CALLABLE(N(BillBlasterAI_Main)) { s32 bulletNpcID; Enemy* bulletEnemy; f32 deltaY; - + if (isInitialCall) { script->AI_TEMP_STATE = AI_STATE_BLASTER_INIT; npc->duration = 30; @@ -166,20 +166,20 @@ API_CALLABLE(N(BillBlasterAI_Main)) { enemy->flags |= ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN; disable_npc_shadow(npc); } - + deltaY = npc->pos.y - gPlayerStatusPtr->position.y; if ((deltaY > 190.0) || (deltaY < -80.0)) { return ApiStatus_BLOCK; } - + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; if (enemy->aiSuspendTime != 0) { return ApiStatus_BLOCK; - } + } enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } - + switch (script->AI_TEMP_STATE) { case AI_STATE_BLASTER_INIT: npc->duration--; @@ -210,7 +210,7 @@ API_CALLABLE(N(BillBlasterAI_Main)) { } npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; bulletEnemy = get_enemy(enemy->AI_VAR_BLASTER_BULLET); - bulletEnemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_PRE; + bulletEnemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_PRE; ai_enemy_play_sound(npc, SOUND_328, SOUND_PARAM_MORE_QUIET); npc->duration = 5; script->AI_TEMP_STATE = AI_STATE_BLASTER_COOLDOWN; diff --git a/src/world/common/enemy/ai/GrooveGuyAI.inc.c b/src/world/common/enemy/ai/GrooveGuyAI.inc.c index e0c0eb223e..fd79b9409c 100644 --- a/src/world/common/enemy/ai/GrooveGuyAI.inc.c +++ b/src/world/common/enemy/ai/GrooveGuyAI.inc.c @@ -76,7 +76,7 @@ API_CALLABLE(N(GrooveGuyAI_Main)) { f32 posY; f32 posZ; f32 hitDepth; - + territory.skipPlayerDetectChance = 0; territory.shape = enemy->territory->wander.detectShape; territory.pointX = enemy->territory->wander.detectPos.x; @@ -85,12 +85,12 @@ API_CALLABLE(N(GrooveGuyAI_Main)) { territory.sizeZ = enemy->territory->wander.detectSize.z; territory.halfHeight = 65.0f; territory.detectFlags = 0; - + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; - + npc->flags &= ~NPC_FLAG_JUMPING; if (!enemy->territory->wander.isFlying) { npc->flags |= NPC_FLAG_GRAVITY; @@ -99,7 +99,7 @@ API_CALLABLE(N(GrooveGuyAI_Main)) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_8; } - + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; @@ -108,7 +108,7 @@ API_CALLABLE(N(GrooveGuyAI_Main)) { } enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; enemy->flags &= ~ENEMY_FLAG_BEGIN_WITH_CHASING; - + hitDepth = 100.0f; posX = npc->pos.x; posY = npc->pos.y + npc->collisionHeight; @@ -117,7 +117,7 @@ API_CALLABLE(N(GrooveGuyAI_Main)) { npc->pos.y = posY; } } - + switch (script->functionTemp[0]) { case 0x0: basic_ai_wander_init(script, aiSettings, territoryPtr); diff --git a/src/world/common/enemy/ai/MagikoopaAI.inc.c b/src/world/common/enemy/ai/MagikoopaAI.inc.c index c3cc64747c..c29bcef9e0 100644 --- a/src/world/common/enemy/ai/MagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/MagikoopaAI.inc.c @@ -34,13 +34,13 @@ void N(MagikoopaAI_01)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol npc->scale.x = N(MagikoopaAI_TeleportAnim)[npc->duration].scaleX; npc->scale.y = N(MagikoopaAI_TeleportAnim)[npc->duration].scaleY; npc->alpha = N(MagikoopaAI_TeleportAnim)[npc->duration].alpha; - + npc->duration++; if (npc->duration == 4) { disable_npc_shadow(npc); enemy->flags |= ENEMY_FLAG_COMBINATION; } - + if (N(MagikoopaAI_TeleportAnim)[npc->duration].alpha == 0) { npc->alpha = 0xFF; npc->scale.x = 1.0f; @@ -103,7 +103,7 @@ void N(MagikoopaAI_11)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol Npc* npc = get_npc_unsafe((s32) enemy->npcID); f32 scale; s16 alpha; - + if (enemy->varTable[0] == 0) { alpha = (npc->duration * 15) + 130; } else { @@ -113,14 +113,14 @@ void N(MagikoopaAI_11)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol alpha = 255; } npc->alpha = alpha; - + npc->scale.x = ((f32)npc->duration * 0.1) + 0.4; if (npc->scale.x > 1.0) { npc->scale.x = 1.0f; } npc->scale.y = npc->scale.x; npc->scale.z = npc->scale.x; - + npc->duration++; if (npc->duration == 5) { enable_npc_shadow(npc); @@ -157,7 +157,7 @@ void N(MagikoopaAI_21)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol Npc* npc = get_npc_unsafe(enemy->npcID); f32 posX, posY, posZ; s32 emoteTemp; - + npc->duration--; if (npc->duration == 0) { npc->currentAnim = enemy->animList[0]; @@ -183,7 +183,7 @@ void N(MagikoopaAI_21)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol void N(MagikoopaAI_22)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* temp_s0 = script->owner1.enemy; Npc* temp_v0 = get_npc_unsafe(temp_s0->npcID); - + temp_v0->duration--; if (temp_v0->duration <= 0) { temp_v0->currentAnim = temp_s0->animList[9]; @@ -197,7 +197,7 @@ void N(MagikoopaAI_23)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol Npc* npc = get_npc_unsafe(enemy->npcID); s32 projectileEnemy; s32 emoteTemp; - + npc->duration--; if (npc->duration <= 0) { projectileEnemy = N(MagikoopaAI_CanShootSpell)(script, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, territory); @@ -218,7 +218,7 @@ void N(MagikoopaAI_23)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol void N(MagikoopaAI_24)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - + npc->duration--; if (npc->duration <= 0) { npc->currentAnim = enemy->animList[0]; @@ -238,7 +238,7 @@ API_CALLABLE(N(MagikoopaAI_Main)) { f32 posY; f32 posZ; f32 hitDepth; - + territory.skipPlayerDetectChance = 0; territory.shape = enemy->territory->wander.detectShape; territory.pointX = enemy->territory->wander.detectPos.x; @@ -247,7 +247,7 @@ API_CALLABLE(N(MagikoopaAI_Main)) { territory.sizeZ = enemy->territory->wander.detectSize.z; territory.halfHeight = 100.0f; territory.detectFlags = 0; - + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { npc->currentAnim = enemy->animList[0]; npc->flags &= ~NPC_FLAG_JUMPING; @@ -264,7 +264,7 @@ API_CALLABLE(N(MagikoopaAI_Main)) { } script->AI_TEMP_STATE = 0; } - + switch (script->AI_TEMP_STATE) { case 0: N(MagikoopaAI_00)(script, aiSettings, territoryPtr); diff --git a/src/world/common/enemy/ai/ParatroopaAI.inc.c b/src/world/common/enemy/ai/ParatroopaAI.inc.c index 0cedf06fb4..d4accf0d92 100644 --- a/src/world/common/enemy/ai/ParatroopaAI.inc.c +++ b/src/world/common/enemy/ai/ParatroopaAI.inc.c @@ -68,7 +68,7 @@ void N(ParatroopaAI_Overshoot)(Evt* script, MobileAISettings *arg1, EnemyDetectV npc->pos.y += npc->jumpVelocity; overshootAmt = overshootAmtRaw / 100.0; npc_move_heading(npc, npc->moveSpeed, npc->yaw); - + posX = npc->pos.x; posY = npc->pos.y; posZ = npc->pos.z; @@ -103,7 +103,7 @@ API_CALLABLE(N(ParatroopaAI_Main)) { EnemyDetectVolume territory; EnemyDetectVolume* territoryPtr = &territory; MobileAISettings* aiSettings = (MobileAISettings*)evt_get_variable(script, *args++); - + territory.skipPlayerDetectChance = 0; territory.shape = enemy->territory->wander.detectShape; territory.pointX = enemy->territory->wander.detectPos.x; @@ -112,7 +112,7 @@ API_CALLABLE(N(ParatroopaAI_Main)) { territory.sizeZ = enemy->territory->wander.detectSize.z; territory.halfHeight = 120.0f; territory.detectFlags = 0; - + if (isInitialCall) { N(FlyingAI_Init)(npc, enemy, script, aiSettings); enemy->varTable[8] = npc->collisionHeight; @@ -127,7 +127,7 @@ API_CALLABLE(N(ParatroopaAI_Main)) { } enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } - + switch (script->AI_TEMP_STATE) { case AI_STATE_WANDER_INIT: N(FlyingAI_WanderInit)(script, aiSettings, territoryPtr); diff --git a/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c b/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c index c637157f6d..b09960abba 100644 --- a/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c +++ b/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c @@ -6,7 +6,7 @@ void N(ShyGuyPatrolAI_14)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territoryPtr) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - + npc->moveSpeed *= 0.6; npc->currentAnim = enemy->animList[12]; npc->duration = 5; @@ -17,11 +17,11 @@ void N(ShyGuyPatrolAI_15)(Evt* script, MobileAISettings* aiSettings, EnemyDetect Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe((s32) enemy->npcID); f32 yaw = npc->yaw; - + if (ai_check_fwd_collisions(npc, npc->moveSpeed, &yaw, NULL, NULL, NULL) == 0) { npc_move_heading(npc, npc->moveSpeed, npc->yaw); } - + npc->duration--; if (npc->duration == 0) { npc->moveSpeed *= 0.6; @@ -36,11 +36,11 @@ void N(ShyGuyPatrolAI_16)(Evt* script, MobileAISettings* aiSettings, EnemyDetect Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); f32 yaw = npc->yaw; - + if (ai_check_fwd_collisions(npc, npc->moveSpeed, &yaw, NULL, NULL, NULL) == 0) { npc_move_heading(npc, npc->moveSpeed, npc->yaw); } - + npc->duration--; if (npc->duration == 0) { npc->duration = 30; @@ -70,7 +70,7 @@ API_CALLABLE(N(ShyGuyPatrolAI_Main)) { f32 posY; f32 posZ; f32 hitDepth; - + territory.skipPlayerDetectChance = 0; territory.shape = enemy->territory->patrol.detectShape; territory.pointX = enemy->territory->patrol.detectPos.x; @@ -79,12 +79,12 @@ API_CALLABLE(N(ShyGuyPatrolAI_Main)) { territory.sizeZ = enemy->territory->patrol.detectSize.z; territory.halfHeight = 65.0f; territory.detectFlags = 0; - + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; - + npc->flags &= ~NPC_FLAG_JUMPING; if (!enemy->territory->patrol.isFlying) { npc->flags |= NPC_FLAG_GRAVITY; @@ -93,7 +93,7 @@ API_CALLABLE(N(ShyGuyPatrolAI_Main)) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_8; } - + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; @@ -111,7 +111,7 @@ API_CALLABLE(N(ShyGuyPatrolAI_Main)) { npc->pos.y = posY; } } - + switch (script->functionTemp[0]) { case 0x0: N(PatrolAI_MoveInit)(script, aiSettings, territoryPtr); diff --git a/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c b/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c index 887e7f51b4..0c918bc524 100644 --- a/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c +++ b/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c @@ -4,7 +4,7 @@ void N(ShyGuyWanderAI_14)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territoryPtr) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - + npc->moveSpeed *= 0.6; npc->currentAnim = enemy->animList[12]; npc->duration = 5; @@ -15,11 +15,11 @@ void N(ShyGuyWanderAI_15)(Evt* script, MobileAISettings* aiSettings, EnemyDetect Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe((s32) enemy->npcID); f32 yaw = npc->yaw; - + if (ai_check_fwd_collisions(npc, npc->moveSpeed, &yaw, NULL, NULL, NULL) == 0) { npc_move_heading(npc, npc->moveSpeed, npc->yaw); } - + npc->duration--; if (npc->duration == 0) { npc->moveSpeed *= 0.6; @@ -34,11 +34,11 @@ void N(ShyGuyWanderAI_16)(Evt* script, MobileAISettings* aiSettings, EnemyDetect Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); f32 yaw = npc->yaw; - + if (ai_check_fwd_collisions(npc, npc->moveSpeed, &yaw, NULL, NULL, NULL) == 0) { npc_move_heading(npc, npc->moveSpeed, npc->yaw); } - + npc->duration--; if (npc->duration == 0) { npc->duration = 30; @@ -68,7 +68,7 @@ API_CALLABLE(N(ShyGuyWanderAI_Main)) { f32 posY; f32 posZ; f32 hitDepth; - + territory.skipPlayerDetectChance = 0; territory.shape = enemy->territory->wander.detectShape; territory.pointX = enemy->territory->wander.detectPos.x; @@ -77,12 +77,12 @@ API_CALLABLE(N(ShyGuyWanderAI_Main)) { territory.sizeZ = enemy->territory->wander.detectSize.z; territory.halfHeight = 65.0f; territory.detectFlags = 0; - + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; - + npc->flags &= ~NPC_FLAG_JUMPING; if (!enemy->territory->wander.isFlying) { npc->flags |= NPC_FLAG_GRAVITY; @@ -91,7 +91,7 @@ API_CALLABLE(N(ShyGuyWanderAI_Main)) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_8; } - + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; @@ -109,7 +109,7 @@ API_CALLABLE(N(ShyGuyWanderAI_Main)) { npc->pos.y = posY; } } - + switch (script->functionTemp[0]) { case 0x0: basic_ai_wander_init(script, aiSettings, territoryPtr); diff --git a/src/world/common/enemy/ai/SpearGuyAI.inc.c b/src/world/common/enemy/ai/SpearGuyAI.inc.c index 777fa3f4ff..5bad33da03 100644 --- a/src/world/common/enemy/ai/SpearGuyAI.inc.c +++ b/src/world/common/enemy/ai/SpearGuyAI.inc.c @@ -129,7 +129,7 @@ ApiStatus N(SpearGuyAI_Main)(Evt* script, s32 isInitialCall) { case AI_STATE_WANDER: basic_ai_wander(script, npcAISettings, territoryPtr); break; - + case AI_STATE_LOITER_INIT: N(SpearGuyAI_LoiterInit)(script, npcAISettings, territoryPtr); case AI_STATE_LOITER: diff --git a/src/world/common/enemy/ai/WanderMeleeAI.inc.c b/src/world/common/enemy/ai/WanderMeleeAI.inc.c index 9b11ed34eb..18d2356c34 100644 --- a/src/world/common/enemy/ai/WanderMeleeAI.inc.c +++ b/src/world/common/enemy/ai/WanderMeleeAI.inc.c @@ -51,7 +51,7 @@ ApiStatus N(WanderMeleeAI_Main)(Evt* script, s32 isInitialCall) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_8; } - + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = AI_STATE_WANDER_INIT; diff --git a/src/world/common/npc/KoopaWithoutShell_Patrol.inc.c b/src/world/common/npc/KoopaWithoutShell_Patrol.inc.c index 71e97e6fd4..443be8be34 100644 --- a/src/world/common/npc/KoopaWithoutShell_Patrol.inc.c +++ b/src/world/common/npc/KoopaWithoutShell_Patrol.inc.c @@ -26,6 +26,6 @@ NpcSettings N(NpcSettings_KoopaWithoutShell_Patrol) = { }; s32 N(missing_80246F94_6F94)[] = { - 0x00000000, 0x002A0018, 0x00000000, 0x00000000, 0x80246F48, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00630000, + 0x00000000, 0x002A0018, 0x00000000, 0x00000000, 0x80246F48, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00630000, }; diff --git a/src/world/common/npc/Mouser.h b/src/world/common/npc/Mouser.h index 0db1b2d7d9..75455a3886 100644 --- a/src/world/common/npc/Mouser.h +++ b/src/world/common/npc/Mouser.h @@ -9,7 +9,7 @@ ANIM_Mouser_Blue_Idle, \ ANIM_Mouser_Blue_Run, \ ANIM_Mouser_Blue_Run, \ - ANIM_Mouser_Blue_Run, \ + ANIM_Mouser_Blue_Run, \ ANIM_Mouser_Blue_Idle, \ ANIM_Mouser_Blue_Idle, \ ANIM_Mouser_Blue_Idle, \ diff --git a/src/world/common/todo/HeartPlant_SpawnHeart.inc.c b/src/world/common/todo/HeartPlant_SpawnHeart.inc.c index be156289ab..56aeae0e75 100644 --- a/src/world/common/todo/HeartPlant_SpawnHeart.inc.c +++ b/src/world/common/todo/HeartPlant_SpawnHeart.inc.c @@ -3,7 +3,7 @@ API_CALLABLE(N(HeartPlant_SpawnHeart)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - + if ((enemy->varTable[0] < 5) && (rand_int(1000) > 300)) { make_item_entity_nodelay(ITEM_HEART, npc->pos.x, npc->pos.y + npc->collisionHeight, npc->pos.z + 5.0, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, 0); diff --git a/src/world/common/todo/UnkFunc12.inc.c b/src/world/common/todo/UnkFunc12.inc.c index 9eff61c17a..b02ff48ab6 100644 --- a/src/world/common/todo/UnkFunc12.inc.c +++ b/src/world/common/todo/UnkFunc12.inc.c @@ -15,7 +15,7 @@ API_CALLABLE(N(UnkFunc12)) { posY = playerStatus->position.y + 10.0f; posZ = playerStatus->position.z; hitDepth = 40.0f; - + npc_raycast_down_sides(0, &posX, &posY, &posZ, &hitDepth); playerStatus->position.x = posX; diff --git a/src/world/common/util/GetFirstTriangleNormal.inc.c b/src/world/common/util/GetFirstTriangleNormal.inc.c index 13f0ec7985..4e0031c59a 100644 --- a/src/world/common/util/GetFirstTriangleNormal.inc.c +++ b/src/world/common/util/GetFirstTriangleNormal.inc.c @@ -19,16 +19,16 @@ void N(GetFirstTriangleNormal)(Gfx* inGfx, f32* outNx, f32* outNy, f32* outNz) { f32 d32x, d32y, d32z; f32 nx, ny, nz; f32 norm; - + Vtx_t* vtxArray; u32 vtxCount; s32 vtxEnd; s32 i; - + v1x = v1y = v1z = 0.0f; v2x = v2y = v2z = 0.0f; v3x = v3y = v3z = 0.0f; - + while (TRUE) { u32 w0 = gfx->words.w0; u32 w1 = gfx->words.w1; @@ -52,7 +52,7 @@ void N(GetFirstTriangleNormal)(Gfx* inGfx, f32* outNx, f32* outNy, f32* outNz) { case G_TRI1: v1x = N(TriNormVertexBuffer)[((w1 >> 16) & 0xFF) / 2]->ob[0]; v1y = N(TriNormVertexBuffer)[((w1 >> 16) & 0xFF) / 2]->ob[1]; - v1z = N(TriNormVertexBuffer)[((w1 >> 16) & 0xFF) / 2]->ob[2]; + v1z = N(TriNormVertexBuffer)[((w1 >> 16) & 0xFF) / 2]->ob[2]; v2x = N(TriNormVertexBuffer)[((w1 >> 8) & 0xFF) / 2]->ob[0]; v2y = N(TriNormVertexBuffer)[((w1 >> 8) & 0xFF) / 2]->ob[1]; v2z = N(TriNormVertexBuffer)[((w1 >> 8) & 0xFF) / 2]->ob[2]; @@ -67,27 +67,27 @@ void N(GetFirstTriangleNormal)(Gfx* inGfx, f32* outNx, f32* outNy, f32* outNz) { v1z = N(TriNormVertexBuffer)[((w0 >> 16) & 0xFF) / 2]->ob[2]; v2x = N(TriNormVertexBuffer)[((w0 >> 8) & 0xFF) / 2]->ob[0]; v2y = N(TriNormVertexBuffer)[((w0 >> 8) & 0xFF) / 2]->ob[1]; - v2z = N(TriNormVertexBuffer)[((w0 >> 8) & 0xFF) / 2]->ob[2]; + v2z = N(TriNormVertexBuffer)[((w0 >> 8) & 0xFF) / 2]->ob[2]; v3x = N(TriNormVertexBuffer)[(w0 & 0xFF) / 2]->ob[0]; v3y = N(TriNormVertexBuffer)[(w0 & 0xFF) / 2]->ob[1]; v3z = N(TriNormVertexBuffer)[(w0 & 0xFF) / 2]->ob[2]; readState = READ_STATE_TRIANGLE; break; } - + if (readState != READ_STATE_CONTINUE) { break; } gfx++; } - + if (readState == READ_STATE_TRIANGLE) { // get two vectors from three points d12x = v1x - v2x; d12y = v1y - v2y; d12z = v1z - v2z; d32x = v3x - v2x; - d32y = v3y - v2y; + d32y = v3y - v2y; d32z = v3z - v2z; // cross product to get normal vector nx = (d12y * d32z) - (d12z * d32y); diff --git a/src/world/common/util/SetLightningBoltPurple.inc.c b/src/world/common/util/SetLightningBoltPurple.inc.c index 1554591600..d69e853a26 100644 --- a/src/world/common/util/SetLightningBoltPurple.inc.c +++ b/src/world/common/util/SetLightningBoltPurple.inc.c @@ -10,6 +10,6 @@ API_CALLABLE(N(SetLightningBoltPurple)) { effect->data.lightningBolt->innerColor.r = 255; effect->data.lightningBolt->innerColor.g = 175; effect->data.lightningBolt->innerColor.b = 239; - + return ApiStatus_DONE2; } diff --git a/src/world/dead/area_flo/flo_03/flo_03_4_foliage.c b/src/world/dead/area_flo/flo_03/flo_03_4_foliage.c index 504f42d47c..09bae8673f 100644 --- a/src/world/dead/area_flo/flo_03/flo_03_4_foliage.c +++ b/src/world/dead/area_flo/flo_03/flo_03_4_foliage.c @@ -6,7 +6,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o170); FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o157); FoliageDropList N(Tree1_Drops) = { - .count = 2, + .count = 2, .drops = { { .itemID = ITEM_RED_BERRY, diff --git a/src/world/dead/area_flo/flo_08/flo_08_5_foliage.c b/src/world/dead/area_flo/flo_08/flo_08_5_foliage.c index 1fa1003cf9..f9f1fafcf2 100644 --- a/src/world/dead/area_flo/flo_08/flo_08_5_foliage.c +++ b/src/world/dead/area_flo/flo_08/flo_08_5_foliage.c @@ -6,7 +6,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o133); FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o132); FoliageDropList N(Tree1_Drops) = { - .count = 2, + .count = 2, .drops = { { .itemID = ITEM_BLUE_BERRY, diff --git a/src/world/dead/area_flo/flo_10/flo_10_7_foliage.c b/src/world/dead/area_flo/flo_10/flo_10_7_foliage.c index 845dfdc565..dd7b4ee3b3 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_7_foliage.c +++ b/src/world/dead/area_flo/flo_10/flo_10_7_foliage.c @@ -6,7 +6,7 @@ FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o47, MODEL_o48, FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o88); FoliageDropList N(Tree1_Drops) = { - .count = 1, + .count = 1, .drops = { { .itemID = ITEM_JAMMIN_JELLY, diff --git a/src/world/dead/area_flo/flo_12/flo_12_1_music.c b/src/world/dead/area_flo/flo_12/flo_12_1_music.c index 1c6bd2255a..8acf9d369b 100644 --- a/src/world/dead/area_flo/flo_12/flo_12_1_music.c +++ b/src/world/dead/area_flo/flo_12/flo_12_1_music.c @@ -16,7 +16,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_END }; -EvtScript N(EVS_PushFlowerSong) = { +EvtScript N(EVS_PushFlowerSong) = { EVT_CALL(PushSong, SONG_FLOWER_NPC_THEME, 3) EVT_RETURN EVT_END diff --git a/src/world/script_api/rooms.c b/src/world/script_api/rooms.c index 794f9aa54a..adce85f64a 100644 --- a/src/world/script_api/rooms.c +++ b/src/world/script_api/rooms.c @@ -635,7 +635,7 @@ EvtScript EVS_EnterRoomDoor = { EVT_SET(LVarE, 20) EVT_EXEC_WAIT(EVS_EnterRoom_MovePlayerA) EVT_END_SWITCH - + // reveal room interior and hide world EVT_CALL(GetDoorData) EVT_SET(LVar0, ROOM_VISIBILITY_SHOW) diff --git a/tools/asm_sizes.py b/tools/asm_sizes.py index 7ebc991b10..673eac5550 100755 --- a/tools/asm_sizes.py +++ b/tools/asm_sizes.py @@ -67,7 +67,7 @@ if __name__ == "__main__": for root, dirs, files in os.walk(asm_dir): for asm_dir in dirs: do_dir(root, asm_dir) - + if args.alphabetical: print(json.dumps(dict(sorted(funcs.items(), key=lambda f: f[0])), indent=4)) elif args.size: diff --git a/tools/build/sprite/header.py b/tools/build/sprite/header.py index b69dc07875..c1d7c29600 100755 --- a/tools/build/sprite/header.py +++ b/tools/build/sprite/header.py @@ -38,7 +38,7 @@ if __name__ == "__main__": f.write(f"#define SPR_IMG_{sprite_name}_{image_name} 0x{i:X}\n") f.write("\n") - # definitions for palettes + # definitions for palettes for p, palette_name in enumerate(sprite.palette_names): if palette_name == "Default": f.write(f"#define SPR_PAL_{sprite_name} 0x{p:X}\n") @@ -46,7 +46,7 @@ if __name__ == "__main__": f.write(f"#define SPR_PAL_{sprite_name}_{palette_name} 0x{p:X}\n") f.write("\n") - # definitions for animations + # definitions for animations for p, palette_name in enumerate(sprite.palette_names): for a, name in enumerate(sprite.animation_names): if palette_name == "Default": diff --git a/tools/build/yay0/Yay0compress.c b/tools/build/yay0/Yay0compress.c index 1b9cd64fc3..22ffb64121 100644 --- a/tools/build/yay0/Yay0compress.c +++ b/tools/build/yay0/Yay0compress.c @@ -35,24 +35,24 @@ int main(int argc, const char **argv, const char **envp) fprintf(stderr, "Yay0compress [infile] [outfile]\n"); return 1; } - + strcpy(src, argv[1]); strcpy(dest, argv[2]); - + if ((fp = fopen(src, "rb")) == NULL) { fprintf(stderr, "FILE OPEN ERROR![%s]\n", src); return 1; } - + fseek(fp, 0, SEEK_END); insize = ftell(fp); fseek(fp, 0, SEEK_SET); - + bz = malloc(insize); fread(bz, 1, insize, fp); fclose(fp); - + for (int i = 0; src[i]; i++) { if (src[i] == '.') @@ -61,31 +61,31 @@ int main(int argc, const char **argv, const char **envp) break; } } - + if ((fp = fopen(dest, "wb")) == NULL) { fprintf(stderr, "FILE CREATE ERROR![%s]\n", dest); exit(1); } - + encode(); - + fprintf(fp, "Yay0"); - + writeint4(insize); - + writeint4(4 * cp + 16); writeint4(2 * pp + 4 * cp + 16); - + for (int i = 0; i < cp; i++) writeint4(cmd[i]); - + for (int i = 0; i < pp; i++) writeshort(pol[i]); - + fwrite(def, 1u, dp, fp); fclose(fp); - + return 0; } @@ -296,7 +296,7 @@ void initskip(unsigned char *pattern, int len) { for (int i = 0; i < 256; i++) skip[i] = len; - + for (int i = 0; i < len; i++) skip[pattern[i]] = len - i - 1; } diff --git a/tools/old/set_reorder_asm.sh b/tools/old/set_reorder_asm.sh index 629b7ef7c4..4168a45074 100755 --- a/tools/old/set_reorder_asm.sh +++ b/tools/old/set_reorder_asm.sh @@ -5,6 +5,6 @@ shopt -s globstar LIST=$(ls asm/**/*.s) for i in $LIST -do +do printf "\n.set reorder\n" >> $i done diff --git a/tools/splat/CHANGELOG.md b/tools/splat/CHANGELOG.md index e800f28911..13606e4931 100644 --- a/tools/splat/CHANGELOG.md +++ b/tools/splat/CHANGELOG.md @@ -5,7 +5,7 @@ * Refactored the `appears_after_overlays_addr` feature so that expressions are written at the latest possible moment in the linker script. This fixes errors and warnings regarding forward references to later symbols. ### 0.13.3 -* Added a new symbol_addrs attribute `appears_after_overlays_addr:0x1234` which will modify the linker script such that the symbol's address is equal to the value of the end of the longest overlay starting with address 0x1234. It achieve this by writing a series of sym = MAX(sym, seg_vram_END) statements into the linker script. For some games, it's feasible to manually create such statements, but for games with hundreds of overlays at the same address, this is very tedious and prone to error. The new attribute allows you to have peace of mind that the symbol will end up after all of these overlays. +* Added a new symbol_addrs attribute `appears_after_overlays_addr:0x1234` which will modify the linker script such that the symbol's address is equal to the value of the end of the longest overlay starting with address 0x1234. It achieve this by writing a series of sym = MAX(sym, seg_vram_END) statements into the linker script. For some games, it's feasible to manually create such statements, but for games with hundreds of overlays at the same address, this is very tedious and prone to error. The new attribute allows you to have peace of mind that the symbol will end up after all of these overlays. ### 0.13.2 * Actually implemented `ld_use_follows`. Oopz @@ -341,10 +341,10 @@ Internally, there's a new Symbol class which stores information about a symbol a ## 0.5 The Rename Update * n64splat name changed to splat - * Some refactoring was done to support other platforms besides n64 in the future + * Some refactoring was done to support other platforms besides n64 in the future * New `platform` option, which defaults to `n64` * This will cause breaking changes in custom segments, so please refer to one of the changes in one of the n64 base segments for details -* Support for custom artifact paths +* Support for custom artifact paths * New `undefined_syms_auto_path` option * New `undefined_funcs_auto_path` option * New `cache_path` option diff --git a/tools/splat_ext/npc.yaml b/tools/splat_ext/npc.yaml index 4026cf71f8..049b3b4964 100644 --- a/tools/splat_ext/npc.yaml +++ b/tools/splat_ext/npc.yaml @@ -1,7 +1,7 @@ # This file describes what to name the frame images, palettes, and animations of sprites when splitting. # GENERAL NAME CONVENTIONS: -# +# # - Names should be short, one or two words, in PascalCase with no underscores. # - Prefer names to describe the actions or states depicted rather than how they are used. # - Sequential names start counting in decimal from 1, not 0. @@ -20,7 +20,7 @@ # - Names should be in the simple present tense: # Sleep GOOD # Sleeping BAD -# +# # - Present perfect is sometimes OK when describing a state of being: # e.g., Injured, Disappointed # diff --git a/tools/substitute.py b/tools/substitute.py index 7f38d9680b..0dbbe2ecdf 100755 --- a/tools/substitute.py +++ b/tools/substitute.py @@ -57,7 +57,7 @@ for root, dirs, files in os.walk(src_dir): # # Rename symbols in from_funcs to namespace equivalents # for root, dirs, files in os.walk -to_replace = [] +to_replace = [] for root, dirs, files in os.walk(asm_dir): for f_name in files: diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml index 60bb67df85..197c513f43 100644 --- a/ver/jp/splat.yaml +++ b/ver/jp/splat.yaml @@ -302,7 +302,7 @@ segments: - [0x4FAC0] - [0x4FB10, rgba32, theater/curtains, 32, 32] - [0x50B10] - - [0x50B60, ci4, theater/floor, 32, 16] + - [0x50B60, ci4, theater/floor, 32, 16] - [0x50C60, palette, theater/floor] - [0x50C80] - [0x50D00, vtx, theater/left_wall_vtx]