diff --git a/docs/game/help-messages.md b/docs/game/help-messages.md new file mode 100644 index 0000000000..d8efe3d25f --- /dev/null +++ b/docs/game/help-messages.md @@ -0,0 +1,44 @@ +# Help messages and tutorial records + +`HelpState` in `rnc/ui/help/help_state.h` is the shared boot help-window +layout. Its geometry comes from `link_localized_display_text` and is consumed +by `draw_help`: `half_width`/`half_height` are the target size, while +`frame_half_width`/`frame_half_height` describe the animated frame. + +## Message fields + +`msg` indexes the loaded message table; `pending` is a request ID, with -1 +meaning no request. `entry` indexes persistent records, and `count` bounds +the loaded table. These are different index spaces. + +A `HelpMessageEntry` is 16 bytes on EE. Its first word is a text pointer +after relocation; archive loaders retain their integer-offset view before +relocation. `find_help_message_index` compares `message_id` at 0x04. +`update_help_state` adds 30000 to `audio_track_offset` at 0x08 for the +secondary audio stream, with -1 meaning no audio. The final word remains +unknown. Message IDs and audio-track offsets are not interchangeable. + +## Records and time + +`HelpRecord` and `UsageStat` are 8-byte records: a 16-bit count, a 16-bit +`latest_time_bucket`, and 32-bit level/status flags. Writers retain the +maximum of `scale_game_frames(play_time) / 600`; readers multiply by 600 +when testing elapsed time. This is a coarse play-time bucket, not a best +score or countdown. Original narrowing and comparisons are preserved. + +`UsageStat.level_mask` is signed: Novalis and Kerwan test it against zero +to inspect bit 31. `HelpRecord.level_flags` remains unsigned. Visited-level +bits coexist with bit 31, which `clear_help_record_high_bits` clears, so +it is not an immutable "ever shown" flag. `help_request` rejects a count +of 0xFFFF; other writers saturate the count there. + +## Reference evidence + +RC1 functions and callers establish these meanings. `rac1-decomp` at +`05da3217a4046ac01dec3ac74f051a348f063155` corroborates geometry and request +offsets in `src/game/help.c` and `src/overlays/shared/help_00203E98.c`. +Its help-update code derives from Lombyte and is not independent evidence. +No PAL addresses or implementation bodies were imported. + +The help window and record layout checks in `src/check/` verify EE offsets +and sizes; boot and overlay byte checks remain the acceptance gates. diff --git a/include/rnc/audio.h b/include/rnc/audio.h new file mode 100644 index 0000000000..2c0dffba2c --- /dev/null +++ b/include/rnc/audio.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_AUDIO_H +#define LOMBYTE_RNC_AUDIO_H + +#include "types.h" + +s32 snd_start_sound_system(void) __asm__("FUN_0012da28"); + +#endif /* LOMBYTE_RNC_AUDIO_H */ diff --git a/include/rnc/audio/decoder.h b/include/rnc/audio/decoder.h new file mode 100644 index 0000000000..a581221d01 --- /dev/null +++ b/include/rnc/audio/decoder.h @@ -0,0 +1,12 @@ +#ifndef LOMBYTE_RNC_AUDIO_DECODER_H +#define LOMBYTE_RNC_AUDIO_DECODER_H + +#include "types.h" + +struct AudioDec; + +s32 audio_dec_create(struct AudioDec *, s32, s32, s32) __asm__("FUN_0023abd0"); +int audio_dec_is_preset(struct AudioDec *) __asm__("func_0023AEE0"); +void audio_dec_reset(struct AudioDec *) __asm__("FUN_0023ad10"); + +#endif /* LOMBYTE_RNC_AUDIO_DECODER_H */ diff --git a/include/rnc/audio/decoder/audio_dec_create.h b/include/rnc/audio/decoder/audio_dec_create.h deleted file mode 100644 index e4fed91a43..0000000000 --- a/include/rnc/audio/decoder/audio_dec_create.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_DECODER_AUDIO_DEC_CREATE_H -#define LOMBYTE_RNC_AUDIO_DECODER_AUDIO_DEC_CREATE_H - -#include "types.h" - -struct AudioDec; - -s32 audio_dec_create(struct AudioDec *, s32, s32, s32) __asm__("FUN_0023abd0"); - -#endif /* LOMBYTE_RNC_AUDIO_DECODER_AUDIO_DEC_CREATE_H */ diff --git a/include/rnc/audio/decoder/audio_dec_is_preset.h b/include/rnc/audio/decoder/audio_dec_is_preset.h deleted file mode 100644 index 5dd93e6d54..0000000000 --- a/include/rnc/audio/decoder/audio_dec_is_preset.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_DECODER_AUDIO_DEC_IS_PRESET_H -#define LOMBYTE_RNC_AUDIO_DECODER_AUDIO_DEC_IS_PRESET_H - -#include "types.h" - -struct AudioDec; - -int audio_dec_is_preset(struct AudioDec *) __asm__("func_0023AEE0"); - -#endif /* LOMBYTE_RNC_AUDIO_DECODER_AUDIO_DEC_IS_PRESET_H */ diff --git a/include/rnc/audio/decoder/audio_dec_reset.h b/include/rnc/audio/decoder/audio_dec_reset.h deleted file mode 100644 index 18b2886b11..0000000000 --- a/include/rnc/audio/decoder/audio_dec_reset.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_DECODER_AUDIO_DEC_RESET_H -#define LOMBYTE_RNC_AUDIO_DECODER_AUDIO_DEC_RESET_H - -#include "types.h" - -struct AudioDec; - -void audio_dec_reset(struct AudioDec *) __asm__("FUN_0023ad10"); - -#endif /* LOMBYTE_RNC_AUDIO_DECODER_AUDIO_DEC_RESET_H */ diff --git a/include/rnc/audio/effects.h b/include/rnc/audio/effects.h new file mode 100644 index 0000000000..75ef9425a3 --- /dev/null +++ b/include/rnc/audio/effects.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_AUDIO_EFFECTS_H +#define LOMBYTE_RNC_AUDIO_EFFECTS_H + +#include "types.h" + +void snd_auto_reverb(s32, s32, s32, s32) __asm__("FUN_0012efe0"); +void snd_pre_alloc_reverb_work_area(s32, s32) __asm__("FUN_0012efa8"); + +#endif /* LOMBYTE_RNC_AUDIO_EFFECTS_H */ diff --git a/include/rnc/audio/effects/snd_auto_reverb.h b/include/rnc/audio/effects/snd_auto_reverb.h deleted file mode 100644 index f07c19ce92..0000000000 --- a/include/rnc/audio/effects/snd_auto_reverb.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_EFFECTS_SND_AUTO_REVERB_H -#define LOMBYTE_RNC_AUDIO_EFFECTS_SND_AUTO_REVERB_H - -#include "types.h" - -void snd_auto_reverb(s32, s32, s32, s32) __asm__("FUN_0012efe0"); - -#endif /* LOMBYTE_RNC_AUDIO_EFFECTS_SND_AUTO_REVERB_H */ diff --git a/include/rnc/audio/effects/snd_pre_alloc_reverb_work_area.h b/include/rnc/audio/effects/snd_pre_alloc_reverb_work_area.h deleted file mode 100644 index 5e24f7d2a0..0000000000 --- a/include/rnc/audio/effects/snd_pre_alloc_reverb_work_area.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_EFFECTS_SND_PRE_ALLOC_REVERB_WORK_AREA_H -#define LOMBYTE_RNC_AUDIO_EFFECTS_SND_PRE_ALLOC_REVERB_WORK_AREA_H - -#include "types.h" - -void snd_pre_alloc_reverb_work_area(s32, s32) __asm__("FUN_0012efa8"); - -#endif /* LOMBYTE_RNC_AUDIO_EFFECTS_SND_PRE_ALLOC_REVERB_WORK_AREA_H */ diff --git a/include/rnc/audio/mixer.h b/include/rnc/audio/mixer.h new file mode 100644 index 0000000000..eafaa88f22 --- /dev/null +++ b/include/rnc/audio/mixer.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_AUDIO_MIXER_H +#define LOMBYTE_RNC_AUDIO_MIXER_H + +#include "types.h" + +void snd_set_group_voice_range(s32, s32, s32) __asm__("FUN_0012e2b8"); +void snd_set_mixer_mode(s32, s32) __asm__("FUN_0012e280"); + +#endif /* LOMBYTE_RNC_AUDIO_MIXER_H */ diff --git a/include/rnc/audio/mixer/snd_set_group_voice_range.h b/include/rnc/audio/mixer/snd_set_group_voice_range.h deleted file mode 100644 index b174f67bb7..0000000000 --- a/include/rnc/audio/mixer/snd_set_group_voice_range.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_MIXER_SND_SET_GROUP_VOICE_RANGE_H -#define LOMBYTE_RNC_AUDIO_MIXER_SND_SET_GROUP_VOICE_RANGE_H - -#include "types.h" - -void snd_set_group_voice_range(s32, s32, s32) __asm__("FUN_0012e2b8"); - -#endif /* LOMBYTE_RNC_AUDIO_MIXER_SND_SET_GROUP_VOICE_RANGE_H */ diff --git a/include/rnc/audio/mixer/snd_set_mixer_mode.h b/include/rnc/audio/mixer/snd_set_mixer_mode.h deleted file mode 100644 index fe92cba863..0000000000 --- a/include/rnc/audio/mixer/snd_set_mixer_mode.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_MIXER_SND_SET_MIXER_MODE_H -#define LOMBYTE_RNC_AUDIO_MIXER_SND_SET_MIXER_MODE_H - -#include "types.h" - -void snd_set_mixer_mode(s32, s32) __asm__("FUN_0012e280"); - -#endif /* LOMBYTE_RNC_AUDIO_MIXER_SND_SET_MIXER_MODE_H */ diff --git a/include/rnc/audio/movie.h b/include/rnc/audio/movie.h new file mode 100644 index 0000000000..8d1bb1034a --- /dev/null +++ b/include/rnc/audio/movie.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_AUDIO_MOVIE_H +#define LOMBYTE_RNC_AUDIO_MOVIE_H + +#include "types.h" + +void snd_close_movie_sound(void) __asm__("FUN_0012f0e0"); +void snd_update_movie_adpcm(s32, s32) __asm__("FUN_0012f148"); + +#endif /* LOMBYTE_RNC_AUDIO_MOVIE_H */ diff --git a/include/rnc/audio/movie/snd_close_movie_sound.h b/include/rnc/audio/movie/snd_close_movie_sound.h deleted file mode 100644 index 70132f39dc..0000000000 --- a/include/rnc/audio/movie/snd_close_movie_sound.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_MOVIE_SND_CLOSE_MOVIE_SOUND_H -#define LOMBYTE_RNC_AUDIO_MOVIE_SND_CLOSE_MOVIE_SOUND_H - -#include "types.h" - -void snd_close_movie_sound(void) __asm__("FUN_0012f0e0"); - -#endif /* LOMBYTE_RNC_AUDIO_MOVIE_SND_CLOSE_MOVIE_SOUND_H */ diff --git a/include/rnc/audio/movie/snd_update_movie_adpcm.h b/include/rnc/audio/movie/snd_update_movie_adpcm.h deleted file mode 100644 index 64adae40db..0000000000 --- a/include/rnc/audio/movie/snd_update_movie_adpcm.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_MOVIE_SND_UPDATE_MOVIE_ADPCM_H -#define LOMBYTE_RNC_AUDIO_MOVIE_SND_UPDATE_MOVIE_ADPCM_H - -#include "types.h" - -void snd_update_movie_adpcm(s32, s32) __asm__("FUN_0012f148"); - -#endif /* LOMBYTE_RNC_AUDIO_MOVIE_SND_UPDATE_MOVIE_ADPCM_H */ diff --git a/include/rnc/audio/music.h b/include/rnc/audio/music.h new file mode 100644 index 0000000000..d2c3ed26d4 --- /dev/null +++ b/include/rnc/audio/music.h @@ -0,0 +1,17 @@ +#ifndef LOMBYTE_RNC_AUDIO_MUSIC_H +#define LOMBYTE_RNC_AUDIO_MUSIC_H + +#include "types.h" + +void music_pause(s32); +void music_start_track(s32, s32, s32) __asm__("FUN_00215c40"); +void music_start_track_10000(s32, s32, s32) __asm__("FUN_002158a0"); +void music_start_track_20000(s32, s32, s32) __asm__("FUN_002157d0"); +void music_start_track_30000(s32, s32, s32) __asm__("FUN_002156d8"); +void music_start_track_40000(s32, s32, s32) __asm__("FUN_00215600"); +void music_start_track_50000(s32, s32, s32) __asm__("FUN_00215518"); +void music_start_track_60000(s32, s32, s32) __asm__("FUN_00215440"); +void music_update(void) __asm__("FUN_00216290"); +void reset_music(void) __asm__("FUN_00215390"); + +#endif /* LOMBYTE_RNC_AUDIO_MUSIC_H */ diff --git a/include/rnc/audio/music/music_pause.h b/include/rnc/audio/music/music_pause.h deleted file mode 100644 index 57f82658d7..0000000000 --- a/include/rnc/audio/music/music_pause.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_PAUSE_H -#define LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_PAUSE_H - -#include "types.h" - -void music_pause(s32); - -#endif /* LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_PAUSE_H */ diff --git a/include/rnc/audio/music/music_start_track.h b/include/rnc/audio/music/music_start_track.h deleted file mode 100644 index 729f198a68..0000000000 --- a/include/rnc/audio/music/music_start_track.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_H -#define LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_H - -#include "types.h" - -void music_start_track(s32, s32, s32) __asm__("FUN_00215c40"); - -#endif /* LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_H */ diff --git a/include/rnc/audio/music/music_start_track_10000.h b/include/rnc/audio/music/music_start_track_10000.h deleted file mode 100644 index b6595e1ed0..0000000000 --- a/include/rnc/audio/music/music_start_track_10000.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_10000_H -#define LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_10000_H - -#include "types.h" - -void music_start_track_10000(s32, s32, s32) __asm__("FUN_002158a0"); - -#endif /* LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_10000_H */ diff --git a/include/rnc/audio/music/music_start_track_20000.h b/include/rnc/audio/music/music_start_track_20000.h deleted file mode 100644 index e699bb030c..0000000000 --- a/include/rnc/audio/music/music_start_track_20000.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_20000_H -#define LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_20000_H - -#include "types.h" - -void music_start_track_20000(s32, s32, s32) __asm__("FUN_002157d0"); - -#endif /* LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_20000_H */ diff --git a/include/rnc/audio/music/music_start_track_30000.h b/include/rnc/audio/music/music_start_track_30000.h deleted file mode 100644 index ff6d2b593c..0000000000 --- a/include/rnc/audio/music/music_start_track_30000.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_30000_H -#define LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_30000_H - -#include "types.h" - -void music_start_track_30000(s32, s32, s32) __asm__("FUN_002156d8"); - -#endif /* LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_30000_H */ diff --git a/include/rnc/audio/music/music_start_track_40000.h b/include/rnc/audio/music/music_start_track_40000.h deleted file mode 100644 index b064dc6b0c..0000000000 --- a/include/rnc/audio/music/music_start_track_40000.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_40000_H -#define LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_40000_H - -#include "types.h" - -void music_start_track_40000(s32, s32, s32) __asm__("FUN_00215600"); - -#endif /* LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_40000_H */ diff --git a/include/rnc/audio/music/music_start_track_50000.h b/include/rnc/audio/music/music_start_track_50000.h deleted file mode 100644 index 0a7c8a184e..0000000000 --- a/include/rnc/audio/music/music_start_track_50000.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_50000_H -#define LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_50000_H - -#include "types.h" - -void music_start_track_50000(s32, s32, s32) __asm__("FUN_00215518"); - -#endif /* LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_50000_H */ diff --git a/include/rnc/audio/music/music_start_track_60000.h b/include/rnc/audio/music/music_start_track_60000.h deleted file mode 100644 index b455383481..0000000000 --- a/include/rnc/audio/music/music_start_track_60000.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_60000_H -#define LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_60000_H - -#include "types.h" - -void music_start_track_60000(s32, s32, s32) __asm__("FUN_00215440"); - -#endif /* LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_START_TRACK_60000_H */ diff --git a/include/rnc/audio/music/music_update.h b/include/rnc/audio/music/music_update.h deleted file mode 100644 index b427fef07d..0000000000 --- a/include/rnc/audio/music/music_update.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_UPDATE_H -#define LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_UPDATE_H - -#include "types.h" - -void music_update(void) __asm__("FUN_00216290"); - -#endif /* LOMBYTE_RNC_AUDIO_MUSIC_MUSIC_UPDATE_H */ diff --git a/include/rnc/audio/music/reset_music.h b/include/rnc/audio/music/reset_music.h deleted file mode 100644 index f60eaee325..0000000000 --- a/include/rnc/audio/music/reset_music.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_MUSIC_RESET_MUSIC_H -#define LOMBYTE_RNC_AUDIO_MUSIC_RESET_MUSIC_H - -#include "types.h" - -void reset_music(void) __asm__("FUN_00215390"); - -#endif /* LOMBYTE_RNC_AUDIO_MUSIC_RESET_MUSIC_H */ diff --git a/include/rnc/audio/rpc.h b/include/rnc/audio/rpc.h new file mode 100644 index 0000000000..dd0dfc817f --- /dev/null +++ b/include/rnc/audio/rpc.h @@ -0,0 +1,10 @@ +#ifndef LOMBYTE_RNC_AUDIO_RPC_H +#define LOMBYTE_RNC_AUDIO_RPC_H + +#include "types.h" + +void snd_prepare_return_buffer(s32 *, s32); +s32 snd_send_iop_command_and_wait(s32, s32, u8 *) __asm__("FUN_0012e548"); +void snd_send_iop_command_no_wait(s32, s32, u8 *, s32, s64) __asm__("FUN_0012e6e0"); + +#endif /* LOMBYTE_RNC_AUDIO_RPC_H */ diff --git a/include/rnc/audio/rpc/snd_returns.h b/include/rnc/audio/rpc/snd_returns.h deleted file mode 100644 index 3db75de66b..0000000000 --- a/include/rnc/audio/rpc/snd_returns.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_RPC_SND_RETURNS_H -#define LOMBYTE_RNC_AUDIO_RPC_SND_RETURNS_H - -#include "types.h" - -void snd_prepare_return_buffer(s32 *, s32); - -#endif /* LOMBYTE_RNC_AUDIO_RPC_SND_RETURNS_H */ diff --git a/include/rnc/audio/rpc/snd_send_iop_command_and_wait.h b/include/rnc/audio/rpc/snd_send_iop_command_and_wait.h deleted file mode 100644 index 9ba32f3549..0000000000 --- a/include/rnc/audio/rpc/snd_send_iop_command_and_wait.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_RPC_SND_SEND_IOP_COMMAND_AND_WAIT_H -#define LOMBYTE_RNC_AUDIO_RPC_SND_SEND_IOP_COMMAND_AND_WAIT_H - -#include "types.h" - -s32 snd_send_iop_command_and_wait(s32, s32, u8 *) __asm__("FUN_0012e548"); - -#endif /* LOMBYTE_RNC_AUDIO_RPC_SND_SEND_IOP_COMMAND_AND_WAIT_H */ diff --git a/include/rnc/audio/rpc/snd_send_iop_command_no_wait.h b/include/rnc/audio/rpc/snd_send_iop_command_no_wait.h deleted file mode 100644 index 6a6c7bce5c..0000000000 --- a/include/rnc/audio/rpc/snd_send_iop_command_no_wait.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_RPC_SND_SEND_IOP_COMMAND_NO_WAIT_H -#define LOMBYTE_RNC_AUDIO_RPC_SND_SEND_IOP_COMMAND_NO_WAIT_H - -#include "types.h" - -void snd_send_iop_command_no_wait(s32, s32, u8 *, s32, s64) __asm__("FUN_0012e6e0"); - -#endif /* LOMBYTE_RNC_AUDIO_RPC_SND_SEND_IOP_COMMAND_NO_WAIT_H */ diff --git a/include/rnc/audio/snd_start_sound_system.h b/include/rnc/audio/snd_start_sound_system.h deleted file mode 100644 index 96584de1bb..0000000000 --- a/include/rnc/audio/snd_start_sound_system.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_SND_START_SOUND_SYSTEM_H -#define LOMBYTE_RNC_AUDIO_SND_START_SOUND_SYSTEM_H - -#include "types.h" - -s32 snd_start_sound_system(void) __asm__("FUN_0012da28"); - -#endif /* LOMBYTE_RNC_AUDIO_SND_START_SOUND_SYSTEM_H */ diff --git a/include/rnc/audio/sound.h b/include/rnc/audio/sound.h new file mode 100644 index 0000000000..f8e5d5feb3 --- /dev/null +++ b/include/rnc/audio/sound.h @@ -0,0 +1,22 @@ +#ifndef LOMBYTE_RNC_AUDIO_SOUND_H +#define LOMBYTE_RNC_AUDIO_SOUND_H + +#include "rnc/audio/voice_pool.h" +#include "types.h" + +struct VoiceVolumeDefinition; + +s32 calculate_voice_distance_volume(struct VoiceVolumeDefinition *, + f32, + f32, + f32) __asm__("FUN_0022c6f8"); +s32 calculate_voice_pan(s32, f32 *, void *) __asm__("FUN_0022c830"); +void clamp_voice_position_to_collision(s32) __asm__("FUN_0022c5a8"); +void initialize_gameplay_sound_system(void) __asm__("FUN_0022c8d0"); +int snd_get_doppler_pitch_mod(int); +void store_sound_bank_handle_callback(int, long) __asm__("FUN_0022dd78"); +int test_voice_occlusion(VoiceSlot *, void *) __asm__("FUN_0022c658"); +void voice_start_callback(int, long) __asm__("FUN_0022dd90"); +void voice_update_callback(int, long) __asm__("FUN_0022ddd8"); + +#endif /* LOMBYTE_RNC_AUDIO_SOUND_H */ diff --git a/include/rnc/audio/sound/calculate_voice_distance_volume.h b/include/rnc/audio/sound/calculate_voice_distance_volume.h deleted file mode 100644 index 8d9a3dbe7f..0000000000 --- a/include/rnc/audio/sound/calculate_voice_distance_volume.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_SOUND_CALCULATE_VOICE_DISTANCE_VOLUME_H -#define LOMBYTE_RNC_AUDIO_SOUND_CALCULATE_VOICE_DISTANCE_VOLUME_H - -#include "types.h" - -struct VoiceVolumeDefinition; - -s32 calculate_voice_distance_volume(struct VoiceVolumeDefinition *, - f32, - f32, - f32) __asm__("FUN_0022c6f8"); - -#endif /* LOMBYTE_RNC_AUDIO_SOUND_CALCULATE_VOICE_DISTANCE_VOLUME_H */ diff --git a/include/rnc/audio/sound/calculate_voice_pan.h b/include/rnc/audio/sound/calculate_voice_pan.h deleted file mode 100644 index 76adb96891..0000000000 --- a/include/rnc/audio/sound/calculate_voice_pan.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_SOUND_CALCULATE_VOICE_PAN_H -#define LOMBYTE_RNC_AUDIO_SOUND_CALCULATE_VOICE_PAN_H - -#include "types.h" - -s32 calculate_voice_pan(s32, f32 *, void *) __asm__("FUN_0022c830"); - -#endif /* LOMBYTE_RNC_AUDIO_SOUND_CALCULATE_VOICE_PAN_H */ diff --git a/include/rnc/audio/sound/clamp_voice_position_to_collision.h b/include/rnc/audio/sound/clamp_voice_position_to_collision.h deleted file mode 100644 index 949f8a33ad..0000000000 --- a/include/rnc/audio/sound/clamp_voice_position_to_collision.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_SOUND_CLAMP_VOICE_POSITION_TO_COLLISION_H -#define LOMBYTE_RNC_AUDIO_SOUND_CLAMP_VOICE_POSITION_TO_COLLISION_H - -#include "types.h" - -void clamp_voice_position_to_collision(s32) __asm__("FUN_0022c5a8"); - -#endif /* LOMBYTE_RNC_AUDIO_SOUND_CLAMP_VOICE_POSITION_TO_COLLISION_H */ diff --git a/include/rnc/audio/sound/initialize_gameplay_sound_system.h b/include/rnc/audio/sound/initialize_gameplay_sound_system.h deleted file mode 100644 index ef02436a60..0000000000 --- a/include/rnc/audio/sound/initialize_gameplay_sound_system.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_SOUND_INITIALIZE_GAMEPLAY_SOUND_SYSTEM_H -#define LOMBYTE_RNC_AUDIO_SOUND_INITIALIZE_GAMEPLAY_SOUND_SYSTEM_H - -#include "types.h" - -void initialize_gameplay_sound_system(void) __asm__("FUN_0022c8d0"); - -#endif /* LOMBYTE_RNC_AUDIO_SOUND_INITIALIZE_GAMEPLAY_SOUND_SYSTEM_H */ diff --git a/include/rnc/audio/sound/snd_get_doppler_pitch_mod.h b/include/rnc/audio/sound/snd_get_doppler_pitch_mod.h deleted file mode 100644 index 48d0fb5e6e..0000000000 --- a/include/rnc/audio/sound/snd_get_doppler_pitch_mod.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_SOUND_SND_GET_DOPPLER_PITCH_MOD_H -#define LOMBYTE_RNC_AUDIO_SOUND_SND_GET_DOPPLER_PITCH_MOD_H - -#include "types.h" - -int snd_get_doppler_pitch_mod(int); - -#endif /* LOMBYTE_RNC_AUDIO_SOUND_SND_GET_DOPPLER_PITCH_MOD_H */ diff --git a/include/rnc/audio/sound/store_sound_bank_handle_callback.h b/include/rnc/audio/sound/store_sound_bank_handle_callback.h deleted file mode 100644 index 2fafc81dad..0000000000 --- a/include/rnc/audio/sound/store_sound_bank_handle_callback.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_SOUND_STORE_SOUND_BANK_HANDLE_CALLBACK_H -#define LOMBYTE_RNC_AUDIO_SOUND_STORE_SOUND_BANK_HANDLE_CALLBACK_H - -#include "types.h" - -void store_sound_bank_handle_callback(int, long) __asm__("FUN_0022dd78"); - -#endif /* LOMBYTE_RNC_AUDIO_SOUND_STORE_SOUND_BANK_HANDLE_CALLBACK_H */ diff --git a/include/rnc/audio/sound/test_voice_occlusion.h b/include/rnc/audio/sound/test_voice_occlusion.h deleted file mode 100644 index a1a8d1899b..0000000000 --- a/include/rnc/audio/sound/test_voice_occlusion.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_SOUND_TEST_VOICE_OCCLUSION_H -#define LOMBYTE_RNC_AUDIO_SOUND_TEST_VOICE_OCCLUSION_H - -#include "types.h" -#include "rnc/audio/voice_pool.h" - -int test_voice_occlusion(VoiceSlot *, void *) __asm__("FUN_0022c658"); - -#endif /* LOMBYTE_RNC_AUDIO_SOUND_TEST_VOICE_OCCLUSION_H */ diff --git a/include/rnc/audio/sound/voice_start_callback.h b/include/rnc/audio/sound/voice_start_callback.h deleted file mode 100644 index b64988ef93..0000000000 --- a/include/rnc/audio/sound/voice_start_callback.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_SOUND_VOICE_START_CALLBACK_H -#define LOMBYTE_RNC_AUDIO_SOUND_VOICE_START_CALLBACK_H - -#include "types.h" - -void voice_start_callback(int, long) __asm__("FUN_0022dd90"); - -#endif /* LOMBYTE_RNC_AUDIO_SOUND_VOICE_START_CALLBACK_H */ diff --git a/include/rnc/audio/sound/voice_update_callback.h b/include/rnc/audio/sound/voice_update_callback.h deleted file mode 100644 index 8f7add874d..0000000000 --- a/include/rnc/audio/sound/voice_update_callback.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_SOUND_VOICE_UPDATE_CALLBACK_H -#define LOMBYTE_RNC_AUDIO_SOUND_VOICE_UPDATE_CALLBACK_H - -#include "types.h" - -void voice_update_callback(int, long) __asm__("FUN_0022ddd8"); - -#endif /* LOMBYTE_RNC_AUDIO_SOUND_VOICE_UPDATE_CALLBACK_H */ diff --git a/include/rnc/audio/streaming.h b/include/rnc/audio/streaming.h new file mode 100644 index 0000000000..82eda9198d --- /dev/null +++ b/include/rnc/audio/streaming.h @@ -0,0 +1,11 @@ +#ifndef LOMBYTE_RNC_AUDIO_STREAMING_H +#define LOMBYTE_RNC_AUDIO_STREAMING_H + +#include "types.h" + +struct AudioStream; + +s32 advance_audio_stream_state(struct AudioStream *) __asm__("FUN_00220648"); +void finish_audio_stream_read(s32) __asm__("FUN_00216950"); + +#endif /* LOMBYTE_RNC_AUDIO_STREAMING_H */ diff --git a/include/rnc/audio/streaming/advance_audio_stream_state.h b/include/rnc/audio/streaming/advance_audio_stream_state.h deleted file mode 100644 index d7e5a2d8e0..0000000000 --- a/include/rnc/audio/streaming/advance_audio_stream_state.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_STREAMING_ADVANCE_AUDIO_STREAM_STATE_H -#define LOMBYTE_RNC_AUDIO_STREAMING_ADVANCE_AUDIO_STREAM_STATE_H - -#include "types.h" - -struct AudioStream; - -s32 advance_audio_stream_state(struct AudioStream *) __asm__("FUN_00220648"); - -#endif /* LOMBYTE_RNC_AUDIO_STREAMING_ADVANCE_AUDIO_STREAM_STATE_H */ diff --git a/include/rnc/audio/streaming/finish_audio_stream_read.h b/include/rnc/audio/streaming/finish_audio_stream_read.h deleted file mode 100644 index fe5973c8b3..0000000000 --- a/include/rnc/audio/streaming/finish_audio_stream_read.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_STREAMING_FINISH_AUDIO_STREAM_READ_H -#define LOMBYTE_RNC_AUDIO_STREAMING_FINISH_AUDIO_STREAM_READ_H - -#include "types.h" - -void finish_audio_stream_read(s32) __asm__("FUN_00216950"); - -#endif /* LOMBYTE_RNC_AUDIO_STREAMING_FINISH_AUDIO_STREAM_READ_H */ diff --git a/include/rnc/audio/streaming/music_callbacks.h b/include/rnc/audio/streaming/music_callbacks.h new file mode 100644 index 0000000000..a21ae759f8 --- /dev/null +++ b/include/rnc/audio/streaming/music_callbacks.h @@ -0,0 +1,13 @@ +#ifndef LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_H +#define LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_H + +#include "types.h" + +void music_channel_ready_callback(int, long) __asm__("FUN_00216990"); +void music_primary_replace_callback(int, long) __asm__("FUN_00216ad0"); +void music_primary_start_callback(int, long) __asm__("FUN_00216b28"); +void music_remaining_time_callback(int, long) __asm__("FUN_00216bc0"); +void music_secondary_start_callback(u32, s64) __asm__("FUN_002169c0"); +void music_transition_start_callback(int, long) __asm__("FUN_00216a80"); + +#endif /* LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_H */ diff --git a/include/rnc/audio/streaming/music_callbacks/music_channel_ready_callback.h b/include/rnc/audio/streaming/music_callbacks/music_channel_ready_callback.h deleted file mode 100644 index c8f9993f01..0000000000 --- a/include/rnc/audio/streaming/music_callbacks/music_channel_ready_callback.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_CHANNEL_READY_CALLBACK_H -#define LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_CHANNEL_READY_CALLBACK_H - -#include "types.h" - -void music_channel_ready_callback(int, long) __asm__("FUN_00216990"); - -#endif /* LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_CHANNEL_READY_CALLBACK_H */ diff --git a/include/rnc/audio/streaming/music_callbacks/music_primary_replace_callback.h b/include/rnc/audio/streaming/music_callbacks/music_primary_replace_callback.h deleted file mode 100644 index 4da0fc1af8..0000000000 --- a/include/rnc/audio/streaming/music_callbacks/music_primary_replace_callback.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_PRIMARY_REPLACE_CALLBACK_H -#define LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_PRIMARY_REPLACE_CALLBACK_H - -#include "types.h" - -void music_primary_replace_callback(int, long) __asm__("FUN_00216ad0"); - -#endif /* LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_PRIMARY_REPLACE_CALLBACK_H */ diff --git a/include/rnc/audio/streaming/music_callbacks/music_primary_start_callback.h b/include/rnc/audio/streaming/music_callbacks/music_primary_start_callback.h deleted file mode 100644 index 1bbf3fbdde..0000000000 --- a/include/rnc/audio/streaming/music_callbacks/music_primary_start_callback.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_PRIMARY_START_CALLBACK_H -#define LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_PRIMARY_START_CALLBACK_H - -#include "types.h" - -void music_primary_start_callback(int, long) __asm__("FUN_00216b28"); - -#endif /* LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_PRIMARY_START_CALLBACK_H */ diff --git a/include/rnc/audio/streaming/music_callbacks/music_remaining_time_callback.h b/include/rnc/audio/streaming/music_callbacks/music_remaining_time_callback.h deleted file mode 100644 index 876d00a3ed..0000000000 --- a/include/rnc/audio/streaming/music_callbacks/music_remaining_time_callback.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_REMAINING_TIME_CALLBACK_H -#define LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_REMAINING_TIME_CALLBACK_H - -#include "types.h" - -void music_remaining_time_callback(int, long) __asm__("FUN_00216bc0"); - -#endif /* LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_REMAINING_TIME_CALLBACK_H */ diff --git a/include/rnc/audio/streaming/music_callbacks/music_secondary_start_callback.h b/include/rnc/audio/streaming/music_callbacks/music_secondary_start_callback.h deleted file mode 100644 index 1ae14cf463..0000000000 --- a/include/rnc/audio/streaming/music_callbacks/music_secondary_start_callback.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_SECONDARY_START_CALLBACK_H -#define LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_SECONDARY_START_CALLBACK_H - -#include "types.h" - -void music_secondary_start_callback(u32, s64) __asm__("FUN_002169c0"); - -#endif /* LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_SECONDARY_START_CALLBACK_H */ diff --git a/include/rnc/audio/streaming/music_callbacks/music_transition_start_callback.h b/include/rnc/audio/streaming/music_callbacks/music_transition_start_callback.h deleted file mode 100644 index e66f7bbe24..0000000000 --- a/include/rnc/audio/streaming/music_callbacks/music_transition_start_callback.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_TRANSITION_START_CALLBACK_H -#define LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_TRANSITION_START_CALLBACK_H - -#include "types.h" - -void music_transition_start_callback(int, long) __asm__("FUN_00216a80"); - -#endif /* LOMBYTE_RNC_AUDIO_STREAMING_MUSIC_CALLBACKS_MUSIC_TRANSITION_START_CALLBACK_H */ diff --git a/include/rnc/audio/streaming/vag.h b/include/rnc/audio/streaming/vag.h new file mode 100644 index 0000000000..ea04e68a93 --- /dev/null +++ b/include/rnc/audio/streaming/vag.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_AUDIO_STREAMING_VAG_H +#define LOMBYTE_RNC_AUDIO_STREAMING_VAG_H + +#include "types.h" + +void snd_pause_vag_stream(s32) __asm__("FUN_0012ec70"); + +#endif /* LOMBYTE_RNC_AUDIO_STREAMING_VAG_H */ diff --git a/include/rnc/audio/streaming/vag/snd_pause_vag_stream.h b/include/rnc/audio/streaming/vag/snd_pause_vag_stream.h deleted file mode 100644 index fcebf6202f..0000000000 --- a/include/rnc/audio/streaming/vag/snd_pause_vag_stream.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_STREAMING_VAG_SND_PAUSE_VAG_STREAM_H -#define LOMBYTE_RNC_AUDIO_STREAMING_VAG_SND_PAUSE_VAG_STREAM_H - -#include "types.h" - -void snd_pause_vag_stream(s32) __asm__("FUN_0012ec70"); - -#endif /* LOMBYTE_RNC_AUDIO_STREAMING_VAG_SND_PAUSE_VAG_STREAM_H */ diff --git a/include/rnc/audio/voices.h b/include/rnc/audio/voices.h new file mode 100644 index 0000000000..f9e444e9cd --- /dev/null +++ b/include/rnc/audio/voices.h @@ -0,0 +1,14 @@ +#ifndef LOMBYTE_RNC_AUDIO_VOICES_H +#define LOMBYTE_RNC_AUDIO_VOICES_H + +#include "rnc/audio/voice_pool.h" +#include "types.h" + +s32 allocate_voice_for_group_entry(s32, s32, s32) __asm__("FUN_0022dba0"); +s32 allocate_voice_slot(VoiceDefinition *, u32, VoiceMoby *, VoiceVector *, s32) __asm__("FUN_0022d7f0"); +s32 is_voice_active(s32, s32) __asm__("FUN_001eb740"); +void snd_play_sound_vol_pan_pmpb(s32, s32, s32, s32, s32, s32, s32, s32) __asm__("FUN_0012e308"); +void snd_set_sound_params_cb(s32, s32, s32, s32, s32, s32, s32, s32) __asm__("FUN_0012e4c0"); +void snd_sound_is_still_playing_cb(s32, s32, s32) __asm__("FUN_0012e448"); + +#endif /* LOMBYTE_RNC_AUDIO_VOICES_H */ diff --git a/include/rnc/audio/voices/allocate_voice_for_group_entry.h b/include/rnc/audio/voices/allocate_voice_for_group_entry.h deleted file mode 100644 index 6fbf629a4f..0000000000 --- a/include/rnc/audio/voices/allocate_voice_for_group_entry.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_VOICES_ALLOCATE_VOICE_FOR_GROUP_ENTRY_H -#define LOMBYTE_RNC_AUDIO_VOICES_ALLOCATE_VOICE_FOR_GROUP_ENTRY_H - -#include "types.h" - -s32 allocate_voice_for_group_entry(s32, s32, s32) __asm__("FUN_0022dba0"); - -#endif /* LOMBYTE_RNC_AUDIO_VOICES_ALLOCATE_VOICE_FOR_GROUP_ENTRY_H */ diff --git a/include/rnc/audio/voices/allocate_voice_slot.h b/include/rnc/audio/voices/allocate_voice_slot.h deleted file mode 100644 index 554f848bf1..0000000000 --- a/include/rnc/audio/voices/allocate_voice_slot.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_VOICES_ALLOCATE_VOICE_SLOT_H -#define LOMBYTE_RNC_AUDIO_VOICES_ALLOCATE_VOICE_SLOT_H - -#include "rnc/audio/voice_pool.h" -#include "types.h" - -s32 allocate_voice_slot(VoiceDefinition *, u32, VoiceMoby *, VoiceVector *, s32) __asm__("FUN_0022d7f0"); - -#endif /* LOMBYTE_RNC_AUDIO_VOICES_ALLOCATE_VOICE_SLOT_H */ diff --git a/include/rnc/audio/voices/is_voice_active.h b/include/rnc/audio/voices/is_voice_active.h deleted file mode 100644 index 60f0886c6d..0000000000 --- a/include/rnc/audio/voices/is_voice_active.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_VOICES_IS_VOICE_ACTIVE_H -#define LOMBYTE_RNC_AUDIO_VOICES_IS_VOICE_ACTIVE_H - -#include "types.h" - -s32 is_voice_active(s32, s32) __asm__("FUN_001eb740"); - -#endif /* LOMBYTE_RNC_AUDIO_VOICES_IS_VOICE_ACTIVE_H */ diff --git a/include/rnc/audio/voices/snd_play_sound_vol_pan_pmpb.h b/include/rnc/audio/voices/snd_play_sound_vol_pan_pmpb.h deleted file mode 100644 index cfe42c0163..0000000000 --- a/include/rnc/audio/voices/snd_play_sound_vol_pan_pmpb.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_VOICES_SND_PLAY_SOUND_VOL_PAN_PMPB_H -#define LOMBYTE_RNC_AUDIO_VOICES_SND_PLAY_SOUND_VOL_PAN_PMPB_H - -#include "types.h" - -void snd_play_sound_vol_pan_pmpb(s32, s32, s32, s32, s32, s32, s32, s32) __asm__("FUN_0012e308"); - -#endif /* LOMBYTE_RNC_AUDIO_VOICES_SND_PLAY_SOUND_VOL_PAN_PMPB_H */ diff --git a/include/rnc/audio/voices/snd_set_sound_params_cb.h b/include/rnc/audio/voices/snd_set_sound_params_cb.h deleted file mode 100644 index f439c0d3c5..0000000000 --- a/include/rnc/audio/voices/snd_set_sound_params_cb.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_VOICES_SND_SET_SOUND_PARAMS_CB_H -#define LOMBYTE_RNC_AUDIO_VOICES_SND_SET_SOUND_PARAMS_CB_H - -#include "types.h" - -void snd_set_sound_params_cb(s32, s32, s32, s32, s32, s32, s32, s32) __asm__("FUN_0012e4c0"); - -#endif /* LOMBYTE_RNC_AUDIO_VOICES_SND_SET_SOUND_PARAMS_CB_H */ diff --git a/include/rnc/audio/voices/snd_sound_is_still_playing_cb.h b/include/rnc/audio/voices/snd_sound_is_still_playing_cb.h deleted file mode 100644 index f847e07217..0000000000 --- a/include/rnc/audio/voices/snd_sound_is_still_playing_cb.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_AUDIO_VOICES_SND_SOUND_IS_STILL_PLAYING_CB_H -#define LOMBYTE_RNC_AUDIO_VOICES_SND_SOUND_IS_STILL_PLAYING_CB_H - -#include "types.h" - -void snd_sound_is_still_playing_cb(s32, s32, s32) __asm__("FUN_0012e448"); - -#endif /* LOMBYTE_RNC_AUDIO_VOICES_SND_SOUND_IS_STILL_PLAYING_CB_H */ diff --git a/include/rnc/camera.h b/include/rnc/camera.h new file mode 100644 index 0000000000..450a260e2b --- /dev/null +++ b/include/rnc/camera.h @@ -0,0 +1,19 @@ +#ifndef LOMBYTE_RNC_CAMERA_H +#define LOMBYTE_RNC_CAMERA_H + +#include "types.h" + +struct CameraOrbit; +struct CameraPath; +struct CameraProbePosition; + +int advance_alternate_camera_transition(char *, struct CameraOrbit *) __asm__("FUN_001eccd8"); +void advance_timed_camera_control(void) __asm__("FUN_001eda60"); +f32 cam_interp_values(f32, f32, f32, f32, f32, f32 *) __asm__("FUN_001ebd78"); +f32 resolve_camera_surface_height(struct CameraProbePosition *, s32) __asm__("FUN_002135f0"); +void sample_camera_path(struct CameraPath *, s32, void *, f32 *, s32, f32) __asm__("FUN_00214e58"); +s32 update_all_cameras(void) __asm__("FUN_001ec420"); +void update_camera_blend(char *) __asm__("FUN_001ed2b0"); +void update_camera_environment_from_regions(void *) __asm__("FUN_001ee4b0"); + +#endif /* LOMBYTE_RNC_CAMERA_H */ diff --git a/include/rnc/camera/advance_alternate_camera_transition.h b/include/rnc/camera/advance_alternate_camera_transition.h deleted file mode 100644 index d608f8ee4d..0000000000 --- a/include/rnc/camera/advance_alternate_camera_transition.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_CAMERA_ADVANCE_ALTERNATE_CAMERA_TRANSITION_H -#define LOMBYTE_RNC_CAMERA_ADVANCE_ALTERNATE_CAMERA_TRANSITION_H - -#include "types.h" - -struct CameraOrbit; - -int advance_alternate_camera_transition(char *, struct CameraOrbit *) __asm__("FUN_001eccd8"); - -#endif /* LOMBYTE_RNC_CAMERA_ADVANCE_ALTERNATE_CAMERA_TRANSITION_H */ diff --git a/include/rnc/camera/advance_timed_camera_control.h b/include/rnc/camera/advance_timed_camera_control.h deleted file mode 100644 index b558c04c89..0000000000 --- a/include/rnc/camera/advance_timed_camera_control.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_CAMERA_ADVANCE_TIMED_CAMERA_CONTROL_H -#define LOMBYTE_RNC_CAMERA_ADVANCE_TIMED_CAMERA_CONTROL_H - -#include "types.h" - -void advance_timed_camera_control(void) __asm__("FUN_001eda60"); - -#endif /* LOMBYTE_RNC_CAMERA_ADVANCE_TIMED_CAMERA_CONTROL_H */ diff --git a/include/rnc/camera/cam_interp_values.h b/include/rnc/camera/cam_interp_values.h deleted file mode 100644 index b4c3f1fa40..0000000000 --- a/include/rnc/camera/cam_interp_values.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_CAMERA_CAM_INTERP_VALUES_H -#define LOMBYTE_RNC_CAMERA_CAM_INTERP_VALUES_H - -#include "types.h" - -f32 cam_interp_values(f32, f32, f32, f32, f32, f32 *) __asm__("FUN_001ebd78"); - -#endif /* LOMBYTE_RNC_CAMERA_CAM_INTERP_VALUES_H */ diff --git a/include/rnc/camera/resolve_camera_surface_height.h b/include/rnc/camera/resolve_camera_surface_height.h deleted file mode 100644 index dcf178a0b3..0000000000 --- a/include/rnc/camera/resolve_camera_surface_height.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_CAMERA_RESOLVE_CAMERA_SURFACE_HEIGHT_H -#define LOMBYTE_RNC_CAMERA_RESOLVE_CAMERA_SURFACE_HEIGHT_H - -#include "types.h" - -struct CameraProbePosition; - -f32 resolve_camera_surface_height(struct CameraProbePosition *, s32) __asm__("FUN_002135f0"); - -#endif /* LOMBYTE_RNC_CAMERA_RESOLVE_CAMERA_SURFACE_HEIGHT_H */ diff --git a/include/rnc/camera/sample_camera_path.h b/include/rnc/camera/sample_camera_path.h deleted file mode 100644 index 3b7d9ec5b4..0000000000 --- a/include/rnc/camera/sample_camera_path.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_CAMERA_SAMPLE_CAMERA_PATH_H -#define LOMBYTE_RNC_CAMERA_SAMPLE_CAMERA_PATH_H - -#include "types.h" - -struct CameraPath; - -void sample_camera_path(struct CameraPath *, s32, void *, f32 *, s32, f32) __asm__("FUN_00214e58"); - -#endif /* LOMBYTE_RNC_CAMERA_SAMPLE_CAMERA_PATH_H */ diff --git a/include/rnc/camera/update_all_cameras.h b/include/rnc/camera/update_all_cameras.h deleted file mode 100644 index 3a1aca3e15..0000000000 --- a/include/rnc/camera/update_all_cameras.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_CAMERA_UPDATE_ALL_CAMERAS_H -#define LOMBYTE_RNC_CAMERA_UPDATE_ALL_CAMERAS_H - -#include "types.h" - -s32 update_all_cameras(void) __asm__("FUN_001ec420"); - -#endif /* LOMBYTE_RNC_CAMERA_UPDATE_ALL_CAMERAS_H */ diff --git a/include/rnc/camera/update_camera_blend.h b/include/rnc/camera/update_camera_blend.h deleted file mode 100644 index a5b317347c..0000000000 --- a/include/rnc/camera/update_camera_blend.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_CAMERA_UPDATE_CAMERA_BLEND_H -#define LOMBYTE_RNC_CAMERA_UPDATE_CAMERA_BLEND_H - -#include "types.h" - -void update_camera_blend(char *) __asm__("FUN_001ed2b0"); - -#endif /* LOMBYTE_RNC_CAMERA_UPDATE_CAMERA_BLEND_H */ diff --git a/include/rnc/camera/update_camera_environment_from_regions.h b/include/rnc/camera/update_camera_environment_from_regions.h deleted file mode 100644 index 62553c7c3b..0000000000 --- a/include/rnc/camera/update_camera_environment_from_regions.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_CAMERA_UPDATE_CAMERA_ENVIRONMENT_FROM_REGIONS_H -#define LOMBYTE_RNC_CAMERA_UPDATE_CAMERA_ENVIRONMENT_FROM_REGIONS_H - -#include "types.h" - -void update_camera_environment_from_regions(void *) __asm__("FUN_001ee4b0"); - -#endif /* LOMBYTE_RNC_CAMERA_UPDATE_CAMERA_ENVIRONMENT_FROM_REGIONS_H */ diff --git a/include/rnc/game.h b/include/rnc/game.h new file mode 100644 index 0000000000..27cac30670 --- /dev/null +++ b/include/rnc/game.h @@ -0,0 +1,13 @@ +#ifndef LOMBYTE_RNC_GAME_H +#define LOMBYTE_RNC_GAME_H + +#include "types.h" + +void dispatch_game_state_update(void) __asm__("FUN_00230ee8"); +void load_level_zero_preserving_progress(s32) __asm__("FUN_00226b08"); +s32 process_global_state_flags(void) __asm__("FUN_00222290"); +void start_level(int) __asm__("FUN_001e9488"); +void update_mode_freeze(void) __asm__("FUN_001fce28"); +void update_resident_gameplay_state(void) __asm__("FUN_0022f778"); + +#endif /* LOMBYTE_RNC_GAME_H */ diff --git a/include/rnc/game/dispatch_game_state_update.h b/include/rnc/game/dispatch_game_state_update.h deleted file mode 100644 index 3ac65cf974..0000000000 --- a/include/rnc/game/dispatch_game_state_update.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_GAME_DISPATCH_GAME_STATE_UPDATE_H -#define LOMBYTE_RNC_GAME_DISPATCH_GAME_STATE_UPDATE_H - -#include "types.h" - -void dispatch_game_state_update(void) __asm__("FUN_00230ee8"); - -#endif /* LOMBYTE_RNC_GAME_DISPATCH_GAME_STATE_UPDATE_H */ diff --git a/include/rnc/game/load_level_zero_preserving_progress.h b/include/rnc/game/load_level_zero_preserving_progress.h deleted file mode 100644 index bb29fc755c..0000000000 --- a/include/rnc/game/load_level_zero_preserving_progress.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_GAME_LOAD_LEVEL_ZERO_PRESERVING_PROGRESS_H -#define LOMBYTE_RNC_GAME_LOAD_LEVEL_ZERO_PRESERVING_PROGRESS_H - -#include "types.h" - -void load_level_zero_preserving_progress(s32) __asm__("FUN_00226b08"); - -#endif /* LOMBYTE_RNC_GAME_LOAD_LEVEL_ZERO_PRESERVING_PROGRESS_H */ diff --git a/include/rnc/game/missions.h b/include/rnc/game/missions.h new file mode 100644 index 0000000000..26ab008555 --- /dev/null +++ b/include/rnc/game/missions.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_GAME_MISSIONS_H +#define LOMBYTE_RNC_GAME_MISSIONS_H + +#include "types.h" + +s32 update_mission_list(void) __asm__("FUN_0020b950"); + +#endif /* LOMBYTE_RNC_GAME_MISSIONS_H */ diff --git a/include/rnc/game/missions/update_mission_list.h b/include/rnc/game/missions/update_mission_list.h deleted file mode 100644 index abb3e3a2a7..0000000000 --- a/include/rnc/game/missions/update_mission_list.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_GAME_MISSIONS_UPDATE_MISSION_LIST_H -#define LOMBYTE_RNC_GAME_MISSIONS_UPDATE_MISSION_LIST_H - -#include "types.h" - -s32 update_mission_list(void) __asm__("FUN_0020b950"); - -#endif /* LOMBYTE_RNC_GAME_MISSIONS_UPDATE_MISSION_LIST_H */ diff --git a/include/rnc/game/process_global_state_flags.h b/include/rnc/game/process_global_state_flags.h deleted file mode 100644 index de84ee61c7..0000000000 --- a/include/rnc/game/process_global_state_flags.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_GAME_PROCESS_GLOBAL_STATE_FLAGS_H -#define LOMBYTE_RNC_GAME_PROCESS_GLOBAL_STATE_FLAGS_H - -#include "types.h" - -s32 process_global_state_flags(void) __asm__("FUN_00222290"); - -#endif /* LOMBYTE_RNC_GAME_PROCESS_GLOBAL_STATE_FLAGS_H */ diff --git a/include/rnc/game/start_level.h b/include/rnc/game/start_level.h deleted file mode 100644 index aa30393906..0000000000 --- a/include/rnc/game/start_level.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_GAME_START_LEVEL_H -#define LOMBYTE_RNC_GAME_START_LEVEL_H - -#include "types.h" - -void start_level(int) __asm__("FUN_001e9488"); - -#endif /* LOMBYTE_RNC_GAME_START_LEVEL_H */ diff --git a/include/rnc/game/transitions.h b/include/rnc/game/transitions.h new file mode 100644 index 0000000000..d13d56582b --- /dev/null +++ b/include/rnc/game/transitions.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_GAME_TRANSITIONS_H +#define LOMBYTE_RNC_GAME_TRANSITIONS_H + +#include "types.h" + +void request_space_load(s32); +void transition_load_wad(void) __asm__("FUN_001ea830"); + +#endif /* LOMBYTE_RNC_GAME_TRANSITIONS_H */ diff --git a/include/rnc/game/transitions/request_space_load.h b/include/rnc/game/transitions/request_space_load.h deleted file mode 100644 index 6122d6f500..0000000000 --- a/include/rnc/game/transitions/request_space_load.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_GAME_TRANSITIONS_REQUEST_SPACE_LOAD_H -#define LOMBYTE_RNC_GAME_TRANSITIONS_REQUEST_SPACE_LOAD_H - -#include "types.h" - -void request_space_load(s32); - -#endif /* LOMBYTE_RNC_GAME_TRANSITIONS_REQUEST_SPACE_LOAD_H */ diff --git a/include/rnc/game/transitions/transition_load_wad.h b/include/rnc/game/transitions/transition_load_wad.h deleted file mode 100644 index d55370de6c..0000000000 --- a/include/rnc/game/transitions/transition_load_wad.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_GAME_TRANSITIONS_TRANSITION_LOAD_WAD_H -#define LOMBYTE_RNC_GAME_TRANSITIONS_TRANSITION_LOAD_WAD_H - -#include "types.h" - -void transition_load_wad(void) __asm__("FUN_001ea830"); - -#endif /* LOMBYTE_RNC_GAME_TRANSITIONS_TRANSITION_LOAD_WAD_H */ diff --git a/include/rnc/game/update_mode_freeze.h b/include/rnc/game/update_mode_freeze.h deleted file mode 100644 index ecd7866b69..0000000000 --- a/include/rnc/game/update_mode_freeze.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_GAME_UPDATE_MODE_FREEZE_H -#define LOMBYTE_RNC_GAME_UPDATE_MODE_FREEZE_H - -#include "types.h" - -void update_mode_freeze(void) __asm__("FUN_001fce28"); - -#endif /* LOMBYTE_RNC_GAME_UPDATE_MODE_FREEZE_H */ diff --git a/include/rnc/game/update_resident_gameplay_state.h b/include/rnc/game/update_resident_gameplay_state.h deleted file mode 100644 index b038f9a596..0000000000 --- a/include/rnc/game/update_resident_gameplay_state.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_GAME_UPDATE_RESIDENT_GAMEPLAY_STATE_H -#define LOMBYTE_RNC_GAME_UPDATE_RESIDENT_GAMEPLAY_STATE_H - -#include "types.h" - -void update_resident_gameplay_state(void) __asm__("FUN_0022f778"); - -#endif /* LOMBYTE_RNC_GAME_UPDATE_RESIDENT_GAMEPLAY_STATE_H */ diff --git a/include/rnc/game/usage_stats.h b/include/rnc/game/usage_stats.h index b32b13209a..489412e448 100644 --- a/include/rnc/game/usage_stats.h +++ b/include/rnc/game/usage_stats.h @@ -6,15 +6,15 @@ /* * Usage counters (usage_stats): an array of 8-byte records, one per action. * Every writer does the same three steps when the action happens: bump count - * (saturating at 0xFFFF), raise unk2 to scale_game_frames(D_0015EEA4) / 600, + * (saturating at 0xFFFF), raise latest_time_bucket to scale_game_frames(D_0015EEA4) / 600, * and OR (1 << current_level_index) | 0x80000000 into level_mask. * Record 0 counts hyperstrikes; the save file restores the counters. * Records 36 on carry their own label, D_00141968. */ struct UsageStat { - u16 count; /* saturating counter */ - u16 unk2; /* max of scale_game_frames(D_0015EEA4) / 600 */ - s32 level_mask; /* bit per level seen; bit 31 = ever used */ + u16 count; /* saturating counter */ + u16 latest_time_bucket; /* max of scale_game_frames(D_0015EEA4) / 600 */ + s32 level_mask; /* bit per level seen; bit 31 = ever used */ }; struct UsageStats { diff --git a/include/rnc/input.h b/include/rnc/input.h new file mode 100644 index 0000000000..10b4147977 --- /dev/null +++ b/include/rnc/input.h @@ -0,0 +1,11 @@ +#ifndef LOMBYTE_RNC_INPUT_H +#define LOMBYTE_RNC_INPUT_H + +#include "types.h" + +struct PAD; + +void poll_pad_device_state(struct PAD *) __asm__("FUN_002170c8"); +void reset_pad_history(void) __asm__("func_00217020"); + +#endif /* LOMBYTE_RNC_INPUT_H */ diff --git a/include/rnc/input/poll_pad_device_state.h b/include/rnc/input/poll_pad_device_state.h deleted file mode 100644 index 1f402cf2df..0000000000 --- a/include/rnc/input/poll_pad_device_state.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_INPUT_POLL_PAD_DEVICE_STATE_H -#define LOMBYTE_RNC_INPUT_POLL_PAD_DEVICE_STATE_H - -#include "types.h" - -struct PAD; - -void poll_pad_device_state(struct PAD *) __asm__("FUN_002170c8"); - -#endif /* LOMBYTE_RNC_INPUT_POLL_PAD_DEVICE_STATE_H */ diff --git a/include/rnc/input/reset_pad_history.h b/include/rnc/input/reset_pad_history.h deleted file mode 100644 index e187cba1bc..0000000000 --- a/include/rnc/input/reset_pad_history.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_INPUT_RESET_PAD_HISTORY_H -#define LOMBYTE_RNC_INPUT_RESET_PAD_HISTORY_H - -#include "types.h" - -void reset_pad_history(void) __asm__("func_00217020"); - -#endif /* LOMBYTE_RNC_INPUT_RESET_PAD_HISTORY_H */ diff --git a/include/rnc/math.h b/include/rnc/math.h new file mode 100644 index 0000000000..dbe75faa72 --- /dev/null +++ b/include/rnc/math.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_MATH_H +#define LOMBYTE_RNC_MATH_H + +#include "types.h" + +int point_is_clockwise(int, int, int, int, int, int) __asm__("func_00208818"); + +#endif /* LOMBYTE_RNC_MATH_H */ diff --git a/include/rnc/math/point_is_clockwise.h b/include/rnc/math/point_is_clockwise.h deleted file mode 100644 index 4f70660f87..0000000000 --- a/include/rnc/math/point_is_clockwise.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_MATH_POINT_IS_CLOCKWISE_H -#define LOMBYTE_RNC_MATH_POINT_IS_CLOCKWISE_H - -#include "types.h" - -int point_is_clockwise(int, int, int, int, int, int) __asm__("func_00208818"); - -#endif /* LOMBYTE_RNC_MATH_POINT_IS_CLOCKWISE_H */ diff --git a/include/rnc/math/rotations.h b/include/rnc/math/rotations.h new file mode 100644 index 0000000000..cbc2d50cc8 --- /dev/null +++ b/include/rnc/math/rotations.h @@ -0,0 +1,10 @@ +#ifndef LOMBYTE_RNC_MATH_ROTATIONS_H +#define LOMBYTE_RNC_MATH_ROTATIONS_H + +#include "types.h" + +struct Quaternion; + +void build_quaternion_from_axis_angle(struct Quaternion *, s32, f32) __asm__("FUN_00214530"); + +#endif /* LOMBYTE_RNC_MATH_ROTATIONS_H */ diff --git a/include/rnc/math/rotations/build_quaternion_from_axis_angle.h b/include/rnc/math/rotations/build_quaternion_from_axis_angle.h deleted file mode 100644 index d2cd595635..0000000000 --- a/include/rnc/math/rotations/build_quaternion_from_axis_angle.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_MATH_ROTATIONS_BUILD_QUATERNION_FROM_AXIS_ANGLE_H -#define LOMBYTE_RNC_MATH_ROTATIONS_BUILD_QUATERNION_FROM_AXIS_ANGLE_H - -#include "types.h" - -struct Quaternion; - -void build_quaternion_from_axis_angle(struct Quaternion *, s32, f32) __asm__("FUN_00214530"); - -#endif /* LOMBYTE_RNC_MATH_ROTATIONS_BUILD_QUATERNION_FROM_AXIS_ANGLE_H */ diff --git a/include/rnc/mobys.h b/include/rnc/mobys.h new file mode 100644 index 0000000000..693f055a19 --- /dev/null +++ b/include/rnc/mobys.h @@ -0,0 +1,12 @@ +#ifndef LOMBYTE_RNC_MOBYS_H +#define LOMBYTE_RNC_MOBYS_H + +#include "types.h" + +struct MobyObject; + +void assign_moby_class_data(s32) __asm__("FUN_00212d68"); +s32 get_moby_hit_state(struct MobyObject *); +void quad_moby_update(char *) __asm__("FUN_0023a2c0"); + +#endif /* LOMBYTE_RNC_MOBYS_H */ diff --git a/include/rnc/mobys/animation.h b/include/rnc/mobys/animation.h new file mode 100644 index 0000000000..39bb5e4460 --- /dev/null +++ b/include/rnc/mobys/animation.h @@ -0,0 +1,11 @@ +#ifndef LOMBYTE_RNC_MOBYS_ANIMATION_H +#define LOMBYTE_RNC_MOBYS_ANIMATION_H + +#include "types.h" + +struct InterpolatedAnim; + +s32 is_value_within_interpolated_window(struct InterpolatedAnim *, f32) __asm__("FUN_00214cc8"); +s32 queue_animation_update(s32, s32, s32, s32, s32, s32, s32) __asm__("FUN_001ff308"); + +#endif /* LOMBYTE_RNC_MOBYS_ANIMATION_H */ diff --git a/include/rnc/mobys/animation/is_value_within_interpolated_window.h b/include/rnc/mobys/animation/is_value_within_interpolated_window.h deleted file mode 100644 index afd51927f1..0000000000 --- a/include/rnc/mobys/animation/is_value_within_interpolated_window.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_MOBYS_ANIMATION_IS_VALUE_WITHIN_INTERPOLATED_WINDOW_H -#define LOMBYTE_RNC_MOBYS_ANIMATION_IS_VALUE_WITHIN_INTERPOLATED_WINDOW_H - -#include "types.h" - -struct InterpolatedAnim; - -s32 is_value_within_interpolated_window(struct InterpolatedAnim *, f32) __asm__("FUN_00214cc8"); - -#endif /* LOMBYTE_RNC_MOBYS_ANIMATION_IS_VALUE_WITHIN_INTERPOLATED_WINDOW_H */ diff --git a/include/rnc/mobys/animation/queue_animation_update.h b/include/rnc/mobys/animation/queue_animation_update.h deleted file mode 100644 index e308f2579f..0000000000 --- a/include/rnc/mobys/animation/queue_animation_update.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_MOBYS_ANIMATION_QUEUE_ANIMATION_UPDATE_H -#define LOMBYTE_RNC_MOBYS_ANIMATION_QUEUE_ANIMATION_UPDATE_H - -#include "types.h" - -s32 queue_animation_update(s32, s32, s32, s32, s32, s32, s32) __asm__("FUN_001ff308"); - -#endif /* LOMBYTE_RNC_MOBYS_ANIMATION_QUEUE_ANIMATION_UPDATE_H */ diff --git a/include/rnc/mobys/assign_moby_class_data.h b/include/rnc/mobys/assign_moby_class_data.h deleted file mode 100644 index ded485644d..0000000000 --- a/include/rnc/mobys/assign_moby_class_data.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_MOBYS_ASSIGN_MOBY_CLASS_DATA_H -#define LOMBYTE_RNC_MOBYS_ASSIGN_MOBY_CLASS_DATA_H - -#include "types.h" - -void assign_moby_class_data(s32) __asm__("FUN_00212d68"); - -#endif /* LOMBYTE_RNC_MOBYS_ASSIGN_MOBY_CLASS_DATA_H */ diff --git a/include/rnc/mobys/get_moby_hit_state.h b/include/rnc/mobys/get_moby_hit_state.h deleted file mode 100644 index 27733655a5..0000000000 --- a/include/rnc/mobys/get_moby_hit_state.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_MOBYS_GET_MOBY_HIT_STATE_H -#define LOMBYTE_RNC_MOBYS_GET_MOBY_HIT_STATE_H - -#include "types.h" - -struct MobyObject; - -s32 get_moby_hit_state(struct MobyObject *); - -#endif /* LOMBYTE_RNC_MOBYS_GET_MOBY_HIT_STATE_H */ diff --git a/include/rnc/mobys/quad_moby_update.h b/include/rnc/mobys/quad_moby_update.h deleted file mode 100644 index 42ff5ed27a..0000000000 --- a/include/rnc/mobys/quad_moby_update.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_MOBYS_QUAD_MOBY_UPDATE_H -#define LOMBYTE_RNC_MOBYS_QUAD_MOBY_UPDATE_H - -#include "types.h" - -void quad_moby_update(char *) __asm__("FUN_0023a2c0"); - -#endif /* LOMBYTE_RNC_MOBYS_QUAD_MOBY_UPDATE_H */ diff --git a/include/rnc/movies/decoder.h b/include/rnc/movies/decoder.h new file mode 100644 index 0000000000..fee649111f --- /dev/null +++ b/include/rnc/movies/decoder.h @@ -0,0 +1,16 @@ +#ifndef LOMBYTE_RNC_MOVIES_DECODER_H +#define LOMBYTE_RNC_MOVIES_DECODER_H + +#include "rnc/sdk/libmpeg.h" +#include "types.h" + +struct MpegCdStream; +struct VideoDec; + +s32 mpeg_cd_stream_close(struct MpegCdStream *) __asm__("func_0023BA58"); +s32 mpeg_cd_stream_open(struct MpegCdStream *, s32, s32) __asm__("func_0023BA48"); +s32 video_dec_create(struct VideoDec *, s32, s32, s32, s32, s32, s32, s32) __asm__("FUN_0023cac8"); +s32 video_dec_is_flushed(struct VideoDec *) __asm__("FUN_0023cde0"); +s32 video_dec_set_stream(struct VideoDec *, s32, s32, MpegStreamCallback, void *) __asm__("FUN_0023cbd0"); + +#endif /* LOMBYTE_RNC_MOVIES_DECODER_H */ diff --git a/include/rnc/movies/decoder/dma/sc_tag2.h b/include/rnc/movies/decoder/dma.h similarity index 51% rename from include/rnc/movies/decoder/dma/sc_tag2.h rename to include/rnc/movies/decoder/dma.h index ccdaa6dac6..cd54b0d56b 100644 --- a/include/rnc/movies/decoder/dma/sc_tag2.h +++ b/include/rnc/movies/decoder/dma.h @@ -1,5 +1,5 @@ -#ifndef LOMBYTE_RNC_MOVIES_DECODER_DMA_SC_TAG2_H -#define LOMBYTE_RNC_MOVIES_DECODER_DMA_SC_TAG2_H +#ifndef LOMBYTE_RNC_MOVIES_DECODER_DMA_H +#define LOMBYTE_RNC_MOVIES_DECODER_DMA_H #include "types.h" @@ -8,4 +8,4 @@ void sc_tag2(unsigned long long *, unsigned int, unsigned int) __asm__("func_0023BC20"); -#endif /* LOMBYTE_RNC_MOVIES_DECODER_DMA_SC_TAG2_H */ +#endif /* LOMBYTE_RNC_MOVIES_DECODER_DMA_H */ diff --git a/include/rnc/movies/decoder/mpeg_cd_stream_close.h b/include/rnc/movies/decoder/mpeg_cd_stream_close.h deleted file mode 100644 index 6c06000d8f..0000000000 --- a/include/rnc/movies/decoder/mpeg_cd_stream_close.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_MOVIES_DECODER_MPEG_CD_STREAM_CLOSE_H -#define LOMBYTE_RNC_MOVIES_DECODER_MPEG_CD_STREAM_CLOSE_H - -#include "types.h" - -struct MpegCdStream; - -s32 mpeg_cd_stream_close(struct MpegCdStream *) __asm__("func_0023BA58"); - -#endif /* LOMBYTE_RNC_MOVIES_DECODER_MPEG_CD_STREAM_CLOSE_H */ diff --git a/include/rnc/movies/decoder/mpeg_cd_stream_open.h b/include/rnc/movies/decoder/mpeg_cd_stream_open.h deleted file mode 100644 index 679912bd68..0000000000 --- a/include/rnc/movies/decoder/mpeg_cd_stream_open.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_MOVIES_DECODER_MPEG_CD_STREAM_OPEN_H -#define LOMBYTE_RNC_MOVIES_DECODER_MPEG_CD_STREAM_OPEN_H - -#include "types.h" - -struct MpegCdStream; - -s32 mpeg_cd_stream_open(struct MpegCdStream *, s32, s32) __asm__("func_0023BA48"); - -#endif /* LOMBYTE_RNC_MOVIES_DECODER_MPEG_CD_STREAM_OPEN_H */ diff --git a/include/rnc/movies/decoder/video_dec_create.h b/include/rnc/movies/decoder/video_dec_create.h deleted file mode 100644 index 16f05bca25..0000000000 --- a/include/rnc/movies/decoder/video_dec_create.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_MOVIES_DECODER_VIDEO_DEC_CREATE_H -#define LOMBYTE_RNC_MOVIES_DECODER_VIDEO_DEC_CREATE_H - -#include "types.h" - -struct VideoDec; - -s32 video_dec_create(struct VideoDec *, s32, s32, s32, s32, s32, s32, s32) __asm__("FUN_0023cac8"); - -#endif /* LOMBYTE_RNC_MOVIES_DECODER_VIDEO_DEC_CREATE_H */ diff --git a/include/rnc/movies/decoder/video_dec_is_flushed.h b/include/rnc/movies/decoder/video_dec_is_flushed.h deleted file mode 100644 index d66a356305..0000000000 --- a/include/rnc/movies/decoder/video_dec_is_flushed.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_MOVIES_DECODER_VIDEO_DEC_IS_FLUSHED_H -#define LOMBYTE_RNC_MOVIES_DECODER_VIDEO_DEC_IS_FLUSHED_H - -#include "types.h" - -struct VideoDec; - -s32 video_dec_is_flushed(struct VideoDec *) __asm__("FUN_0023cde0"); - -#endif /* LOMBYTE_RNC_MOVIES_DECODER_VIDEO_DEC_IS_FLUSHED_H */ diff --git a/include/rnc/movies/decoder/video_dec_set_stream.h b/include/rnc/movies/decoder/video_dec_set_stream.h deleted file mode 100644 index 8762bb321f..0000000000 --- a/include/rnc/movies/decoder/video_dec_set_stream.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_MOVIES_DECODER_VIDEO_DEC_SET_STREAM_H -#define LOMBYTE_RNC_MOVIES_DECODER_VIDEO_DEC_SET_STREAM_H - -#include "rnc/sdk/libmpeg.h" -#include "types.h" - -struct VideoDec; - -s32 video_dec_set_stream(struct VideoDec *, s32, s32, MpegStreamCallback, void *) __asm__("FUN_0023cbd0"); - -#endif /* LOMBYTE_RNC_MOVIES_DECODER_VIDEO_DEC_SET_STREAM_H */ diff --git a/include/rnc/movies/decoder/video_input.h b/include/rnc/movies/decoder/video_input.h new file mode 100644 index 0000000000..b6400b46f9 --- /dev/null +++ b/include/rnc/movies/decoder/video_input.h @@ -0,0 +1,12 @@ +#ifndef LOMBYTE_RNC_MOVIES_DECODER_VIDEO_INPUT_H +#define LOMBYTE_RNC_MOVIES_DECODER_VIDEO_INPUT_H + +#include "types.h" + +struct ViBuf; + +s32 vi_buf_count(struct ViBuf *) __asm__("FUN_0023c610"); +s32 vi_buf_delete(struct ViBuf *) __asm__("FUN_0023c5b8"); +s32 vi_buf_restart_dma(struct ViBuf *) __asm__("FUN_0023c280"); + +#endif /* LOMBYTE_RNC_MOVIES_DECODER_VIDEO_INPUT_H */ diff --git a/include/rnc/movies/decoder/video_input/vi_buf_count.h b/include/rnc/movies/decoder/video_input/vi_buf_count.h deleted file mode 100644 index 895b62cb8c..0000000000 --- a/include/rnc/movies/decoder/video_input/vi_buf_count.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_MOVIES_DECODER_VIDEO_INPUT_VI_BUF_COUNT_H -#define LOMBYTE_RNC_MOVIES_DECODER_VIDEO_INPUT_VI_BUF_COUNT_H - -#include "types.h" - -struct ViBuf; - -s32 vi_buf_count(struct ViBuf *) __asm__("FUN_0023c610"); - -#endif /* LOMBYTE_RNC_MOVIES_DECODER_VIDEO_INPUT_VI_BUF_COUNT_H */ diff --git a/include/rnc/movies/decoder/video_input/vi_buf_delete.h b/include/rnc/movies/decoder/video_input/vi_buf_delete.h deleted file mode 100644 index 770dad4bad..0000000000 --- a/include/rnc/movies/decoder/video_input/vi_buf_delete.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_MOVIES_DECODER_VIDEO_INPUT_VI_BUF_DELETE_H -#define LOMBYTE_RNC_MOVIES_DECODER_VIDEO_INPUT_VI_BUF_DELETE_H - -#include "types.h" - -struct ViBuf; - -s32 vi_buf_delete(struct ViBuf *) __asm__("FUN_0023c5b8"); - -#endif /* LOMBYTE_RNC_MOVIES_DECODER_VIDEO_INPUT_VI_BUF_DELETE_H */ diff --git a/include/rnc/movies/decoder/video_input/vi_buf_restart_dma.h b/include/rnc/movies/decoder/video_input/vi_buf_restart_dma.h deleted file mode 100644 index ab8d4a62ca..0000000000 --- a/include/rnc/movies/decoder/video_input/vi_buf_restart_dma.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_MOVIES_DECODER_VIDEO_INPUT_VI_BUF_RESTART_DMA_H -#define LOMBYTE_RNC_MOVIES_DECODER_VIDEO_INPUT_VI_BUF_RESTART_DMA_H - -#include "types.h" - -struct ViBuf; - -s32 vi_buf_restart_dma(struct ViBuf *) __asm__("FUN_0023c280"); - -#endif /* LOMBYTE_RNC_MOVIES_DECODER_VIDEO_INPUT_VI_BUF_RESTART_DMA_H */ diff --git a/include/rnc/movies/display.h b/include/rnc/movies/display.h new file mode 100644 index 0000000000..5f9444868e --- /dev/null +++ b/include/rnc/movies/display.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_MOVIES_DISPLAY_H +#define LOMBYTE_RNC_MOVIES_DISPLAY_H + +#include "types.h" + +void end_display(void) __asm__("ClearStageStateFlag"); +s32 handler_end_image(void) __asm__("FUN_0023b540"); + +#endif /* LOMBYTE_RNC_MOVIES_DISPLAY_H */ diff --git a/include/rnc/movies/display/end_display.h b/include/rnc/movies/display/end_display.h deleted file mode 100644 index 3d3fe760a5..0000000000 --- a/include/rnc/movies/display/end_display.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_MOVIES_DISPLAY_END_DISPLAY_H -#define LOMBYTE_RNC_MOVIES_DISPLAY_END_DISPLAY_H - -#include "types.h" - -void end_display(void) __asm__("ClearStageStateFlag"); - -#endif /* LOMBYTE_RNC_MOVIES_DISPLAY_END_DISPLAY_H */ diff --git a/include/rnc/movies/display/handler_end_image.h b/include/rnc/movies/display/handler_end_image.h deleted file mode 100644 index 4f1d79608f..0000000000 --- a/include/rnc/movies/display/handler_end_image.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_MOVIES_DISPLAY_HANDLER_END_IMAGE_H -#define LOMBYTE_RNC_MOVIES_DISPLAY_HANDLER_END_IMAGE_H - -#include "types.h" - -s32 handler_end_image(void) __asm__("FUN_0023b540"); - -#endif /* LOMBYTE_RNC_MOVIES_DISPLAY_HANDLER_END_IMAGE_H */ diff --git a/include/rnc/movies/player.h b/include/rnc/movies/player.h new file mode 100644 index 0000000000..541473e4c9 --- /dev/null +++ b/include/rnc/movies/player.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_MOVIES_PLAYER_H +#define LOMBYTE_RNC_MOVIES_PLAYER_H + +#include "types.h" + +void err_message(s32) __asm__("FUN_0023ab78"); + +#endif /* LOMBYTE_RNC_MOVIES_PLAYER_H */ diff --git a/include/rnc/movies/player/err_message.h b/include/rnc/movies/player/err_message.h deleted file mode 100644 index 7f311997f7..0000000000 --- a/include/rnc/movies/player/err_message.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_MOVIES_PLAYER_ERR_MESSAGE_H -#define LOMBYTE_RNC_MOVIES_PLAYER_ERR_MESSAGE_H - -#include "types.h" - -void err_message(s32) __asm__("FUN_0023ab78"); - -#endif /* LOMBYTE_RNC_MOVIES_PLAYER_ERR_MESSAGE_H */ diff --git a/include/rnc/overlay/l00/mobys.h b/include/rnc/overlay/l00/mobys.h new file mode 100644 index 0000000000..d24a75150e --- /dev/null +++ b/include/rnc/overlay/l00/mobys.h @@ -0,0 +1,12 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L00_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_L00_MOBYS_H + +#include "types.h" + +void beam_slot_controller_update() __asm__("FUN_L00_002e1df0"); +void clank_cutscene_trigger_update() __asm__("FUN_L00_002d9dc8"); +void phase_effect_controller_update() __asm__("FUN_L00_002e3800"); +void help_hints_update() __asm__("FUN_L00_002e0988"); +void veldin_robot_enemy_update() __asm__("FUN_L00_002e0b88"); + +#endif /* LOMBYTE_RNC_OVERLAY_L00_MOBYS_H */ diff --git a/include/rnc/overlay/l00/mobys/beam_slot_controller.h b/include/rnc/overlay/l00/mobys/beam_slot_controller.h deleted file mode 100644 index cbcca7a5ce..0000000000 --- a/include/rnc/overlay/l00/mobys/beam_slot_controller.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L00_MOBYS_BEAM_SLOT_CONTROLLER_H -#define LOMBYTE_RNC_OVERLAY_L00_MOBYS_BEAM_SLOT_CONTROLLER_H - -#include "types.h" - -void beam_slot_controller_update() __asm__("FUN_L00_002e1df0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L00_MOBYS_BEAM_SLOT_CONTROLLER_H */ diff --git a/include/rnc/overlay/l00/mobys/clank_cutscene_trigger.h b/include/rnc/overlay/l00/mobys/clank_cutscene_trigger.h deleted file mode 100644 index fee9f1c148..0000000000 --- a/include/rnc/overlay/l00/mobys/clank_cutscene_trigger.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L00_MOBYS_CLANK_CUTSCENE_TRIGGER_H -#define LOMBYTE_RNC_OVERLAY_L00_MOBYS_CLANK_CUTSCENE_TRIGGER_H - -#include "types.h" - -void clank_cutscene_trigger_update() __asm__("FUN_L00_002d9dc8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L00_MOBYS_CLANK_CUTSCENE_TRIGGER_H */ diff --git a/include/rnc/overlay/l00/mobys/cutscene_effects.h b/include/rnc/overlay/l00/mobys/cutscene_effects.h deleted file mode 100644 index 3c9b25d9d7..0000000000 --- a/include/rnc/overlay/l00/mobys/cutscene_effects.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L00_MOBYS_CUTSCENE_EFFECTS_H -#define LOMBYTE_RNC_OVERLAY_L00_MOBYS_CUTSCENE_EFFECTS_H - -#include "types.h" - -void phase_effect_controller_update() __asm__("FUN_L00_002e3800"); - -#endif /* LOMBYTE_RNC_OVERLAY_L00_MOBYS_CUTSCENE_EFFECTS_H */ diff --git a/include/rnc/overlay/l00/mobys/help_hints.h b/include/rnc/overlay/l00/mobys/help_hints.h deleted file mode 100644 index bc708dc554..0000000000 --- a/include/rnc/overlay/l00/mobys/help_hints.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L00_MOBYS_HELP_HINTS_H -#define LOMBYTE_RNC_OVERLAY_L00_MOBYS_HELP_HINTS_H - -#include "types.h" - -void help_hints_update() __asm__("FUN_L00_002e0988"); - -#endif /* LOMBYTE_RNC_OVERLAY_L00_MOBYS_HELP_HINTS_H */ diff --git a/include/rnc/overlay/l00/mobys/veldin_robot_enemy.h b/include/rnc/overlay/l00/mobys/veldin_robot_enemy.h deleted file mode 100644 index 3326fb1d70..0000000000 --- a/include/rnc/overlay/l00/mobys/veldin_robot_enemy.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L00_MOBYS_VELDIN_ROBOT_ENEMY_H -#define LOMBYTE_RNC_OVERLAY_L00_MOBYS_VELDIN_ROBOT_ENEMY_H - -#include "types.h" - -void veldin_robot_enemy_update() __asm__("FUN_L00_002e0b88"); - -#endif /* LOMBYTE_RNC_OVERLAY_L00_MOBYS_VELDIN_ROBOT_ENEMY_H */ diff --git a/include/rnc/overlay/l01/scroll_layers.h b/include/rnc/overlay/l01.h similarity index 51% rename from include/rnc/overlay/l01/scroll_layers.h rename to include/rnc/overlay/l01.h index 63e5cfa57d..834850bc8a 100644 --- a/include/rnc/overlay/l01/scroll_layers.h +++ b/include/rnc/overlay/l01.h @@ -1,9 +1,9 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L01_SCROLL_LAYERS_H -#define LOMBYTE_RNC_OVERLAY_L01_SCROLL_LAYERS_H +#ifndef LOMBYTE_RNC_OVERLAY_L01_H +#define LOMBYTE_RNC_OVERLAY_L01_H #include "rnc/overlay/l01/scroll_layer.h" #include "types.h" void update_and_draw_scrolling_overlay_layers(s32, ScrollLayer *) __asm__("FUN_L01_002b96e0"); -#endif /* LOMBYTE_RNC_OVERLAY_L01_SCROLL_LAYERS_H */ +#endif /* LOMBYTE_RNC_OVERLAY_L01_H */ diff --git a/include/rnc/overlay/l02/mobys.h b/include/rnc/overlay/l02/mobys.h new file mode 100644 index 0000000000..63308a99ec --- /dev/null +++ b/include/rnc/overlay/l02/mobys.h @@ -0,0 +1,11 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L02_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_L02_MOBYS_H + +#include "types.h" + +struct Moby; + +char *spawn_projectile_moby(struct Moby *, void *, float *) __asm__("FUN_L02_002ec228"); +void update_skid_mcmarx_relocation_sequence(struct Moby *) __asm__("FUN_L02_002e1fb8"); + +#endif /* LOMBYTE_RNC_OVERLAY_L02_MOBYS_H */ diff --git a/include/rnc/overlay/l02/mobys/rocket_launcher_projectile.h b/include/rnc/overlay/l02/mobys/rocket_launcher_projectile.h deleted file mode 100644 index ee2839b288..0000000000 --- a/include/rnc/overlay/l02/mobys/rocket_launcher_projectile.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L02_MOBYS_ROCKET_LAUNCHER_PROJECTILE_H -#define LOMBYTE_RNC_OVERLAY_L02_MOBYS_ROCKET_LAUNCHER_PROJECTILE_H - -#include "types.h" - -struct Moby; - -char *spawn_projectile_moby(struct Moby *, void *, float *) __asm__("FUN_L02_002ec228"); - -#endif /* LOMBYTE_RNC_OVERLAY_L02_MOBYS_ROCKET_LAUNCHER_PROJECTILE_H */ diff --git a/include/rnc/overlay/l02/mobys/skid_mcmarx.h b/include/rnc/overlay/l02/mobys/skid_mcmarx.h deleted file mode 100644 index 7ca30a2997..0000000000 --- a/include/rnc/overlay/l02/mobys/skid_mcmarx.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L02_MOBYS_SKID_MCMARX_H -#define LOMBYTE_RNC_OVERLAY_L02_MOBYS_SKID_MCMARX_H - -#include "types.h" - -struct Moby; - -void update_skid_mcmarx_relocation_sequence(struct Moby *) __asm__("FUN_L02_002e1fb8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L02_MOBYS_SKID_MCMARX_H */ diff --git a/include/rnc/overlay/l03/hero_relative_camera.h b/include/rnc/overlay/l03.h similarity index 62% rename from include/rnc/overlay/l03/hero_relative_camera.h rename to include/rnc/overlay/l03.h index 78007833fb..6c7ab71d22 100644 --- a/include/rnc/overlay/l03/hero_relative_camera.h +++ b/include/rnc/overlay/l03.h @@ -1,5 +1,5 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_HERO_RELATIVE_CAMERA_H -#define LOMBYTE_RNC_OVERLAY_L03_HERO_RELATIVE_CAMERA_H +#ifndef LOMBYTE_RNC_OVERLAY_L03_H +#define LOMBYTE_RNC_OVERLAY_L03_H #include "types.h" @@ -8,4 +8,4 @@ int FUN_L03_002ebd70(void); void update_camera_position_and_orientation(void *) __asm__("FUN_L03_002ebdb0"); void update_camera_state_outside_clip_volume(char *) __asm__("FUN_L03_002ebde8"); -#endif /* LOMBYTE_RNC_OVERLAY_L03_HERO_RELATIVE_CAMERA_H */ +#endif /* LOMBYTE_RNC_OVERLAY_L03_H */ diff --git a/include/rnc/overlay/l03/mobys.h b/include/rnc/overlay/l03/mobys.h new file mode 100644 index 0000000000..b3a240f440 --- /dev/null +++ b/include/rnc/overlay/l03/mobys.h @@ -0,0 +1,27 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_H + +#include "types.h" + +struct Moby; +struct RailSpawnerMoby; + +void big_al_update(struct Moby *) __asm__("FUN_L03_002db558"); +void kerwan_cutscene_effects_update(struct Moby *) __asm__("FUN_L03_002e01d0"); +void helga_update(struct Moby *) __asm__("FUN_L03_002da870"); +void help_hints_update(struct Moby *) __asm__("FUN_L03_002df520"); +void kerwan_path_enemy_update() __asm__("FUN_L03_002c6fd0"); +void lightpost_update(struct Moby *) __asm__("FUN_L03_002e2948"); +void metropolis_train_carriage_update(struct Moby *) __asm__("FUN_L03_002953f8"); +void metropolis_train_locomotive_update(char *) __asm__("FUN_L03_00292e98"); +void mine_layer_mine_update(struct Moby *) __asm__("FUN_L03_002cbea8"); +void mine_layer_update(struct Moby *) __asm__("FUN_L03_002c9eb8"); +void moving_platform_small_update(char *) __asm__("FUN_L03_00294c08"); +void path_mover_update(struct Moby *) __asm__("FUN_L03_002db020"); +void path_mover_spawner_update(struct RailSpawnerMoby *) __asm__("FUN_L03_002db280"); +void rail_lift_update(struct Moby *) __asm__("FUN_L03_002dccc0"); +void red_ship_1_update(char *) __asm__("FUN_L03_0029dba8"); +void robo_shack_sign_update(struct Moby *) __asm__("FUN_L03_002d3e58"); +void robot_qwark_update(struct Moby *) __asm__("FUN_L03_002dbd90"); + +#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_H */ diff --git a/include/rnc/overlay/l03/mobys/big_al.h b/include/rnc/overlay/l03/mobys/big_al.h deleted file mode 100644 index 61bf26116e..0000000000 --- a/include/rnc/overlay/l03/mobys/big_al.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_BIG_AL_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_BIG_AL_H - -#include "types.h" - -struct Moby; - -void big_al_update(struct Moby *) __asm__("FUN_L03_002db558"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_BIG_AL_H */ diff --git a/include/rnc/overlay/l03/mobys/cutscene_effects.h b/include/rnc/overlay/l03/mobys/cutscene_effects.h deleted file mode 100644 index 3dd1105b98..0000000000 --- a/include/rnc/overlay/l03/mobys/cutscene_effects.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_CUTSCENE_EFFECTS_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_CUTSCENE_EFFECTS_H - -#include "types.h" - -struct Moby; - -void kerwan_cutscene_effects_update(struct Moby *) __asm__("FUN_L03_002e01d0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_CUTSCENE_EFFECTS_H */ diff --git a/include/rnc/overlay/l03/mobys/helga.h b/include/rnc/overlay/l03/mobys/helga.h deleted file mode 100644 index ce140f9c2c..0000000000 --- a/include/rnc/overlay/l03/mobys/helga.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_HELGA_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_HELGA_H - -#include "types.h" - -struct Moby; - -void helga_update(struct Moby *) __asm__("FUN_L03_002da870"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_HELGA_H */ diff --git a/include/rnc/overlay/l03/mobys/help_hints.h b/include/rnc/overlay/l03/mobys/help_hints.h deleted file mode 100644 index 5828ccca61..0000000000 --- a/include/rnc/overlay/l03/mobys/help_hints.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_HELP_HINTS_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_HELP_HINTS_H - -#include "types.h" - -struct Moby; - -void help_hints_update(struct Moby *) __asm__("FUN_L03_002df520"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_HELP_HINTS_H */ diff --git a/include/rnc/overlay/l03/mobys/kerwan_path_enemy.h b/include/rnc/overlay/l03/mobys/kerwan_path_enemy.h deleted file mode 100644 index c291047d43..0000000000 --- a/include/rnc/overlay/l03/mobys/kerwan_path_enemy.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_KERWAN_PATH_ENEMY_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_KERWAN_PATH_ENEMY_H - -#include "types.h" - -void kerwan_path_enemy_update() __asm__("FUN_L03_002c6fd0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_KERWAN_PATH_ENEMY_H */ diff --git a/include/rnc/overlay/l03/mobys/lightpost.h b/include/rnc/overlay/l03/mobys/lightpost.h deleted file mode 100644 index 847996f2fd..0000000000 --- a/include/rnc/overlay/l03/mobys/lightpost.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_LIGHTPOST_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_LIGHTPOST_H - -#include "types.h" - -struct Moby; - -void lightpost_update(struct Moby *) __asm__("FUN_L03_002e2948"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_LIGHTPOST_H */ diff --git a/include/rnc/overlay/l03/mobys/metropolis_train_carriage.h b/include/rnc/overlay/l03/mobys/metropolis_train_carriage.h deleted file mode 100644 index 8576446a2b..0000000000 --- a/include/rnc/overlay/l03/mobys/metropolis_train_carriage.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_METROPOLIS_TRAIN_CARRIAGE_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_METROPOLIS_TRAIN_CARRIAGE_H - -#include "types.h" - -struct Moby; - -void metropolis_train_carriage_update(struct Moby *) __asm__("FUN_L03_002953f8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_METROPOLIS_TRAIN_CARRIAGE_H */ diff --git a/include/rnc/overlay/l03/mobys/metropolis_train_locomotive.h b/include/rnc/overlay/l03/mobys/metropolis_train_locomotive.h deleted file mode 100644 index bca9c815d9..0000000000 --- a/include/rnc/overlay/l03/mobys/metropolis_train_locomotive.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_METROPOLIS_TRAIN_LOCOMOTIVE_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_METROPOLIS_TRAIN_LOCOMOTIVE_H - -#include "types.h" - -void metropolis_train_locomotive_update(char *) __asm__("FUN_L03_00292e98"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_METROPOLIS_TRAIN_LOCOMOTIVE_H */ diff --git a/include/rnc/overlay/l03/mobys/mine.h b/include/rnc/overlay/l03/mobys/mine.h deleted file mode 100644 index 0950355adf..0000000000 --- a/include/rnc/overlay/l03/mobys/mine.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_MINE_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_MINE_H - -#include "types.h" - -struct Moby; - -void mine_layer_mine_update(struct Moby *) __asm__("FUN_L03_002cbea8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_MINE_H */ diff --git a/include/rnc/overlay/l03/mobys/mine_layer.h b/include/rnc/overlay/l03/mobys/mine_layer.h deleted file mode 100644 index c0f24b8fc5..0000000000 --- a/include/rnc/overlay/l03/mobys/mine_layer.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_MINE_LAYER_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_MINE_LAYER_H - -#include "types.h" - -struct Moby; - -void mine_layer_update(struct Moby *) __asm__("FUN_L03_002c9eb8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_MINE_LAYER_H */ diff --git a/include/rnc/overlay/l03/mobys/moving_platform_small.h b/include/rnc/overlay/l03/mobys/moving_platform_small.h deleted file mode 100644 index 0c36a5df28..0000000000 --- a/include/rnc/overlay/l03/mobys/moving_platform_small.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_MOVING_PLATFORM_SMALL_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_MOVING_PLATFORM_SMALL_H - -#include "types.h" - -void moving_platform_small_update(char *) __asm__("FUN_L03_00294c08"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_MOVING_PLATFORM_SMALL_H */ diff --git a/include/rnc/overlay/l03/mobys/path_mover.h b/include/rnc/overlay/l03/mobys/path_mover.h deleted file mode 100644 index 7b579a452e..0000000000 --- a/include/rnc/overlay/l03/mobys/path_mover.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_PATH_MOVER_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_PATH_MOVER_H - -#include "types.h" - -struct Moby; - -void path_mover_update(struct Moby *) __asm__("FUN_L03_002db020"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_PATH_MOVER_H */ diff --git a/include/rnc/overlay/l03/mobys/path_mover_spawner.h b/include/rnc/overlay/l03/mobys/path_mover_spawner.h deleted file mode 100644 index 5c065b9e88..0000000000 --- a/include/rnc/overlay/l03/mobys/path_mover_spawner.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_PATH_MOVER_SPAWNER_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_PATH_MOVER_SPAWNER_H - -#include "types.h" - -struct RailSpawnerMoby; - -void path_mover_spawner_update(struct RailSpawnerMoby *) __asm__("FUN_L03_002db280"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_PATH_MOVER_SPAWNER_H */ diff --git a/include/rnc/overlay/l03/mobys/rail_lift.h b/include/rnc/overlay/l03/mobys/rail_lift.h deleted file mode 100644 index ff90d3c8c8..0000000000 --- a/include/rnc/overlay/l03/mobys/rail_lift.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_RAIL_LIFT_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_RAIL_LIFT_H - -#include "types.h" - -struct Moby; - -void rail_lift_update(struct Moby *) __asm__("FUN_L03_002dccc0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_RAIL_LIFT_H */ diff --git a/include/rnc/overlay/l03/mobys/red_ship_1.h b/include/rnc/overlay/l03/mobys/red_ship_1.h deleted file mode 100644 index e64da168a4..0000000000 --- a/include/rnc/overlay/l03/mobys/red_ship_1.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_RED_SHIP_1_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_RED_SHIP_1_H - -#include "types.h" - -void red_ship_1_update(char *) __asm__("FUN_L03_0029dba8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_RED_SHIP_1_H */ diff --git a/include/rnc/overlay/l03/mobys/robo_shack_sign.h b/include/rnc/overlay/l03/mobys/robo_shack_sign.h deleted file mode 100644 index 0c900b542d..0000000000 --- a/include/rnc/overlay/l03/mobys/robo_shack_sign.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_ROBO_SHACK_SIGN_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_ROBO_SHACK_SIGN_H - -#include "types.h" - -struct Moby; - -void robo_shack_sign_update(struct Moby *) __asm__("FUN_L03_002d3e58"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_ROBO_SHACK_SIGN_H */ diff --git a/include/rnc/overlay/l03/mobys/robot_qwark.h b/include/rnc/overlay/l03/mobys/robot_qwark.h deleted file mode 100644 index cf67ef0f19..0000000000 --- a/include/rnc/overlay/l03/mobys/robot_qwark.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L03_MOBYS_ROBOT_QWARK_H -#define LOMBYTE_RNC_OVERLAY_L03_MOBYS_ROBOT_QWARK_H - -#include "types.h" - -struct Moby; - -void robot_qwark_update(struct Moby *) __asm__("FUN_L03_002dbd90"); - -#endif /* LOMBYTE_RNC_OVERLAY_L03_MOBYS_ROBOT_QWARK_H */ diff --git a/include/rnc/overlay/l04.h b/include/rnc/overlay/l04.h new file mode 100644 index 0000000000..aae8bc585f --- /dev/null +++ b/include/rnc/overlay/l04.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L04_H +#define LOMBYTE_RNC_OVERLAY_L04_H + +#include "types.h" + +void spawn_smoke_puff_trail_with_endpoint_bursts(void *, void *, void *, int, float, float) __asm__("FUN_L04_002c41e0"); + +#endif /* LOMBYTE_RNC_OVERLAY_L04_H */ diff --git a/include/rnc/overlay/l04/mobys.h b/include/rnc/overlay/l04/mobys.h new file mode 100644 index 0000000000..8c1d216f5a --- /dev/null +++ b/include/rnc/overlay/l04/mobys.h @@ -0,0 +1,35 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_H + +#include "types.h" + +struct Moby; + +void big_axebot_update() __asm__("FUN_L04_002ba520"); +void blarg_trooper_update(struct Moby *) __asm__("FUN_L04_002c4850"); +void butterfly_swarm_update(struct Moby *) __asm__("FUN_L04_0029ecf8"); +void circular_saw_enemy_update() __asm__("FUN_L04_002c2270"); +void get_circular_saw_enemy_suck_cannon_record() __asm__("FUN_L04_002c41b0"); +int launch_circular_saw_enemy_from_suck_cannon(struct Moby *, + int, + int, + float) __asm__("FUN_L04_002c40d0"); +void cutscene_camera_target_update(struct Moby *) __asm__("FUN_L04_002e53a0"); +void eudora_bridge_update(struct Moby *) __asm__("FUN_L04_002c6858"); +void floating_platform_update(char *) __asm__("FUN_L04_002cdda0"); +void help_hints_update() __asm__("FUN_L04_002e4418"); +void leaf_update(struct Moby *) __asm__("FUN_L04_002d7e90"); +void lieutenant_update(struct Moby *) __asm__("FUN_L04_002e3078"); +void path_progress_mover_update(char *) __asm__("FUN_L04_002d6f68"); +void pipe_update(struct Moby *) __asm__("FUN_L04_002e79a8"); +void platform_booster_update(struct Moby *) __asm__("FUN_L04_002c6bb8"); +void random_interval_animation_update(struct Moby *) __asm__("FUN_L04_002a5a08"); +void snow_plow_update(struct Moby *) __asm__("FUN_L04_002ca420"); +void suck_cannon_update(struct Moby *) __asm__("FUN_L04_002e1a10"); +void translation_delta_matrix_update(char *) __asm__("FUN_L04_002d3580"); +void transport_ship_update(void *) __asm__("FUN_L04_002ce060"); +void upper_door_update(struct Moby *) __asm__("FUN_L04_002e17d8"); +void woodcut_bot_update() __asm__("FUN_L04_002d16b8"); +void woodcut_bot_debris_update() __asm__("FUN_L04_002e5178"); + +#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_H */ diff --git a/include/rnc/overlay/l04/mobys/big_axebot.h b/include/rnc/overlay/l04/mobys/big_axebot.h deleted file mode 100644 index ff49f44108..0000000000 --- a/include/rnc/overlay/l04/mobys/big_axebot.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_BIG_AXEBOT_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_BIG_AXEBOT_H - -#include "types.h" - -void big_axebot_update() __asm__("FUN_L04_002ba520"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_BIG_AXEBOT_H */ diff --git a/include/rnc/overlay/l04/mobys/blarg_trooper.h b/include/rnc/overlay/l04/mobys/blarg_trooper.h deleted file mode 100644 index 146d449de7..0000000000 --- a/include/rnc/overlay/l04/mobys/blarg_trooper.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_BLARG_TROOPER_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_BLARG_TROOPER_H - -#include "types.h" - -struct Moby; - -void blarg_trooper_update(struct Moby *) __asm__("FUN_L04_002c4850"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_BLARG_TROOPER_H */ diff --git a/include/rnc/overlay/l04/mobys/butterfly_swarm.h b/include/rnc/overlay/l04/mobys/butterfly_swarm.h deleted file mode 100644 index 144dfafda5..0000000000 --- a/include/rnc/overlay/l04/mobys/butterfly_swarm.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_BUTTERFLY_SWARM_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_BUTTERFLY_SWARM_H - -#include "types.h" - -struct Moby; - -void butterfly_swarm_update(struct Moby *) __asm__("FUN_L04_0029ecf8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_BUTTERFLY_SWARM_H */ diff --git a/include/rnc/overlay/l04/mobys/circular_saw_enemy.h b/include/rnc/overlay/l04/mobys/circular_saw_enemy.h deleted file mode 100644 index 356ac6f1bb..0000000000 --- a/include/rnc/overlay/l04/mobys/circular_saw_enemy.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_CIRCULAR_SAW_ENEMY_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_CIRCULAR_SAW_ENEMY_H - -#include "types.h" - -struct Moby; - -void circular_saw_enemy_update() __asm__("FUN_L04_002c2270"); -void get_circular_saw_enemy_suck_cannon_record() __asm__("FUN_L04_002c41b0"); -int launch_circular_saw_enemy_from_suck_cannon(struct Moby *, - int, - int, - float) __asm__("FUN_L04_002c40d0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_CIRCULAR_SAW_ENEMY_H */ diff --git a/include/rnc/overlay/l04/mobys/cutscene_camera_target.h b/include/rnc/overlay/l04/mobys/cutscene_camera_target.h deleted file mode 100644 index 5339c3a7e8..0000000000 --- a/include/rnc/overlay/l04/mobys/cutscene_camera_target.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_CUTSCENE_CAMERA_TARGET_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_CUTSCENE_CAMERA_TARGET_H - -#include "types.h" - -struct Moby; - -void cutscene_camera_target_update(struct Moby *) __asm__("FUN_L04_002e53a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_CUTSCENE_CAMERA_TARGET_H */ diff --git a/include/rnc/overlay/l04/mobys/eudora_bridge.h b/include/rnc/overlay/l04/mobys/eudora_bridge.h deleted file mode 100644 index a877dbeab4..0000000000 --- a/include/rnc/overlay/l04/mobys/eudora_bridge.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_EUDORA_BRIDGE_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_EUDORA_BRIDGE_H - -#include "types.h" - -struct Moby; - -void eudora_bridge_update(struct Moby *) __asm__("FUN_L04_002c6858"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_EUDORA_BRIDGE_H */ diff --git a/include/rnc/overlay/l04/mobys/floating_platform.h b/include/rnc/overlay/l04/mobys/floating_platform.h deleted file mode 100644 index bce7f83c17..0000000000 --- a/include/rnc/overlay/l04/mobys/floating_platform.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_FLOATING_PLATFORM_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_FLOATING_PLATFORM_H - -#include "types.h" - -void floating_platform_update(char *) __asm__("FUN_L04_002cdda0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_FLOATING_PLATFORM_H */ diff --git a/include/rnc/overlay/l04/mobys/help_hints.h b/include/rnc/overlay/l04/mobys/help_hints.h deleted file mode 100644 index 3c4a19882b..0000000000 --- a/include/rnc/overlay/l04/mobys/help_hints.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_HELP_HINTS_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_HELP_HINTS_H - -#include "types.h" - -void help_hints_update() __asm__("FUN_L04_002e4418"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_HELP_HINTS_H */ diff --git a/include/rnc/overlay/l04/mobys/leaf.h b/include/rnc/overlay/l04/mobys/leaf.h deleted file mode 100644 index 8d1a634261..0000000000 --- a/include/rnc/overlay/l04/mobys/leaf.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_LEAF_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_LEAF_H - -#include "types.h" - -struct Moby; - -void leaf_update(struct Moby *) __asm__("FUN_L04_002d7e90"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_LEAF_H */ diff --git a/include/rnc/overlay/l04/mobys/lieutenant.h b/include/rnc/overlay/l04/mobys/lieutenant.h deleted file mode 100644 index d77fefbb24..0000000000 --- a/include/rnc/overlay/l04/mobys/lieutenant.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_LIEUTENANT_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_LIEUTENANT_H - -#include "types.h" - -struct Moby; - -void lieutenant_update(struct Moby *) __asm__("FUN_L04_002e3078"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_LIEUTENANT_H */ diff --git a/include/rnc/overlay/l04/mobys/path_progress_mover.h b/include/rnc/overlay/l04/mobys/path_progress_mover.h deleted file mode 100644 index 1652ae6de9..0000000000 --- a/include/rnc/overlay/l04/mobys/path_progress_mover.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_PATH_PROGRESS_MOVER_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_PATH_PROGRESS_MOVER_H - -#include "types.h" - -void path_progress_mover_update(char *) __asm__("FUN_L04_002d6f68"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_PATH_PROGRESS_MOVER_H */ diff --git a/include/rnc/overlay/l04/mobys/pipe.h b/include/rnc/overlay/l04/mobys/pipe.h deleted file mode 100644 index a14db2723d..0000000000 --- a/include/rnc/overlay/l04/mobys/pipe.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_PIPE_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_PIPE_H - -#include "types.h" - -struct Moby; - -void pipe_update(struct Moby *) __asm__("FUN_L04_002e79a8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_PIPE_H */ diff --git a/include/rnc/overlay/l04/mobys/platform_booster.h b/include/rnc/overlay/l04/mobys/platform_booster.h deleted file mode 100644 index 3bd185f210..0000000000 --- a/include/rnc/overlay/l04/mobys/platform_booster.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_PLATFORM_BOOSTER_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_PLATFORM_BOOSTER_H - -#include "types.h" - -struct Moby; - -void platform_booster_update(struct Moby *) __asm__("FUN_L04_002c6bb8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_PLATFORM_BOOSTER_H */ diff --git a/include/rnc/overlay/l04/mobys/random_interval_animation.h b/include/rnc/overlay/l04/mobys/random_interval_animation.h deleted file mode 100644 index 9aa63e0e27..0000000000 --- a/include/rnc/overlay/l04/mobys/random_interval_animation.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_RANDOM_INTERVAL_ANIMATION_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_RANDOM_INTERVAL_ANIMATION_H - -#include "types.h" - -struct Moby; - -void random_interval_animation_update(struct Moby *) __asm__("FUN_L04_002a5a08"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_RANDOM_INTERVAL_ANIMATION_H */ diff --git a/include/rnc/overlay/l04/mobys/snow_plow.h b/include/rnc/overlay/l04/mobys/snow_plow.h deleted file mode 100644 index 8d77b71f10..0000000000 --- a/include/rnc/overlay/l04/mobys/snow_plow.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_SNOW_PLOW_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_SNOW_PLOW_H - -#include "types.h" - -struct Moby; - -void snow_plow_update(struct Moby *) __asm__("FUN_L04_002ca420"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_SNOW_PLOW_H */ diff --git a/include/rnc/overlay/l04/mobys/suck_cannon.h b/include/rnc/overlay/l04/mobys/suck_cannon.h deleted file mode 100644 index cab8067a70..0000000000 --- a/include/rnc/overlay/l04/mobys/suck_cannon.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_SUCK_CANNON_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_SUCK_CANNON_H - -#include "types.h" - -struct Moby; - -void suck_cannon_update(struct Moby *) __asm__("FUN_L04_002e1a10"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_SUCK_CANNON_H */ diff --git a/include/rnc/overlay/l04/mobys/translation_delta_matrix.h b/include/rnc/overlay/l04/mobys/translation_delta_matrix.h deleted file mode 100644 index 2a9b08684a..0000000000 --- a/include/rnc/overlay/l04/mobys/translation_delta_matrix.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_TRANSLATION_DELTA_MATRIX_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_TRANSLATION_DELTA_MATRIX_H - -#include "types.h" - -void translation_delta_matrix_update(char *) __asm__("FUN_L04_002d3580"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_TRANSLATION_DELTA_MATRIX_H */ diff --git a/include/rnc/overlay/l04/mobys/transport_ship.h b/include/rnc/overlay/l04/mobys/transport_ship.h deleted file mode 100644 index 139f4aa102..0000000000 --- a/include/rnc/overlay/l04/mobys/transport_ship.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_TRANSPORT_SHIP_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_TRANSPORT_SHIP_H - -#include "types.h" - -void transport_ship_update(void *) __asm__("FUN_L04_002ce060"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_TRANSPORT_SHIP_H */ diff --git a/include/rnc/overlay/l04/mobys/upper_door.h b/include/rnc/overlay/l04/mobys/upper_door.h deleted file mode 100644 index 86adee454c..0000000000 --- a/include/rnc/overlay/l04/mobys/upper_door.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_UPPER_DOOR_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_UPPER_DOOR_H - -#include "types.h" - -struct Moby; - -void upper_door_update(struct Moby *) __asm__("FUN_L04_002e17d8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_UPPER_DOOR_H */ diff --git a/include/rnc/overlay/l04/mobys/woodcut_bot.h b/include/rnc/overlay/l04/mobys/woodcut_bot.h deleted file mode 100644 index da8d54aac5..0000000000 --- a/include/rnc/overlay/l04/mobys/woodcut_bot.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_WOODCUT_BOT_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_WOODCUT_BOT_H - -#include "types.h" - -void woodcut_bot_update() __asm__("FUN_L04_002d16b8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_WOODCUT_BOT_H */ diff --git a/include/rnc/overlay/l04/mobys/woodcut_bot_debris.h b/include/rnc/overlay/l04/mobys/woodcut_bot_debris.h deleted file mode 100644 index 2f5af2ebcf..0000000000 --- a/include/rnc/overlay/l04/mobys/woodcut_bot_debris.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_MOBYS_WOODCUT_BOT_DEBRIS_H -#define LOMBYTE_RNC_OVERLAY_L04_MOBYS_WOODCUT_BOT_DEBRIS_H - -#include "types.h" - -void woodcut_bot_debris_update() __asm__("FUN_L04_002e5178"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_MOBYS_WOODCUT_BOT_DEBRIS_H */ diff --git a/include/rnc/overlay/l04/spawn_smoke_puff_trail_with_endpoint_bursts.h b/include/rnc/overlay/l04/spawn_smoke_puff_trail_with_endpoint_bursts.h deleted file mode 100644 index fcf89fe341..0000000000 --- a/include/rnc/overlay/l04/spawn_smoke_puff_trail_with_endpoint_bursts.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L04_SPAWN_SMOKE_PUFF_TRAIL_WITH_ENDPOINT_BURSTS_H -#define LOMBYTE_RNC_OVERLAY_L04_SPAWN_SMOKE_PUFF_TRAIL_WITH_ENDPOINT_BURSTS_H - -#include "types.h" - -void spawn_smoke_puff_trail_with_endpoint_bursts(void *, void *, void *, int, float, float) __asm__("FUN_L04_002c41e0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L04_SPAWN_SMOKE_PUFF_TRAIL_WITH_ENDPOINT_BURSTS_H */ diff --git a/include/rnc/overlay/l05.h b/include/rnc/overlay/l05.h new file mode 100644 index 0000000000..308d8ca2d4 --- /dev/null +++ b/include/rnc/overlay/l05.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L05_H +#define LOMBYTE_RNC_OVERLAY_L05_H + +#include "types.h" + +void render_level_water_grids(void) __asm__("FUN_L05_0030d678"); + +#endif /* LOMBYTE_RNC_OVERLAY_L05_H */ diff --git a/include/rnc/overlay/l05/mobys.h b/include/rnc/overlay/l05/mobys.h new file mode 100644 index 0000000000..eaf5469852 --- /dev/null +++ b/include/rnc/overlay/l05/mobys.h @@ -0,0 +1,39 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_H + +#include "types.h" + +struct Moby; + +void amoeboid_update(struct Moby *) __asm__("FUN_L05_002dac80"); +void box_update(char *) __asm__("FUN_L05_0030bf98"); +void cutscene_camera_target_update(unsigned char *) __asm__("FUN_L05_0031d5c8"); +void drain_cover_update() __asm__("FUN_L05_0030e7f8"); +void electric_gate_update(char *) __asm__("FUN_L05_0030dc68"); +void elevator_with_button_update(struct Moby *) __asm__("FUN_L05_003156d0"); +void extermibot_update(unsigned char *) __asm__("FUN_L05_00301f48"); +void extermitank_update(unsigned char *) __asm__("FUN_L05_00304320"); +void floating_platform_update(unsigned char *) __asm__("FUN_L05_0030bdd8"); +void fog_zone_update(struct Moby *) __asm__("FUN_L05_0030e1f8"); +void help_hints_update(struct Moby *) __asm__("FUN_L05_0031bf40"); +void hero_clip_volume_outputs_update(struct Moby *) __asm__("FUN_L05_00318a68"); +void hoverboard_girl_update() __asm__("FUN_L05_00316ab8"); +void ocean_rilgar_update(struct Moby *) __asm__("FUN_L05_00316110"); +void pipe_mounted_grating_update(struct Moby *) __asm__("FUN_L05_0030f5c8"); +void qwarks_bouncer_update() __asm__("FUN_L05_00317470"); +void qwarks_trailer_update(struct Moby *) __asm__("FUN_L05_00319c28"); +void rising_gate_update(struct Moby *) __asm__("FUN_L05_00314eb0"); +void scenery_ship_update(char *) __asm__("FUN_L05_002d7140"); +void shady_salesman_update() __asm__("FUN_L05_003180a0"); +void sharkigator_update(char *) __asm__("FUN_L05_002d1688"); +void skid_mcmarx_update() __asm__("FUN_L05_00307910"); +void taxi_update(struct Moby *) __asm__("FUN_L05_00318c78"); +void initialize_taxi_stop_state(void *) __asm__("FUN_L05_00319208"); +void television_update(struct Moby *) __asm__("FUN_L05_00318b98"); +void triggered_moby_yaw_update(struct Moby *) __asm__("FUN_L05_003166a0"); +void triggered_motion_update(char *) __asm__("FUN_L05_00316258"); +void triggered_slide_update(char *) __asm__("FUN_L05_0030e508"); +void triggered_spray_emitter_update(struct Moby *) __asm__("FUN_L05_003150f0"); +void water_update(struct Moby *) __asm__("FUN_L05_0030ca80"); + +#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_H */ diff --git a/include/rnc/overlay/l05/mobys/amoeboid.h b/include/rnc/overlay/l05/mobys/amoeboid.h deleted file mode 100644 index 20b65a0a16..0000000000 --- a/include/rnc/overlay/l05/mobys/amoeboid.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_AMOEBOID_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_AMOEBOID_H - -#include "types.h" - -struct Moby; - -void amoeboid_update(struct Moby *) __asm__("FUN_L05_002dac80"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_AMOEBOID_H */ diff --git a/include/rnc/overlay/l05/mobys/box.h b/include/rnc/overlay/l05/mobys/box.h deleted file mode 100644 index 5599a8e65f..0000000000 --- a/include/rnc/overlay/l05/mobys/box.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_BOX_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_BOX_H - -#include "types.h" - -void box_update(char *) __asm__("FUN_L05_0030bf98"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_BOX_H */ diff --git a/include/rnc/overlay/l05/mobys/cutscene_camera_target.h b/include/rnc/overlay/l05/mobys/cutscene_camera_target.h deleted file mode 100644 index 44ae23e965..0000000000 --- a/include/rnc/overlay/l05/mobys/cutscene_camera_target.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_CUTSCENE_CAMERA_TARGET_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_CUTSCENE_CAMERA_TARGET_H - -#include "types.h" - -void cutscene_camera_target_update(unsigned char *) __asm__("FUN_L05_0031d5c8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_CUTSCENE_CAMERA_TARGET_H */ diff --git a/include/rnc/overlay/l05/mobys/drain_cover.h b/include/rnc/overlay/l05/mobys/drain_cover.h deleted file mode 100644 index 8db2007847..0000000000 --- a/include/rnc/overlay/l05/mobys/drain_cover.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_DRAIN_COVER_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_DRAIN_COVER_H - -#include "types.h" - -void drain_cover_update() __asm__("FUN_L05_0030e7f8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_DRAIN_COVER_H */ diff --git a/include/rnc/overlay/l05/mobys/electric_gate.h b/include/rnc/overlay/l05/mobys/electric_gate.h deleted file mode 100644 index 6f2ec85408..0000000000 --- a/include/rnc/overlay/l05/mobys/electric_gate.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_ELECTRIC_GATE_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_ELECTRIC_GATE_H - -#include "types.h" - -void electric_gate_update(char *) __asm__("FUN_L05_0030dc68"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_ELECTRIC_GATE_H */ diff --git a/include/rnc/overlay/l05/mobys/elevator_with_button.h b/include/rnc/overlay/l05/mobys/elevator_with_button.h deleted file mode 100644 index f43798413b..0000000000 --- a/include/rnc/overlay/l05/mobys/elevator_with_button.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_ELEVATOR_WITH_BUTTON_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_ELEVATOR_WITH_BUTTON_H - -#include "types.h" - -struct Moby; - -void elevator_with_button_update(struct Moby *) __asm__("FUN_L05_003156d0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_ELEVATOR_WITH_BUTTON_H */ diff --git a/include/rnc/overlay/l05/mobys/extermibot.h b/include/rnc/overlay/l05/mobys/extermibot.h deleted file mode 100644 index 6fabc7feec..0000000000 --- a/include/rnc/overlay/l05/mobys/extermibot.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_EXTERMIBOT_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_EXTERMIBOT_H - -#include "types.h" - -void extermibot_update(unsigned char *) __asm__("FUN_L05_00301f48"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_EXTERMIBOT_H */ diff --git a/include/rnc/overlay/l05/mobys/extermitank.h b/include/rnc/overlay/l05/mobys/extermitank.h deleted file mode 100644 index 28a9e2d5cb..0000000000 --- a/include/rnc/overlay/l05/mobys/extermitank.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_EXTERMITANK_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_EXTERMITANK_H - -#include "types.h" - -void extermitank_update(unsigned char *) __asm__("FUN_L05_00304320"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_EXTERMITANK_H */ diff --git a/include/rnc/overlay/l05/mobys/floating_platform.h b/include/rnc/overlay/l05/mobys/floating_platform.h deleted file mode 100644 index b696e1610a..0000000000 --- a/include/rnc/overlay/l05/mobys/floating_platform.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_FLOATING_PLATFORM_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_FLOATING_PLATFORM_H - -#include "types.h" - -void floating_platform_update(unsigned char *) __asm__("FUN_L05_0030bdd8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_FLOATING_PLATFORM_H */ diff --git a/include/rnc/overlay/l05/mobys/fog_zone.h b/include/rnc/overlay/l05/mobys/fog_zone.h deleted file mode 100644 index 9c46b11ab8..0000000000 --- a/include/rnc/overlay/l05/mobys/fog_zone.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_FOG_ZONE_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_FOG_ZONE_H - -#include "types.h" - -struct Moby; - -void fog_zone_update(struct Moby *) __asm__("FUN_L05_0030e1f8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_FOG_ZONE_H */ diff --git a/include/rnc/overlay/l05/mobys/help_hints.h b/include/rnc/overlay/l05/mobys/help_hints.h deleted file mode 100644 index 69542eccf6..0000000000 --- a/include/rnc/overlay/l05/mobys/help_hints.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_HELP_HINTS_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_HELP_HINTS_H - -#include "types.h" - -struct Moby; - -void help_hints_update(struct Moby *) __asm__("FUN_L05_0031bf40"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_HELP_HINTS_H */ diff --git a/include/rnc/overlay/l05/mobys/hero_clip_volume_outputs.h b/include/rnc/overlay/l05/mobys/hero_clip_volume_outputs.h deleted file mode 100644 index ebe228621e..0000000000 --- a/include/rnc/overlay/l05/mobys/hero_clip_volume_outputs.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_HERO_CLIP_VOLUME_OUTPUTS_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_HERO_CLIP_VOLUME_OUTPUTS_H - -#include "types.h" - -struct Moby; - -void hero_clip_volume_outputs_update(struct Moby *) __asm__("FUN_L05_00318a68"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_HERO_CLIP_VOLUME_OUTPUTS_H */ diff --git a/include/rnc/overlay/l05/mobys/hoverboard_girl.h b/include/rnc/overlay/l05/mobys/hoverboard_girl.h deleted file mode 100644 index cb20f164dc..0000000000 --- a/include/rnc/overlay/l05/mobys/hoverboard_girl.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_HOVERBOARD_GIRL_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_HOVERBOARD_GIRL_H - -#include "types.h" - -void hoverboard_girl_update() __asm__("FUN_L05_00316ab8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_HOVERBOARD_GIRL_H */ diff --git a/include/rnc/overlay/l05/mobys/ocean_rilgar.h b/include/rnc/overlay/l05/mobys/ocean_rilgar.h deleted file mode 100644 index 7f1b162585..0000000000 --- a/include/rnc/overlay/l05/mobys/ocean_rilgar.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_OCEAN_RILGAR_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_OCEAN_RILGAR_H - -#include "types.h" - -struct Moby; - -void ocean_rilgar_update(struct Moby *) __asm__("FUN_L05_00316110"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_OCEAN_RILGAR_H */ diff --git a/include/rnc/overlay/l05/mobys/pipe_mounted_grating.h b/include/rnc/overlay/l05/mobys/pipe_mounted_grating.h deleted file mode 100644 index 41705edce2..0000000000 --- a/include/rnc/overlay/l05/mobys/pipe_mounted_grating.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_PIPE_MOUNTED_GRATING_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_PIPE_MOUNTED_GRATING_H - -#include "types.h" - -struct Moby; - -void pipe_mounted_grating_update(struct Moby *) __asm__("FUN_L05_0030f5c8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_PIPE_MOUNTED_GRATING_H */ diff --git a/include/rnc/overlay/l05/mobys/qwarks_bouncer.h b/include/rnc/overlay/l05/mobys/qwarks_bouncer.h deleted file mode 100644 index 25217b211c..0000000000 --- a/include/rnc/overlay/l05/mobys/qwarks_bouncer.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_QWARKS_BOUNCER_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_QWARKS_BOUNCER_H - -#include "types.h" - -void qwarks_bouncer_update() __asm__("FUN_L05_00317470"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_QWARKS_BOUNCER_H */ diff --git a/include/rnc/overlay/l05/mobys/qwarks_trailer.h b/include/rnc/overlay/l05/mobys/qwarks_trailer.h deleted file mode 100644 index fdcb60ce60..0000000000 --- a/include/rnc/overlay/l05/mobys/qwarks_trailer.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_QWARKS_TRAILER_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_QWARKS_TRAILER_H - -#include "types.h" - -struct Moby; - -void qwarks_trailer_update(struct Moby *) __asm__("FUN_L05_00319c28"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_QWARKS_TRAILER_H */ diff --git a/include/rnc/overlay/l05/mobys/rising_gate.h b/include/rnc/overlay/l05/mobys/rising_gate.h deleted file mode 100644 index 24a0483a8e..0000000000 --- a/include/rnc/overlay/l05/mobys/rising_gate.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_RISING_GATE_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_RISING_GATE_H - -#include "types.h" - -struct Moby; - -void rising_gate_update(struct Moby *) __asm__("FUN_L05_00314eb0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_RISING_GATE_H */ diff --git a/include/rnc/overlay/l05/mobys/scenery_ship.h b/include/rnc/overlay/l05/mobys/scenery_ship.h deleted file mode 100644 index 9acd25d436..0000000000 --- a/include/rnc/overlay/l05/mobys/scenery_ship.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_SCENERY_SHIP_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_SCENERY_SHIP_H - -#include "types.h" - -void scenery_ship_update(char *) __asm__("FUN_L05_002d7140"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_SCENERY_SHIP_H */ diff --git a/include/rnc/overlay/l05/mobys/shady_salesman.h b/include/rnc/overlay/l05/mobys/shady_salesman.h deleted file mode 100644 index deae73817f..0000000000 --- a/include/rnc/overlay/l05/mobys/shady_salesman.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_SHADY_SALESMAN_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_SHADY_SALESMAN_H - -#include "types.h" - -void shady_salesman_update() __asm__("FUN_L05_003180a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_SHADY_SALESMAN_H */ diff --git a/include/rnc/overlay/l05/mobys/sharkigator.h b/include/rnc/overlay/l05/mobys/sharkigator.h deleted file mode 100644 index b87ece704a..0000000000 --- a/include/rnc/overlay/l05/mobys/sharkigator.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_SHARKIGATOR_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_SHARKIGATOR_H - -#include "types.h" - -void sharkigator_update(char *) __asm__("FUN_L05_002d1688"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_SHARKIGATOR_H */ diff --git a/include/rnc/overlay/l05/mobys/skid_mcmarx.h b/include/rnc/overlay/l05/mobys/skid_mcmarx.h deleted file mode 100644 index 79ce227b69..0000000000 --- a/include/rnc/overlay/l05/mobys/skid_mcmarx.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_SKID_MCMARX_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_SKID_MCMARX_H - -#include "types.h" - -void skid_mcmarx_update() __asm__("FUN_L05_00307910"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_SKID_MCMARX_H */ diff --git a/include/rnc/overlay/l05/mobys/taxi.h b/include/rnc/overlay/l05/mobys/taxi.h deleted file mode 100644 index 1e5ee75177..0000000000 --- a/include/rnc/overlay/l05/mobys/taxi.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_TAXI_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_TAXI_H - -#include "types.h" - -struct Moby; - -void taxi_update(struct Moby *) __asm__("FUN_L05_00318c78"); -void initialize_taxi_stop_state(void *) __asm__("FUN_L05_00319208"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_TAXI_H */ diff --git a/include/rnc/overlay/l05/mobys/television.h b/include/rnc/overlay/l05/mobys/television.h deleted file mode 100644 index ee5de13c67..0000000000 --- a/include/rnc/overlay/l05/mobys/television.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_TELEVISION_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_TELEVISION_H - -#include "types.h" - -struct Moby; - -void television_update(struct Moby *) __asm__("FUN_L05_00318b98"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_TELEVISION_H */ diff --git a/include/rnc/overlay/l05/mobys/triggered_moby_yaw.h b/include/rnc/overlay/l05/mobys/triggered_moby_yaw.h deleted file mode 100644 index 9bae556061..0000000000 --- a/include/rnc/overlay/l05/mobys/triggered_moby_yaw.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_TRIGGERED_MOBY_YAW_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_TRIGGERED_MOBY_YAW_H - -#include "types.h" - -struct Moby; - -void triggered_moby_yaw_update(struct Moby *) __asm__("FUN_L05_003166a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_TRIGGERED_MOBY_YAW_H */ diff --git a/include/rnc/overlay/l05/mobys/triggered_motion.h b/include/rnc/overlay/l05/mobys/triggered_motion.h deleted file mode 100644 index 37e374010d..0000000000 --- a/include/rnc/overlay/l05/mobys/triggered_motion.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_TRIGGERED_MOTION_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_TRIGGERED_MOTION_H - -#include "types.h" - -void triggered_motion_update(char *) __asm__("FUN_L05_00316258"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_TRIGGERED_MOTION_H */ diff --git a/include/rnc/overlay/l05/mobys/triggered_slide.h b/include/rnc/overlay/l05/mobys/triggered_slide.h deleted file mode 100644 index cb5d6655c0..0000000000 --- a/include/rnc/overlay/l05/mobys/triggered_slide.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_TRIGGERED_SLIDE_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_TRIGGERED_SLIDE_H - -#include "types.h" - -void triggered_slide_update(char *) __asm__("FUN_L05_0030e508"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_TRIGGERED_SLIDE_H */ diff --git a/include/rnc/overlay/l05/mobys/triggered_spray_emitter.h b/include/rnc/overlay/l05/mobys/triggered_spray_emitter.h deleted file mode 100644 index e6d7d69ed7..0000000000 --- a/include/rnc/overlay/l05/mobys/triggered_spray_emitter.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_TRIGGERED_SPRAY_EMITTER_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_TRIGGERED_SPRAY_EMITTER_H - -#include "types.h" - -struct Moby; - -void triggered_spray_emitter_update(struct Moby *) __asm__("FUN_L05_003150f0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_TRIGGERED_SPRAY_EMITTER_H */ diff --git a/include/rnc/overlay/l05/mobys/water.h b/include/rnc/overlay/l05/mobys/water.h deleted file mode 100644 index b28308176b..0000000000 --- a/include/rnc/overlay/l05/mobys/water.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_MOBYS_WATER_H -#define LOMBYTE_RNC_OVERLAY_L05_MOBYS_WATER_H - -#include "types.h" - -struct Moby; - -void water_update(struct Moby *) __asm__("FUN_L05_0030ca80"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_MOBYS_WATER_H */ diff --git a/include/rnc/overlay/l05/render_level_water_grids.h b/include/rnc/overlay/l05/render_level_water_grids.h deleted file mode 100644 index fa7ade3d2a..0000000000 --- a/include/rnc/overlay/l05/render_level_water_grids.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L05_RENDER_LEVEL_WATER_GRIDS_H -#define LOMBYTE_RNC_OVERLAY_L05_RENDER_LEVEL_WATER_GRIDS_H - -#include "types.h" - -void render_level_water_grids(void) __asm__("FUN_L05_0030d678"); - -#endif /* LOMBYTE_RNC_OVERLAY_L05_RENDER_LEVEL_WATER_GRIDS_H */ diff --git a/include/rnc/overlay/l06/mobys.h b/include/rnc/overlay/l06/mobys.h new file mode 100644 index 0000000000..7dcf07a757 --- /dev/null +++ b/include/rnc/overlay/l06/mobys.h @@ -0,0 +1,32 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_H + +#include "types.h" + +struct Moby; + +void alien_snapper_update() __asm__("FUN_L06_002f7d78"); +void alien_snapper_spawner_update(char *) __asm__("FUN_L06_002fda30"); +void beam_barrier_update(struct Moby *) __asm__("FUN_L06_002f6470"); +void breakable_prop_update(char *) __asm__("FUN_L06_00309e08"); +void breakable_prop_variant_update(char *) __asm__("FUN_L06_00309fa8"); +void breakable_window_update(char *) __asm__("FUN_L06_002ffcb0"); +void breakaway_piece_update(char *) __asm__("FUN_L06_00300df0"); +void countdown_sequence_update(unsigned char *) __asm__("FUN_L06_00301b90"); +void cutscene_camera_target_update(struct Moby *) __asm__("FUN_L06_00309348"); +void draw_pulsing_timer_display(char *) __asm__("FUN_L06_003021d8"); +void drawbridge_update() __asm__("FUN_L06_002f55a0"); +void dual_texture_mesh_update(char *) __asm__("FUN_L06_002fd088"); +void elevator_update() __asm__("FUN_L06_002fc640"); +void fred_update(struct Moby *) __asm__("FUN_L06_00301070"); +void hangar_door_update(char *) __asm__("FUN_L06_002b4770"); +void help_hints_update(struct Moby *) __asm__("FUN_L06_003083b0"); +void red_button_update(struct Moby *) __asm__("FUN_L06_00304098"); +void shuttle_update(struct Moby *) __asm__("FUN_L06_00302578"); +void spark_emitter_update(struct Moby *) __asm__("FUN_L06_00308c68"); +void activate_listed_spark_emitters(int) __asm__("FUN_L06_00309240"); +void split_door_update(char *) __asm__("FUN_L06_002fbfb0"); +void switchable_beam_barrier_update(char *) __asm__("FUN_L06_003049f8"); +void toxic_gas_vent_update(char *) __asm__("FUN_L06_002f3ad8"); + +#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_H */ diff --git a/include/rnc/overlay/l06/mobys/alien_snapper.h b/include/rnc/overlay/l06/mobys/alien_snapper.h deleted file mode 100644 index 93efabfa0c..0000000000 --- a/include/rnc/overlay/l06/mobys/alien_snapper.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_ALIEN_SNAPPER_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_ALIEN_SNAPPER_H - -#include "types.h" - -void alien_snapper_update() __asm__("FUN_L06_002f7d78"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_ALIEN_SNAPPER_H */ diff --git a/include/rnc/overlay/l06/mobys/alien_snapper_spawner.h b/include/rnc/overlay/l06/mobys/alien_snapper_spawner.h deleted file mode 100644 index 91384784b0..0000000000 --- a/include/rnc/overlay/l06/mobys/alien_snapper_spawner.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_ALIEN_SNAPPER_SPAWNER_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_ALIEN_SNAPPER_SPAWNER_H - -#include "types.h" - -void alien_snapper_spawner_update(char *) __asm__("FUN_L06_002fda30"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_ALIEN_SNAPPER_SPAWNER_H */ diff --git a/include/rnc/overlay/l06/mobys/beam_barrier.h b/include/rnc/overlay/l06/mobys/beam_barrier.h deleted file mode 100644 index 187bc89f3d..0000000000 --- a/include/rnc/overlay/l06/mobys/beam_barrier.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_BEAM_BARRIER_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_BEAM_BARRIER_H - -#include "types.h" - -struct Moby; - -void beam_barrier_update(struct Moby *) __asm__("FUN_L06_002f6470"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_BEAM_BARRIER_H */ diff --git a/include/rnc/overlay/l06/mobys/breakable_prop.h b/include/rnc/overlay/l06/mobys/breakable_prop.h deleted file mode 100644 index 3aa239e3f1..0000000000 --- a/include/rnc/overlay/l06/mobys/breakable_prop.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_BREAKABLE_PROP_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_BREAKABLE_PROP_H - -#include "types.h" - -void breakable_prop_update(char *) __asm__("FUN_L06_00309e08"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_BREAKABLE_PROP_H */ diff --git a/include/rnc/overlay/l06/mobys/breakable_prop_variant.h b/include/rnc/overlay/l06/mobys/breakable_prop_variant.h deleted file mode 100644 index 95a38a1a39..0000000000 --- a/include/rnc/overlay/l06/mobys/breakable_prop_variant.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_BREAKABLE_PROP_VARIANT_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_BREAKABLE_PROP_VARIANT_H - -#include "types.h" - -void breakable_prop_variant_update(char *) __asm__("FUN_L06_00309fa8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_BREAKABLE_PROP_VARIANT_H */ diff --git a/include/rnc/overlay/l06/mobys/breakable_window.h b/include/rnc/overlay/l06/mobys/breakable_window.h deleted file mode 100644 index 73b86f3f0f..0000000000 --- a/include/rnc/overlay/l06/mobys/breakable_window.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_BREAKABLE_WINDOW_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_BREAKABLE_WINDOW_H - -#include "types.h" - -void breakable_window_update(char *) __asm__("FUN_L06_002ffcb0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_BREAKABLE_WINDOW_H */ diff --git a/include/rnc/overlay/l06/mobys/breakaway_piece.h b/include/rnc/overlay/l06/mobys/breakaway_piece.h deleted file mode 100644 index 7bbc797598..0000000000 --- a/include/rnc/overlay/l06/mobys/breakaway_piece.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_BREAKAWAY_PIECE_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_BREAKAWAY_PIECE_H - -#include "types.h" - -void breakaway_piece_update(char *) __asm__("FUN_L06_00300df0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_BREAKAWAY_PIECE_H */ diff --git a/include/rnc/overlay/l06/mobys/countdown_sequence.h b/include/rnc/overlay/l06/mobys/countdown_sequence.h deleted file mode 100644 index fa0d9ac857..0000000000 --- a/include/rnc/overlay/l06/mobys/countdown_sequence.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_COUNTDOWN_SEQUENCE_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_COUNTDOWN_SEQUENCE_H - -#include "types.h" - -void countdown_sequence_update(unsigned char *) __asm__("FUN_L06_00301b90"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_COUNTDOWN_SEQUENCE_H */ diff --git a/include/rnc/overlay/l06/mobys/cutscene_camera_target.h b/include/rnc/overlay/l06/mobys/cutscene_camera_target.h deleted file mode 100644 index 47031b692e..0000000000 --- a/include/rnc/overlay/l06/mobys/cutscene_camera_target.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_CUTSCENE_CAMERA_TARGET_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_CUTSCENE_CAMERA_TARGET_H - -#include "types.h" - -struct Moby; - -void cutscene_camera_target_update(struct Moby *) __asm__("FUN_L06_00309348"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_CUTSCENE_CAMERA_TARGET_H */ diff --git a/include/rnc/overlay/l06/mobys/draw_pulsing_timer_display.h b/include/rnc/overlay/l06/mobys/draw_pulsing_timer_display.h deleted file mode 100644 index 9f46ff6d14..0000000000 --- a/include/rnc/overlay/l06/mobys/draw_pulsing_timer_display.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_DRAW_PULSING_TIMER_DISPLAY_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_DRAW_PULSING_TIMER_DISPLAY_H - -#include "types.h" - -void draw_pulsing_timer_display(char *) __asm__("FUN_L06_003021d8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_DRAW_PULSING_TIMER_DISPLAY_H */ diff --git a/include/rnc/overlay/l06/mobys/drawbridge.h b/include/rnc/overlay/l06/mobys/drawbridge.h deleted file mode 100644 index 6fc4f38d17..0000000000 --- a/include/rnc/overlay/l06/mobys/drawbridge.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_DRAWBRIDGE_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_DRAWBRIDGE_H - -#include "types.h" - -void drawbridge_update() __asm__("FUN_L06_002f55a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_DRAWBRIDGE_H */ diff --git a/include/rnc/overlay/l06/mobys/dual_texture_meshes.h b/include/rnc/overlay/l06/mobys/dual_texture_meshes.h deleted file mode 100644 index bf333c4643..0000000000 --- a/include/rnc/overlay/l06/mobys/dual_texture_meshes.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_DUAL_TEXTURE_MESHES_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_DUAL_TEXTURE_MESHES_H - -#include "types.h" - -void dual_texture_mesh_update(char *) __asm__("FUN_L06_002fd088"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_DUAL_TEXTURE_MESHES_H */ diff --git a/include/rnc/overlay/l06/mobys/elevator.h b/include/rnc/overlay/l06/mobys/elevator.h deleted file mode 100644 index 2fb0cf3db9..0000000000 --- a/include/rnc/overlay/l06/mobys/elevator.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_ELEVATOR_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_ELEVATOR_H - -#include "types.h" - -void elevator_update() __asm__("FUN_L06_002fc640"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_ELEVATOR_H */ diff --git a/include/rnc/overlay/l06/mobys/fred.h b/include/rnc/overlay/l06/mobys/fred.h deleted file mode 100644 index 7ff7263cea..0000000000 --- a/include/rnc/overlay/l06/mobys/fred.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_FRED_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_FRED_H - -#include "types.h" - -struct Moby; - -void fred_update(struct Moby *) __asm__("FUN_L06_00301070"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_FRED_H */ diff --git a/include/rnc/overlay/l06/mobys/hangar_door.h b/include/rnc/overlay/l06/mobys/hangar_door.h deleted file mode 100644 index 2c66a3da7b..0000000000 --- a/include/rnc/overlay/l06/mobys/hangar_door.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_HANGAR_DOOR_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_HANGAR_DOOR_H - -#include "types.h" - -void hangar_door_update(char *) __asm__("FUN_L06_002b4770"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_HANGAR_DOOR_H */ diff --git a/include/rnc/overlay/l06/mobys/help_hints.h b/include/rnc/overlay/l06/mobys/help_hints.h deleted file mode 100644 index 005edac4e2..0000000000 --- a/include/rnc/overlay/l06/mobys/help_hints.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_HELP_HINTS_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_HELP_HINTS_H - -#include "types.h" - -struct Moby; - -void help_hints_update(struct Moby *) __asm__("FUN_L06_003083b0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_HELP_HINTS_H */ diff --git a/include/rnc/overlay/l06/mobys/red_button.h b/include/rnc/overlay/l06/mobys/red_button.h deleted file mode 100644 index fe5bb1166a..0000000000 --- a/include/rnc/overlay/l06/mobys/red_button.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_RED_BUTTON_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_RED_BUTTON_H - -#include "types.h" - -struct Moby; - -void red_button_update(struct Moby *) __asm__("FUN_L06_00304098"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_RED_BUTTON_H */ diff --git a/include/rnc/overlay/l06/mobys/shuttle.h b/include/rnc/overlay/l06/mobys/shuttle.h deleted file mode 100644 index 6a23e7949c..0000000000 --- a/include/rnc/overlay/l06/mobys/shuttle.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_SHUTTLE_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_SHUTTLE_H - -#include "types.h" - -struct Moby; - -void shuttle_update(struct Moby *) __asm__("FUN_L06_00302578"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_SHUTTLE_H */ diff --git a/include/rnc/overlay/l06/mobys/spark_emitter.h b/include/rnc/overlay/l06/mobys/spark_emitter.h deleted file mode 100644 index b4139c90f6..0000000000 --- a/include/rnc/overlay/l06/mobys/spark_emitter.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_SPARK_EMITTER_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_SPARK_EMITTER_H - -#include "types.h" - -struct Moby; - -void spark_emitter_update(struct Moby *) __asm__("FUN_L06_00308c68"); -void activate_listed_spark_emitters(int) __asm__("FUN_L06_00309240"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_SPARK_EMITTER_H */ diff --git a/include/rnc/overlay/l06/mobys/split_door.h b/include/rnc/overlay/l06/mobys/split_door.h deleted file mode 100644 index 3d3140f14f..0000000000 --- a/include/rnc/overlay/l06/mobys/split_door.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_SPLIT_DOOR_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_SPLIT_DOOR_H - -#include "types.h" - -void split_door_update(char *) __asm__("FUN_L06_002fbfb0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_SPLIT_DOOR_H */ diff --git a/include/rnc/overlay/l06/mobys/switchable_beam_barrier.h b/include/rnc/overlay/l06/mobys/switchable_beam_barrier.h deleted file mode 100644 index 32a497c0e5..0000000000 --- a/include/rnc/overlay/l06/mobys/switchable_beam_barrier.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_SWITCHABLE_BEAM_BARRIER_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_SWITCHABLE_BEAM_BARRIER_H - -#include "types.h" - -void switchable_beam_barrier_update(char *) __asm__("FUN_L06_003049f8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_SWITCHABLE_BEAM_BARRIER_H */ diff --git a/include/rnc/overlay/l06/mobys/toxic_gas_vent.h b/include/rnc/overlay/l06/mobys/toxic_gas_vent.h deleted file mode 100644 index 5ddc8a4983..0000000000 --- a/include/rnc/overlay/l06/mobys/toxic_gas_vent.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L06_MOBYS_TOXIC_GAS_VENT_H -#define LOMBYTE_RNC_OVERLAY_L06_MOBYS_TOXIC_GAS_VENT_H - -#include "types.h" - -void toxic_gas_vent_update(char *) __asm__("FUN_L06_002f3ad8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L06_MOBYS_TOXIC_GAS_VENT_H */ diff --git a/include/rnc/overlay/l07.h b/include/rnc/overlay/l07.h new file mode 100644 index 0000000000..6c9597f26d --- /dev/null +++ b/include/rnc/overlay/l07.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L07_H +#define LOMBYTE_RNC_OVERLAY_L07_H + +#include "types.h" + +void clear_bit_grid_rectangle(int, int, int, int) __asm__("FUN_L07_00270248"); + +#endif /* LOMBYTE_RNC_OVERLAY_L07_H */ diff --git a/include/rnc/overlay/l07/clear_bit_grid_rectangle.h b/include/rnc/overlay/l07/clear_bit_grid_rectangle.h deleted file mode 100644 index 6774d0a2ad..0000000000 --- a/include/rnc/overlay/l07/clear_bit_grid_rectangle.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L07_CLEAR_BIT_GRID_RECTANGLE_H -#define LOMBYTE_RNC_OVERLAY_L07_CLEAR_BIT_GRID_RECTANGLE_H - -#include "types.h" - -void clear_bit_grid_rectangle(int, int, int, int) __asm__("FUN_L07_00270248"); - -#endif /* LOMBYTE_RNC_OVERLAY_L07_CLEAR_BIT_GRID_RECTANGLE_H */ diff --git a/include/rnc/overlay/l07/mobys.h b/include/rnc/overlay/l07/mobys.h new file mode 100644 index 0000000000..9eb9be654d --- /dev/null +++ b/include/rnc/overlay/l07/mobys.h @@ -0,0 +1,11 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L07_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_L07_MOBYS_H + +#include "types.h" + +int get_target_sight(char *, char *, float) __asm__("FUN_L07_002886d8"); +char *spawn_growing_ballistic_moby(char *, char *, int) __asm__("FUN_L07_0030e370"); +unsigned char * +spawn_machinegun_turret_projectile(void *, float *, int, int) __asm__("FUN_L07_0030b538"); + +#endif /* LOMBYTE_RNC_OVERLAY_L07_MOBYS_H */ diff --git a/include/rnc/overlay/l07/mobys/get_target_sight.h b/include/rnc/overlay/l07/mobys/get_target_sight.h deleted file mode 100644 index f1681b6183..0000000000 --- a/include/rnc/overlay/l07/mobys/get_target_sight.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L07_MOBYS_GET_TARGET_SIGHT_H -#define LOMBYTE_RNC_OVERLAY_L07_MOBYS_GET_TARGET_SIGHT_H - -#include "types.h" - -int get_target_sight(char *, char *, float) __asm__("FUN_L07_002886d8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L07_MOBYS_GET_TARGET_SIGHT_H */ diff --git a/include/rnc/overlay/l07/mobys/growing_ballistic_moby.h b/include/rnc/overlay/l07/mobys/growing_ballistic_moby.h deleted file mode 100644 index 13f76497ea..0000000000 --- a/include/rnc/overlay/l07/mobys/growing_ballistic_moby.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L07_MOBYS_GROWING_BALLISTIC_MOBY_H -#define LOMBYTE_RNC_OVERLAY_L07_MOBYS_GROWING_BALLISTIC_MOBY_H - -#include "types.h" - -char *spawn_growing_ballistic_moby(char *, char *, int) __asm__("FUN_L07_0030e370"); - -#endif /* LOMBYTE_RNC_OVERLAY_L07_MOBYS_GROWING_BALLISTIC_MOBY_H */ diff --git a/include/rnc/overlay/l07/mobys/machinegun_turret_projectile.h b/include/rnc/overlay/l07/mobys/machinegun_turret_projectile.h deleted file mode 100644 index fab20f407f..0000000000 --- a/include/rnc/overlay/l07/mobys/machinegun_turret_projectile.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L07_MOBYS_MACHINEGUN_TURRET_PROJECTILE_H -#define LOMBYTE_RNC_OVERLAY_L07_MOBYS_MACHINEGUN_TURRET_PROJECTILE_H - -#include "types.h" - -unsigned char * -spawn_machinegun_turret_projectile(void *, float *, int, int) __asm__("FUN_L07_0030b538"); - -#endif /* LOMBYTE_RNC_OVERLAY_L07_MOBYS_MACHINEGUN_TURRET_PROJECTILE_H */ diff --git a/include/rnc/overlay/l08/mobys.h b/include/rnc/overlay/l08/mobys.h new file mode 100644 index 0000000000..f3712d1761 --- /dev/null +++ b/include/rnc/overlay/l08/mobys.h @@ -0,0 +1,38 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_H + +#include "rnc/sdk/eetypes.h" +#include "types.h" + +struct Moby; + +void batalia_cannon_update() __asm__("FUN_L08_002e0328"); +void batalia_deserter_update() __asm__("FUN_L08_00305270"); +void batalia_textured_effect_update(struct Moby *) __asm__("FUN_L08_003097b0"); +void blarg_bombthrower_update(struct Moby *) __asm__("FUN_L08_002dabf0"); +void bolt_pickup_update() __asm__("FUN_L08_002b82a0"); +void bolt_thief_update(struct Moby *) __asm__("FUN_L08_002e2df0"); +void moby_248_update(char *) __asm__("FUN_L08_002d23f0"); +void bomber_tank_update() __asm__("FUN_L08_002d42d8"); +void commando_update() __asm__("FUN_L08_00302ce8"); +void cutscene_camera_target_update(struct Moby *) __asm__("FUN_L08_003084d8"); +void effect_emitter_update(struct Moby *) __asm__("FUN_L08_00308c90"); +void falling_debris_update() __asm__("FUN_L08_002e16c0"); +void flickering_mesh_effect_update(struct Moby *) __asm__("FUN_L08_002f70a0"); +void gunship_update(struct Moby *) __asm__("FUN_L08_002e24e8"); +void heavy_gunship_update(struct Moby *) __asm__("FUN_L08_002e9b70"); +void help_hints_update(struct Moby *) __asm__("FUN_L08_00307540"); +void landmine_update(struct Moby *) __asm__("FUN_L08_002f44c0"); +void layered_mesh_effect_update(struct Moby *) __asm__("FUN_L08_002f1548"); +void lift_update(char *) __asm__("FUN_L08_002ea398"); +void path_following_moby_update(char *) __asm__("FUN_L08_002de848"); +void shattering_prop_update(struct Moby *) __asm__("FUN_L08_0030bc00"); +void shrub_update(struct Moby *) __asm__("FUN_L08_002e8cd0"); +void shuttle_update(struct Moby *) __asm__("FUN_L08_002dbdb0"); +unsigned char *spawn_moby_offset_effect(char *) __asm__("FUN_L08_00279f00"); +void spawn_effect_with_initial_motion(u128 *, u128 *, int, float) __asm__("FUN_L08_0027fe00"); +void swing_gate_update(struct Moby *) __asm__("FUN_L08_002ea4c0"); +void the_plumber_batalia_update() __asm__("FUN_L08_003065d8"); +void water_surface_update(struct Moby *) __asm__("FUN_L08_002da0f0"); + +#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_H */ diff --git a/include/rnc/overlay/l08/mobys/batalia_cannon.h b/include/rnc/overlay/l08/mobys/batalia_cannon.h deleted file mode 100644 index 772e5bc5e6..0000000000 --- a/include/rnc/overlay/l08/mobys/batalia_cannon.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_BATALIA_CANNON_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_BATALIA_CANNON_H - -#include "types.h" - -void batalia_cannon_update() __asm__("FUN_L08_002e0328"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_BATALIA_CANNON_H */ diff --git a/include/rnc/overlay/l08/mobys/batalia_deserter.h b/include/rnc/overlay/l08/mobys/batalia_deserter.h deleted file mode 100644 index 35686db4ce..0000000000 --- a/include/rnc/overlay/l08/mobys/batalia_deserter.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_BATALIA_DESERTER_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_BATALIA_DESERTER_H - -#include "types.h" - -void batalia_deserter_update() __asm__("FUN_L08_00305270"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_BATALIA_DESERTER_H */ diff --git a/include/rnc/overlay/l08/mobys/batalia_textured_effect.h b/include/rnc/overlay/l08/mobys/batalia_textured_effect.h deleted file mode 100644 index 2111184a73..0000000000 --- a/include/rnc/overlay/l08/mobys/batalia_textured_effect.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_BATALIA_TEXTURED_EFFECT_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_BATALIA_TEXTURED_EFFECT_H - -#include "types.h" - -struct Moby; - -void batalia_textured_effect_update(struct Moby *) __asm__("FUN_L08_003097b0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_BATALIA_TEXTURED_EFFECT_H */ diff --git a/include/rnc/overlay/l08/mobys/blarg_bombthrower.h b/include/rnc/overlay/l08/mobys/blarg_bombthrower.h deleted file mode 100644 index 99d6809d5d..0000000000 --- a/include/rnc/overlay/l08/mobys/blarg_bombthrower.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_BLARG_BOMBTHROWER_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_BLARG_BOMBTHROWER_H - -#include "types.h" - -struct Moby; - -void blarg_bombthrower_update(struct Moby *) __asm__("FUN_L08_002dabf0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_BLARG_BOMBTHROWER_H */ diff --git a/include/rnc/overlay/l08/mobys/bolt_pickup.h b/include/rnc/overlay/l08/mobys/bolt_pickup.h deleted file mode 100644 index 1640193d02..0000000000 --- a/include/rnc/overlay/l08/mobys/bolt_pickup.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_BOLT_PICKUP_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_BOLT_PICKUP_H - -#include "types.h" - -void bolt_pickup_update() __asm__("FUN_L08_002b82a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_BOLT_PICKUP_H */ diff --git a/include/rnc/overlay/l08/mobys/bolt_thief.h b/include/rnc/overlay/l08/mobys/bolt_thief.h deleted file mode 100644 index 28ff957e91..0000000000 --- a/include/rnc/overlay/l08/mobys/bolt_thief.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_BOLT_THIEF_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_BOLT_THIEF_H - -#include "types.h" - -struct Moby; - -void bolt_thief_update(struct Moby *) __asm__("FUN_L08_002e2df0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_BOLT_THIEF_H */ diff --git a/include/rnc/overlay/l08/mobys/bomb.h b/include/rnc/overlay/l08/mobys/bomb.h deleted file mode 100644 index 11c153a50f..0000000000 --- a/include/rnc/overlay/l08/mobys/bomb.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_BOMB_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_BOMB_H - -#include "types.h" - -void moby_248_update(char *) __asm__("FUN_L08_002d23f0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_BOMB_H */ diff --git a/include/rnc/overlay/l08/mobys/bomber_tank.h b/include/rnc/overlay/l08/mobys/bomber_tank.h deleted file mode 100644 index c12ba9ad69..0000000000 --- a/include/rnc/overlay/l08/mobys/bomber_tank.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_BOMBER_TANK_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_BOMBER_TANK_H - -#include "types.h" - -void bomber_tank_update() __asm__("FUN_L08_002d42d8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_BOMBER_TANK_H */ diff --git a/include/rnc/overlay/l08/mobys/commando.h b/include/rnc/overlay/l08/mobys/commando.h deleted file mode 100644 index 9790e17d0c..0000000000 --- a/include/rnc/overlay/l08/mobys/commando.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_COMMANDO_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_COMMANDO_H - -#include "types.h" - -void commando_update() __asm__("FUN_L08_00302ce8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_COMMANDO_H */ diff --git a/include/rnc/overlay/l08/mobys/cutscene_camera_target.h b/include/rnc/overlay/l08/mobys/cutscene_camera_target.h deleted file mode 100644 index c4681f7821..0000000000 --- a/include/rnc/overlay/l08/mobys/cutscene_camera_target.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_CUTSCENE_CAMERA_TARGET_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_CUTSCENE_CAMERA_TARGET_H - -#include "types.h" - -struct Moby; - -void cutscene_camera_target_update(struct Moby *) __asm__("FUN_L08_003084d8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_CUTSCENE_CAMERA_TARGET_H */ diff --git a/include/rnc/overlay/l08/mobys/effect_emitter.h b/include/rnc/overlay/l08/mobys/effect_emitter.h deleted file mode 100644 index 197849a122..0000000000 --- a/include/rnc/overlay/l08/mobys/effect_emitter.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_EFFECT_EMITTER_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_EFFECT_EMITTER_H - -#include "types.h" - -struct Moby; - -void effect_emitter_update(struct Moby *) __asm__("FUN_L08_00308c90"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_EFFECT_EMITTER_H */ diff --git a/include/rnc/overlay/l08/mobys/falling_debris.h b/include/rnc/overlay/l08/mobys/falling_debris.h deleted file mode 100644 index e64e120eb0..0000000000 --- a/include/rnc/overlay/l08/mobys/falling_debris.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_FALLING_DEBRIS_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_FALLING_DEBRIS_H - -#include "types.h" - -void falling_debris_update() __asm__("FUN_L08_002e16c0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_FALLING_DEBRIS_H */ diff --git a/include/rnc/overlay/l08/mobys/flickering_mesh_effect.h b/include/rnc/overlay/l08/mobys/flickering_mesh_effect.h deleted file mode 100644 index 21f3a4bf3d..0000000000 --- a/include/rnc/overlay/l08/mobys/flickering_mesh_effect.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_FLICKERING_MESH_EFFECT_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_FLICKERING_MESH_EFFECT_H - -#include "types.h" - -struct Moby; - -void flickering_mesh_effect_update(struct Moby *) __asm__("FUN_L08_002f70a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_FLICKERING_MESH_EFFECT_H */ diff --git a/include/rnc/overlay/l08/mobys/gunship.h b/include/rnc/overlay/l08/mobys/gunship.h deleted file mode 100644 index 7a2160a970..0000000000 --- a/include/rnc/overlay/l08/mobys/gunship.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_GUNSHIP_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_GUNSHIP_H - -#include "types.h" - -struct Moby; - -void gunship_update(struct Moby *) __asm__("FUN_L08_002e24e8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_GUNSHIP_H */ diff --git a/include/rnc/overlay/l08/mobys/heavy_gunship.h b/include/rnc/overlay/l08/mobys/heavy_gunship.h deleted file mode 100644 index 1ca152d3c1..0000000000 --- a/include/rnc/overlay/l08/mobys/heavy_gunship.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_HEAVY_GUNSHIP_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_HEAVY_GUNSHIP_H - -#include "types.h" - -struct Moby; - -void heavy_gunship_update(struct Moby *) __asm__("FUN_L08_002e9b70"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_HEAVY_GUNSHIP_H */ diff --git a/include/rnc/overlay/l08/mobys/help_hints.h b/include/rnc/overlay/l08/mobys/help_hints.h deleted file mode 100644 index a771f59d29..0000000000 --- a/include/rnc/overlay/l08/mobys/help_hints.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_HELP_HINTS_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_HELP_HINTS_H - -#include "types.h" - -struct Moby; - -void help_hints_update(struct Moby *) __asm__("FUN_L08_00307540"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_HELP_HINTS_H */ diff --git a/include/rnc/overlay/l08/mobys/landmine.h b/include/rnc/overlay/l08/mobys/landmine.h deleted file mode 100644 index 546bc9ae4f..0000000000 --- a/include/rnc/overlay/l08/mobys/landmine.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_LANDMINE_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_LANDMINE_H - -#include "types.h" - -struct Moby; - -void landmine_update(struct Moby *) __asm__("FUN_L08_002f44c0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_LANDMINE_H */ diff --git a/include/rnc/overlay/l08/mobys/layered_mesh_effect.h b/include/rnc/overlay/l08/mobys/layered_mesh_effect.h deleted file mode 100644 index 0d485e9919..0000000000 --- a/include/rnc/overlay/l08/mobys/layered_mesh_effect.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_LAYERED_MESH_EFFECT_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_LAYERED_MESH_EFFECT_H - -#include "types.h" - -struct Moby; - -void layered_mesh_effect_update(struct Moby *) __asm__("FUN_L08_002f1548"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_LAYERED_MESH_EFFECT_H */ diff --git a/include/rnc/overlay/l08/mobys/lift.h b/include/rnc/overlay/l08/mobys/lift.h deleted file mode 100644 index 17af4ebaa3..0000000000 --- a/include/rnc/overlay/l08/mobys/lift.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_LIFT_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_LIFT_H - -#include "types.h" - -void lift_update(char *) __asm__("FUN_L08_002ea398"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_LIFT_H */ diff --git a/include/rnc/overlay/l08/mobys/path_following_moby.h b/include/rnc/overlay/l08/mobys/path_following_moby.h deleted file mode 100644 index 98e961adaa..0000000000 --- a/include/rnc/overlay/l08/mobys/path_following_moby.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_PATH_FOLLOWING_MOBY_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_PATH_FOLLOWING_MOBY_H - -#include "types.h" - -void path_following_moby_update(char *) __asm__("FUN_L08_002de848"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_PATH_FOLLOWING_MOBY_H */ diff --git a/include/rnc/overlay/l08/mobys/shattering_prop.h b/include/rnc/overlay/l08/mobys/shattering_prop.h deleted file mode 100644 index 80124fc954..0000000000 --- a/include/rnc/overlay/l08/mobys/shattering_prop.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_SHATTERING_PROP_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_SHATTERING_PROP_H - -#include "types.h" - -struct Moby; - -void shattering_prop_update(struct Moby *) __asm__("FUN_L08_0030bc00"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_SHATTERING_PROP_H */ diff --git a/include/rnc/overlay/l08/mobys/shrub.h b/include/rnc/overlay/l08/mobys/shrub.h deleted file mode 100644 index 9a3d04d325..0000000000 --- a/include/rnc/overlay/l08/mobys/shrub.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_SHRUB_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_SHRUB_H - -#include "types.h" - -struct Moby; - -void shrub_update(struct Moby *) __asm__("FUN_L08_002e8cd0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_SHRUB_H */ diff --git a/include/rnc/overlay/l08/mobys/shuttle.h b/include/rnc/overlay/l08/mobys/shuttle.h deleted file mode 100644 index d12dddae25..0000000000 --- a/include/rnc/overlay/l08/mobys/shuttle.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_SHUTTLE_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_SHUTTLE_H - -#include "types.h" - -struct Moby; - -void shuttle_update(struct Moby *) __asm__("FUN_L08_002dbdb0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_SHUTTLE_H */ diff --git a/include/rnc/overlay/l08/mobys/spawn_moby_offset_effect.h b/include/rnc/overlay/l08/mobys/spawn_moby_offset_effect.h deleted file mode 100644 index c99a8b7602..0000000000 --- a/include/rnc/overlay/l08/mobys/spawn_moby_offset_effect.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_SPAWN_MOBY_OFFSET_EFFECT_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_SPAWN_MOBY_OFFSET_EFFECT_H - -#include "types.h" -#include "rnc/sdk/eetypes.h" - -unsigned char *spawn_moby_offset_effect(char *) __asm__("FUN_L08_00279f00"); -void spawn_effect_with_initial_motion(u128 *, u128 *, int, float) __asm__("FUN_L08_0027fe00"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_SPAWN_MOBY_OFFSET_EFFECT_H */ diff --git a/include/rnc/overlay/l08/mobys/swing_gate.h b/include/rnc/overlay/l08/mobys/swing_gate.h deleted file mode 100644 index a5fe761014..0000000000 --- a/include/rnc/overlay/l08/mobys/swing_gate.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_SWING_GATE_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_SWING_GATE_H - -#include "types.h" - -struct Moby; - -void swing_gate_update(struct Moby *) __asm__("FUN_L08_002ea4c0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_SWING_GATE_H */ diff --git a/include/rnc/overlay/l08/mobys/the_plumber_batalia.h b/include/rnc/overlay/l08/mobys/the_plumber_batalia.h deleted file mode 100644 index 0e27b1ba55..0000000000 --- a/include/rnc/overlay/l08/mobys/the_plumber_batalia.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_THE_PLUMBER_BATALIA_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_THE_PLUMBER_BATALIA_H - -#include "types.h" - -void the_plumber_batalia_update() __asm__("FUN_L08_003065d8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_THE_PLUMBER_BATALIA_H */ diff --git a/include/rnc/overlay/l08/mobys/water_surface.h b/include/rnc/overlay/l08/mobys/water_surface.h deleted file mode 100644 index c62abd9498..0000000000 --- a/include/rnc/overlay/l08/mobys/water_surface.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L08_MOBYS_WATER_SURFACE_H -#define LOMBYTE_RNC_OVERLAY_L08_MOBYS_WATER_SURFACE_H - -#include "types.h" - -struct Moby; - -void water_surface_update(struct Moby *) __asm__("FUN_L08_002da0f0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L08_MOBYS_WATER_SURFACE_H */ diff --git a/include/rnc/overlay/l09/mobys.h b/include/rnc/overlay/l09/mobys.h new file mode 100644 index 0000000000..aed9d9a910 --- /dev/null +++ b/include/rnc/overlay/l09/mobys.h @@ -0,0 +1,30 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_H + +#include "rnc/math/vector.h" +#include "types.h" + +struct Moby; + +void airship_chain_link_update() __asm__("FUN_L09_00304360"); +void airship_part_update(struct Moby *) __asm__("FUN_L09_002c26c8"); +void asteroid_update(struct Moby *) __asm__("FUN_L09_002eb970"); +void barrier_update() __asm__("FUN_L09_003082d8"); +void damage_causer_update(struct Moby *) __asm__("FUN_L09_00305a28"); +void destructible_prop_update(struct Moby *) __asm__("FUN_L09_002ee110"); +void display_update(struct Moby *) __asm__("FUN_L09_002edc30"); +struct Moby * +spawn_tumbling_debris(struct Moby *, Vec4 *, Vec4 *, s32, f32) __asm__("FUN_L09_002ef868"); +void drifting_moby_update(struct Moby *) __asm__("FUN_L09_002f0040"); +void elevator_update(unsigned char *) __asm__("FUN_L09_003033a0"); +void floating_ship_piece_update(char *) __asm__("FUN_L09_003091b0"); +void help_hints_update(struct Moby *) __asm__("FUN_L09_00300888"); +void lamp_update(struct Moby *) __asm__("FUN_L09_0030a678"); +void platform_update() __asm__("FUN_L09_002f86a0"); +void refueling_station_update(struct Moby *) __asm__("FUN_L09_00303d10"); +void shrinking_tumbling_debris_update(struct Moby *) __asm__("FUN_L09_002ef9b0"); +void shuttle_update(struct Moby *) __asm__("FUN_L09_00309c08"); +void tumbling_debris_update(struct Moby *) __asm__("FUN_L09_002ef430"); +void turret_update(struct Moby *) __asm__("FUN_L09_00304c80"); + +#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_H */ diff --git a/include/rnc/overlay/l09/mobys/airship_chain_link.h b/include/rnc/overlay/l09/mobys/airship_chain_link.h deleted file mode 100644 index de4d0375ef..0000000000 --- a/include/rnc/overlay/l09/mobys/airship_chain_link.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_AIRSHIP_CHAIN_LINK_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_AIRSHIP_CHAIN_LINK_H - -#include "types.h" - -void airship_chain_link_update() __asm__("FUN_L09_00304360"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_AIRSHIP_CHAIN_LINK_H */ diff --git a/include/rnc/overlay/l09/mobys/airship_part.h b/include/rnc/overlay/l09/mobys/airship_part.h deleted file mode 100644 index efa2804965..0000000000 --- a/include/rnc/overlay/l09/mobys/airship_part.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_AIRSHIP_PART_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_AIRSHIP_PART_H - -#include "types.h" - -struct Moby; - -void airship_part_update(struct Moby *) __asm__("FUN_L09_002c26c8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_AIRSHIP_PART_H */ diff --git a/include/rnc/overlay/l09/mobys/asteroid.h b/include/rnc/overlay/l09/mobys/asteroid.h deleted file mode 100644 index d328d972d5..0000000000 --- a/include/rnc/overlay/l09/mobys/asteroid.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_ASTEROID_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_ASTEROID_H - -#include "types.h" - -struct Moby; - -void asteroid_update(struct Moby *) __asm__("FUN_L09_002eb970"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_ASTEROID_H */ diff --git a/include/rnc/overlay/l09/mobys/barrier.h b/include/rnc/overlay/l09/mobys/barrier.h deleted file mode 100644 index b758018987..0000000000 --- a/include/rnc/overlay/l09/mobys/barrier.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_BARRIER_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_BARRIER_H - -#include "types.h" - -void barrier_update() __asm__("FUN_L09_003082d8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_BARRIER_H */ diff --git a/include/rnc/overlay/l09/mobys/damage_causer.h b/include/rnc/overlay/l09/mobys/damage_causer.h deleted file mode 100644 index 002ec0b79e..0000000000 --- a/include/rnc/overlay/l09/mobys/damage_causer.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_DAMAGE_CAUSER_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_DAMAGE_CAUSER_H - -#include "types.h" - -struct Moby; - -void damage_causer_update(struct Moby *) __asm__("FUN_L09_00305a28"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_DAMAGE_CAUSER_H */ diff --git a/include/rnc/overlay/l09/mobys/destructible_prop.h b/include/rnc/overlay/l09/mobys/destructible_prop.h deleted file mode 100644 index 4ed3cdf735..0000000000 --- a/include/rnc/overlay/l09/mobys/destructible_prop.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_DESTRUCTIBLE_PROP_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_DESTRUCTIBLE_PROP_H - -#include "types.h" - -struct Moby; - -void destructible_prop_update(struct Moby *) __asm__("FUN_L09_002ee110"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_DESTRUCTIBLE_PROP_H */ diff --git a/include/rnc/overlay/l09/mobys/display.h b/include/rnc/overlay/l09/mobys/display.h deleted file mode 100644 index 807cc733d7..0000000000 --- a/include/rnc/overlay/l09/mobys/display.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_DISPLAY_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_DISPLAY_H - -#include "rnc/math/vector.h" -#include "types.h" - -struct Moby; - -void display_update(struct Moby *) __asm__("FUN_L09_002edc30"); -struct Moby * -spawn_tumbling_debris(struct Moby *, Vec4 *, Vec4 *, s32, f32) __asm__("FUN_L09_002ef868"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_DISPLAY_H */ diff --git a/include/rnc/overlay/l09/mobys/drifting_moby.h b/include/rnc/overlay/l09/mobys/drifting_moby.h deleted file mode 100644 index 8b68abf986..0000000000 --- a/include/rnc/overlay/l09/mobys/drifting_moby.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_DRIFTING_MOBY_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_DRIFTING_MOBY_H - -#include "types.h" - -struct Moby; - -void drifting_moby_update(struct Moby *) __asm__("FUN_L09_002f0040"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_DRIFTING_MOBY_H */ diff --git a/include/rnc/overlay/l09/mobys/elevator.h b/include/rnc/overlay/l09/mobys/elevator.h deleted file mode 100644 index c4dff0395c..0000000000 --- a/include/rnc/overlay/l09/mobys/elevator.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_ELEVATOR_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_ELEVATOR_H - -#include "types.h" - -void elevator_update(unsigned char *) __asm__("FUN_L09_003033a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_ELEVATOR_H */ diff --git a/include/rnc/overlay/l09/mobys/floating_ship_piece.h b/include/rnc/overlay/l09/mobys/floating_ship_piece.h deleted file mode 100644 index 9f0e9bd32f..0000000000 --- a/include/rnc/overlay/l09/mobys/floating_ship_piece.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_FLOATING_SHIP_PIECE_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_FLOATING_SHIP_PIECE_H - -#include "types.h" - -void floating_ship_piece_update(char *) __asm__("FUN_L09_003091b0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_FLOATING_SHIP_PIECE_H */ diff --git a/include/rnc/overlay/l09/mobys/help_hints.h b/include/rnc/overlay/l09/mobys/help_hints.h deleted file mode 100644 index 63c4360524..0000000000 --- a/include/rnc/overlay/l09/mobys/help_hints.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_HELP_HINTS_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_HELP_HINTS_H - -#include "types.h" - -struct Moby; - -void help_hints_update(struct Moby *) __asm__("FUN_L09_00300888"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_HELP_HINTS_H */ diff --git a/include/rnc/overlay/l09/mobys/lamp.h b/include/rnc/overlay/l09/mobys/lamp.h deleted file mode 100644 index 09a602c90b..0000000000 --- a/include/rnc/overlay/l09/mobys/lamp.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_LAMP_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_LAMP_H - -#include "types.h" - -struct Moby; - -void lamp_update(struct Moby *) __asm__("FUN_L09_0030a678"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_LAMP_H */ diff --git a/include/rnc/overlay/l09/mobys/platform.h b/include/rnc/overlay/l09/mobys/platform.h deleted file mode 100644 index 88230eefe8..0000000000 --- a/include/rnc/overlay/l09/mobys/platform.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_PLATFORM_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_PLATFORM_H - -#include "types.h" - -void platform_update() __asm__("FUN_L09_002f86a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_PLATFORM_H */ diff --git a/include/rnc/overlay/l09/mobys/refueling_station.h b/include/rnc/overlay/l09/mobys/refueling_station.h deleted file mode 100644 index 4a5940dd0f..0000000000 --- a/include/rnc/overlay/l09/mobys/refueling_station.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_REFUELING_STATION_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_REFUELING_STATION_H - -#include "types.h" - -struct Moby; - -void refueling_station_update(struct Moby *) __asm__("FUN_L09_00303d10"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_REFUELING_STATION_H */ diff --git a/include/rnc/overlay/l09/mobys/shrinking_tumbling_debris.h b/include/rnc/overlay/l09/mobys/shrinking_tumbling_debris.h deleted file mode 100644 index 4a2bd45832..0000000000 --- a/include/rnc/overlay/l09/mobys/shrinking_tumbling_debris.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_SHRINKING_TUMBLING_DEBRIS_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_SHRINKING_TUMBLING_DEBRIS_H - -#include "types.h" - -struct Moby; - -void shrinking_tumbling_debris_update(struct Moby *) __asm__("FUN_L09_002ef9b0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_SHRINKING_TUMBLING_DEBRIS_H */ diff --git a/include/rnc/overlay/l09/mobys/shuttle.h b/include/rnc/overlay/l09/mobys/shuttle.h deleted file mode 100644 index 115c79be24..0000000000 --- a/include/rnc/overlay/l09/mobys/shuttle.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_SHUTTLE_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_SHUTTLE_H - -#include "types.h" - -struct Moby; - -void shuttle_update(struct Moby *) __asm__("FUN_L09_00309c08"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_SHUTTLE_H */ diff --git a/include/rnc/overlay/l09/mobys/tumbling_debris.h b/include/rnc/overlay/l09/mobys/tumbling_debris.h deleted file mode 100644 index abd30f81d7..0000000000 --- a/include/rnc/overlay/l09/mobys/tumbling_debris.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_TUMBLING_DEBRIS_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_TUMBLING_DEBRIS_H - -#include "types.h" - -struct Moby; - -void tumbling_debris_update(struct Moby *) __asm__("FUN_L09_002ef430"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_TUMBLING_DEBRIS_H */ diff --git a/include/rnc/overlay/l09/mobys/turret.h b/include/rnc/overlay/l09/mobys/turret.h deleted file mode 100644 index 1fffa4b5f0..0000000000 --- a/include/rnc/overlay/l09/mobys/turret.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L09_MOBYS_TURRET_H -#define LOMBYTE_RNC_OVERLAY_L09_MOBYS_TURRET_H - -#include "types.h" - -struct Moby; - -void turret_update(struct Moby *) __asm__("FUN_L09_00304c80"); - -#endif /* LOMBYTE_RNC_OVERLAY_L09_MOBYS_TURRET_H */ diff --git a/include/rnc/overlay/l11/hero.h b/include/rnc/overlay/l11/hero.h new file mode 100644 index 0000000000..bd0a935c44 --- /dev/null +++ b/include/rnc/overlay/l11/hero.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L11_HERO_H +#define LOMBYTE_RNC_OVERLAY_L11_HERO_H + +#include "types.h" + +int hero_set_state(int, int) __asm__("FUN_L11_0024db50"); + +#endif /* LOMBYTE_RNC_OVERLAY_L11_HERO_H */ diff --git a/include/rnc/overlay/l11/hero/hero_set_state.h b/include/rnc/overlay/l11/hero/hero_set_state.h deleted file mode 100644 index 4ef08ab911..0000000000 --- a/include/rnc/overlay/l11/hero/hero_set_state.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L11_HERO_HERO_SET_STATE_H -#define LOMBYTE_RNC_OVERLAY_L11_HERO_HERO_SET_STATE_H - -#include "types.h" - -int hero_set_state(int, int) __asm__("FUN_L11_0024db50"); - -#endif /* LOMBYTE_RNC_OVERLAY_L11_HERO_HERO_SET_STATE_H */ diff --git a/include/rnc/overlay/l12/mobys.h b/include/rnc/overlay/l12/mobys.h new file mode 100644 index 0000000000..7e0ad75d0a --- /dev/null +++ b/include/rnc/overlay/l12/mobys.h @@ -0,0 +1,31 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_H + +#include "rnc/overlay/l12/mobys/watcher.h" +#include "types.h" + +struct Moby; + +void blarg_helicopter_update(struct Moby *) __asm__("FUN_L12_002e9f68"); +void blarg_trooper_update(struct Moby *) __asm__("FUN_L12_002e72c0"); +void clip_volume_scene_trigger_update(struct Moby *) __asm__("FUN_L12_003093c8"); +void crane_arm_update(unsigned char *) __asm__("FUN_L12_002ec1d0"); +void cutscene_camera_target_update(struct Moby *) __asm__("FUN_L12_003094a0"); +void edwina_update(L16WatchMoby *) __asm__("FUN_L12_002eb570"); +void effects_draw_trigger_update(struct Moby *) __asm__("FUN_L12_002e7208"); +void helicopter_update(char *) __asm__("FUN_L12_002ebea8"); +void help_hints_update(struct Moby *) __asm__("FUN_L12_002ed280"); +void homing_mine_update(struct Moby *) __asm__("FUN_L12_00304e00"); +void homing_mine_spawner_update(struct Moby *) __asm__("FUN_L12_00307840"); +void hoven_turret_update(struct Moby *) __asm__("FUN_L12_00303540"); +void jittered_quad_layers_update(struct Moby *) __asm__("FUN_L12_003081b0"); +void lamp_update(struct Moby *) __asm__("FUN_L12_0030b6c8"); +void oscillating_target_link_update() __asm__("FUN_L12_00302f30"); +void planetbuster_maximus_part_update(char *) __asm__("FUN_L12_003069d0"); +void platform_update() __asm__("FUN_L12_002e3ed8"); +void rocket_update(struct Moby *) __asm__("FUN_L12_002ece00"); +void scrolling_texture_layers_update() __asm__("FUN_L12_0030bff0"); +void water_reservoir_update(struct Moby *) __asm__("FUN_L12_002ec720"); +void level_12_water_tile_update(struct Moby *) __asm__("FUN_L12_002bf140"); + +#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_H */ diff --git a/include/rnc/overlay/l12/mobys/blarg_helicopter.h b/include/rnc/overlay/l12/mobys/blarg_helicopter.h deleted file mode 100644 index 2e4363f854..0000000000 --- a/include/rnc/overlay/l12/mobys/blarg_helicopter.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_BLARG_HELICOPTER_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_BLARG_HELICOPTER_H - -#include "types.h" - -struct Moby; - -void blarg_helicopter_update(struct Moby *) __asm__("FUN_L12_002e9f68"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_BLARG_HELICOPTER_H */ diff --git a/include/rnc/overlay/l12/mobys/blarg_trooper.h b/include/rnc/overlay/l12/mobys/blarg_trooper.h deleted file mode 100644 index 77ee8f8efe..0000000000 --- a/include/rnc/overlay/l12/mobys/blarg_trooper.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_BLARG_TROOPER_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_BLARG_TROOPER_H - -#include "types.h" - -struct Moby; - -void blarg_trooper_update(struct Moby *) __asm__("FUN_L12_002e72c0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_BLARG_TROOPER_H */ diff --git a/include/rnc/overlay/l12/mobys/clip_volume_scene_trigger.h b/include/rnc/overlay/l12/mobys/clip_volume_scene_trigger.h deleted file mode 100644 index 9076500bf0..0000000000 --- a/include/rnc/overlay/l12/mobys/clip_volume_scene_trigger.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_CLIP_VOLUME_SCENE_TRIGGER_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_CLIP_VOLUME_SCENE_TRIGGER_H - -#include "types.h" - -struct Moby; - -void clip_volume_scene_trigger_update(struct Moby *) __asm__("FUN_L12_003093c8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_CLIP_VOLUME_SCENE_TRIGGER_H */ diff --git a/include/rnc/overlay/l12/mobys/crane_arm.h b/include/rnc/overlay/l12/mobys/crane_arm.h deleted file mode 100644 index 51a1cd5742..0000000000 --- a/include/rnc/overlay/l12/mobys/crane_arm.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_CRANE_ARM_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_CRANE_ARM_H - -#include "types.h" - -void crane_arm_update(unsigned char *) __asm__("FUN_L12_002ec1d0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_CRANE_ARM_H */ diff --git a/include/rnc/overlay/l12/mobys/cutscene_camera_target.h b/include/rnc/overlay/l12/mobys/cutscene_camera_target.h deleted file mode 100644 index ad0ed94a60..0000000000 --- a/include/rnc/overlay/l12/mobys/cutscene_camera_target.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_CUTSCENE_CAMERA_TARGET_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_CUTSCENE_CAMERA_TARGET_H - -#include "types.h" - -struct Moby; - -void cutscene_camera_target_update(struct Moby *) __asm__("FUN_L12_003094a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_CUTSCENE_CAMERA_TARGET_H */ diff --git a/include/rnc/overlay/l12/mobys/edwina.h b/include/rnc/overlay/l12/mobys/edwina.h deleted file mode 100644 index 6ec2daf875..0000000000 --- a/include/rnc/overlay/l12/mobys/edwina.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_EDWINA_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_EDWINA_H - -#include "types.h" -#include "rnc/overlay/l12/mobys/watcher.h" - -void edwina_update(L16WatchMoby *) __asm__("FUN_L12_002eb570"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_EDWINA_H */ diff --git a/include/rnc/overlay/l12/mobys/effects_draw_trigger.h b/include/rnc/overlay/l12/mobys/effects_draw_trigger.h deleted file mode 100644 index 1c2ce1e524..0000000000 --- a/include/rnc/overlay/l12/mobys/effects_draw_trigger.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_EFFECTS_DRAW_TRIGGER_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_EFFECTS_DRAW_TRIGGER_H - -#include "types.h" - -struct Moby; - -void effects_draw_trigger_update(struct Moby *) __asm__("FUN_L12_002e7208"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_EFFECTS_DRAW_TRIGGER_H */ diff --git a/include/rnc/overlay/l12/mobys/helicopter.h b/include/rnc/overlay/l12/mobys/helicopter.h deleted file mode 100644 index 3e5d9d1e48..0000000000 --- a/include/rnc/overlay/l12/mobys/helicopter.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_HELICOPTER_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_HELICOPTER_H - -#include "types.h" - -void helicopter_update(char *) __asm__("FUN_L12_002ebea8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_HELICOPTER_H */ diff --git a/include/rnc/overlay/l12/mobys/help_hints.h b/include/rnc/overlay/l12/mobys/help_hints.h deleted file mode 100644 index 2ff32216bd..0000000000 --- a/include/rnc/overlay/l12/mobys/help_hints.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_HELP_HINTS_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_HELP_HINTS_H - -#include "types.h" - -struct Moby; - -void help_hints_update(struct Moby *) __asm__("FUN_L12_002ed280"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_HELP_HINTS_H */ diff --git a/include/rnc/overlay/l12/mobys/homing_mine.h b/include/rnc/overlay/l12/mobys/homing_mine.h deleted file mode 100644 index 10374d5265..0000000000 --- a/include/rnc/overlay/l12/mobys/homing_mine.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_HOMING_MINE_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_HOMING_MINE_H - -#include "types.h" - -struct Moby; - -void homing_mine_update(struct Moby *) __asm__("FUN_L12_00304e00"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_HOMING_MINE_H */ diff --git a/include/rnc/overlay/l12/mobys/homing_mine_spawner.h b/include/rnc/overlay/l12/mobys/homing_mine_spawner.h deleted file mode 100644 index 6b70fbf80a..0000000000 --- a/include/rnc/overlay/l12/mobys/homing_mine_spawner.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_HOMING_MINE_SPAWNER_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_HOMING_MINE_SPAWNER_H - -#include "types.h" - -struct Moby; - -void homing_mine_spawner_update(struct Moby *) __asm__("FUN_L12_00307840"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_HOMING_MINE_SPAWNER_H */ diff --git a/include/rnc/overlay/l12/mobys/hoven_turret.h b/include/rnc/overlay/l12/mobys/hoven_turret.h deleted file mode 100644 index 5932487b9f..0000000000 --- a/include/rnc/overlay/l12/mobys/hoven_turret.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_HOVEN_TURRET_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_HOVEN_TURRET_H - -#include "types.h" - -struct Moby; - -void hoven_turret_update(struct Moby *) __asm__("FUN_L12_00303540"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_HOVEN_TURRET_H */ diff --git a/include/rnc/overlay/l12/mobys/jittered_quad_layers.h b/include/rnc/overlay/l12/mobys/jittered_quad_layers.h deleted file mode 100644 index a6cd88df75..0000000000 --- a/include/rnc/overlay/l12/mobys/jittered_quad_layers.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_JITTERED_QUAD_LAYERS_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_JITTERED_QUAD_LAYERS_H - -#include "types.h" - -struct Moby; - -void jittered_quad_layers_update(struct Moby *) __asm__("FUN_L12_003081b0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_JITTERED_QUAD_LAYERS_H */ diff --git a/include/rnc/overlay/l12/mobys/lamp.h b/include/rnc/overlay/l12/mobys/lamp.h deleted file mode 100644 index 0d69e4a0fe..0000000000 --- a/include/rnc/overlay/l12/mobys/lamp.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_LAMP_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_LAMP_H - -#include "types.h" - -struct Moby; - -void lamp_update(struct Moby *) __asm__("FUN_L12_0030b6c8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_LAMP_H */ diff --git a/include/rnc/overlay/l12/mobys/oscillating_target_link.h b/include/rnc/overlay/l12/mobys/oscillating_target_link.h deleted file mode 100644 index 89e185fb9d..0000000000 --- a/include/rnc/overlay/l12/mobys/oscillating_target_link.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_OSCILLATING_TARGET_LINK_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_OSCILLATING_TARGET_LINK_H - -#include "types.h" - -void oscillating_target_link_update() __asm__("FUN_L12_00302f30"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_OSCILLATING_TARGET_LINK_H */ diff --git a/include/rnc/overlay/l12/mobys/planetbuster_maximus_part.h b/include/rnc/overlay/l12/mobys/planetbuster_maximus_part.h deleted file mode 100644 index af866cd899..0000000000 --- a/include/rnc/overlay/l12/mobys/planetbuster_maximus_part.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_PLANETBUSTER_MAXIMUS_PART_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_PLANETBUSTER_MAXIMUS_PART_H - -#include "types.h" - -void planetbuster_maximus_part_update(char *) __asm__("FUN_L12_003069d0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_PLANETBUSTER_MAXIMUS_PART_H */ diff --git a/include/rnc/overlay/l12/mobys/platform.h b/include/rnc/overlay/l12/mobys/platform.h deleted file mode 100644 index 7c496837be..0000000000 --- a/include/rnc/overlay/l12/mobys/platform.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_PLATFORM_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_PLATFORM_H - -#include "types.h" - -void platform_update() __asm__("FUN_L12_002e3ed8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_PLATFORM_H */ diff --git a/include/rnc/overlay/l12/mobys/rocket.h b/include/rnc/overlay/l12/mobys/rocket.h deleted file mode 100644 index 74c8840ee1..0000000000 --- a/include/rnc/overlay/l12/mobys/rocket.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_ROCKET_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_ROCKET_H - -#include "types.h" - -struct Moby; - -void rocket_update(struct Moby *) __asm__("FUN_L12_002ece00"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_ROCKET_H */ diff --git a/include/rnc/overlay/l12/mobys/scrolling_texture_layers.h b/include/rnc/overlay/l12/mobys/scrolling_texture_layers.h deleted file mode 100644 index 440f1948f9..0000000000 --- a/include/rnc/overlay/l12/mobys/scrolling_texture_layers.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_SCROLLING_TEXTURE_LAYERS_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_SCROLLING_TEXTURE_LAYERS_H - -#include "types.h" - -void scrolling_texture_layers_update() __asm__("FUN_L12_0030bff0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_SCROLLING_TEXTURE_LAYERS_H */ diff --git a/include/rnc/overlay/l12/mobys/water_reservoir.h b/include/rnc/overlay/l12/mobys/water_reservoir.h deleted file mode 100644 index 41f2998934..0000000000 --- a/include/rnc/overlay/l12/mobys/water_reservoir.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_WATER_RESERVOIR_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_WATER_RESERVOIR_H - -#include "types.h" - -struct Moby; - -void water_reservoir_update(struct Moby *) __asm__("FUN_L12_002ec720"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_WATER_RESERVOIR_H */ diff --git a/include/rnc/overlay/l12/mobys/water_tile.h b/include/rnc/overlay/l12/mobys/water_tile.h deleted file mode 100644 index 4f4bcabda9..0000000000 --- a/include/rnc/overlay/l12/mobys/water_tile.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L12_MOBYS_WATER_TILE_H -#define LOMBYTE_RNC_OVERLAY_L12_MOBYS_WATER_TILE_H - -#include "types.h" - -struct Moby; - -void level_12_water_tile_update(struct Moby *) __asm__("FUN_L12_002bf140"); - -#endif /* LOMBYTE_RNC_OVERLAY_L12_MOBYS_WATER_TILE_H */ diff --git a/include/rnc/overlay/l14/mobys/racer_path_and_weapon.h b/include/rnc/overlay/l14/mobys.h similarity index 73% rename from include/rnc/overlay/l14/mobys/racer_path_and_weapon.h rename to include/rnc/overlay/l14/mobys.h index 806ddf2146..8e720c9f35 100644 --- a/include/rnc/overlay/l14/mobys/racer_path_and_weapon.h +++ b/include/rnc/overlay/l14/mobys.h @@ -1,5 +1,5 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L14_MOBYS_RACER_PATH_AND_WEAPON_H -#define LOMBYTE_RNC_OVERLAY_L14_MOBYS_RACER_PATH_AND_WEAPON_H +#ifndef LOMBYTE_RNC_OVERLAY_L14_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_L14_MOBYS_H #include "types.h" @@ -12,4 +12,4 @@ void advance_moby_along_path(struct Moby *) __asm__("FUN_L14_002d7198"); void update_moby_joint_visual_effects(struct Moby *) __asm__("FUN_L14_002d7490"); void reset_racer_group_to_hero_path_position(struct Moby *) __asm__("FUN_L14_002d6570"); -#endif /* LOMBYTE_RNC_OVERLAY_L14_MOBYS_RACER_PATH_AND_WEAPON_H */ +#endif /* LOMBYTE_RNC_OVERLAY_L14_MOBYS_H */ diff --git a/include/rnc/overlay/l15/mobys.h b/include/rnc/overlay/l15/mobys.h new file mode 100644 index 0000000000..625d917120 --- /dev/null +++ b/include/rnc/overlay/l15/mobys.h @@ -0,0 +1,10 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L15_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_L15_MOBYS_H + +#include "types.h" + +struct Moby; + +void draw_moby_radial_ripple_mesh_buffers(struct Moby *) __asm__("FUN_L15_002eac90"); + +#endif /* LOMBYTE_RNC_OVERLAY_L15_MOBYS_H */ diff --git a/include/rnc/overlay/l15/mobys/radial_ripple_mesh.h b/include/rnc/overlay/l15/mobys/radial_ripple_mesh.h deleted file mode 100644 index 798aabbc07..0000000000 --- a/include/rnc/overlay/l15/mobys/radial_ripple_mesh.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L15_MOBYS_RADIAL_RIPPLE_MESH_H -#define LOMBYTE_RNC_OVERLAY_L15_MOBYS_RADIAL_RIPPLE_MESH_H - -#include "types.h" - -struct Moby; - -void draw_moby_radial_ripple_mesh_buffers(struct Moby *) __asm__("FUN_L15_002eac90"); - -#endif /* LOMBYTE_RNC_OVERLAY_L15_MOBYS_RADIAL_RIPPLE_MESH_H */ diff --git a/include/rnc/overlay/l16/mobys.h b/include/rnc/overlay/l16/mobys.h new file mode 100644 index 0000000000..47a45e2115 --- /dev/null +++ b/include/rnc/overlay/l16/mobys.h @@ -0,0 +1,39 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_H + +#include "types.h" + +struct Moby; + +void bolt_thief_update() __asm__("FUN_L16_002e37a0"); +void thrown_bomb_update() __asm__("FUN_L16_002c5eb0"); +void breakable_prop_update(struct Moby *) __asm__("FUN_L16_002d6740"); +void chicken_relocator_update(struct Moby *) __asm__("FUN_L16_002e8970"); +void chomper_update(struct Moby *) __asm__("FUN_L16_002e5e08"); +void clip_volume_dialogue_trigger_update(struct Moby *) __asm__("FUN_L16_002e7208"); +void conveyor_belt_update(struct Moby *) __asm__("FUN_L16_002c9878"); +void cutscene_joint_trails_update(struct Moby *) __asm__("FUN_L16_002e7e00"); +void elevator_update() __asm__("FUN_L16_002e7f80"); +void gadgetron_ceo_update() __asm__("FUN_L16_002e6808"); +void gadgetron_sign_update(struct Moby *) __asm__("FUN_L16_002e88d0"); +void grindrail_button_update(struct Moby *) __asm__("FUN_L16_002e54a0"); +void grindrail_gate_update(struct Moby *) __asm__("FUN_L16_002e5010"); +void help_desk_lady_update() __asm__("FUN_L16_002e3190"); +void linked_pair_ribbons_update(struct Moby *) __asm__("FUN_L16_002cf4a8"); +void local_bounds_command_trigger_update(struct Moby *) __asm__("FUN_L16_002e5258"); +void path_following_rocket_update(struct Moby *) __asm__("FUN_L16_002c3d38"); +void path_walker_update(unsigned char *) __asm__("FUN_L16_002e76b8"); +void reflection_mesh_update(struct Moby *) __asm__("FUN_L16_002e93b0"); +void reflection_mesh_pair_update(struct Moby *) __asm__("FUN_L16_002e98e0"); +void draw_level16_reflection_mesh_batch(void) __asm__("FUN_L16_002e9ce0"); +void reflection_mesh_trio_b_update(struct Moby *) __asm__("FUN_L16_002ea128"); +void homing_projectile_update(unsigned char *) __asm__("FUN_L16_002a3f38"); +void spinning_sprite_effect_update(struct Moby *) __asm__("FUN_L16_002c9480"); +void taxi_update(struct Moby *) __asm__("FUN_L16_002e43e0"); +void test_dummy_challenge_update(struct Moby *) __asm__("FUN_L16_002d5ef8"); +void test_dummy_on_hoverboard_update(unsigned char *) __asm__("FUN_L16_002d04a0"); +void wall_button_update(struct Moby *) __asm__("FUN_L16_002cf198"); +void wall_button_blocker_update(struct Moby *) __asm__("FUN_L16_002e36e8"); +void set_wall_button_blocker_collision(void *, int) __asm__("FUN_L16_002e3770"); + +#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_H */ diff --git a/include/rnc/overlay/l16/mobys/bolt_thief.h b/include/rnc/overlay/l16/mobys/bolt_thief.h deleted file mode 100644 index d86c44dbf5..0000000000 --- a/include/rnc/overlay/l16/mobys/bolt_thief.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_BOLT_THIEF_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_BOLT_THIEF_H - -#include "types.h" - -void bolt_thief_update() __asm__("FUN_L16_002e37a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_BOLT_THIEF_H */ diff --git a/include/rnc/overlay/l16/mobys/bomb.h b/include/rnc/overlay/l16/mobys/bomb.h deleted file mode 100644 index a60da817c7..0000000000 --- a/include/rnc/overlay/l16/mobys/bomb.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_BOMB_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_BOMB_H - -#include "types.h" - -void thrown_bomb_update() __asm__("FUN_L16_002c5eb0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_BOMB_H */ diff --git a/include/rnc/overlay/l16/mobys/breakable_prop.h b/include/rnc/overlay/l16/mobys/breakable_prop.h deleted file mode 100644 index 880c54ce0e..0000000000 --- a/include/rnc/overlay/l16/mobys/breakable_prop.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_BREAKABLE_PROP_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_BREAKABLE_PROP_H - -#include "types.h" - -struct Moby; - -void breakable_prop_update(struct Moby *) __asm__("FUN_L16_002d6740"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_BREAKABLE_PROP_H */ diff --git a/include/rnc/overlay/l16/mobys/chicken_relocator.h b/include/rnc/overlay/l16/mobys/chicken_relocator.h deleted file mode 100644 index 1e9aeb9039..0000000000 --- a/include/rnc/overlay/l16/mobys/chicken_relocator.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_CHICKEN_RELOCATOR_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_CHICKEN_RELOCATOR_H - -#include "types.h" - -struct Moby; - -void chicken_relocator_update(struct Moby *) __asm__("FUN_L16_002e8970"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_CHICKEN_RELOCATOR_H */ diff --git a/include/rnc/overlay/l16/mobys/chomper.h b/include/rnc/overlay/l16/mobys/chomper.h deleted file mode 100644 index 3a7620efd5..0000000000 --- a/include/rnc/overlay/l16/mobys/chomper.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_CHOMPER_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_CHOMPER_H - -#include "types.h" - -struct Moby; - -void chomper_update(struct Moby *) __asm__("FUN_L16_002e5e08"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_CHOMPER_H */ diff --git a/include/rnc/overlay/l16/mobys/clip_volume_dialogue_trigger.h b/include/rnc/overlay/l16/mobys/clip_volume_dialogue_trigger.h deleted file mode 100644 index a84b090934..0000000000 --- a/include/rnc/overlay/l16/mobys/clip_volume_dialogue_trigger.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_CLIP_VOLUME_DIALOGUE_TRIGGER_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_CLIP_VOLUME_DIALOGUE_TRIGGER_H - -#include "types.h" - -struct Moby; - -void clip_volume_dialogue_trigger_update(struct Moby *) __asm__("FUN_L16_002e7208"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_CLIP_VOLUME_DIALOGUE_TRIGGER_H */ diff --git a/include/rnc/overlay/l16/mobys/conveyor_belt.h b/include/rnc/overlay/l16/mobys/conveyor_belt.h deleted file mode 100644 index 13e68c29d1..0000000000 --- a/include/rnc/overlay/l16/mobys/conveyor_belt.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_CONVEYOR_BELT_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_CONVEYOR_BELT_H - -#include "types.h" - -struct Moby; - -void conveyor_belt_update(struct Moby *) __asm__("FUN_L16_002c9878"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_CONVEYOR_BELT_H */ diff --git a/include/rnc/overlay/l16/mobys/cutscene_joint_trails.h b/include/rnc/overlay/l16/mobys/cutscene_joint_trails.h deleted file mode 100644 index 9952f15b2f..0000000000 --- a/include/rnc/overlay/l16/mobys/cutscene_joint_trails.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_CUTSCENE_JOINT_TRAILS_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_CUTSCENE_JOINT_TRAILS_H - -#include "types.h" - -struct Moby; - -void cutscene_joint_trails_update(struct Moby *) __asm__("FUN_L16_002e7e00"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_CUTSCENE_JOINT_TRAILS_H */ diff --git a/include/rnc/overlay/l16/mobys/elevator.h b/include/rnc/overlay/l16/mobys/elevator.h deleted file mode 100644 index 9b4d97aa8a..0000000000 --- a/include/rnc/overlay/l16/mobys/elevator.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_ELEVATOR_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_ELEVATOR_H - -#include "types.h" - -void elevator_update() __asm__("FUN_L16_002e7f80"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_ELEVATOR_H */ diff --git a/include/rnc/overlay/l16/mobys/gadgetron_ceo.h b/include/rnc/overlay/l16/mobys/gadgetron_ceo.h deleted file mode 100644 index 3b5ef43be0..0000000000 --- a/include/rnc/overlay/l16/mobys/gadgetron_ceo.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_GADGETRON_CEO_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_GADGETRON_CEO_H - -#include "types.h" - -void gadgetron_ceo_update() __asm__("FUN_L16_002e6808"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_GADGETRON_CEO_H */ diff --git a/include/rnc/overlay/l16/mobys/gadgetron_sign.h b/include/rnc/overlay/l16/mobys/gadgetron_sign.h deleted file mode 100644 index 4ad4d16cc8..0000000000 --- a/include/rnc/overlay/l16/mobys/gadgetron_sign.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_GADGETRON_SIGN_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_GADGETRON_SIGN_H - -#include "types.h" - -struct Moby; - -void gadgetron_sign_update(struct Moby *) __asm__("FUN_L16_002e88d0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_GADGETRON_SIGN_H */ diff --git a/include/rnc/overlay/l16/mobys/grindrail_button.h b/include/rnc/overlay/l16/mobys/grindrail_button.h deleted file mode 100644 index 276c4f7129..0000000000 --- a/include/rnc/overlay/l16/mobys/grindrail_button.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_GRINDRAIL_BUTTON_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_GRINDRAIL_BUTTON_H - -#include "types.h" - -struct Moby; - -void grindrail_button_update(struct Moby *) __asm__("FUN_L16_002e54a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_GRINDRAIL_BUTTON_H */ diff --git a/include/rnc/overlay/l16/mobys/grindrail_gate.h b/include/rnc/overlay/l16/mobys/grindrail_gate.h deleted file mode 100644 index a6665ed9cc..0000000000 --- a/include/rnc/overlay/l16/mobys/grindrail_gate.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_GRINDRAIL_GATE_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_GRINDRAIL_GATE_H - -#include "types.h" - -struct Moby; - -void grindrail_gate_update(struct Moby *) __asm__("FUN_L16_002e5010"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_GRINDRAIL_GATE_H */ diff --git a/include/rnc/overlay/l16/mobys/help_desk_lady.h b/include/rnc/overlay/l16/mobys/help_desk_lady.h deleted file mode 100644 index e441fab988..0000000000 --- a/include/rnc/overlay/l16/mobys/help_desk_lady.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_HELP_DESK_LADY_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_HELP_DESK_LADY_H - -#include "types.h" - -void help_desk_lady_update() __asm__("FUN_L16_002e3190"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_HELP_DESK_LADY_H */ diff --git a/include/rnc/overlay/l16/mobys/linked_pair_ribbons.h b/include/rnc/overlay/l16/mobys/linked_pair_ribbons.h deleted file mode 100644 index 58218c8477..0000000000 --- a/include/rnc/overlay/l16/mobys/linked_pair_ribbons.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_LINKED_PAIR_RIBBONS_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_LINKED_PAIR_RIBBONS_H - -#include "types.h" - -struct Moby; - -void linked_pair_ribbons_update(struct Moby *) __asm__("FUN_L16_002cf4a8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_LINKED_PAIR_RIBBONS_H */ diff --git a/include/rnc/overlay/l16/mobys/local_bounds_command_trigger.h b/include/rnc/overlay/l16/mobys/local_bounds_command_trigger.h deleted file mode 100644 index ab5acb2d1d..0000000000 --- a/include/rnc/overlay/l16/mobys/local_bounds_command_trigger.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_LOCAL_BOUNDS_COMMAND_TRIGGER_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_LOCAL_BOUNDS_COMMAND_TRIGGER_H - -#include "types.h" - -struct Moby; - -void local_bounds_command_trigger_update(struct Moby *) __asm__("FUN_L16_002e5258"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_LOCAL_BOUNDS_COMMAND_TRIGGER_H */ diff --git a/include/rnc/overlay/l16/mobys/path_following_rocket.h b/include/rnc/overlay/l16/mobys/path_following_rocket.h deleted file mode 100644 index 9437b175c7..0000000000 --- a/include/rnc/overlay/l16/mobys/path_following_rocket.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_PATH_FOLLOWING_ROCKET_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_PATH_FOLLOWING_ROCKET_H - -#include "types.h" - -struct Moby; - -void path_following_rocket_update(struct Moby *) __asm__("FUN_L16_002c3d38"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_PATH_FOLLOWING_ROCKET_H */ diff --git a/include/rnc/overlay/l16/mobys/path_walker.h b/include/rnc/overlay/l16/mobys/path_walker.h deleted file mode 100644 index a421e7fb1b..0000000000 --- a/include/rnc/overlay/l16/mobys/path_walker.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_PATH_WALKER_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_PATH_WALKER_H - -#include "types.h" - -void path_walker_update(unsigned char *) __asm__("FUN_L16_002e76b8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_PATH_WALKER_H */ diff --git a/include/rnc/overlay/l16/mobys/reflection_mesh.h b/include/rnc/overlay/l16/mobys/reflection_mesh.h deleted file mode 100644 index 6e8ff4029c..0000000000 --- a/include/rnc/overlay/l16/mobys/reflection_mesh.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_REFLECTION_MESH_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_REFLECTION_MESH_H - -#include "types.h" - -struct Moby; - -void reflection_mesh_update(struct Moby *) __asm__("FUN_L16_002e93b0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_REFLECTION_MESH_H */ diff --git a/include/rnc/overlay/l16/mobys/reflection_mesh_pair.h b/include/rnc/overlay/l16/mobys/reflection_mesh_pair.h deleted file mode 100644 index 63b996e6fa..0000000000 --- a/include/rnc/overlay/l16/mobys/reflection_mesh_pair.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_REFLECTION_MESH_PAIR_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_REFLECTION_MESH_PAIR_H - -#include "types.h" - -struct Moby; - -void reflection_mesh_pair_update(struct Moby *) __asm__("FUN_L16_002e98e0"); -void draw_level16_reflection_mesh_batch(void) __asm__("FUN_L16_002e9ce0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_REFLECTION_MESH_PAIR_H */ diff --git a/include/rnc/overlay/l16/mobys/reflection_mesh_trio_b.h b/include/rnc/overlay/l16/mobys/reflection_mesh_trio_b.h deleted file mode 100644 index e10c8f0a56..0000000000 --- a/include/rnc/overlay/l16/mobys/reflection_mesh_trio_b.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_REFLECTION_MESH_TRIO_B_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_REFLECTION_MESH_TRIO_B_H - -#include "types.h" - -struct Moby; - -void reflection_mesh_trio_b_update(struct Moby *) __asm__("FUN_L16_002ea128"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_REFLECTION_MESH_TRIO_B_H */ diff --git a/include/rnc/overlay/l16/mobys/rocket.h b/include/rnc/overlay/l16/mobys/rocket.h deleted file mode 100644 index b5023c5c0f..0000000000 --- a/include/rnc/overlay/l16/mobys/rocket.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_ROCKET_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_ROCKET_H - -#include "types.h" - -void homing_projectile_update(unsigned char *) __asm__("FUN_L16_002a3f38"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_ROCKET_H */ diff --git a/include/rnc/overlay/l16/mobys/spinning_sprite_effect.h b/include/rnc/overlay/l16/mobys/spinning_sprite_effect.h deleted file mode 100644 index 5a08f58b9a..0000000000 --- a/include/rnc/overlay/l16/mobys/spinning_sprite_effect.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_SPINNING_SPRITE_EFFECT_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_SPINNING_SPRITE_EFFECT_H - -#include "types.h" - -struct Moby; - -void spinning_sprite_effect_update(struct Moby *) __asm__("FUN_L16_002c9480"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_SPINNING_SPRITE_EFFECT_H */ diff --git a/include/rnc/overlay/l16/mobys/taxi.h b/include/rnc/overlay/l16/mobys/taxi.h deleted file mode 100644 index 0f69665129..0000000000 --- a/include/rnc/overlay/l16/mobys/taxi.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_TAXI_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_TAXI_H - -#include "types.h" - -struct Moby; - -void taxi_update(struct Moby *) __asm__("FUN_L16_002e43e0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_TAXI_H */ diff --git a/include/rnc/overlay/l16/mobys/test_dummy_challenge.h b/include/rnc/overlay/l16/mobys/test_dummy_challenge.h deleted file mode 100644 index 62ec96cd13..0000000000 --- a/include/rnc/overlay/l16/mobys/test_dummy_challenge.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_TEST_DUMMY_CHALLENGE_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_TEST_DUMMY_CHALLENGE_H - -#include "types.h" - -struct Moby; - -void test_dummy_challenge_update(struct Moby *) __asm__("FUN_L16_002d5ef8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_TEST_DUMMY_CHALLENGE_H */ diff --git a/include/rnc/overlay/l16/mobys/test_dummy_on_hoverboard.h b/include/rnc/overlay/l16/mobys/test_dummy_on_hoverboard.h deleted file mode 100644 index 2451b786b9..0000000000 --- a/include/rnc/overlay/l16/mobys/test_dummy_on_hoverboard.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_TEST_DUMMY_ON_HOVERBOARD_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_TEST_DUMMY_ON_HOVERBOARD_H - -#include "types.h" - -void test_dummy_on_hoverboard_update(unsigned char *) __asm__("FUN_L16_002d04a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_TEST_DUMMY_ON_HOVERBOARD_H */ diff --git a/include/rnc/overlay/l16/mobys/wall_button.h b/include/rnc/overlay/l16/mobys/wall_button.h deleted file mode 100644 index 1158c1bd64..0000000000 --- a/include/rnc/overlay/l16/mobys/wall_button.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_WALL_BUTTON_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_WALL_BUTTON_H - -#include "types.h" - -struct Moby; - -void wall_button_update(struct Moby *) __asm__("FUN_L16_002cf198"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_WALL_BUTTON_H */ diff --git a/include/rnc/overlay/l16/mobys/wall_button_blocker.h b/include/rnc/overlay/l16/mobys/wall_button_blocker.h deleted file mode 100644 index 0065618ec8..0000000000 --- a/include/rnc/overlay/l16/mobys/wall_button_blocker.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L16_MOBYS_WALL_BUTTON_BLOCKER_H -#define LOMBYTE_RNC_OVERLAY_L16_MOBYS_WALL_BUTTON_BLOCKER_H - -#include "types.h" - -struct Moby; - -void wall_button_blocker_update(struct Moby *) __asm__("FUN_L16_002e36e8"); -void set_wall_button_blocker_collision(void *, int) __asm__("FUN_L16_002e3770"); - -#endif /* LOMBYTE_RNC_OVERLAY_L16_MOBYS_WALL_BUTTON_BLOCKER_H */ diff --git a/include/rnc/overlay/l17/mobys.h b/include/rnc/overlay/l17/mobys.h new file mode 100644 index 0000000000..930998eeaa --- /dev/null +++ b/include/rnc/overlay/l17/mobys.h @@ -0,0 +1,28 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_H + +#include "types.h" + +struct Moby; + +void blarg_ship_update(struct Moby *) __asm__("FUN_L17_002f40d8"); +char *try_activate_blarg_ship_from_list(int) __asm__("FUN_L17_002f4fb8"); +void breakaway_prop_update(struct Moby *) __asm__("FUN_L17_002f5390"); +void fleet_camera_box_watcher_update(struct Moby *) __asm__("FUN_L17_002f26d0"); +void cutscene_camera_target_update(struct Moby *) __asm__("FUN_L17_002f2e78"); +void door_update(struct Moby *) __asm__("FUN_L17_002e87d8"); +void dreks_fleet_turret_update(struct Moby *) __asm__("FUN_L17_002cb310"); +void fleet_turret_shot_update(struct Moby *) __asm__("FUN_L17_002e8e08"); +void fighter_jet_update() __asm__("FUN_L17_002ed018"); +void fleet_backdrop_animation_update(struct Moby *) __asm__("FUN_L17_002f3848"); +void fleet_beam_update(struct Moby *) __asm__("FUN_L17_002a8da0"); +void fleet_rotating_radial_effect_update(char *) __asm__("FUN_L17_002d77f0"); +void floating_mine_update(struct Moby *) __asm__("FUN_L17_002dc3f8"); +void magnet_elevator_update(struct Moby *) __asm__("FUN_L17_002ee2b0"); +int cancel_suck_cannon_suction_and_set_state_12(struct Moby *) __asm__("FUN_L17_002f0040"); +int enemy_stun_update(struct Moby *) __asm__("FUN_L17_002efea8"); +void robot_dog_update(unsigned char *) __asm__("FUN_L17_002eeb68"); +void shattering_prop_update(struct Moby *) __asm__("FUN_L17_002f5260"); +void shuttle_update(struct Moby *) __asm__("FUN_L17_002f1940"); + +#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_H */ diff --git a/include/rnc/overlay/l17/mobys/blarg_ship.h b/include/rnc/overlay/l17/mobys/blarg_ship.h deleted file mode 100644 index 90027c98c4..0000000000 --- a/include/rnc/overlay/l17/mobys/blarg_ship.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_BLARG_SHIP_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_BLARG_SHIP_H - -#include "types.h" - -struct Moby; - -void blarg_ship_update(struct Moby *) __asm__("FUN_L17_002f40d8"); -char *try_activate_blarg_ship_from_list(int) __asm__("FUN_L17_002f4fb8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_BLARG_SHIP_H */ diff --git a/include/rnc/overlay/l17/mobys/breakaway_prop.h b/include/rnc/overlay/l17/mobys/breakaway_prop.h deleted file mode 100644 index b014c872ff..0000000000 --- a/include/rnc/overlay/l17/mobys/breakaway_prop.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_BREAKAWAY_PROP_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_BREAKAWAY_PROP_H - -#include "types.h" - -struct Moby; - -void breakaway_prop_update(struct Moby *) __asm__("FUN_L17_002f5390"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_BREAKAWAY_PROP_H */ diff --git a/include/rnc/overlay/l17/mobys/camera_box_watcher.h b/include/rnc/overlay/l17/mobys/camera_box_watcher.h deleted file mode 100644 index 2a2a5ed967..0000000000 --- a/include/rnc/overlay/l17/mobys/camera_box_watcher.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_CAMERA_BOX_WATCHER_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_CAMERA_BOX_WATCHER_H - -#include "types.h" - -struct Moby; - -void fleet_camera_box_watcher_update(struct Moby *) __asm__("FUN_L17_002f26d0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_CAMERA_BOX_WATCHER_H */ diff --git a/include/rnc/overlay/l17/mobys/cutscene_camera_target.h b/include/rnc/overlay/l17/mobys/cutscene_camera_target.h deleted file mode 100644 index 6dc85404a9..0000000000 --- a/include/rnc/overlay/l17/mobys/cutscene_camera_target.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_CUTSCENE_CAMERA_TARGET_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_CUTSCENE_CAMERA_TARGET_H - -#include "types.h" - -struct Moby; - -void cutscene_camera_target_update(struct Moby *) __asm__("FUN_L17_002f2e78"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_CUTSCENE_CAMERA_TARGET_H */ diff --git a/include/rnc/overlay/l17/mobys/door.h b/include/rnc/overlay/l17/mobys/door.h deleted file mode 100644 index 89ecbd6698..0000000000 --- a/include/rnc/overlay/l17/mobys/door.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_DOOR_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_DOOR_H - -#include "types.h" - -struct Moby; - -void door_update(struct Moby *) __asm__("FUN_L17_002e87d8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_DOOR_H */ diff --git a/include/rnc/overlay/l17/mobys/dreks_fleet_turret.h b/include/rnc/overlay/l17/mobys/dreks_fleet_turret.h deleted file mode 100644 index 331d30cf63..0000000000 --- a/include/rnc/overlay/l17/mobys/dreks_fleet_turret.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_DREKS_FLEET_TURRET_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_DREKS_FLEET_TURRET_H - -#include "types.h" - -struct Moby; - -void dreks_fleet_turret_update(struct Moby *) __asm__("FUN_L17_002cb310"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_DREKS_FLEET_TURRET_H */ diff --git a/include/rnc/overlay/l17/mobys/dreks_fleet_turret_shot.h b/include/rnc/overlay/l17/mobys/dreks_fleet_turret_shot.h deleted file mode 100644 index d7fd632b9f..0000000000 --- a/include/rnc/overlay/l17/mobys/dreks_fleet_turret_shot.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_DREKS_FLEET_TURRET_SHOT_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_DREKS_FLEET_TURRET_SHOT_H - -#include "types.h" - -struct Moby; - -void fleet_turret_shot_update(struct Moby *) __asm__("FUN_L17_002e8e08"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_DREKS_FLEET_TURRET_SHOT_H */ diff --git a/include/rnc/overlay/l17/mobys/fighter_jet.h b/include/rnc/overlay/l17/mobys/fighter_jet.h deleted file mode 100644 index 01c8d7682d..0000000000 --- a/include/rnc/overlay/l17/mobys/fighter_jet.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_FIGHTER_JET_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_FIGHTER_JET_H - -#include "types.h" - -void fighter_jet_update() __asm__("FUN_L17_002ed018"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_FIGHTER_JET_H */ diff --git a/include/rnc/overlay/l17/mobys/fleet_backdrop.h b/include/rnc/overlay/l17/mobys/fleet_backdrop.h deleted file mode 100644 index e8b1f925ce..0000000000 --- a/include/rnc/overlay/l17/mobys/fleet_backdrop.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_FLEET_BACKDROP_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_FLEET_BACKDROP_H - -#include "types.h" - -struct Moby; - -void fleet_backdrop_animation_update(struct Moby *) __asm__("FUN_L17_002f3848"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_FLEET_BACKDROP_H */ diff --git a/include/rnc/overlay/l17/mobys/fleet_beam.h b/include/rnc/overlay/l17/mobys/fleet_beam.h deleted file mode 100644 index 57f44e3590..0000000000 --- a/include/rnc/overlay/l17/mobys/fleet_beam.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_FLEET_BEAM_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_FLEET_BEAM_H - -#include "types.h" - -struct Moby; - -void fleet_beam_update(struct Moby *) __asm__("FUN_L17_002a8da0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_FLEET_BEAM_H */ diff --git a/include/rnc/overlay/l17/mobys/fleet_rotating_radial_effect.h b/include/rnc/overlay/l17/mobys/fleet_rotating_radial_effect.h deleted file mode 100644 index 7dbf7dc27b..0000000000 --- a/include/rnc/overlay/l17/mobys/fleet_rotating_radial_effect.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_FLEET_ROTATING_RADIAL_EFFECT_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_FLEET_ROTATING_RADIAL_EFFECT_H - -#include "types.h" - -void fleet_rotating_radial_effect_update(char *) __asm__("FUN_L17_002d77f0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_FLEET_ROTATING_RADIAL_EFFECT_H */ diff --git a/include/rnc/overlay/l17/mobys/floating_mine.h b/include/rnc/overlay/l17/mobys/floating_mine.h deleted file mode 100644 index 5947db17ee..0000000000 --- a/include/rnc/overlay/l17/mobys/floating_mine.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_FLOATING_MINE_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_FLOATING_MINE_H - -#include "types.h" - -struct Moby; - -void floating_mine_update(struct Moby *) __asm__("FUN_L17_002dc3f8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_FLOATING_MINE_H */ diff --git a/include/rnc/overlay/l17/mobys/magnet_elevator.h b/include/rnc/overlay/l17/mobys/magnet_elevator.h deleted file mode 100644 index fb3c9cd66c..0000000000 --- a/include/rnc/overlay/l17/mobys/magnet_elevator.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_MAGNET_ELEVATOR_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_MAGNET_ELEVATOR_H - -#include "types.h" - -struct Moby; - -void magnet_elevator_update(struct Moby *) __asm__("FUN_L17_002ee2b0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_MAGNET_ELEVATOR_H */ diff --git a/include/rnc/overlay/l17/mobys/robot_dog.h b/include/rnc/overlay/l17/mobys/robot_dog.h deleted file mode 100644 index 9ba914d9fb..0000000000 --- a/include/rnc/overlay/l17/mobys/robot_dog.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_ROBOT_DOG_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_ROBOT_DOG_H - -#include "types.h" - -struct Moby; - -int cancel_suck_cannon_suction_and_set_state_12(struct Moby *) __asm__("FUN_L17_002f0040"); -int enemy_stun_update(struct Moby *) __asm__("FUN_L17_002efea8"); -void robot_dog_update(unsigned char *) __asm__("FUN_L17_002eeb68"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_ROBOT_DOG_H */ diff --git a/include/rnc/overlay/l17/mobys/shattering_prop.h b/include/rnc/overlay/l17/mobys/shattering_prop.h deleted file mode 100644 index 4e80058b90..0000000000 --- a/include/rnc/overlay/l17/mobys/shattering_prop.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_SHATTERING_PROP_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_SHATTERING_PROP_H - -#include "types.h" - -struct Moby; - -void shattering_prop_update(struct Moby *) __asm__("FUN_L17_002f5260"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_SHATTERING_PROP_H */ diff --git a/include/rnc/overlay/l17/mobys/shuttle.h b/include/rnc/overlay/l17/mobys/shuttle.h deleted file mode 100644 index 14c4cc7967..0000000000 --- a/include/rnc/overlay/l17/mobys/shuttle.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L17_MOBYS_SHUTTLE_H -#define LOMBYTE_RNC_OVERLAY_L17_MOBYS_SHUTTLE_H - -#include "types.h" - -struct Moby; - -void shuttle_update(struct Moby *) __asm__("FUN_L17_002f1940"); - -#endif /* LOMBYTE_RNC_OVERLAY_L17_MOBYS_SHUTTLE_H */ diff --git a/include/rnc/overlay/l18/hero.h b/include/rnc/overlay/l18/hero.h new file mode 100644 index 0000000000..b03938456b --- /dev/null +++ b/include/rnc/overlay/l18/hero.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L18_HERO_H +#define LOMBYTE_RNC_OVERLAY_L18_HERO_H + +#include "types.h" + +int hero_set_state(int, int) __asm__("FUN_L18_00227dd0"); + +#endif /* LOMBYTE_RNC_OVERLAY_L18_HERO_H */ diff --git a/include/rnc/overlay/l18/hero/hero_set_state.h b/include/rnc/overlay/l18/hero/hero_set_state.h deleted file mode 100644 index b9d222ba7c..0000000000 --- a/include/rnc/overlay/l18/hero/hero_set_state.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_HERO_HERO_SET_STATE_H -#define LOMBYTE_RNC_OVERLAY_L18_HERO_HERO_SET_STATE_H - -#include "types.h" - -int hero_set_state(int, int) __asm__("FUN_L18_00227dd0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_HERO_HERO_SET_STATE_H */ diff --git a/include/rnc/overlay/l18/mobys.h b/include/rnc/overlay/l18/mobys.h new file mode 100644 index 0000000000..266a3bebd7 --- /dev/null +++ b/include/rnc/overlay/l18/mobys.h @@ -0,0 +1,38 @@ +#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_H + +#include "types.h" + +struct Moby; + +void boss_camera_transition_update(struct Moby *) __asm__("FUN_L18_002df608"); +void child_carrier_update(char *) __asm__("FUN_L18_002fa728"); +void set_group_child_carrier_byte_bc(int, int) __asm__("FUN_L18_002fa888"); +void deplanetizer_effects_update(struct Moby *) __asm__("FUN_L18_002f88e8"); +void cutscene_joint_trail_update() __asm__("FUN_L18_002fad28"); +void deplanetizer_gun_update() __asm__("FUN_L18_002f7ad8"); +void destructible_scenery_update(struct Moby *) __asm__("FUN_L18_002e9768"); +void drek_boss_damage_ring_update(struct Moby *) __asm__("FUN_L18_002dc260"); +void drek_boss_electric_ball_update(struct Moby *) __asm__("FUN_L18_002e9e70"); +void drek_boss_ring_projectile_update(struct Moby *) __asm__("FUN_L18_002db460"); +void drek_final_boss_robot_update() __asm__("FUN_L18_002f2bf0"); +void floating_platform_update(struct Moby *) __asm__("FUN_L18_002d82c0"); +void gadgebot_update(unsigned char *) __asm__("FUN_L18_002fbb98"); +void hide_moby_and_clear_collision(struct Moby *) __asm__("FUN_L18_002fcd00"); +int update_moby_suck_cannon_state(struct Moby *) __asm__("FUN_L18_002fcbb0"); +void grind_rail_junction_update(struct Moby *) __asm__("FUN_L18_002d62e8"); +void hidden_deplanetizer_gun_update(struct Moby *) __asm__("FUN_L18_002fa640"); +void inert_moby_update() __asm__("FUN_L18_002f7ab0"); +void lift_update(struct Moby *) __asm__("FUN_L18_002f2310"); +void hide_moby_and_disable_collision(struct Moby *) __asm__("FUN_L18_002d6280"); +void moby_568_update(struct Moby *) __asm__("FUN_L18_002d5918"); +int moby_hold_state_while_active(struct Moby *) __asm__("FUN_L18_002d6190"); +int update_moby_state_pause(struct Moby *) __asm__("FUN_L18_002d6108"); +void rocket_moby_update(struct Moby *) __asm__("FUN_L18_002d5050"); +void rocket_tank_update() __asm__("FUN_L18_002f7c40"); +void rocket_tank_rocket_update(char *) __asm__("FUN_L18_002a7220"); +void thruster_pack_lock_green_update(char *) __asm__("FUN_L18_002d6600"); +void thruster_pack_lock_red_update(struct Moby *) __asm__("FUN_L18_002d7b20"); +void trespasser_barrier_update(struct Moby *) __asm__("FUN_L18_002f1e68"); + +#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_H */ diff --git a/include/rnc/overlay/l18/mobys/camera_transition.h b/include/rnc/overlay/l18/mobys/camera_transition.h deleted file mode 100644 index 5cbb82cbbc..0000000000 --- a/include/rnc/overlay/l18/mobys/camera_transition.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_CAMERA_TRANSITION_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_CAMERA_TRANSITION_H - -#include "types.h" - -struct Moby; - -void boss_camera_transition_update(struct Moby *) __asm__("FUN_L18_002df608"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_CAMERA_TRANSITION_H */ diff --git a/include/rnc/overlay/l18/mobys/child_carrier.h b/include/rnc/overlay/l18/mobys/child_carrier.h deleted file mode 100644 index c9106c69d0..0000000000 --- a/include/rnc/overlay/l18/mobys/child_carrier.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_CHILD_CARRIER_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_CHILD_CARRIER_H - -#include "types.h" - -void child_carrier_update(char *) __asm__("FUN_L18_002fa728"); -void set_group_child_carrier_byte_bc(int, int) __asm__("FUN_L18_002fa888"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_CHILD_CARRIER_H */ diff --git a/include/rnc/overlay/l18/mobys/cutscene_effects.h b/include/rnc/overlay/l18/mobys/cutscene_effects.h deleted file mode 100644 index fe1871a939..0000000000 --- a/include/rnc/overlay/l18/mobys/cutscene_effects.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_CUTSCENE_EFFECTS_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_CUTSCENE_EFFECTS_H - -#include "types.h" - -struct Moby; - -void deplanetizer_effects_update(struct Moby *) __asm__("FUN_L18_002f88e8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_CUTSCENE_EFFECTS_H */ diff --git a/include/rnc/overlay/l18/mobys/cutscene_joint_trail.h b/include/rnc/overlay/l18/mobys/cutscene_joint_trail.h deleted file mode 100644 index 11cf4c31ba..0000000000 --- a/include/rnc/overlay/l18/mobys/cutscene_joint_trail.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_CUTSCENE_JOINT_TRAIL_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_CUTSCENE_JOINT_TRAIL_H - -#include "types.h" - -void cutscene_joint_trail_update() __asm__("FUN_L18_002fad28"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_CUTSCENE_JOINT_TRAIL_H */ diff --git a/include/rnc/overlay/l18/mobys/deplanetizer_gun.h b/include/rnc/overlay/l18/mobys/deplanetizer_gun.h deleted file mode 100644 index b54d5c341f..0000000000 --- a/include/rnc/overlay/l18/mobys/deplanetizer_gun.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_DEPLANETIZER_GUN_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_DEPLANETIZER_GUN_H - -#include "types.h" - -void deplanetizer_gun_update() __asm__("FUN_L18_002f7ad8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_DEPLANETIZER_GUN_H */ diff --git a/include/rnc/overlay/l18/mobys/destructible_scenery.h b/include/rnc/overlay/l18/mobys/destructible_scenery.h deleted file mode 100644 index 3364121d4d..0000000000 --- a/include/rnc/overlay/l18/mobys/destructible_scenery.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_DESTRUCTIBLE_SCENERY_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_DESTRUCTIBLE_SCENERY_H - -#include "types.h" - -struct Moby; - -void destructible_scenery_update(struct Moby *) __asm__("FUN_L18_002e9768"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_DESTRUCTIBLE_SCENERY_H */ diff --git a/include/rnc/overlay/l18/mobys/drek_boss_damage_ring.h b/include/rnc/overlay/l18/mobys/drek_boss_damage_ring.h deleted file mode 100644 index 4e7888d6ea..0000000000 --- a/include/rnc/overlay/l18/mobys/drek_boss_damage_ring.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_DREK_BOSS_DAMAGE_RING_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_DREK_BOSS_DAMAGE_RING_H - -#include "types.h" - -struct Moby; - -void drek_boss_damage_ring_update(struct Moby *) __asm__("FUN_L18_002dc260"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_DREK_BOSS_DAMAGE_RING_H */ diff --git a/include/rnc/overlay/l18/mobys/drek_boss_electric_ball.h b/include/rnc/overlay/l18/mobys/drek_boss_electric_ball.h deleted file mode 100644 index bdb68b6c14..0000000000 --- a/include/rnc/overlay/l18/mobys/drek_boss_electric_ball.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_DREK_BOSS_ELECTRIC_BALL_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_DREK_BOSS_ELECTRIC_BALL_H - -#include "types.h" - -struct Moby; - -void drek_boss_electric_ball_update(struct Moby *) __asm__("FUN_L18_002e9e70"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_DREK_BOSS_ELECTRIC_BALL_H */ diff --git a/include/rnc/overlay/l18/mobys/drek_boss_ring_projectile.h b/include/rnc/overlay/l18/mobys/drek_boss_ring_projectile.h deleted file mode 100644 index 1ed52ac6b2..0000000000 --- a/include/rnc/overlay/l18/mobys/drek_boss_ring_projectile.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_DREK_BOSS_RING_PROJECTILE_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_DREK_BOSS_RING_PROJECTILE_H - -#include "types.h" - -struct Moby; - -void drek_boss_ring_projectile_update(struct Moby *) __asm__("FUN_L18_002db460"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_DREK_BOSS_RING_PROJECTILE_H */ diff --git a/include/rnc/overlay/l18/mobys/drek_final_boss_robot.h b/include/rnc/overlay/l18/mobys/drek_final_boss_robot.h deleted file mode 100644 index dd83a11320..0000000000 --- a/include/rnc/overlay/l18/mobys/drek_final_boss_robot.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_DREK_FINAL_BOSS_ROBOT_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_DREK_FINAL_BOSS_ROBOT_H - -#include "types.h" - -void drek_final_boss_robot_update() __asm__("FUN_L18_002f2bf0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_DREK_FINAL_BOSS_ROBOT_H */ diff --git a/include/rnc/overlay/l18/mobys/floating_platform.h b/include/rnc/overlay/l18/mobys/floating_platform.h deleted file mode 100644 index fc62e1af19..0000000000 --- a/include/rnc/overlay/l18/mobys/floating_platform.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_FLOATING_PLATFORM_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_FLOATING_PLATFORM_H - -#include "types.h" - -struct Moby; - -void floating_platform_update(struct Moby *) __asm__("FUN_L18_002d82c0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_FLOATING_PLATFORM_H */ diff --git a/include/rnc/overlay/l18/mobys/gadgebot.h b/include/rnc/overlay/l18/mobys/gadgebot.h deleted file mode 100644 index eaed73aa19..0000000000 --- a/include/rnc/overlay/l18/mobys/gadgebot.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_GADGEBOT_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_GADGEBOT_H - -#include "types.h" - -struct Moby; - -void gadgebot_update(unsigned char *) __asm__("FUN_L18_002fbb98"); -void hide_moby_and_clear_collision(struct Moby *) __asm__("FUN_L18_002fcd00"); -int update_moby_suck_cannon_state(struct Moby *) __asm__("FUN_L18_002fcbb0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_GADGEBOT_H */ diff --git a/include/rnc/overlay/l18/mobys/grind_rail_junction.h b/include/rnc/overlay/l18/mobys/grind_rail_junction.h deleted file mode 100644 index 5c6aea34a5..0000000000 --- a/include/rnc/overlay/l18/mobys/grind_rail_junction.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_GRIND_RAIL_JUNCTION_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_GRIND_RAIL_JUNCTION_H - -#include "types.h" - -struct Moby; - -void grind_rail_junction_update(struct Moby *) __asm__("FUN_L18_002d62e8"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_GRIND_RAIL_JUNCTION_H */ diff --git a/include/rnc/overlay/l18/mobys/hidden_deplanetizer_gun.h b/include/rnc/overlay/l18/mobys/hidden_deplanetizer_gun.h deleted file mode 100644 index 48c3bf2995..0000000000 --- a/include/rnc/overlay/l18/mobys/hidden_deplanetizer_gun.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_HIDDEN_DEPLANETIZER_GUN_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_HIDDEN_DEPLANETIZER_GUN_H - -#include "types.h" - -struct Moby; - -void hidden_deplanetizer_gun_update(struct Moby *) __asm__("FUN_L18_002fa640"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_HIDDEN_DEPLANETIZER_GUN_H */ diff --git a/include/rnc/overlay/l18/mobys/inert_moby.h b/include/rnc/overlay/l18/mobys/inert_moby.h deleted file mode 100644 index 46c07a800b..0000000000 --- a/include/rnc/overlay/l18/mobys/inert_moby.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_INERT_MOBY_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_INERT_MOBY_H - -#include "types.h" - -void inert_moby_update() __asm__("FUN_L18_002f7ab0"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_INERT_MOBY_H */ diff --git a/include/rnc/overlay/l18/mobys/lift.h b/include/rnc/overlay/l18/mobys/lift.h deleted file mode 100644 index f6858c671e..0000000000 --- a/include/rnc/overlay/l18/mobys/lift.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_LIFT_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_LIFT_H - -#include "types.h" - -struct Moby; - -void lift_update(struct Moby *) __asm__("FUN_L18_002f2310"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_LIFT_H */ diff --git a/include/rnc/overlay/l18/mobys/mine.h b/include/rnc/overlay/l18/mobys/mine.h deleted file mode 100644 index aa28a72c7f..0000000000 --- a/include/rnc/overlay/l18/mobys/mine.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_MINE_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_MINE_H - -#include "types.h" - -struct Moby; - -void hide_moby_and_disable_collision(struct Moby *) __asm__("FUN_L18_002d6280"); -void moby_568_update(struct Moby *) __asm__("FUN_L18_002d5918"); -int moby_hold_state_while_active(struct Moby *) __asm__("FUN_L18_002d6190"); -int update_moby_state_pause(struct Moby *) __asm__("FUN_L18_002d6108"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_MINE_H */ diff --git a/include/rnc/overlay/l18/mobys/rocket.h b/include/rnc/overlay/l18/mobys/rocket.h deleted file mode 100644 index 3757450fab..0000000000 --- a/include/rnc/overlay/l18/mobys/rocket.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_ROCKET_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_ROCKET_H - -#include "types.h" - -struct Moby; - -void rocket_moby_update(struct Moby *) __asm__("FUN_L18_002d5050"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_ROCKET_H */ diff --git a/include/rnc/overlay/l18/mobys/rocket_tank.h b/include/rnc/overlay/l18/mobys/rocket_tank.h deleted file mode 100644 index 9cd26b6557..0000000000 --- a/include/rnc/overlay/l18/mobys/rocket_tank.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_ROCKET_TANK_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_ROCKET_TANK_H - -#include "types.h" - -void rocket_tank_update() __asm__("FUN_L18_002f7c40"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_ROCKET_TANK_H */ diff --git a/include/rnc/overlay/l18/mobys/rocket_tank_rocket.h b/include/rnc/overlay/l18/mobys/rocket_tank_rocket.h deleted file mode 100644 index 5a39f306e4..0000000000 --- a/include/rnc/overlay/l18/mobys/rocket_tank_rocket.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_ROCKET_TANK_ROCKET_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_ROCKET_TANK_ROCKET_H - -#include "types.h" - -void rocket_tank_rocket_update(char *) __asm__("FUN_L18_002a7220"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_ROCKET_TANK_ROCKET_H */ diff --git a/include/rnc/overlay/l18/mobys/thruster_pack_lock_green.h b/include/rnc/overlay/l18/mobys/thruster_pack_lock_green.h deleted file mode 100644 index a039742e48..0000000000 --- a/include/rnc/overlay/l18/mobys/thruster_pack_lock_green.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_THRUSTER_PACK_LOCK_GREEN_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_THRUSTER_PACK_LOCK_GREEN_H - -#include "types.h" - -void thruster_pack_lock_green_update(char *) __asm__("FUN_L18_002d6600"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_THRUSTER_PACK_LOCK_GREEN_H */ diff --git a/include/rnc/overlay/l18/mobys/thruster_pack_lock_red.h b/include/rnc/overlay/l18/mobys/thruster_pack_lock_red.h deleted file mode 100644 index c32f437415..0000000000 --- a/include/rnc/overlay/l18/mobys/thruster_pack_lock_red.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_THRUSTER_PACK_LOCK_RED_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_THRUSTER_PACK_LOCK_RED_H - -#include "types.h" - -struct Moby; - -void thruster_pack_lock_red_update(struct Moby *) __asm__("FUN_L18_002d7b20"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_THRUSTER_PACK_LOCK_RED_H */ diff --git a/include/rnc/overlay/l18/mobys/trespasser_barrier.h b/include/rnc/overlay/l18/mobys/trespasser_barrier.h deleted file mode 100644 index 718b85e22b..0000000000 --- a/include/rnc/overlay/l18/mobys/trespasser_barrier.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_L18_MOBYS_TRESPASSER_BARRIER_H -#define LOMBYTE_RNC_OVERLAY_L18_MOBYS_TRESPASSER_BARRIER_H - -#include "types.h" - -struct Moby; - -void trespasser_barrier_update(struct Moby *) __asm__("FUN_L18_002f1e68"); - -#endif /* LOMBYTE_RNC_OVERLAY_L18_MOBYS_TRESPASSER_BARRIER_H */ diff --git a/include/rnc/overlay/shared/audio/emitters.h b/include/rnc/overlay/shared/audio/emitters.h new file mode 100644 index 0000000000..9979c299dd --- /dev/null +++ b/include/rnc/overlay/shared/audio/emitters.h @@ -0,0 +1,14 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_H +#define LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_H + +#include "types.h" + +void update_box_emitter(char *) __asm__("FUN_L01_00319928"); +void update_sound_emitter_playback_by_distance(u8 *) __asm__("FUN_L00_002ed950"); +void update_ground_height_modulated_voice(char *) __asm__("FUN_L08_00316fa8"); +void update_listener_emitter(int) __asm__("FUN_L01_0031a078"); +void update_music_switch_emitter(int *) __asm__("FUN_L01_0031a128"); +void update_sound_emitter_playback_at_random_position(u8 *) __asm__("FUN_L00_002edad8"); +void update_reverb_box_emitter(char *) __asm__("FUN_L01_00319f18"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_H */ diff --git a/include/rnc/overlay/shared/audio/emitters/box_emitter.h b/include/rnc/overlay/shared/audio/emitters/box_emitter.h deleted file mode 100644 index bc1607ecba..0000000000 --- a/include/rnc/overlay/shared/audio/emitters/box_emitter.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_BOX_EMITTER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_BOX_EMITTER_H - -#include "types.h" - -void update_box_emitter(char *) __asm__("FUN_L01_00319928"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_BOX_EMITTER_H */ diff --git a/include/rnc/overlay/shared/audio/emitters/distance_emitter.h b/include/rnc/overlay/shared/audio/emitters/distance_emitter.h deleted file mode 100644 index d4add81ce4..0000000000 --- a/include/rnc/overlay/shared/audio/emitters/distance_emitter.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_DISTANCE_EMITTER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_DISTANCE_EMITTER_H - -#include "types.h" - -void update_sound_emitter_playback_by_distance(u8 *) __asm__("FUN_L00_002ed950"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_DISTANCE_EMITTER_H */ diff --git a/include/rnc/overlay/shared/audio/emitters/ground_height_emitter.h b/include/rnc/overlay/shared/audio/emitters/ground_height_emitter.h deleted file mode 100644 index abbda33bb7..0000000000 --- a/include/rnc/overlay/shared/audio/emitters/ground_height_emitter.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_GROUND_HEIGHT_EMITTER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_GROUND_HEIGHT_EMITTER_H - -#include "types.h" - -void update_ground_height_modulated_voice(char *) __asm__("FUN_L08_00316fa8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_GROUND_HEIGHT_EMITTER_H */ diff --git a/include/rnc/overlay/shared/audio/emitters/listener_emitter.h b/include/rnc/overlay/shared/audio/emitters/listener_emitter.h deleted file mode 100644 index 652884779d..0000000000 --- a/include/rnc/overlay/shared/audio/emitters/listener_emitter.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_LISTENER_EMITTER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_LISTENER_EMITTER_H - -#include "types.h" - -void update_listener_emitter(int) __asm__("FUN_L01_0031a078"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_LISTENER_EMITTER_H */ diff --git a/include/rnc/overlay/shared/audio/emitters/music_switch_emitter.h b/include/rnc/overlay/shared/audio/emitters/music_switch_emitter.h deleted file mode 100644 index d5de48819b..0000000000 --- a/include/rnc/overlay/shared/audio/emitters/music_switch_emitter.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_MUSIC_SWITCH_EMITTER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_MUSIC_SWITCH_EMITTER_H - -#include "types.h" - -void update_music_switch_emitter(int *) __asm__("FUN_L01_0031a128"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_MUSIC_SWITCH_EMITTER_H */ diff --git a/include/rnc/overlay/shared/audio/emitters/random_position_emitter.h b/include/rnc/overlay/shared/audio/emitters/random_position_emitter.h deleted file mode 100644 index 2d8e28078d..0000000000 --- a/include/rnc/overlay/shared/audio/emitters/random_position_emitter.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_RANDOM_POSITION_EMITTER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_RANDOM_POSITION_EMITTER_H - -#include "types.h" - -void update_sound_emitter_playback_at_random_position(u8 *) __asm__("FUN_L00_002edad8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_RANDOM_POSITION_EMITTER_H */ diff --git a/include/rnc/overlay/shared/audio/emitters/reverb_box_emitter.h b/include/rnc/overlay/shared/audio/emitters/reverb_box_emitter.h deleted file mode 100644 index 938cc449a5..0000000000 --- a/include/rnc/overlay/shared/audio/emitters/reverb_box_emitter.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_REVERB_BOX_EMITTER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_REVERB_BOX_EMITTER_H - -#include "types.h" - -void update_reverb_box_emitter(char *) __asm__("FUN_L01_00319f18"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_EMITTERS_REVERB_BOX_EMITTER_H */ diff --git a/include/rnc/overlay/shared/audio/voices.h b/include/rnc/overlay/shared/audio/voices.h new file mode 100644 index 0000000000..014f5afc04 --- /dev/null +++ b/include/rnc/overlay/shared/audio/voices.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_VOICES_H +#define LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_VOICES_H + +#include "types.h" + +void set_requested_state_and_mark_changes(int, int, int, int, int) __asm__("FUN_L01_002a1a90"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_VOICES_H */ diff --git a/include/rnc/overlay/shared/audio/voices/set_requested_state_and_mark_changes.h b/include/rnc/overlay/shared/audio/voices/set_requested_state_and_mark_changes.h deleted file mode 100644 index 3cfae322fe..0000000000 --- a/include/rnc/overlay/shared/audio/voices/set_requested_state_and_mark_changes.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_VOICES_SET_REQUESTED_STATE_AND_MARK_CHANGES_H -#define LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_VOICES_SET_REQUESTED_STATE_AND_MARK_CHANGES_H - -#include "types.h" - -void set_requested_state_and_mark_changes(int, int, int, int, int) __asm__("FUN_L01_002a1a90"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_AUDIO_VOICES_SET_REQUESTED_STATE_AND_MARK_CHANGES_H */ diff --git a/include/rnc/overlay/shared/camera.h b/include/rnc/overlay/shared/camera.h new file mode 100644 index 0000000000..4a12803de4 --- /dev/null +++ b/include/rnc/overlay/shared/camera.h @@ -0,0 +1,36 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_H +#define LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_H + +#include "types.h" + +struct UpdateCam; + +s32 volume_camera_check(struct UpdateCam *) __asm__("FUN_L00_002ed8b0"); +int evaluate_clip_volume_candidate(char *, char *) __asm__("FUN_L03_002e8870"); +void set_transform_state_three_when_outside_clip_volume(char *) __asm__("FUN_L03_002e8980"); +void try_select_camera_offset_effect_moby(char *) __asm__("FUN_L02_002fa7c8"); +void set_follow_camera_orbit_clamp_mode(int) __asm__("FUN_L00_002e8568"); +void set_follow_camera_blend_output_flags(void) __asm__("FUN_L00_002e8680"); +void FUN_L00_002e8620(void); +void FUN_L00_002e8490(float); +void follow_camera_setup() __asm__("FUN_L00_002e6d60"); +void reset_follow_camera_state_from_position(char *) __asm__("FUN_L00_002e6bf8"); +void follow_camera_auto_turn(int) __asm__("FUN_L00_002e8f40"); +void follow_camera_update(u8 *) __asm__("FUN_L00_002e9c28"); +void initialize_camera_transform_and_paths() __asm__("FUN_L01_00315de0"); +void update_camera_mode_from_preset() __asm__("FUN_L01_00316030"); +void update_camera_position_and_orientation_from_paths() __asm__("FUN_L01_00315358"); +void initialize_hero_aligned_camera_mode(void) __asm__("FUN_L00_002ea7a0"); +int camera_transition_update(u8 *, char *) __asm__("FUN_L00_002ea488"); +void select_camera_mode_by_hero_vector_alignment() __asm__("FUN_L00_002ea810"); +void update_hero_aligned_camera_from_input(u8 *) __asm__("FUN_L00_002e9f38"); +void reset_camera_from_source_transform(char *) __asm__("FUN_L05_0032a6e0"); +int update_moby_camera_control(char *) __asm__("FUN_L02_002fc298"); +void release_moby_camera_control(char *) __asm__("FUN_L06_00316330"); +void initialize_orbit_camera_from_hero() __asm__("FUN_L00_002ebb00"); +void register_camera_update_callback(int) __asm__("FUN_L02_001fc008"); +void conditionally_set_camera_state_three(char *) __asm__("FUN_L00_002ec7b0"); +void initialize_target_tracking_camera(void *) __asm__("FUN_L00_002ebbd8"); +void update_target_tracking_camera(char *) __asm__("FUN_L00_002ec6c0"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_H */ diff --git a/include/rnc/overlay/shared/camera/aim_volume_camera.h b/include/rnc/overlay/shared/camera/aim_volume_camera.h deleted file mode 100644 index 13136d4551..0000000000 --- a/include/rnc/overlay/shared/camera/aim_volume_camera.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_AIM_VOLUME_CAMERA_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_AIM_VOLUME_CAMERA_H - -#include "types.h" - -struct UpdateCam; - -s32 volume_camera_check(struct UpdateCam *) __asm__("FUN_L00_002ed8b0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_AIM_VOLUME_CAMERA_H */ diff --git a/include/rnc/overlay/shared/camera/clip_volume_camera.h b/include/rnc/overlay/shared/camera/clip_volume_camera.h deleted file mode 100644 index a7d2d9ef8e..0000000000 --- a/include/rnc/overlay/shared/camera/clip_volume_camera.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_CLIP_VOLUME_CAMERA_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_CLIP_VOLUME_CAMERA_H - -#include "types.h" - -int evaluate_clip_volume_candidate(char *, char *) __asm__("FUN_L03_002e8870"); -void set_transform_state_three_when_outside_clip_volume(char *) __asm__("FUN_L03_002e8980"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_CLIP_VOLUME_CAMERA_H */ diff --git a/include/rnc/overlay/shared/camera/follow_camera_offset_effect.h b/include/rnc/overlay/shared/camera/follow_camera_offset_effect.h deleted file mode 100644 index 224eb54a9e..0000000000 --- a/include/rnc/overlay/shared/camera/follow_camera_offset_effect.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_FOLLOW_CAMERA_OFFSET_EFFECT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_FOLLOW_CAMERA_OFFSET_EFFECT_H - -#include "types.h" - -void try_select_camera_offset_effect_moby(char *) __asm__("FUN_L02_002fa7c8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_FOLLOW_CAMERA_OFFSET_EFFECT_H */ diff --git a/include/rnc/overlay/shared/camera/follow_camera_set_distance.h b/include/rnc/overlay/shared/camera/follow_camera_set_distance.h deleted file mode 100644 index def53f5f56..0000000000 --- a/include/rnc/overlay/shared/camera/follow_camera_set_distance.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_FOLLOW_CAMERA_SET_DISTANCE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_FOLLOW_CAMERA_SET_DISTANCE_H - -#include "types.h" - -void set_follow_camera_orbit_clamp_mode(int) __asm__("FUN_L00_002e8568"); -void set_follow_camera_blend_output_flags(void) __asm__("FUN_L00_002e8680"); -void FUN_L00_002e8620(void); -void FUN_L00_002e8490(float); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_FOLLOW_CAMERA_SET_DISTANCE_H */ diff --git a/include/rnc/overlay/shared/camera/follow_camera_setup.h b/include/rnc/overlay/shared/camera/follow_camera_setup.h deleted file mode 100644 index 0def3c92f7..0000000000 --- a/include/rnc/overlay/shared/camera/follow_camera_setup.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_FOLLOW_CAMERA_SETUP_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_FOLLOW_CAMERA_SETUP_H - -#include "types.h" - -void follow_camera_setup() __asm__("FUN_L00_002e6d60"); -void reset_follow_camera_state_from_position(char *) __asm__("FUN_L00_002e6bf8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_FOLLOW_CAMERA_SETUP_H */ diff --git a/include/rnc/overlay/shared/camera/follow_camera_turn_and_pitch.h b/include/rnc/overlay/shared/camera/follow_camera_turn_and_pitch.h deleted file mode 100644 index 5586a65b68..0000000000 --- a/include/rnc/overlay/shared/camera/follow_camera_turn_and_pitch.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_FOLLOW_CAMERA_TURN_AND_PITCH_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_FOLLOW_CAMERA_TURN_AND_PITCH_H - -#include "types.h" - -void follow_camera_auto_turn(int) __asm__("FUN_L00_002e8f40"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_FOLLOW_CAMERA_TURN_AND_PITCH_H */ diff --git a/include/rnc/overlay/shared/camera/follow_camera_update.h b/include/rnc/overlay/shared/camera/follow_camera_update.h deleted file mode 100644 index 09c81487bd..0000000000 --- a/include/rnc/overlay/shared/camera/follow_camera_update.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_FOLLOW_CAMERA_UPDATE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_FOLLOW_CAMERA_UPDATE_H - -#include "types.h" - -void follow_camera_update(u8 *) __asm__("FUN_L00_002e9c28"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_FOLLOW_CAMERA_UPDATE_H */ diff --git a/include/rnc/overlay/shared/camera/grindrail_camera.h b/include/rnc/overlay/shared/camera/grindrail_camera.h deleted file mode 100644 index 4a7be0b5b4..0000000000 --- a/include/rnc/overlay/shared/camera/grindrail_camera.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_GRINDRAIL_CAMERA_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_GRINDRAIL_CAMERA_H - -#include "types.h" - -void initialize_camera_transform_and_paths() __asm__("FUN_L01_00315de0"); -void update_camera_mode_from_preset() __asm__("FUN_L01_00316030"); -void update_camera_position_and_orientation_from_paths() __asm__("FUN_L01_00315358"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_GRINDRAIL_CAMERA_H */ diff --git a/include/rnc/overlay/shared/camera/hero_aligned_camera.h b/include/rnc/overlay/shared/camera/hero_aligned_camera.h deleted file mode 100644 index b0acae2758..0000000000 --- a/include/rnc/overlay/shared/camera/hero_aligned_camera.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_HERO_ALIGNED_CAMERA_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_HERO_ALIGNED_CAMERA_H - -#include "types.h" - -void initialize_hero_aligned_camera_mode(void) __asm__("FUN_L00_002ea7a0"); -int camera_transition_update(u8 *, char *) __asm__("FUN_L00_002ea488"); -void select_camera_mode_by_hero_vector_alignment() __asm__("FUN_L00_002ea810"); -void update_hero_aligned_camera_from_input(u8 *) __asm__("FUN_L00_002e9f38"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_HERO_ALIGNED_CAMERA_H */ diff --git a/include/rnc/overlay/shared/camera/hoverboard_camera.h b/include/rnc/overlay/shared/camera/hoverboard_camera.h deleted file mode 100644 index 6a26704f55..0000000000 --- a/include/rnc/overlay/shared/camera/hoverboard_camera.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_HOVERBOARD_CAMERA_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_HOVERBOARD_CAMERA_H - -#include "types.h" - -void reset_camera_from_source_transform(char *) __asm__("FUN_L05_0032a6e0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_HOVERBOARD_CAMERA_H */ diff --git a/include/rnc/overlay/shared/camera/moby_controlled_camera.h b/include/rnc/overlay/shared/camera/moby_controlled_camera.h deleted file mode 100644 index b9b398ad06..0000000000 --- a/include/rnc/overlay/shared/camera/moby_controlled_camera.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_MOBY_CONTROLLED_CAMERA_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_MOBY_CONTROLLED_CAMERA_H - -#include "types.h" - -int update_moby_camera_control(char *) __asm__("FUN_L02_002fc298"); -void release_moby_camera_control(char *) __asm__("FUN_L06_00316330"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_MOBY_CONTROLLED_CAMERA_H */ diff --git a/include/rnc/overlay/shared/camera/orbit_camera.h b/include/rnc/overlay/shared/camera/orbit_camera.h deleted file mode 100644 index 9dd9a9c38b..0000000000 --- a/include/rnc/overlay/shared/camera/orbit_camera.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_ORBIT_CAMERA_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_ORBIT_CAMERA_H - -#include "types.h" - -void initialize_orbit_camera_from_hero() __asm__("FUN_L00_002ebb00"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_ORBIT_CAMERA_H */ diff --git a/include/rnc/overlay/shared/camera/register_camera_update_callback.h b/include/rnc/overlay/shared/camera/register_camera_update_callback.h deleted file mode 100644 index 5ea534a50a..0000000000 --- a/include/rnc/overlay/shared/camera/register_camera_update_callback.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_REGISTER_CAMERA_UPDATE_CALLBACK_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_REGISTER_CAMERA_UPDATE_CALLBACK_H - -#include "types.h" - -void register_camera_update_callback(int) __asm__("FUN_L02_001fc008"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_REGISTER_CAMERA_UPDATE_CALLBACK_H */ diff --git a/include/rnc/overlay/shared/camera/target_tracking_camera.h b/include/rnc/overlay/shared/camera/target_tracking_camera.h deleted file mode 100644 index 9a57777e9a..0000000000 --- a/include/rnc/overlay/shared/camera/target_tracking_camera.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_TARGET_TRACKING_CAMERA_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_TARGET_TRACKING_CAMERA_H - -#include "types.h" - -void conditionally_set_camera_state_three(char *) __asm__("FUN_L00_002ec7b0"); -void initialize_target_tracking_camera(void *) __asm__("FUN_L00_002ebbd8"); -void update_target_tracking_camera(char *) __asm__("FUN_L00_002ec6c0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CAMERA_TARGET_TRACKING_CAMERA_H */ diff --git a/include/rnc/overlay/shared/cutscenes.h b/include/rnc/overlay/shared/cutscenes.h new file mode 100644 index 0000000000..42e0769108 --- /dev/null +++ b/include/rnc/overlay/shared/cutscenes.h @@ -0,0 +1,10 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CUTSCENES_H +#define LOMBYTE_RNC_OVERLAY_SHARED_CUTSCENES_H + +#include "types.h" + +void fred_1_update(char *) __asm__("FUN_L03_002dc310"); +void qwark_rilgar_update() __asm__("FUN_L03_002dc478"); +void the_plumber_update() __asm__("FUN_L01_002ff118"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CUTSCENES_H */ diff --git a/include/rnc/overlay/shared/cutscenes/fred_1.h b/include/rnc/overlay/shared/cutscenes/fred_1.h deleted file mode 100644 index bca2114958..0000000000 --- a/include/rnc/overlay/shared/cutscenes/fred_1.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CUTSCENES_FRED_1_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CUTSCENES_FRED_1_H - -#include "types.h" - -void fred_1_update(char *) __asm__("FUN_L03_002dc310"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CUTSCENES_FRED_1_H */ diff --git a/include/rnc/overlay/shared/cutscenes/qwark_rilgar.h b/include/rnc/overlay/shared/cutscenes/qwark_rilgar.h deleted file mode 100644 index 8fb16d2449..0000000000 --- a/include/rnc/overlay/shared/cutscenes/qwark_rilgar.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CUTSCENES_QWARK_RILGAR_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CUTSCENES_QWARK_RILGAR_H - -#include "types.h" - -void qwark_rilgar_update() __asm__("FUN_L03_002dc478"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CUTSCENES_QWARK_RILGAR_H */ diff --git a/include/rnc/overlay/shared/cutscenes/the_plumber.h b/include/rnc/overlay/shared/cutscenes/the_plumber.h deleted file mode 100644 index ba00683c0b..0000000000 --- a/include/rnc/overlay/shared/cutscenes/the_plumber.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_CUTSCENES_THE_PLUMBER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_CUTSCENES_THE_PLUMBER_H - -#include "types.h" - -void the_plumber_update() __asm__("FUN_L01_002ff118"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_CUTSCENES_THE_PLUMBER_H */ diff --git a/include/rnc/overlay/shared/enemies.h b/include/rnc/overlay/shared/enemies.h new file mode 100644 index 0000000000..712b2794ae --- /dev/null +++ b/include/rnc/overlay/shared/enemies.h @@ -0,0 +1,61 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_H +#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_H + +#include "types.h" + +struct Moby; + +void armed_transport_update(char *) __asm__("FUN_L16_002e22d8"); +void armed_transport_rocket_update(char *) __asm__("FUN_L16_002a0a98"); +void billboard_projectile_update(char *) __asm__("FUN_L01_002c7530"); +void blarg_commander_update(char *) __asm__("FUN_L12_00308918"); +void blarg_elite_commando_update(char *) __asm__("FUN_L16_002d2cf0"); +void blarg_gun_update(char *) __asm__("FUN_L05_003186f8"); +void helicopter_spark_update() __asm__("FUN_L03_002d47c0"); +void blarg_paratrooper_update(char *) __asm__("FUN_L08_00301158"); +void emit_moby_sprite_particles(char *) __asm__("FUN_L10_00298940"); +void blarg_ship_rocket_update(char *) __asm__("FUN_L10_002cc2e8"); +char *spawn_blarg_ship_shot(int, float *, float *, float, float, float) __asm__("FUN_L11_00308f48"); +void blarg_ship_shot_update(char *) __asm__("FUN_L11_00309098"); +void blarg_space_commando_update(struct Moby *) __asm__("FUN_L06_002fdbd0"); +void blarg_trooper_projectile_update(struct Moby *) __asm__("FUN_L04_002af058"); +void bolt_thief_mine_update(struct Moby *) __asm__("FUN_L14_002ff640"); +void bomb_spawner_update(struct Moby *) __asm__("FUN_L03_002bef68"); +void bomb_spawner_bomb_update(struct Moby *) __asm__("FUN_L03_002c4718"); +s32 cancel_moby_suction_and_save_state(unsigned char *) __asm__("FUN_L06_002ea7c8"); +void frog_update(unsigned char *) __asm__("FUN_L06_002e8678"); +int update_moby_grab_state(struct Moby *) __asm__("FUN_L06_002ea5e0"); +int update_moby_suck_cannon_storage_state(unsigned char *) __asm__("FUN_L06_002ea6a8"); +void get_moby_data_plus_0x60() __asm__("FUN_L01_002f1df8"); +void ground_melee_enemy_update() __asm__("FUN_L09_002e27d8"); +int moby_hold_state_if_grabbed(struct Moby *) __asm__("FUN_L01_002f1c78"); +int run_moby_helper_and_set_state_7(struct Moby *) __asm__("FUN_L01_002f1dc8"); +void hero_seeking_mine_update(char *) __asm__("FUN_L15_002a2488"); +int cancel_suck_cannon_suction_and_set_moby_state_9(char *) __asm__("FUN_L00_002d57d0"); +void get_moby_private_data_d0_address() __asm__("FUN_L00_002d5800"); +void horny_toad_update() __asm__("FUN_L00_002d4610"); +int process_suck_cannon_suction_and_update_moby_state(char *) __asm__("FUN_L00_002d56e0"); +void collect_moby_and_clear_path_keys(struct Moby *) __asm__("FUN_L00_002d5830"); +int cancel_suck_cannon_suction_and_set_state_14(struct Moby *) __asm__("FUN_L01_002efb98"); +void get_moby_data_plus_0xc0() __asm__("FUN_L01_002efbc8"); +void large_amoeboid_update(unsigned char *) __asm__("FUN_L01_002edca0"); +int moby_hold_state_if_found(struct Moby *) __asm__("FUN_L01_002efaf8"); +int process_amoeboid_suck_cannon_suction(struct Moby *) __asm__("FUN_L01_002efa88"); +void fire_bolt_update(char *) __asm__("FUN_L08_00307298"); +void sand_mouse_update(struct Moby *) __asm__("FUN_L01_002e3f20"); +void sandmouse_update() __asm__("FUN_L01_0030df40"); +void sandmouse_house_update(unsigned char *) __asm__("FUN_L01_002f2b68"); +void sandmouse_projectile_update(char *) __asm__("FUN_L01_0030c9a8"); +void *enter_scoutbot_return_home_state(struct Moby *) __asm__("FUN_L08_002d4050"); +void scoutbot_update() __asm__("FUN_L08_002d2af0"); +void seeker_update(struct Moby *) __asm__("FUN_L09_002c5990"); +void sentrybot_update(unsigned char *) __asm__("FUN_L15_002979d8"); +void set_sentrybot_alarm_duration(char *, int) __asm__("FUN_L15_002cbac0"); +void mark_moby_killed_and_release_owned_voice(int) __asm__("FUN_L15_002a35d8"); +void sentrybot_alarm_update(unsigned char *) __asm__("FUN_L15_002cb4c8"); +void sentrybot_projectile_update(unsigned char *) __asm__("FUN_L15_002e4380"); +void smoke_trail_projectile_update(char *) __asm__("FUN_L01_002eda00"); +void spawner_update(char *) __asm__("FUN_L09_0030ab80"); +void spiderbot_update(unsigned char *) __asm__("FUN_L15_002a6e68"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_H */ diff --git a/include/rnc/overlay/shared/enemies/armed_transport.h b/include/rnc/overlay/shared/enemies/armed_transport.h deleted file mode 100644 index 5259a35be4..0000000000 --- a/include/rnc/overlay/shared/enemies/armed_transport.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_ARMED_TRANSPORT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_ARMED_TRANSPORT_H - -#include "types.h" - -void armed_transport_update(char *) __asm__("FUN_L16_002e22d8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_ARMED_TRANSPORT_H */ diff --git a/include/rnc/overlay/shared/enemies/armed_transport_rocket.h b/include/rnc/overlay/shared/enemies/armed_transport_rocket.h deleted file mode 100644 index 8678ae110d..0000000000 --- a/include/rnc/overlay/shared/enemies/armed_transport_rocket.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_ARMED_TRANSPORT_ROCKET_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_ARMED_TRANSPORT_ROCKET_H - -#include "types.h" - -void armed_transport_rocket_update(char *) __asm__("FUN_L16_002a0a98"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_ARMED_TRANSPORT_ROCKET_H */ diff --git a/include/rnc/overlay/shared/enemies/billboard_projectile.h b/include/rnc/overlay/shared/enemies/billboard_projectile.h deleted file mode 100644 index 7f7f3ee858..0000000000 --- a/include/rnc/overlay/shared/enemies/billboard_projectile.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BILLBOARD_PROJECTILE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BILLBOARD_PROJECTILE_H - -#include "types.h" - -void billboard_projectile_update(char *) __asm__("FUN_L01_002c7530"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BILLBOARD_PROJECTILE_H */ diff --git a/include/rnc/overlay/shared/enemies/blarg_commander.h b/include/rnc/overlay/shared/enemies/blarg_commander.h deleted file mode 100644 index af7f04f301..0000000000 --- a/include/rnc/overlay/shared/enemies/blarg_commander.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_COMMANDER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_COMMANDER_H - -#include "types.h" - -void blarg_commander_update(char *) __asm__("FUN_L12_00308918"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_COMMANDER_H */ diff --git a/include/rnc/overlay/shared/enemies/blarg_elite_commando.h b/include/rnc/overlay/shared/enemies/blarg_elite_commando.h deleted file mode 100644 index a032da5a5a..0000000000 --- a/include/rnc/overlay/shared/enemies/blarg_elite_commando.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_ELITE_COMMANDO_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_ELITE_COMMANDO_H - -#include "types.h" - -void blarg_elite_commando_update(char *) __asm__("FUN_L16_002d2cf0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_ELITE_COMMANDO_H */ diff --git a/include/rnc/overlay/shared/enemies/blarg_gun.h b/include/rnc/overlay/shared/enemies/blarg_gun.h deleted file mode 100644 index 69af9b0590..0000000000 --- a/include/rnc/overlay/shared/enemies/blarg_gun.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_GUN_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_GUN_H - -#include "types.h" - -void blarg_gun_update(char *) __asm__("FUN_L05_003186f8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_GUN_H */ diff --git a/include/rnc/overlay/shared/enemies/blarg_helicopter_spark.h b/include/rnc/overlay/shared/enemies/blarg_helicopter_spark.h deleted file mode 100644 index 80d910535c..0000000000 --- a/include/rnc/overlay/shared/enemies/blarg_helicopter_spark.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_HELICOPTER_SPARK_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_HELICOPTER_SPARK_H - -#include "types.h" - -void helicopter_spark_update() __asm__("FUN_L03_002d47c0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_HELICOPTER_SPARK_H */ diff --git a/include/rnc/overlay/shared/enemies/blarg_paratrooper.h b/include/rnc/overlay/shared/enemies/blarg_paratrooper.h deleted file mode 100644 index 27cda00ff1..0000000000 --- a/include/rnc/overlay/shared/enemies/blarg_paratrooper.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_PARATROOPER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_PARATROOPER_H - -#include "types.h" - -void blarg_paratrooper_update(char *) __asm__("FUN_L08_00301158"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_PARATROOPER_H */ diff --git a/include/rnc/overlay/shared/enemies/blarg_ship_rocket.h b/include/rnc/overlay/shared/enemies/blarg_ship_rocket.h deleted file mode 100644 index d30c21d514..0000000000 --- a/include/rnc/overlay/shared/enemies/blarg_ship_rocket.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_SHIP_ROCKET_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_SHIP_ROCKET_H - -#include "types.h" - -void emit_moby_sprite_particles(char *) __asm__("FUN_L10_00298940"); -void blarg_ship_rocket_update(char *) __asm__("FUN_L10_002cc2e8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_SHIP_ROCKET_H */ diff --git a/include/rnc/overlay/shared/enemies/blarg_ship_shot.h b/include/rnc/overlay/shared/enemies/blarg_ship_shot.h deleted file mode 100644 index cbca652ce7..0000000000 --- a/include/rnc/overlay/shared/enemies/blarg_ship_shot.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_SHIP_SHOT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_SHIP_SHOT_H - -#include "types.h" - -char *spawn_blarg_ship_shot(int, float *, float *, float, float, float) __asm__("FUN_L11_00308f48"); -void blarg_ship_shot_update(char *) __asm__("FUN_L11_00309098"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_SHIP_SHOT_H */ diff --git a/include/rnc/overlay/shared/enemies/blarg_space_commando.h b/include/rnc/overlay/shared/enemies/blarg_space_commando.h deleted file mode 100644 index 4546c1828a..0000000000 --- a/include/rnc/overlay/shared/enemies/blarg_space_commando.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_SPACE_COMMANDO_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_SPACE_COMMANDO_H - -#include "types.h" - -struct Moby; - -void blarg_space_commando_update(struct Moby *) __asm__("FUN_L06_002fdbd0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_SPACE_COMMANDO_H */ diff --git a/include/rnc/overlay/shared/enemies/blarg_trooper_projectile.h b/include/rnc/overlay/shared/enemies/blarg_trooper_projectile.h deleted file mode 100644 index e02c9dce30..0000000000 --- a/include/rnc/overlay/shared/enemies/blarg_trooper_projectile.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_TROOPER_PROJECTILE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_TROOPER_PROJECTILE_H - -#include "types.h" - -struct Moby; - -void blarg_trooper_projectile_update(struct Moby *) __asm__("FUN_L04_002af058"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BLARG_TROOPER_PROJECTILE_H */ diff --git a/include/rnc/overlay/shared/enemies/bolt_thief_mine.h b/include/rnc/overlay/shared/enemies/bolt_thief_mine.h deleted file mode 100644 index 09366550c7..0000000000 --- a/include/rnc/overlay/shared/enemies/bolt_thief_mine.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BOLT_THIEF_MINE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BOLT_THIEF_MINE_H - -#include "types.h" - -struct Moby; - -void bolt_thief_mine_update(struct Moby *) __asm__("FUN_L14_002ff640"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BOLT_THIEF_MINE_H */ diff --git a/include/rnc/overlay/shared/enemies/bomb_spawner.h b/include/rnc/overlay/shared/enemies/bomb_spawner.h deleted file mode 100644 index c02eace2a0..0000000000 --- a/include/rnc/overlay/shared/enemies/bomb_spawner.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BOMB_SPAWNER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BOMB_SPAWNER_H - -#include "types.h" - -struct Moby; - -void bomb_spawner_update(struct Moby *) __asm__("FUN_L03_002bef68"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BOMB_SPAWNER_H */ diff --git a/include/rnc/overlay/shared/enemies/bomb_spawner_bomb.h b/include/rnc/overlay/shared/enemies/bomb_spawner_bomb.h deleted file mode 100644 index d4fd8ea5a6..0000000000 --- a/include/rnc/overlay/shared/enemies/bomb_spawner_bomb.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BOMB_SPAWNER_BOMB_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BOMB_SPAWNER_BOMB_H - -#include "types.h" - -struct Moby; - -void bomb_spawner_bomb_update(struct Moby *) __asm__("FUN_L03_002c4718"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_BOMB_SPAWNER_BOMB_H */ diff --git a/include/rnc/overlay/shared/enemies/frog.h b/include/rnc/overlay/shared/enemies/frog.h deleted file mode 100644 index 8a073bd3b7..0000000000 --- a/include/rnc/overlay/shared/enemies/frog.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_FROG_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_FROG_H - -#include "types.h" - -struct Moby; - -s32 cancel_moby_suction_and_save_state(unsigned char *) __asm__("FUN_L06_002ea7c8"); -void frog_update(unsigned char *) __asm__("FUN_L06_002e8678"); -int update_moby_grab_state(struct Moby *) __asm__("FUN_L06_002ea5e0"); -int update_moby_suck_cannon_storage_state(unsigned char *) __asm__("FUN_L06_002ea6a8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_FROG_H */ diff --git a/include/rnc/overlay/shared/enemies/ground_melee_enemy.h b/include/rnc/overlay/shared/enemies/ground_melee_enemy.h deleted file mode 100644 index 7ea242098f..0000000000 --- a/include/rnc/overlay/shared/enemies/ground_melee_enemy.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_GROUND_MELEE_ENEMY_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_GROUND_MELEE_ENEMY_H - -#include "types.h" - -struct Moby; - -void get_moby_data_plus_0x60() __asm__("FUN_L01_002f1df8"); -void ground_melee_enemy_update() __asm__("FUN_L09_002e27d8"); -int moby_hold_state_if_grabbed(struct Moby *) __asm__("FUN_L01_002f1c78"); -int run_moby_helper_and_set_state_7(struct Moby *) __asm__("FUN_L01_002f1dc8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_GROUND_MELEE_ENEMY_H */ diff --git a/include/rnc/overlay/shared/enemies/hero_seeking_mine.h b/include/rnc/overlay/shared/enemies/hero_seeking_mine.h deleted file mode 100644 index d5b2030ca3..0000000000 --- a/include/rnc/overlay/shared/enemies/hero_seeking_mine.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_HERO_SEEKING_MINE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_HERO_SEEKING_MINE_H - -#include "types.h" - -void hero_seeking_mine_update(char *) __asm__("FUN_L15_002a2488"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_HERO_SEEKING_MINE_H */ diff --git a/include/rnc/overlay/shared/enemies/horny_toad.h b/include/rnc/overlay/shared/enemies/horny_toad.h deleted file mode 100644 index 4f9a633133..0000000000 --- a/include/rnc/overlay/shared/enemies/horny_toad.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_HORNY_TOAD_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_HORNY_TOAD_H - -#include "types.h" - -struct Moby; - -int cancel_suck_cannon_suction_and_set_moby_state_9(char *) __asm__("FUN_L00_002d57d0"); -void get_moby_private_data_d0_address() __asm__("FUN_L00_002d5800"); -void horny_toad_update() __asm__("FUN_L00_002d4610"); -int process_suck_cannon_suction_and_update_moby_state(char *) __asm__("FUN_L00_002d56e0"); -void collect_moby_and_clear_path_keys(struct Moby *) __asm__("FUN_L00_002d5830"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_HORNY_TOAD_H */ diff --git a/include/rnc/overlay/shared/enemies/large_amoeboid.h b/include/rnc/overlay/shared/enemies/large_amoeboid.h deleted file mode 100644 index a57657c82a..0000000000 --- a/include/rnc/overlay/shared/enemies/large_amoeboid.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_LARGE_AMOEBOID_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_LARGE_AMOEBOID_H - -#include "types.h" - -struct Moby; - -int cancel_suck_cannon_suction_and_set_state_14(struct Moby *) __asm__("FUN_L01_002efb98"); -void get_moby_data_plus_0xc0() __asm__("FUN_L01_002efbc8"); -void large_amoeboid_update(unsigned char *) __asm__("FUN_L01_002edca0"); -int moby_hold_state_if_found(struct Moby *) __asm__("FUN_L01_002efaf8"); -int process_amoeboid_suck_cannon_suction(struct Moby *) __asm__("FUN_L01_002efa88"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_LARGE_AMOEBOID_H */ diff --git a/include/rnc/overlay/shared/enemies/paratrooper_fire_bolt.h b/include/rnc/overlay/shared/enemies/paratrooper_fire_bolt.h deleted file mode 100644 index d6896da95a..0000000000 --- a/include/rnc/overlay/shared/enemies/paratrooper_fire_bolt.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_PARATROOPER_FIRE_BOLT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_PARATROOPER_FIRE_BOLT_H - -#include "types.h" - -void fire_bolt_update(char *) __asm__("FUN_L08_00307298"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_PARATROOPER_FIRE_BOLT_H */ diff --git a/include/rnc/overlay/shared/enemies/sand_mouse.h b/include/rnc/overlay/shared/enemies/sand_mouse.h deleted file mode 100644 index 663b18c5b6..0000000000 --- a/include/rnc/overlay/shared/enemies/sand_mouse.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SAND_MOUSE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SAND_MOUSE_H - -#include "types.h" - -struct Moby; - -void sand_mouse_update(struct Moby *) __asm__("FUN_L01_002e3f20"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SAND_MOUSE_H */ diff --git a/include/rnc/overlay/shared/enemies/sandmouse.h b/include/rnc/overlay/shared/enemies/sandmouse.h deleted file mode 100644 index d143d62a56..0000000000 --- a/include/rnc/overlay/shared/enemies/sandmouse.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SANDMOUSE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SANDMOUSE_H - -#include "types.h" - -void sandmouse_update() __asm__("FUN_L01_0030df40"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SANDMOUSE_H */ diff --git a/include/rnc/overlay/shared/enemies/sandmouse_house.h b/include/rnc/overlay/shared/enemies/sandmouse_house.h deleted file mode 100644 index 0e48c5b8ee..0000000000 --- a/include/rnc/overlay/shared/enemies/sandmouse_house.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SANDMOUSE_HOUSE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SANDMOUSE_HOUSE_H - -#include "types.h" - -void sandmouse_house_update(unsigned char *) __asm__("FUN_L01_002f2b68"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SANDMOUSE_HOUSE_H */ diff --git a/include/rnc/overlay/shared/enemies/sandmouse_projectile.h b/include/rnc/overlay/shared/enemies/sandmouse_projectile.h deleted file mode 100644 index c0218ebb0b..0000000000 --- a/include/rnc/overlay/shared/enemies/sandmouse_projectile.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SANDMOUSE_PROJECTILE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SANDMOUSE_PROJECTILE_H - -#include "types.h" - -void sandmouse_projectile_update(char *) __asm__("FUN_L01_0030c9a8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SANDMOUSE_PROJECTILE_H */ diff --git a/include/rnc/overlay/shared/enemies/scoutbot.h b/include/rnc/overlay/shared/enemies/scoutbot.h deleted file mode 100644 index 8ccdfb8cc3..0000000000 --- a/include/rnc/overlay/shared/enemies/scoutbot.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SCOUTBOT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SCOUTBOT_H - -#include "types.h" - -struct Moby; - -void *enter_scoutbot_return_home_state(struct Moby *) __asm__("FUN_L08_002d4050"); -void scoutbot_update() __asm__("FUN_L08_002d2af0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SCOUTBOT_H */ diff --git a/include/rnc/overlay/shared/enemies/seeker.h b/include/rnc/overlay/shared/enemies/seeker.h deleted file mode 100644 index 882f58321f..0000000000 --- a/include/rnc/overlay/shared/enemies/seeker.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SEEKER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SEEKER_H - -#include "types.h" - -struct Moby; - -void seeker_update(struct Moby *) __asm__("FUN_L09_002c5990"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SEEKER_H */ diff --git a/include/rnc/overlay/shared/enemies/sentrybot.h b/include/rnc/overlay/shared/enemies/sentrybot.h deleted file mode 100644 index 63e82a100f..0000000000 --- a/include/rnc/overlay/shared/enemies/sentrybot.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SENTRYBOT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SENTRYBOT_H - -#include "types.h" - -void sentrybot_update(unsigned char *) __asm__("FUN_L15_002979d8"); -void set_sentrybot_alarm_duration(char *, int) __asm__("FUN_L15_002cbac0"); -void mark_moby_killed_and_release_owned_voice(int) __asm__("FUN_L15_002a35d8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SENTRYBOT_H */ diff --git a/include/rnc/overlay/shared/enemies/sentrybot_alarm.h b/include/rnc/overlay/shared/enemies/sentrybot_alarm.h deleted file mode 100644 index 9b6c4f09c3..0000000000 --- a/include/rnc/overlay/shared/enemies/sentrybot_alarm.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SENTRYBOT_ALARM_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SENTRYBOT_ALARM_H - -#include "types.h" - -void sentrybot_alarm_update(unsigned char *) __asm__("FUN_L15_002cb4c8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SENTRYBOT_ALARM_H */ diff --git a/include/rnc/overlay/shared/enemies/sentrybot_projectile.h b/include/rnc/overlay/shared/enemies/sentrybot_projectile.h deleted file mode 100644 index 73579bbf74..0000000000 --- a/include/rnc/overlay/shared/enemies/sentrybot_projectile.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SENTRYBOT_PROJECTILE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SENTRYBOT_PROJECTILE_H - -#include "types.h" - -void sentrybot_projectile_update(unsigned char *) __asm__("FUN_L15_002e4380"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SENTRYBOT_PROJECTILE_H */ diff --git a/include/rnc/overlay/shared/enemies/smoke_trail_projectile.h b/include/rnc/overlay/shared/enemies/smoke_trail_projectile.h deleted file mode 100644 index 09e67dab03..0000000000 --- a/include/rnc/overlay/shared/enemies/smoke_trail_projectile.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SMOKE_TRAIL_PROJECTILE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SMOKE_TRAIL_PROJECTILE_H - -#include "types.h" - -void smoke_trail_projectile_update(char *) __asm__("FUN_L01_002eda00"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SMOKE_TRAIL_PROJECTILE_H */ diff --git a/include/rnc/overlay/shared/enemies/spawner.h b/include/rnc/overlay/shared/enemies/spawner.h deleted file mode 100644 index 575c30b2f3..0000000000 --- a/include/rnc/overlay/shared/enemies/spawner.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SPAWNER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SPAWNER_H - -#include "types.h" - -void spawner_update(char *) __asm__("FUN_L09_0030ab80"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SPAWNER_H */ diff --git a/include/rnc/overlay/shared/enemies/spiderbot.h b/include/rnc/overlay/shared/enemies/spiderbot.h deleted file mode 100644 index 261a82ac04..0000000000 --- a/include/rnc/overlay/shared/enemies/spiderbot.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SPIDERBOT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SPIDERBOT_H - -#include "types.h" - -void spiderbot_update(unsigned char *) __asm__("FUN_L15_002a6e68"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_ENEMIES_SPIDERBOT_H */ diff --git a/include/rnc/overlay/shared/game.h b/include/rnc/overlay/shared/game.h new file mode 100644 index 0000000000..4eceb3c3cb --- /dev/null +++ b/include/rnc/overlay/shared/game.h @@ -0,0 +1,11 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_GAME_H +#define LOMBYTE_RNC_OVERLAY_SHARED_GAME_H + +#include "types.h" + +void init_level_runtime_state(void) __asm__("FUN_L00_0023d028"); +void deactivate_recorded_moby(void) __asm__("FUN_L00_0028e990"); +void initialize_moby_state_record(char *) __asm__("FUN_L00_0028e8a0"); +void prepare_level_entry_transition(void) __asm__("FUN_L00_0028eed0"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_GAME_H */ diff --git a/include/rnc/overlay/shared/game/init_level_runtime_state.h b/include/rnc/overlay/shared/game/init_level_runtime_state.h deleted file mode 100644 index 77ffd066a2..0000000000 --- a/include/rnc/overlay/shared/game/init_level_runtime_state.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_GAME_INIT_LEVEL_RUNTIME_STATE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_GAME_INIT_LEVEL_RUNTIME_STATE_H - -#include "types.h" - -void init_level_runtime_state(void) __asm__("FUN_L00_0023d028"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_GAME_INIT_LEVEL_RUNTIME_STATE_H */ diff --git a/include/rnc/overlay/shared/game/initialize_level_transition_with_audio.h b/include/rnc/overlay/shared/game/initialize_level_transition_with_audio.h deleted file mode 100644 index 792a66c40b..0000000000 --- a/include/rnc/overlay/shared/game/initialize_level_transition_with_audio.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_GAME_INITIALIZE_LEVEL_TRANSITION_WITH_AUDIO_H -#define LOMBYTE_RNC_OVERLAY_SHARED_GAME_INITIALIZE_LEVEL_TRANSITION_WITH_AUDIO_H - -#include "types.h" - -void deactivate_recorded_moby(void) __asm__("FUN_L00_0028e990"); -void initialize_moby_state_record(char *) __asm__("FUN_L00_0028e8a0"); -void prepare_level_entry_transition(void) __asm__("FUN_L00_0028eed0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_GAME_INITIALIZE_LEVEL_TRANSITION_WITH_AUDIO_H */ diff --git a/include/rnc/overlay/shared/hero.h b/include/rnc/overlay/shared/hero.h new file mode 100644 index 0000000000..f50261ff12 --- /dev/null +++ b/include/rnc/overlay/shared/hero.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_HERO_H +#define LOMBYTE_RNC_OVERLAY_SHARED_HERO_H + +#include "rnc/overlay/shared/hero/hero_tables.h" +#include "types.h" + +void initialize_hero(void) __asm__("FUN_L00_00204c60"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_HERO_H */ diff --git a/include/rnc/overlay/shared/hero/hero.h b/include/rnc/overlay/shared/hero/hero.h deleted file mode 100644 index 7b43148ed8..0000000000 --- a/include/rnc/overlay/shared/hero/hero.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_HERO_HERO_H -#define LOMBYTE_RNC_OVERLAY_SHARED_HERO_HERO_H - -#include "types.h" -#include "rnc/overlay/shared/hero/hero_tables.h" - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_HERO_HERO_H */ diff --git a/include/rnc/overlay/shared/hero/initialize_hero.h b/include/rnc/overlay/shared/hero/initialize_hero.h deleted file mode 100644 index 1149cbfe87..0000000000 --- a/include/rnc/overlay/shared/hero/initialize_hero.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_HERO_INITIALIZE_HERO_H -#define LOMBYTE_RNC_OVERLAY_SHARED_HERO_INITIALIZE_HERO_H - -#include "types.h" - -void initialize_hero(void) __asm__("FUN_L00_00204c60"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_HERO_INITIALIZE_HERO_H */ diff --git a/include/rnc/overlay/shared/math/random.h b/include/rnc/overlay/shared/math/random.h new file mode 100644 index 0000000000..1d2a6d9d9e --- /dev/null +++ b/include/rnc/overlay/shared/math/random.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MATH_RANDOM_H +#define LOMBYTE_RNC_OVERLAY_SHARED_MATH_RANDOM_H + +#include "types.h" + +void generate_random_scaled_vector2(float *, float) __asm__("FUN_L09_00277758"); +float scale_by_one_minus_random_squared(float) __asm__("FUN_L09_00277688"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MATH_RANDOM_H */ diff --git a/include/rnc/overlay/shared/math/random/generate_random_scaled_vector2.h b/include/rnc/overlay/shared/math/random/generate_random_scaled_vector2.h deleted file mode 100644 index 039bd42f5f..0000000000 --- a/include/rnc/overlay/shared/math/random/generate_random_scaled_vector2.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MATH_RANDOM_GENERATE_RANDOM_SCALED_VECTOR2_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MATH_RANDOM_GENERATE_RANDOM_SCALED_VECTOR2_H - -#include "types.h" - -void generate_random_scaled_vector2(float *, float) __asm__("FUN_L09_00277758"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MATH_RANDOM_GENERATE_RANDOM_SCALED_VECTOR2_H */ diff --git a/include/rnc/overlay/shared/math/random/scale_by_one_minus_random_squared.h b/include/rnc/overlay/shared/math/random/scale_by_one_minus_random_squared.h deleted file mode 100644 index dd342bc94e..0000000000 --- a/include/rnc/overlay/shared/math/random/scale_by_one_minus_random_squared.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MATH_RANDOM_SCALE_BY_ONE_MINUS_RANDOM_SQUARED_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MATH_RANDOM_SCALE_BY_ONE_MINUS_RANDOM_SQUARED_H - -#include "types.h" - -float scale_by_one_minus_random_squared(float) __asm__("FUN_L09_00277688"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MATH_RANDOM_SCALE_BY_ONE_MINUS_RANDOM_SQUARED_H */ diff --git a/include/rnc/overlay/shared/math/rotations.h b/include/rnc/overlay/shared/math/rotations.h new file mode 100644 index 0000000000..46e32fc696 --- /dev/null +++ b/include/rnc/overlay/shared/math/rotations.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MATH_ROTATIONS_H +#define LOMBYTE_RNC_OVERLAY_SHARED_MATH_ROTATIONS_H + +#include "types.h" + +void rotate_vector_by_scaled_angle_between_vectors(float, float *, float *, float *, int) __asm__("FUN_L03_0024e6f8"); +float step_rotation_toward_target(float, float, float) __asm__("FUN_L00_00200510"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MATH_ROTATIONS_H */ diff --git a/include/rnc/overlay/shared/math/rotations/rotate_vector_by_scaled_angle_between_vectors.h b/include/rnc/overlay/shared/math/rotations/rotate_vector_by_scaled_angle_between_vectors.h deleted file mode 100644 index 6c65076b58..0000000000 --- a/include/rnc/overlay/shared/math/rotations/rotate_vector_by_scaled_angle_between_vectors.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MATH_ROTATIONS_ROTATE_VECTOR_BY_SCALED_ANGLE_BETWEEN_VECTORS_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MATH_ROTATIONS_ROTATE_VECTOR_BY_SCALED_ANGLE_BETWEEN_VECTORS_H - -#include "types.h" - -void rotate_vector_by_scaled_angle_between_vectors(float, float *, float *, float *, int) __asm__("FUN_L03_0024e6f8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MATH_ROTATIONS_ROTATE_VECTOR_BY_SCALED_ANGLE_BETWEEN_VECTORS_H */ diff --git a/include/rnc/overlay/shared/math/rotations/step_rotation_toward_target.h b/include/rnc/overlay/shared/math/rotations/step_rotation_toward_target.h deleted file mode 100644 index f1ed493184..0000000000 --- a/include/rnc/overlay/shared/math/rotations/step_rotation_toward_target.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MATH_ROTATIONS_STEP_ROTATION_TOWARD_TARGET_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MATH_ROTATIONS_STEP_ROTATION_TOWARD_TARGET_H - -#include "types.h" - -float step_rotation_toward_target(float, float, float) __asm__("FUN_L00_00200510"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MATH_ROTATIONS_STEP_ROTATION_TOWARD_TARGET_H */ diff --git a/include/rnc/overlay/shared/mobys.h b/include/rnc/overlay/shared/mobys.h new file mode 100644 index 0000000000..3470ef9042 --- /dev/null +++ b/include/rnc/overlay/shared/mobys.h @@ -0,0 +1,27 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_H +#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_H + +#include "types.h" + +struct Moby; + +void add_moby_frames_for_group_proximity(char *) __asm__("FUN_L05_00307010"); +void offset_moby_class_point_pairs(unsigned char *, int, int) __asm__("FUN_L00_0024efb0"); +void camera_object_update(char *) __asm__("FUN_L00_002a4e48"); +s32 compute_advanced_moby_path_position(struct Moby *, void *, void *, s32, s32, f32) __asm__("FUN_L09_00294ae0"); +void draw_only_moby_update(struct Moby *) __asm__("FUN_L16_002e9df0"); +void falling_moby_update(char *) __asm__("FUN_L03_002de370"); +int find_nearest_animation_sequence_entry(char *, float) __asm__("FUN_L00_0024ed18"); +int find_point_ahead(char *, char *, float) __asm__("FUN_L01_00274b78"); +char *get_moby_pvars_link(struct Moby *) __asm__("FUN_L00_002603d0"); +int is_moby_class_23e_in_state_14(char *) __asm__("FUN_L03_002c6c60"); +void set_moby_state_14(unsigned char *) __asm__("FUN_L03_002c6c90"); +void moby_draw_callback_update(struct Moby *) __asm__("FUN_L03_002dc9b0"); +void moby_draw_registration_update(unsigned char *) __asm__("FUN_L07_002f8058"); +void remove_when_near_hero_update(char *) __asm__("FUN_L11_002cb790"); +void show_tracked_moby(void) __asm__("FUN_L01_002a2480"); +void spawn_nearby_effect_without_direction(unsigned char *, int, int, void *, float) __asm__("FUN_L10_0024c7f0"); +int test_linked_moby_turn_trigger(struct Moby *) __asm__("FUN_L11_0030f270"); +void update_moby_proximity_interaction(unsigned char *) __asm__("FUN_L00_0028e180"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_H */ diff --git a/include/rnc/overlay/shared/mobys/add_moby_frames_for_group_proximity.h b/include/rnc/overlay/shared/mobys/add_moby_frames_for_group_proximity.h deleted file mode 100644 index 8839f17f36..0000000000 --- a/include/rnc/overlay/shared/mobys/add_moby_frames_for_group_proximity.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_ADD_MOBY_FRAMES_FOR_GROUP_PROXIMITY_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_ADD_MOBY_FRAMES_FOR_GROUP_PROXIMITY_H - -#include "types.h" - -void add_moby_frames_for_group_proximity(char *) __asm__("FUN_L05_00307010"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_ADD_MOBY_FRAMES_FOR_GROUP_PROXIMITY_H */ diff --git a/include/rnc/overlay/shared/mobys/allocate_moby_animation_slot.h b/include/rnc/overlay/shared/mobys/allocate_moby_animation_slot.h deleted file mode 100644 index 09fd843334..0000000000 --- a/include/rnc/overlay/shared/mobys/allocate_moby_animation_slot.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_ALLOCATE_MOBY_ANIMATION_SLOT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_ALLOCATE_MOBY_ANIMATION_SLOT_H - -#include "types.h" - -void offset_moby_class_point_pairs(unsigned char *, int, int) __asm__("FUN_L00_0024efb0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_ALLOCATE_MOBY_ANIMATION_SLOT_H */ diff --git a/include/rnc/overlay/shared/mobys/camera_object.h b/include/rnc/overlay/shared/mobys/camera_object.h deleted file mode 100644 index fdf8bc23c4..0000000000 --- a/include/rnc/overlay/shared/mobys/camera_object.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_CAMERA_OBJECT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_CAMERA_OBJECT_H - -#include "types.h" - -void camera_object_update(char *) __asm__("FUN_L00_002a4e48"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_CAMERA_OBJECT_H */ diff --git a/include/rnc/overlay/shared/mobys/compute_advanced_moby_path_position.h b/include/rnc/overlay/shared/mobys/compute_advanced_moby_path_position.h deleted file mode 100644 index 1603672d6c..0000000000 --- a/include/rnc/overlay/shared/mobys/compute_advanced_moby_path_position.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_COMPUTE_ADVANCED_MOBY_PATH_POSITION_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_COMPUTE_ADVANCED_MOBY_PATH_POSITION_H - -#include "types.h" - -struct Moby; - -s32 compute_advanced_moby_path_position(struct Moby *, void *, void *, s32, s32, f32) __asm__("FUN_L09_00294ae0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_COMPUTE_ADVANCED_MOBY_PATH_POSITION_H */ diff --git a/include/rnc/overlay/shared/mobys/draw_only_moby_update.h b/include/rnc/overlay/shared/mobys/draw_only_moby_update.h deleted file mode 100644 index e94b2850f9..0000000000 --- a/include/rnc/overlay/shared/mobys/draw_only_moby_update.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_DRAW_ONLY_MOBY_UPDATE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_DRAW_ONLY_MOBY_UPDATE_H - -#include "types.h" - -struct Moby; - -void draw_only_moby_update(struct Moby *) __asm__("FUN_L16_002e9df0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_DRAW_ONLY_MOBY_UPDATE_H */ diff --git a/include/rnc/overlay/shared/mobys/falling_moby_update.h b/include/rnc/overlay/shared/mobys/falling_moby_update.h deleted file mode 100644 index fbd53993db..0000000000 --- a/include/rnc/overlay/shared/mobys/falling_moby_update.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_FALLING_MOBY_UPDATE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_FALLING_MOBY_UPDATE_H - -#include "types.h" - -void falling_moby_update(char *) __asm__("FUN_L03_002de370"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_FALLING_MOBY_UPDATE_H */ diff --git a/include/rnc/overlay/shared/mobys/find_nearest_animation_sequence_entry.h b/include/rnc/overlay/shared/mobys/find_nearest_animation_sequence_entry.h deleted file mode 100644 index 61414c85b6..0000000000 --- a/include/rnc/overlay/shared/mobys/find_nearest_animation_sequence_entry.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_FIND_NEAREST_ANIMATION_SEQUENCE_ENTRY_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_FIND_NEAREST_ANIMATION_SEQUENCE_ENTRY_H - -#include "types.h" - -int find_nearest_animation_sequence_entry(char *, float) __asm__("FUN_L00_0024ed18"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_FIND_NEAREST_ANIMATION_SEQUENCE_ENTRY_H */ diff --git a/include/rnc/overlay/shared/mobys/find_point_ahead.h b/include/rnc/overlay/shared/mobys/find_point_ahead.h deleted file mode 100644 index 192b87146b..0000000000 --- a/include/rnc/overlay/shared/mobys/find_point_ahead.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_FIND_POINT_AHEAD_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_FIND_POINT_AHEAD_H - -#include "types.h" - -int find_point_ahead(char *, char *, float) __asm__("FUN_L01_00274b78"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_FIND_POINT_AHEAD_H */ diff --git a/include/rnc/overlay/shared/mobys/get_moby_pvars_link.h b/include/rnc/overlay/shared/mobys/get_moby_pvars_link.h deleted file mode 100644 index 6bab2f6153..0000000000 --- a/include/rnc/overlay/shared/mobys/get_moby_pvars_link.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_GET_MOBY_PVARS_LINK_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_GET_MOBY_PVARS_LINK_H - -#include "types.h" - -struct Moby; - -char *get_moby_pvars_link(struct Moby *) __asm__("FUN_L00_002603d0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_GET_MOBY_PVARS_LINK_H */ diff --git a/include/rnc/overlay/shared/mobys/is_moby_class_23e_in_state_14.h b/include/rnc/overlay/shared/mobys/is_moby_class_23e_in_state_14.h deleted file mode 100644 index d2d22bc660..0000000000 --- a/include/rnc/overlay/shared/mobys/is_moby_class_23e_in_state_14.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_IS_MOBY_CLASS_23E_IN_STATE_14_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_IS_MOBY_CLASS_23E_IN_STATE_14_H - -#include "types.h" - -int is_moby_class_23e_in_state_14(char *) __asm__("FUN_L03_002c6c60"); -void set_moby_state_14(unsigned char *) __asm__("FUN_L03_002c6c90"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_IS_MOBY_CLASS_23E_IN_STATE_14_H */ diff --git a/include/rnc/overlay/shared/mobys/moby_draw_callback_update.h b/include/rnc/overlay/shared/mobys/moby_draw_callback_update.h deleted file mode 100644 index b9b9c348da..0000000000 --- a/include/rnc/overlay/shared/mobys/moby_draw_callback_update.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_MOBY_DRAW_CALLBACK_UPDATE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_MOBY_DRAW_CALLBACK_UPDATE_H - -#include "types.h" - -struct Moby; - -void moby_draw_callback_update(struct Moby *) __asm__("FUN_L03_002dc9b0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_MOBY_DRAW_CALLBACK_UPDATE_H */ diff --git a/include/rnc/overlay/shared/mobys/moby_draw_registration_update.h b/include/rnc/overlay/shared/mobys/moby_draw_registration_update.h deleted file mode 100644 index d0eec1cf88..0000000000 --- a/include/rnc/overlay/shared/mobys/moby_draw_registration_update.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_MOBY_DRAW_REGISTRATION_UPDATE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_MOBY_DRAW_REGISTRATION_UPDATE_H - -#include "types.h" - -void moby_draw_registration_update(unsigned char *) __asm__("FUN_L07_002f8058"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_MOBY_DRAW_REGISTRATION_UPDATE_H */ diff --git a/include/rnc/overlay/shared/mobys/remove_when_near_hero_update.h b/include/rnc/overlay/shared/mobys/remove_when_near_hero_update.h deleted file mode 100644 index 28d10698ae..0000000000 --- a/include/rnc/overlay/shared/mobys/remove_when_near_hero_update.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_REMOVE_WHEN_NEAR_HERO_UPDATE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_REMOVE_WHEN_NEAR_HERO_UPDATE_H - -#include "types.h" - -void remove_when_near_hero_update(char *) __asm__("FUN_L11_002cb790"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_REMOVE_WHEN_NEAR_HERO_UPDATE_H */ diff --git a/include/rnc/overlay/shared/mobys/show_tracked_moby.h b/include/rnc/overlay/shared/mobys/show_tracked_moby.h deleted file mode 100644 index c13160b304..0000000000 --- a/include/rnc/overlay/shared/mobys/show_tracked_moby.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_SHOW_TRACKED_MOBY_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_SHOW_TRACKED_MOBY_H - -#include "types.h" - -void show_tracked_moby(void) __asm__("FUN_L01_002a2480"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_SHOW_TRACKED_MOBY_H */ diff --git a/include/rnc/overlay/shared/mobys/spawn_nearby_effect_without_direction.h b/include/rnc/overlay/shared/mobys/spawn_nearby_effect_without_direction.h deleted file mode 100644 index 5053027d82..0000000000 --- a/include/rnc/overlay/shared/mobys/spawn_nearby_effect_without_direction.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_SPAWN_NEARBY_EFFECT_WITHOUT_DIRECTION_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_SPAWN_NEARBY_EFFECT_WITHOUT_DIRECTION_H - -#include "types.h" - -void spawn_nearby_effect_without_direction(unsigned char *, int, int, void *, float) __asm__("FUN_L10_0024c7f0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_SPAWN_NEARBY_EFFECT_WITHOUT_DIRECTION_H */ diff --git a/include/rnc/overlay/shared/mobys/test_linked_moby_turn_trigger.h b/include/rnc/overlay/shared/mobys/test_linked_moby_turn_trigger.h deleted file mode 100644 index e93ed77347..0000000000 --- a/include/rnc/overlay/shared/mobys/test_linked_moby_turn_trigger.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_TEST_LINKED_MOBY_TURN_TRIGGER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_TEST_LINKED_MOBY_TURN_TRIGGER_H - -#include "types.h" - -struct Moby; - -int test_linked_moby_turn_trigger(struct Moby *) __asm__("FUN_L11_0030f270"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_TEST_LINKED_MOBY_TURN_TRIGGER_H */ diff --git a/include/rnc/overlay/shared/mobys/update_moby_proximity_interaction.h b/include/rnc/overlay/shared/mobys/update_moby_proximity_interaction.h deleted file mode 100644 index 97ff4fdf36..0000000000 --- a/include/rnc/overlay/shared/mobys/update_moby_proximity_interaction.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_UPDATE_MOBY_PROXIMITY_INTERACTION_H -#define LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_UPDATE_MOBY_PROXIMITY_INTERACTION_H - -#include "types.h" - -void update_moby_proximity_interaction(unsigned char *) __asm__("FUN_L00_0028e180"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_MOBYS_UPDATE_MOBY_PROXIMITY_INTERACTION_H */ diff --git a/include/rnc/overlay/shared/pickups.h b/include/rnc/overlay/shared/pickups.h new file mode 100644 index 0000000000..a784f55a7d --- /dev/null +++ b/include/rnc/overlay/shared/pickups.h @@ -0,0 +1,21 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_H +#define LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_H + +#include "types.h" + +struct Moby; + +void buried_bolts_update(struct Moby *) __asm__("FUN_L01_002f2eb8"); +void codebot_update(struct Moby *) __asm__("FUN_L15_002ebd78"); +void crate_update(struct Moby *) __asm__("FUN_L00_002cf218"); +void nanotech_crate_fragment_update() __asm__("FUN_L00_002afa48"); +unsigned char *spawn_ship_pickup(char *, int) __asm__("FUN_L13_002e1c50"); +void ammocrate_update(char *) __asm__("FUN_L13_002e1cc8"); +void tresspasser_update(struct Moby *) __asm__("FUN_L02_002ea210"); +void initialize_collectible_sprite_state(char *) __asm__("FUN_L02_002ea7d0"); +void update_collectible_sprite_effect(char *) __asm__("FUN_L02_002ea8b0"); +void nanotech_ball_update() __asm__("FUN_L00_002d89f0"); +void pilots_helmet_update() __asm__("FUN_L00_002e03a0"); +void devestator_ammo_update(struct Moby *) __asm__("FUN_L00_002c53c0"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_H */ diff --git a/include/rnc/overlay/shared/pickups/buried_bolts.h b/include/rnc/overlay/shared/pickups/buried_bolts.h deleted file mode 100644 index c007cd6c74..0000000000 --- a/include/rnc/overlay/shared/pickups/buried_bolts.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_BURIED_BOLTS_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_BURIED_BOLTS_H - -#include "types.h" - -struct Moby; - -void buried_bolts_update(struct Moby *) __asm__("FUN_L01_002f2eb8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_BURIED_BOLTS_H */ diff --git a/include/rnc/overlay/shared/pickups/codebot.h b/include/rnc/overlay/shared/pickups/codebot.h deleted file mode 100644 index 66d2aff451..0000000000 --- a/include/rnc/overlay/shared/pickups/codebot.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_CODEBOT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_CODEBOT_H - -#include "types.h" - -struct Moby; - -void codebot_update(struct Moby *) __asm__("FUN_L15_002ebd78"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_CODEBOT_H */ diff --git a/include/rnc/overlay/shared/pickups/crate.h b/include/rnc/overlay/shared/pickups/crate.h deleted file mode 100644 index aa8e482a24..0000000000 --- a/include/rnc/overlay/shared/pickups/crate.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_CRATE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_CRATE_H - -#include "types.h" - -struct Moby; - -void crate_update(struct Moby *) __asm__("FUN_L00_002cf218"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_CRATE_H */ diff --git a/include/rnc/overlay/shared/pickups/crate_fragment.h b/include/rnc/overlay/shared/pickups/crate_fragment.h deleted file mode 100644 index 83dd984b77..0000000000 --- a/include/rnc/overlay/shared/pickups/crate_fragment.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_CRATE_FRAGMENT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_CRATE_FRAGMENT_H - -#include "types.h" - -void nanotech_crate_fragment_update() __asm__("FUN_L00_002afa48"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_CRATE_FRAGMENT_H */ diff --git a/include/rnc/overlay/shared/pickups/fighter_jet_crate.h b/include/rnc/overlay/shared/pickups/fighter_jet_crate.h deleted file mode 100644 index 56bf978f7c..0000000000 --- a/include/rnc/overlay/shared/pickups/fighter_jet_crate.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_FIGHTER_JET_CRATE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_FIGHTER_JET_CRATE_H - -#include "types.h" - -unsigned char *spawn_ship_pickup(char *, int) __asm__("FUN_L13_002e1c50"); -void ammocrate_update(char *) __asm__("FUN_L13_002e1cc8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_FIGHTER_JET_CRATE_H */ diff --git a/include/rnc/overlay/shared/pickups/gadget_pickup.h b/include/rnc/overlay/shared/pickups/gadget_pickup.h deleted file mode 100644 index 2c7ac3b72c..0000000000 --- a/include/rnc/overlay/shared/pickups/gadget_pickup.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_GADGET_PICKUP_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_GADGET_PICKUP_H - -#include "types.h" - -struct Moby; - -void tresspasser_update(struct Moby *) __asm__("FUN_L02_002ea210"); -void initialize_collectible_sprite_state(char *) __asm__("FUN_L02_002ea7d0"); -void update_collectible_sprite_effect(char *) __asm__("FUN_L02_002ea8b0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_GADGET_PICKUP_H */ diff --git a/include/rnc/overlay/shared/pickups/nanotech_ball.h b/include/rnc/overlay/shared/pickups/nanotech_ball.h deleted file mode 100644 index d80728de3c..0000000000 --- a/include/rnc/overlay/shared/pickups/nanotech_ball.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_NANOTECH_BALL_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_NANOTECH_BALL_H - -#include "types.h" - -void nanotech_ball_update() __asm__("FUN_L00_002d89f0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_NANOTECH_BALL_H */ diff --git a/include/rnc/overlay/shared/pickups/pilots_helmet.h b/include/rnc/overlay/shared/pickups/pilots_helmet.h deleted file mode 100644 index 1559cdf06b..0000000000 --- a/include/rnc/overlay/shared/pickups/pilots_helmet.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_PILOTS_HELMET_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_PILOTS_HELMET_H - -#include "types.h" - -void pilots_helmet_update() __asm__("FUN_L00_002e03a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_PILOTS_HELMET_H */ diff --git a/include/rnc/overlay/shared/pickups/weapon_ammo.h b/include/rnc/overlay/shared/pickups/weapon_ammo.h deleted file mode 100644 index 79603bf457..0000000000 --- a/include/rnc/overlay/shared/pickups/weapon_ammo.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_WEAPON_AMMO_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_WEAPON_AMMO_H - -#include "types.h" - -struct Moby; - -void devestator_ammo_update(struct Moby *) __asm__("FUN_L00_002c53c0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PICKUPS_WEAPON_AMMO_H */ diff --git a/include/rnc/overlay/shared/props.h b/include/rnc/overlay/shared/props.h new file mode 100644 index 0000000000..2ec4c8ed62 --- /dev/null +++ b/include/rnc/overlay/shared/props.h @@ -0,0 +1,52 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_H +#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_H + +#include "types.h" + +struct Moby; + +void bolt_crank_update(struct Moby *) __asm__("FUN_L01_002e0c68"); +void bot_door_lock_update(char *) __asm__("FUN_L06_00307d30"); +void breakable_lamp_update(struct Moby *) __asm__("FUN_L05_0031c8e0"); +void prop_breakup_update(char *) __asm__("FUN_L06_00309860"); +void directional_spark_emitter_update(char *) __asm__("FUN_L08_002f5830"); +void electric_beam_update(unsigned char *) __asm__("FUN_L14_003015d0"); +void electric_water_update(struct Moby *) __asm__("FUN_L15_002d6810"); +void draw_electric_water_bolt_effect(char *) __asm__("FUN_L15_002d8710"); +void energy_sphere_update(struct Moby *) __asm__("FUN_L06_002f7ab8"); +void energy_sphere_holder_update(char *) __asm__("FUN_L06_002f7288"); +void escalator_update(char *) __asm__("FUN_L02_002dc6b0"); +void flickering_point_light_update(u8 *) __asm__("FUN_L01_0030b618"); +void floor_button_update(struct Moby *) __asm__("FUN_L05_0030c5b0"); +void garage_door_update(struct Moby *) __asm__("FUN_L03_002dca30"); +void grindrail_barrier_update(struct Moby *) __asm__("FUN_L16_002e5708"); +void moby_rotation_group_update() __asm__("FUN_L06_002f4f00"); +void hoverboard_ring_update(char *) __asm__("FUN_L05_0031abe0"); +void hydrodisplacer_update() __asm__("FUN_L00_002df9a0"); +void hydrodisplacer_faucet_update(char *) __asm__("FUN_L05_002f8080"); +void set_moby_state_two(struct Moby *) __asm__("FUN_L06_00303150"); +void initialize_energy_sphere_holder_vars(char *) __asm__("FUN_L06_002f7548"); +void moby_wobble_update(unsigned char *) __asm__("FUN_L05_0030c0a8"); +void linked_spark_emitter_update(unsigned char *) __asm__("FUN_L15_002a2bf0"); +void moby_spatial_trigger_update(struct Moby *) __asm__("FUN_L05_002f5200"); +void novalis_elevator_update(unsigned char *) __asm__("FUN_L01_002b9eb0"); +void ocean_pokitaru_update() __asm__("FUN_L11_0030b358"); +void particle_spawner_smoke_fire_update() __asm__("FUN_L00_002d6f28"); +void red_plant_update(unsigned char *) __asm__("FUN_L00_002e3ca8"); +void pterodactyl_update(unsigned char *) __asm__("FUN_L00_002e3a88"); +void red_orb_update(struct Moby *) __asm__("FUN_L00_002df4f8"); +void respawn_volume_update(char *) __asm__("FUN_L06_002f7930"); +void ripple_strips_moby_update(struct Moby *) __asm__("FUN_L15_002eb0a0"); +void falling_spinning_moby_update(struct Moby *) __asm__("FUN_L06_00300b90"); +unsigned char *spawn_spinning_moby_fragment(char *, float *, float *) __asm__("FUN_L06_00300c60"); +void statue_update(unsigned char *) __asm__("FUN_L03_002d3cd8"); +void swingshot_versatarget_update(char *) __asm__("FUN_L02_002e0450"); +void timed_activation_pads_update(unsigned char *) __asm__("FUN_L07_0030bf90"); +void trackdrive_left_update(char *) __asm__("FUN_L02_002cb978"); +void tresspasser_pad_update() __asm__("FUN_L02_002d8ad0"); +void tumbling_part_update(char *) __asm__("FUN_L00_002e3d88"); +void underwater_door_update(struct Moby *) __asm__("FUN_L15_002bddb0"); +void underwater_ring_update(struct Moby *) __asm__("FUN_L15_002e5958"); +void updraft_vent_update(unsigned char *) __asm__("FUN_L10_002e9028"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_H */ diff --git a/include/rnc/overlay/shared/props/bolt_crank.h b/include/rnc/overlay/shared/props/bolt_crank.h deleted file mode 100644 index 4c5e09eaa2..0000000000 --- a/include/rnc/overlay/shared/props/bolt_crank.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_BOLT_CRANK_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_BOLT_CRANK_H - -#include "types.h" - -struct Moby; - -void bolt_crank_update(struct Moby *) __asm__("FUN_L01_002e0c68"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_BOLT_CRANK_H */ diff --git a/include/rnc/overlay/shared/props/bot_door_lock.h b/include/rnc/overlay/shared/props/bot_door_lock.h deleted file mode 100644 index 46c08581c1..0000000000 --- a/include/rnc/overlay/shared/props/bot_door_lock.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_BOT_DOOR_LOCK_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_BOT_DOOR_LOCK_H - -#include "types.h" - -void bot_door_lock_update(char *) __asm__("FUN_L06_00307d30"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_BOT_DOOR_LOCK_H */ diff --git a/include/rnc/overlay/shared/props/breakable_lamp.h b/include/rnc/overlay/shared/props/breakable_lamp.h deleted file mode 100644 index 13b234277f..0000000000 --- a/include/rnc/overlay/shared/props/breakable_lamp.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_BREAKABLE_LAMP_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_BREAKABLE_LAMP_H - -#include "types.h" - -struct Moby; - -void breakable_lamp_update(struct Moby *) __asm__("FUN_L05_0031c8e0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_BREAKABLE_LAMP_H */ diff --git a/include/rnc/overlay/shared/props/breakable_prop.h b/include/rnc/overlay/shared/props/breakable_prop.h deleted file mode 100644 index 1bab27ac44..0000000000 --- a/include/rnc/overlay/shared/props/breakable_prop.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_BREAKABLE_PROP_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_BREAKABLE_PROP_H - -#include "types.h" - -void prop_breakup_update(char *) __asm__("FUN_L06_00309860"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_BREAKABLE_PROP_H */ diff --git a/include/rnc/overlay/shared/props/directional_spark_emitter.h b/include/rnc/overlay/shared/props/directional_spark_emitter.h deleted file mode 100644 index 632fa6fab6..0000000000 --- a/include/rnc/overlay/shared/props/directional_spark_emitter.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_DIRECTIONAL_SPARK_EMITTER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_DIRECTIONAL_SPARK_EMITTER_H - -#include "types.h" - -void directional_spark_emitter_update(char *) __asm__("FUN_L08_002f5830"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_DIRECTIONAL_SPARK_EMITTER_H */ diff --git a/include/rnc/overlay/shared/props/electric_beam.h b/include/rnc/overlay/shared/props/electric_beam.h deleted file mode 100644 index a84373b3da..0000000000 --- a/include/rnc/overlay/shared/props/electric_beam.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_ELECTRIC_BEAM_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_ELECTRIC_BEAM_H - -#include "types.h" - -void electric_beam_update(unsigned char *) __asm__("FUN_L14_003015d0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_ELECTRIC_BEAM_H */ diff --git a/include/rnc/overlay/shared/props/electric_water.h b/include/rnc/overlay/shared/props/electric_water.h deleted file mode 100644 index 6f0cef3b36..0000000000 --- a/include/rnc/overlay/shared/props/electric_water.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_ELECTRIC_WATER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_ELECTRIC_WATER_H - -#include "types.h" - -struct Moby; - -void electric_water_update(struct Moby *) __asm__("FUN_L15_002d6810"); -void draw_electric_water_bolt_effect(char *) __asm__("FUN_L15_002d8710"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_ELECTRIC_WATER_H */ diff --git a/include/rnc/overlay/shared/props/energy_sphere.h b/include/rnc/overlay/shared/props/energy_sphere.h deleted file mode 100644 index 2dae3505b3..0000000000 --- a/include/rnc/overlay/shared/props/energy_sphere.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_ENERGY_SPHERE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_ENERGY_SPHERE_H - -#include "types.h" - -struct Moby; - -void energy_sphere_update(struct Moby *) __asm__("FUN_L06_002f7ab8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_ENERGY_SPHERE_H */ diff --git a/include/rnc/overlay/shared/props/energy_sphere_holder.h b/include/rnc/overlay/shared/props/energy_sphere_holder.h deleted file mode 100644 index c0a3b48e8c..0000000000 --- a/include/rnc/overlay/shared/props/energy_sphere_holder.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_ENERGY_SPHERE_HOLDER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_ENERGY_SPHERE_HOLDER_H - -#include "types.h" - -void energy_sphere_holder_update(char *) __asm__("FUN_L06_002f7288"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_ENERGY_SPHERE_HOLDER_H */ diff --git a/include/rnc/overlay/shared/props/escalator.h b/include/rnc/overlay/shared/props/escalator.h deleted file mode 100644 index 22a4e9dc97..0000000000 --- a/include/rnc/overlay/shared/props/escalator.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_ESCALATOR_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_ESCALATOR_H - -#include "types.h" - -void escalator_update(char *) __asm__("FUN_L02_002dc6b0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_ESCALATOR_H */ diff --git a/include/rnc/overlay/shared/props/flickering_point_light.h b/include/rnc/overlay/shared/props/flickering_point_light.h deleted file mode 100644 index e5adcc73e9..0000000000 --- a/include/rnc/overlay/shared/props/flickering_point_light.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_FLICKERING_POINT_LIGHT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_FLICKERING_POINT_LIGHT_H - -#include "types.h" - -void flickering_point_light_update(u8 *) __asm__("FUN_L01_0030b618"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_FLICKERING_POINT_LIGHT_H */ diff --git a/include/rnc/overlay/shared/props/floor_button.h b/include/rnc/overlay/shared/props/floor_button.h deleted file mode 100644 index 66ba42252d..0000000000 --- a/include/rnc/overlay/shared/props/floor_button.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_FLOOR_BUTTON_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_FLOOR_BUTTON_H - -#include "types.h" - -struct Moby; - -void floor_button_update(struct Moby *) __asm__("FUN_L05_0030c5b0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_FLOOR_BUTTON_H */ diff --git a/include/rnc/overlay/shared/props/garage_door.h b/include/rnc/overlay/shared/props/garage_door.h deleted file mode 100644 index f780cc80ff..0000000000 --- a/include/rnc/overlay/shared/props/garage_door.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_GARAGE_DOOR_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_GARAGE_DOOR_H - -#include "types.h" - -struct Moby; - -void garage_door_update(struct Moby *) __asm__("FUN_L03_002dca30"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_GARAGE_DOOR_H */ diff --git a/include/rnc/overlay/shared/props/grindrail_barrier.h b/include/rnc/overlay/shared/props/grindrail_barrier.h deleted file mode 100644 index 1687a2c404..0000000000 --- a/include/rnc/overlay/shared/props/grindrail_barrier.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_GRINDRAIL_BARRIER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_GRINDRAIL_BARRIER_H - -#include "types.h" - -struct Moby; - -void grindrail_barrier_update(struct Moby *) __asm__("FUN_L16_002e5708"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_GRINDRAIL_BARRIER_H */ diff --git a/include/rnc/overlay/shared/props/group_rotator.h b/include/rnc/overlay/shared/props/group_rotator.h deleted file mode 100644 index e321366a9f..0000000000 --- a/include/rnc/overlay/shared/props/group_rotator.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_GROUP_ROTATOR_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_GROUP_ROTATOR_H - -#include "types.h" - -void moby_rotation_group_update() __asm__("FUN_L06_002f4f00"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_GROUP_ROTATOR_H */ diff --git a/include/rnc/overlay/shared/props/hoverboard_ring.h b/include/rnc/overlay/shared/props/hoverboard_ring.h deleted file mode 100644 index 56d638fada..0000000000 --- a/include/rnc/overlay/shared/props/hoverboard_ring.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_HOVERBOARD_RING_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_HOVERBOARD_RING_H - -#include "types.h" - -void hoverboard_ring_update(char *) __asm__("FUN_L05_0031abe0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_HOVERBOARD_RING_H */ diff --git a/include/rnc/overlay/shared/props/hydrodisplacer.h b/include/rnc/overlay/shared/props/hydrodisplacer.h deleted file mode 100644 index 1a5f69948f..0000000000 --- a/include/rnc/overlay/shared/props/hydrodisplacer.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_HYDRODISPLACER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_HYDRODISPLACER_H - -#include "types.h" - -void hydrodisplacer_update() __asm__("FUN_L00_002df9a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_HYDRODISPLACER_H */ diff --git a/include/rnc/overlay/shared/props/hydrodisplacer_faucet.h b/include/rnc/overlay/shared/props/hydrodisplacer_faucet.h deleted file mode 100644 index 7ddc2943df..0000000000 --- a/include/rnc/overlay/shared/props/hydrodisplacer_faucet.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_HYDRODISPLACER_FAUCET_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_HYDRODISPLACER_FAUCET_H - -#include "types.h" - -void hydrodisplacer_faucet_update(char *) __asm__("FUN_L05_002f8080"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_HYDRODISPLACER_FAUCET_H */ diff --git a/include/rnc/overlay/shared/props/initialize_energy_sphere_holder_vars.h b/include/rnc/overlay/shared/props/initialize_energy_sphere_holder_vars.h deleted file mode 100644 index 870503398b..0000000000 --- a/include/rnc/overlay/shared/props/initialize_energy_sphere_holder_vars.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_INITIALIZE_ENERGY_SPHERE_HOLDER_VARS_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_INITIALIZE_ENERGY_SPHERE_HOLDER_VARS_H - -#include "types.h" - -struct Moby; - -void set_moby_state_two(struct Moby *) __asm__("FUN_L06_00303150"); -void initialize_energy_sphere_holder_vars(char *) __asm__("FUN_L06_002f7548"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_INITIALIZE_ENERGY_SPHERE_HOLDER_VARS_H */ diff --git a/include/rnc/overlay/shared/props/lamp.h b/include/rnc/overlay/shared/props/lamp.h deleted file mode 100644 index 3ebef18bca..0000000000 --- a/include/rnc/overlay/shared/props/lamp.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_LAMP_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_LAMP_H - -#include "types.h" - -void moby_wobble_update(unsigned char *) __asm__("FUN_L05_0030c0a8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_LAMP_H */ diff --git a/include/rnc/overlay/shared/props/linked_spark_emitter.h b/include/rnc/overlay/shared/props/linked_spark_emitter.h deleted file mode 100644 index 87c9431e1b..0000000000 --- a/include/rnc/overlay/shared/props/linked_spark_emitter.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_LINKED_SPARK_EMITTER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_LINKED_SPARK_EMITTER_H - -#include "types.h" - -void linked_spark_emitter_update(unsigned char *) __asm__("FUN_L15_002a2bf0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_LINKED_SPARK_EMITTER_H */ diff --git a/include/rnc/overlay/shared/props/moby_state_trigger.h b/include/rnc/overlay/shared/props/moby_state_trigger.h deleted file mode 100644 index a7dfb09bec..0000000000 --- a/include/rnc/overlay/shared/props/moby_state_trigger.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_MOBY_STATE_TRIGGER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_MOBY_STATE_TRIGGER_H - -#include "types.h" - -struct Moby; - -void moby_spatial_trigger_update(struct Moby *) __asm__("FUN_L05_002f5200"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_MOBY_STATE_TRIGGER_H */ diff --git a/include/rnc/overlay/shared/props/novalis_elevator.h b/include/rnc/overlay/shared/props/novalis_elevator.h deleted file mode 100644 index dae8f923e3..0000000000 --- a/include/rnc/overlay/shared/props/novalis_elevator.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_NOVALIS_ELEVATOR_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_NOVALIS_ELEVATOR_H - -#include "types.h" - -void novalis_elevator_update(unsigned char *) __asm__("FUN_L01_002b9eb0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_NOVALIS_ELEVATOR_H */ diff --git a/include/rnc/overlay/shared/props/ocean_pokitaru.h b/include/rnc/overlay/shared/props/ocean_pokitaru.h deleted file mode 100644 index c80e3fe694..0000000000 --- a/include/rnc/overlay/shared/props/ocean_pokitaru.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_OCEAN_POKITARU_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_OCEAN_POKITARU_H - -#include "types.h" - -void ocean_pokitaru_update() __asm__("FUN_L11_0030b358"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_OCEAN_POKITARU_H */ diff --git a/include/rnc/overlay/shared/props/particle_spawner_smoke_fire.h b/include/rnc/overlay/shared/props/particle_spawner_smoke_fire.h deleted file mode 100644 index 0e177987f2..0000000000 --- a/include/rnc/overlay/shared/props/particle_spawner_smoke_fire.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_PARTICLE_SPAWNER_SMOKE_FIRE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_PARTICLE_SPAWNER_SMOKE_FIRE_H - -#include "types.h" - -void particle_spawner_smoke_fire_update() __asm__("FUN_L00_002d6f28"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_PARTICLE_SPAWNER_SMOKE_FIRE_H */ diff --git a/include/rnc/overlay/shared/props/plant.h b/include/rnc/overlay/shared/props/plant.h deleted file mode 100644 index cb91831d80..0000000000 --- a/include/rnc/overlay/shared/props/plant.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_PLANT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_PLANT_H - -#include "types.h" - -void red_plant_update(unsigned char *) __asm__("FUN_L00_002e3ca8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_PLANT_H */ diff --git a/include/rnc/overlay/shared/props/pterodactyl.h b/include/rnc/overlay/shared/props/pterodactyl.h deleted file mode 100644 index 300d158e8a..0000000000 --- a/include/rnc/overlay/shared/props/pterodactyl.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_PTERODACTYL_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_PTERODACTYL_H - -#include "types.h" - -void pterodactyl_update(unsigned char *) __asm__("FUN_L00_002e3a88"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_PTERODACTYL_H */ diff --git a/include/rnc/overlay/shared/props/red_orb.h b/include/rnc/overlay/shared/props/red_orb.h deleted file mode 100644 index d90779882a..0000000000 --- a/include/rnc/overlay/shared/props/red_orb.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_RED_ORB_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_RED_ORB_H - -#include "types.h" - -struct Moby; - -void red_orb_update(struct Moby *) __asm__("FUN_L00_002df4f8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_RED_ORB_H */ diff --git a/include/rnc/overlay/shared/props/respawn_volume.h b/include/rnc/overlay/shared/props/respawn_volume.h deleted file mode 100644 index ce1f868bea..0000000000 --- a/include/rnc/overlay/shared/props/respawn_volume.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_RESPAWN_VOLUME_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_RESPAWN_VOLUME_H - -#include "types.h" - -void respawn_volume_update(char *) __asm__("FUN_L06_002f7930"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_RESPAWN_VOLUME_H */ diff --git a/include/rnc/overlay/shared/props/ripple_strips.h b/include/rnc/overlay/shared/props/ripple_strips.h deleted file mode 100644 index 0767eb9a7a..0000000000 --- a/include/rnc/overlay/shared/props/ripple_strips.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_RIPPLE_STRIPS_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_RIPPLE_STRIPS_H - -#include "types.h" - -struct Moby; - -void ripple_strips_moby_update(struct Moby *) __asm__("FUN_L15_002eb0a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_RIPPLE_STRIPS_H */ diff --git a/include/rnc/overlay/shared/props/spinning_fragment.h b/include/rnc/overlay/shared/props/spinning_fragment.h deleted file mode 100644 index fe16cc6f4e..0000000000 --- a/include/rnc/overlay/shared/props/spinning_fragment.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_SPINNING_FRAGMENT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_SPINNING_FRAGMENT_H - -#include "types.h" - -struct Moby; - -void falling_spinning_moby_update(struct Moby *) __asm__("FUN_L06_00300b90"); -unsigned char *spawn_spinning_moby_fragment(char *, float *, float *) __asm__("FUN_L06_00300c60"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_SPINNING_FRAGMENT_H */ diff --git a/include/rnc/overlay/shared/props/statue.h b/include/rnc/overlay/shared/props/statue.h deleted file mode 100644 index 7919dee906..0000000000 --- a/include/rnc/overlay/shared/props/statue.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_STATUE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_STATUE_H - -#include "types.h" - -void statue_update(unsigned char *) __asm__("FUN_L03_002d3cd8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_STATUE_H */ diff --git a/include/rnc/overlay/shared/props/swingshot_versatarget.h b/include/rnc/overlay/shared/props/swingshot_versatarget.h deleted file mode 100644 index f20d59e64f..0000000000 --- a/include/rnc/overlay/shared/props/swingshot_versatarget.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_SWINGSHOT_VERSATARGET_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_SWINGSHOT_VERSATARGET_H - -#include "types.h" - -void swingshot_versatarget_update(char *) __asm__("FUN_L02_002e0450"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_SWINGSHOT_VERSATARGET_H */ diff --git a/include/rnc/overlay/shared/props/timed_activation_pads.h b/include/rnc/overlay/shared/props/timed_activation_pads.h deleted file mode 100644 index 1e2a9cbe4a..0000000000 --- a/include/rnc/overlay/shared/props/timed_activation_pads.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_TIMED_ACTIVATION_PADS_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_TIMED_ACTIVATION_PADS_H - -#include "types.h" - -void timed_activation_pads_update(unsigned char *) __asm__("FUN_L07_0030bf90"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_TIMED_ACTIVATION_PADS_H */ diff --git a/include/rnc/overlay/shared/props/trackdrive_left.h b/include/rnc/overlay/shared/props/trackdrive_left.h deleted file mode 100644 index 4446a62385..0000000000 --- a/include/rnc/overlay/shared/props/trackdrive_left.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_TRACKDRIVE_LEFT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_TRACKDRIVE_LEFT_H - -#include "types.h" - -void trackdrive_left_update(char *) __asm__("FUN_L02_002cb978"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_TRACKDRIVE_LEFT_H */ diff --git a/include/rnc/overlay/shared/props/trespasser_pad.h b/include/rnc/overlay/shared/props/trespasser_pad.h deleted file mode 100644 index 9a9a84f0e2..0000000000 --- a/include/rnc/overlay/shared/props/trespasser_pad.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_TRESPASSER_PAD_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_TRESPASSER_PAD_H - -#include "types.h" - -void tresspasser_pad_update() __asm__("FUN_L02_002d8ad0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_TRESPASSER_PAD_H */ diff --git a/include/rnc/overlay/shared/props/tumbling_part.h b/include/rnc/overlay/shared/props/tumbling_part.h deleted file mode 100644 index 436cb9dcba..0000000000 --- a/include/rnc/overlay/shared/props/tumbling_part.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_TUMBLING_PART_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_TUMBLING_PART_H - -#include "types.h" - -void tumbling_part_update(char *) __asm__("FUN_L00_002e3d88"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_TUMBLING_PART_H */ diff --git a/include/rnc/overlay/shared/props/underwater_door.h b/include/rnc/overlay/shared/props/underwater_door.h deleted file mode 100644 index 63993c4ac9..0000000000 --- a/include/rnc/overlay/shared/props/underwater_door.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_UNDERWATER_DOOR_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_UNDERWATER_DOOR_H - -#include "types.h" - -struct Moby; - -void underwater_door_update(struct Moby *) __asm__("FUN_L15_002bddb0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_UNDERWATER_DOOR_H */ diff --git a/include/rnc/overlay/shared/props/underwater_ring.h b/include/rnc/overlay/shared/props/underwater_ring.h deleted file mode 100644 index 6f7da6de18..0000000000 --- a/include/rnc/overlay/shared/props/underwater_ring.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_UNDERWATER_RING_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_UNDERWATER_RING_H - -#include "types.h" - -struct Moby; - -void underwater_ring_update(struct Moby *) __asm__("FUN_L15_002e5958"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_UNDERWATER_RING_H */ diff --git a/include/rnc/overlay/shared/props/updraft_vent.h b/include/rnc/overlay/shared/props/updraft_vent.h deleted file mode 100644 index 5b20d74468..0000000000 --- a/include/rnc/overlay/shared/props/updraft_vent.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_PROPS_UPDRAFT_VENT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_PROPS_UPDRAFT_VENT_H - -#include "types.h" - -void updraft_vent_update(unsigned char *) __asm__("FUN_L10_002e9028"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_PROPS_UPDRAFT_VENT_H */ diff --git a/include/rnc/overlay/shared/rendering.h b/include/rnc/overlay/shared/rendering.h new file mode 100644 index 0000000000..cf36047ad7 --- /dev/null +++ b/include/rnc/overlay/shared/rendering.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_H +#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_H + +#include "types.h" + +void emit_sine_modulated_rgba_draw_packet(void) __asm__("FUN_L15_002cbd88"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_H */ diff --git a/include/rnc/overlay/shared/rendering/debug.h b/include/rnc/overlay/shared/rendering/debug.h new file mode 100644 index 0000000000..b3409e3a96 --- /dev/null +++ b/include/rnc/overlay/shared/rendering/debug.h @@ -0,0 +1,11 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_DEBUG_H +#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_DEBUG_H + +#include "types.h" + +void draw_debug_profiler_if_enabled(void) __asm__("FUN_L00_001f8e30"); +void update_debug_menu(void) __asm__("FUN_L00_001f4598"); +void draw_debug_menu(void) __asm__("FUN_L00_001f58e0"); +void flush_debug_text_queue(void) __asm__("FUN_L00_001f36f8"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_DEBUG_H */ diff --git a/include/rnc/overlay/shared/rendering/debug/draw_debug_profiler_if_enabled.h b/include/rnc/overlay/shared/rendering/debug/draw_debug_profiler_if_enabled.h deleted file mode 100644 index dbd7ede976..0000000000 --- a/include/rnc/overlay/shared/rendering/debug/draw_debug_profiler_if_enabled.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_DEBUG_DRAW_DEBUG_PROFILER_IF_ENABLED_H -#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_DEBUG_DRAW_DEBUG_PROFILER_IF_ENABLED_H - -#include "types.h" - -void draw_debug_profiler_if_enabled(void) __asm__("FUN_L00_001f8e30"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_DEBUG_DRAW_DEBUG_PROFILER_IF_ENABLED_H */ diff --git a/include/rnc/overlay/shared/rendering/debug/update_debug_menu.h b/include/rnc/overlay/shared/rendering/debug/update_debug_menu.h deleted file mode 100644 index 371432e3a3..0000000000 --- a/include/rnc/overlay/shared/rendering/debug/update_debug_menu.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_DEBUG_UPDATE_DEBUG_MENU_H -#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_DEBUG_UPDATE_DEBUG_MENU_H - -#include "types.h" - -void update_debug_menu(void) __asm__("FUN_L00_001f4598"); -void draw_debug_menu(void) __asm__("FUN_L00_001f58e0"); -void flush_debug_text_queue(void) __asm__("FUN_L00_001f36f8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_DEBUG_UPDATE_DEBUG_MENU_H */ diff --git a/include/rnc/overlay/shared/rendering/effects.h b/include/rnc/overlay/shared/rendering/effects.h new file mode 100644 index 0000000000..7aec95986d --- /dev/null +++ b/include/rnc/overlay/shared/rendering/effects.h @@ -0,0 +1,20 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_H +#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_H + +#include "types.h" + +struct Moby; + +void create_type_31_part(int, int *, int *, float *, int) __asm__("FUN_L03_00260130"); +void create_type_49_particle(void *, int, void *, float) __asm__("FUN_L08_0027f5f0"); +void debris_update(unsigned char *) __asm__("FUN_L00_002af5b8"); +void draw_eleven_entry_scrolled_texture_batch(int) __asm__("FUN_L08_002f0c18"); +void glow_particle_update() __asm__("FUN_L00_002acad8"); +void parent_following_effect_update(char *) __asm__("FUN_L03_002bae48"); +void radial_particle_emitter_update(char *) __asm__("FUN_L08_003085f0"); +void register_part_types(void) __asm__("FUN_L00_00268900"); +unsigned char *create_type_47_particle( + void *, float *, float *, int, int, int, int, int, char *) __asm__("FUN_L15_002647f0"); +void timed_sprite_effect_update(struct Moby *) __asm__("FUN_L06_0030be60"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_H */ diff --git a/include/rnc/overlay/shared/rendering/effects/create_type_31_part.h b/include/rnc/overlay/shared/rendering/effects/create_type_31_part.h deleted file mode 100644 index 9e3b6482a7..0000000000 --- a/include/rnc/overlay/shared/rendering/effects/create_type_31_part.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_CREATE_TYPE_31_PART_H -#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_CREATE_TYPE_31_PART_H - -#include "types.h" - -void create_type_31_part(int, int *, int *, float *, int) __asm__("FUN_L03_00260130"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_CREATE_TYPE_31_PART_H */ diff --git a/include/rnc/overlay/shared/rendering/effects/create_type_49_particle.h b/include/rnc/overlay/shared/rendering/effects/create_type_49_particle.h deleted file mode 100644 index d74c15e4bb..0000000000 --- a/include/rnc/overlay/shared/rendering/effects/create_type_49_particle.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_CREATE_TYPE_49_PARTICLE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_CREATE_TYPE_49_PARTICLE_H - -#include "types.h" - -void create_type_49_particle(void *, int, void *, float) __asm__("FUN_L08_0027f5f0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_CREATE_TYPE_49_PARTICLE_H */ diff --git a/include/rnc/overlay/shared/rendering/effects/debris.h b/include/rnc/overlay/shared/rendering/effects/debris.h deleted file mode 100644 index db181e97d2..0000000000 --- a/include/rnc/overlay/shared/rendering/effects/debris.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_DEBRIS_H -#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_DEBRIS_H - -#include "types.h" - -void debris_update(unsigned char *) __asm__("FUN_L00_002af5b8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_DEBRIS_H */ diff --git a/include/rnc/overlay/shared/rendering/effects/draw_scrolled_mesh_batch.h b/include/rnc/overlay/shared/rendering/effects/draw_scrolled_mesh_batch.h deleted file mode 100644 index e1ac1bd9ad..0000000000 --- a/include/rnc/overlay/shared/rendering/effects/draw_scrolled_mesh_batch.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_DRAW_SCROLLED_MESH_BATCH_H -#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_DRAW_SCROLLED_MESH_BATCH_H - -#include "types.h" - -void draw_eleven_entry_scrolled_texture_batch(int) __asm__("FUN_L08_002f0c18"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_DRAW_SCROLLED_MESH_BATCH_H */ diff --git a/include/rnc/overlay/shared/rendering/effects/glow_particle.h b/include/rnc/overlay/shared/rendering/effects/glow_particle.h deleted file mode 100644 index 3f83a452fb..0000000000 --- a/include/rnc/overlay/shared/rendering/effects/glow_particle.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_GLOW_PARTICLE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_GLOW_PARTICLE_H - -#include "types.h" - -void glow_particle_update() __asm__("FUN_L00_002acad8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_GLOW_PARTICLE_H */ diff --git a/include/rnc/overlay/shared/rendering/effects/parent_following_effect.h b/include/rnc/overlay/shared/rendering/effects/parent_following_effect.h deleted file mode 100644 index 8653b68b54..0000000000 --- a/include/rnc/overlay/shared/rendering/effects/parent_following_effect.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_PARENT_FOLLOWING_EFFECT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_PARENT_FOLLOWING_EFFECT_H - -#include "types.h" - -void parent_following_effect_update(char *) __asm__("FUN_L03_002bae48"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_PARENT_FOLLOWING_EFFECT_H */ diff --git a/include/rnc/overlay/shared/rendering/effects/radial_particle_emitter.h b/include/rnc/overlay/shared/rendering/effects/radial_particle_emitter.h deleted file mode 100644 index 5121fffc69..0000000000 --- a/include/rnc/overlay/shared/rendering/effects/radial_particle_emitter.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_RADIAL_PARTICLE_EMITTER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_RADIAL_PARTICLE_EMITTER_H - -#include "types.h" - -void radial_particle_emitter_update(char *) __asm__("FUN_L08_003085f0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_RADIAL_PARTICLE_EMITTER_H */ diff --git a/include/rnc/overlay/shared/rendering/effects/register_part_types.h b/include/rnc/overlay/shared/rendering/effects/register_part_types.h deleted file mode 100644 index b23f3add3e..0000000000 --- a/include/rnc/overlay/shared/rendering/effects/register_part_types.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_REGISTER_PART_TYPES_H -#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_REGISTER_PART_TYPES_H - -#include "types.h" - -void register_part_types(void) __asm__("FUN_L00_00268900"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_REGISTER_PART_TYPES_H */ diff --git a/include/rnc/overlay/shared/rendering/effects/spawn_owner_target_particle.h b/include/rnc/overlay/shared/rendering/effects/spawn_owner_target_particle.h deleted file mode 100644 index 85611e44bc..0000000000 --- a/include/rnc/overlay/shared/rendering/effects/spawn_owner_target_particle.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_SPAWN_OWNER_TARGET_PARTICLE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_SPAWN_OWNER_TARGET_PARTICLE_H - -#include "types.h" - -unsigned char *create_type_47_particle( - void *, float *, float *, int, int, int, int, int, char *) __asm__("FUN_L15_002647f0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_SPAWN_OWNER_TARGET_PARTICLE_H */ diff --git a/include/rnc/overlay/shared/rendering/effects/timed_sprite_effect.h b/include/rnc/overlay/shared/rendering/effects/timed_sprite_effect.h deleted file mode 100644 index bcfc4de06c..0000000000 --- a/include/rnc/overlay/shared/rendering/effects/timed_sprite_effect.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_TIMED_SPRITE_EFFECT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_TIMED_SPRITE_EFFECT_H - -#include "types.h" - -struct Moby; - -void timed_sprite_effect_update(struct Moby *) __asm__("FUN_L06_0030be60"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EFFECTS_TIMED_SPRITE_EFFECT_H */ diff --git a/include/rnc/overlay/shared/rendering/emit_sine_modulated_rgba_draw_packet.h b/include/rnc/overlay/shared/rendering/emit_sine_modulated_rgba_draw_packet.h deleted file mode 100644 index ae67d910ab..0000000000 --- a/include/rnc/overlay/shared/rendering/emit_sine_modulated_rgba_draw_packet.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EMIT_SINE_MODULATED_RGBA_DRAW_PACKET_H -#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EMIT_SINE_MODULATED_RGBA_DRAW_PACKET_H - -#include "types.h" - -void emit_sine_modulated_rgba_draw_packet(void) __asm__("FUN_L15_002cbd88"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_EMIT_SINE_MODULATED_RGBA_DRAW_PACKET_H */ diff --git a/include/rnc/overlay/shared/rendering/frame.h b/include/rnc/overlay/shared/rendering/frame.h new file mode 100644 index 0000000000..fc5fe7dfaf --- /dev/null +++ b/include/rnc/overlay/shared/rendering/frame.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_FRAME_H +#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_FRAME_H + +#include "types.h" + +void frame_roll_counter(void) __asm__("FUN_L00_001f6d70"); +void queue_framebuffer_upload(unsigned int) __asm__("FUN_L00_001fc558"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_FRAME_H */ diff --git a/include/rnc/overlay/shared/rendering/frame/frame_roll_counter.h b/include/rnc/overlay/shared/rendering/frame/frame_roll_counter.h deleted file mode 100644 index 1c04310ac1..0000000000 --- a/include/rnc/overlay/shared/rendering/frame/frame_roll_counter.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_FRAME_FRAME_ROLL_COUNTER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_FRAME_FRAME_ROLL_COUNTER_H - -#include "types.h" - -void frame_roll_counter(void) __asm__("FUN_L00_001f6d70"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_FRAME_FRAME_ROLL_COUNTER_H */ diff --git a/include/rnc/overlay/shared/rendering/frame/queue_framebuffer_upload.h b/include/rnc/overlay/shared/rendering/frame/queue_framebuffer_upload.h deleted file mode 100644 index 9ced89ee34..0000000000 --- a/include/rnc/overlay/shared/rendering/frame/queue_framebuffer_upload.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_FRAME_QUEUE_FRAMEBUFFER_UPLOAD_H -#define LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_FRAME_QUEUE_FRAMEBUFFER_UPLOAD_H - -#include "types.h" - -void queue_framebuffer_upload(unsigned int) __asm__("FUN_L00_001fc558"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_RENDERING_FRAME_QUEUE_FRAMEBUFFER_UPLOAD_H */ diff --git a/include/rnc/overlay/shared/streaming.h b/include/rnc/overlay/shared/streaming.h new file mode 100644 index 0000000000..65c350eafe --- /dev/null +++ b/include/rnc/overlay/shared/streaming.h @@ -0,0 +1,10 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_STREAMING_H +#define LOMBYTE_RNC_OVERLAY_SHARED_STREAMING_H + +#include "types.h" + +void load_chunks_with_optional_fade(s32, s32) __asm__("FUN_L00_00245610"); +void load_scene_chunks_with_fade(s32) __asm__("FUN_L00_002454c8"); +void start_indexed_disc_stream(s32) __asm__("FUN_L02_00298c68"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_STREAMING_H */ diff --git a/include/rnc/overlay/shared/streaming/load_scene_chunks_with_fade.h b/include/rnc/overlay/shared/streaming/load_scene_chunks_with_fade.h deleted file mode 100644 index c00b29bccd..0000000000 --- a/include/rnc/overlay/shared/streaming/load_scene_chunks_with_fade.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_STREAMING_LOAD_SCENE_CHUNKS_WITH_FADE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_STREAMING_LOAD_SCENE_CHUNKS_WITH_FADE_H - -#include "types.h" - -void load_chunks_with_optional_fade(s32, s32) __asm__("FUN_L00_00245610"); -void load_scene_chunks_with_fade(s32) __asm__("FUN_L00_002454c8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_STREAMING_LOAD_SCENE_CHUNKS_WITH_FADE_H */ diff --git a/include/rnc/overlay/shared/streaming/start_indexed_disc_stream.h b/include/rnc/overlay/shared/streaming/start_indexed_disc_stream.h deleted file mode 100644 index 9d80d5b494..0000000000 --- a/include/rnc/overlay/shared/streaming/start_indexed_disc_stream.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_STREAMING_START_INDEXED_DISC_STREAM_H -#define LOMBYTE_RNC_OVERLAY_SHARED_STREAMING_START_INDEXED_DISC_STREAM_H - -#include "types.h" - -void start_indexed_disc_stream(s32) __asm__("FUN_L02_00298c68"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_STREAMING_START_INDEXED_DISC_STREAM_H */ diff --git a/include/rnc/overlay/shared/ui/menus.h b/include/rnc/overlay/shared/ui/menus.h new file mode 100644 index 0000000000..ebfffd89a9 --- /dev/null +++ b/include/rnc/overlay/shared/ui/menus.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_UI_MENUS_H +#define LOMBYTE_RNC_OVERLAY_SHARED_UI_MENUS_H + +#include "types.h" + +int find_or_assign_bolt_source_slot(int, int) __asm__("FUN_L00_00284d90"); +s32 get_pause_menu_mode(void) __asm__("FUN_L00_00201720"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_UI_MENUS_H */ diff --git a/include/rnc/overlay/shared/ui/menus/find_or_assign_bolt_source_slot.h b/include/rnc/overlay/shared/ui/menus/find_or_assign_bolt_source_slot.h deleted file mode 100644 index 92ff2b494f..0000000000 --- a/include/rnc/overlay/shared/ui/menus/find_or_assign_bolt_source_slot.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_UI_MENUS_FIND_OR_ASSIGN_BOLT_SOURCE_SLOT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_UI_MENUS_FIND_OR_ASSIGN_BOLT_SOURCE_SLOT_H - -#include "types.h" - -int find_or_assign_bolt_source_slot(int, int) __asm__("FUN_L00_00284d90"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_UI_MENUS_FIND_OR_ASSIGN_BOLT_SOURCE_SLOT_H */ diff --git a/include/rnc/overlay/shared/ui/menus/get_pause_menu_mode.h b/include/rnc/overlay/shared/ui/menus/get_pause_menu_mode.h deleted file mode 100644 index bc23485d70..0000000000 --- a/include/rnc/overlay/shared/ui/menus/get_pause_menu_mode.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_UI_MENUS_GET_PAUSE_MENU_MODE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_UI_MENUS_GET_PAUSE_MENU_MODE_H - -#include "types.h" - -s32 get_pause_menu_mode(void) __asm__("FUN_L00_00201720"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_UI_MENUS_GET_PAUSE_MENU_MODE_H */ diff --git a/include/rnc/overlay/shared/ui/text.h b/include/rnc/overlay/shared/ui/text.h new file mode 100644 index 0000000000..50e743e8aa --- /dev/null +++ b/include/rnc/overlay/shared/ui/text.h @@ -0,0 +1,12 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_UI_TEXT_H +#define LOMBYTE_RNC_OVERLAY_SHARED_UI_TEXT_H + +#include "types.h" + +void draw_page_contents(void) __asm__("FUN_L00_001f8f50"); +void draw_dialog_background_and_text(void) __asm__("FUN_L00_001f8ec8"); +void draw_framebuffer_with_timed_text(void) __asm__("FUN_L00_001f8f78"); +void draw_timed_text(void *, s32) __asm__("FUN_L00_001fcca0"); +void level_draw_dialog_text(void) __asm__("FUN_L00_002018c8"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_UI_TEXT_H */ diff --git a/include/rnc/overlay/shared/ui/text/draw_dialog_background_and_text.h b/include/rnc/overlay/shared/ui/text/draw_dialog_background_and_text.h deleted file mode 100644 index 34e78ab767..0000000000 --- a/include/rnc/overlay/shared/ui/text/draw_dialog_background_and_text.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_UI_TEXT_DRAW_DIALOG_BACKGROUND_AND_TEXT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_UI_TEXT_DRAW_DIALOG_BACKGROUND_AND_TEXT_H - -#include "types.h" - -void draw_page_contents(void) __asm__("FUN_L00_001f8f50"); -void draw_dialog_background_and_text(void) __asm__("FUN_L00_001f8ec8"); -void draw_framebuffer_with_timed_text(void) __asm__("FUN_L00_001f8f78"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_UI_TEXT_DRAW_DIALOG_BACKGROUND_AND_TEXT_H */ diff --git a/include/rnc/overlay/shared/ui/text/draw_timed_text.h b/include/rnc/overlay/shared/ui/text/draw_timed_text.h deleted file mode 100644 index 2e65b96b30..0000000000 --- a/include/rnc/overlay/shared/ui/text/draw_timed_text.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_UI_TEXT_DRAW_TIMED_TEXT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_UI_TEXT_DRAW_TIMED_TEXT_H - -#include "types.h" - -void draw_timed_text(void *, s32) __asm__("FUN_L00_001fcca0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_UI_TEXT_DRAW_TIMED_TEXT_H */ diff --git a/include/rnc/overlay/shared/ui/text/level_draw_dialog_text.h b/include/rnc/overlay/shared/ui/text/level_draw_dialog_text.h deleted file mode 100644 index 9efcf5a264..0000000000 --- a/include/rnc/overlay/shared/ui/text/level_draw_dialog_text.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_UI_TEXT_LEVEL_DRAW_DIALOG_TEXT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_UI_TEXT_LEVEL_DRAW_DIALOG_TEXT_H - -#include "types.h" - -void level_draw_dialog_text(void) __asm__("FUN_L00_002018c8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_UI_TEXT_LEVEL_DRAW_DIALOG_TEXT_H */ diff --git a/include/rnc/overlay/shared/vehicles.h b/include/rnc/overlay/shared/vehicles.h new file mode 100644 index 0000000000..85e819adf9 --- /dev/null +++ b/include/rnc/overlay/shared/vehicles.h @@ -0,0 +1,20 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_H +#define LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_H + +#include "types.h" + +struct Moby; + +void background_ship_1_update(char *) __asm__("FUN_L02_002ec4b8"); +void background_ship_2_update(char *) __asm__("FUN_L02_002ece18"); +void fighter_jet_missile_update(struct Moby *) __asm__("FUN_L11_003089d0"); +void fighter_jet_rocket_update() __asm__("FUN_L13_002e6c08"); +void giant_clank_charged_blast_update() __asm__("FUN_L15_0029edb0"); +void giant_clank_hit_sphere_update(struct Moby *) __asm__("FUN_L15_0029ead0"); +void giant_clank_missile_update() __asm__("FUN_L15_0029d6c0"); +void giant_clank_pad_update(struct Moby *) __asm__("FUN_L15_002ed068"); +void hoverboard_update(unsigned char *) __asm__("FUN_L05_002f87a8"); +void ship_rocket_update(struct Moby *) __asm__("FUN_L11_003094f8"); +void veldin_ship_update() __asm__("FUN_L00_002d1e80"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_H */ diff --git a/include/rnc/overlay/shared/vehicles/background_ship_1.h b/include/rnc/overlay/shared/vehicles/background_ship_1.h deleted file mode 100644 index 2e820fc976..0000000000 --- a/include/rnc/overlay/shared/vehicles/background_ship_1.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_BACKGROUND_SHIP_1_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_BACKGROUND_SHIP_1_H - -#include "types.h" - -void background_ship_1_update(char *) __asm__("FUN_L02_002ec4b8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_BACKGROUND_SHIP_1_H */ diff --git a/include/rnc/overlay/shared/vehicles/background_ship_2.h b/include/rnc/overlay/shared/vehicles/background_ship_2.h deleted file mode 100644 index 06f988433b..0000000000 --- a/include/rnc/overlay/shared/vehicles/background_ship_2.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_BACKGROUND_SHIP_2_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_BACKGROUND_SHIP_2_H - -#include "types.h" - -void background_ship_2_update(char *) __asm__("FUN_L02_002ece18"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_BACKGROUND_SHIP_2_H */ diff --git a/include/rnc/overlay/shared/vehicles/fighter_jet_missile.h b/include/rnc/overlay/shared/vehicles/fighter_jet_missile.h deleted file mode 100644 index fe1a6de242..0000000000 --- a/include/rnc/overlay/shared/vehicles/fighter_jet_missile.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_FIGHTER_JET_MISSILE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_FIGHTER_JET_MISSILE_H - -#include "types.h" - -struct Moby; - -void fighter_jet_missile_update(struct Moby *) __asm__("FUN_L11_003089d0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_FIGHTER_JET_MISSILE_H */ diff --git a/include/rnc/overlay/shared/vehicles/fighter_jet_rocket.h b/include/rnc/overlay/shared/vehicles/fighter_jet_rocket.h deleted file mode 100644 index 15f75626b8..0000000000 --- a/include/rnc/overlay/shared/vehicles/fighter_jet_rocket.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_FIGHTER_JET_ROCKET_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_FIGHTER_JET_ROCKET_H - -#include "types.h" - -void fighter_jet_rocket_update() __asm__("FUN_L13_002e6c08"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_FIGHTER_JET_ROCKET_H */ diff --git a/include/rnc/overlay/shared/vehicles/giant_clank_charged_blast.h b/include/rnc/overlay/shared/vehicles/giant_clank_charged_blast.h deleted file mode 100644 index c5c29165cf..0000000000 --- a/include/rnc/overlay/shared/vehicles/giant_clank_charged_blast.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_GIANT_CLANK_CHARGED_BLAST_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_GIANT_CLANK_CHARGED_BLAST_H - -#include "types.h" - -void giant_clank_charged_blast_update() __asm__("FUN_L15_0029edb0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_GIANT_CLANK_CHARGED_BLAST_H */ diff --git a/include/rnc/overlay/shared/vehicles/giant_clank_hit_sphere.h b/include/rnc/overlay/shared/vehicles/giant_clank_hit_sphere.h deleted file mode 100644 index c3a86e23a7..0000000000 --- a/include/rnc/overlay/shared/vehicles/giant_clank_hit_sphere.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_GIANT_CLANK_HIT_SPHERE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_GIANT_CLANK_HIT_SPHERE_H - -#include "types.h" - -struct Moby; - -void giant_clank_hit_sphere_update(struct Moby *) __asm__("FUN_L15_0029ead0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_GIANT_CLANK_HIT_SPHERE_H */ diff --git a/include/rnc/overlay/shared/vehicles/giant_clank_missile.h b/include/rnc/overlay/shared/vehicles/giant_clank_missile.h deleted file mode 100644 index b934d957ba..0000000000 --- a/include/rnc/overlay/shared/vehicles/giant_clank_missile.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_GIANT_CLANK_MISSILE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_GIANT_CLANK_MISSILE_H - -#include "types.h" - -void giant_clank_missile_update() __asm__("FUN_L15_0029d6c0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_GIANT_CLANK_MISSILE_H */ diff --git a/include/rnc/overlay/shared/vehicles/giant_clank_pad.h b/include/rnc/overlay/shared/vehicles/giant_clank_pad.h deleted file mode 100644 index 1d48a47d37..0000000000 --- a/include/rnc/overlay/shared/vehicles/giant_clank_pad.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_GIANT_CLANK_PAD_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_GIANT_CLANK_PAD_H - -#include "types.h" - -struct Moby; - -void giant_clank_pad_update(struct Moby *) __asm__("FUN_L15_002ed068"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_GIANT_CLANK_PAD_H */ diff --git a/include/rnc/overlay/shared/vehicles/hoverboard.h b/include/rnc/overlay/shared/vehicles/hoverboard.h deleted file mode 100644 index 18865f8cbf..0000000000 --- a/include/rnc/overlay/shared/vehicles/hoverboard.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_HOVERBOARD_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_HOVERBOARD_H - -#include "types.h" - -void hoverboard_update(unsigned char *) __asm__("FUN_L05_002f87a8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_HOVERBOARD_H */ diff --git a/include/rnc/overlay/shared/vehicles/ship_rocket.h b/include/rnc/overlay/shared/vehicles/ship_rocket.h deleted file mode 100644 index 6d72c44d31..0000000000 --- a/include/rnc/overlay/shared/vehicles/ship_rocket.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_SHIP_ROCKET_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_SHIP_ROCKET_H - -#include "types.h" - -struct Moby; - -void ship_rocket_update(struct Moby *) __asm__("FUN_L11_003094f8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_SHIP_ROCKET_H */ diff --git a/include/rnc/overlay/shared/vehicles/veldin_ship.h b/include/rnc/overlay/shared/vehicles/veldin_ship.h deleted file mode 100644 index 117e7e4e90..0000000000 --- a/include/rnc/overlay/shared/vehicles/veldin_ship.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_VELDIN_SHIP_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_VELDIN_SHIP_H - -#include "types.h" - -void veldin_ship_update() __asm__("FUN_L00_002d1e80"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VEHICLES_VELDIN_SHIP_H */ diff --git a/include/rnc/overlay/shared/vendor.h b/include/rnc/overlay/shared/vendor.h new file mode 100644 index 0000000000..9d466956bc --- /dev/null +++ b/include/rnc/overlay/shared/vendor.h @@ -0,0 +1,13 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_H +#define LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_H + +#include "types.h" + +void draw_vendor_screen(void) __asm__("FUN_L00_002a02b0"); +void pool_splash(int, int, int, float, float, float, float) __asm__("FUN_L00_002a3ec8"); +void draw_vendor_purchase_text(void *, s32, s32) __asm__("FUN_L00_0029ead8"); +void flag_vendor_item(int) __asm__("FUN_L13_00316f48"); +void vendor_update() __asm__("FUN_L00_002a57a8"); +void vendor_orb_update(unsigned char *) __asm__("FUN_L00_002df730"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_H */ diff --git a/include/rnc/overlay/shared/vendor/draw_vendor_inset_quads.h b/include/rnc/overlay/shared/vendor/draw_vendor_inset_quads.h deleted file mode 100644 index b5ec49aef2..0000000000 --- a/include/rnc/overlay/shared/vendor/draw_vendor_inset_quads.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_DRAW_VENDOR_INSET_QUADS_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_DRAW_VENDOR_INSET_QUADS_H - -#include "types.h" - -void draw_vendor_screen(void) __asm__("FUN_L00_002a02b0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_DRAW_VENDOR_INSET_QUADS_H */ diff --git a/include/rnc/overlay/shared/vendor/draw_vendor_purchase_text.h b/include/rnc/overlay/shared/vendor/draw_vendor_purchase_text.h deleted file mode 100644 index bbde1ddf81..0000000000 --- a/include/rnc/overlay/shared/vendor/draw_vendor_purchase_text.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_DRAW_VENDOR_PURCHASE_TEXT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_DRAW_VENDOR_PURCHASE_TEXT_H - -#include "types.h" - -void pool_splash(int, int, int, float, float, float, float) __asm__("FUN_L00_002a3ec8"); -void draw_vendor_purchase_text(void *, s32, s32) __asm__("FUN_L00_0029ead8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_DRAW_VENDOR_PURCHASE_TEXT_H */ diff --git a/include/rnc/overlay/shared/vendor/flag_vendor_item.h b/include/rnc/overlay/shared/vendor/flag_vendor_item.h deleted file mode 100644 index 89e1edc669..0000000000 --- a/include/rnc/overlay/shared/vendor/flag_vendor_item.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_FLAG_VENDOR_ITEM_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_FLAG_VENDOR_ITEM_H - -#include "types.h" - -void flag_vendor_item(int) __asm__("FUN_L13_00316f48"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_FLAG_VENDOR_ITEM_H */ diff --git a/include/rnc/overlay/shared/vendor/vendor.h b/include/rnc/overlay/shared/vendor/vendor.h deleted file mode 100644 index a7f686d85c..0000000000 --- a/include/rnc/overlay/shared/vendor/vendor.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_VENDOR_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_VENDOR_H - -#include "types.h" - -void vendor_update() __asm__("FUN_L00_002a57a8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_VENDOR_H */ diff --git a/include/rnc/overlay/shared/vendor/vendor_orb.h b/include/rnc/overlay/shared/vendor/vendor_orb.h deleted file mode 100644 index 5bc8eb7045..0000000000 --- a/include/rnc/overlay/shared/vendor/vendor_orb.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_VENDOR_ORB_H -#define LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_VENDOR_ORB_H - -#include "types.h" - -void vendor_orb_update(unsigned char *) __asm__("FUN_L00_002df730"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_VENDOR_VENDOR_ORB_H */ diff --git a/include/rnc/overlay/shared/weapons.h b/include/rnc/overlay/shared/weapons.h new file mode 100644 index 0000000000..6542875a5c --- /dev/null +++ b/include/rnc/overlay/shared/weapons.h @@ -0,0 +1,59 @@ +#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_H +#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_H + +#include "rnc/overlay/shared/math/quad.h" +#include "rnc/overlay/shared/weapons/mine.h" +#include "rnc/sdk/eetypes.h" +#include "types.h" + +struct Moby; + +void blaster_update(struct Moby *) __asm__("FUN_L00_002b49a8"); +void homing_shot_update() __asm__("FUN_L00_002cb418"); +void bomb_glove_update(struct Moby *) __asm__("FUN_L00_002c26c8"); +void decoy_update(char *) __asm__("FUN_L00_002c4380"); +void release_moby_with_collision_check(float *, char *, void *) __asm__("FUN_L00_002c3888"); +void decoy_glove_update(unsigned char *) __asm__("FUN_L00_002d2670"); +void doom_bot_update(struct Moby *) __asm__("FUN_L00_002bffa8"); +unsigned char *spawn_doom_bot(int, u128 *, u128 *) __asm__("FUN_L00_002bfe08"); +void drone_update(struct Moby *) __asm__("FUN_L00_002ce358"); +void glove_of_doom_update(struct Moby *) __asm__("FUN_L00_002c7a58"); +void spawn_moby_collision_particles(unsigned char *) __asm__("FUN_L00_002c8078"); +void doom_bot_spawner_update(struct Moby *) __asm__("FUN_L00_002c89e8"); +void gold_devastator_missile_update(M910 *) __asm__("FUN_L00_002b03a0"); +void helipack_update(char *) __asm__("FUN_L00_002d37d0"); +void linked_moby_states_update(unsigned char *) __asm__("FUN_L00_002b3458"); +void metal_detector_update(struct Moby *) __asm__("FUN_L00_002d2ee8"); +void mine_glove_update(struct Moby *) __asm__("FUN_L00_002c1ad0"); +void morphoray_update() __asm__("FUN_L00_002bc7e8"); +s32 FUN_L00_002caf40(s32); +int cancel_suck_cannon_suction_and_set_moby_state_5(struct Moby *) __asm__("FUN_L00_002caf10"); +int launch_suck_cannon_projectile_and_update_moby_state(struct Moby *, + int, + int, + float) __asm__("FUN_L00_002cae60"); +int moby_set_state_from_check(struct Moby *) __asm__("FUN_L00_002cadc0"); +void morphoray_chicken_update() __asm__("FUN_L00_002c97e0"); +struct Moby *spawn_morphoray_chicken(void *) __asm__("FUN_L00_002c9348"); +void damped_falling_moby_update(unsigned char *) __asm__("FUN_L00_002cc210"); +void morphoray_target_effect_update() __asm__("FUN_L00_002d7f88"); +void pyrocitor_update(struct Moby *) __asm__("FUN_L00_002b77f0"); +void ryno_update(struct Moby *) __asm__("FUN_L00_002cc608"); +void ryno_rocket_update(char *) __asm__("FUN_L00_002cd1f0"); +void swingshot_update() __asm__("FUN_L00_002c6158"); +void taunter_update() __asm__("FUN_L00_002b6f10"); +void tesla_claw_update(struct Moby *) __asm__("FUN_L00_002b87e0"); +void thruster_pack_flame_update(void *) __asm__("FUN_L00_002b4198"); +void trailing_flame_update(struct Moby *) __asm__("FUN_L00_002bb400"); +void trespasser_update(struct Moby *) __asm__("FUN_L00_002c1718"); +void turret_rocket_update(char *) __asm__("FUN_L08_002e8210"); +char *spawn_turret_rocket(int, float *, float *, int) __asm__("FUN_L08_002e7eb0"); +void turret_shot_update(struct Moby *) __asm__("FUN_L09_00307d68"); +struct Moby *spawn_turret_shot(void *, OvlVec4 *, OvlVec4 *, s32) __asm__("FUN_L09_00307ba8"); +void visibomb_update() __asm__("FUN_L00_002b3058"); +void visibomb_missile_update(struct Moby *) __asm__("FUN_L00_002b6140"); +s32 spawn_visibomb_missile(void *, void *, f32, f32) __asm__("FUN_L00_002b58d8"); +void terminate_visibomb_missile(void *, char **) __asm__("FUN_L00_002b5b20"); +void walloper_update(char *) __asm__("FUN_L00_002bb558"); + +#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_H */ diff --git a/include/rnc/overlay/shared/weapons/blaster.h b/include/rnc/overlay/shared/weapons/blaster.h deleted file mode 100644 index a1aa577cfc..0000000000 --- a/include/rnc/overlay/shared/weapons/blaster.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_BLASTER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_BLASTER_H - -#include "types.h" - -struct Moby; - -void blaster_update(struct Moby *) __asm__("FUN_L00_002b49a8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_BLASTER_H */ diff --git a/include/rnc/overlay/shared/weapons/blaster_shot.h b/include/rnc/overlay/shared/weapons/blaster_shot.h deleted file mode 100644 index 02374d8ab1..0000000000 --- a/include/rnc/overlay/shared/weapons/blaster_shot.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_BLASTER_SHOT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_BLASTER_SHOT_H - -#include "types.h" - -void homing_shot_update() __asm__("FUN_L00_002cb418"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_BLASTER_SHOT_H */ diff --git a/include/rnc/overlay/shared/weapons/bomb_glove.h b/include/rnc/overlay/shared/weapons/bomb_glove.h deleted file mode 100644 index 4eb9e84d95..0000000000 --- a/include/rnc/overlay/shared/weapons/bomb_glove.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_BOMB_GLOVE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_BOMB_GLOVE_H - -#include "types.h" - -struct Moby; - -void bomb_glove_update(struct Moby *) __asm__("FUN_L00_002c26c8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_BOMB_GLOVE_H */ diff --git a/include/rnc/overlay/shared/weapons/decoy.h b/include/rnc/overlay/shared/weapons/decoy.h deleted file mode 100644 index e91cb17adc..0000000000 --- a/include/rnc/overlay/shared/weapons/decoy.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_DECOY_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_DECOY_H - -#include "types.h" - -void decoy_update(char *) __asm__("FUN_L00_002c4380"); -void release_moby_with_collision_check(float *, char *, void *) __asm__("FUN_L00_002c3888"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_DECOY_H */ diff --git a/include/rnc/overlay/shared/weapons/decoy_glove.h b/include/rnc/overlay/shared/weapons/decoy_glove.h deleted file mode 100644 index 8657b6c4f9..0000000000 --- a/include/rnc/overlay/shared/weapons/decoy_glove.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_DECOY_GLOVE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_DECOY_GLOVE_H - -#include "types.h" - -void decoy_glove_update(unsigned char *) __asm__("FUN_L00_002d2670"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_DECOY_GLOVE_H */ diff --git a/include/rnc/overlay/shared/weapons/doom_bot.h b/include/rnc/overlay/shared/weapons/doom_bot.h deleted file mode 100644 index 846b53f1e1..0000000000 --- a/include/rnc/overlay/shared/weapons/doom_bot.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_DOOM_BOT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_DOOM_BOT_H - -#include "types.h" -#include "rnc/sdk/eetypes.h" - -struct Moby; - -void doom_bot_update(struct Moby *) __asm__("FUN_L00_002bffa8"); -unsigned char *spawn_doom_bot(int, u128 *, u128 *) __asm__("FUN_L00_002bfe08"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_DOOM_BOT_H */ diff --git a/include/rnc/overlay/shared/weapons/drone.h b/include/rnc/overlay/shared/weapons/drone.h deleted file mode 100644 index 7a6574d380..0000000000 --- a/include/rnc/overlay/shared/weapons/drone.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_DRONE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_DRONE_H - -#include "types.h" - -struct Moby; - -void drone_update(struct Moby *) __asm__("FUN_L00_002ce358"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_DRONE_H */ diff --git a/include/rnc/overlay/shared/weapons/glove_of_doom.h b/include/rnc/overlay/shared/weapons/glove_of_doom.h deleted file mode 100644 index b82da84769..0000000000 --- a/include/rnc/overlay/shared/weapons/glove_of_doom.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_GLOVE_OF_DOOM_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_GLOVE_OF_DOOM_H - -#include "types.h" - -struct Moby; - -void glove_of_doom_update(struct Moby *) __asm__("FUN_L00_002c7a58"); -void spawn_moby_collision_particles(unsigned char *) __asm__("FUN_L00_002c8078"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_GLOVE_OF_DOOM_H */ diff --git a/include/rnc/overlay/shared/weapons/glove_of_doom_bomb.h b/include/rnc/overlay/shared/weapons/glove_of_doom_bomb.h deleted file mode 100644 index d44d8c79ef..0000000000 --- a/include/rnc/overlay/shared/weapons/glove_of_doom_bomb.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_GLOVE_OF_DOOM_BOMB_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_GLOVE_OF_DOOM_BOMB_H - -#include "types.h" - -struct Moby; - -void doom_bot_spawner_update(struct Moby *) __asm__("FUN_L00_002c89e8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_GLOVE_OF_DOOM_BOMB_H */ diff --git a/include/rnc/overlay/shared/weapons/gold_devastator_missile.h b/include/rnc/overlay/shared/weapons/gold_devastator_missile.h deleted file mode 100644 index f304b128de..0000000000 --- a/include/rnc/overlay/shared/weapons/gold_devastator_missile.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_GOLD_DEVASTATOR_MISSILE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_GOLD_DEVASTATOR_MISSILE_H - -#include "types.h" -#include "rnc/overlay/shared/weapons/mine.h" - -void gold_devastator_missile_update(M910 *) __asm__("FUN_L00_002b03a0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_GOLD_DEVASTATOR_MISSILE_H */ diff --git a/include/rnc/overlay/shared/weapons/helipack.h b/include/rnc/overlay/shared/weapons/helipack.h deleted file mode 100644 index 70555e821f..0000000000 --- a/include/rnc/overlay/shared/weapons/helipack.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_HELIPACK_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_HELIPACK_H - -#include "types.h" - -void helipack_update(char *) __asm__("FUN_L00_002d37d0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_HELIPACK_H */ diff --git a/include/rnc/overlay/shared/weapons/linked_moby_states_update.h b/include/rnc/overlay/shared/weapons/linked_moby_states_update.h deleted file mode 100644 index 3a47bb8be7..0000000000 --- a/include/rnc/overlay/shared/weapons/linked_moby_states_update.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_LINKED_MOBY_STATES_UPDATE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_LINKED_MOBY_STATES_UPDATE_H - -#include "types.h" - -void linked_moby_states_update(unsigned char *) __asm__("FUN_L00_002b3458"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_LINKED_MOBY_STATES_UPDATE_H */ diff --git a/include/rnc/overlay/shared/weapons/metal_detector.h b/include/rnc/overlay/shared/weapons/metal_detector.h deleted file mode 100644 index a1eae95792..0000000000 --- a/include/rnc/overlay/shared/weapons/metal_detector.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_METAL_DETECTOR_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_METAL_DETECTOR_H - -#include "types.h" - -struct Moby; - -void metal_detector_update(struct Moby *) __asm__("FUN_L00_002d2ee8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_METAL_DETECTOR_H */ diff --git a/include/rnc/overlay/shared/weapons/mine_glove.h b/include/rnc/overlay/shared/weapons/mine_glove.h deleted file mode 100644 index ecdf9e8ef8..0000000000 --- a/include/rnc/overlay/shared/weapons/mine_glove.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_MINE_GLOVE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_MINE_GLOVE_H - -#include "types.h" - -struct Moby; - -void mine_glove_update(struct Moby *) __asm__("FUN_L00_002c1ad0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_MINE_GLOVE_H */ diff --git a/include/rnc/overlay/shared/weapons/morphoray.h b/include/rnc/overlay/shared/weapons/morphoray.h deleted file mode 100644 index 6adc754943..0000000000 --- a/include/rnc/overlay/shared/weapons/morphoray.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_MORPHORAY_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_MORPHORAY_H - -#include "types.h" - -void morphoray_update() __asm__("FUN_L00_002bc7e8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_MORPHORAY_H */ diff --git a/include/rnc/overlay/shared/weapons/morphoray_chicken.h b/include/rnc/overlay/shared/weapons/morphoray_chicken.h deleted file mode 100644 index 56723e9871..0000000000 --- a/include/rnc/overlay/shared/weapons/morphoray_chicken.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_MORPHORAY_CHICKEN_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_MORPHORAY_CHICKEN_H - -#include "types.h" - -struct Moby; - -s32 FUN_L00_002caf40(s32); -int cancel_suck_cannon_suction_and_set_moby_state_5(struct Moby *) __asm__("FUN_L00_002caf10"); -int launch_suck_cannon_projectile_and_update_moby_state(struct Moby *, - int, - int, - float) __asm__("FUN_L00_002cae60"); -int moby_set_state_from_check(struct Moby *) __asm__("FUN_L00_002cadc0"); -void morphoray_chicken_update() __asm__("FUN_L00_002c97e0"); -struct Moby *spawn_morphoray_chicken(void *) __asm__("FUN_L00_002c9348"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_MORPHORAY_CHICKEN_H */ diff --git a/include/rnc/overlay/shared/weapons/morphoray_chicken_feather.h b/include/rnc/overlay/shared/weapons/morphoray_chicken_feather.h deleted file mode 100644 index 0edbd22f3f..0000000000 --- a/include/rnc/overlay/shared/weapons/morphoray_chicken_feather.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_MORPHORAY_CHICKEN_FEATHER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_MORPHORAY_CHICKEN_FEATHER_H - -#include "types.h" - -void damped_falling_moby_update(unsigned char *) __asm__("FUN_L00_002cc210"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_MORPHORAY_CHICKEN_FEATHER_H */ diff --git a/include/rnc/overlay/shared/weapons/morphoray_target_effect.h b/include/rnc/overlay/shared/weapons/morphoray_target_effect.h deleted file mode 100644 index 6ae3fd85f9..0000000000 --- a/include/rnc/overlay/shared/weapons/morphoray_target_effect.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_MORPHORAY_TARGET_EFFECT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_MORPHORAY_TARGET_EFFECT_H - -#include "types.h" - -void morphoray_target_effect_update() __asm__("FUN_L00_002d7f88"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_MORPHORAY_TARGET_EFFECT_H */ diff --git a/include/rnc/overlay/shared/weapons/pyrocitor.h b/include/rnc/overlay/shared/weapons/pyrocitor.h deleted file mode 100644 index 3b21127723..0000000000 --- a/include/rnc/overlay/shared/weapons/pyrocitor.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_PYROCITOR_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_PYROCITOR_H - -#include "types.h" - -struct Moby; - -void pyrocitor_update(struct Moby *) __asm__("FUN_L00_002b77f0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_PYROCITOR_H */ diff --git a/include/rnc/overlay/shared/weapons/ryno.h b/include/rnc/overlay/shared/weapons/ryno.h deleted file mode 100644 index b933d53245..0000000000 --- a/include/rnc/overlay/shared/weapons/ryno.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_RYNO_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_RYNO_H - -#include "types.h" - -struct Moby; - -void ryno_update(struct Moby *) __asm__("FUN_L00_002cc608"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_RYNO_H */ diff --git a/include/rnc/overlay/shared/weapons/ryno_rocket.h b/include/rnc/overlay/shared/weapons/ryno_rocket.h deleted file mode 100644 index 9c2c1e84f6..0000000000 --- a/include/rnc/overlay/shared/weapons/ryno_rocket.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_RYNO_ROCKET_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_RYNO_ROCKET_H - -#include "types.h" - -void ryno_rocket_update(char *) __asm__("FUN_L00_002cd1f0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_RYNO_ROCKET_H */ diff --git a/include/rnc/overlay/shared/weapons/swingshot.h b/include/rnc/overlay/shared/weapons/swingshot.h deleted file mode 100644 index 8826f7e447..0000000000 --- a/include/rnc/overlay/shared/weapons/swingshot.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_SWINGSHOT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_SWINGSHOT_H - -#include "types.h" - -void swingshot_update() __asm__("FUN_L00_002c6158"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_SWINGSHOT_H */ diff --git a/include/rnc/overlay/shared/weapons/taunter.h b/include/rnc/overlay/shared/weapons/taunter.h deleted file mode 100644 index aef8b86938..0000000000 --- a/include/rnc/overlay/shared/weapons/taunter.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TAUNTER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TAUNTER_H - -#include "types.h" - -void taunter_update() __asm__("FUN_L00_002b6f10"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TAUNTER_H */ diff --git a/include/rnc/overlay/shared/weapons/tesla_claw.h b/include/rnc/overlay/shared/weapons/tesla_claw.h deleted file mode 100644 index 7257fd40a6..0000000000 --- a/include/rnc/overlay/shared/weapons/tesla_claw.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TESLA_CLAW_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TESLA_CLAW_H - -#include "types.h" - -struct Moby; - -void tesla_claw_update(struct Moby *) __asm__("FUN_L00_002b87e0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TESLA_CLAW_H */ diff --git a/include/rnc/overlay/shared/weapons/thruster_pack_flame.h b/include/rnc/overlay/shared/weapons/thruster_pack_flame.h deleted file mode 100644 index dd61e39da4..0000000000 --- a/include/rnc/overlay/shared/weapons/thruster_pack_flame.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_THRUSTER_PACK_FLAME_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_THRUSTER_PACK_FLAME_H - -#include "types.h" - -void thruster_pack_flame_update(void *) __asm__("FUN_L00_002b4198"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_THRUSTER_PACK_FLAME_H */ diff --git a/include/rnc/overlay/shared/weapons/trailing_flame.h b/include/rnc/overlay/shared/weapons/trailing_flame.h deleted file mode 100644 index 6d09ea57af..0000000000 --- a/include/rnc/overlay/shared/weapons/trailing_flame.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TRAILING_FLAME_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TRAILING_FLAME_H - -#include "types.h" - -struct Moby; - -void trailing_flame_update(struct Moby *) __asm__("FUN_L00_002bb400"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TRAILING_FLAME_H */ diff --git a/include/rnc/overlay/shared/weapons/trespasser.h b/include/rnc/overlay/shared/weapons/trespasser.h deleted file mode 100644 index 2e7987edbc..0000000000 --- a/include/rnc/overlay/shared/weapons/trespasser.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TRESPASSER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TRESPASSER_H - -#include "types.h" - -struct Moby; - -void trespasser_update(struct Moby *) __asm__("FUN_L00_002c1718"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TRESPASSER_H */ diff --git a/include/rnc/overlay/shared/weapons/turret_rocket.h b/include/rnc/overlay/shared/weapons/turret_rocket.h deleted file mode 100644 index 7141686ba1..0000000000 --- a/include/rnc/overlay/shared/weapons/turret_rocket.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TURRET_ROCKET_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TURRET_ROCKET_H - -#include "types.h" - -void turret_rocket_update(char *) __asm__("FUN_L08_002e8210"); -char *spawn_turret_rocket(int, float *, float *, int) __asm__("FUN_L08_002e7eb0"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TURRET_ROCKET_H */ diff --git a/include/rnc/overlay/shared/weapons/turret_shot.h b/include/rnc/overlay/shared/weapons/turret_shot.h deleted file mode 100644 index ce33f9f601..0000000000 --- a/include/rnc/overlay/shared/weapons/turret_shot.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TURRET_SHOT_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TURRET_SHOT_H - -#include "rnc/overlay/shared/math/quad.h" -#include "types.h" - -struct Moby; - -void turret_shot_update(struct Moby *) __asm__("FUN_L09_00307d68"); -struct Moby *spawn_turret_shot(void *, OvlVec4 *, OvlVec4 *, s32) __asm__("FUN_L09_00307ba8"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_TURRET_SHOT_H */ diff --git a/include/rnc/overlay/shared/weapons/visibomb.h b/include/rnc/overlay/shared/weapons/visibomb.h deleted file mode 100644 index 292f16741b..0000000000 --- a/include/rnc/overlay/shared/weapons/visibomb.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_VISIBOMB_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_VISIBOMB_H - -#include "types.h" - -void visibomb_update() __asm__("FUN_L00_002b3058"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_VISIBOMB_H */ diff --git a/include/rnc/overlay/shared/weapons/visibomb_missile.h b/include/rnc/overlay/shared/weapons/visibomb_missile.h deleted file mode 100644 index f9dce5afad..0000000000 --- a/include/rnc/overlay/shared/weapons/visibomb_missile.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_VISIBOMB_MISSILE_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_VISIBOMB_MISSILE_H - -#include "types.h" - -struct Moby; - -void visibomb_missile_update(struct Moby *) __asm__("FUN_L00_002b6140"); -s32 spawn_visibomb_missile(void *, void *, f32, f32) __asm__("FUN_L00_002b58d8"); -void terminate_visibomb_missile(void *, char **) __asm__("FUN_L00_002b5b20"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_VISIBOMB_MISSILE_H */ diff --git a/include/rnc/overlay/shared/weapons/walloper.h b/include/rnc/overlay/shared/weapons/walloper.h deleted file mode 100644 index 023d32f15d..0000000000 --- a/include/rnc/overlay/shared/weapons/walloper.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_WALLOPER_H -#define LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_WALLOPER_H - -#include "types.h" - -void walloper_update(char *) __asm__("FUN_L00_002bb558"); - -#endif /* LOMBYTE_RNC_OVERLAY_SHARED_WEAPONS_WALLOPER_H */ diff --git a/include/rnc/rendering/debug.h b/include/rnc/rendering/debug.h new file mode 100644 index 0000000000..f017d353dd --- /dev/null +++ b/include/rnc/rendering/debug.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_RENDERING_DEBUG_H +#define LOMBYTE_RNC_RENDERING_DEBUG_H + +#include "types.h" + +void prepare_debug_profiler_render(void) __asm__("FUN_001f4248"); + +#endif /* LOMBYTE_RNC_RENDERING_DEBUG_H */ diff --git a/include/rnc/rendering/debug/prepare_debug_profiler_render.h b/include/rnc/rendering/debug/prepare_debug_profiler_render.h deleted file mode 100644 index ce6f7374ff..0000000000 --- a/include/rnc/rendering/debug/prepare_debug_profiler_render.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_DEBUG_PREPARE_DEBUG_PROFILER_RENDER_H -#define LOMBYTE_RNC_RENDERING_DEBUG_PREPARE_DEBUG_PROFILER_RENDER_H - -#include "types.h" - -void prepare_debug_profiler_render(void) __asm__("FUN_001f4248"); - -#endif /* LOMBYTE_RNC_RENDERING_DEBUG_PREPARE_DEBUG_PROFILER_RENDER_H */ diff --git a/include/rnc/rendering/effects.h b/include/rnc/rendering/effects.h new file mode 100644 index 0000000000..ef659fc2f0 --- /dev/null +++ b/include/rnc/rendering/effects.h @@ -0,0 +1,12 @@ +#ifndef LOMBYTE_RNC_RENDERING_EFFECTS_H +#define LOMBYTE_RNC_RENDERING_EFFECTS_H + +#include "types.h" + +struct TransitionState; + +void append_billboard_batch(void) __asm__("FUN_001f92b0"); +void draw_resident_textured_banner(s32) __asm__("FUN_0022ea08"); +s32 draw_transition_overlay(struct TransitionState *) __asm__("FUN_0021fc68"); + +#endif /* LOMBYTE_RNC_RENDERING_EFFECTS_H */ diff --git a/include/rnc/rendering/effects/append_billboard_batch.h b/include/rnc/rendering/effects/append_billboard_batch.h deleted file mode 100644 index 6382cecd43..0000000000 --- a/include/rnc/rendering/effects/append_billboard_batch.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_EFFECTS_APPEND_BILLBOARD_BATCH_H -#define LOMBYTE_RNC_RENDERING_EFFECTS_APPEND_BILLBOARD_BATCH_H - -#include "types.h" - -void append_billboard_batch(void) __asm__("FUN_001f92b0"); - -#endif /* LOMBYTE_RNC_RENDERING_EFFECTS_APPEND_BILLBOARD_BATCH_H */ diff --git a/include/rnc/rendering/effects/draw_resident_textured_banner.h b/include/rnc/rendering/effects/draw_resident_textured_banner.h deleted file mode 100644 index 47c83d8451..0000000000 --- a/include/rnc/rendering/effects/draw_resident_textured_banner.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_EFFECTS_DRAW_RESIDENT_TEXTURED_BANNER_H -#define LOMBYTE_RNC_RENDERING_EFFECTS_DRAW_RESIDENT_TEXTURED_BANNER_H - -#include "types.h" - -void draw_resident_textured_banner(s32) __asm__("FUN_0022ea08"); - -#endif /* LOMBYTE_RNC_RENDERING_EFFECTS_DRAW_RESIDENT_TEXTURED_BANNER_H */ diff --git a/include/rnc/rendering/effects/draw_transition_overlay.h b/include/rnc/rendering/effects/draw_transition_overlay.h deleted file mode 100644 index 664d0b1f57..0000000000 --- a/include/rnc/rendering/effects/draw_transition_overlay.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_EFFECTS_DRAW_TRANSITION_OVERLAY_H -#define LOMBYTE_RNC_RENDERING_EFFECTS_DRAW_TRANSITION_OVERLAY_H - -#include "types.h" - -struct TransitionState; - -s32 draw_transition_overlay(struct TransitionState *) __asm__("FUN_0021fc68"); - -#endif /* LOMBYTE_RNC_RENDERING_EFFECTS_DRAW_TRANSITION_OVERLAY_H */ diff --git a/include/rnc/rendering/frame.h b/include/rnc/rendering/frame.h new file mode 100644 index 0000000000..b266e6b6d5 --- /dev/null +++ b/include/rnc/rendering/frame.h @@ -0,0 +1,11 @@ +#ifndef LOMBYTE_RNC_RENDERING_FRAME_H +#define LOMBYTE_RNC_RENDERING_FRAME_H + +#include "types.h" + +void copy_render_buffer_pair(void) __asm__("FUN_00235840"); +void reset_draw_config(void); +void reset_gs_registers_pr(void) __asm__("FUN_001f3958"); +void set_background_color(s32, u64, u64); + +#endif /* LOMBYTE_RNC_RENDERING_FRAME_H */ diff --git a/include/rnc/rendering/frame/callbacks.h b/include/rnc/rendering/frame/callbacks.h new file mode 100644 index 0000000000..930bd63cfb --- /dev/null +++ b/include/rnc/rendering/frame/callbacks.h @@ -0,0 +1,10 @@ +#ifndef LOMBYTE_RNC_RENDERING_FRAME_CALLBACKS_H +#define LOMBYTE_RNC_RENDERING_FRAME_CALLBACKS_H + +#include "types.h" + +void noop_callback_h(void) __asm__("func_001E9428"); +void noop_callback_i(void) __asm__("func_001E9430"); +void noop_graphics_callback(void) __asm__("func_00237A70"); + +#endif /* LOMBYTE_RNC_RENDERING_FRAME_CALLBACKS_H */ diff --git a/include/rnc/rendering/frame/callbacks/noop_callback_h.h b/include/rnc/rendering/frame/callbacks/noop_callback_h.h deleted file mode 100644 index b9536e7f06..0000000000 --- a/include/rnc/rendering/frame/callbacks/noop_callback_h.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_FRAME_CALLBACKS_NOOP_CALLBACK_H_H -#define LOMBYTE_RNC_RENDERING_FRAME_CALLBACKS_NOOP_CALLBACK_H_H - -#include "types.h" - -void noop_callback_h(void) __asm__("func_001E9428"); - -#endif /* LOMBYTE_RNC_RENDERING_FRAME_CALLBACKS_NOOP_CALLBACK_H_H */ diff --git a/include/rnc/rendering/frame/callbacks/noop_callback_i.h b/include/rnc/rendering/frame/callbacks/noop_callback_i.h deleted file mode 100644 index 5dae8b9438..0000000000 --- a/include/rnc/rendering/frame/callbacks/noop_callback_i.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_FRAME_CALLBACKS_NOOP_CALLBACK_I_H -#define LOMBYTE_RNC_RENDERING_FRAME_CALLBACKS_NOOP_CALLBACK_I_H - -#include "types.h" - -void noop_callback_i(void) __asm__("func_001E9430"); - -#endif /* LOMBYTE_RNC_RENDERING_FRAME_CALLBACKS_NOOP_CALLBACK_I_H */ diff --git a/include/rnc/rendering/frame/callbacks/noop_graphics_callback.h b/include/rnc/rendering/frame/callbacks/noop_graphics_callback.h deleted file mode 100644 index 1cc4c17dc3..0000000000 --- a/include/rnc/rendering/frame/callbacks/noop_graphics_callback.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_FRAME_CALLBACKS_NOOP_GRAPHICS_CALLBACK_H -#define LOMBYTE_RNC_RENDERING_FRAME_CALLBACKS_NOOP_GRAPHICS_CALLBACK_H - -#include "types.h" - -void noop_graphics_callback(void) __asm__("func_00237A70"); - -#endif /* LOMBYTE_RNC_RENDERING_FRAME_CALLBACKS_NOOP_GRAPHICS_CALLBACK_H */ diff --git a/include/rnc/rendering/frame/copy_render_buffer_pair.h b/include/rnc/rendering/frame/copy_render_buffer_pair.h deleted file mode 100644 index 1a9c1c0114..0000000000 --- a/include/rnc/rendering/frame/copy_render_buffer_pair.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_FRAME_COPY_RENDER_BUFFER_PAIR_H -#define LOMBYTE_RNC_RENDERING_FRAME_COPY_RENDER_BUFFER_PAIR_H - -#include "types.h" - -void copy_render_buffer_pair(void) __asm__("FUN_00235840"); - -#endif /* LOMBYTE_RNC_RENDERING_FRAME_COPY_RENDER_BUFFER_PAIR_H */ diff --git a/include/rnc/rendering/frame/reset_draw_config.h b/include/rnc/rendering/frame/reset_draw_config.h deleted file mode 100644 index 389a224d82..0000000000 --- a/include/rnc/rendering/frame/reset_draw_config.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_FRAME_RESET_DRAW_CONFIG_H -#define LOMBYTE_RNC_RENDERING_FRAME_RESET_DRAW_CONFIG_H - -#include "types.h" - -void reset_draw_config(void); - -#endif /* LOMBYTE_RNC_RENDERING_FRAME_RESET_DRAW_CONFIG_H */ diff --git a/include/rnc/rendering/frame/reset_gs_registers_pr.h b/include/rnc/rendering/frame/reset_gs_registers_pr.h deleted file mode 100644 index 84c1bbe648..0000000000 --- a/include/rnc/rendering/frame/reset_gs_registers_pr.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_FRAME_RESET_GS_REGISTERS_PR_H -#define LOMBYTE_RNC_RENDERING_FRAME_RESET_GS_REGISTERS_PR_H - -#include "types.h" - -void reset_gs_registers_pr(void) __asm__("FUN_001f3958"); - -#endif /* LOMBYTE_RNC_RENDERING_FRAME_RESET_GS_REGISTERS_PR_H */ diff --git a/include/rnc/rendering/frame/set_background_color.h b/include/rnc/rendering/frame/set_background_color.h deleted file mode 100644 index be1b9bd6a0..0000000000 --- a/include/rnc/rendering/frame/set_background_color.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_FRAME_SET_BACKGROUND_COLOR_H -#define LOMBYTE_RNC_RENDERING_FRAME_SET_BACKGROUND_COLOR_H - -#include "types.h" - -void set_background_color(s32, u64, u64); - -#endif /* LOMBYTE_RNC_RENDERING_FRAME_SET_BACKGROUND_COLOR_H */ diff --git a/include/rnc/rendering/mobys.h b/include/rnc/rendering/mobys.h new file mode 100644 index 0000000000..4e0b3018cb --- /dev/null +++ b/include/rnc/rendering/mobys.h @@ -0,0 +1,13 @@ +#ifndef LOMBYTE_RNC_RENDERING_MOBYS_H +#define LOMBYTE_RNC_RENDERING_MOBYS_H + +#include "types.h" + +struct MenuStreamedMobyScreen; + +s32 draw_moby_entries_from_object(struct MenuStreamedMobyScreen *) __asm__("FUN_00225a68"); +void patch_moby_gifs(void) __asm__("FUN_0020cef8"); +void register_entity_render_resources(void) __asm__("FUN_00235898"); +void render_environment_mapped_object(void) __asm__("FUN_002327a0"); + +#endif /* LOMBYTE_RNC_RENDERING_MOBYS_H */ diff --git a/include/rnc/rendering/mobys/draw_moby_entries_from_object.h b/include/rnc/rendering/mobys/draw_moby_entries_from_object.h deleted file mode 100644 index e0daed2832..0000000000 --- a/include/rnc/rendering/mobys/draw_moby_entries_from_object.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_MOBYS_DRAW_MOBY_ENTRIES_FROM_OBJECT_H -#define LOMBYTE_RNC_RENDERING_MOBYS_DRAW_MOBY_ENTRIES_FROM_OBJECT_H - -#include "types.h" - -struct MenuStreamedMobyScreen; - -s32 draw_moby_entries_from_object(struct MenuStreamedMobyScreen *) __asm__("FUN_00225a68"); - -#endif /* LOMBYTE_RNC_RENDERING_MOBYS_DRAW_MOBY_ENTRIES_FROM_OBJECT_H */ diff --git a/include/rnc/rendering/mobys/patch_moby_gifs.h b/include/rnc/rendering/mobys/patch_moby_gifs.h deleted file mode 100644 index 8691dd6f4e..0000000000 --- a/include/rnc/rendering/mobys/patch_moby_gifs.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_MOBYS_PATCH_MOBY_GIFS_H -#define LOMBYTE_RNC_RENDERING_MOBYS_PATCH_MOBY_GIFS_H - -#include "types.h" - -void patch_moby_gifs(void) __asm__("FUN_0020cef8"); - -#endif /* LOMBYTE_RNC_RENDERING_MOBYS_PATCH_MOBY_GIFS_H */ diff --git a/include/rnc/rendering/mobys/register_entity_render_resources.h b/include/rnc/rendering/mobys/register_entity_render_resources.h deleted file mode 100644 index ec7e90c9f4..0000000000 --- a/include/rnc/rendering/mobys/register_entity_render_resources.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_MOBYS_REGISTER_ENTITY_RENDER_RESOURCES_H -#define LOMBYTE_RNC_RENDERING_MOBYS_REGISTER_ENTITY_RENDER_RESOURCES_H - -#include "types.h" - -void register_entity_render_resources(void) __asm__("FUN_00235898"); - -#endif /* LOMBYTE_RNC_RENDERING_MOBYS_REGISTER_ENTITY_RENDER_RESOURCES_H */ diff --git a/include/rnc/rendering/mobys/render_environment_mapped_object.h b/include/rnc/rendering/mobys/render_environment_mapped_object.h deleted file mode 100644 index 36f919b49e..0000000000 --- a/include/rnc/rendering/mobys/render_environment_mapped_object.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_MOBYS_RENDER_ENVIRONMENT_MAPPED_OBJECT_H -#define LOMBYTE_RNC_RENDERING_MOBYS_RENDER_ENVIRONMENT_MAPPED_OBJECT_H - -#include "types.h" - -void render_environment_mapped_object(void) __asm__("FUN_002327a0"); - -#endif /* LOMBYTE_RNC_RENDERING_MOBYS_RENDER_ENVIRONMENT_MAPPED_OBJECT_H */ diff --git a/include/rnc/rendering/occlusion.h b/include/rnc/rendering/occlusion.h new file mode 100644 index 0000000000..0d2a435cd6 --- /dev/null +++ b/include/rnc/rendering/occlusion.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_RENDERING_OCCLUSION_H +#define LOMBYTE_RNC_RENDERING_OCCLUSION_H + +#include "types.h" + +void build_occlusion_visibility(void) __asm__("FUN_001f2820"); +void update_occlusion(void) __asm__("FUN_001f2c10"); + +#endif /* LOMBYTE_RNC_RENDERING_OCCLUSION_H */ diff --git a/include/rnc/rendering/occlusion/build_occlusion_visibility.h b/include/rnc/rendering/occlusion/build_occlusion_visibility.h deleted file mode 100644 index 51296b4d22..0000000000 --- a/include/rnc/rendering/occlusion/build_occlusion_visibility.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_OCCLUSION_BUILD_OCCLUSION_VISIBILITY_H -#define LOMBYTE_RNC_RENDERING_OCCLUSION_BUILD_OCCLUSION_VISIBILITY_H - -#include "types.h" - -void build_occlusion_visibility(void) __asm__("FUN_001f2820"); - -#endif /* LOMBYTE_RNC_RENDERING_OCCLUSION_BUILD_OCCLUSION_VISIBILITY_H */ diff --git a/include/rnc/rendering/occlusion/update_occlusion.h b/include/rnc/rendering/occlusion/update_occlusion.h deleted file mode 100644 index babaad0388..0000000000 --- a/include/rnc/rendering/occlusion/update_occlusion.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_OCCLUSION_UPDATE_OCCLUSION_H -#define LOMBYTE_RNC_RENDERING_OCCLUSION_UPDATE_OCCLUSION_H - -#include "types.h" - -void update_occlusion(void) __asm__("FUN_001f2c10"); - -#endif /* LOMBYTE_RNC_RENDERING_OCCLUSION_UPDATE_OCCLUSION_H */ diff --git a/include/rnc/rendering/packets.h b/include/rnc/rendering/packets.h new file mode 100644 index 0000000000..7102cf59f0 --- /dev/null +++ b/include/rnc/rendering/packets.h @@ -0,0 +1,15 @@ +#ifndef LOMBYTE_RNC_RENDERING_PACKETS_H +#define LOMBYTE_RNC_RENDERING_PACKETS_H + +#include "types.h" + +void append_dma_tag(u32); +void append_power_of_two_textured_screen_sprite( + u64, s32, s32, s32, s32, s32, s32, s32, s32, s32) __asm__("FUN_00200468"); +void emit_textured_rectangle(f32, f32, f32, f32, s32, s32, s32, s32, u64, u64) __asm__("FUN_001f5808"); +void pack_render_command_fields(u64 *, u64, u64, u64, u64) __asm__("PackRenderCommandFields"); +void put_disp_buffer(void) __asm__("FUN_001fb2a8"); +void set_up_vis_gif_viewer(u64 *, s32, s32, s32, s32, s32) __asm__("FUN_00202fd0"); +void write_vif_unpack_packet(s32, void *, s32) __asm__("FUN_00233888"); + +#endif /* LOMBYTE_RNC_RENDERING_PACKETS_H */ diff --git a/include/rnc/rendering/packets/append_dma_tag.h b/include/rnc/rendering/packets/append_dma_tag.h deleted file mode 100644 index 862ff047a2..0000000000 --- a/include/rnc/rendering/packets/append_dma_tag.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_PACKETS_APPEND_DMA_TAG_H -#define LOMBYTE_RNC_RENDERING_PACKETS_APPEND_DMA_TAG_H - -#include "types.h" - -void append_dma_tag(u32); - -#endif /* LOMBYTE_RNC_RENDERING_PACKETS_APPEND_DMA_TAG_H */ diff --git a/include/rnc/rendering/packets/append_power_of_two_textured_screen_sprite.h b/include/rnc/rendering/packets/append_power_of_two_textured_screen_sprite.h deleted file mode 100644 index 64eb64f26c..0000000000 --- a/include/rnc/rendering/packets/append_power_of_two_textured_screen_sprite.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_PACKETS_APPEND_POWER_OF_TWO_TEXTURED_SCREEN_SPRITE_H -#define LOMBYTE_RNC_RENDERING_PACKETS_APPEND_POWER_OF_TWO_TEXTURED_SCREEN_SPRITE_H - -#include "types.h" - -void append_power_of_two_textured_screen_sprite( - u64, s32, s32, s32, s32, s32, s32, s32, s32, s32) __asm__("FUN_00200468"); - -#endif /* LOMBYTE_RNC_RENDERING_PACKETS_APPEND_POWER_OF_TWO_TEXTURED_SCREEN_SPRITE_H */ diff --git a/include/rnc/rendering/packets/emit_textured_rectangle.h b/include/rnc/rendering/packets/emit_textured_rectangle.h deleted file mode 100644 index 2951cb7b16..0000000000 --- a/include/rnc/rendering/packets/emit_textured_rectangle.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_PACKETS_EMIT_TEXTURED_RECTANGLE_H -#define LOMBYTE_RNC_RENDERING_PACKETS_EMIT_TEXTURED_RECTANGLE_H - -#include "types.h" - -void emit_textured_rectangle(f32, f32, f32, f32, s32, s32, s32, s32, u64, u64) __asm__("FUN_001f5808"); - -#endif /* LOMBYTE_RNC_RENDERING_PACKETS_EMIT_TEXTURED_RECTANGLE_H */ diff --git a/include/rnc/rendering/packets/pack_render_command_fields.h b/include/rnc/rendering/packets/pack_render_command_fields.h deleted file mode 100644 index ef252bb423..0000000000 --- a/include/rnc/rendering/packets/pack_render_command_fields.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_PACKETS_PACK_RENDER_COMMAND_FIELDS_H -#define LOMBYTE_RNC_RENDERING_PACKETS_PACK_RENDER_COMMAND_FIELDS_H - -#include "types.h" - -void pack_render_command_fields(u64 *, u64, u64, u64, u64) __asm__("PackRenderCommandFields"); - -#endif /* LOMBYTE_RNC_RENDERING_PACKETS_PACK_RENDER_COMMAND_FIELDS_H */ diff --git a/include/rnc/rendering/packets/put_disp_buffer.h b/include/rnc/rendering/packets/put_disp_buffer.h deleted file mode 100644 index cff1110466..0000000000 --- a/include/rnc/rendering/packets/put_disp_buffer.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_PACKETS_PUT_DISP_BUFFER_H -#define LOMBYTE_RNC_RENDERING_PACKETS_PUT_DISP_BUFFER_H - -#include "types.h" - -void put_disp_buffer(void) __asm__("FUN_001fb2a8"); - -#endif /* LOMBYTE_RNC_RENDERING_PACKETS_PUT_DISP_BUFFER_H */ diff --git a/include/rnc/rendering/packets/set_up_vis_gif_viewer.h b/include/rnc/rendering/packets/set_up_vis_gif_viewer.h deleted file mode 100644 index fe3e42647b..0000000000 --- a/include/rnc/rendering/packets/set_up_vis_gif_viewer.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_PACKETS_SET_UP_VIS_GIF_VIEWER_H -#define LOMBYTE_RNC_RENDERING_PACKETS_SET_UP_VIS_GIF_VIEWER_H - -#include "types.h" - -void set_up_vis_gif_viewer(u64 *, s32, s32, s32, s32, s32) __asm__("FUN_00202fd0"); - -#endif /* LOMBYTE_RNC_RENDERING_PACKETS_SET_UP_VIS_GIF_VIEWER_H */ diff --git a/include/rnc/rendering/packets/write_vif_unpack_packet.h b/include/rnc/rendering/packets/write_vif_unpack_packet.h deleted file mode 100644 index 68ef660bf4..0000000000 --- a/include/rnc/rendering/packets/write_vif_unpack_packet.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_PACKETS_WRITE_VIF_UNPACK_PACKET_H -#define LOMBYTE_RNC_RENDERING_PACKETS_WRITE_VIF_UNPACK_PACKET_H - -#include "types.h" - -void write_vif_unpack_packet(s32, void *, s32) __asm__("FUN_00233888"); - -#endif /* LOMBYTE_RNC_RENDERING_PACKETS_WRITE_VIF_UNPACK_PACKET_H */ diff --git a/include/rnc/rendering/shrubs/register_shrub_render_class.h b/include/rnc/rendering/shrubs.h similarity index 67% rename from include/rnc/rendering/shrubs/register_shrub_render_class.h rename to include/rnc/rendering/shrubs.h index 09a7d4d121..26d56efc83 100644 --- a/include/rnc/rendering/shrubs/register_shrub_render_class.h +++ b/include/rnc/rendering/shrubs.h @@ -1,5 +1,5 @@ -#ifndef LOMBYTE_RNC_RENDERING_SHRUBS_REGISTER_SHRUB_RENDER_CLASS_H -#define LOMBYTE_RNC_RENDERING_SHRUBS_REGISTER_SHRUB_RENDER_CLASS_H +#ifndef LOMBYTE_RNC_RENDERING_SHRUBS_H +#define LOMBYTE_RNC_RENDERING_SHRUBS_H #include "rnc/rendering/resident_class.h" #include "rnc/rendering/shrub_render_class.h" @@ -12,4 +12,4 @@ void register_shrub_render_class(ShrubRenderClass *, ShrubMipTextureDefinition *, s32) __asm__("FUN_00203b08"); -#endif /* LOMBYTE_RNC_RENDERING_SHRUBS_REGISTER_SHRUB_RENDER_CLASS_H */ +#endif /* LOMBYTE_RNC_RENDERING_SHRUBS_H */ diff --git a/include/rnc/rendering/texture.h b/include/rnc/rendering/texture.h new file mode 100644 index 0000000000..d29842d18d --- /dev/null +++ b/include/rnc/rendering/texture.h @@ -0,0 +1,15 @@ +#ifndef LOMBYTE_RNC_RENDERING_TEXTURE_H +#define LOMBYTE_RNC_RENDERING_TEXTURE_H + +#include "types.h" + +struct Descriptor; +struct MenuScreen; +struct ParticleHdr; + +void draw_textured_quad(s32, s32, s32, s32, s32, s32, s32, s32, s64, s64) __asm__("FUN_001f5450"); +void pack_image_descriptor(struct Descriptor *, struct MenuScreen *); +void parse_particle_textures(struct ParticleHdr *, s32, s32 *, s32) __asm__("FUN_002026c8"); +void reset_gs_texture_allocation(void); + +#endif /* LOMBYTE_RNC_RENDERING_TEXTURE_H */ diff --git a/include/rnc/rendering/texture/draw_textured_quad.h b/include/rnc/rendering/texture/draw_textured_quad.h deleted file mode 100644 index e11fb026b8..0000000000 --- a/include/rnc/rendering/texture/draw_textured_quad.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_TEXTURE_DRAW_TEXTURED_QUAD_H -#define LOMBYTE_RNC_RENDERING_TEXTURE_DRAW_TEXTURED_QUAD_H - -#include "types.h" - -void draw_textured_quad(s32, s32, s32, s32, s32, s32, s32, s32, s64, s64) __asm__("FUN_001f5450"); - -#endif /* LOMBYTE_RNC_RENDERING_TEXTURE_DRAW_TEXTURED_QUAD_H */ diff --git a/include/rnc/rendering/texture/pack_image_descriptor.h b/include/rnc/rendering/texture/pack_image_descriptor.h deleted file mode 100644 index 1a4482b6a5..0000000000 --- a/include/rnc/rendering/texture/pack_image_descriptor.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_TEXTURE_PACK_IMAGE_DESCRIPTOR_H -#define LOMBYTE_RNC_RENDERING_TEXTURE_PACK_IMAGE_DESCRIPTOR_H - -#include "types.h" - -struct Descriptor; -struct MenuScreen; - -void pack_image_descriptor(struct Descriptor *, struct MenuScreen *); - -#endif /* LOMBYTE_RNC_RENDERING_TEXTURE_PACK_IMAGE_DESCRIPTOR_H */ diff --git a/include/rnc/rendering/texture/parse_particle_textures.h b/include/rnc/rendering/texture/parse_particle_textures.h deleted file mode 100644 index 1d071e6326..0000000000 --- a/include/rnc/rendering/texture/parse_particle_textures.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_TEXTURE_PARSE_PARTICLE_TEXTURES_H -#define LOMBYTE_RNC_RENDERING_TEXTURE_PARSE_PARTICLE_TEXTURES_H - -#include "types.h" - -struct ParticleHdr; - -void parse_particle_textures(struct ParticleHdr *, s32, s32 *, s32) __asm__("FUN_002026c8"); - -#endif /* LOMBYTE_RNC_RENDERING_TEXTURE_PARSE_PARTICLE_TEXTURES_H */ diff --git a/include/rnc/rendering/texture/reset_gs_texture_allocation.h b/include/rnc/rendering/texture/reset_gs_texture_allocation.h deleted file mode 100644 index 7abb823c8b..0000000000 --- a/include/rnc/rendering/texture/reset_gs_texture_allocation.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_TEXTURE_RESET_GS_TEXTURE_ALLOCATION_H -#define LOMBYTE_RNC_RENDERING_TEXTURE_RESET_GS_TEXTURE_ALLOCATION_H - -#include "types.h" - -void reset_gs_texture_allocation(void); - -#endif /* LOMBYTE_RNC_RENDERING_TEXTURE_RESET_GS_TEXTURE_ALLOCATION_H */ diff --git a/include/rnc/rendering/tfrags.h b/include/rnc/rendering/tfrags.h new file mode 100644 index 0000000000..b0e6d46d12 --- /dev/null +++ b/include/rnc/rendering/tfrags.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_RENDERING_TFRAGS_H +#define LOMBYTE_RNC_RENDERING_TFRAGS_H + +#include "types.h" + +void initialize_tfrag_render_data(char *, void *) __asm__("FUN_002040e0"); + +#endif /* LOMBYTE_RNC_RENDERING_TFRAGS_H */ diff --git a/include/rnc/rendering/tfrags/initialize_tfrag_render_data.h b/include/rnc/rendering/tfrags/initialize_tfrag_render_data.h deleted file mode 100644 index 13b8c49a49..0000000000 --- a/include/rnc/rendering/tfrags/initialize_tfrag_render_data.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_TFRAGS_INITIALIZE_TFRAG_RENDER_DATA_H -#define LOMBYTE_RNC_RENDERING_TFRAGS_INITIALIZE_TFRAG_RENDER_DATA_H - -#include "types.h" - -void initialize_tfrag_render_data(char *, void *) __asm__("FUN_002040e0"); - -#endif /* LOMBYTE_RNC_RENDERING_TFRAGS_INITIALIZE_TFRAG_RENDER_DATA_H */ diff --git a/include/rnc/rendering/ties/register_object_render_class.h b/include/rnc/rendering/ties.h similarity index 64% rename from include/rnc/rendering/ties/register_object_render_class.h rename to include/rnc/rendering/ties.h index b1f555ad49..383216bd1e 100644 --- a/include/rnc/rendering/ties/register_object_render_class.h +++ b/include/rnc/rendering/ties.h @@ -1,5 +1,5 @@ -#ifndef LOMBYTE_RNC_RENDERING_TIES_REGISTER_OBJECT_RENDER_CLASS_H -#define LOMBYTE_RNC_RENDERING_TIES_REGISTER_OBJECT_RENDER_CLASS_H +#ifndef LOMBYTE_RNC_RENDERING_TIES_H +#define LOMBYTE_RNC_RENDERING_TIES_H #include "rnc/rendering/object_render_class.h" #include "rnc/rendering/resident_class.h" @@ -11,4 +11,4 @@ void register_object_render_class(ObjectRenderClass *, u128 *, s32) __asm__("FUN_00203730"); -#endif /* LOMBYTE_RNC_RENDERING_TIES_REGISTER_OBJECT_RENDER_CLASS_H */ +#endif /* LOMBYTE_RNC_RENDERING_TIES_H */ diff --git a/include/rnc/rendering/view.h b/include/rnc/rendering/view.h index 82083a249b..446293c65b 100644 --- a/include/rnc/rendering/view.h +++ b/include/rnc/rendering/view.h @@ -3,6 +3,8 @@ #include "types.h" #include "rnc/math/vector.h" +#include "rnc/sdk/eetypes.h" +#include "types.h" /* View and projection state at D_0018CD00. init_view_context and configure_graphics_projection set the clip distances, @@ -50,4 +52,8 @@ struct View { extern struct View view_context __asm__("D_0018CD00"); +void configure_graphics_projection(s32, s32, f32, f32, f32, f32, f32) __asm__("FUN_001f33b8"); +void project_graphics_bounds(u128 *, u128 *, s32 *, s32 *, s32 *, s32 *) __asm__("FUN_00237a78"); +void setup_view_context(void) __asm__("FUN_00239750"); + #endif /* LOMBYTE_RNC_RENDERING_VIEW_H */ diff --git a/include/rnc/rendering/view/configure_graphics_projection.h b/include/rnc/rendering/view/configure_graphics_projection.h deleted file mode 100644 index b13dc7b000..0000000000 --- a/include/rnc/rendering/view/configure_graphics_projection.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_VIEW_CONFIGURE_GRAPHICS_PROJECTION_H -#define LOMBYTE_RNC_RENDERING_VIEW_CONFIGURE_GRAPHICS_PROJECTION_H - -#include "types.h" - -void configure_graphics_projection(s32, s32, f32, f32, f32, f32, f32) __asm__("FUN_001f33b8"); - -#endif /* LOMBYTE_RNC_RENDERING_VIEW_CONFIGURE_GRAPHICS_PROJECTION_H */ diff --git a/include/rnc/rendering/view/project_graphics_bounds.h b/include/rnc/rendering/view/project_graphics_bounds.h deleted file mode 100644 index 24b793e357..0000000000 --- a/include/rnc/rendering/view/project_graphics_bounds.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_VIEW_PROJECT_GRAPHICS_BOUNDS_H -#define LOMBYTE_RNC_RENDERING_VIEW_PROJECT_GRAPHICS_BOUNDS_H - -#include "rnc/sdk/eetypes.h" -#include "types.h" - -void project_graphics_bounds(u128 *, u128 *, s32 *, s32 *, s32 *, s32 *) __asm__("FUN_00237a78"); - -#endif /* LOMBYTE_RNC_RENDERING_VIEW_PROJECT_GRAPHICS_BOUNDS_H */ diff --git a/include/rnc/rendering/view/setup_view_context.h b/include/rnc/rendering/view/setup_view_context.h deleted file mode 100644 index 4506fe884c..0000000000 --- a/include/rnc/rendering/view/setup_view_context.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_VIEW_SETUP_VIEW_CONTEXT_H -#define LOMBYTE_RNC_RENDERING_VIEW_SETUP_VIEW_CONTEXT_H - -#include "types.h" - -void setup_view_context(void) __asm__("FUN_00239750"); - -#endif /* LOMBYTE_RNC_RENDERING_VIEW_SETUP_VIEW_CONTEXT_H */ diff --git a/include/rnc/rendering/vu1.h b/include/rnc/rendering/vu1.h new file mode 100644 index 0000000000..6dcd07d00e --- /dev/null +++ b/include/rnc/rendering/vu1.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_RENDERING_VU1_H +#define LOMBYTE_RNC_RENDERING_VU1_H + +#include "types.h" + +s32 vif1_dma_interrupt_handler(s32) __asm__("func_00233E00"); +void vu1_add_vif_code(s32) __asm__("FUN_00233938"); + +#endif /* LOMBYTE_RNC_RENDERING_VU1_H */ diff --git a/include/rnc/rendering/vu1/vif1_dma_interrupt_handler.h b/include/rnc/rendering/vu1/vif1_dma_interrupt_handler.h deleted file mode 100644 index 80de61e12e..0000000000 --- a/include/rnc/rendering/vu1/vif1_dma_interrupt_handler.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_VU1_VIF1_DMA_INTERRUPT_HANDLER_H -#define LOMBYTE_RNC_RENDERING_VU1_VIF1_DMA_INTERRUPT_HANDLER_H - -#include "types.h" - -s32 vif1_dma_interrupt_handler(s32) __asm__("func_00233E00"); - -#endif /* LOMBYTE_RNC_RENDERING_VU1_VIF1_DMA_INTERRUPT_HANDLER_H */ diff --git a/include/rnc/rendering/vu1/vu1_add_vif_code.h b/include/rnc/rendering/vu1/vu1_add_vif_code.h deleted file mode 100644 index 457b193b8e..0000000000 --- a/include/rnc/rendering/vu1/vu1_add_vif_code.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RENDERING_VU1_VU1_ADD_VIF_CODE_H -#define LOMBYTE_RNC_RENDERING_VU1_VU1_ADD_VIF_CODE_H - -#include "types.h" - -void vu1_add_vif_code(s32) __asm__("FUN_00233938"); - -#endif /* LOMBYTE_RNC_RENDERING_VU1_VU1_ADD_VIF_CODE_H */ diff --git a/include/rnc/runtime.h b/include/rnc/runtime.h new file mode 100644 index 0000000000..f21ebec007 --- /dev/null +++ b/include/rnc/runtime.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_RUNTIME_H +#define LOMBYTE_RNC_RUNTIME_H + +#include "types.h" + +void decrement_resource_counter(void) __asm__("UpdateResourceCounter"); + +#endif /* LOMBYTE_RNC_RUNTIME_H */ diff --git a/include/rnc/runtime/callbacks.h b/include/rnc/runtime/callbacks.h new file mode 100644 index 0000000000..18e8682155 --- /dev/null +++ b/include/rnc/runtime/callbacks.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_RUNTIME_CALLBACKS_H +#define LOMBYTE_RNC_RUNTIME_CALLBACKS_H + +#include "types.h" + +void noop_memory_callback(void) __asm__("func_00208810"); + +#endif /* LOMBYTE_RNC_RUNTIME_CALLBACKS_H */ diff --git a/include/rnc/runtime/callbacks/noop_memory_callback.h b/include/rnc/runtime/callbacks/noop_memory_callback.h deleted file mode 100644 index c0864546d2..0000000000 --- a/include/rnc/runtime/callbacks/noop_memory_callback.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RUNTIME_CALLBACKS_NOOP_MEMORY_CALLBACK_H -#define LOMBYTE_RNC_RUNTIME_CALLBACKS_NOOP_MEMORY_CALLBACK_H - -#include "types.h" - -void noop_memory_callback(void) __asm__("func_00208810"); - -#endif /* LOMBYTE_RNC_RUNTIME_CALLBACKS_NOOP_MEMORY_CALLBACK_H */ diff --git a/include/rnc/runtime/decrement_resource_counter.h b/include/rnc/runtime/decrement_resource_counter.h deleted file mode 100644 index 2957acd818..0000000000 --- a/include/rnc/runtime/decrement_resource_counter.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RUNTIME_DECREMENT_RESOURCE_COUNTER_H -#define LOMBYTE_RNC_RUNTIME_DECREMENT_RESOURCE_COUNTER_H - -#include "types.h" - -void decrement_resource_counter(void) __asm__("UpdateResourceCounter"); - -#endif /* LOMBYTE_RNC_RUNTIME_DECREMENT_RESOURCE_COUNTER_H */ diff --git a/include/rnc/runtime/memory.h b/include/rnc/runtime/memory.h new file mode 100644 index 0000000000..fe1f9b433b --- /dev/null +++ b/include/rnc/runtime/memory.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_RUNTIME_MEMORY_H +#define LOMBYTE_RNC_RUNTIME_MEMORY_H + +#include "types.h" + +int init_ring_buffer(int) __asm__("func_00119568"); +void unpack_spr_descriptor(void *) __asm__("FUN_001238a0"); + +#endif /* LOMBYTE_RNC_RUNTIME_MEMORY_H */ diff --git a/include/rnc/runtime/memory/init_ring_buffer.h b/include/rnc/runtime/memory/init_ring_buffer.h deleted file mode 100644 index 837dfb025c..0000000000 --- a/include/rnc/runtime/memory/init_ring_buffer.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RUNTIME_MEMORY_INIT_RING_BUFFER_H -#define LOMBYTE_RNC_RUNTIME_MEMORY_INIT_RING_BUFFER_H - -#include "types.h" - -int init_ring_buffer(int) __asm__("func_00119568"); - -#endif /* LOMBYTE_RNC_RUNTIME_MEMORY_INIT_RING_BUFFER_H */ diff --git a/include/rnc/runtime/memory/unpack_spr_descriptor.h b/include/rnc/runtime/memory/unpack_spr_descriptor.h deleted file mode 100644 index ef76deb6b8..0000000000 --- a/include/rnc/runtime/memory/unpack_spr_descriptor.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_RUNTIME_MEMORY_UNPACK_SPR_DESCRIPTOR_H -#define LOMBYTE_RNC_RUNTIME_MEMORY_UNPACK_SPR_DESCRIPTOR_H - -#include "types.h" - -void unpack_spr_descriptor(void *) __asm__("FUN_001238a0"); - -#endif /* LOMBYTE_RNC_RUNTIME_MEMORY_UNPACK_SPR_DESCRIPTOR_H */ diff --git a/include/rnc/save.h b/include/rnc/save.h new file mode 100644 index 0000000000..5d80e5f48d --- /dev/null +++ b/include/rnc/save.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_SAVE_H +#define LOMBYTE_RNC_SAVE_H + +#include "types.h" + +s32 check_memory_card(void) __asm__("FUN_00209168"); + +#endif /* LOMBYTE_RNC_SAVE_H */ diff --git a/include/rnc/save/check_memory_card.h b/include/rnc/save/check_memory_card.h deleted file mode 100644 index 9c7e1f5676..0000000000 --- a/include/rnc/save/check_memory_card.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SAVE_CHECK_MEMORY_CARD_H -#define LOMBYTE_RNC_SAVE_CHECK_MEMORY_CARD_H - -#include "types.h" - -s32 check_memory_card(void) __asm__("FUN_00209168"); - -#endif /* LOMBYTE_RNC_SAVE_CHECK_MEMORY_CARD_H */ diff --git a/include/rnc/sdk/callbacks.h b/include/rnc/sdk/callbacks.h new file mode 100644 index 0000000000..c825a49154 --- /dev/null +++ b/include/rnc/sdk/callbacks.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_SDK_CALLBACKS_H +#define LOMBYTE_RNC_SDK_CALLBACKS_H + +#include "types.h" + +void wake_thread_alarm(s32, u32, s32) __asm__("FUN_00123bc0"); + +#endif /* LOMBYTE_RNC_SDK_CALLBACKS_H */ diff --git a/include/rnc/sdk/callbacks/wake_thread_alarm.h b/include/rnc/sdk/callbacks/wake_thread_alarm.h deleted file mode 100644 index 907782881c..0000000000 --- a/include/rnc/sdk/callbacks/wake_thread_alarm.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_CALLBACKS_WAKE_THREAD_ALARM_H -#define LOMBYTE_RNC_SDK_CALLBACKS_WAKE_THREAD_ALARM_H - -#include "types.h" - -void wake_thread_alarm(s32, u32, s32) __asm__("FUN_00123bc0"); - -#endif /* LOMBYTE_RNC_SDK_CALLBACKS_WAKE_THREAD_ALARM_H */ diff --git a/include/rnc/sdk/debug.h b/include/rnc/sdk/debug.h new file mode 100644 index 0000000000..0d9a2df269 --- /dev/null +++ b/include/rnc/sdk/debug.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_SDK_DEBUG_H +#define LOMBYTE_RNC_SDK_DEBUG_H + +#include "types.h" + +void DebugPrint(char *, ...); + +#endif /* LOMBYTE_RNC_SDK_DEBUG_H */ diff --git a/include/rnc/sdk/debug/debug_print.h b/include/rnc/sdk/debug/debug_print.h deleted file mode 100644 index dbb78050a0..0000000000 --- a/include/rnc/sdk/debug/debug_print.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DEBUG_DEBUG_PRINT_H -#define LOMBYTE_RNC_SDK_DEBUG_DEBUG_PRINT_H - -#include "types.h" - -void DebugPrint(char *, ...); - -#endif /* LOMBYTE_RNC_SDK_DEBUG_DEBUG_PRINT_H */ diff --git a/include/rnc/sdk/deci2.h b/include/rnc/sdk/deci2.h new file mode 100644 index 0000000000..d6cbfaa81c --- /dev/null +++ b/include/rnc/sdk/deci2.h @@ -0,0 +1,22 @@ +#ifndef LOMBYTE_RNC_SDK_DECI2_H +#define LOMBYTE_RNC_SDK_DECI2_H + +#include "types.h" + +int CallDebugCharacter(int, int); +void deci2Putchar(s32); +int kprintf(const char *, ...); +s32 kputchar(s32); +s32 Kputs(s8 *); +void printfloat(f64); +s32 SceDeci2ExRecv(s32, void *, u16); +s32 SceDeci2ExSend(s32, void *, u16); +s32 sceDeci2Open(); +void SceDeci2Poll(s32); +int scePrintf(const char *, ...); +void sceTtyHandler(); +s32 sceTtyInit(void); +s32 sceTtyRead(s8 *, s32); +s32 sceTtyWrite(s8 *, s32); + +#endif /* LOMBYTE_RNC_SDK_DECI2_H */ diff --git a/include/rnc/sdk/deci2/call_debug_character.h b/include/rnc/sdk/deci2/call_debug_character.h deleted file mode 100644 index 23fba6e85f..0000000000 --- a/include/rnc/sdk/deci2/call_debug_character.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DECI2_CALL_DEBUG_CHARACTER_H -#define LOMBYTE_RNC_SDK_DECI2_CALL_DEBUG_CHARACTER_H - -#include "types.h" - -int CallDebugCharacter(int, int); - -#endif /* LOMBYTE_RNC_SDK_DECI2_CALL_DEBUG_CHARACTER_H */ diff --git a/include/rnc/sdk/deci2/deci2_putchar.h b/include/rnc/sdk/deci2/deci2_putchar.h deleted file mode 100644 index 458a2f4348..0000000000 --- a/include/rnc/sdk/deci2/deci2_putchar.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DECI2_DECI2_PUTCHAR_H -#define LOMBYTE_RNC_SDK_DECI2_DECI2_PUTCHAR_H - -#include "types.h" - -void deci2Putchar(s32); - -#endif /* LOMBYTE_RNC_SDK_DECI2_DECI2_PUTCHAR_H */ diff --git a/include/rnc/sdk/deci2/kprintf.h b/include/rnc/sdk/deci2/kprintf.h deleted file mode 100644 index 5c02a58e8f..0000000000 --- a/include/rnc/sdk/deci2/kprintf.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DECI2_KPRINTF_H -#define LOMBYTE_RNC_SDK_DECI2_KPRINTF_H - -#include "types.h" - -int kprintf(const char *, ...); - -#endif /* LOMBYTE_RNC_SDK_DECI2_KPRINTF_H */ diff --git a/include/rnc/sdk/deci2/kputchar.h b/include/rnc/sdk/deci2/kputchar.h deleted file mode 100644 index bcd80ae257..0000000000 --- a/include/rnc/sdk/deci2/kputchar.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DECI2_KPUTCHAR_H -#define LOMBYTE_RNC_SDK_DECI2_KPUTCHAR_H - -#include "types.h" - -s32 kputchar(s32); - -#endif /* LOMBYTE_RNC_SDK_DECI2_KPUTCHAR_H */ diff --git a/include/rnc/sdk/deci2/kputs.h b/include/rnc/sdk/deci2/kputs.h deleted file mode 100644 index 2a2af1b53e..0000000000 --- a/include/rnc/sdk/deci2/kputs.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DECI2_KPUTS_H -#define LOMBYTE_RNC_SDK_DECI2_KPUTS_H - -#include "types.h" - -s32 Kputs(s8 *); - -#endif /* LOMBYTE_RNC_SDK_DECI2_KPUTS_H */ diff --git a/include/rnc/sdk/deci2/printfloat.h b/include/rnc/sdk/deci2/printfloat.h deleted file mode 100644 index 86b5d66a3b..0000000000 --- a/include/rnc/sdk/deci2/printfloat.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DECI2_PRINTFLOAT_H -#define LOMBYTE_RNC_SDK_DECI2_PRINTFLOAT_H - -#include "types.h" - -void printfloat(f64); - -#endif /* LOMBYTE_RNC_SDK_DECI2_PRINTFLOAT_H */ diff --git a/include/rnc/sdk/deci2/sce_deci2_ex_recv.h b/include/rnc/sdk/deci2/sce_deci2_ex_recv.h deleted file mode 100644 index 8929b79739..0000000000 --- a/include/rnc/sdk/deci2/sce_deci2_ex_recv.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DECI2_SCE_DECI2_EX_RECV_H -#define LOMBYTE_RNC_SDK_DECI2_SCE_DECI2_EX_RECV_H - -#include "types.h" - -s32 SceDeci2ExRecv(s32, void *, u16); - -#endif /* LOMBYTE_RNC_SDK_DECI2_SCE_DECI2_EX_RECV_H */ diff --git a/include/rnc/sdk/deci2/sce_deci2_ex_send.h b/include/rnc/sdk/deci2/sce_deci2_ex_send.h deleted file mode 100644 index 4110aa0933..0000000000 --- a/include/rnc/sdk/deci2/sce_deci2_ex_send.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DECI2_SCE_DECI2_EX_SEND_H -#define LOMBYTE_RNC_SDK_DECI2_SCE_DECI2_EX_SEND_H - -#include "types.h" - -s32 SceDeci2ExSend(s32, void *, u16); - -#endif /* LOMBYTE_RNC_SDK_DECI2_SCE_DECI2_EX_SEND_H */ diff --git a/include/rnc/sdk/deci2/sce_deci2_open.h b/include/rnc/sdk/deci2/sce_deci2_open.h deleted file mode 100644 index 611456189d..0000000000 --- a/include/rnc/sdk/deci2/sce_deci2_open.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DECI2_SCE_DECI2_OPEN_H -#define LOMBYTE_RNC_SDK_DECI2_SCE_DECI2_OPEN_H - -#include "types.h" - -s32 sceDeci2Open(); - -#endif /* LOMBYTE_RNC_SDK_DECI2_SCE_DECI2_OPEN_H */ diff --git a/include/rnc/sdk/deci2/sce_deci2_poll.h b/include/rnc/sdk/deci2/sce_deci2_poll.h deleted file mode 100644 index 499718f15c..0000000000 --- a/include/rnc/sdk/deci2/sce_deci2_poll.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DECI2_SCE_DECI2_POLL_H -#define LOMBYTE_RNC_SDK_DECI2_SCE_DECI2_POLL_H - -#include "types.h" - -void SceDeci2Poll(s32); - -#endif /* LOMBYTE_RNC_SDK_DECI2_SCE_DECI2_POLL_H */ diff --git a/include/rnc/sdk/deci2/sce_printf.h b/include/rnc/sdk/deci2/sce_printf.h deleted file mode 100644 index 29679716ec..0000000000 --- a/include/rnc/sdk/deci2/sce_printf.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DECI2_SCE_PRINTF_H -#define LOMBYTE_RNC_SDK_DECI2_SCE_PRINTF_H - -#include "types.h" - -int scePrintf(const char *, ...); - -#endif /* LOMBYTE_RNC_SDK_DECI2_SCE_PRINTF_H */ diff --git a/include/rnc/sdk/deci2/sce_tty_handler.h b/include/rnc/sdk/deci2/sce_tty_handler.h deleted file mode 100644 index ef8e3389b6..0000000000 --- a/include/rnc/sdk/deci2/sce_tty_handler.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DECI2_SCE_TTY_HANDLER_H -#define LOMBYTE_RNC_SDK_DECI2_SCE_TTY_HANDLER_H - -#include "types.h" - -void sceTtyHandler(); - -#endif /* LOMBYTE_RNC_SDK_DECI2_SCE_TTY_HANDLER_H */ diff --git a/include/rnc/sdk/deci2/sce_tty_init.h b/include/rnc/sdk/deci2/sce_tty_init.h deleted file mode 100644 index bc1b72b09e..0000000000 --- a/include/rnc/sdk/deci2/sce_tty_init.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DECI2_SCE_TTY_INIT_H -#define LOMBYTE_RNC_SDK_DECI2_SCE_TTY_INIT_H - -#include "types.h" - -s32 sceTtyInit(void); - -#endif /* LOMBYTE_RNC_SDK_DECI2_SCE_TTY_INIT_H */ diff --git a/include/rnc/sdk/deci2/sce_tty_read.h b/include/rnc/sdk/deci2/sce_tty_read.h deleted file mode 100644 index a87a924414..0000000000 --- a/include/rnc/sdk/deci2/sce_tty_read.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DECI2_SCE_TTY_READ_H -#define LOMBYTE_RNC_SDK_DECI2_SCE_TTY_READ_H - -#include "types.h" - -s32 sceTtyRead(s8 *, s32); - -#endif /* LOMBYTE_RNC_SDK_DECI2_SCE_TTY_READ_H */ diff --git a/include/rnc/sdk/deci2/sce_tty_write.h b/include/rnc/sdk/deci2/sce_tty_write.h deleted file mode 100644 index fba0ea42fa..0000000000 --- a/include/rnc/sdk/deci2/sce_tty_write.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DECI2_SCE_TTY_WRITE_H -#define LOMBYTE_RNC_SDK_DECI2_SCE_TTY_WRITE_H - -#include "types.h" - -s32 sceTtyWrite(s8 *, s32); - -#endif /* LOMBYTE_RNC_SDK_DECI2_SCE_TTY_WRITE_H */ diff --git a/include/rnc/sdk/dma.h b/include/rnc/sdk/dma.h new file mode 100644 index 0000000000..e77fca5c48 --- /dev/null +++ b/include/rnc/sdk/dma.h @@ -0,0 +1,19 @@ +#ifndef LOMBYTE_RNC_SDK_DMA_H +#define LOMBYTE_RNC_SDK_DMA_H + +#include "rnc/sdk/sce_dma_chan.h" +#include "types.h" + +struct DmaChannelRegs; + +sceDmaChan *GetDmaChannel(u32) __asm__("sceDmaGetChan"); +s32 sceDmaPause(volatile u32 *); +s32 sceDmaPutEnv(); +s32 sceDmaReset(s32); +void sceDmaSend(struct DmaChannelRegs *, s32); +void SetD3Chcr(s32); +void SetD4Chcr(s32); +void SetD4ChcrVariant(s32); +void WaitDma(volatile u32 *); + +#endif /* LOMBYTE_RNC_SDK_DMA_H */ diff --git a/include/rnc/sdk/dma/sce_dma_get_chan.h b/include/rnc/sdk/dma/sce_dma_get_chan.h deleted file mode 100644 index 830d675ea7..0000000000 --- a/include/rnc/sdk/dma/sce_dma_get_chan.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DMA_SCE_DMA_GET_CHAN_H -#define LOMBYTE_RNC_SDK_DMA_SCE_DMA_GET_CHAN_H - -#include "rnc/sdk/sce_dma_chan.h" -#include "types.h" - -sceDmaChan *GetDmaChannel(u32) __asm__("sceDmaGetChan"); - -#endif /* LOMBYTE_RNC_SDK_DMA_SCE_DMA_GET_CHAN_H */ diff --git a/include/rnc/sdk/dma/sce_dma_pause.h b/include/rnc/sdk/dma/sce_dma_pause.h deleted file mode 100644 index a6a9bfc5aa..0000000000 --- a/include/rnc/sdk/dma/sce_dma_pause.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DMA_SCE_DMA_PAUSE_H -#define LOMBYTE_RNC_SDK_DMA_SCE_DMA_PAUSE_H - -#include "types.h" - -s32 sceDmaPause(volatile u32 *); - -#endif /* LOMBYTE_RNC_SDK_DMA_SCE_DMA_PAUSE_H */ diff --git a/include/rnc/sdk/dma/sce_dma_put_env.h b/include/rnc/sdk/dma/sce_dma_put_env.h deleted file mode 100644 index fbefadbb7c..0000000000 --- a/include/rnc/sdk/dma/sce_dma_put_env.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DMA_SCE_DMA_PUT_ENV_H -#define LOMBYTE_RNC_SDK_DMA_SCE_DMA_PUT_ENV_H - -#include "types.h" - -s32 sceDmaPutEnv(); - -#endif /* LOMBYTE_RNC_SDK_DMA_SCE_DMA_PUT_ENV_H */ diff --git a/include/rnc/sdk/dma/sce_dma_reset.h b/include/rnc/sdk/dma/sce_dma_reset.h deleted file mode 100644 index ac7fb8a119..0000000000 --- a/include/rnc/sdk/dma/sce_dma_reset.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DMA_SCE_DMA_RESET_H -#define LOMBYTE_RNC_SDK_DMA_SCE_DMA_RESET_H - -#include "types.h" - -s32 sceDmaReset(s32); - -#endif /* LOMBYTE_RNC_SDK_DMA_SCE_DMA_RESET_H */ diff --git a/include/rnc/sdk/dma/sce_dma_send.h b/include/rnc/sdk/dma/sce_dma_send.h deleted file mode 100644 index dd8a66194b..0000000000 --- a/include/rnc/sdk/dma/sce_dma_send.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DMA_SCE_DMA_SEND_H -#define LOMBYTE_RNC_SDK_DMA_SCE_DMA_SEND_H - -#include "types.h" - -struct DmaChannelRegs; - -void sceDmaSend(struct DmaChannelRegs *, s32); - -#endif /* LOMBYTE_RNC_SDK_DMA_SCE_DMA_SEND_H */ diff --git a/include/rnc/sdk/dma/set_d3_chcr.h b/include/rnc/sdk/dma/set_d3_chcr.h deleted file mode 100644 index 929c41b8bf..0000000000 --- a/include/rnc/sdk/dma/set_d3_chcr.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DMA_SET_D3_CHCR_H -#define LOMBYTE_RNC_SDK_DMA_SET_D3_CHCR_H - -#include "types.h" - -void SetD3Chcr(s32); - -#endif /* LOMBYTE_RNC_SDK_DMA_SET_D3_CHCR_H */ diff --git a/include/rnc/sdk/dma/set_d4_chcr.h b/include/rnc/sdk/dma/set_d4_chcr.h deleted file mode 100644 index 5c65d7ede3..0000000000 --- a/include/rnc/sdk/dma/set_d4_chcr.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DMA_SET_D4_CHCR_H -#define LOMBYTE_RNC_SDK_DMA_SET_D4_CHCR_H - -#include "types.h" - -void SetD4Chcr(s32); - -#endif /* LOMBYTE_RNC_SDK_DMA_SET_D4_CHCR_H */ diff --git a/include/rnc/sdk/dma/set_d4_chcr_variant.h b/include/rnc/sdk/dma/set_d4_chcr_variant.h deleted file mode 100644 index 0b307754b1..0000000000 --- a/include/rnc/sdk/dma/set_d4_chcr_variant.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DMA_SET_D4_CHCR_VARIANT_H -#define LOMBYTE_RNC_SDK_DMA_SET_D4_CHCR_VARIANT_H - -#include "types.h" - -void SetD4ChcrVariant(s32); - -#endif /* LOMBYTE_RNC_SDK_DMA_SET_D4_CHCR_VARIANT_H */ diff --git a/include/rnc/sdk/dma/wait_dma.h b/include/rnc/sdk/dma/wait_dma.h deleted file mode 100644 index b413b0290c..0000000000 --- a/include/rnc/sdk/dma/wait_dma.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_DMA_WAIT_DMA_H -#define LOMBYTE_RNC_SDK_DMA_WAIT_DMA_H - -#include "types.h" - -void WaitDma(volatile u32 *); - -#endif /* LOMBYTE_RNC_SDK_DMA_WAIT_DMA_H */ diff --git a/include/rnc/sdk/graph.h b/include/rnc/sdk/graph.h new file mode 100644 index 0000000000..358452ae97 --- /dev/null +++ b/include/rnc/sdk/graph.h @@ -0,0 +1,21 @@ +#ifndef LOMBYTE_RNC_SDK_GRAPH_H +#define LOMBYTE_RNC_SDK_GRAPH_H + +#include "rnc/sdk/libgraph.h" +#include "types.h" + +struct sceGsDispEnv; +struct sceGsDrawEnv1; + +void ClearMemoryRange(u8 *, s32) __asm__("Memclr"); +s32 sceGsExecLoadImage(u8 *, u8 *); +void sceGsPutDispEnv(struct sceGsDispEnv *); +s32 sceGsPutDrawEnv(u64 *); +void sceGsResetGraph(s16, s16, s16, s16); +void sceGsSetDefDispEnv(struct sceGsDispEnv *, s16, s16, s16, s16, s16); +s32 sceGsSetDefDrawEnv(struct sceGsDrawEnv1 *, s16, s16, s16, s16, s16); +s32 sceGsSetDefLoadImage(sceGsLoadImage *, s16, s16, s16, s16, s16, s16, s16); +s32 sceGsSyncV(s32); +s32 sceGsSyncVCallback(s32); + +#endif /* LOMBYTE_RNC_SDK_GRAPH_H */ diff --git a/include/rnc/sdk/graph/memclr.h b/include/rnc/sdk/graph/memclr.h deleted file mode 100644 index e4402542dc..0000000000 --- a/include/rnc/sdk/graph/memclr.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_GRAPH_MEMCLR_H -#define LOMBYTE_RNC_SDK_GRAPH_MEMCLR_H - -#include "types.h" - -void ClearMemoryRange(u8 *, s32) __asm__("Memclr"); - -#endif /* LOMBYTE_RNC_SDK_GRAPH_MEMCLR_H */ diff --git a/include/rnc/sdk/graph/sce_gs_exec_load_image.h b/include/rnc/sdk/graph/sce_gs_exec_load_image.h deleted file mode 100644 index 483eeea565..0000000000 --- a/include/rnc/sdk/graph/sce_gs_exec_load_image.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_GRAPH_SCE_GS_EXEC_LOAD_IMAGE_H -#define LOMBYTE_RNC_SDK_GRAPH_SCE_GS_EXEC_LOAD_IMAGE_H - -#include "types.h" - -s32 sceGsExecLoadImage(u8 *, u8 *); - -#endif /* LOMBYTE_RNC_SDK_GRAPH_SCE_GS_EXEC_LOAD_IMAGE_H */ diff --git a/include/rnc/sdk/graph/sce_gs_put_disp_env.h b/include/rnc/sdk/graph/sce_gs_put_disp_env.h deleted file mode 100644 index 7a78850389..0000000000 --- a/include/rnc/sdk/graph/sce_gs_put_disp_env.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_GRAPH_SCE_GS_PUT_DISP_ENV_H -#define LOMBYTE_RNC_SDK_GRAPH_SCE_GS_PUT_DISP_ENV_H - -#include "types.h" - -struct sceGsDispEnv; - -void sceGsPutDispEnv(struct sceGsDispEnv *); - -#endif /* LOMBYTE_RNC_SDK_GRAPH_SCE_GS_PUT_DISP_ENV_H */ diff --git a/include/rnc/sdk/graph/sce_gs_put_draw_env.h b/include/rnc/sdk/graph/sce_gs_put_draw_env.h deleted file mode 100644 index aaf6504a67..0000000000 --- a/include/rnc/sdk/graph/sce_gs_put_draw_env.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_GRAPH_SCE_GS_PUT_DRAW_ENV_H -#define LOMBYTE_RNC_SDK_GRAPH_SCE_GS_PUT_DRAW_ENV_H - -#include "types.h" - -s32 sceGsPutDrawEnv(u64 *); - -#endif /* LOMBYTE_RNC_SDK_GRAPH_SCE_GS_PUT_DRAW_ENV_H */ diff --git a/include/rnc/sdk/graph/sce_gs_reset_graph.h b/include/rnc/sdk/graph/sce_gs_reset_graph.h deleted file mode 100644 index b73af685bb..0000000000 --- a/include/rnc/sdk/graph/sce_gs_reset_graph.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_GRAPH_SCE_GS_RESET_GRAPH_H -#define LOMBYTE_RNC_SDK_GRAPH_SCE_GS_RESET_GRAPH_H - -#include "types.h" - -void sceGsResetGraph(s16, s16, s16, s16); - -#endif /* LOMBYTE_RNC_SDK_GRAPH_SCE_GS_RESET_GRAPH_H */ diff --git a/include/rnc/sdk/graph/sce_gs_set_def_disp_env.h b/include/rnc/sdk/graph/sce_gs_set_def_disp_env.h deleted file mode 100644 index 20679b5644..0000000000 --- a/include/rnc/sdk/graph/sce_gs_set_def_disp_env.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_GRAPH_SCE_GS_SET_DEF_DISP_ENV_H -#define LOMBYTE_RNC_SDK_GRAPH_SCE_GS_SET_DEF_DISP_ENV_H - -#include "types.h" - -struct sceGsDispEnv; - -void sceGsSetDefDispEnv(struct sceGsDispEnv *, s16, s16, s16, s16, s16); - -#endif /* LOMBYTE_RNC_SDK_GRAPH_SCE_GS_SET_DEF_DISP_ENV_H */ diff --git a/include/rnc/sdk/graph/sce_gs_set_def_draw_env.h b/include/rnc/sdk/graph/sce_gs_set_def_draw_env.h deleted file mode 100644 index eb799861fc..0000000000 --- a/include/rnc/sdk/graph/sce_gs_set_def_draw_env.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_GRAPH_SCE_GS_SET_DEF_DRAW_ENV_H -#define LOMBYTE_RNC_SDK_GRAPH_SCE_GS_SET_DEF_DRAW_ENV_H - -#include "types.h" - -struct sceGsDrawEnv1; - -s32 sceGsSetDefDrawEnv(struct sceGsDrawEnv1 *, s16, s16, s16, s16, s16); - -#endif /* LOMBYTE_RNC_SDK_GRAPH_SCE_GS_SET_DEF_DRAW_ENV_H */ diff --git a/include/rnc/sdk/graph/sce_gs_set_def_load_image.h b/include/rnc/sdk/graph/sce_gs_set_def_load_image.h deleted file mode 100644 index 5abf388912..0000000000 --- a/include/rnc/sdk/graph/sce_gs_set_def_load_image.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_GRAPH_SCE_GS_SET_DEF_LOAD_IMAGE_H -#define LOMBYTE_RNC_SDK_GRAPH_SCE_GS_SET_DEF_LOAD_IMAGE_H - -#include "rnc/sdk/libgraph.h" -#include "types.h" - -s32 sceGsSetDefLoadImage(sceGsLoadImage *, s16, s16, s16, s16, s16, s16, s16); - -#endif /* LOMBYTE_RNC_SDK_GRAPH_SCE_GS_SET_DEF_LOAD_IMAGE_H */ diff --git a/include/rnc/sdk/graph/sce_gs_sync_v.h b/include/rnc/sdk/graph/sce_gs_sync_v.h deleted file mode 100644 index 5a226ff1a8..0000000000 --- a/include/rnc/sdk/graph/sce_gs_sync_v.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_GRAPH_SCE_GS_SYNC_V_H -#define LOMBYTE_RNC_SDK_GRAPH_SCE_GS_SYNC_V_H - -#include "types.h" - -s32 sceGsSyncV(s32); - -#endif /* LOMBYTE_RNC_SDK_GRAPH_SCE_GS_SYNC_V_H */ diff --git a/include/rnc/sdk/graph/sce_gs_sync_v_callback.h b/include/rnc/sdk/graph/sce_gs_sync_v_callback.h deleted file mode 100644 index 7c6b8b44dd..0000000000 --- a/include/rnc/sdk/graph/sce_gs_sync_v_callback.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_GRAPH_SCE_GS_SYNC_V_CALLBACK_H -#define LOMBYTE_RNC_SDK_GRAPH_SCE_GS_SYNC_V_CALLBACK_H - -#include "types.h" - -s32 sceGsSyncVCallback(s32); - -#endif /* LOMBYTE_RNC_SDK_GRAPH_SCE_GS_SYNC_V_CALLBACK_H */ diff --git a/include/rnc/sdk/input.h b/include/rnc/sdk/input.h new file mode 100644 index 0000000000..944fff1cdb --- /dev/null +++ b/include/rnc/sdk/input.h @@ -0,0 +1,15 @@ +#ifndef LOMBYTE_RNC_SDK_INPUT_H +#define LOMBYTE_RNC_SDK_INPUT_H + +#include "types.h" + +s32 scePad2CheckDma(s32); +s32 scePad2GetButtonProfile(s32, u8 *); +void *scePad2GetSide(s32); +s32 scePad2GetState(s32); +s32 scePad2LinkDriver(s32); +s32 scePad2Read(s32, u8 *); +s32 scePad2SetButtonOrder(u8 *, s32 *); +s32 sceVibGetProfile(s32, u8 *); + +#endif /* LOMBYTE_RNC_SDK_INPUT_H */ diff --git a/include/rnc/sdk/input/dbc.h b/include/rnc/sdk/input/dbc.h new file mode 100644 index 0000000000..c69823e6da --- /dev/null +++ b/include/rnc/sdk/input/dbc.h @@ -0,0 +1,12 @@ +#ifndef LOMBYTE_RNC_SDK_INPUT_DBC_H +#define LOMBYTE_RNC_SDK_INPUT_DBC_H + +#include "types.h" + +s32 sceDbcCreateSocket(void *, s32, s32); +s32 sceDbcInit(void); +s32 sceDbcSetWorkAddr(s32); +int SceDbcGetModVersion(void) __asm__("sceDbcGetModVersion"); +s32 sceDbcReceiveData(s32, s32, s32 *, u8 *); + +#endif /* LOMBYTE_RNC_SDK_INPUT_DBC_H */ diff --git a/include/rnc/sdk/input/dbc/sceDbcCreateSocket.h b/include/rnc/sdk/input/dbc/sceDbcCreateSocket.h deleted file mode 100644 index c6b3d0692d..0000000000 --- a/include/rnc/sdk/input/dbc/sceDbcCreateSocket.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_INPUT_DBC_SCEDBCCREATESOCKET_H -#define LOMBYTE_RNC_SDK_INPUT_DBC_SCEDBCCREATESOCKET_H - -#include "types.h" - -s32 sceDbcCreateSocket(void *, s32, s32); - -#endif /* LOMBYTE_RNC_SDK_INPUT_DBC_SCEDBCCREATESOCKET_H */ diff --git a/include/rnc/sdk/input/dbc/sceDbcInit.h b/include/rnc/sdk/input/dbc/sceDbcInit.h deleted file mode 100644 index f8350a267f..0000000000 --- a/include/rnc/sdk/input/dbc/sceDbcInit.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_INPUT_DBC_SCEDBCINIT_H -#define LOMBYTE_RNC_SDK_INPUT_DBC_SCEDBCINIT_H - -#include "types.h" - -s32 sceDbcInit(void); - -#endif /* LOMBYTE_RNC_SDK_INPUT_DBC_SCEDBCINIT_H */ diff --git a/include/rnc/sdk/input/dbc/sceDbcSetWorkAddr.h b/include/rnc/sdk/input/dbc/sceDbcSetWorkAddr.h deleted file mode 100644 index de28692ac3..0000000000 --- a/include/rnc/sdk/input/dbc/sceDbcSetWorkAddr.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_INPUT_DBC_SCEDBCSETWORKADDR_H -#define LOMBYTE_RNC_SDK_INPUT_DBC_SCEDBCSETWORKADDR_H - -#include "types.h" - -s32 sceDbcSetWorkAddr(s32); - -#endif /* LOMBYTE_RNC_SDK_INPUT_DBC_SCEDBCSETWORKADDR_H */ diff --git a/include/rnc/sdk/input/dbc/sce_dbc_get_mod_version.h b/include/rnc/sdk/input/dbc/sce_dbc_get_mod_version.h deleted file mode 100644 index 41680719eb..0000000000 --- a/include/rnc/sdk/input/dbc/sce_dbc_get_mod_version.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_INPUT_DBC_SCE_DBC_GET_MOD_VERSION_H -#define LOMBYTE_RNC_SDK_INPUT_DBC_SCE_DBC_GET_MOD_VERSION_H - -#include "types.h" - -int SceDbcGetModVersion(void) __asm__("sceDbcGetModVersion"); - -#endif /* LOMBYTE_RNC_SDK_INPUT_DBC_SCE_DBC_GET_MOD_VERSION_H */ diff --git a/include/rnc/sdk/input/dbc/scedbcreceivedata.h b/include/rnc/sdk/input/dbc/scedbcreceivedata.h deleted file mode 100644 index bea9304013..0000000000 --- a/include/rnc/sdk/input/dbc/scedbcreceivedata.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_INPUT_DBC_SCEDBCRECEIVEDATA_H -#define LOMBYTE_RNC_SDK_INPUT_DBC_SCEDBCRECEIVEDATA_H - -#include "types.h" - -s32 sceDbcReceiveData(s32, s32, s32 *, u8 *); - -#endif /* LOMBYTE_RNC_SDK_INPUT_DBC_SCEDBCRECEIVEDATA_H */ diff --git a/include/rnc/sdk/input/sce_pad2_check_dma.h b/include/rnc/sdk/input/sce_pad2_check_dma.h deleted file mode 100644 index 1ee8183660..0000000000 --- a/include/rnc/sdk/input/sce_pad2_check_dma.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_CHECK_DMA_H -#define LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_CHECK_DMA_H - -#include "types.h" - -s32 scePad2CheckDma(s32); - -#endif /* LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_CHECK_DMA_H */ diff --git a/include/rnc/sdk/input/sce_pad2_get_button_profile.h b/include/rnc/sdk/input/sce_pad2_get_button_profile.h deleted file mode 100644 index 82eac77ac3..0000000000 --- a/include/rnc/sdk/input/sce_pad2_get_button_profile.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_GET_BUTTON_PROFILE_H -#define LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_GET_BUTTON_PROFILE_H - -#include "types.h" - -s32 scePad2GetButtonProfile(s32, u8 *); - -#endif /* LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_GET_BUTTON_PROFILE_H */ diff --git a/include/rnc/sdk/input/sce_pad2_get_side.h b/include/rnc/sdk/input/sce_pad2_get_side.h deleted file mode 100644 index ed34d001fb..0000000000 --- a/include/rnc/sdk/input/sce_pad2_get_side.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_GET_SIDE_H -#define LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_GET_SIDE_H - -#include "types.h" - -void *scePad2GetSide(s32); - -#endif /* LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_GET_SIDE_H */ diff --git a/include/rnc/sdk/input/sce_pad2_get_state.h b/include/rnc/sdk/input/sce_pad2_get_state.h deleted file mode 100644 index 68101f9cd5..0000000000 --- a/include/rnc/sdk/input/sce_pad2_get_state.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_GET_STATE_H -#define LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_GET_STATE_H - -#include "types.h" - -s32 scePad2GetState(s32); - -#endif /* LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_GET_STATE_H */ diff --git a/include/rnc/sdk/input/sce_pad2_link_driver.h b/include/rnc/sdk/input/sce_pad2_link_driver.h deleted file mode 100644 index ac81b0124a..0000000000 --- a/include/rnc/sdk/input/sce_pad2_link_driver.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_LINK_DRIVER_H -#define LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_LINK_DRIVER_H - -#include "types.h" - -s32 scePad2LinkDriver(s32); - -#endif /* LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_LINK_DRIVER_H */ diff --git a/include/rnc/sdk/input/sce_pad2_read.h b/include/rnc/sdk/input/sce_pad2_read.h deleted file mode 100644 index a5ee041947..0000000000 --- a/include/rnc/sdk/input/sce_pad2_read.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_READ_H -#define LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_READ_H - -#include "types.h" - -s32 scePad2Read(s32, u8 *); - -#endif /* LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_READ_H */ diff --git a/include/rnc/sdk/input/sce_pad2_set_button_order.h b/include/rnc/sdk/input/sce_pad2_set_button_order.h deleted file mode 100644 index 82680f84af..0000000000 --- a/include/rnc/sdk/input/sce_pad2_set_button_order.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_SET_BUTTON_ORDER_H -#define LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_SET_BUTTON_ORDER_H - -#include "types.h" - -s32 scePad2SetButtonOrder(u8 *, s32 *); - -#endif /* LOMBYTE_RNC_SDK_INPUT_SCE_PAD2_SET_BUTTON_ORDER_H */ diff --git a/include/rnc/sdk/input/sce_vib_get_profile.h b/include/rnc/sdk/input/sce_vib_get_profile.h deleted file mode 100644 index a566d21f48..0000000000 --- a/include/rnc/sdk/input/sce_vib_get_profile.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_INPUT_SCE_VIB_GET_PROFILE_H -#define LOMBYTE_RNC_SDK_INPUT_SCE_VIB_GET_PROFILE_H - -#include "types.h" - -s32 sceVibGetProfile(s32, u8 *); - -#endif /* LOMBYTE_RNC_SDK_INPUT_SCE_VIB_GET_PROFILE_H */ diff --git a/include/rnc/sdk/interrupts.h b/include/rnc/sdk/interrupts.h new file mode 100644 index 0000000000..e4aa3edd21 --- /dev/null +++ b/include/rnc/sdk/interrupts.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_SDK_INTERRUPTS_H +#define LOMBYTE_RNC_SDK_INTERRUPTS_H + +#include "types.h" + +s32 EnableInterrupts(void); + +#endif /* LOMBYTE_RNC_SDK_INTERRUPTS_H */ diff --git a/include/rnc/sdk/interrupts/enable_interrupts.h b/include/rnc/sdk/interrupts/enable_interrupts.h deleted file mode 100644 index 272795003a..0000000000 --- a/include/rnc/sdk/interrupts/enable_interrupts.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_INTERRUPTS_ENABLE_INTERRUPTS_H -#define LOMBYTE_RNC_SDK_INTERRUPTS_ENABLE_INTERRUPTS_H - -#include "types.h" - -s32 EnableInterrupts(void); - -#endif /* LOMBYTE_RNC_SDK_INTERRUPTS_ENABLE_INTERRUPTS_H */ diff --git a/include/rnc/sdk/ipu.h b/include/rnc/sdk/ipu.h new file mode 100644 index 0000000000..b2bff304fd --- /dev/null +++ b/include/rnc/sdk/ipu.h @@ -0,0 +1,19 @@ +#ifndef LOMBYTE_RNC_SDK_IPU_H +#define LOMBYTE_RNC_SDK_IPU_H + +#include "types.h" + +struct IpuContext; +struct MpegDecoder; + +u32 SetIpuMpeg1(u32) __asm__("_ipuSetMPEG1"); +s16 _ipuVdec(struct MpegDecoder *, s32); +void receiveDataFromIPU(s32, s32); +void sceIpuRestartDMA(struct IpuContext *); +s32 SendIpuCommand() __asm__("_sendIpuCommand"); +void suspend_ipu_dma_state(u32 *) __asm__("FUN_0012cc20"); +s32 _waitBdecOut(); +void _waitIpuIdle(s32 *); +s64 _waitIpuIdle64(s32 *); + +#endif /* LOMBYTE_RNC_SDK_IPU_H */ diff --git a/include/rnc/sdk/ipu/ipu_set_mpeg1.h b/include/rnc/sdk/ipu/ipu_set_mpeg1.h deleted file mode 100644 index d73a240ee5..0000000000 --- a/include/rnc/sdk/ipu/ipu_set_mpeg1.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_IPU_IPU_SET_MPEG1_H -#define LOMBYTE_RNC_SDK_IPU_IPU_SET_MPEG1_H - -#include "types.h" - -u32 SetIpuMpeg1(u32) __asm__("_ipuSetMPEG1"); - -#endif /* LOMBYTE_RNC_SDK_IPU_IPU_SET_MPEG1_H */ diff --git a/include/rnc/sdk/ipu/ipu_vdec.h b/include/rnc/sdk/ipu/ipu_vdec.h deleted file mode 100644 index 6e42421549..0000000000 --- a/include/rnc/sdk/ipu/ipu_vdec.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_IPU_IPU_VDEC_H -#define LOMBYTE_RNC_SDK_IPU_IPU_VDEC_H - -#include "types.h" - -struct MpegDecoder; - -s16 _ipuVdec(struct MpegDecoder *, s32); - -#endif /* LOMBYTE_RNC_SDK_IPU_IPU_VDEC_H */ diff --git a/include/rnc/sdk/ipu/receive_data_from_ipu.h b/include/rnc/sdk/ipu/receive_data_from_ipu.h deleted file mode 100644 index e6c2de47d6..0000000000 --- a/include/rnc/sdk/ipu/receive_data_from_ipu.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_IPU_RECEIVE_DATA_FROM_IPU_H -#define LOMBYTE_RNC_SDK_IPU_RECEIVE_DATA_FROM_IPU_H - -#include "types.h" - -void receiveDataFromIPU(s32, s32); - -#endif /* LOMBYTE_RNC_SDK_IPU_RECEIVE_DATA_FROM_IPU_H */ diff --git a/include/rnc/sdk/ipu/sce_ipu_restart_dma.h b/include/rnc/sdk/ipu/sce_ipu_restart_dma.h deleted file mode 100644 index 0cf56dce26..0000000000 --- a/include/rnc/sdk/ipu/sce_ipu_restart_dma.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_IPU_SCE_IPU_RESTART_DMA_H -#define LOMBYTE_RNC_SDK_IPU_SCE_IPU_RESTART_DMA_H - -#include "types.h" - -struct IpuContext; - -void sceIpuRestartDMA(struct IpuContext *); - -#endif /* LOMBYTE_RNC_SDK_IPU_SCE_IPU_RESTART_DMA_H */ diff --git a/include/rnc/sdk/ipu/send_ipu_command.h b/include/rnc/sdk/ipu/send_ipu_command.h deleted file mode 100644 index a643170a17..0000000000 --- a/include/rnc/sdk/ipu/send_ipu_command.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_IPU_SEND_IPU_COMMAND_H -#define LOMBYTE_RNC_SDK_IPU_SEND_IPU_COMMAND_H - -#include "types.h" - -s32 SendIpuCommand() __asm__("_sendIpuCommand"); - -#endif /* LOMBYTE_RNC_SDK_IPU_SEND_IPU_COMMAND_H */ diff --git a/include/rnc/sdk/ipu/suspend_ipu_dma_state.h b/include/rnc/sdk/ipu/suspend_ipu_dma_state.h deleted file mode 100644 index 0e53570c5a..0000000000 --- a/include/rnc/sdk/ipu/suspend_ipu_dma_state.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_IPU_SUSPEND_IPU_DMA_STATE_H -#define LOMBYTE_RNC_SDK_IPU_SUSPEND_IPU_DMA_STATE_H - -#include "types.h" - -void suspend_ipu_dma_state(u32 *) __asm__("FUN_0012cc20"); - -#endif /* LOMBYTE_RNC_SDK_IPU_SUSPEND_IPU_DMA_STATE_H */ diff --git a/include/rnc/sdk/ipu/wait_bdec_out.h b/include/rnc/sdk/ipu/wait_bdec_out.h deleted file mode 100644 index af779eaa92..0000000000 --- a/include/rnc/sdk/ipu/wait_bdec_out.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_IPU_WAIT_BDEC_OUT_H -#define LOMBYTE_RNC_SDK_IPU_WAIT_BDEC_OUT_H - -#include "types.h" - -s32 _waitBdecOut(); - -#endif /* LOMBYTE_RNC_SDK_IPU_WAIT_BDEC_OUT_H */ diff --git a/include/rnc/sdk/ipu/wait_ipu_idle.h b/include/rnc/sdk/ipu/wait_ipu_idle.h deleted file mode 100644 index 623c4d3134..0000000000 --- a/include/rnc/sdk/ipu/wait_ipu_idle.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_IPU_WAIT_IPU_IDLE_H -#define LOMBYTE_RNC_SDK_IPU_WAIT_IPU_IDLE_H - -#include "types.h" - -void _waitIpuIdle(s32 *); - -#endif /* LOMBYTE_RNC_SDK_IPU_WAIT_IPU_IDLE_H */ diff --git a/include/rnc/sdk/ipu/wait_ipu_idle64.h b/include/rnc/sdk/ipu/wait_ipu_idle64.h deleted file mode 100644 index ca4bbe1b8b..0000000000 --- a/include/rnc/sdk/ipu/wait_ipu_idle64.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_IPU_WAIT_IPU_IDLE64_H -#define LOMBYTE_RNC_SDK_IPU_WAIT_IPU_IDLE64_H - -#include "types.h" - -s64 _waitIpuIdle64(s32 *); - -#endif /* LOMBYTE_RNC_SDK_IPU_WAIT_IPU_IDLE64_H */ diff --git a/include/rnc/sdk/kernel.h b/include/rnc/sdk/kernel.h index b2229a5592..8a1536ccf0 100644 --- a/include/rnc/sdk/kernel.h +++ b/include/rnc/sdk/kernel.h @@ -1,6 +1,8 @@ #ifndef LOMBYTE_RNC_SDK_KERNEL_H #define LOMBYTE_RNC_SDK_KERNEL_H +#include "types.h" +#include "rnc/sdk/top_thread.h" #include "types.h" /* Sony EE-kernel primitives: the privileged instructions C cannot express. @@ -38,4 +40,21 @@ struct SemaParam { u32 option; }; +void InitExecPS2(void); +void InitSystemCallTableAddress(void); +s32 InitThread(void); +s32 PatchIsNeeded(void); +s64 VSync2(void); +void clear_tty_initialized(void) __asm__("func_00118BC0"); +s32 iWakeupThread(s32); +void InitAlarm(void); +s32 InitTLB(void); +void InitTLBFunctions(void); +s32 read(s32, s32, s32); +void *sbrk(s32); +void SupplementCrt0(void) __asm__("supplement_crt0"); +void topThread(TopThreadQueue *); +void VSync(void); +s32 write(s32, s32, s32); + #endif /* LOMBYTE_RNC_SDK_KERNEL_H */ diff --git a/include/rnc/sdk/kernel/InitExecPS2.h b/include/rnc/sdk/kernel/InitExecPS2.h deleted file mode 100644 index afd6bd936a..0000000000 --- a/include/rnc/sdk/kernel/InitExecPS2.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_INITEXECPS2_H -#define LOMBYTE_RNC_SDK_KERNEL_INITEXECPS2_H - -#include "types.h" - -void InitExecPS2(void); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_INITEXECPS2_H */ diff --git a/include/rnc/sdk/kernel/InitSystemCallTableAddress.h b/include/rnc/sdk/kernel/InitSystemCallTableAddress.h deleted file mode 100644 index 2f9d3ae067..0000000000 --- a/include/rnc/sdk/kernel/InitSystemCallTableAddress.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_INITSYSTEMCALLTABLEADDRESS_H -#define LOMBYTE_RNC_SDK_KERNEL_INITSYSTEMCALLTABLEADDRESS_H - -#include "types.h" - -void InitSystemCallTableAddress(void); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_INITSYSTEMCALLTABLEADDRESS_H */ diff --git a/include/rnc/sdk/kernel/InitThread.h b/include/rnc/sdk/kernel/InitThread.h deleted file mode 100644 index 2564389c27..0000000000 --- a/include/rnc/sdk/kernel/InitThread.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_INITTHREAD_H -#define LOMBYTE_RNC_SDK_KERNEL_INITTHREAD_H - -#include "types.h" - -s32 InitThread(void); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_INITTHREAD_H */ diff --git a/include/rnc/sdk/kernel/PatchIsNeeded.h b/include/rnc/sdk/kernel/PatchIsNeeded.h deleted file mode 100644 index d18ccb46ce..0000000000 --- a/include/rnc/sdk/kernel/PatchIsNeeded.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_PATCHISNEEDED_H -#define LOMBYTE_RNC_SDK_KERNEL_PATCHISNEEDED_H - -#include "types.h" - -s32 PatchIsNeeded(void); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_PATCHISNEEDED_H */ diff --git a/include/rnc/sdk/kernel/VSync2.h b/include/rnc/sdk/kernel/VSync2.h deleted file mode 100644 index 2ab826963a..0000000000 --- a/include/rnc/sdk/kernel/VSync2.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_VSYNC2_H -#define LOMBYTE_RNC_SDK_KERNEL_VSYNC2_H - -#include "types.h" - -s64 VSync2(void); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_VSYNC2_H */ diff --git a/include/rnc/sdk/kernel/clear_tty_initialized.h b/include/rnc/sdk/kernel/clear_tty_initialized.h deleted file mode 100644 index 914ea3c8af..0000000000 --- a/include/rnc/sdk/kernel/clear_tty_initialized.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_CLEAR_TTY_INITIALIZED_H -#define LOMBYTE_RNC_SDK_KERNEL_CLEAR_TTY_INITIALIZED_H - -#include "types.h" - -void clear_tty_initialized(void) __asm__("func_00118BC0"); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_CLEAR_TTY_INITIALIZED_H */ diff --git a/include/rnc/sdk/kernel/i_wakeup_thread.h b/include/rnc/sdk/kernel/i_wakeup_thread.h deleted file mode 100644 index ce04a68cd6..0000000000 --- a/include/rnc/sdk/kernel/i_wakeup_thread.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_I_WAKEUP_THREAD_H -#define LOMBYTE_RNC_SDK_KERNEL_I_WAKEUP_THREAD_H - -#include "types.h" - -s32 iWakeupThread(s32); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_I_WAKEUP_THREAD_H */ diff --git a/include/rnc/sdk/kernel/init_alarm.h b/include/rnc/sdk/kernel/init_alarm.h deleted file mode 100644 index 9436fc5303..0000000000 --- a/include/rnc/sdk/kernel/init_alarm.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_INIT_ALARM_H -#define LOMBYTE_RNC_SDK_KERNEL_INIT_ALARM_H - -#include "types.h" - -void InitAlarm(void); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_INIT_ALARM_H */ diff --git a/include/rnc/sdk/kernel/init_tlb.h b/include/rnc/sdk/kernel/init_tlb.h deleted file mode 100644 index 795854c70d..0000000000 --- a/include/rnc/sdk/kernel/init_tlb.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_INIT_TLB_H -#define LOMBYTE_RNC_SDK_KERNEL_INIT_TLB_H - -#include "types.h" - -s32 InitTLB(void); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_INIT_TLB_H */ diff --git a/include/rnc/sdk/kernel/init_tlb_functions.h b/include/rnc/sdk/kernel/init_tlb_functions.h deleted file mode 100644 index 4d3fff5665..0000000000 --- a/include/rnc/sdk/kernel/init_tlb_functions.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_INIT_TLB_FUNCTIONS_H -#define LOMBYTE_RNC_SDK_KERNEL_INIT_TLB_FUNCTIONS_H - -#include "types.h" - -void InitTLBFunctions(void); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_INIT_TLB_FUNCTIONS_H */ diff --git a/include/rnc/sdk/kernel/read.h b/include/rnc/sdk/kernel/read.h deleted file mode 100644 index aa8ad85874..0000000000 --- a/include/rnc/sdk/kernel/read.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_READ_H -#define LOMBYTE_RNC_SDK_KERNEL_READ_H - -#include "types.h" - -s32 read(s32, s32, s32); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_READ_H */ diff --git a/include/rnc/sdk/kernel/sbrk.h b/include/rnc/sdk/kernel/sbrk.h deleted file mode 100644 index f5b29c4f5b..0000000000 --- a/include/rnc/sdk/kernel/sbrk.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_SBRK_H -#define LOMBYTE_RNC_SDK_KERNEL_SBRK_H - -#include "types.h" - -void *sbrk(s32); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_SBRK_H */ diff --git a/include/rnc/sdk/kernel/supplement_crt0.h b/include/rnc/sdk/kernel/supplement_crt0.h deleted file mode 100644 index e7d5602e68..0000000000 --- a/include/rnc/sdk/kernel/supplement_crt0.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_SUPPLEMENT_CRT0_H -#define LOMBYTE_RNC_SDK_KERNEL_SUPPLEMENT_CRT0_H - -#include "types.h" - -void SupplementCrt0(void) __asm__("supplement_crt0"); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_SUPPLEMENT_CRT0_H */ diff --git a/include/rnc/sdk/kernel/topThread.h b/include/rnc/sdk/kernel/topThread.h deleted file mode 100644 index fb1afb66ab..0000000000 --- a/include/rnc/sdk/kernel/topThread.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_TOPTHREAD_H -#define LOMBYTE_RNC_SDK_KERNEL_TOPTHREAD_H - -#include "types.h" -#include "rnc/sdk/top_thread.h" - -void topThread(TopThreadQueue *); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_TOPTHREAD_H */ diff --git a/include/rnc/sdk/kernel/v_sync.h b/include/rnc/sdk/kernel/v_sync.h deleted file mode 100644 index 37b4015478..0000000000 --- a/include/rnc/sdk/kernel/v_sync.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_V_SYNC_H -#define LOMBYTE_RNC_SDK_KERNEL_V_SYNC_H - -#include "types.h" - -void VSync(void); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_V_SYNC_H */ diff --git a/include/rnc/sdk/kernel/write.h b/include/rnc/sdk/kernel/write.h deleted file mode 100644 index 215dcd4f5a..0000000000 --- a/include/rnc/sdk/kernel/write.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_KERNEL_WRITE_H -#define LOMBYTE_RNC_SDK_KERNEL_WRITE_H - -#include "types.h" - -s32 write(s32, s32, s32); - -#endif /* LOMBYTE_RNC_SDK_KERNEL_WRITE_H */ diff --git a/include/rnc/sdk/libc/locale.h b/include/rnc/sdk/libc/locale.h new file mode 100644 index 0000000000..8ba7f2b5c0 --- /dev/null +++ b/include/rnc/sdk/libc/locale.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_SDK_LIBC_LOCALE_H +#define LOMBYTE_RNC_SDK_LIBC_LOCALE_H + +#include "types.h" + +int *_localeconv_r(void *) __asm__("func_001144D8"); + +#endif /* LOMBYTE_RNC_SDK_LIBC_LOCALE_H */ diff --git a/include/rnc/sdk/libc/locale/_localeconv_r.h b/include/rnc/sdk/libc/locale/_localeconv_r.h deleted file mode 100644 index d0056520d7..0000000000 --- a/include/rnc/sdk/libc/locale/_localeconv_r.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_LOCALE__LOCALECONV_R_H -#define LOMBYTE_RNC_SDK_LIBC_LOCALE__LOCALECONV_R_H - -#include "types.h" - -int *_localeconv_r(void *) __asm__("func_001144D8"); - -#endif /* LOMBYTE_RNC_SDK_LIBC_LOCALE__LOCALECONV_R_H */ diff --git a/include/rnc/sdk/libc/malloc.h b/include/rnc/sdk/libc/malloc.h new file mode 100644 index 0000000000..e2522b900a --- /dev/null +++ b/include/rnc/sdk/libc/malloc.h @@ -0,0 +1,15 @@ +#ifndef LOMBYTE_RNC_SDK_LIBC_MALLOC_H +#define LOMBYTE_RNC_SDK_LIBC_MALLOC_H + +#include "types.h" + +struct _reent; + +void *_calloc_r(struct _reent *, u32, u32); +void *SbrkReentrant(void *, int) __asm__("_sbrk_r"); +void _free_r(struct _reent *, void *); +void malloc_extend_top(struct _reent *, u32); +void *_malloc_r(struct _reent *, u32); +s32 _malloc_trim_r(struct _reent *, u32); + +#endif /* LOMBYTE_RNC_SDK_LIBC_MALLOC_H */ diff --git a/include/rnc/sdk/libc/malloc/_calloc_r.h b/include/rnc/sdk/libc/malloc/_calloc_r.h deleted file mode 100644 index e4985d19e0..0000000000 --- a/include/rnc/sdk/libc/malloc/_calloc_r.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_MALLOC__CALLOC_R_H -#define LOMBYTE_RNC_SDK_LIBC_MALLOC__CALLOC_R_H - -#include "types.h" - -struct _reent; - -void *_calloc_r(struct _reent *, u32, u32); - -#endif /* LOMBYTE_RNC_SDK_LIBC_MALLOC__CALLOC_R_H */ diff --git a/include/rnc/sdk/libc/malloc/_sbrk_r.h b/include/rnc/sdk/libc/malloc/_sbrk_r.h deleted file mode 100644 index 79438bde92..0000000000 --- a/include/rnc/sdk/libc/malloc/_sbrk_r.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_MALLOC__SBRK_R_H -#define LOMBYTE_RNC_SDK_LIBC_MALLOC__SBRK_R_H - -#include "types.h" - -void *SbrkReentrant(void *, int) __asm__("_sbrk_r"); - -#endif /* LOMBYTE_RNC_SDK_LIBC_MALLOC__SBRK_R_H */ diff --git a/include/rnc/sdk/libc/malloc/free_r.h b/include/rnc/sdk/libc/malloc/free_r.h deleted file mode 100644 index 7ea02c9e77..0000000000 --- a/include/rnc/sdk/libc/malloc/free_r.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_MALLOC_FREE_R_H -#define LOMBYTE_RNC_SDK_LIBC_MALLOC_FREE_R_H - -#include "types.h" - -struct _reent; - -void _free_r(struct _reent *, void *); - -#endif /* LOMBYTE_RNC_SDK_LIBC_MALLOC_FREE_R_H */ diff --git a/include/rnc/sdk/libc/malloc/malloc_extend_top.h b/include/rnc/sdk/libc/malloc/malloc_extend_top.h deleted file mode 100644 index 6162f62315..0000000000 --- a/include/rnc/sdk/libc/malloc/malloc_extend_top.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_MALLOC_MALLOC_EXTEND_TOP_H -#define LOMBYTE_RNC_SDK_LIBC_MALLOC_MALLOC_EXTEND_TOP_H - -#include "types.h" - -struct _reent; - -void malloc_extend_top(struct _reent *, u32); - -#endif /* LOMBYTE_RNC_SDK_LIBC_MALLOC_MALLOC_EXTEND_TOP_H */ diff --git a/include/rnc/sdk/libc/malloc/malloc_r.h b/include/rnc/sdk/libc/malloc/malloc_r.h deleted file mode 100644 index 3888b4911f..0000000000 --- a/include/rnc/sdk/libc/malloc/malloc_r.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_MALLOC_MALLOC_R_H -#define LOMBYTE_RNC_SDK_LIBC_MALLOC_MALLOC_R_H - -#include "types.h" - -struct _reent; - -void *_malloc_r(struct _reent *, u32); - -#endif /* LOMBYTE_RNC_SDK_LIBC_MALLOC_MALLOC_R_H */ diff --git a/include/rnc/sdk/libc/malloc/malloc_trim_r.h b/include/rnc/sdk/libc/malloc/malloc_trim_r.h deleted file mode 100644 index 31f85284db..0000000000 --- a/include/rnc/sdk/libc/malloc/malloc_trim_r.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_MALLOC_MALLOC_TRIM_R_H -#define LOMBYTE_RNC_SDK_LIBC_MALLOC_MALLOC_TRIM_R_H - -#include "types.h" - -struct _reent; - -s32 _malloc_trim_r(struct _reent *, u32); - -#endif /* LOMBYTE_RNC_SDK_LIBC_MALLOC_MALLOC_TRIM_R_H */ diff --git a/include/rnc/sdk/libc/mprec.h b/include/rnc/sdk/libc/mprec.h new file mode 100644 index 0000000000..dcd70750c1 --- /dev/null +++ b/include/rnc/sdk/libc/mprec.h @@ -0,0 +1,14 @@ +#ifndef LOMBYTE_RNC_SDK_LIBC_MPREC_H +#define LOMBYTE_RNC_SDK_LIBC_MPREC_H + +#include "types.h" + +struct Bigint; +struct _reent; + +char *_dtoa_r(struct _reent *, f64, s32, s32, s32 *, s32 *, char **); +s32 CountLeadingZeroBits(s32) __asm__("_hi0bits"); +s32 CountTrailingZeroBits(u32 *) __asm__("_lo0bits"); +struct Bigint *_lshift(s32, struct Bigint *, s32); + +#endif /* LOMBYTE_RNC_SDK_LIBC_MPREC_H */ diff --git a/include/rnc/sdk/libc/mprec/_dtoa_r.h b/include/rnc/sdk/libc/mprec/_dtoa_r.h deleted file mode 100644 index 3e3f21d7ba..0000000000 --- a/include/rnc/sdk/libc/mprec/_dtoa_r.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_MPREC__DTOA_R_H -#define LOMBYTE_RNC_SDK_LIBC_MPREC__DTOA_R_H - -#include "types.h" - -struct _reent; - -char *_dtoa_r(struct _reent *, f64, s32, s32, s32 *, s32 *, char **); - -#endif /* LOMBYTE_RNC_SDK_LIBC_MPREC__DTOA_R_H */ diff --git a/include/rnc/sdk/libc/mprec/hi0bits.h b/include/rnc/sdk/libc/mprec/hi0bits.h deleted file mode 100644 index 55a89f0390..0000000000 --- a/include/rnc/sdk/libc/mprec/hi0bits.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_MPREC_HI0BITS_H -#define LOMBYTE_RNC_SDK_LIBC_MPREC_HI0BITS_H - -#include "types.h" - -s32 CountLeadingZeroBits(s32) __asm__("_hi0bits"); - -#endif /* LOMBYTE_RNC_SDK_LIBC_MPREC_HI0BITS_H */ diff --git a/include/rnc/sdk/libc/mprec/lo0bits.h b/include/rnc/sdk/libc/mprec/lo0bits.h deleted file mode 100644 index 93e5119c8a..0000000000 --- a/include/rnc/sdk/libc/mprec/lo0bits.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_MPREC_LO0BITS_H -#define LOMBYTE_RNC_SDK_LIBC_MPREC_LO0BITS_H - -#include "types.h" - -s32 CountTrailingZeroBits(u32 *) __asm__("_lo0bits"); - -#endif /* LOMBYTE_RNC_SDK_LIBC_MPREC_LO0BITS_H */ diff --git a/include/rnc/sdk/libc/mprec/lshift.h b/include/rnc/sdk/libc/mprec/lshift.h deleted file mode 100644 index 22858b32c4..0000000000 --- a/include/rnc/sdk/libc/mprec/lshift.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_MPREC_LSHIFT_H -#define LOMBYTE_RNC_SDK_LIBC_MPREC_LSHIFT_H - -#include "types.h" - -struct Bigint; - -struct Bigint *_lshift(s32, struct Bigint *, s32); - -#endif /* LOMBYTE_RNC_SDK_LIBC_MPREC_LSHIFT_H */ diff --git a/include/rnc/sdk/libc/reent.h b/include/rnc/sdk/libc/reent.h new file mode 100644 index 0000000000..49e83cc830 --- /dev/null +++ b/include/rnc/sdk/libc/reent.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_SDK_LIBC_REENT_H +#define LOMBYTE_RNC_SDK_LIBC_REENT_H + +#include "types.h" + +int _fstat(int, int *) __asm__("func_00118EC8"); + +#endif /* LOMBYTE_RNC_SDK_LIBC_REENT_H */ diff --git a/include/rnc/sdk/libc/reent/_fstat.h b/include/rnc/sdk/libc/reent/_fstat.h deleted file mode 100644 index 7e30bfe205..0000000000 --- a/include/rnc/sdk/libc/reent/_fstat.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_REENT__FSTAT_H -#define LOMBYTE_RNC_SDK_LIBC_REENT__FSTAT_H - -#include "types.h" - -int _fstat(int, int *) __asm__("func_00118EC8"); - -#endif /* LOMBYTE_RNC_SDK_LIBC_REENT__FSTAT_H */ diff --git a/include/rnc/sdk/libc/stdio.h b/include/rnc/sdk/libc/stdio.h new file mode 100644 index 0000000000..66e6262d15 --- /dev/null +++ b/include/rnc/sdk/libc/stdio.h @@ -0,0 +1,19 @@ +#ifndef LOMBYTE_RNC_SDK_LIBC_STDIO_H +#define LOMBYTE_RNC_SDK_LIBC_STDIO_H + +#include "rnc/sdk/library/stdio.h" +#include "types.h" + +struct Reent; + +int exponent(char *, int, int); +s32 fflush(RncFile *); +s32 _fwalk(u8 *, s32 (*)(void *)); +int Printf(const char *, ...) __asm__("printf"); +s32 __sfvwrite(RncFile *, RncStdioUio *); +void __sinit(struct Reent *); +void __smakebuf(RncFile *); +s32 sprintf(s8 *, const s8 *, ...); +void std(); + +#endif /* LOMBYTE_RNC_SDK_LIBC_STDIO_H */ diff --git a/include/rnc/sdk/libc/stdio/exponent.h b/include/rnc/sdk/libc/stdio/exponent.h deleted file mode 100644 index f577190f07..0000000000 --- a/include/rnc/sdk/libc/stdio/exponent.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_STDIO_EXPONENT_H -#define LOMBYTE_RNC_SDK_LIBC_STDIO_EXPONENT_H - -#include "types.h" - -int exponent(char *, int, int); - -#endif /* LOMBYTE_RNC_SDK_LIBC_STDIO_EXPONENT_H */ diff --git a/include/rnc/sdk/libc/stdio/fflush.h b/include/rnc/sdk/libc/stdio/fflush.h deleted file mode 100644 index 7ab2483cec..0000000000 --- a/include/rnc/sdk/libc/stdio/fflush.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_STDIO_FFLUSH_H -#define LOMBYTE_RNC_SDK_LIBC_STDIO_FFLUSH_H - -#include "rnc/sdk/library/stdio.h" -#include "types.h" - -s32 fflush(RncFile *); - -#endif /* LOMBYTE_RNC_SDK_LIBC_STDIO_FFLUSH_H */ diff --git a/include/rnc/sdk/libc/stdio/fwalk.h b/include/rnc/sdk/libc/stdio/fwalk.h deleted file mode 100644 index 8ae318bc35..0000000000 --- a/include/rnc/sdk/libc/stdio/fwalk.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_STDIO_FWALK_H -#define LOMBYTE_RNC_SDK_LIBC_STDIO_FWALK_H - -#include "types.h" - -s32 _fwalk(u8 *, s32 (*)(void *)); - -#endif /* LOMBYTE_RNC_SDK_LIBC_STDIO_FWALK_H */ diff --git a/include/rnc/sdk/libc/stdio/printf.h b/include/rnc/sdk/libc/stdio/printf.h deleted file mode 100644 index 5811453819..0000000000 --- a/include/rnc/sdk/libc/stdio/printf.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_STDIO_PRINTF_H -#define LOMBYTE_RNC_SDK_LIBC_STDIO_PRINTF_H - -#include "types.h" - -int Printf(const char *, ...) __asm__("printf"); - -#endif /* LOMBYTE_RNC_SDK_LIBC_STDIO_PRINTF_H */ diff --git a/include/rnc/sdk/libc/stdio/sfvwrite.h b/include/rnc/sdk/libc/stdio/sfvwrite.h deleted file mode 100644 index b44ba5ec81..0000000000 --- a/include/rnc/sdk/libc/stdio/sfvwrite.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_STDIO_SFVWRITE_H -#define LOMBYTE_RNC_SDK_LIBC_STDIO_SFVWRITE_H - -#include "rnc/sdk/library/stdio.h" -#include "types.h" - -s32 __sfvwrite(RncFile *, RncStdioUio *); - -#endif /* LOMBYTE_RNC_SDK_LIBC_STDIO_SFVWRITE_H */ diff --git a/include/rnc/sdk/libc/stdio/sinit.h b/include/rnc/sdk/libc/stdio/sinit.h deleted file mode 100644 index 5f6d10fd94..0000000000 --- a/include/rnc/sdk/libc/stdio/sinit.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_STDIO_SINIT_H -#define LOMBYTE_RNC_SDK_LIBC_STDIO_SINIT_H - -#include "types.h" - -struct Reent; - -void __sinit(struct Reent *); - -#endif /* LOMBYTE_RNC_SDK_LIBC_STDIO_SINIT_H */ diff --git a/include/rnc/sdk/libc/stdio/smakebuf.h b/include/rnc/sdk/libc/stdio/smakebuf.h deleted file mode 100644 index f46503b4b7..0000000000 --- a/include/rnc/sdk/libc/stdio/smakebuf.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_STDIO_SMAKEBUF_H -#define LOMBYTE_RNC_SDK_LIBC_STDIO_SMAKEBUF_H - -#include "types.h" -#include "rnc/sdk/library/stdio.h" - -void __smakebuf(RncFile *); - -#endif /* LOMBYTE_RNC_SDK_LIBC_STDIO_SMAKEBUF_H */ diff --git a/include/rnc/sdk/libc/stdio/sprintf.h b/include/rnc/sdk/libc/stdio/sprintf.h deleted file mode 100644 index 366322084f..0000000000 --- a/include/rnc/sdk/libc/stdio/sprintf.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_STDIO_SPRINTF_H -#define LOMBYTE_RNC_SDK_LIBC_STDIO_SPRINTF_H - -#include "types.h" - -s32 sprintf(s8 *, const s8 *, ...); - -#endif /* LOMBYTE_RNC_SDK_LIBC_STDIO_SPRINTF_H */ diff --git a/include/rnc/sdk/libc/stdio/std.h b/include/rnc/sdk/libc/stdio/std.h deleted file mode 100644 index eb13e1b72b..0000000000 --- a/include/rnc/sdk/libc/stdio/std.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_STDIO_STD_H -#define LOMBYTE_RNC_SDK_LIBC_STDIO_STD_H - -#include "types.h" - -void std(); - -#endif /* LOMBYTE_RNC_SDK_LIBC_STDIO_STD_H */ diff --git a/include/rnc/sdk/libc/stdlib.h b/include/rnc/sdk/libc/stdlib.h new file mode 100644 index 0000000000..fcfb8cb494 --- /dev/null +++ b/include/rnc/sdk/libc/stdlib.h @@ -0,0 +1,12 @@ +#ifndef LOMBYTE_RNC_SDK_LIBC_STDLIB_H +#define LOMBYTE_RNC_SDK_LIBC_STDLIB_H + +#include "types.h" + +int *__errno(void) __asm__("func_001138A8"); +s32 isinf(f64) __asm__("FUN_00116168"); +s32 isnan(f64) __asm__("ClassifyDoubleNaN"); +s32 RandomNext(void) __asm__("rand"); +void srand(int) __asm__("func_001160C8"); + +#endif /* LOMBYTE_RNC_SDK_LIBC_STDLIB_H */ diff --git a/include/rnc/sdk/libc/stdlib/__errno.h b/include/rnc/sdk/libc/stdlib/__errno.h deleted file mode 100644 index 78fb15d6f0..0000000000 --- a/include/rnc/sdk/libc/stdlib/__errno.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_STDLIB___ERRNO_H -#define LOMBYTE_RNC_SDK_LIBC_STDLIB___ERRNO_H - -#include "types.h" - -int *__errno(void) __asm__("func_001138A8"); - -#endif /* LOMBYTE_RNC_SDK_LIBC_STDLIB___ERRNO_H */ diff --git a/include/rnc/sdk/libc/stdlib/isinf.h b/include/rnc/sdk/libc/stdlib/isinf.h deleted file mode 100644 index 461f555d01..0000000000 --- a/include/rnc/sdk/libc/stdlib/isinf.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_STDLIB_ISINF_H -#define LOMBYTE_RNC_SDK_LIBC_STDLIB_ISINF_H - -#include "types.h" - -s32 isinf(f64) __asm__("FUN_00116168"); - -#endif /* LOMBYTE_RNC_SDK_LIBC_STDLIB_ISINF_H */ diff --git a/include/rnc/sdk/libc/stdlib/isnan.h b/include/rnc/sdk/libc/stdlib/isnan.h deleted file mode 100644 index 5ede8a5ee8..0000000000 --- a/include/rnc/sdk/libc/stdlib/isnan.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_STDLIB_ISNAN_H -#define LOMBYTE_RNC_SDK_LIBC_STDLIB_ISNAN_H - -#include "types.h" - -s32 isnan(f64) __asm__("ClassifyDoubleNaN"); - -#endif /* LOMBYTE_RNC_SDK_LIBC_STDLIB_ISNAN_H */ diff --git a/include/rnc/sdk/libc/stdlib/rand.h b/include/rnc/sdk/libc/stdlib/rand.h deleted file mode 100644 index 92b9aab173..0000000000 --- a/include/rnc/sdk/libc/stdlib/rand.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_STDLIB_RAND_H -#define LOMBYTE_RNC_SDK_LIBC_STDLIB_RAND_H - -#include "types.h" - -s32 RandomNext(void) __asm__("rand"); - -#endif /* LOMBYTE_RNC_SDK_LIBC_STDLIB_RAND_H */ diff --git a/include/rnc/sdk/libc/stdlib/srand.h b/include/rnc/sdk/libc/stdlib/srand.h deleted file mode 100644 index b84c4fc6b9..0000000000 --- a/include/rnc/sdk/libc/stdlib/srand.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_STDLIB_SRAND_H -#define LOMBYTE_RNC_SDK_LIBC_STDLIB_SRAND_H - -#include "types.h" - -void srand(int) __asm__("func_001160C8"); - -#endif /* LOMBYTE_RNC_SDK_LIBC_STDLIB_SRAND_H */ diff --git a/include/rnc/sdk/libc/string.h b/include/rnc/sdk/libc/string.h new file mode 100644 index 0000000000..b6af4a3d2e --- /dev/null +++ b/include/rnc/sdk/libc/string.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_SDK_LIBC_STRING_H +#define LOMBYTE_RNC_SDK_LIBC_STRING_H + +#include "types.h" + +char *FindSubstring(char *, char *); + +#endif /* LOMBYTE_RNC_SDK_LIBC_STRING_H */ diff --git a/include/rnc/sdk/libc/string/find_substring.h b/include/rnc/sdk/libc/string/find_substring.h deleted file mode 100644 index fc6b3226c9..0000000000 --- a/include/rnc/sdk/libc/string/find_substring.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_LIBC_STRING_FIND_SUBSTRING_H -#define LOMBYTE_RNC_SDK_LIBC_STRING_FIND_SUBSTRING_H - -#include "types.h" - -char *FindSubstring(char *, char *); - -#endif /* LOMBYTE_RNC_SDK_LIBC_STRING_FIND_SUBSTRING_H */ diff --git a/include/rnc/sdk/mpeg/api.h b/include/rnc/sdk/mpeg/api.h new file mode 100644 index 0000000000..52c382abfb --- /dev/null +++ b/include/rnc/sdk/mpeg/api.h @@ -0,0 +1,24 @@ +#ifndef LOMBYTE_RNC_SDK_MPEG_API_H +#define LOMBYTE_RNC_SDK_MPEG_API_H + +#include "types.h" + +struct MpegContext; +struct MpegEvent; +struct MpegWorkArea; +struct ReadBuf; +struct VideoDec; +struct sceMpeg; + +s32 _dispatchMpegCallback(struct MpegContext *, struct MpegEvent *); +void DispatchMpegCallbackNoData(void *) __asm__("_dispatchMpegCbNodata"); +int reset_work_area(struct MpegWorkArea *) __asm__("func_0012BC10"); +s32 sceMpegDemuxPssRing(struct VideoDec *, u8 *, s32, struct ReadBuf *, s32); +s32 _sceMpegFlush(struct sceMpeg *); +int sceMpegGetPicture(struct sceMpeg *, void *, int); +void sceMpegInit(void); +s32 sceMpegIsEnd(struct sceMpeg *) __asm__("func_0012BA48"); +s32 sceMpegIsRefBuffEmpty(struct sceMpeg *) __asm__("func_0012BA58"); +void sceMpegReset(struct sceMpeg *); + +#endif /* LOMBYTE_RNC_SDK_MPEG_API_H */ diff --git a/include/rnc/sdk/mpeg/api/dispatch_mpeg_callback.h b/include/rnc/sdk/mpeg/api/dispatch_mpeg_callback.h deleted file mode 100644 index 497acd2f0a..0000000000 --- a/include/rnc/sdk/mpeg/api/dispatch_mpeg_callback.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_API_DISPATCH_MPEG_CALLBACK_H -#define LOMBYTE_RNC_SDK_MPEG_API_DISPATCH_MPEG_CALLBACK_H - -#include "types.h" - -struct MpegContext; -struct MpegEvent; - -s32 _dispatchMpegCallback(struct MpegContext *, struct MpegEvent *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_API_DISPATCH_MPEG_CALLBACK_H */ diff --git a/include/rnc/sdk/mpeg/api/dispatch_mpeg_cb_nodata.h b/include/rnc/sdk/mpeg/api/dispatch_mpeg_cb_nodata.h deleted file mode 100644 index c0fd1fa25b..0000000000 --- a/include/rnc/sdk/mpeg/api/dispatch_mpeg_cb_nodata.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_API_DISPATCH_MPEG_CB_NODATA_H -#define LOMBYTE_RNC_SDK_MPEG_API_DISPATCH_MPEG_CB_NODATA_H - -#include "types.h" - -void DispatchMpegCallbackNoData(void *) __asm__("_dispatchMpegCbNodata"); - -#endif /* LOMBYTE_RNC_SDK_MPEG_API_DISPATCH_MPEG_CB_NODATA_H */ diff --git a/include/rnc/sdk/mpeg/api/reset_work_area.h b/include/rnc/sdk/mpeg/api/reset_work_area.h deleted file mode 100644 index 32cde1f078..0000000000 --- a/include/rnc/sdk/mpeg/api/reset_work_area.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_API_RESET_WORK_AREA_H -#define LOMBYTE_RNC_SDK_MPEG_API_RESET_WORK_AREA_H - -#include "types.h" - -struct MpegWorkArea; - -int reset_work_area(struct MpegWorkArea *) __asm__("func_0012BC10"); - -#endif /* LOMBYTE_RNC_SDK_MPEG_API_RESET_WORK_AREA_H */ diff --git a/include/rnc/sdk/mpeg/api/sce_mpeg_demux_pss_ring.h b/include/rnc/sdk/mpeg/api/sce_mpeg_demux_pss_ring.h deleted file mode 100644 index d64b04c3a8..0000000000 --- a/include/rnc/sdk/mpeg/api/sce_mpeg_demux_pss_ring.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_DEMUX_PSS_RING_H -#define LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_DEMUX_PSS_RING_H - -#include "types.h" - -struct ReadBuf; -struct VideoDec; - -s32 sceMpegDemuxPssRing(struct VideoDec *, u8 *, s32, struct ReadBuf *, s32); - -#endif /* LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_DEMUX_PSS_RING_H */ diff --git a/include/rnc/sdk/mpeg/api/sce_mpeg_flush.h b/include/rnc/sdk/mpeg/api/sce_mpeg_flush.h deleted file mode 100644 index 817fbe9cba..0000000000 --- a/include/rnc/sdk/mpeg/api/sce_mpeg_flush.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_FLUSH_H -#define LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_FLUSH_H - -#include "types.h" - -struct sceMpeg; - -s32 _sceMpegFlush(struct sceMpeg *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_FLUSH_H */ diff --git a/include/rnc/sdk/mpeg/api/sce_mpeg_get_picture.h b/include/rnc/sdk/mpeg/api/sce_mpeg_get_picture.h deleted file mode 100644 index ab9641646f..0000000000 --- a/include/rnc/sdk/mpeg/api/sce_mpeg_get_picture.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_GET_PICTURE_H -#define LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_GET_PICTURE_H - -#include "types.h" - -struct sceMpeg; - -int sceMpegGetPicture(struct sceMpeg *, void *, int); - -#endif /* LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_GET_PICTURE_H */ diff --git a/include/rnc/sdk/mpeg/api/sce_mpeg_init.h b/include/rnc/sdk/mpeg/api/sce_mpeg_init.h deleted file mode 100644 index 5ea1018b7f..0000000000 --- a/include/rnc/sdk/mpeg/api/sce_mpeg_init.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_INIT_H -#define LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_INIT_H - -#include "types.h" - -void sceMpegInit(void); - -#endif /* LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_INIT_H */ diff --git a/include/rnc/sdk/mpeg/api/sce_mpeg_is_end.h b/include/rnc/sdk/mpeg/api/sce_mpeg_is_end.h deleted file mode 100644 index dc0bc57b5b..0000000000 --- a/include/rnc/sdk/mpeg/api/sce_mpeg_is_end.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_IS_END_H -#define LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_IS_END_H - -#include "types.h" - -struct sceMpeg; - -s32 sceMpegIsEnd(struct sceMpeg *) __asm__("func_0012BA48"); - -#endif /* LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_IS_END_H */ diff --git a/include/rnc/sdk/mpeg/api/sce_mpeg_is_ref_buff_empty.h b/include/rnc/sdk/mpeg/api/sce_mpeg_is_ref_buff_empty.h deleted file mode 100644 index b70cb411d3..0000000000 --- a/include/rnc/sdk/mpeg/api/sce_mpeg_is_ref_buff_empty.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_IS_REF_BUFF_EMPTY_H -#define LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_IS_REF_BUFF_EMPTY_H - -#include "types.h" - -struct sceMpeg; - -s32 sceMpegIsRefBuffEmpty(struct sceMpeg *) __asm__("func_0012BA58"); - -#endif /* LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_IS_REF_BUFF_EMPTY_H */ diff --git a/include/rnc/sdk/mpeg/api/sce_mpeg_reset.h b/include/rnc/sdk/mpeg/api/sce_mpeg_reset.h deleted file mode 100644 index 1fb7fd0302..0000000000 --- a/include/rnc/sdk/mpeg/api/sce_mpeg_reset.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_RESET_H -#define LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_RESET_H - -#include "types.h" - -struct sceMpeg; - -void sceMpegReset(struct sceMpeg *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_API_SCE_MPEG_RESET_H */ diff --git a/include/rnc/sdk/mpeg/bitstream.h b/include/rnc/sdk/mpeg/bitstream.h new file mode 100644 index 0000000000..bbca26adf6 --- /dev/null +++ b/include/rnc/sdk/mpeg/bitstream.h @@ -0,0 +1,12 @@ +#ifndef LOMBYTE_RNC_SDK_MPEG_BITSTREAM_H +#define LOMBYTE_RNC_SDK_MPEG_BITSTREAM_H + +#include "types.h" + +void _flushBuf(s32 *, s32); +s32 _peepBit(s32 *, s32); +s32 _nextBit(); +void _nextStartCode(s32 *); +s32 peek_bits(void *, s32) __asm__("SignExtendPackedValue"); + +#endif /* LOMBYTE_RNC_SDK_MPEG_BITSTREAM_H */ diff --git a/include/rnc/sdk/mpeg/bitstream/_flushBuf.h b/include/rnc/sdk/mpeg/bitstream/_flushBuf.h deleted file mode 100644 index abc53122b3..0000000000 --- a/include/rnc/sdk/mpeg/bitstream/_flushBuf.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_BITSTREAM__FLUSHBUF_H -#define LOMBYTE_RNC_SDK_MPEG_BITSTREAM__FLUSHBUF_H - -#include "types.h" - -void _flushBuf(s32 *, s32); - -#endif /* LOMBYTE_RNC_SDK_MPEG_BITSTREAM__FLUSHBUF_H */ diff --git a/include/rnc/sdk/mpeg/bitstream/_peepBit.h b/include/rnc/sdk/mpeg/bitstream/_peepBit.h deleted file mode 100644 index 10fed31cb3..0000000000 --- a/include/rnc/sdk/mpeg/bitstream/_peepBit.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_BITSTREAM__PEEPBIT_H -#define LOMBYTE_RNC_SDK_MPEG_BITSTREAM__PEEPBIT_H - -#include "types.h" - -s32 _peepBit(s32 *, s32); - -#endif /* LOMBYTE_RNC_SDK_MPEG_BITSTREAM__PEEPBIT_H */ diff --git a/include/rnc/sdk/mpeg/bitstream/nextbit.h b/include/rnc/sdk/mpeg/bitstream/nextbit.h deleted file mode 100644 index a39a146b3f..0000000000 --- a/include/rnc/sdk/mpeg/bitstream/nextbit.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_BITSTREAM_NEXTBIT_H -#define LOMBYTE_RNC_SDK_MPEG_BITSTREAM_NEXTBIT_H - -#include "types.h" - -s32 _nextBit(); - -#endif /* LOMBYTE_RNC_SDK_MPEG_BITSTREAM_NEXTBIT_H */ diff --git a/include/rnc/sdk/mpeg/bitstream/nextstartcode.h b/include/rnc/sdk/mpeg/bitstream/nextstartcode.h deleted file mode 100644 index f913e9f2ea..0000000000 --- a/include/rnc/sdk/mpeg/bitstream/nextstartcode.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_BITSTREAM_NEXTSTARTCODE_H -#define LOMBYTE_RNC_SDK_MPEG_BITSTREAM_NEXTSTARTCODE_H - -#include "types.h" - -void _nextStartCode(s32 *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_BITSTREAM_NEXTSTARTCODE_H */ diff --git a/include/rnc/sdk/mpeg/bitstream/peek_bits.h b/include/rnc/sdk/mpeg/bitstream/peek_bits.h deleted file mode 100644 index 66f09eafeb..0000000000 --- a/include/rnc/sdk/mpeg/bitstream/peek_bits.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_BITSTREAM_PEEK_BITS_H -#define LOMBYTE_RNC_SDK_MPEG_BITSTREAM_PEEK_BITS_H - -#include "types.h" - -s32 peek_bits(void *, s32) __asm__("SignExtendPackedValue"); - -#endif /* LOMBYTE_RNC_SDK_MPEG_BITSTREAM_PEEK_BITS_H */ diff --git a/include/rnc/sdk/mpeg/demux/_getPtsDtsFlags.h b/include/rnc/sdk/mpeg/demux.h similarity index 56% rename from include/rnc/sdk/mpeg/demux/_getPtsDtsFlags.h rename to include/rnc/sdk/mpeg/demux.h index 01a4bc3732..b3d6c8a7fa 100644 --- a/include/rnc/sdk/mpeg/demux/_getPtsDtsFlags.h +++ b/include/rnc/sdk/mpeg/demux.h @@ -1,15 +1,21 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_DEMUX__GETPTSDTSFLAGS_H -#define LOMBYTE_RNC_SDK_MPEG_DEMUX__GETPTSDTSFLAGS_H +#ifndef LOMBYTE_RNC_SDK_MPEG_DEMUX_H +#define LOMBYTE_RNC_SDK_MPEG_DEMUX_H #include "types.h" struct MpegPictureTimestampRecord; struct MpegTimestampState; +struct PES_BS; +struct PES_HDR; +struct PackHeaderInfo; +s32 _PES_packet(s32, struct PES_BS *, struct PES_HDR *); void GetMpegPictureTimestampsAndFlags(struct MpegTimestampState *, struct MpegPictureTimestampRecord *, s64 *, s64 *, s64 *) __asm__("_getPtsDtsFlags"); +s32 _pack_header(s32, struct PackHeaderInfo *); +u64 _type2id(s32, s32); -#endif /* LOMBYTE_RNC_SDK_MPEG_DEMUX__GETPTSDTSFLAGS_H */ +#endif /* LOMBYTE_RNC_SDK_MPEG_DEMUX_H */ diff --git a/include/rnc/sdk/mpeg/demux/_PES_packet.h b/include/rnc/sdk/mpeg/demux/_PES_packet.h deleted file mode 100644 index ee7ddca2ce..0000000000 --- a/include/rnc/sdk/mpeg/demux/_PES_packet.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_DEMUX__PES_PACKET_H -#define LOMBYTE_RNC_SDK_MPEG_DEMUX__PES_PACKET_H - -#include "types.h" - -struct PES_BS; -struct PES_HDR; - -s32 _PES_packet(s32, struct PES_BS *, struct PES_HDR *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_DEMUX__PES_PACKET_H */ diff --git a/include/rnc/sdk/mpeg/demux/_pack_header.h b/include/rnc/sdk/mpeg/demux/_pack_header.h deleted file mode 100644 index 0fd8b64aa8..0000000000 --- a/include/rnc/sdk/mpeg/demux/_pack_header.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_DEMUX__PACK_HEADER_H -#define LOMBYTE_RNC_SDK_MPEG_DEMUX__PACK_HEADER_H - -#include "types.h" - -struct PackHeaderInfo; - -s32 _pack_header(s32, struct PackHeaderInfo *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_DEMUX__PACK_HEADER_H */ diff --git a/include/rnc/sdk/mpeg/demux/type2id.h b/include/rnc/sdk/mpeg/demux/type2id.h deleted file mode 100644 index 4b862f4bf9..0000000000 --- a/include/rnc/sdk/mpeg/demux/type2id.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_DEMUX_TYPE2ID_H -#define LOMBYTE_RNC_SDK_MPEG_DEMUX_TYPE2ID_H - -#include "types.h" - -u64 _type2id(s32, s32); - -#endif /* LOMBYTE_RNC_SDK_MPEG_DEMUX_TYPE2ID_H */ diff --git a/include/rnc/sdk/mpeg/errors.h b/include/rnc/sdk/mpeg/errors.h new file mode 100644 index 0000000000..db21a2d8ca --- /dev/null +++ b/include/rnc/sdk/mpeg/errors.h @@ -0,0 +1,10 @@ +#ifndef LOMBYTE_RNC_SDK_MPEG_ERRORS_H +#define LOMBYTE_RNC_SDK_MPEG_ERRORS_H + +#include "types.h" + +struct ErrorContext; + +void _Error(struct ErrorContext *, int); + +#endif /* LOMBYTE_RNC_SDK_MPEG_ERRORS_H */ diff --git a/include/rnc/sdk/mpeg/errors/_Error.h b/include/rnc/sdk/mpeg/errors/_Error.h deleted file mode 100644 index e65d7250c9..0000000000 --- a/include/rnc/sdk/mpeg/errors/_Error.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_ERRORS__ERROR_H -#define LOMBYTE_RNC_SDK_MPEG_ERRORS__ERROR_H - -#include "types.h" - -struct ErrorContext; - -void _Error(struct ErrorContext *, int); - -#endif /* LOMBYTE_RNC_SDK_MPEG_ERRORS__ERROR_H */ diff --git a/include/rnc/sdk/mpeg/headers.h b/include/rnc/sdk/mpeg/headers.h new file mode 100644 index 0000000000..63aad14a64 --- /dev/null +++ b/include/rnc/sdk/mpeg/headers.h @@ -0,0 +1,15 @@ +#ifndef LOMBYTE_RNC_SDK_MPEG_HEADERS_H +#define LOMBYTE_RNC_SDK_MPEG_HEADERS_H + +#include "types.h" + +struct MpegDecoder; +struct sceMpeg; + +void _extensionAndUserData(void *); +void ExtraInfo(void *) __asm__("_extrainfo"); +s32 _nextHeader(); +void _setDefaultQM(struct MpegDecoder *, s32, u32); +void func_0012C4C8(struct sceMpeg *); + +#endif /* LOMBYTE_RNC_SDK_MPEG_HEADERS_H */ diff --git a/include/rnc/sdk/mpeg/headers/_extensionAndUserData.h b/include/rnc/sdk/mpeg/headers/_extensionAndUserData.h deleted file mode 100644 index a6a9254a64..0000000000 --- a/include/rnc/sdk/mpeg/headers/_extensionAndUserData.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_HEADERS__EXTENSIONANDUSERDATA_H -#define LOMBYTE_RNC_SDK_MPEG_HEADERS__EXTENSIONANDUSERDATA_H - -#include "types.h" - -void _extensionAndUserData(void *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_HEADERS__EXTENSIONANDUSERDATA_H */ diff --git a/include/rnc/sdk/mpeg/headers/extrainfo.h b/include/rnc/sdk/mpeg/headers/extrainfo.h deleted file mode 100644 index 2c10aa994f..0000000000 --- a/include/rnc/sdk/mpeg/headers/extrainfo.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_HEADERS_EXTRAINFO_H -#define LOMBYTE_RNC_SDK_MPEG_HEADERS_EXTRAINFO_H - -#include "types.h" - -void ExtraInfo(void *) __asm__("_extrainfo"); - -#endif /* LOMBYTE_RNC_SDK_MPEG_HEADERS_EXTRAINFO_H */ diff --git a/include/rnc/sdk/mpeg/headers/next_header.h b/include/rnc/sdk/mpeg/headers/next_header.h deleted file mode 100644 index f84ff663dd..0000000000 --- a/include/rnc/sdk/mpeg/headers/next_header.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_HEADERS_NEXT_HEADER_H -#define LOMBYTE_RNC_SDK_MPEG_HEADERS_NEXT_HEADER_H - -#include "types.h" - -s32 _nextHeader(); - -#endif /* LOMBYTE_RNC_SDK_MPEG_HEADERS_NEXT_HEADER_H */ diff --git a/include/rnc/sdk/mpeg/headers/setdefaultqm.h b/include/rnc/sdk/mpeg/headers/setdefaultqm.h deleted file mode 100644 index bb2be953d5..0000000000 --- a/include/rnc/sdk/mpeg/headers/setdefaultqm.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_HEADERS_SETDEFAULTQM_H -#define LOMBYTE_RNC_SDK_MPEG_HEADERS_SETDEFAULTQM_H - -#include "types.h" - -struct MpegDecoder; - -void _setDefaultQM(struct MpegDecoder *, s32, u32); - -#endif /* LOMBYTE_RNC_SDK_MPEG_HEADERS_SETDEFAULTQM_H */ diff --git a/include/rnc/sdk/mpeg/headers/update_mpeg_frame_size.h b/include/rnc/sdk/mpeg/headers/update_mpeg_frame_size.h deleted file mode 100644 index 26232b11d7..0000000000 --- a/include/rnc/sdk/mpeg/headers/update_mpeg_frame_size.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_HEADERS_UPDATE_MPEG_FRAME_SIZE_H -#define LOMBYTE_RNC_SDK_MPEG_HEADERS_UPDATE_MPEG_FRAME_SIZE_H - -#include "types.h" - -struct sceMpeg; - -void func_0012C4C8(struct sceMpeg *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_HEADERS_UPDATE_MPEG_FRAME_SIZE_H */ diff --git a/include/rnc/sdk/mpeg/macroblock.h b/include/rnc/sdk/mpeg/macroblock.h new file mode 100644 index 0000000000..781b47ffea --- /dev/null +++ b/include/rnc/sdk/mpeg/macroblock.h @@ -0,0 +1,26 @@ +#ifndef LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_H +#define LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_H + +#include "types.h" + +struct MotionVector; +struct MotionVectorStore; +struct MpegCopyParams; +struct MpegDecoder; +struct MpegMbState; +struct MpegMotionRef; +struct MpegMotionState; +struct MpegSkipState; +struct MpegSliceDecoder; + +int _decMB0(struct MpegDecoder *, int *, int *, int *, struct MpegMbState *, int *, int); +s32 _slice0(struct MpegDecoder *, s32); +void _cpr8(struct MpegDecoder *, struct MpegCopyParams *); +void _doMC(struct MpegDecoder *, s32); +s32 _mbAddressIncrement(); +void _motionVector(s32, struct MotionVector *, struct MotionVectorStore *, s32, s32, s32, s32, s32); +void _motionVectors(); +s32 _skipMB0(struct MpegDecoder *, struct MpegSkipState *, s32 *, struct MpegMotionRef *, s32 *); +s32 _sliceA0(struct MpegSliceDecoder *, s32, s32 *, s32 *, volatile struct MpegMotionState *); + +#endif /* LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_H */ diff --git a/include/rnc/sdk/mpeg/macroblock/_decMB0.h b/include/rnc/sdk/mpeg/macroblock/_decMB0.h deleted file mode 100644 index 1db0171bf4..0000000000 --- a/include/rnc/sdk/mpeg/macroblock/_decMB0.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_MACROBLOCK__DECMB0_H -#define LOMBYTE_RNC_SDK_MPEG_MACROBLOCK__DECMB0_H - -#include "types.h" - -struct MpegDecoder; -struct MpegMbState; - -int _decMB0(struct MpegDecoder *, int *, int *, int *, struct MpegMbState *, int *, int); - -#endif /* LOMBYTE_RNC_SDK_MPEG_MACROBLOCK__DECMB0_H */ diff --git a/include/rnc/sdk/mpeg/macroblock/_slice0.h b/include/rnc/sdk/mpeg/macroblock/_slice0.h deleted file mode 100644 index a39fac25d9..0000000000 --- a/include/rnc/sdk/mpeg/macroblock/_slice0.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_MACROBLOCK__SLICE0_H -#define LOMBYTE_RNC_SDK_MPEG_MACROBLOCK__SLICE0_H - -#include "types.h" - -struct MpegDecoder; - -s32 _slice0(struct MpegDecoder *, s32); - -#endif /* LOMBYTE_RNC_SDK_MPEG_MACROBLOCK__SLICE0_H */ diff --git a/include/rnc/sdk/mpeg/macroblock/cpr8.h b/include/rnc/sdk/mpeg/macroblock/cpr8.h deleted file mode 100644 index d3023ece8e..0000000000 --- a/include/rnc/sdk/mpeg/macroblock/cpr8.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_CPR8_H -#define LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_CPR8_H - -#include "types.h" - -struct MpegCopyParams; -struct MpegDecoder; - -void _cpr8(struct MpegDecoder *, struct MpegCopyParams *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_CPR8_H */ diff --git a/include/rnc/sdk/mpeg/macroblock/domc.h b/include/rnc/sdk/mpeg/macroblock/domc.h deleted file mode 100644 index f0126b5a07..0000000000 --- a/include/rnc/sdk/mpeg/macroblock/domc.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_DOMC_H -#define LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_DOMC_H - -#include "types.h" - -struct MpegDecoder; - -void _doMC(struct MpegDecoder *, s32); - -#endif /* LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_DOMC_H */ diff --git a/include/rnc/sdk/mpeg/macroblock/mb_address_increment.h b/include/rnc/sdk/mpeg/macroblock/mb_address_increment.h deleted file mode 100644 index c7deed5f35..0000000000 --- a/include/rnc/sdk/mpeg/macroblock/mb_address_increment.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_MB_ADDRESS_INCREMENT_H -#define LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_MB_ADDRESS_INCREMENT_H - -#include "types.h" - -s32 _mbAddressIncrement(); - -#endif /* LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_MB_ADDRESS_INCREMENT_H */ diff --git a/include/rnc/sdk/mpeg/macroblock/motion_vector.h b/include/rnc/sdk/mpeg/macroblock/motion_vector.h deleted file mode 100644 index b41c26d28b..0000000000 --- a/include/rnc/sdk/mpeg/macroblock/motion_vector.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_MOTION_VECTOR_H -#define LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_MOTION_VECTOR_H - -#include "types.h" - -struct MotionVector; -struct MotionVectorStore; - -void _motionVector(s32, struct MotionVector *, struct MotionVectorStore *, s32, s32, s32, s32, s32); - -#endif /* LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_MOTION_VECTOR_H */ diff --git a/include/rnc/sdk/mpeg/macroblock/motion_vectors.h b/include/rnc/sdk/mpeg/macroblock/motion_vectors.h deleted file mode 100644 index a7ad12c09a..0000000000 --- a/include/rnc/sdk/mpeg/macroblock/motion_vectors.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_MOTION_VECTORS_H -#define LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_MOTION_VECTORS_H - -#include "types.h" - -void _motionVectors(); - -#endif /* LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_MOTION_VECTORS_H */ diff --git a/include/rnc/sdk/mpeg/macroblock/skip_mb0.h b/include/rnc/sdk/mpeg/macroblock/skip_mb0.h deleted file mode 100644 index eb925b5c77..0000000000 --- a/include/rnc/sdk/mpeg/macroblock/skip_mb0.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_SKIP_MB0_H -#define LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_SKIP_MB0_H - -#include "types.h" - -struct MpegDecoder; -struct MpegMotionRef; -struct MpegSkipState; - -s32 _skipMB0(struct MpegDecoder *, struct MpegSkipState *, s32 *, struct MpegMotionRef *, s32 *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_SKIP_MB0_H */ diff --git a/include/rnc/sdk/mpeg/macroblock/slicea0.h b/include/rnc/sdk/mpeg/macroblock/slicea0.h deleted file mode 100644 index e1f83d0cc7..0000000000 --- a/include/rnc/sdk/mpeg/macroblock/slicea0.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_SLICEA0_H -#define LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_SLICEA0_H - -#include "types.h" - -struct MpegMotionState; -struct MpegSliceDecoder; - -s32 _sliceA0(struct MpegSliceDecoder *, s32, s32 *, s32 *, volatile struct MpegMotionState *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_MACROBLOCK_SLICEA0_H */ diff --git a/include/rnc/sdk/mpeg/picture.h b/include/rnc/sdk/mpeg/picture.h new file mode 100644 index 0000000000..abfde57abb --- /dev/null +++ b/include/rnc/sdk/mpeg/picture.h @@ -0,0 +1,19 @@ +#ifndef LOMBYTE_RNC_SDK_MPEG_PICTURE_H +#define LOMBYTE_RNC_SDK_MPEG_PICTURE_H + +#include "types.h" + +struct MpegDecoder; +struct MpegDecoderState; +struct sceMpeg; + +void _clearEach(u8 *); +s32 _decodeOrSkipField(struct sceMpeg *, s32, s32); +s32 _decodeOrSkipFrame(struct sceMpeg *, s32, s32); +s32 _getpic(struct sceMpeg *); +void _lastFrame(struct MpegDecoder *); +s32 _pictureData0(); +s32 _decPicture(struct MpegDecoderState *); +void UpdateTempTrackData(struct MpegDecoder *, s32); + +#endif /* LOMBYTE_RNC_SDK_MPEG_PICTURE_H */ diff --git a/include/rnc/sdk/mpeg/picture/_clearEach.h b/include/rnc/sdk/mpeg/picture/_clearEach.h deleted file mode 100644 index 91814bb1c7..0000000000 --- a/include/rnc/sdk/mpeg/picture/_clearEach.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_PICTURE__CLEAREACH_H -#define LOMBYTE_RNC_SDK_MPEG_PICTURE__CLEAREACH_H - -#include "types.h" - -void _clearEach(u8 *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_PICTURE__CLEAREACH_H */ diff --git a/include/rnc/sdk/mpeg/picture/_decodeOrSkipField.h b/include/rnc/sdk/mpeg/picture/_decodeOrSkipField.h deleted file mode 100644 index 46ceab8473..0000000000 --- a/include/rnc/sdk/mpeg/picture/_decodeOrSkipField.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_PICTURE__DECODEORSKIPFIELD_H -#define LOMBYTE_RNC_SDK_MPEG_PICTURE__DECODEORSKIPFIELD_H - -#include "types.h" - -struct sceMpeg; - -s32 _decodeOrSkipField(struct sceMpeg *, s32, s32); - -#endif /* LOMBYTE_RNC_SDK_MPEG_PICTURE__DECODEORSKIPFIELD_H */ diff --git a/include/rnc/sdk/mpeg/picture/_decodeOrSkipFrame.h b/include/rnc/sdk/mpeg/picture/_decodeOrSkipFrame.h deleted file mode 100644 index af90332d94..0000000000 --- a/include/rnc/sdk/mpeg/picture/_decodeOrSkipFrame.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_PICTURE__DECODEORSKIPFRAME_H -#define LOMBYTE_RNC_SDK_MPEG_PICTURE__DECODEORSKIPFRAME_H - -#include "types.h" - -struct sceMpeg; - -s32 _decodeOrSkipFrame(struct sceMpeg *, s32, s32); - -#endif /* LOMBYTE_RNC_SDK_MPEG_PICTURE__DECODEORSKIPFRAME_H */ diff --git a/include/rnc/sdk/mpeg/picture/_getpic.h b/include/rnc/sdk/mpeg/picture/_getpic.h deleted file mode 100644 index 287c763cf8..0000000000 --- a/include/rnc/sdk/mpeg/picture/_getpic.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_PICTURE__GETPIC_H -#define LOMBYTE_RNC_SDK_MPEG_PICTURE__GETPIC_H - -#include "types.h" - -struct sceMpeg; - -s32 _getpic(struct sceMpeg *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_PICTURE__GETPIC_H */ diff --git a/include/rnc/sdk/mpeg/picture/_lastFrame.h b/include/rnc/sdk/mpeg/picture/_lastFrame.h deleted file mode 100644 index 1debe48187..0000000000 --- a/include/rnc/sdk/mpeg/picture/_lastFrame.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_PICTURE__LASTFRAME_H -#define LOMBYTE_RNC_SDK_MPEG_PICTURE__LASTFRAME_H - -#include "types.h" - -struct MpegDecoder; - -void _lastFrame(struct MpegDecoder *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_PICTURE__LASTFRAME_H */ diff --git a/include/rnc/sdk/mpeg/picture/_pictureData0.h b/include/rnc/sdk/mpeg/picture/_pictureData0.h deleted file mode 100644 index f07532f238..0000000000 --- a/include/rnc/sdk/mpeg/picture/_pictureData0.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_PICTURE__PICTUREDATA0_H -#define LOMBYTE_RNC_SDK_MPEG_PICTURE__PICTUREDATA0_H - -#include "types.h" - -s32 _pictureData0(); - -#endif /* LOMBYTE_RNC_SDK_MPEG_PICTURE__PICTUREDATA0_H */ diff --git a/include/rnc/sdk/mpeg/picture/decpicture.h b/include/rnc/sdk/mpeg/picture/decpicture.h deleted file mode 100644 index 9ad1429840..0000000000 --- a/include/rnc/sdk/mpeg/picture/decpicture.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_PICTURE_DECPICTURE_H -#define LOMBYTE_RNC_SDK_MPEG_PICTURE_DECPICTURE_H - -#include "types.h" - -struct MpegDecoderState; - -s32 _decPicture(struct MpegDecoderState *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_PICTURE_DECPICTURE_H */ diff --git a/include/rnc/sdk/mpeg/picture/update_temp_track_data.h b/include/rnc/sdk/mpeg/picture/update_temp_track_data.h deleted file mode 100644 index ad5db6a7fb..0000000000 --- a/include/rnc/sdk/mpeg/picture/update_temp_track_data.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_PICTURE_UPDATE_TEMP_TRACK_DATA_H -#define LOMBYTE_RNC_SDK_MPEG_PICTURE_UPDATE_TEMP_TRACK_DATA_H - -#include "types.h" - -struct MpegDecoder; - -void UpdateTempTrackData(struct MpegDecoder *, s32); - -#endif /* LOMBYTE_RNC_SDK_MPEG_PICTURE_UPDATE_TEMP_TRACK_DATA_H */ diff --git a/include/rnc/sdk/mpeg/ref_images.h b/include/rnc/sdk/mpeg/ref_images.h new file mode 100644 index 0000000000..17057cb054 --- /dev/null +++ b/include/rnc/sdk/mpeg/ref_images.h @@ -0,0 +1,32 @@ +#ifndef LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_H +#define LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_H + +#include "types.h" + +struct MpegDecoder; +struct MpegRefImage; +struct MpegReferenceState; + +void _getRef0( + struct MpegDecoder *, struct MpegRefImage *, int, int, int, int, int, int, int, int, int, int); +s32 UpdateMpegReferenceImages(struct MpegReferenceState *, s32) __asm__("_updateRefImage"); +s32 _csc_storeRefImage(); +void _initRefImages(unsigned int *, + unsigned int *, + unsigned int *, + unsigned int *, + unsigned int *, + unsigned int *, + unsigned int *, + unsigned int *, + unsigned int *, + void *, + void *, + void *, + int, + int); +s32 InitializeReferenceImage(); +s32 _isOutSizeOK(struct MpegDecoder *, struct MpegRefImage *); +void _outputFrame(struct MpegDecoder *, s32, s32); + +#endif /* LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_H */ diff --git a/include/rnc/sdk/mpeg/ref_images/_getRef0.h b/include/rnc/sdk/mpeg/ref_images/_getRef0.h deleted file mode 100644 index 53f9b13f1e..0000000000 --- a/include/rnc/sdk/mpeg/ref_images/_getRef0.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_REF_IMAGES__GETREF0_H -#define LOMBYTE_RNC_SDK_MPEG_REF_IMAGES__GETREF0_H - -#include "types.h" - -struct MpegDecoder; -struct MpegRefImage; - -void _getRef0( - struct MpegDecoder *, struct MpegRefImage *, int, int, int, int, int, int, int, int, int, int); - -#endif /* LOMBYTE_RNC_SDK_MPEG_REF_IMAGES__GETREF0_H */ diff --git a/include/rnc/sdk/mpeg/ref_images/_updateRefImage.h b/include/rnc/sdk/mpeg/ref_images/_updateRefImage.h deleted file mode 100644 index 0e8d408220..0000000000 --- a/include/rnc/sdk/mpeg/ref_images/_updateRefImage.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_REF_IMAGES__UPDATEREFIMAGE_H -#define LOMBYTE_RNC_SDK_MPEG_REF_IMAGES__UPDATEREFIMAGE_H - -#include "types.h" - -struct MpegReferenceState; - -s32 UpdateMpegReferenceImages(struct MpegReferenceState *, s32) __asm__("_updateRefImage"); - -#endif /* LOMBYTE_RNC_SDK_MPEG_REF_IMAGES__UPDATEREFIMAGE_H */ diff --git a/include/rnc/sdk/mpeg/ref_images/csc_store_ref_image.h b/include/rnc/sdk/mpeg/ref_images/csc_store_ref_image.h deleted file mode 100644 index 5780363367..0000000000 --- a/include/rnc/sdk/mpeg/ref_images/csc_store_ref_image.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_CSC_STORE_REF_IMAGE_H -#define LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_CSC_STORE_REF_IMAGE_H - -#include "types.h" - -s32 _csc_storeRefImage(); - -#endif /* LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_CSC_STORE_REF_IMAGE_H */ diff --git a/include/rnc/sdk/mpeg/ref_images/init_ref_images.h b/include/rnc/sdk/mpeg/ref_images/init_ref_images.h deleted file mode 100644 index 398c4a3029..0000000000 --- a/include/rnc/sdk/mpeg/ref_images/init_ref_images.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_INIT_REF_IMAGES_H -#define LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_INIT_REF_IMAGES_H - -#include "types.h" - -void _initRefImages(unsigned int *, - unsigned int *, - unsigned int *, - unsigned int *, - unsigned int *, - unsigned int *, - unsigned int *, - unsigned int *, - unsigned int *, - void *, - void *, - void *, - int, - int); - -#endif /* LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_INIT_REF_IMAGES_H */ diff --git a/include/rnc/sdk/mpeg/ref_images/initialize_reference_image.h b/include/rnc/sdk/mpeg/ref_images/initialize_reference_image.h deleted file mode 100644 index bb79dd1a0c..0000000000 --- a/include/rnc/sdk/mpeg/ref_images/initialize_reference_image.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_INITIALIZE_REFERENCE_IMAGE_H -#define LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_INITIALIZE_REFERENCE_IMAGE_H - -#include "types.h" - -s32 InitializeReferenceImage(); - -#endif /* LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_INITIALIZE_REFERENCE_IMAGE_H */ diff --git a/include/rnc/sdk/mpeg/ref_images/is_out_size_ok.h b/include/rnc/sdk/mpeg/ref_images/is_out_size_ok.h deleted file mode 100644 index 4f45668aed..0000000000 --- a/include/rnc/sdk/mpeg/ref_images/is_out_size_ok.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_IS_OUT_SIZE_OK_H -#define LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_IS_OUT_SIZE_OK_H - -#include "types.h" - -struct MpegDecoder; -struct MpegRefImage; - -s32 _isOutSizeOK(struct MpegDecoder *, struct MpegRefImage *); - -#endif /* LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_IS_OUT_SIZE_OK_H */ diff --git a/include/rnc/sdk/mpeg/ref_images/outputframe.h b/include/rnc/sdk/mpeg/ref_images/outputframe.h deleted file mode 100644 index b57cd139f6..0000000000 --- a/include/rnc/sdk/mpeg/ref_images/outputframe.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_OUTPUTFRAME_H -#define LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_OUTPUTFRAME_H - -#include "types.h" - -struct MpegDecoder; - -void _outputFrame(struct MpegDecoder *, s32, s32); - -#endif /* LOMBYTE_RNC_SDK_MPEG_REF_IMAGES_OUTPUTFRAME_H */ diff --git a/include/rnc/sdk/rpc/cmd.h b/include/rnc/sdk/rpc/cmd.h new file mode 100644 index 0000000000..d30e76e9fe --- /dev/null +++ b/include/rnc/sdk/rpc/cmd.h @@ -0,0 +1,15 @@ +#ifndef LOMBYTE_RNC_SDK_RPC_CMD_H +#define LOMBYTE_RNC_SDK_RPC_CMD_H + +#include "types.h" + +void sceSifAddCmdHandler(s32, u32, u32); +s32 _sceSifCmdIntrHdlr(void); +void sceSifExitCmd(void); +int sceSifGetSreg(int) __asm__("func_0011A458"); +void sceSifInitCmd(void); +void sceSifRemoveCmdHandler(s32); +s32 _sceSifSendCmd(void *, s32, void *, void *, s32, void *, s32); +s32 sceSifSendCmd(void *, void *, void *, s32, void *, s32); + +#endif /* LOMBYTE_RNC_SDK_RPC_CMD_H */ diff --git a/include/rnc/sdk/rpc/cmd/sce_sif_add_cmd_handler.h b/include/rnc/sdk/rpc/cmd/sce_sif_add_cmd_handler.h deleted file mode 100644 index ab25fdb294..0000000000 --- a/include/rnc/sdk/rpc/cmd/sce_sif_add_cmd_handler.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_ADD_CMD_HANDLER_H -#define LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_ADD_CMD_HANDLER_H - -#include "types.h" - -void sceSifAddCmdHandler(s32, u32, u32); - -#endif /* LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_ADD_CMD_HANDLER_H */ diff --git a/include/rnc/sdk/rpc/cmd/sce_sif_cmd_intr_hdlr.h b/include/rnc/sdk/rpc/cmd/sce_sif_cmd_intr_hdlr.h deleted file mode 100644 index 7f8516c9dd..0000000000 --- a/include/rnc/sdk/rpc/cmd/sce_sif_cmd_intr_hdlr.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_CMD_INTR_HDLR_H -#define LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_CMD_INTR_HDLR_H - -#include "types.h" - -s32 _sceSifCmdIntrHdlr(void); - -#endif /* LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_CMD_INTR_HDLR_H */ diff --git a/include/rnc/sdk/rpc/cmd/sce_sif_exit_cmd.h b/include/rnc/sdk/rpc/cmd/sce_sif_exit_cmd.h deleted file mode 100644 index 174d107ca1..0000000000 --- a/include/rnc/sdk/rpc/cmd/sce_sif_exit_cmd.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_EXIT_CMD_H -#define LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_EXIT_CMD_H - -#include "types.h" - -void sceSifExitCmd(void); - -#endif /* LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_EXIT_CMD_H */ diff --git a/include/rnc/sdk/rpc/cmd/sce_sif_get_sreg.h b/include/rnc/sdk/rpc/cmd/sce_sif_get_sreg.h deleted file mode 100644 index 56e45487f2..0000000000 --- a/include/rnc/sdk/rpc/cmd/sce_sif_get_sreg.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_GET_SREG_H -#define LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_GET_SREG_H - -#include "types.h" - -int sceSifGetSreg(int) __asm__("func_0011A458"); - -#endif /* LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_GET_SREG_H */ diff --git a/include/rnc/sdk/rpc/cmd/sce_sif_init_cmd.h b/include/rnc/sdk/rpc/cmd/sce_sif_init_cmd.h deleted file mode 100644 index 155da5110c..0000000000 --- a/include/rnc/sdk/rpc/cmd/sce_sif_init_cmd.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_INIT_CMD_H -#define LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_INIT_CMD_H - -#include "types.h" - -void sceSifInitCmd(void); - -#endif /* LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_INIT_CMD_H */ diff --git a/include/rnc/sdk/rpc/cmd/sce_sif_remove_cmd_handler.h b/include/rnc/sdk/rpc/cmd/sce_sif_remove_cmd_handler.h deleted file mode 100644 index e07d8734b0..0000000000 --- a/include/rnc/sdk/rpc/cmd/sce_sif_remove_cmd_handler.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_REMOVE_CMD_HANDLER_H -#define LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_REMOVE_CMD_HANDLER_H - -#include "types.h" - -void sceSifRemoveCmdHandler(s32); - -#endif /* LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_REMOVE_CMD_HANDLER_H */ diff --git a/include/rnc/sdk/rpc/cmd/sce_sif_send_cmd.h b/include/rnc/sdk/rpc/cmd/sce_sif_send_cmd.h deleted file mode 100644 index 94ca41c64e..0000000000 --- a/include/rnc/sdk/rpc/cmd/sce_sif_send_cmd.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_SEND_CMD_H -#define LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_SEND_CMD_H - -#include "types.h" - -s32 _sceSifSendCmd(void *, s32, void *, void *, s32, void *, s32); - -#endif /* LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_SEND_CMD_H */ diff --git a/include/rnc/sdk/rpc/cmd/sce_sif_send_cmd_public.h b/include/rnc/sdk/rpc/cmd/sce_sif_send_cmd_public.h deleted file mode 100644 index f45f093f8f..0000000000 --- a/include/rnc/sdk/rpc/cmd/sce_sif_send_cmd_public.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_SEND_CMD_PUBLIC_H -#define LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_SEND_CMD_PUBLIC_H - -#include "types.h" - -s32 sceSifSendCmd(void *, void *, void *, s32, void *, s32); - -#endif /* LOMBYTE_RNC_SDK_RPC_CMD_SCE_SIF_SEND_CMD_PUBLIC_H */ diff --git a/include/rnc/sdk/rpc/iop.h b/include/rnc/sdk/rpc/iop.h new file mode 100644 index 0000000000..9e320fb0b4 --- /dev/null +++ b/include/rnc/sdk/rpc/iop.h @@ -0,0 +1,12 @@ +#ifndef LOMBYTE_RNC_SDK_RPC_IOP_H +#define LOMBYTE_RNC_SDK_RPC_IOP_H + +#include "types.h" + +s32 sceSifInitIopHeap(void); +s32 _sceSifLoadModuleBuffer(s32, s32, s32, s32 *); +s32 sceSifRebootIop(const char *); +s32 sceSifResetIop(const char *, s32); +int sceSifSyncIop(void); + +#endif /* LOMBYTE_RNC_SDK_RPC_IOP_H */ diff --git a/include/rnc/sdk/rpc/iop/sce_sif_init_iop_heap.h b/include/rnc/sdk/rpc/iop/sce_sif_init_iop_heap.h deleted file mode 100644 index 702c64e4b6..0000000000 --- a/include/rnc/sdk/rpc/iop/sce_sif_init_iop_heap.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_IOP_SCE_SIF_INIT_IOP_HEAP_H -#define LOMBYTE_RNC_SDK_RPC_IOP_SCE_SIF_INIT_IOP_HEAP_H - -#include "types.h" - -s32 sceSifInitIopHeap(void); - -#endif /* LOMBYTE_RNC_SDK_RPC_IOP_SCE_SIF_INIT_IOP_HEAP_H */ diff --git a/include/rnc/sdk/rpc/iop/sce_sif_load_module_buffer.h b/include/rnc/sdk/rpc/iop/sce_sif_load_module_buffer.h deleted file mode 100644 index f39caff433..0000000000 --- a/include/rnc/sdk/rpc/iop/sce_sif_load_module_buffer.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_IOP_SCE_SIF_LOAD_MODULE_BUFFER_H -#define LOMBYTE_RNC_SDK_RPC_IOP_SCE_SIF_LOAD_MODULE_BUFFER_H - -#include "types.h" - -s32 _sceSifLoadModuleBuffer(s32, s32, s32, s32 *); - -#endif /* LOMBYTE_RNC_SDK_RPC_IOP_SCE_SIF_LOAD_MODULE_BUFFER_H */ diff --git a/include/rnc/sdk/rpc/iop/sce_sif_reboot_iop.h b/include/rnc/sdk/rpc/iop/sce_sif_reboot_iop.h deleted file mode 100644 index 4d393bdaff..0000000000 --- a/include/rnc/sdk/rpc/iop/sce_sif_reboot_iop.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_IOP_SCE_SIF_REBOOT_IOP_H -#define LOMBYTE_RNC_SDK_RPC_IOP_SCE_SIF_REBOOT_IOP_H - -#include "types.h" - -s32 sceSifRebootIop(const char *); - -#endif /* LOMBYTE_RNC_SDK_RPC_IOP_SCE_SIF_REBOOT_IOP_H */ diff --git a/include/rnc/sdk/rpc/iop/sce_sif_reset_iop.h b/include/rnc/sdk/rpc/iop/sce_sif_reset_iop.h deleted file mode 100644 index 3f9ad4385a..0000000000 --- a/include/rnc/sdk/rpc/iop/sce_sif_reset_iop.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_IOP_SCE_SIF_RESET_IOP_H -#define LOMBYTE_RNC_SDK_RPC_IOP_SCE_SIF_RESET_IOP_H - -#include "types.h" - -s32 sceSifResetIop(const char *, s32); - -#endif /* LOMBYTE_RNC_SDK_RPC_IOP_SCE_SIF_RESET_IOP_H */ diff --git a/include/rnc/sdk/rpc/iop/sce_sif_sync_iop.h b/include/rnc/sdk/rpc/iop/sce_sif_sync_iop.h deleted file mode 100644 index 057b82dc55..0000000000 --- a/include/rnc/sdk/rpc/iop/sce_sif_sync_iop.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_IOP_SCE_SIF_SYNC_IOP_H -#define LOMBYTE_RNC_SDK_RPC_IOP_SCE_SIF_SYNC_IOP_H - -#include "types.h" - -int sceSifSyncIop(void); - -#endif /* LOMBYTE_RNC_SDK_RPC_IOP_SCE_SIF_SYNC_IOP_H */ diff --git a/include/rnc/sdk/rpc/rpc.h b/include/rnc/sdk/rpc/rpc.h new file mode 100644 index 0000000000..356e2df50e --- /dev/null +++ b/include/rnc/sdk/rpc/rpc.h @@ -0,0 +1,21 @@ +#ifndef LOMBYTE_RNC_SDK_RPC_RPC_H +#define LOMBYTE_RNC_SDK_RPC_RPC_H + +#include "types.h" + +struct EndPkt; +struct sceSifClientData; + +s32 free_rpc_packet() __asm__("func_0011AD90"); +s32 _lf_bind(void); +void QueuePeekReadDone(); +void _request_bind(); +void _request_end(struct EndPkt *, void *); +void _request_rdata(); +s32 sceSifBindRpc(struct sceSifClientData *, s32, s32); +s32 sceSifCallRpc(void *, s32, s32, void *, s32, void *, s32, void *, void *); +s32 SceSifCheckStatRpc(void *); +void sceSifExitRpc(void) __asm__("InitializeRpcCommand"); +void sceSifInitRpc(u32); + +#endif /* LOMBYTE_RNC_SDK_RPC_RPC_H */ diff --git a/include/rnc/sdk/rpc/rpc/free_rpc_packet.h b/include/rnc/sdk/rpc/rpc/free_rpc_packet.h deleted file mode 100644 index 94a1cb5b61..0000000000 --- a/include/rnc/sdk/rpc/rpc/free_rpc_packet.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_RPC_FREE_RPC_PACKET_H -#define LOMBYTE_RNC_SDK_RPC_RPC_FREE_RPC_PACKET_H - -#include "types.h" - -s32 free_rpc_packet() __asm__("func_0011AD90"); - -#endif /* LOMBYTE_RNC_SDK_RPC_RPC_FREE_RPC_PACKET_H */ diff --git a/include/rnc/sdk/rpc/rpc/lf_bind.h b/include/rnc/sdk/rpc/rpc/lf_bind.h deleted file mode 100644 index 2a70eeabd9..0000000000 --- a/include/rnc/sdk/rpc/rpc/lf_bind.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_RPC_LF_BIND_H -#define LOMBYTE_RNC_SDK_RPC_RPC_LF_BIND_H - -#include "types.h" - -s32 _lf_bind(void); - -#endif /* LOMBYTE_RNC_SDK_RPC_RPC_LF_BIND_H */ diff --git a/include/rnc/sdk/rpc/rpc/queue_peek_read_done.h b/include/rnc/sdk/rpc/rpc/queue_peek_read_done.h deleted file mode 100644 index 915e00c6a4..0000000000 --- a/include/rnc/sdk/rpc/rpc/queue_peek_read_done.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_RPC_QUEUE_PEEK_READ_DONE_H -#define LOMBYTE_RNC_SDK_RPC_RPC_QUEUE_PEEK_READ_DONE_H - -#include "types.h" - -void QueuePeekReadDone(); - -#endif /* LOMBYTE_RNC_SDK_RPC_RPC_QUEUE_PEEK_READ_DONE_H */ diff --git a/include/rnc/sdk/rpc/rpc/request_bind.h b/include/rnc/sdk/rpc/rpc/request_bind.h deleted file mode 100644 index 1e5b75ceeb..0000000000 --- a/include/rnc/sdk/rpc/rpc/request_bind.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_RPC_REQUEST_BIND_H -#define LOMBYTE_RNC_SDK_RPC_RPC_REQUEST_BIND_H - -#include "types.h" - -void _request_bind(); - -#endif /* LOMBYTE_RNC_SDK_RPC_RPC_REQUEST_BIND_H */ diff --git a/include/rnc/sdk/rpc/rpc/request_end.h b/include/rnc/sdk/rpc/rpc/request_end.h deleted file mode 100644 index 78db4f59e5..0000000000 --- a/include/rnc/sdk/rpc/rpc/request_end.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_RPC_REQUEST_END_H -#define LOMBYTE_RNC_SDK_RPC_RPC_REQUEST_END_H - -#include "types.h" - -struct EndPkt; - -void _request_end(struct EndPkt *, void *); - -#endif /* LOMBYTE_RNC_SDK_RPC_RPC_REQUEST_END_H */ diff --git a/include/rnc/sdk/rpc/rpc/request_rdata.h b/include/rnc/sdk/rpc/rpc/request_rdata.h deleted file mode 100644 index a399da404f..0000000000 --- a/include/rnc/sdk/rpc/rpc/request_rdata.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_RPC_REQUEST_RDATA_H -#define LOMBYTE_RNC_SDK_RPC_RPC_REQUEST_RDATA_H - -#include "types.h" - -void _request_rdata(); - -#endif /* LOMBYTE_RNC_SDK_RPC_RPC_REQUEST_RDATA_H */ diff --git a/include/rnc/sdk/rpc/rpc/sce_sif_bind_rpc.h b/include/rnc/sdk/rpc/rpc/sce_sif_bind_rpc.h deleted file mode 100644 index 38f4b722c4..0000000000 --- a/include/rnc/sdk/rpc/rpc/sce_sif_bind_rpc.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_RPC_SCE_SIF_BIND_RPC_H -#define LOMBYTE_RNC_SDK_RPC_RPC_SCE_SIF_BIND_RPC_H - -#include "types.h" - -struct sceSifClientData; - -s32 sceSifBindRpc(struct sceSifClientData *, s32, s32); - -#endif /* LOMBYTE_RNC_SDK_RPC_RPC_SCE_SIF_BIND_RPC_H */ diff --git a/include/rnc/sdk/rpc/rpc/sce_sif_call_rpc.h b/include/rnc/sdk/rpc/rpc/sce_sif_call_rpc.h deleted file mode 100644 index 01d8273b93..0000000000 --- a/include/rnc/sdk/rpc/rpc/sce_sif_call_rpc.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_RPC_SCE_SIF_CALL_RPC_H -#define LOMBYTE_RNC_SDK_RPC_RPC_SCE_SIF_CALL_RPC_H - -#include "types.h" - -s32 sceSifCallRpc(void *, s32, s32, void *, s32, void *, s32, void *, void *); - -#endif /* LOMBYTE_RNC_SDK_RPC_RPC_SCE_SIF_CALL_RPC_H */ diff --git a/include/rnc/sdk/rpc/rpc/sce_sif_check_stat_rpc.h b/include/rnc/sdk/rpc/rpc/sce_sif_check_stat_rpc.h deleted file mode 100644 index 53f0b83db4..0000000000 --- a/include/rnc/sdk/rpc/rpc/sce_sif_check_stat_rpc.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_RPC_SCE_SIF_CHECK_STAT_RPC_H -#define LOMBYTE_RNC_SDK_RPC_RPC_SCE_SIF_CHECK_STAT_RPC_H - -#include "types.h" - -s32 SceSifCheckStatRpc(void *); - -#endif /* LOMBYTE_RNC_SDK_RPC_RPC_SCE_SIF_CHECK_STAT_RPC_H */ diff --git a/include/rnc/sdk/rpc/rpc/sce_sif_exit_rpc.h b/include/rnc/sdk/rpc/rpc/sce_sif_exit_rpc.h deleted file mode 100644 index 49731519f2..0000000000 --- a/include/rnc/sdk/rpc/rpc/sce_sif_exit_rpc.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_RPC_SCE_SIF_EXIT_RPC_H -#define LOMBYTE_RNC_SDK_RPC_RPC_SCE_SIF_EXIT_RPC_H - -#include "types.h" - -void sceSifExitRpc(void) __asm__("InitializeRpcCommand"); - -#endif /* LOMBYTE_RNC_SDK_RPC_RPC_SCE_SIF_EXIT_RPC_H */ diff --git a/include/rnc/sdk/rpc/rpc/sce_sif_init_rpc.h b/include/rnc/sdk/rpc/rpc/sce_sif_init_rpc.h deleted file mode 100644 index 4885015f1f..0000000000 --- a/include/rnc/sdk/rpc/rpc/sce_sif_init_rpc.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_RPC_RPC_SCE_SIF_INIT_RPC_H -#define LOMBYTE_RNC_SDK_RPC_RPC_SCE_SIF_INIT_RPC_H - -#include "types.h" - -void sceSifInitRpc(u32); - -#endif /* LOMBYTE_RNC_SDK_RPC_RPC_SCE_SIF_INIT_RPC_H */ diff --git a/include/rnc/sdk/scf.h b/include/rnc/sdk/scf.h new file mode 100644 index 0000000000..913762beb8 --- /dev/null +++ b/include/rnc/sdk/scf.h @@ -0,0 +1,13 @@ +#ifndef LOMBYTE_RNC_SDK_SCF_H +#define LOMBYTE_RNC_SDK_SCF_H + +#include "types.h" + +s8 *GetRomName(void); +int IsT10K(void); +int sceScfGetLanguage(void); +void sceScfGetLocalTimefromRTC(s32); +u8 sceScfGetSummerTime(void); +int sceScfGetTimeZone(void); + +#endif /* LOMBYTE_RNC_SDK_SCF_H */ diff --git a/include/rnc/sdk/scf/GetRomName.h b/include/rnc/sdk/scf/GetRomName.h deleted file mode 100644 index 34c7a69286..0000000000 --- a/include/rnc/sdk/scf/GetRomName.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SCF_GETROMNAME_H -#define LOMBYTE_RNC_SDK_SCF_GETROMNAME_H - -#include "types.h" - -s8 *GetRomName(void); - -#endif /* LOMBYTE_RNC_SDK_SCF_GETROMNAME_H */ diff --git a/include/rnc/sdk/scf/is_t10_k.h b/include/rnc/sdk/scf/is_t10_k.h deleted file mode 100644 index ad8a6aabce..0000000000 --- a/include/rnc/sdk/scf/is_t10_k.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SCF_IS_T10_K_H -#define LOMBYTE_RNC_SDK_SCF_IS_T10_K_H - -#include "types.h" - -int IsT10K(void); - -#endif /* LOMBYTE_RNC_SDK_SCF_IS_T10_K_H */ diff --git a/include/rnc/sdk/scf/sce_scf_get_language.h b/include/rnc/sdk/scf/sce_scf_get_language.h deleted file mode 100644 index 8f386033b6..0000000000 --- a/include/rnc/sdk/scf/sce_scf_get_language.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SCF_SCE_SCF_GET_LANGUAGE_H -#define LOMBYTE_RNC_SDK_SCF_SCE_SCF_GET_LANGUAGE_H - -#include "types.h" - -int sceScfGetLanguage(void); - -#endif /* LOMBYTE_RNC_SDK_SCF_SCE_SCF_GET_LANGUAGE_H */ diff --git a/include/rnc/sdk/scf/sce_scf_get_local_timefrom_rtc.h b/include/rnc/sdk/scf/sce_scf_get_local_timefrom_rtc.h deleted file mode 100644 index 7be5f4637f..0000000000 --- a/include/rnc/sdk/scf/sce_scf_get_local_timefrom_rtc.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SCF_SCE_SCF_GET_LOCAL_TIMEFROM_RTC_H -#define LOMBYTE_RNC_SDK_SCF_SCE_SCF_GET_LOCAL_TIMEFROM_RTC_H - -#include "types.h" - -void sceScfGetLocalTimefromRTC(s32); - -#endif /* LOMBYTE_RNC_SDK_SCF_SCE_SCF_GET_LOCAL_TIMEFROM_RTC_H */ diff --git a/include/rnc/sdk/scf/sce_scf_get_summer_time.h b/include/rnc/sdk/scf/sce_scf_get_summer_time.h deleted file mode 100644 index 6a228525c4..0000000000 --- a/include/rnc/sdk/scf/sce_scf_get_summer_time.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SCF_SCE_SCF_GET_SUMMER_TIME_H -#define LOMBYTE_RNC_SDK_SCF_SCE_SCF_GET_SUMMER_TIME_H - -#include "types.h" - -u8 sceScfGetSummerTime(void); - -#endif /* LOMBYTE_RNC_SDK_SCF_SCE_SCF_GET_SUMMER_TIME_H */ diff --git a/include/rnc/sdk/scf/sce_scf_get_time_zone.h b/include/rnc/sdk/scf/sce_scf_get_time_zone.h deleted file mode 100644 index cbb28e1762..0000000000 --- a/include/rnc/sdk/scf/sce_scf_get_time_zone.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SCF_SCE_SCF_GET_TIME_ZONE_H -#define LOMBYTE_RNC_SDK_SCF_SCE_SCF_GET_TIME_ZONE_H - -#include "types.h" - -int sceScfGetTimeZone(void); - -#endif /* LOMBYTE_RNC_SDK_SCF_SCE_SCF_GET_TIME_ZONE_H */ diff --git a/include/rnc/sdk/soft_float.h b/include/rnc/sdk/soft_float.h new file mode 100644 index 0000000000..a28326f99d --- /dev/null +++ b/include/rnc/sdk/soft_float.h @@ -0,0 +1,17 @@ +#ifndef LOMBYTE_RNC_SDK_SOFT_FLOAT_H +#define LOMBYTE_RNC_SDK_SOFT_FLOAT_H + +#include "rnc/sdk/library/fp_number.h" +#include "types.h" + +u64 __fixunsdfdi(f64); +u64 MakeDoublePacket(s32, s32, s32, u64) __asm__("__make_dp"); +u64 __muldi3(u64, u64); +f64 __pack_d(FpNumber *); +s32 CompareDoubles(double, double) __asm__("dpcmp"); +f64 dpmul(f64, f64); +FpNumber *_fpadd_parts(FpNumber *, FpNumber *, FpNumber *); +u64 __udivdi3(u64, u64); +u64 __umoddi3(u64, u64); + +#endif /* LOMBYTE_RNC_SDK_SOFT_FLOAT_H */ diff --git a/include/rnc/sdk/soft_float/__fixunsdfdi.h b/include/rnc/sdk/soft_float/__fixunsdfdi.h deleted file mode 100644 index 8fe436ab7b..0000000000 --- a/include/rnc/sdk/soft_float/__fixunsdfdi.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SOFT_FLOAT___FIXUNSDFDI_H -#define LOMBYTE_RNC_SDK_SOFT_FLOAT___FIXUNSDFDI_H - -#include "types.h" - -u64 __fixunsdfdi(f64); - -#endif /* LOMBYTE_RNC_SDK_SOFT_FLOAT___FIXUNSDFDI_H */ diff --git a/include/rnc/sdk/soft_float/__make_dp.h b/include/rnc/sdk/soft_float/__make_dp.h deleted file mode 100644 index 95a2f3e7ce..0000000000 --- a/include/rnc/sdk/soft_float/__make_dp.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SOFT_FLOAT___MAKE_DP_H -#define LOMBYTE_RNC_SDK_SOFT_FLOAT___MAKE_DP_H - -#include "types.h" - -u64 MakeDoublePacket(s32, s32, s32, u64) __asm__("__make_dp"); - -#endif /* LOMBYTE_RNC_SDK_SOFT_FLOAT___MAKE_DP_H */ diff --git a/include/rnc/sdk/soft_float/__muldi3.h b/include/rnc/sdk/soft_float/__muldi3.h deleted file mode 100644 index 2f27b5870d..0000000000 --- a/include/rnc/sdk/soft_float/__muldi3.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SOFT_FLOAT___MULDI3_H -#define LOMBYTE_RNC_SDK_SOFT_FLOAT___MULDI3_H - -#include "types.h" - -u64 __muldi3(u64, u64); - -#endif /* LOMBYTE_RNC_SDK_SOFT_FLOAT___MULDI3_H */ diff --git a/include/rnc/sdk/soft_float/__pack_d.h b/include/rnc/sdk/soft_float/__pack_d.h deleted file mode 100644 index ba708e3565..0000000000 --- a/include/rnc/sdk/soft_float/__pack_d.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SOFT_FLOAT___PACK_D_H -#define LOMBYTE_RNC_SDK_SOFT_FLOAT___PACK_D_H - -#include "rnc/sdk/library/fp_number.h" -#include "types.h" - -f64 __pack_d(FpNumber *); - -#endif /* LOMBYTE_RNC_SDK_SOFT_FLOAT___PACK_D_H */ diff --git a/include/rnc/sdk/soft_float/dpcmp.h b/include/rnc/sdk/soft_float/dpcmp.h deleted file mode 100644 index 25063f40bb..0000000000 --- a/include/rnc/sdk/soft_float/dpcmp.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SOFT_FLOAT_DPCMP_H -#define LOMBYTE_RNC_SDK_SOFT_FLOAT_DPCMP_H - -#include "types.h" - -s32 CompareDoubles(double, double) __asm__("dpcmp"); - -#endif /* LOMBYTE_RNC_SDK_SOFT_FLOAT_DPCMP_H */ diff --git a/include/rnc/sdk/soft_float/dpmul.h b/include/rnc/sdk/soft_float/dpmul.h deleted file mode 100644 index 0ed6ad5edc..0000000000 --- a/include/rnc/sdk/soft_float/dpmul.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SOFT_FLOAT_DPMUL_H -#define LOMBYTE_RNC_SDK_SOFT_FLOAT_DPMUL_H - -#include "types.h" - -f64 dpmul(f64, f64); - -#endif /* LOMBYTE_RNC_SDK_SOFT_FLOAT_DPMUL_H */ diff --git a/include/rnc/sdk/soft_float/fpadd_parts.h b/include/rnc/sdk/soft_float/fpadd_parts.h deleted file mode 100644 index 18a82a3dd5..0000000000 --- a/include/rnc/sdk/soft_float/fpadd_parts.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SOFT_FLOAT_FPADD_PARTS_H -#define LOMBYTE_RNC_SDK_SOFT_FLOAT_FPADD_PARTS_H - -#include "types.h" -#include "rnc/sdk/library/fp_number.h" - -FpNumber *_fpadd_parts(FpNumber *, FpNumber *, FpNumber *); - -#endif /* LOMBYTE_RNC_SDK_SOFT_FLOAT_FPADD_PARTS_H */ diff --git a/include/rnc/sdk/soft_float/udivdi3.h b/include/rnc/sdk/soft_float/udivdi3.h deleted file mode 100644 index 638778f8d3..0000000000 --- a/include/rnc/sdk/soft_float/udivdi3.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SOFT_FLOAT_UDIVDI3_H -#define LOMBYTE_RNC_SDK_SOFT_FLOAT_UDIVDI3_H - -#include "types.h" - -u64 __udivdi3(u64, u64); - -#endif /* LOMBYTE_RNC_SDK_SOFT_FLOAT_UDIVDI3_H */ diff --git a/include/rnc/sdk/soft_float/umoddi3.h b/include/rnc/sdk/soft_float/umoddi3.h deleted file mode 100644 index 05f63e409f..0000000000 --- a/include/rnc/sdk/soft_float/umoddi3.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SOFT_FLOAT_UMODDI3_H -#define LOMBYTE_RNC_SDK_SOFT_FLOAT_UMODDI3_H - -#include "types.h" - -u64 __umoddi3(u64, u64); - -#endif /* LOMBYTE_RNC_SDK_SOFT_FLOAT_UMODDI3_H */ diff --git a/include/rnc/sdk/storage/cdvd.h b/include/rnc/sdk/storage/cdvd.h new file mode 100644 index 0000000000..c763b649a3 --- /dev/null +++ b/include/rnc/sdk/storage/cdvd.h @@ -0,0 +1,27 @@ +#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_H +#define LOMBYTE_RNC_SDK_STORAGE_CDVD_H + +#include "types.h" + +struct sceCdRMode; + +s32 PowerOffCB(void); +void cdvd_exit(void); +s32 checkModelVersion(void); +void cmd_sem_init(void); +void handle_cd_read_callback(s32 *) __asm__("FUN_001206d8"); +s32 sceCdCallback(s32); +void SceCdDelayThread(int) __asm__("sceCdDelayThread"); +s32 sceCdDiskReady(s32) __asm__("FUN_00121190"); +s32 sceCdGetError(void); +int sceCdInit(int); +s32 sceCdNcmdDiskReady(void); +s32 sceCdRead(u32, u32, void *, struct sceCdRMode *); +s32 sceCdSyncS(s32); +s32 sceCdBreak(void); +s32 sceCdMmode(s32); +s32 sceCdReadClock(u64 *); +s32 sceCdSync(s32); +void signal_native_cd_delay_alarm(s32, u32, s32) __asm__("FUN_001205e8"); + +#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_H */ diff --git a/include/rnc/sdk/storage/cdvd/PowerOffCB.h b/include/rnc/sdk/storage/cdvd/PowerOffCB.h deleted file mode 100644 index cc57717c3b..0000000000 --- a/include/rnc/sdk/storage/cdvd/PowerOffCB.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_POWEROFFCB_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_POWEROFFCB_H - -#include "types.h" - -s32 PowerOffCB(void); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_POWEROFFCB_H */ diff --git a/include/rnc/sdk/storage/cdvd/cdvd_exit.h b/include/rnc/sdk/storage/cdvd/cdvd_exit.h deleted file mode 100644 index 7c73a66d9e..0000000000 --- a/include/rnc/sdk/storage/cdvd/cdvd_exit.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_CDVD_EXIT_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_CDVD_EXIT_H - -#include "types.h" - -void cdvd_exit(void); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_CDVD_EXIT_H */ diff --git a/include/rnc/sdk/storage/cdvd/checkModelVersion.h b/include/rnc/sdk/storage/cdvd/checkModelVersion.h deleted file mode 100644 index 8df29d72ec..0000000000 --- a/include/rnc/sdk/storage/cdvd/checkModelVersion.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_CHECKMODELVERSION_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_CHECKMODELVERSION_H - -#include "types.h" - -s32 checkModelVersion(void); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_CHECKMODELVERSION_H */ diff --git a/include/rnc/sdk/storage/cdvd/cmd_sem_init.h b/include/rnc/sdk/storage/cdvd/cmd_sem_init.h deleted file mode 100644 index a4d20c7ea8..0000000000 --- a/include/rnc/sdk/storage/cdvd/cmd_sem_init.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_CMD_SEM_INIT_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_CMD_SEM_INIT_H - -#include "types.h" - -void cmd_sem_init(void); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_CMD_SEM_INIT_H */ diff --git a/include/rnc/sdk/storage/cdvd/handle_cd_read_callback.h b/include/rnc/sdk/storage/cdvd/handle_cd_read_callback.h deleted file mode 100644 index 1436a9db47..0000000000 --- a/include/rnc/sdk/storage/cdvd/handle_cd_read_callback.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_HANDLE_CD_READ_CALLBACK_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_HANDLE_CD_READ_CALLBACK_H - -#include "types.h" - -void handle_cd_read_callback(s32 *) __asm__("FUN_001206d8"); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_HANDLE_CD_READ_CALLBACK_H */ diff --git a/include/rnc/sdk/storage/cdvd/sceCdCallback.h b/include/rnc/sdk/storage/cdvd/sceCdCallback.h deleted file mode 100644 index b804e747dd..0000000000 --- a/include/rnc/sdk/storage/cdvd/sceCdCallback.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDCALLBACK_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDCALLBACK_H - -#include "types.h" - -s32 sceCdCallback(s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDCALLBACK_H */ diff --git a/include/rnc/sdk/storage/cdvd/sceCdDelayThread.h b/include/rnc/sdk/storage/cdvd/sceCdDelayThread.h deleted file mode 100644 index e9fc335083..0000000000 --- a/include/rnc/sdk/storage/cdvd/sceCdDelayThread.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDDELAYTHREAD_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDDELAYTHREAD_H - -#include "types.h" - -void SceCdDelayThread(int) __asm__("sceCdDelayThread"); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDDELAYTHREAD_H */ diff --git a/include/rnc/sdk/storage/cdvd/sceCdDiskReady.h b/include/rnc/sdk/storage/cdvd/sceCdDiskReady.h deleted file mode 100644 index d2b564bbc9..0000000000 --- a/include/rnc/sdk/storage/cdvd/sceCdDiskReady.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDDISKREADY_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDDISKREADY_H - -#include "types.h" - -s32 sceCdDiskReady(s32) __asm__("FUN_00121190"); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDDISKREADY_H */ diff --git a/include/rnc/sdk/storage/cdvd/sceCdGetError.h b/include/rnc/sdk/storage/cdvd/sceCdGetError.h deleted file mode 100644 index 36563b2fdb..0000000000 --- a/include/rnc/sdk/storage/cdvd/sceCdGetError.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDGETERROR_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDGETERROR_H - -#include "types.h" - -s32 sceCdGetError(void); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDGETERROR_H */ diff --git a/include/rnc/sdk/storage/cdvd/sceCdInit.h b/include/rnc/sdk/storage/cdvd/sceCdInit.h deleted file mode 100644 index 1135da8220..0000000000 --- a/include/rnc/sdk/storage/cdvd/sceCdInit.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDINIT_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDINIT_H - -#include "types.h" - -int sceCdInit(int); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDINIT_H */ diff --git a/include/rnc/sdk/storage/cdvd/sceCdNcmdDiskReady.h b/include/rnc/sdk/storage/cdvd/sceCdNcmdDiskReady.h deleted file mode 100644 index 45e5846ed0..0000000000 --- a/include/rnc/sdk/storage/cdvd/sceCdNcmdDiskReady.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDNCMDDISKREADY_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDNCMDDISKREADY_H - -#include "types.h" - -s32 sceCdNcmdDiskReady(void); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDNCMDDISKREADY_H */ diff --git a/include/rnc/sdk/storage/cdvd/sceCdRead.h b/include/rnc/sdk/storage/cdvd/sceCdRead.h deleted file mode 100644 index 85f3d499a1..0000000000 --- a/include/rnc/sdk/storage/cdvd/sceCdRead.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDREAD_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDREAD_H - -#include "types.h" - -struct sceCdRMode; - -s32 sceCdRead(u32, u32, void *, struct sceCdRMode *); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDREAD_H */ diff --git a/include/rnc/sdk/storage/cdvd/sceCdSyncS.h b/include/rnc/sdk/storage/cdvd/sceCdSyncS.h deleted file mode 100644 index 281dd52a5d..0000000000 --- a/include/rnc/sdk/storage/cdvd/sceCdSyncS.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDSYNCS_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDSYNCS_H - -#include "types.h" - -s32 sceCdSyncS(s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDSYNCS_H */ diff --git a/include/rnc/sdk/storage/cdvd/scecdbreak.h b/include/rnc/sdk/storage/cdvd/scecdbreak.h deleted file mode 100644 index 80275d15ce..0000000000 --- a/include/rnc/sdk/storage/cdvd/scecdbreak.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDBREAK_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDBREAK_H - -#include "types.h" - -s32 sceCdBreak(void); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDBREAK_H */ diff --git a/include/rnc/sdk/storage/cdvd/scecdmmode.h b/include/rnc/sdk/storage/cdvd/scecdmmode.h deleted file mode 100644 index 551b7a771f..0000000000 --- a/include/rnc/sdk/storage/cdvd/scecdmmode.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDMMODE_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDMMODE_H - -#include "types.h" - -s32 sceCdMmode(s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDMMODE_H */ diff --git a/include/rnc/sdk/storage/cdvd/scecdreadclock.h b/include/rnc/sdk/storage/cdvd/scecdreadclock.h deleted file mode 100644 index 0f10597fca..0000000000 --- a/include/rnc/sdk/storage/cdvd/scecdreadclock.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDREADCLOCK_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDREADCLOCK_H - -#include "types.h" - -s32 sceCdReadClock(u64 *); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDREADCLOCK_H */ diff --git a/include/rnc/sdk/storage/cdvd/scecdsync.h b/include/rnc/sdk/storage/cdvd/scecdsync.h deleted file mode 100644 index a6d6916458..0000000000 --- a/include/rnc/sdk/storage/cdvd/scecdsync.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDSYNC_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDSYNC_H - -#include "types.h" - -s32 sceCdSync(s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_SCECDSYNC_H */ diff --git a/include/rnc/sdk/storage/cdvd/signal_native_cd_delay_alarm.h b/include/rnc/sdk/storage/cdvd/signal_native_cd_delay_alarm.h deleted file mode 100644 index d0003dd439..0000000000 --- a/include/rnc/sdk/storage/cdvd/signal_native_cd_delay_alarm.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_CDVD_SIGNAL_NATIVE_CD_DELAY_ALARM_H -#define LOMBYTE_RNC_SDK_STORAGE_CDVD_SIGNAL_NATIVE_CD_DELAY_ALARM_H - -#include "types.h" - -void signal_native_cd_delay_alarm(s32, u32, s32) __asm__("FUN_001205e8"); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_CDVD_SIGNAL_NATIVE_CD_DELAY_ALARM_H */ diff --git a/include/rnc/sdk/storage/fileio.h b/include/rnc/sdk/storage/fileio.h new file mode 100644 index 0000000000..74ee9c9818 --- /dev/null +++ b/include/rnc/sdk/storage/fileio.h @@ -0,0 +1,16 @@ +#ifndef LOMBYTE_RNC_SDK_STORAGE_FILEIO_H +#define LOMBYTE_RNC_SDK_STORAGE_FILEIO_H + +#include "types.h" + +void _sceFs_Rcv_Intr(s32 *); +s32 sceClose(s32); +s32 sceFsInit(void); +int SceFsReset(void) __asm__("sceFsReset"); +s32 sceRead(s32, void *, s32); +void _sceFsIobSemaMK(void); +s32 sceLseek(s32, s32, s32); +void _sceFsSemInit(void); +s32 sceWrite(s32, u8 *, s32); + +#endif /* LOMBYTE_RNC_SDK_STORAGE_FILEIO_H */ diff --git a/include/rnc/sdk/storage/fileio/_sceFs_Rcv_Intr.h b/include/rnc/sdk/storage/fileio/_sceFs_Rcv_Intr.h deleted file mode 100644 index e6d0324ddd..0000000000 --- a/include/rnc/sdk/storage/fileio/_sceFs_Rcv_Intr.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_FILEIO__SCEFS_RCV_INTR_H -#define LOMBYTE_RNC_SDK_STORAGE_FILEIO__SCEFS_RCV_INTR_H - -#include "types.h" - -void _sceFs_Rcv_Intr(s32 *); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_FILEIO__SCEFS_RCV_INTR_H */ diff --git a/include/rnc/sdk/storage/fileio/sceClose.h b/include/rnc/sdk/storage/fileio/sceClose.h deleted file mode 100644 index 4c9cf32138..0000000000 --- a/include/rnc/sdk/storage/fileio/sceClose.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCECLOSE_H -#define LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCECLOSE_H - -#include "types.h" - -s32 sceClose(s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCECLOSE_H */ diff --git a/include/rnc/sdk/storage/fileio/sceFsInit.h b/include/rnc/sdk/storage/fileio/sceFsInit.h deleted file mode 100644 index cd77b04340..0000000000 --- a/include/rnc/sdk/storage/fileio/sceFsInit.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCEFSINIT_H -#define LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCEFSINIT_H - -#include "types.h" - -s32 sceFsInit(void); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCEFSINIT_H */ diff --git a/include/rnc/sdk/storage/fileio/sceFsReset.h b/include/rnc/sdk/storage/fileio/sceFsReset.h deleted file mode 100644 index f4f89f4e0f..0000000000 --- a/include/rnc/sdk/storage/fileio/sceFsReset.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCEFSRESET_H -#define LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCEFSRESET_H - -#include "types.h" - -int SceFsReset(void) __asm__("sceFsReset"); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCEFSRESET_H */ diff --git a/include/rnc/sdk/storage/fileio/sceRead.h b/include/rnc/sdk/storage/fileio/sceRead.h deleted file mode 100644 index e4cb1ee39b..0000000000 --- a/include/rnc/sdk/storage/fileio/sceRead.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCEREAD_H -#define LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCEREAD_H - -#include "types.h" - -s32 sceRead(s32, void *, s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCEREAD_H */ diff --git a/include/rnc/sdk/storage/fileio/sce_fs_iob_sema_mk.h b/include/rnc/sdk/storage/fileio/sce_fs_iob_sema_mk.h deleted file mode 100644 index ff6e8b0b59..0000000000 --- a/include/rnc/sdk/storage/fileio/sce_fs_iob_sema_mk.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCE_FS_IOB_SEMA_MK_H -#define LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCE_FS_IOB_SEMA_MK_H - -#include "types.h" - -void _sceFsIobSemaMK(void); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCE_FS_IOB_SEMA_MK_H */ diff --git a/include/rnc/sdk/storage/fileio/sce_lseek.h b/include/rnc/sdk/storage/fileio/sce_lseek.h deleted file mode 100644 index 2db81b4975..0000000000 --- a/include/rnc/sdk/storage/fileio/sce_lseek.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCE_LSEEK_H -#define LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCE_LSEEK_H - -#include "types.h" - -s32 sceLseek(s32, s32, s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCE_LSEEK_H */ diff --git a/include/rnc/sdk/storage/fileio/scefsseminit.h b/include/rnc/sdk/storage/fileio/scefsseminit.h deleted file mode 100644 index 340c86e2ca..0000000000 --- a/include/rnc/sdk/storage/fileio/scefsseminit.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCEFSSEMINIT_H -#define LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCEFSSEMINIT_H - -#include "types.h" - -void _sceFsSemInit(void); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCEFSSEMINIT_H */ diff --git a/include/rnc/sdk/storage/fileio/scewrite.h b/include/rnc/sdk/storage/fileio/scewrite.h deleted file mode 100644 index d8a24e8568..0000000000 --- a/include/rnc/sdk/storage/fileio/scewrite.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCEWRITE_H -#define LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCEWRITE_H - -#include "types.h" - -s32 sceWrite(s32, u8 *, s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_FILEIO_SCEWRITE_H */ diff --git a/include/rnc/sdk/storage/memory_card.h b/include/rnc/sdk/storage/memory_card.h new file mode 100644 index 0000000000..338e1d076a --- /dev/null +++ b/include/rnc/sdk/storage/memory_card.h @@ -0,0 +1,23 @@ +#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_H +#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_H + +#include "types.h" + +void mcDelayThread(int); +void mceStorePwd(char *); +s32 sceMcChdir(s32, s32, s8 *, s32); +s32 sceMcClose(s32); +s32 sceMcDelete(s32, s32, char *); +s32 SceMcFormat(s32, s32); +s32 sceMcGetDir(s32, s32, s8 *, s32, s32, s32); +s32 sceMcGetInfo(s32, s32, s32, s32, s32); +s32 sceMcInit(void); +s32 sceMcMkdir(s32, s32, const char *); +s32 sceMcOpen(s32, s32, char *, s32); +s32 sceMcRead(s32, s32 *, s32); +s32 sceMcSeek(s32, s32, s32); +s32 sceMcSync(s32, s32 *, s32 *); +s32 SceMcUnformat(s32, s32); +s32 sceMcWrite(s32, u8 *, s32); + +#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_H */ diff --git a/include/rnc/sdk/storage/memory_card/mc_delay_thread.h b/include/rnc/sdk/storage/memory_card/mc_delay_thread.h deleted file mode 100644 index 851dd505ea..0000000000 --- a/include/rnc/sdk/storage/memory_card/mc_delay_thread.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_MC_DELAY_THREAD_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_MC_DELAY_THREAD_H - -#include "types.h" - -void mcDelayThread(int); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_MC_DELAY_THREAD_H */ diff --git a/include/rnc/sdk/storage/memory_card/mce_store_pwd.h b/include/rnc/sdk/storage/memory_card/mce_store_pwd.h deleted file mode 100644 index 449379a109..0000000000 --- a/include/rnc/sdk/storage/memory_card/mce_store_pwd.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_MCE_STORE_PWD_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_MCE_STORE_PWD_H - -#include "types.h" - -void mceStorePwd(char *); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_MCE_STORE_PWD_H */ diff --git a/include/rnc/sdk/storage/memory_card/sce_mc_chdir.h b/include/rnc/sdk/storage/memory_card/sce_mc_chdir.h deleted file mode 100644 index 40ada979b6..0000000000 --- a/include/rnc/sdk/storage/memory_card/sce_mc_chdir.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_CHDIR_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_CHDIR_H - -#include "types.h" - -s32 sceMcChdir(s32, s32, s8 *, s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_CHDIR_H */ diff --git a/include/rnc/sdk/storage/memory_card/sce_mc_close.h b/include/rnc/sdk/storage/memory_card/sce_mc_close.h deleted file mode 100644 index 3726f1a577..0000000000 --- a/include/rnc/sdk/storage/memory_card/sce_mc_close.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_CLOSE_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_CLOSE_H - -#include "types.h" - -s32 sceMcClose(s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_CLOSE_H */ diff --git a/include/rnc/sdk/storage/memory_card/sce_mc_delete.h b/include/rnc/sdk/storage/memory_card/sce_mc_delete.h deleted file mode 100644 index 471959c3e6..0000000000 --- a/include/rnc/sdk/storage/memory_card/sce_mc_delete.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_DELETE_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_DELETE_H - -#include "types.h" - -s32 sceMcDelete(s32, s32, char *); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_DELETE_H */ diff --git a/include/rnc/sdk/storage/memory_card/sce_mc_format.h b/include/rnc/sdk/storage/memory_card/sce_mc_format.h deleted file mode 100644 index b161b80bde..0000000000 --- a/include/rnc/sdk/storage/memory_card/sce_mc_format.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_FORMAT_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_FORMAT_H - -#include "types.h" - -s32 SceMcFormat(s32, s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_FORMAT_H */ diff --git a/include/rnc/sdk/storage/memory_card/sce_mc_get_dir.h b/include/rnc/sdk/storage/memory_card/sce_mc_get_dir.h deleted file mode 100644 index 8e34d842b7..0000000000 --- a/include/rnc/sdk/storage/memory_card/sce_mc_get_dir.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_GET_DIR_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_GET_DIR_H - -#include "types.h" - -s32 sceMcGetDir(s32, s32, s8 *, s32, s32, s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_GET_DIR_H */ diff --git a/include/rnc/sdk/storage/memory_card/sce_mc_get_info.h b/include/rnc/sdk/storage/memory_card/sce_mc_get_info.h deleted file mode 100644 index 19a0ef16da..0000000000 --- a/include/rnc/sdk/storage/memory_card/sce_mc_get_info.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_GET_INFO_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_GET_INFO_H - -#include "types.h" - -s32 sceMcGetInfo(s32, s32, s32, s32, s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_GET_INFO_H */ diff --git a/include/rnc/sdk/storage/memory_card/sce_mc_init.h b/include/rnc/sdk/storage/memory_card/sce_mc_init.h deleted file mode 100644 index 5619642dc6..0000000000 --- a/include/rnc/sdk/storage/memory_card/sce_mc_init.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_INIT_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_INIT_H - -#include "types.h" - -s32 sceMcInit(void); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_INIT_H */ diff --git a/include/rnc/sdk/storage/memory_card/sce_mc_mkdir.h b/include/rnc/sdk/storage/memory_card/sce_mc_mkdir.h deleted file mode 100644 index f2bb94e4f7..0000000000 --- a/include/rnc/sdk/storage/memory_card/sce_mc_mkdir.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_MKDIR_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_MKDIR_H - -#include "types.h" - -s32 sceMcMkdir(s32, s32, const char *); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_MKDIR_H */ diff --git a/include/rnc/sdk/storage/memory_card/sce_mc_open.h b/include/rnc/sdk/storage/memory_card/sce_mc_open.h deleted file mode 100644 index a80f465255..0000000000 --- a/include/rnc/sdk/storage/memory_card/sce_mc_open.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_OPEN_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_OPEN_H - -#include "types.h" - -s32 sceMcOpen(s32, s32, char *, s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_OPEN_H */ diff --git a/include/rnc/sdk/storage/memory_card/sce_mc_read.h b/include/rnc/sdk/storage/memory_card/sce_mc_read.h deleted file mode 100644 index 94736c4548..0000000000 --- a/include/rnc/sdk/storage/memory_card/sce_mc_read.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_READ_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_READ_H - -#include "types.h" - -s32 sceMcRead(s32, s32 *, s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_READ_H */ diff --git a/include/rnc/sdk/storage/memory_card/sce_mc_seek.h b/include/rnc/sdk/storage/memory_card/sce_mc_seek.h deleted file mode 100644 index c3403a90ad..0000000000 --- a/include/rnc/sdk/storage/memory_card/sce_mc_seek.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_SEEK_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_SEEK_H - -#include "types.h" - -s32 sceMcSeek(s32, s32, s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_SEEK_H */ diff --git a/include/rnc/sdk/storage/memory_card/sce_mc_sync.h b/include/rnc/sdk/storage/memory_card/sce_mc_sync.h deleted file mode 100644 index bd9afc28fd..0000000000 --- a/include/rnc/sdk/storage/memory_card/sce_mc_sync.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_SYNC_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_SYNC_H - -#include "types.h" - -s32 sceMcSync(s32, s32 *, s32 *); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_SYNC_H */ diff --git a/include/rnc/sdk/storage/memory_card/sce_mc_unformat.h b/include/rnc/sdk/storage/memory_card/sce_mc_unformat.h deleted file mode 100644 index 73a9c6bbdf..0000000000 --- a/include/rnc/sdk/storage/memory_card/sce_mc_unformat.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_UNFORMAT_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_UNFORMAT_H - -#include "types.h" - -s32 SceMcUnformat(s32, s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_UNFORMAT_H */ diff --git a/include/rnc/sdk/storage/memory_card/sce_mc_write.h b/include/rnc/sdk/storage/memory_card/sce_mc_write.h deleted file mode 100644 index f1cb64f603..0000000000 --- a/include/rnc/sdk/storage/memory_card/sce_mc_write.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_WRITE_H -#define LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_WRITE_H - -#include "types.h" - -s32 sceMcWrite(s32, u8 *, s32); - -#endif /* LOMBYTE_RNC_SDK_STORAGE_MEMORY_CARD_SCE_MC_WRITE_H */ diff --git a/include/rnc/sdk/syscalls.h b/include/rnc/sdk/syscalls.h new file mode 100644 index 0000000000..5b93332070 --- /dev/null +++ b/include/rnc/sdk/syscalls.h @@ -0,0 +1,10 @@ +#ifndef LOMBYTE_RNC_SDK_SYSCALLS_H +#define LOMBYTE_RNC_SDK_SYSCALLS_H + +#include "types.h" + +void JumpToRfuDispatch(void); +void RfuDispatchEntry(int); +void UpdateRfuDispatchState(void); + +#endif /* LOMBYTE_RNC_SDK_SYSCALLS_H */ diff --git a/include/rnc/sdk/syscalls/jump_to_rfu_dispatch.h b/include/rnc/sdk/syscalls/jump_to_rfu_dispatch.h deleted file mode 100644 index 776514785f..0000000000 --- a/include/rnc/sdk/syscalls/jump_to_rfu_dispatch.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SYSCALLS_JUMP_TO_RFU_DISPATCH_H -#define LOMBYTE_RNC_SDK_SYSCALLS_JUMP_TO_RFU_DISPATCH_H - -#include "types.h" - -void JumpToRfuDispatch(void); - -#endif /* LOMBYTE_RNC_SDK_SYSCALLS_JUMP_TO_RFU_DISPATCH_H */ diff --git a/include/rnc/sdk/syscalls/rfu_dispatch_entry.h b/include/rnc/sdk/syscalls/rfu_dispatch_entry.h deleted file mode 100644 index 3f85c1993a..0000000000 --- a/include/rnc/sdk/syscalls/rfu_dispatch_entry.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SYSCALLS_RFU_DISPATCH_ENTRY_H -#define LOMBYTE_RNC_SDK_SYSCALLS_RFU_DISPATCH_ENTRY_H - -#include "types.h" - -void RfuDispatchEntry(int); - -#endif /* LOMBYTE_RNC_SDK_SYSCALLS_RFU_DISPATCH_ENTRY_H */ diff --git a/include/rnc/sdk/syscalls/update_rfu_dispatch_state.h b/include/rnc/sdk/syscalls/update_rfu_dispatch_state.h deleted file mode 100644 index cbbf481994..0000000000 --- a/include/rnc/sdk/syscalls/update_rfu_dispatch_state.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SYSCALLS_UPDATE_RFU_DISPATCH_STATE_H -#define LOMBYTE_RNC_SDK_SYSCALLS_UPDATE_RFU_DISPATCH_STATE_H - -#include "types.h" - -void UpdateRfuDispatchState(void); - -#endif /* LOMBYTE_RNC_SDK_SYSCALLS_UPDATE_RFU_DISPATCH_STATE_H */ diff --git a/include/rnc/sdk/system.h b/include/rnc/sdk/system.h new file mode 100644 index 0000000000..4313d69591 --- /dev/null +++ b/include/rnc/sdk/system.h @@ -0,0 +1,10 @@ +#ifndef LOMBYTE_RNC_SDK_SYSTEM_H +#define LOMBYTE_RNC_SDK_SYSTEM_H + +#include "types.h" + +u32 CheckAddress(u32); +s32 _sysbitFlush(); +s32 _sysbitGet(s32, s32); + +#endif /* LOMBYTE_RNC_SDK_SYSTEM_H */ diff --git a/include/rnc/sdk/system/check_address.h b/include/rnc/sdk/system/check_address.h deleted file mode 100644 index 70727a747c..0000000000 --- a/include/rnc/sdk/system/check_address.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SYSTEM_CHECK_ADDRESS_H -#define LOMBYTE_RNC_SDK_SYSTEM_CHECK_ADDRESS_H - -#include "types.h" - -u32 CheckAddress(u32); - -#endif /* LOMBYTE_RNC_SDK_SYSTEM_CHECK_ADDRESS_H */ diff --git a/include/rnc/sdk/system/sysbit_flush.h b/include/rnc/sdk/system/sysbit_flush.h deleted file mode 100644 index 8c0cf32af1..0000000000 --- a/include/rnc/sdk/system/sysbit_flush.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SYSTEM_SYSBIT_FLUSH_H -#define LOMBYTE_RNC_SDK_SYSTEM_SYSBIT_FLUSH_H - -#include "types.h" - -s32 _sysbitFlush(); - -#endif /* LOMBYTE_RNC_SDK_SYSTEM_SYSBIT_FLUSH_H */ diff --git a/include/rnc/sdk/system/sysbit_get.h b/include/rnc/sdk/system/sysbit_get.h deleted file mode 100644 index 026cf85727..0000000000 --- a/include/rnc/sdk/system/sysbit_get.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_SYSTEM_SYSBIT_GET_H -#define LOMBYTE_RNC_SDK_SYSTEM_SYSBIT_GET_H - -#include "types.h" - -s32 _sysbitGet(s32, s32); - -#endif /* LOMBYTE_RNC_SDK_SYSTEM_SYSBIT_GET_H */ diff --git a/include/rnc/sdk/time.h b/include/rnc/sdk/time.h new file mode 100644 index 0000000000..4c6788dd85 --- /dev/null +++ b/include/rnc/sdk/time.h @@ -0,0 +1,11 @@ +#ifndef LOMBYTE_RNC_SDK_TIME_H +#define LOMBYTE_RNC_SDK_TIME_H + +#include "types.h" + +void AddClockHour() __asm__("addhour"); +u8 BcdToTime(u8); +void Subhour() __asm__("subhour"); +u32 TimeToBcd(u32); + +#endif /* LOMBYTE_RNC_SDK_TIME_H */ diff --git a/include/rnc/sdk/time/addhour.h b/include/rnc/sdk/time/addhour.h deleted file mode 100644 index c7dda403a5..0000000000 --- a/include/rnc/sdk/time/addhour.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_TIME_ADDHOUR_H -#define LOMBYTE_RNC_SDK_TIME_ADDHOUR_H - -#include "types.h" - -void AddClockHour() __asm__("addhour"); - -#endif /* LOMBYTE_RNC_SDK_TIME_ADDHOUR_H */ diff --git a/include/rnc/sdk/time/bcd_to_time.h b/include/rnc/sdk/time/bcd_to_time.h deleted file mode 100644 index 36603aea0e..0000000000 --- a/include/rnc/sdk/time/bcd_to_time.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_TIME_BCD_TO_TIME_H -#define LOMBYTE_RNC_SDK_TIME_BCD_TO_TIME_H - -#include "types.h" - -u8 BcdToTime(u8); - -#endif /* LOMBYTE_RNC_SDK_TIME_BCD_TO_TIME_H */ diff --git a/include/rnc/sdk/time/subhour.h b/include/rnc/sdk/time/subhour.h deleted file mode 100644 index c3c59154e5..0000000000 --- a/include/rnc/sdk/time/subhour.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_TIME_SUBHOUR_H -#define LOMBYTE_RNC_SDK_TIME_SUBHOUR_H - -#include "types.h" - -void Subhour() __asm__("subhour"); - -#endif /* LOMBYTE_RNC_SDK_TIME_SUBHOUR_H */ diff --git a/include/rnc/sdk/time/time_to_bcd.h b/include/rnc/sdk/time/time_to_bcd.h deleted file mode 100644 index a7c73bd967..0000000000 --- a/include/rnc/sdk/time/time_to_bcd.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_SDK_TIME_TIME_TO_BCD_H -#define LOMBYTE_RNC_SDK_TIME_TIME_TO_BCD_H - -#include "types.h" - -u32 TimeToBcd(u32); - -#endif /* LOMBYTE_RNC_SDK_TIME_TIME_TO_BCD_H */ diff --git a/include/rnc/streaming.h b/include/rnc/streaming.h new file mode 100644 index 0000000000..6c186af48d --- /dev/null +++ b/include/rnc/streaming.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_STREAMING_H +#define LOMBYTE_RNC_STREAMING_H + +#include "types.h" + +s32 wad_get_sectors(s32, s32, s32) __asm__("FUN_0012f208"); + +#endif /* LOMBYTE_RNC_STREAMING_H */ diff --git a/include/rnc/streaming/stash.h b/include/rnc/streaming/stash.h new file mode 100644 index 0000000000..158c23196f --- /dev/null +++ b/include/rnc/streaming/stash.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_STREAMING_STASH_H +#define LOMBYTE_RNC_STREAMING_STASH_H + +#include "types.h" + +s32 stash_send_data(u32, s32, s32, s32) __asm__("FUN_00232e40"); + +#endif /* LOMBYTE_RNC_STREAMING_STASH_H */ diff --git a/include/rnc/streaming/stash/stash_send_data.h b/include/rnc/streaming/stash/stash_send_data.h deleted file mode 100644 index 887a163009..0000000000 --- a/include/rnc/streaming/stash/stash_send_data.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_STREAMING_STASH_STASH_SEND_DATA_H -#define LOMBYTE_RNC_STREAMING_STASH_STASH_SEND_DATA_H - -#include "types.h" - -s32 stash_send_data(u32, s32, s32, s32) __asm__("FUN_00232e40"); - -#endif /* LOMBYTE_RNC_STREAMING_STASH_STASH_SEND_DATA_H */ diff --git a/include/rnc/streaming/wad_get_sectors.h b/include/rnc/streaming/wad_get_sectors.h deleted file mode 100644 index 20d36c8045..0000000000 --- a/include/rnc/streaming/wad_get_sectors.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_STREAMING_WAD_GET_SECTORS_H -#define LOMBYTE_RNC_STREAMING_WAD_GET_SECTORS_H - -#include "types.h" - -s32 wad_get_sectors(s32, s32, s32) __asm__("FUN_0012f208"); - -#endif /* LOMBYTE_RNC_STREAMING_WAD_GET_SECTORS_H */ diff --git a/include/rnc/ui/help.h b/include/rnc/ui/help.h new file mode 100644 index 0000000000..58c38f4860 --- /dev/null +++ b/include/rnc/ui/help.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_UI_HELP_H +#define LOMBYTE_RNC_UI_HELP_H + +#include "types.h" + +void help_draw_prompt(void) __asm__("FUN_001fe898"); +void load_help_message_group(s32); + +#endif /* LOMBYTE_RNC_UI_HELP_H */ diff --git a/include/rnc/ui/help/help_draw_prompt.h b/include/rnc/ui/help/help_draw_prompt.h deleted file mode 100644 index 2cdd0f0a4c..0000000000 --- a/include/rnc/ui/help/help_draw_prompt.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_HELP_HELP_DRAW_PROMPT_H -#define LOMBYTE_RNC_UI_HELP_HELP_DRAW_PROMPT_H - -#include "types.h" - -void help_draw_prompt(void) __asm__("FUN_001fe898"); - -#endif /* LOMBYTE_RNC_UI_HELP_HELP_DRAW_PROMPT_H */ diff --git a/include/rnc/ui/help/help_record.h b/include/rnc/ui/help/help_record.h index 99d32fd833..fa84799283 100644 --- a/include/rnc/ui/help/help_record.h +++ b/include/rnc/ui/help/help_record.h @@ -5,8 +5,8 @@ typedef struct { u16 count; - u16 best; - u32 flags; + u16 latest_time_bucket; + u32 level_flags; } HelpRecord; /* One record per help entry: the level code's clear_help_record_high_bits diff --git a/include/rnc/ui/help/load_help_message_group.h b/include/rnc/ui/help/load_help_message_group.h deleted file mode 100644 index 7f7745ac84..0000000000 --- a/include/rnc/ui/help/load_help_message_group.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_HELP_LOAD_HELP_MESSAGE_GROUP_H -#define LOMBYTE_RNC_UI_HELP_LOAD_HELP_MESSAGE_GROUP_H - -#include "types.h" - -void load_help_message_group(s32); - -#endif /* LOMBYTE_RNC_UI_HELP_LOAD_HELP_MESSAGE_GROUP_H */ diff --git a/include/rnc/ui/help/message_entry.h b/include/rnc/ui/help/message_entry.h new file mode 100644 index 0000000000..671c4659d1 --- /dev/null +++ b/include/rnc/ui/help/message_entry.h @@ -0,0 +1,15 @@ +#ifndef LOMBYTE_RNC_UI_HELP_MESSAGE_ENTRY_H +#define LOMBYTE_RNC_UI_HELP_MESSAGE_ENTRY_H + +#include "types.h" + +/* A relocated RC1 help-text entry; the on-disc first word is an offset. + * Lookup compares message_id; audio uses 30000 + audio_track_offset. + * The last word has no established meaning and must remain unnamed. */ +typedef struct HelpMessageEntry { + void *text; /* 0x00 */ + s32 message_id; /* 0x04 */ + s32 audio_track_offset; /* 0x08: -1 means no audio */ + s32 unknown_0C; +} HelpMessageEntry; +#endif /* LOMBYTE_RNC_UI_HELP_MESSAGE_ENTRY_H */ diff --git a/include/rnc/ui/hud.h b/include/rnc/ui/hud.h new file mode 100644 index 0000000000..ce8a1ff7b7 --- /dev/null +++ b/include/rnc/ui/hud.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_UI_HUD_H +#define LOMBYTE_RNC_UI_HUD_H + +#include "types.h" + +void append_screen_rect_packet(s32, s32, s32, s32, u64, s32) __asm__("FUN_00200e08"); +void update_hud(void) __asm__("FUN_001ff780"); + +#endif /* LOMBYTE_RNC_UI_HUD_H */ diff --git a/include/rnc/ui/hud/append_screen_rect_packet.h b/include/rnc/ui/hud/append_screen_rect_packet.h deleted file mode 100644 index bdb21c4b39..0000000000 --- a/include/rnc/ui/hud/append_screen_rect_packet.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_HUD_APPEND_SCREEN_RECT_PACKET_H -#define LOMBYTE_RNC_UI_HUD_APPEND_SCREEN_RECT_PACKET_H - -#include "types.h" - -void append_screen_rect_packet(s32, s32, s32, s32, u64, s32) __asm__("FUN_00200e08"); - -#endif /* LOMBYTE_RNC_UI_HUD_APPEND_SCREEN_RECT_PACKET_H */ diff --git a/include/rnc/ui/hud/banks.h b/include/rnc/ui/hud/banks.h new file mode 100644 index 0000000000..fd9a94a76f --- /dev/null +++ b/include/rnc/ui/hud/banks.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_UI_HUD_BANKS_H +#define LOMBYTE_RNC_UI_HUD_BANKS_H + +#include "types.h" + +void hud_send_texture(u32, s32, s32, s32, s32, s32) __asm__("FUN_00200b10"); +void load_compressed_hud_bank(s32, s32) __asm__("FUN_00202d10"); + +#endif /* LOMBYTE_RNC_UI_HUD_BANKS_H */ diff --git a/include/rnc/ui/hud/banks/hud_send_texture.h b/include/rnc/ui/hud/banks/hud_send_texture.h deleted file mode 100644 index cb0a5e9d48..0000000000 --- a/include/rnc/ui/hud/banks/hud_send_texture.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_HUD_BANKS_HUD_SEND_TEXTURE_H -#define LOMBYTE_RNC_UI_HUD_BANKS_HUD_SEND_TEXTURE_H - -#include "types.h" - -void hud_send_texture(u32, s32, s32, s32, s32, s32) __asm__("FUN_00200b10"); - -#endif /* LOMBYTE_RNC_UI_HUD_BANKS_HUD_SEND_TEXTURE_H */ diff --git a/include/rnc/ui/hud/banks/load_compressed_hud_bank.h b/include/rnc/ui/hud/banks/load_compressed_hud_bank.h deleted file mode 100644 index ca10a01396..0000000000 --- a/include/rnc/ui/hud/banks/load_compressed_hud_bank.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_HUD_BANKS_LOAD_COMPRESSED_HUD_BANK_H -#define LOMBYTE_RNC_UI_HUD_BANKS_LOAD_COMPRESSED_HUD_BANK_H - -#include "types.h" - -void load_compressed_hud_bank(s32, s32) __asm__("FUN_00202d10"); - -#endif /* LOMBYTE_RNC_UI_HUD_BANKS_LOAD_COMPRESSED_HUD_BANK_H */ diff --git a/include/rnc/ui/hud/sprites.h b/include/rnc/ui/hud/sprites.h new file mode 100644 index 0000000000..e1f32926fb --- /dev/null +++ b/include/rnc/ui/hud/sprites.h @@ -0,0 +1,10 @@ +#ifndef LOMBYTE_RNC_UI_HUD_SPRITES_H +#define LOMBYTE_RNC_UI_HUD_SPRITES_H + +#include "types.h" + +void draw_hud_rect_depth(s32, s32, s32, s32, u64, u32, s32) __asm__("FUN_00200f90"); +void draw_hud_sprite_rect(s32, s32, s32, s32, s32, s32, s32, s32, s32, s32) __asm__("FUN_00200958"); +void draw_hud_sprite_subpixel(s32, s32, s32, s32, s32, s32) __asm__("FUN_00200080"); + +#endif /* LOMBYTE_RNC_UI_HUD_SPRITES_H */ diff --git a/include/rnc/ui/hud/sprites/draw_hud_rect_depth.h b/include/rnc/ui/hud/sprites/draw_hud_rect_depth.h deleted file mode 100644 index 478a8ef258..0000000000 --- a/include/rnc/ui/hud/sprites/draw_hud_rect_depth.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_HUD_SPRITES_DRAW_HUD_RECT_DEPTH_H -#define LOMBYTE_RNC_UI_HUD_SPRITES_DRAW_HUD_RECT_DEPTH_H - -#include "types.h" - -void draw_hud_rect_depth(s32, s32, s32, s32, u64, u32, s32) __asm__("FUN_00200f90"); - -#endif /* LOMBYTE_RNC_UI_HUD_SPRITES_DRAW_HUD_RECT_DEPTH_H */ diff --git a/include/rnc/ui/hud/sprites/draw_hud_sprite_rect.h b/include/rnc/ui/hud/sprites/draw_hud_sprite_rect.h deleted file mode 100644 index 27de06e6ad..0000000000 --- a/include/rnc/ui/hud/sprites/draw_hud_sprite_rect.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_HUD_SPRITES_DRAW_HUD_SPRITE_RECT_H -#define LOMBYTE_RNC_UI_HUD_SPRITES_DRAW_HUD_SPRITE_RECT_H - -#include "types.h" - -void draw_hud_sprite_rect(s32, s32, s32, s32, s32, s32, s32, s32, s32, s32) __asm__("FUN_00200958"); - -#endif /* LOMBYTE_RNC_UI_HUD_SPRITES_DRAW_HUD_SPRITE_RECT_H */ diff --git a/include/rnc/ui/hud/sprites/draw_hud_sprite_subpixel.h b/include/rnc/ui/hud/sprites/draw_hud_sprite_subpixel.h deleted file mode 100644 index 0b3962d9f0..0000000000 --- a/include/rnc/ui/hud/sprites/draw_hud_sprite_subpixel.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_HUD_SPRITES_DRAW_HUD_SPRITE_SUBPIXEL_H -#define LOMBYTE_RNC_UI_HUD_SPRITES_DRAW_HUD_SPRITE_SUBPIXEL_H - -#include "types.h" - -void draw_hud_sprite_subpixel(s32, s32, s32, s32, s32, s32) __asm__("FUN_00200080"); - -#endif /* LOMBYTE_RNC_UI_HUD_SPRITES_DRAW_HUD_SPRITE_SUBPIXEL_H */ diff --git a/include/rnc/ui/hud/update_hud.h b/include/rnc/ui/hud/update_hud.h deleted file mode 100644 index fb41607b44..0000000000 --- a/include/rnc/ui/hud/update_hud.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_HUD_UPDATE_HUD_H -#define LOMBYTE_RNC_UI_HUD_UPDATE_HUD_H - -#include "types.h" - -void update_hud(void) __asm__("FUN_001ff780"); - -#endif /* LOMBYTE_RNC_UI_HUD_UPDATE_HUD_H */ diff --git a/include/rnc/ui/loading.h b/include/rnc/ui/loading.h new file mode 100644 index 0000000000..6f6706dddc --- /dev/null +++ b/include/rnc/ui/loading.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_UI_LOADING_H +#define LOMBYTE_RNC_UI_LOADING_H + +#include "types.h" + +void play_level_loading_slides(s32, s32, s32, s32, s32) __asm__("FUN_00231bd8"); + +#endif /* LOMBYTE_RNC_UI_LOADING_H */ diff --git a/include/rnc/ui/loading/play_level_loading_slides.h b/include/rnc/ui/loading/play_level_loading_slides.h deleted file mode 100644 index 34fa1767cc..0000000000 --- a/include/rnc/ui/loading/play_level_loading_slides.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_LOADING_PLAY_LEVEL_LOADING_SLIDES_H -#define LOMBYTE_RNC_UI_LOADING_PLAY_LEVEL_LOADING_SLIDES_H - -#include "types.h" - -void play_level_loading_slides(s32, s32, s32, s32, s32) __asm__("FUN_00231bd8"); - -#endif /* LOMBYTE_RNC_UI_LOADING_PLAY_LEVEL_LOADING_SLIDES_H */ diff --git a/include/rnc/ui/map.h b/include/rnc/ui/map.h new file mode 100644 index 0000000000..6ab5f54e2a --- /dev/null +++ b/include/rnc/ui/map.h @@ -0,0 +1,16 @@ +#ifndef LOMBYTE_RNC_UI_MAP_H +#define LOMBYTE_RNC_UI_MAP_H + +#include "types.h" + +struct MenuScreen; + +void draw_map_overlay(void) __asm__("FUN_00205640"); +s32 draw_map_screen(struct MenuScreen *) __asm__("FUN_0021be60"); +s32 draw_map_screen_layers(void) __asm__("FUN_00220850"); +s32 draw_map_screen_overlay(void) __asm__("FUN_0021f330"); +s32 leave_map_screen(void) __asm__("FUN_0021bda0"); +void update_map_icons(s32, s32) __asm__("FUN_0020bf90"); +void world_to_map_coords(f32, f32, f32 *, f32 *, s32) __asm__("FUN_00208408"); + +#endif /* LOMBYTE_RNC_UI_MAP_H */ diff --git a/include/rnc/ui/map/coverage.h b/include/rnc/ui/map/coverage.h new file mode 100644 index 0000000000..cc8172e2ff --- /dev/null +++ b/include/rnc/ui/map/coverage.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_UI_MAP_COVERAGE_H +#define LOMBYTE_RNC_UI_MAP_COVERAGE_H + +#include "types.h" + +void decode_map_rle_row(u8 *, s32, u8 *, s16 *) __asm__("FUN_00206860"); + +#endif /* LOMBYTE_RNC_UI_MAP_COVERAGE_H */ diff --git a/include/rnc/ui/map/coverage/decode_map_rle_row.h b/include/rnc/ui/map/coverage/decode_map_rle_row.h deleted file mode 100644 index 7e0f414561..0000000000 --- a/include/rnc/ui/map/coverage/decode_map_rle_row.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MAP_COVERAGE_DECODE_MAP_RLE_ROW_H -#define LOMBYTE_RNC_UI_MAP_COVERAGE_DECODE_MAP_RLE_ROW_H - -#include "types.h" - -void decode_map_rle_row(u8 *, s32, u8 *, s16 *) __asm__("FUN_00206860"); - -#endif /* LOMBYTE_RNC_UI_MAP_COVERAGE_DECODE_MAP_RLE_ROW_H */ diff --git a/include/rnc/ui/map/draw_map_overlay.h b/include/rnc/ui/map/draw_map_overlay.h deleted file mode 100644 index 5d509e1558..0000000000 --- a/include/rnc/ui/map/draw_map_overlay.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MAP_DRAW_MAP_OVERLAY_H -#define LOMBYTE_RNC_UI_MAP_DRAW_MAP_OVERLAY_H - -#include "types.h" - -void draw_map_overlay(void) __asm__("FUN_00205640"); - -#endif /* LOMBYTE_RNC_UI_MAP_DRAW_MAP_OVERLAY_H */ diff --git a/include/rnc/ui/map/draw_map_screen.h b/include/rnc/ui/map/draw_map_screen.h deleted file mode 100644 index 1a387da325..0000000000 --- a/include/rnc/ui/map/draw_map_screen.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MAP_DRAW_MAP_SCREEN_H -#define LOMBYTE_RNC_UI_MAP_DRAW_MAP_SCREEN_H - -#include "types.h" - -struct MenuScreen; - -s32 draw_map_screen(struct MenuScreen *) __asm__("FUN_0021be60"); - -#endif /* LOMBYTE_RNC_UI_MAP_DRAW_MAP_SCREEN_H */ diff --git a/include/rnc/ui/map/draw_map_screen_layers.h b/include/rnc/ui/map/draw_map_screen_layers.h deleted file mode 100644 index a3906622df..0000000000 --- a/include/rnc/ui/map/draw_map_screen_layers.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MAP_DRAW_MAP_SCREEN_LAYERS_H -#define LOMBYTE_RNC_UI_MAP_DRAW_MAP_SCREEN_LAYERS_H - -#include "types.h" - -s32 draw_map_screen_layers(void) __asm__("FUN_00220850"); - -#endif /* LOMBYTE_RNC_UI_MAP_DRAW_MAP_SCREEN_LAYERS_H */ diff --git a/include/rnc/ui/map/draw_map_screen_overlay.h b/include/rnc/ui/map/draw_map_screen_overlay.h deleted file mode 100644 index 921bd5db68..0000000000 --- a/include/rnc/ui/map/draw_map_screen_overlay.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MAP_DRAW_MAP_SCREEN_OVERLAY_H -#define LOMBYTE_RNC_UI_MAP_DRAW_MAP_SCREEN_OVERLAY_H - -#include "types.h" - -s32 draw_map_screen_overlay(void) __asm__("FUN_0021f330"); - -#endif /* LOMBYTE_RNC_UI_MAP_DRAW_MAP_SCREEN_OVERLAY_H */ diff --git a/include/rnc/ui/map/leave_map_screen.h b/include/rnc/ui/map/leave_map_screen.h deleted file mode 100644 index 423b593000..0000000000 --- a/include/rnc/ui/map/leave_map_screen.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MAP_LEAVE_MAP_SCREEN_H -#define LOMBYTE_RNC_UI_MAP_LEAVE_MAP_SCREEN_H - -#include "types.h" - -s32 leave_map_screen(void) __asm__("FUN_0021bda0"); - -#endif /* LOMBYTE_RNC_UI_MAP_LEAVE_MAP_SCREEN_H */ diff --git a/include/rnc/ui/map/level_selection.h b/include/rnc/ui/map/level_selection.h new file mode 100644 index 0000000000..2c7305f10f --- /dev/null +++ b/include/rnc/ui/map/level_selection.h @@ -0,0 +1,12 @@ +#ifndef LOMBYTE_RNC_UI_MAP_LEVEL_SELECTION_H +#define LOMBYTE_RNC_UI_MAP_LEVEL_SELECTION_H + +#include "types.h" + +struct MenuScreen; + +void draw_level_selection_map(s32, s32, s32, s32) __asm__("FUN_001fd748"); +s32 draw_level_selection_map_screen(struct MenuScreen *) __asm__("FUN_00221930"); +int update_level_selection_map_screen(void) __asm__("FUN_00221908"); + +#endif /* LOMBYTE_RNC_UI_MAP_LEVEL_SELECTION_H */ diff --git a/include/rnc/ui/map/level_selection/draw_level_selection_map.h b/include/rnc/ui/map/level_selection/draw_level_selection_map.h deleted file mode 100644 index 07a159cd19..0000000000 --- a/include/rnc/ui/map/level_selection/draw_level_selection_map.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MAP_LEVEL_SELECTION_DRAW_LEVEL_SELECTION_MAP_H -#define LOMBYTE_RNC_UI_MAP_LEVEL_SELECTION_DRAW_LEVEL_SELECTION_MAP_H - -#include "types.h" - -void draw_level_selection_map(s32, s32, s32, s32) __asm__("FUN_001fd748"); - -#endif /* LOMBYTE_RNC_UI_MAP_LEVEL_SELECTION_DRAW_LEVEL_SELECTION_MAP_H */ diff --git a/include/rnc/ui/map/level_selection/draw_level_selection_map_screen.h b/include/rnc/ui/map/level_selection/draw_level_selection_map_screen.h deleted file mode 100644 index af3d6a5604..0000000000 --- a/include/rnc/ui/map/level_selection/draw_level_selection_map_screen.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MAP_LEVEL_SELECTION_DRAW_LEVEL_SELECTION_MAP_SCREEN_H -#define LOMBYTE_RNC_UI_MAP_LEVEL_SELECTION_DRAW_LEVEL_SELECTION_MAP_SCREEN_H - -#include "types.h" - -struct MenuScreen; - -s32 draw_level_selection_map_screen(struct MenuScreen *) __asm__("FUN_00221930"); - -#endif /* LOMBYTE_RNC_UI_MAP_LEVEL_SELECTION_DRAW_LEVEL_SELECTION_MAP_SCREEN_H */ diff --git a/include/rnc/ui/map/level_selection/update_level_selection_map_screen.h b/include/rnc/ui/map/level_selection/update_level_selection_map_screen.h deleted file mode 100644 index d07a3e7434..0000000000 --- a/include/rnc/ui/map/level_selection/update_level_selection_map_screen.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MAP_LEVEL_SELECTION_UPDATE_LEVEL_SELECTION_MAP_SCREEN_H -#define LOMBYTE_RNC_UI_MAP_LEVEL_SELECTION_UPDATE_LEVEL_SELECTION_MAP_SCREEN_H - -#include "types.h" - -int update_level_selection_map_screen(void) __asm__("FUN_00221908"); - -#endif /* LOMBYTE_RNC_UI_MAP_LEVEL_SELECTION_UPDATE_LEVEL_SELECTION_MAP_SCREEN_H */ diff --git a/include/rnc/ui/map/update_map_icons.h b/include/rnc/ui/map/update_map_icons.h deleted file mode 100644 index fcbc59d389..0000000000 --- a/include/rnc/ui/map/update_map_icons.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MAP_UPDATE_MAP_ICONS_H -#define LOMBYTE_RNC_UI_MAP_UPDATE_MAP_ICONS_H - -#include "types.h" - -void update_map_icons(s32, s32) __asm__("FUN_0020bf90"); - -#endif /* LOMBYTE_RNC_UI_MAP_UPDATE_MAP_ICONS_H */ diff --git a/include/rnc/ui/map/world_to_map_coords.h b/include/rnc/ui/map/world_to_map_coords.h deleted file mode 100644 index 263747b781..0000000000 --- a/include/rnc/ui/map/world_to_map_coords.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MAP_WORLD_TO_MAP_COORDS_H -#define LOMBYTE_RNC_UI_MAP_WORLD_TO_MAP_COORDS_H - -#include "types.h" - -void world_to_map_coords(f32, f32, f32 *, f32 *, s32) __asm__("FUN_00208408"); - -#endif /* LOMBYTE_RNC_UI_MAP_WORLD_TO_MAP_COORDS_H */ diff --git a/include/rnc/ui/menus.h b/include/rnc/ui/menus.h new file mode 100644 index 0000000000..104e237190 --- /dev/null +++ b/include/rnc/ui/menus.h @@ -0,0 +1,8 @@ +#ifndef LOMBYTE_RNC_UI_MENUS_H +#define LOMBYTE_RNC_UI_MENUS_H + +#include "types.h" + +void initialize_menu_preview_scene(void) __asm__("FUN_00218f98"); + +#endif /* LOMBYTE_RNC_UI_MENUS_H */ diff --git a/include/rnc/ui/menus/initialize_menu_preview_scene.h b/include/rnc/ui/menus/initialize_menu_preview_scene.h deleted file mode 100644 index 1888afa926..0000000000 --- a/include/rnc/ui/menus/initialize_menu_preview_scene.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_INITIALIZE_MENU_PREVIEW_SCENE_H -#define LOMBYTE_RNC_UI_MENUS_INITIALIZE_MENU_PREVIEW_SCENE_H - -#include "types.h" - -void initialize_menu_preview_scene(void) __asm__("FUN_00218f98"); - -#endif /* LOMBYTE_RNC_UI_MENUS_INITIALIZE_MENU_PREVIEW_SCENE_H */ diff --git a/include/rnc/ui/menus/item_preview.h b/include/rnc/ui/menus/item_preview.h new file mode 100644 index 0000000000..94b76fd6a4 --- /dev/null +++ b/include/rnc/ui/menus/item_preview.h @@ -0,0 +1,31 @@ +#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_H +#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_H + +#include "types.h" + +struct ItemPreviewBinding; +struct ItemPreviewLink; +struct ItemPreviewRotation; +struct MenuPreviewObjects; +struct MenuPreviewPair; +struct MenuScreen; +struct RotatingPreviewMoby; +struct RotatingPreviewOwner; + +s32 advance_preview_animation_queue(void) __asm__("FUN_00226670"); +s32 clear_menu_preview_pair(struct MenuPreviewPair *) __asm__("FUN_0021df58"); +s32 create_rotating_preview_moby(struct RotatingPreviewOwner *) __asm__("FUN_0021ea48"); +s32 draw_available_item_preview_mobys(struct MenuScreen *) __asm__("FUN_0021e608"); +s32 draw_item_preview_screen(struct MenuScreen *) __asm__("FUN_0021e110"); +s32 draw_menu_preview_objects(struct MenuPreviewObjects *) __asm__("FUN_0021ddf8"); +int enter_item_preview(struct MenuScreen *) __asm__("FUN_0021df30"); +int initialize_menu_preview_objects(struct MenuScreen *) __asm__("FUN_002240c8"); +void load_preview_resource_bindings(s32, s32) __asm__("FUN_00226848"); +s32 release_item_preview_moby(struct ItemPreviewLink *) __asm__("FUN_0021eaf0"); +s32 release_menu_preview_objects(s32) __asm__("FUN_002242b8"); +void rotate_item_preview_moby(struct ItemPreviewRotation *) __asm__("FUN_0021e1f8"); +void rotate_preview_moby_x(struct RotatingPreviewMoby *) __asm__("FUN_0021f120"); +s32 update_item_preview_binding(struct ItemPreviewBinding *) __asm__("FUN_0021e230"); +int update_item_preview_moby(struct MenuScreen *) __asm__("FUN_0021df98"); + +#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_H */ diff --git a/include/rnc/ui/menus/item_preview/advance_preview_animation_queue.h b/include/rnc/ui/menus/item_preview/advance_preview_animation_queue.h deleted file mode 100644 index 4856ce3547..0000000000 --- a/include/rnc/ui/menus/item_preview/advance_preview_animation_queue.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_ADVANCE_PREVIEW_ANIMATION_QUEUE_H -#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_ADVANCE_PREVIEW_ANIMATION_QUEUE_H - -#include "types.h" - -s32 advance_preview_animation_queue(void) __asm__("FUN_00226670"); - -#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_ADVANCE_PREVIEW_ANIMATION_QUEUE_H */ diff --git a/include/rnc/ui/menus/item_preview/clear_menu_preview_pair.h b/include/rnc/ui/menus/item_preview/clear_menu_preview_pair.h deleted file mode 100644 index 714a7dcb87..0000000000 --- a/include/rnc/ui/menus/item_preview/clear_menu_preview_pair.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_CLEAR_MENU_PREVIEW_PAIR_H -#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_CLEAR_MENU_PREVIEW_PAIR_H - -#include "types.h" - -struct MenuPreviewPair; - -s32 clear_menu_preview_pair(struct MenuPreviewPair *) __asm__("FUN_0021df58"); - -#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_CLEAR_MENU_PREVIEW_PAIR_H */ diff --git a/include/rnc/ui/menus/item_preview/create_rotating_preview_moby.h b/include/rnc/ui/menus/item_preview/create_rotating_preview_moby.h deleted file mode 100644 index f6611b7644..0000000000 --- a/include/rnc/ui/menus/item_preview/create_rotating_preview_moby.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_CREATE_ROTATING_PREVIEW_MOBY_H -#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_CREATE_ROTATING_PREVIEW_MOBY_H - -#include "types.h" - -struct RotatingPreviewOwner; - -s32 create_rotating_preview_moby(struct RotatingPreviewOwner *) __asm__("FUN_0021ea48"); - -#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_CREATE_ROTATING_PREVIEW_MOBY_H */ diff --git a/include/rnc/ui/menus/item_preview/draw_available_item_preview_mobys.h b/include/rnc/ui/menus/item_preview/draw_available_item_preview_mobys.h deleted file mode 100644 index ca96440bd5..0000000000 --- a/include/rnc/ui/menus/item_preview/draw_available_item_preview_mobys.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_DRAW_AVAILABLE_ITEM_PREVIEW_MOBYS_H -#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_DRAW_AVAILABLE_ITEM_PREVIEW_MOBYS_H - -#include "types.h" - -struct MenuScreen; - -s32 draw_available_item_preview_mobys(struct MenuScreen *) __asm__("FUN_0021e608"); - -#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_DRAW_AVAILABLE_ITEM_PREVIEW_MOBYS_H */ diff --git a/include/rnc/ui/menus/item_preview/draw_item_preview_screen.h b/include/rnc/ui/menus/item_preview/draw_item_preview_screen.h deleted file mode 100644 index 3a0d08ea0a..0000000000 --- a/include/rnc/ui/menus/item_preview/draw_item_preview_screen.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_DRAW_ITEM_PREVIEW_SCREEN_H -#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_DRAW_ITEM_PREVIEW_SCREEN_H - -#include "types.h" - -struct MenuScreen; - -s32 draw_item_preview_screen(struct MenuScreen *) __asm__("FUN_0021e110"); - -#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_DRAW_ITEM_PREVIEW_SCREEN_H */ diff --git a/include/rnc/ui/menus/item_preview/draw_menu_preview_objects.h b/include/rnc/ui/menus/item_preview/draw_menu_preview_objects.h deleted file mode 100644 index 2137109469..0000000000 --- a/include/rnc/ui/menus/item_preview/draw_menu_preview_objects.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_DRAW_MENU_PREVIEW_OBJECTS_H -#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_DRAW_MENU_PREVIEW_OBJECTS_H - -#include "types.h" - -struct MenuPreviewObjects; - -s32 draw_menu_preview_objects(struct MenuPreviewObjects *) __asm__("FUN_0021ddf8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_DRAW_MENU_PREVIEW_OBJECTS_H */ diff --git a/include/rnc/ui/menus/item_preview/enter_item_preview.h b/include/rnc/ui/menus/item_preview/enter_item_preview.h deleted file mode 100644 index d3c8c5de91..0000000000 --- a/include/rnc/ui/menus/item_preview/enter_item_preview.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_ENTER_ITEM_PREVIEW_H -#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_ENTER_ITEM_PREVIEW_H - -#include "types.h" - -struct MenuScreen; - -int enter_item_preview(struct MenuScreen *) __asm__("FUN_0021df30"); - -#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_ENTER_ITEM_PREVIEW_H */ diff --git a/include/rnc/ui/menus/item_preview/initialize_menu_preview_objects.h b/include/rnc/ui/menus/item_preview/initialize_menu_preview_objects.h deleted file mode 100644 index a5661ba6e3..0000000000 --- a/include/rnc/ui/menus/item_preview/initialize_menu_preview_objects.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_INITIALIZE_MENU_PREVIEW_OBJECTS_H -#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_INITIALIZE_MENU_PREVIEW_OBJECTS_H - -#include "types.h" - -struct MenuScreen; - -int initialize_menu_preview_objects(struct MenuScreen *) __asm__("FUN_002240c8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_INITIALIZE_MENU_PREVIEW_OBJECTS_H */ diff --git a/include/rnc/ui/menus/item_preview/load_preview_resource_bindings.h b/include/rnc/ui/menus/item_preview/load_preview_resource_bindings.h deleted file mode 100644 index 01991cba13..0000000000 --- a/include/rnc/ui/menus/item_preview/load_preview_resource_bindings.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_LOAD_PREVIEW_RESOURCE_BINDINGS_H -#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_LOAD_PREVIEW_RESOURCE_BINDINGS_H - -#include "types.h" - -void load_preview_resource_bindings(s32, s32) __asm__("FUN_00226848"); - -#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_LOAD_PREVIEW_RESOURCE_BINDINGS_H */ diff --git a/include/rnc/ui/menus/item_preview/release_item_preview_moby.h b/include/rnc/ui/menus/item_preview/release_item_preview_moby.h deleted file mode 100644 index 3e91790eca..0000000000 --- a/include/rnc/ui/menus/item_preview/release_item_preview_moby.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_RELEASE_ITEM_PREVIEW_MOBY_H -#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_RELEASE_ITEM_PREVIEW_MOBY_H - -#include "types.h" - -struct ItemPreviewLink; - -s32 release_item_preview_moby(struct ItemPreviewLink *) __asm__("FUN_0021eaf0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_RELEASE_ITEM_PREVIEW_MOBY_H */ diff --git a/include/rnc/ui/menus/item_preview/release_menu_preview_objects.h b/include/rnc/ui/menus/item_preview/release_menu_preview_objects.h deleted file mode 100644 index 9c52feadb1..0000000000 --- a/include/rnc/ui/menus/item_preview/release_menu_preview_objects.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_RELEASE_MENU_PREVIEW_OBJECTS_H -#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_RELEASE_MENU_PREVIEW_OBJECTS_H - -#include "types.h" - -s32 release_menu_preview_objects(s32) __asm__("FUN_002242b8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_RELEASE_MENU_PREVIEW_OBJECTS_H */ diff --git a/include/rnc/ui/menus/item_preview/rotate_item_preview_moby.h b/include/rnc/ui/menus/item_preview/rotate_item_preview_moby.h deleted file mode 100644 index f47bc78f28..0000000000 --- a/include/rnc/ui/menus/item_preview/rotate_item_preview_moby.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_ROTATE_ITEM_PREVIEW_MOBY_H -#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_ROTATE_ITEM_PREVIEW_MOBY_H - -#include "types.h" - -struct ItemPreviewRotation; - -void rotate_item_preview_moby(struct ItemPreviewRotation *) __asm__("FUN_0021e1f8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_ROTATE_ITEM_PREVIEW_MOBY_H */ diff --git a/include/rnc/ui/menus/item_preview/rotate_preview_moby_x.h b/include/rnc/ui/menus/item_preview/rotate_preview_moby_x.h deleted file mode 100644 index 51c00a2e93..0000000000 --- a/include/rnc/ui/menus/item_preview/rotate_preview_moby_x.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_ROTATE_PREVIEW_MOBY_X_H -#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_ROTATE_PREVIEW_MOBY_X_H - -#include "types.h" - -struct RotatingPreviewMoby; - -void rotate_preview_moby_x(struct RotatingPreviewMoby *) __asm__("FUN_0021f120"); - -#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_ROTATE_PREVIEW_MOBY_X_H */ diff --git a/include/rnc/ui/menus/item_preview/update_item_preview_binding.h b/include/rnc/ui/menus/item_preview/update_item_preview_binding.h deleted file mode 100644 index 2e2755936b..0000000000 --- a/include/rnc/ui/menus/item_preview/update_item_preview_binding.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_UPDATE_ITEM_PREVIEW_BINDING_H -#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_UPDATE_ITEM_PREVIEW_BINDING_H - -#include "types.h" - -struct ItemPreviewBinding; - -s32 update_item_preview_binding(struct ItemPreviewBinding *) __asm__("FUN_0021e230"); - -#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_UPDATE_ITEM_PREVIEW_BINDING_H */ diff --git a/include/rnc/ui/menus/item_preview/update_item_preview_moby.h b/include/rnc/ui/menus/item_preview/update_item_preview_moby.h deleted file mode 100644 index a129b80182..0000000000 --- a/include/rnc/ui/menus/item_preview/update_item_preview_moby.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_UPDATE_ITEM_PREVIEW_MOBY_H -#define LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_UPDATE_ITEM_PREVIEW_MOBY_H - -#include "types.h" - -struct MenuScreen; - -int update_item_preview_moby(struct MenuScreen *) __asm__("FUN_0021df98"); - -#endif /* LOMBYTE_RNC_UI_MENUS_ITEM_PREVIEW_UPDATE_ITEM_PREVIEW_MOBY_H */ diff --git a/include/rnc/ui/menus/missions.h b/include/rnc/ui/menus/missions.h new file mode 100644 index 0000000000..60cbe5d373 --- /dev/null +++ b/include/rnc/ui/menus/missions.h @@ -0,0 +1,17 @@ +#ifndef LOMBYTE_RNC_UI_MENUS_MISSIONS_H +#define LOMBYTE_RNC_UI_MENUS_MISSIONS_H + +#include "types.h" + +struct Menu; +struct MenuScreen; +struct MissionsMenu; +struct Obj; + +s32 draw_mission_menu_labels(void) __asm__("FUN_0021f5f8"); +s32 draw_missions_menu(struct Menu *) __asm__("FUN_0021f368"); +s32 draw_missions_menu2(struct MissionsMenu *) __asm__("FUN_0021f688"); +s32 enter_menu_mission_list(struct Obj *) __asm__("FUN_0021c420"); +s32 update_menu_mission_list(struct MenuScreen *) __asm__("FUN_0021c4c0"); + +#endif /* LOMBYTE_RNC_UI_MENUS_MISSIONS_H */ diff --git a/include/rnc/ui/menus/missions/draw_mission_menu_labels.h b/include/rnc/ui/menus/missions/draw_mission_menu_labels.h deleted file mode 100644 index 67da8e962a..0000000000 --- a/include/rnc/ui/menus/missions/draw_mission_menu_labels.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_MISSIONS_DRAW_MISSION_MENU_LABELS_H -#define LOMBYTE_RNC_UI_MENUS_MISSIONS_DRAW_MISSION_MENU_LABELS_H - -#include "types.h" - -s32 draw_mission_menu_labels(void) __asm__("FUN_0021f5f8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_MISSIONS_DRAW_MISSION_MENU_LABELS_H */ diff --git a/include/rnc/ui/menus/missions/draw_missions_menu.h b/include/rnc/ui/menus/missions/draw_missions_menu.h deleted file mode 100644 index 1c48e2ea14..0000000000 --- a/include/rnc/ui/menus/missions/draw_missions_menu.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_MISSIONS_DRAW_MISSIONS_MENU_H -#define LOMBYTE_RNC_UI_MENUS_MISSIONS_DRAW_MISSIONS_MENU_H - -#include "types.h" - -struct Menu; - -s32 draw_missions_menu(struct Menu *) __asm__("FUN_0021f368"); - -#endif /* LOMBYTE_RNC_UI_MENUS_MISSIONS_DRAW_MISSIONS_MENU_H */ diff --git a/include/rnc/ui/menus/missions/draw_missions_menu2.h b/include/rnc/ui/menus/missions/draw_missions_menu2.h deleted file mode 100644 index f666a49d27..0000000000 --- a/include/rnc/ui/menus/missions/draw_missions_menu2.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_MISSIONS_DRAW_MISSIONS_MENU2_H -#define LOMBYTE_RNC_UI_MENUS_MISSIONS_DRAW_MISSIONS_MENU2_H - -#include "types.h" - -struct MissionsMenu; - -s32 draw_missions_menu2(struct MissionsMenu *) __asm__("FUN_0021f688"); - -#endif /* LOMBYTE_RNC_UI_MENUS_MISSIONS_DRAW_MISSIONS_MENU2_H */ diff --git a/include/rnc/ui/menus/missions/enter_menu_mission_list.h b/include/rnc/ui/menus/missions/enter_menu_mission_list.h deleted file mode 100644 index 42904ec6fc..0000000000 --- a/include/rnc/ui/menus/missions/enter_menu_mission_list.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_MISSIONS_ENTER_MENU_MISSION_LIST_H -#define LOMBYTE_RNC_UI_MENUS_MISSIONS_ENTER_MENU_MISSION_LIST_H - -#include "types.h" - -struct Obj; - -s32 enter_menu_mission_list(struct Obj *) __asm__("FUN_0021c420"); - -#endif /* LOMBYTE_RNC_UI_MENUS_MISSIONS_ENTER_MENU_MISSION_LIST_H */ diff --git a/include/rnc/ui/menus/missions/update_menu_mission_list.h b/include/rnc/ui/menus/missions/update_menu_mission_list.h deleted file mode 100644 index 9569e80c50..0000000000 --- a/include/rnc/ui/menus/missions/update_menu_mission_list.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_MISSIONS_UPDATE_MENU_MISSION_LIST_H -#define LOMBYTE_RNC_UI_MENUS_MISSIONS_UPDATE_MENU_MISSION_LIST_H - -#include "types.h" - -struct MenuScreen; - -s32 update_menu_mission_list(struct MenuScreen *) __asm__("FUN_0021c4c0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_MISSIONS_UPDATE_MENU_MISSION_LIST_H */ diff --git a/include/rnc/ui/menus/options.h b/include/rnc/ui/menus/options.h new file mode 100644 index 0000000000..c1ced84bbf --- /dev/null +++ b/include/rnc/ui/menus/options.h @@ -0,0 +1,15 @@ +#ifndef LOMBYTE_RNC_UI_MENUS_OPTIONS_H +#define LOMBYTE_RNC_UI_MENUS_OPTIONS_H + +#include "types.h" + +struct CheatsMenu; +struct MenuScreen; +struct SoundMenu; + +s32 draw_cheats_menu(struct CheatsMenu *) __asm__("FUN_00221030"); +s32 draw_sound_menu(struct MenuScreen *) __asm__("FUN_0021ce00"); +int set_pause_sound_volume(void) __asm__("FUN_0021cb00"); +s32 sound_options_menu(struct SoundMenu *) __asm__("FUN_0021cb30"); + +#endif /* LOMBYTE_RNC_UI_MENUS_OPTIONS_H */ diff --git a/include/rnc/ui/menus/options/draw_cheats_menu.h b/include/rnc/ui/menus/options/draw_cheats_menu.h deleted file mode 100644 index 3b8eb54675..0000000000 --- a/include/rnc/ui/menus/options/draw_cheats_menu.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_OPTIONS_DRAW_CHEATS_MENU_H -#define LOMBYTE_RNC_UI_MENUS_OPTIONS_DRAW_CHEATS_MENU_H - -#include "types.h" - -struct CheatsMenu; - -s32 draw_cheats_menu(struct CheatsMenu *) __asm__("FUN_00221030"); - -#endif /* LOMBYTE_RNC_UI_MENUS_OPTIONS_DRAW_CHEATS_MENU_H */ diff --git a/include/rnc/ui/menus/options/draw_sound_menu.h b/include/rnc/ui/menus/options/draw_sound_menu.h deleted file mode 100644 index c3b8776e21..0000000000 --- a/include/rnc/ui/menus/options/draw_sound_menu.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_OPTIONS_DRAW_SOUND_MENU_H -#define LOMBYTE_RNC_UI_MENUS_OPTIONS_DRAW_SOUND_MENU_H - -#include "types.h" - -struct MenuScreen; - -s32 draw_sound_menu(struct MenuScreen *) __asm__("FUN_0021ce00"); - -#endif /* LOMBYTE_RNC_UI_MENUS_OPTIONS_DRAW_SOUND_MENU_H */ diff --git a/include/rnc/ui/menus/options/set_pause_sound_volume.h b/include/rnc/ui/menus/options/set_pause_sound_volume.h deleted file mode 100644 index 89bb21581d..0000000000 --- a/include/rnc/ui/menus/options/set_pause_sound_volume.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_OPTIONS_SET_PAUSE_SOUND_VOLUME_H -#define LOMBYTE_RNC_UI_MENUS_OPTIONS_SET_PAUSE_SOUND_VOLUME_H - -#include "types.h" - -int set_pause_sound_volume(void) __asm__("FUN_0021cb00"); - -#endif /* LOMBYTE_RNC_UI_MENUS_OPTIONS_SET_PAUSE_SOUND_VOLUME_H */ diff --git a/include/rnc/ui/menus/options/sound_options_menu.h b/include/rnc/ui/menus/options/sound_options_menu.h deleted file mode 100644 index dec3511c84..0000000000 --- a/include/rnc/ui/menus/options/sound_options_menu.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_OPTIONS_SOUND_OPTIONS_MENU_H -#define LOMBYTE_RNC_UI_MENUS_OPTIONS_SOUND_OPTIONS_MENU_H - -#include "types.h" - -struct SoundMenu; - -s32 sound_options_menu(struct SoundMenu *) __asm__("FUN_0021cb30"); - -#endif /* LOMBYTE_RNC_UI_MENUS_OPTIONS_SOUND_OPTIONS_MENU_H */ diff --git a/include/rnc/ui/menus/pause.h b/include/rnc/ui/menus/pause.h new file mode 100644 index 0000000000..6c2250db60 --- /dev/null +++ b/include/rnc/ui/menus/pause.h @@ -0,0 +1,20 @@ +#ifndef LOMBYTE_RNC_UI_MENUS_PAUSE_H +#define LOMBYTE_RNC_UI_MENUS_PAUSE_H + +#include "types.h" + +struct MenuScreen; +struct PauseState; + +int assign_heli_pack_label_text_table(void *) __asm__("FUN_0021ca98"); +int assign_pause_level_sprite_list(char *) __asm__("FUN_00221d28"); +int build_pause_item_list(void) __asm__("FUN_002215f8"); +s32 draw_pause_ring(struct PauseState *) __asm__("FUN_00220b20"); +s32 draw_quit_game_menu(struct MenuScreen *) __asm__("FUN_0021e890"); +int find_next_pause_page(struct MenuScreen *, int) __asm__("FUN_0021b7a8"); +int pause_page_enter_noop(void) __asm__("FUN_002217f8"); +int pause_stage_sprite_lists(u32 *) __asm__("FUN_0021ca60"); +int set_menu_pause_flag_state(struct MenuScreen *) __asm__("FUN_0021ddd0"); +int set_pause_action_list(int *) __asm__("FUN_0021a1b0"); + +#endif /* LOMBYTE_RNC_UI_MENUS_PAUSE_H */ diff --git a/include/rnc/ui/menus/pause/assign_heli_pack_label_text_table.h b/include/rnc/ui/menus/pause/assign_heli_pack_label_text_table.h deleted file mode 100644 index 905aa54419..0000000000 --- a/include/rnc/ui/menus/pause/assign_heli_pack_label_text_table.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_PAUSE_ASSIGN_HELI_PACK_LABEL_TEXT_TABLE_H -#define LOMBYTE_RNC_UI_MENUS_PAUSE_ASSIGN_HELI_PACK_LABEL_TEXT_TABLE_H - -#include "types.h" - -int assign_heli_pack_label_text_table(void *) __asm__("FUN_0021ca98"); - -#endif /* LOMBYTE_RNC_UI_MENUS_PAUSE_ASSIGN_HELI_PACK_LABEL_TEXT_TABLE_H */ diff --git a/include/rnc/ui/menus/pause/assign_pause_level_sprite_list.h b/include/rnc/ui/menus/pause/assign_pause_level_sprite_list.h deleted file mode 100644 index dfafddc0bd..0000000000 --- a/include/rnc/ui/menus/pause/assign_pause_level_sprite_list.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_PAUSE_ASSIGN_PAUSE_LEVEL_SPRITE_LIST_H -#define LOMBYTE_RNC_UI_MENUS_PAUSE_ASSIGN_PAUSE_LEVEL_SPRITE_LIST_H - -#include "types.h" - -int assign_pause_level_sprite_list(char *) __asm__("FUN_00221d28"); - -#endif /* LOMBYTE_RNC_UI_MENUS_PAUSE_ASSIGN_PAUSE_LEVEL_SPRITE_LIST_H */ diff --git a/include/rnc/ui/menus/pause/build_pause_item_list.h b/include/rnc/ui/menus/pause/build_pause_item_list.h deleted file mode 100644 index 11bba51aef..0000000000 --- a/include/rnc/ui/menus/pause/build_pause_item_list.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_PAUSE_BUILD_PAUSE_ITEM_LIST_H -#define LOMBYTE_RNC_UI_MENUS_PAUSE_BUILD_PAUSE_ITEM_LIST_H - -#include "types.h" - -int build_pause_item_list(void) __asm__("FUN_002215f8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_PAUSE_BUILD_PAUSE_ITEM_LIST_H */ diff --git a/include/rnc/ui/menus/pause/draw_pause_ring.h b/include/rnc/ui/menus/pause/draw_pause_ring.h deleted file mode 100644 index 55795d2a54..0000000000 --- a/include/rnc/ui/menus/pause/draw_pause_ring.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_PAUSE_DRAW_PAUSE_RING_H -#define LOMBYTE_RNC_UI_MENUS_PAUSE_DRAW_PAUSE_RING_H - -#include "types.h" - -struct PauseState; - -s32 draw_pause_ring(struct PauseState *) __asm__("FUN_00220b20"); - -#endif /* LOMBYTE_RNC_UI_MENUS_PAUSE_DRAW_PAUSE_RING_H */ diff --git a/include/rnc/ui/menus/pause/draw_quit_game_menu.h b/include/rnc/ui/menus/pause/draw_quit_game_menu.h deleted file mode 100644 index 17ac1a58a8..0000000000 --- a/include/rnc/ui/menus/pause/draw_quit_game_menu.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_PAUSE_DRAW_QUIT_GAME_MENU_H -#define LOMBYTE_RNC_UI_MENUS_PAUSE_DRAW_QUIT_GAME_MENU_H - -#include "types.h" - -struct MenuScreen; - -s32 draw_quit_game_menu(struct MenuScreen *) __asm__("FUN_0021e890"); - -#endif /* LOMBYTE_RNC_UI_MENUS_PAUSE_DRAW_QUIT_GAME_MENU_H */ diff --git a/include/rnc/ui/menus/pause/find_next_pause_page.h b/include/rnc/ui/menus/pause/find_next_pause_page.h deleted file mode 100644 index 63e4abdd7f..0000000000 --- a/include/rnc/ui/menus/pause/find_next_pause_page.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_PAUSE_FIND_NEXT_PAUSE_PAGE_H -#define LOMBYTE_RNC_UI_MENUS_PAUSE_FIND_NEXT_PAUSE_PAGE_H - -#include "types.h" - -struct MenuScreen; - -int find_next_pause_page(struct MenuScreen *, int) __asm__("FUN_0021b7a8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_PAUSE_FIND_NEXT_PAUSE_PAGE_H */ diff --git a/include/rnc/ui/menus/pause/pause_page_enter_noop.h b/include/rnc/ui/menus/pause/pause_page_enter_noop.h deleted file mode 100644 index 8fa51ae8ca..0000000000 --- a/include/rnc/ui/menus/pause/pause_page_enter_noop.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_PAUSE_PAUSE_PAGE_ENTER_NOOP_H -#define LOMBYTE_RNC_UI_MENUS_PAUSE_PAUSE_PAGE_ENTER_NOOP_H - -#include "types.h" - -int pause_page_enter_noop(void) __asm__("FUN_002217f8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_PAUSE_PAUSE_PAGE_ENTER_NOOP_H */ diff --git a/include/rnc/ui/menus/pause/pause_stage_sprite_lists.h b/include/rnc/ui/menus/pause/pause_stage_sprite_lists.h deleted file mode 100644 index ed5ef4eade..0000000000 --- a/include/rnc/ui/menus/pause/pause_stage_sprite_lists.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_PAUSE_PAUSE_STAGE_SPRITE_LISTS_H -#define LOMBYTE_RNC_UI_MENUS_PAUSE_PAUSE_STAGE_SPRITE_LISTS_H - -#include "types.h" - -int pause_stage_sprite_lists(u32 *) __asm__("FUN_0021ca60"); - -#endif /* LOMBYTE_RNC_UI_MENUS_PAUSE_PAUSE_STAGE_SPRITE_LISTS_H */ diff --git a/include/rnc/ui/menus/pause/set_menu_pause_flag_state.h b/include/rnc/ui/menus/pause/set_menu_pause_flag_state.h deleted file mode 100644 index c5fa4100a3..0000000000 --- a/include/rnc/ui/menus/pause/set_menu_pause_flag_state.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_PAUSE_SET_MENU_PAUSE_FLAG_STATE_H -#define LOMBYTE_RNC_UI_MENUS_PAUSE_SET_MENU_PAUSE_FLAG_STATE_H - -#include "types.h" - -struct MenuScreen; - -int set_menu_pause_flag_state(struct MenuScreen *) __asm__("FUN_0021ddd0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_PAUSE_SET_MENU_PAUSE_FLAG_STATE_H */ diff --git a/include/rnc/ui/menus/pause/set_pause_action_list.h b/include/rnc/ui/menus/pause/set_pause_action_list.h deleted file mode 100644 index 9c1d4e9668..0000000000 --- a/include/rnc/ui/menus/pause/set_pause_action_list.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_PAUSE_SET_PAUSE_ACTION_LIST_H -#define LOMBYTE_RNC_UI_MENUS_PAUSE_SET_PAUSE_ACTION_LIST_H - -#include "types.h" - -int set_pause_action_list(int *) __asm__("FUN_0021a1b0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_PAUSE_SET_PAUSE_ACTION_LIST_H */ diff --git a/include/rnc/ui/menus/save_data.h b/include/rnc/ui/menus/save_data.h new file mode 100644 index 0000000000..d56b986826 --- /dev/null +++ b/include/rnc/ui/menus/save_data.h @@ -0,0 +1,45 @@ +#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_H +#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_H + +#include "types.h" + +struct LoadMenuDescriptor; +struct MenuScreen; + +s32 draw_checking_memory_card_data_menu(struct MenuScreen *) __asm__("FUN_00220348"); +s32 draw_save_slot_list(struct MenuScreen *) __asm__("FUN_002239e0"); +s32 enter_save_slot_screen(struct MenuScreen *) __asm__("FUN_00222f18"); +s32 leave_save_slot_screen(struct MenuScreen *) __asm__("FUN_00222f58"); +s32 loading_data_menu(struct LoadMenuDescriptor *) __asm__("FUN_002232d8"); +void prepare_save_game(int, int) __asm__("FUN_002269c0"); +int reset_pause_memory_card_state(void) __asm__("FUN_0021cac8"); +void save_card_state_check_save(void) __asm__("FUN_00208bc0"); +void save_card_state_checking_save(void) __asm__("FUN_00208c00"); +void save_card_state_create_failed(void) __asm__("FUN_00208e90"); +void save_card_state_create_save_pending(void) __asm__("FUN_00208d20"); +void save_card_state_creating_save(void) __asm__("FUN_00208d60"); +void save_card_state_format_failed(void) __asm__("FUN_00208e68"); +void save_card_state_format_pending(void) __asm__("FUN_00208af8"); +void save_card_state_formatted(void) __asm__("FUN_00208b88"); +void save_card_state_formatting(void) __asm__("FUN_00208b28"); +void save_card_state_good_save(void) __asm__("FUN_002088d0"); +void save_card_state_init(void) __asm__("FUN_002088a8"); +void save_card_state_load_failed(void) __asm__("FUN_00208ed8"); +void save_card_state_new_card(void) __asm__("FUN_00208dd8"); +void save_card_state_no_card(void) __asm__("FUN_002089a8"); +void save_card_state_no_room(void) __asm__("FUN_00208eb8"); +void save_card_state_no_save(void) __asm__("FUN_00208c70"); +void save_card_state_prompt_begin_no_save(void) __asm__("FUN_00208fe8"); +void save_card_state_prompt_begin_unformatted(void) __asm__("FUN_00208fa0"); +void save_card_state_prompt_create_save(void) __asm__("FUN_00208ca8"); +void save_card_state_prompt_format(void) __asm__("FUN_00208a78"); +void save_card_state_save_failed(void) __asm__("FUN_00208f00"); +void save_card_state_saving(void) __asm__("FUN_00208f28"); +void save_card_state_unformatted(void) __asm__("FUN_00208a38"); +void save_card_state_wait_for_card(void) __asm__("FUN_002089d0"); +void save_card_state_warning(void) __asm__("FUN_00208980"); +s32 saving_data_menu(struct MenuScreen *) __asm__("FUN_00222f88"); +s32 saving_data_menu2(struct MenuScreen *) __asm__("FUN_002235b8"); +void start_memory_card_save(s32, s32) __asm__("FUN_00226a70"); + +#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_H */ diff --git a/include/rnc/ui/menus/save_data/draw_checking_memory_card_data_menu.h b/include/rnc/ui/menus/save_data/draw_checking_memory_card_data_menu.h deleted file mode 100644 index d9d686ecc6..0000000000 --- a/include/rnc/ui/menus/save_data/draw_checking_memory_card_data_menu.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_DRAW_CHECKING_MEMORY_CARD_DATA_MENU_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_DRAW_CHECKING_MEMORY_CARD_DATA_MENU_H - -#include "types.h" - -struct MenuScreen; - -s32 draw_checking_memory_card_data_menu(struct MenuScreen *) __asm__("FUN_00220348"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_DRAW_CHECKING_MEMORY_CARD_DATA_MENU_H */ diff --git a/include/rnc/ui/menus/save_data/draw_save_slot_list.h b/include/rnc/ui/menus/save_data/draw_save_slot_list.h deleted file mode 100644 index 28a96ea475..0000000000 --- a/include/rnc/ui/menus/save_data/draw_save_slot_list.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_DRAW_SAVE_SLOT_LIST_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_DRAW_SAVE_SLOT_LIST_H - -#include "types.h" - -struct MenuScreen; - -s32 draw_save_slot_list(struct MenuScreen *) __asm__("FUN_002239e0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_DRAW_SAVE_SLOT_LIST_H */ diff --git a/include/rnc/ui/menus/save_data/enter_save_slot_screen.h b/include/rnc/ui/menus/save_data/enter_save_slot_screen.h deleted file mode 100644 index 85522dd572..0000000000 --- a/include/rnc/ui/menus/save_data/enter_save_slot_screen.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_ENTER_SAVE_SLOT_SCREEN_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_ENTER_SAVE_SLOT_SCREEN_H - -#include "types.h" - -struct MenuScreen; - -s32 enter_save_slot_screen(struct MenuScreen *) __asm__("FUN_00222f18"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_ENTER_SAVE_SLOT_SCREEN_H */ diff --git a/include/rnc/ui/menus/save_data/leave_save_slot_screen.h b/include/rnc/ui/menus/save_data/leave_save_slot_screen.h deleted file mode 100644 index 6e30c6a0a0..0000000000 --- a/include/rnc/ui/menus/save_data/leave_save_slot_screen.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_LEAVE_SAVE_SLOT_SCREEN_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_LEAVE_SAVE_SLOT_SCREEN_H - -#include "types.h" - -struct MenuScreen; - -s32 leave_save_slot_screen(struct MenuScreen *) __asm__("FUN_00222f58"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_LEAVE_SAVE_SLOT_SCREEN_H */ diff --git a/include/rnc/ui/menus/save_data/loading_data_menu.h b/include/rnc/ui/menus/save_data/loading_data_menu.h deleted file mode 100644 index 586508398c..0000000000 --- a/include/rnc/ui/menus/save_data/loading_data_menu.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_LOADING_DATA_MENU_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_LOADING_DATA_MENU_H - -#include "types.h" - -struct LoadMenuDescriptor; - -s32 loading_data_menu(struct LoadMenuDescriptor *) __asm__("FUN_002232d8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_LOADING_DATA_MENU_H */ diff --git a/include/rnc/ui/menus/save_data/prepare_save_game.h b/include/rnc/ui/menus/save_data/prepare_save_game.h deleted file mode 100644 index 29cddb2274..0000000000 --- a/include/rnc/ui/menus/save_data/prepare_save_game.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_PREPARE_SAVE_GAME_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_PREPARE_SAVE_GAME_H - -#include "types.h" - -void prepare_save_game(int, int) __asm__("FUN_002269c0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_PREPARE_SAVE_GAME_H */ diff --git a/include/rnc/ui/menus/save_data/reset_pause_memory_card_state.h b/include/rnc/ui/menus/save_data/reset_pause_memory_card_state.h deleted file mode 100644 index 3616b0d85d..0000000000 --- a/include/rnc/ui/menus/save_data/reset_pause_memory_card_state.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_RESET_PAUSE_MEMORY_CARD_STATE_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_RESET_PAUSE_MEMORY_CARD_STATE_H - -#include "types.h" - -int reset_pause_memory_card_state(void) __asm__("FUN_0021cac8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_RESET_PAUSE_MEMORY_CARD_STATE_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_check_save.h b/include/rnc/ui/menus/save_data/save_card_state_check_save.h deleted file mode 100644 index 0b9232c20c..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_check_save.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_CHECK_SAVE_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_CHECK_SAVE_H - -#include "types.h" - -void save_card_state_check_save(void) __asm__("FUN_00208bc0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_CHECK_SAVE_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_checking_save.h b/include/rnc/ui/menus/save_data/save_card_state_checking_save.h deleted file mode 100644 index 3366475042..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_checking_save.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_CHECKING_SAVE_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_CHECKING_SAVE_H - -#include "types.h" - -void save_card_state_checking_save(void) __asm__("FUN_00208c00"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_CHECKING_SAVE_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_create_failed.h b/include/rnc/ui/menus/save_data/save_card_state_create_failed.h deleted file mode 100644 index 1f41b2a4f6..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_create_failed.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_CREATE_FAILED_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_CREATE_FAILED_H - -#include "types.h" - -void save_card_state_create_failed(void) __asm__("FUN_00208e90"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_CREATE_FAILED_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_create_save_pending.h b/include/rnc/ui/menus/save_data/save_card_state_create_save_pending.h deleted file mode 100644 index b0327fe79a..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_create_save_pending.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_CREATE_SAVE_PENDING_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_CREATE_SAVE_PENDING_H - -#include "types.h" - -void save_card_state_create_save_pending(void) __asm__("FUN_00208d20"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_CREATE_SAVE_PENDING_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_creating_save.h b/include/rnc/ui/menus/save_data/save_card_state_creating_save.h deleted file mode 100644 index b6846cdc39..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_creating_save.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_CREATING_SAVE_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_CREATING_SAVE_H - -#include "types.h" - -void save_card_state_creating_save(void) __asm__("FUN_00208d60"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_CREATING_SAVE_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_format_failed.h b/include/rnc/ui/menus/save_data/save_card_state_format_failed.h deleted file mode 100644 index 9b165947d7..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_format_failed.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_FORMAT_FAILED_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_FORMAT_FAILED_H - -#include "types.h" - -void save_card_state_format_failed(void) __asm__("FUN_00208e68"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_FORMAT_FAILED_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_format_pending.h b/include/rnc/ui/menus/save_data/save_card_state_format_pending.h deleted file mode 100644 index 8838487294..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_format_pending.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_FORMAT_PENDING_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_FORMAT_PENDING_H - -#include "types.h" - -void save_card_state_format_pending(void) __asm__("FUN_00208af8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_FORMAT_PENDING_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_formatted.h b/include/rnc/ui/menus/save_data/save_card_state_formatted.h deleted file mode 100644 index 20fa9d83c2..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_formatted.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_FORMATTED_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_FORMATTED_H - -#include "types.h" - -void save_card_state_formatted(void) __asm__("FUN_00208b88"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_FORMATTED_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_formatting.h b/include/rnc/ui/menus/save_data/save_card_state_formatting.h deleted file mode 100644 index 726e753d97..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_formatting.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_FORMATTING_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_FORMATTING_H - -#include "types.h" - -void save_card_state_formatting(void) __asm__("FUN_00208b28"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_FORMATTING_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_good_save.h b/include/rnc/ui/menus/save_data/save_card_state_good_save.h deleted file mode 100644 index d482283c7f..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_good_save.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_GOOD_SAVE_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_GOOD_SAVE_H - -#include "types.h" - -void save_card_state_good_save(void) __asm__("FUN_002088d0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_GOOD_SAVE_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_init.h b/include/rnc/ui/menus/save_data/save_card_state_init.h deleted file mode 100644 index 9358d45254..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_init.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_INIT_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_INIT_H - -#include "types.h" - -void save_card_state_init(void) __asm__("FUN_002088a8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_INIT_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_load_failed.h b/include/rnc/ui/menus/save_data/save_card_state_load_failed.h deleted file mode 100644 index d4d566500b..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_load_failed.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_LOAD_FAILED_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_LOAD_FAILED_H - -#include "types.h" - -void save_card_state_load_failed(void) __asm__("FUN_00208ed8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_LOAD_FAILED_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_new_card.h b/include/rnc/ui/menus/save_data/save_card_state_new_card.h deleted file mode 100644 index 008b6ffdf6..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_new_card.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_NEW_CARD_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_NEW_CARD_H - -#include "types.h" - -void save_card_state_new_card(void) __asm__("FUN_00208dd8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_NEW_CARD_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_no_card.h b/include/rnc/ui/menus/save_data/save_card_state_no_card.h deleted file mode 100644 index 237afd7760..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_no_card.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_NO_CARD_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_NO_CARD_H - -#include "types.h" - -void save_card_state_no_card(void) __asm__("FUN_002089a8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_NO_CARD_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_no_room.h b/include/rnc/ui/menus/save_data/save_card_state_no_room.h deleted file mode 100644 index c591949efc..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_no_room.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_NO_ROOM_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_NO_ROOM_H - -#include "types.h" - -void save_card_state_no_room(void) __asm__("FUN_00208eb8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_NO_ROOM_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_no_save.h b/include/rnc/ui/menus/save_data/save_card_state_no_save.h deleted file mode 100644 index b052f59a90..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_no_save.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_NO_SAVE_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_NO_SAVE_H - -#include "types.h" - -void save_card_state_no_save(void) __asm__("FUN_00208c70"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_NO_SAVE_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_prompt_begin_no_save.h b/include/rnc/ui/menus/save_data/save_card_state_prompt_begin_no_save.h deleted file mode 100644 index 154b060904..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_prompt_begin_no_save.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_PROMPT_BEGIN_NO_SAVE_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_PROMPT_BEGIN_NO_SAVE_H - -#include "types.h" - -void save_card_state_prompt_begin_no_save(void) __asm__("FUN_00208fe8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_PROMPT_BEGIN_NO_SAVE_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_prompt_begin_unformatted.h b/include/rnc/ui/menus/save_data/save_card_state_prompt_begin_unformatted.h deleted file mode 100644 index c45f5aa1a7..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_prompt_begin_unformatted.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_PROMPT_BEGIN_UNFORMATTED_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_PROMPT_BEGIN_UNFORMATTED_H - -#include "types.h" - -void save_card_state_prompt_begin_unformatted(void) __asm__("FUN_00208fa0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_PROMPT_BEGIN_UNFORMATTED_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_prompt_create_save.h b/include/rnc/ui/menus/save_data/save_card_state_prompt_create_save.h deleted file mode 100644 index 677227be6a..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_prompt_create_save.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_PROMPT_CREATE_SAVE_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_PROMPT_CREATE_SAVE_H - -#include "types.h" - -void save_card_state_prompt_create_save(void) __asm__("FUN_00208ca8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_PROMPT_CREATE_SAVE_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_prompt_format.h b/include/rnc/ui/menus/save_data/save_card_state_prompt_format.h deleted file mode 100644 index 1123ccc706..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_prompt_format.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_PROMPT_FORMAT_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_PROMPT_FORMAT_H - -#include "types.h" - -void save_card_state_prompt_format(void) __asm__("FUN_00208a78"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_PROMPT_FORMAT_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_save_failed.h b/include/rnc/ui/menus/save_data/save_card_state_save_failed.h deleted file mode 100644 index 00dabca8d7..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_save_failed.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_SAVE_FAILED_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_SAVE_FAILED_H - -#include "types.h" - -void save_card_state_save_failed(void) __asm__("FUN_00208f00"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_SAVE_FAILED_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_saving.h b/include/rnc/ui/menus/save_data/save_card_state_saving.h deleted file mode 100644 index c6bdafed77..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_saving.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_SAVING_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_SAVING_H - -#include "types.h" - -void save_card_state_saving(void) __asm__("FUN_00208f28"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_SAVING_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_unformatted.h b/include/rnc/ui/menus/save_data/save_card_state_unformatted.h deleted file mode 100644 index 8de5a9088c..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_unformatted.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_UNFORMATTED_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_UNFORMATTED_H - -#include "types.h" - -void save_card_state_unformatted(void) __asm__("FUN_00208a38"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_UNFORMATTED_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_wait_for_card.h b/include/rnc/ui/menus/save_data/save_card_state_wait_for_card.h deleted file mode 100644 index 64b5bdd458..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_wait_for_card.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_WAIT_FOR_CARD_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_WAIT_FOR_CARD_H - -#include "types.h" - -void save_card_state_wait_for_card(void) __asm__("FUN_002089d0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_WAIT_FOR_CARD_H */ diff --git a/include/rnc/ui/menus/save_data/save_card_state_warning.h b/include/rnc/ui/menus/save_data/save_card_state_warning.h deleted file mode 100644 index fc217c0ea1..0000000000 --- a/include/rnc/ui/menus/save_data/save_card_state_warning.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_WARNING_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_WARNING_H - -#include "types.h" - -void save_card_state_warning(void) __asm__("FUN_00208980"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVE_CARD_STATE_WARNING_H */ diff --git a/include/rnc/ui/menus/save_data/saving_data_menu.h b/include/rnc/ui/menus/save_data/saving_data_menu.h deleted file mode 100644 index 47e5f7a325..0000000000 --- a/include/rnc/ui/menus/save_data/saving_data_menu.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVING_DATA_MENU_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVING_DATA_MENU_H - -#include "types.h" - -struct MenuScreen; - -s32 saving_data_menu(struct MenuScreen *) __asm__("FUN_00222f88"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVING_DATA_MENU_H */ diff --git a/include/rnc/ui/menus/save_data/saving_data_menu2.h b/include/rnc/ui/menus/save_data/saving_data_menu2.h deleted file mode 100644 index ca7d4c187f..0000000000 --- a/include/rnc/ui/menus/save_data/saving_data_menu2.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVING_DATA_MENU2_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVING_DATA_MENU2_H - -#include "types.h" - -struct MenuScreen; - -s32 saving_data_menu2(struct MenuScreen *) __asm__("FUN_002235b8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_SAVING_DATA_MENU2_H */ diff --git a/include/rnc/ui/menus/save_data/start_memory_card_save.h b/include/rnc/ui/menus/save_data/start_memory_card_save.h deleted file mode 100644 index 4b68764347..0000000000 --- a/include/rnc/ui/menus/save_data/start_memory_card_save.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SAVE_DATA_START_MEMORY_CARD_SAVE_H -#define LOMBYTE_RNC_UI_MENUS_SAVE_DATA_START_MEMORY_CARD_SAVE_H - -#include "types.h" - -void start_memory_card_save(s32, s32) __asm__("FUN_00226a70"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SAVE_DATA_START_MEMORY_CARD_SAVE_H */ diff --git a/include/rnc/ui/menus/selection.h b/include/rnc/ui/menus/selection.h new file mode 100644 index 0000000000..e67e390453 --- /dev/null +++ b/include/rnc/ui/menus/selection.h @@ -0,0 +1,17 @@ +#ifndef LOMBYTE_RNC_UI_MENUS_SELECTION_H +#define LOMBYTE_RNC_UI_MENUS_SELECTION_H + +#include "types.h" + +struct MenuScreen; + +s32 build_filtered_menu_item_list(void) __asm__("FUN_002216c0"); +s32 handle_cyclic_menu_selection_input(struct MenuScreen *) __asm__("FUN_00221d68"); +void load_selection_list(struct MenuScreen *, s32) __asm__("FUN_0021c9c8"); +s32 update_menu_cycle_selection(struct MenuScreen *) __asm__("FUN_00221e50"); +s32 update_menu_grid_selection(struct MenuScreen *) __asm__("FUN_0021b858"); +int update_menu_icon_list(struct MenuScreen *) __asm__("FUN_00219e10"); +s32 update_menu_item_slots(struct MenuScreen *) __asm__("FUN_0021c7a0"); +s32 update_menu_option_list(struct MenuScreen *) __asm__("FUN_00220e28"); + +#endif /* LOMBYTE_RNC_UI_MENUS_SELECTION_H */ diff --git a/include/rnc/ui/menus/selection/build_filtered_menu_item_list.h b/include/rnc/ui/menus/selection/build_filtered_menu_item_list.h deleted file mode 100644 index d662abc662..0000000000 --- a/include/rnc/ui/menus/selection/build_filtered_menu_item_list.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SELECTION_BUILD_FILTERED_MENU_ITEM_LIST_H -#define LOMBYTE_RNC_UI_MENUS_SELECTION_BUILD_FILTERED_MENU_ITEM_LIST_H - -#include "types.h" - -s32 build_filtered_menu_item_list(void) __asm__("FUN_002216c0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SELECTION_BUILD_FILTERED_MENU_ITEM_LIST_H */ diff --git a/include/rnc/ui/menus/selection/handle_cyclic_menu_selection_input.h b/include/rnc/ui/menus/selection/handle_cyclic_menu_selection_input.h deleted file mode 100644 index 9d9420c90e..0000000000 --- a/include/rnc/ui/menus/selection/handle_cyclic_menu_selection_input.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SELECTION_HANDLE_CYCLIC_MENU_SELECTION_INPUT_H -#define LOMBYTE_RNC_UI_MENUS_SELECTION_HANDLE_CYCLIC_MENU_SELECTION_INPUT_H - -#include "types.h" - -struct MenuScreen; - -s32 handle_cyclic_menu_selection_input(struct MenuScreen *) __asm__("FUN_00221d68"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SELECTION_HANDLE_CYCLIC_MENU_SELECTION_INPUT_H */ diff --git a/include/rnc/ui/menus/selection/load_selection_list.h b/include/rnc/ui/menus/selection/load_selection_list.h deleted file mode 100644 index 8d58e1917e..0000000000 --- a/include/rnc/ui/menus/selection/load_selection_list.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SELECTION_LOAD_SELECTION_LIST_H -#define LOMBYTE_RNC_UI_MENUS_SELECTION_LOAD_SELECTION_LIST_H - -#include "types.h" - -struct MenuScreen; - -void load_selection_list(struct MenuScreen *, s32) __asm__("FUN_0021c9c8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SELECTION_LOAD_SELECTION_LIST_H */ diff --git a/include/rnc/ui/menus/selection/update_menu_cycle_selection.h b/include/rnc/ui/menus/selection/update_menu_cycle_selection.h deleted file mode 100644 index 9ec912532c..0000000000 --- a/include/rnc/ui/menus/selection/update_menu_cycle_selection.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SELECTION_UPDATE_MENU_CYCLE_SELECTION_H -#define LOMBYTE_RNC_UI_MENUS_SELECTION_UPDATE_MENU_CYCLE_SELECTION_H - -#include "types.h" - -struct MenuScreen; - -s32 update_menu_cycle_selection(struct MenuScreen *) __asm__("FUN_00221e50"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SELECTION_UPDATE_MENU_CYCLE_SELECTION_H */ diff --git a/include/rnc/ui/menus/selection/update_menu_grid_selection.h b/include/rnc/ui/menus/selection/update_menu_grid_selection.h deleted file mode 100644 index ba8b30d9d3..0000000000 --- a/include/rnc/ui/menus/selection/update_menu_grid_selection.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SELECTION_UPDATE_MENU_GRID_SELECTION_H -#define LOMBYTE_RNC_UI_MENUS_SELECTION_UPDATE_MENU_GRID_SELECTION_H - -#include "types.h" - -struct MenuScreen; - -s32 update_menu_grid_selection(struct MenuScreen *) __asm__("FUN_0021b858"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SELECTION_UPDATE_MENU_GRID_SELECTION_H */ diff --git a/include/rnc/ui/menus/selection/update_menu_icon_list.h b/include/rnc/ui/menus/selection/update_menu_icon_list.h deleted file mode 100644 index 9ec2a2f277..0000000000 --- a/include/rnc/ui/menus/selection/update_menu_icon_list.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SELECTION_UPDATE_MENU_ICON_LIST_H -#define LOMBYTE_RNC_UI_MENUS_SELECTION_UPDATE_MENU_ICON_LIST_H - -#include "types.h" - -struct MenuScreen; - -int update_menu_icon_list(struct MenuScreen *) __asm__("FUN_00219e10"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SELECTION_UPDATE_MENU_ICON_LIST_H */ diff --git a/include/rnc/ui/menus/selection/update_menu_item_slots.h b/include/rnc/ui/menus/selection/update_menu_item_slots.h deleted file mode 100644 index 4a09b4a484..0000000000 --- a/include/rnc/ui/menus/selection/update_menu_item_slots.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SELECTION_UPDATE_MENU_ITEM_SLOTS_H -#define LOMBYTE_RNC_UI_MENUS_SELECTION_UPDATE_MENU_ITEM_SLOTS_H - -#include "types.h" - -struct MenuScreen; - -s32 update_menu_item_slots(struct MenuScreen *) __asm__("FUN_0021c7a0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SELECTION_UPDATE_MENU_ITEM_SLOTS_H */ diff --git a/include/rnc/ui/menus/selection/update_menu_option_list.h b/include/rnc/ui/menus/selection/update_menu_option_list.h deleted file mode 100644 index bc8397ced2..0000000000 --- a/include/rnc/ui/menus/selection/update_menu_option_list.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SELECTION_UPDATE_MENU_OPTION_LIST_H -#define LOMBYTE_RNC_UI_MENUS_SELECTION_UPDATE_MENU_OPTION_LIST_H - -#include "types.h" - -struct MenuScreen; - -s32 update_menu_option_list(struct MenuScreen *) __asm__("FUN_00220e28"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SELECTION_UPDATE_MENU_OPTION_LIST_H */ diff --git a/include/rnc/ui/menus/stream_buffers.h b/include/rnc/ui/menus/stream_buffers.h index 2eb7009d03..7119bd39a0 100644 --- a/include/rnc/ui/menus/stream_buffers.h +++ b/include/rnc/ui/menus/stream_buffers.h @@ -1,6 +1,7 @@ #ifndef LOMBYTE_RNC_UI_MENUS_STREAM_BUFFERS_H #define LOMBYTE_RNC_UI_MENUS_STREAM_BUFFERS_H +#include "types.h" #include "types.h" enum { @@ -17,4 +18,6 @@ struct MenuStreamBuffer { extern struct MenuStreamBuffer menu_stream_buffers[MENU_STREAM_BUFFER_COUNT] __asm__("D_001D60B8"); +s32 release_menu_stream_buffer(s32) __asm__("FUN_00225cd8"); + #endif /* LOMBYTE_RNC_UI_MENUS_STREAM_BUFFERS_H */ diff --git a/include/rnc/ui/menus/stream_buffers/release_menu_stream_buffer.h b/include/rnc/ui/menus/stream_buffers/release_menu_stream_buffer.h deleted file mode 100644 index 4641b14d7b..0000000000 --- a/include/rnc/ui/menus/stream_buffers/release_menu_stream_buffer.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_STREAM_BUFFERS_RELEASE_MENU_STREAM_BUFFER_H -#define LOMBYTE_RNC_UI_MENUS_STREAM_BUFFERS_RELEASE_MENU_STREAM_BUFFER_H - -#include "types.h" - -s32 release_menu_stream_buffer(s32) __asm__("FUN_00225cd8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_STREAM_BUFFERS_RELEASE_MENU_STREAM_BUFFER_H */ diff --git a/include/rnc/ui/menus/stream_image.h b/include/rnc/ui/menus/stream_image.h new file mode 100644 index 0000000000..77baccd769 --- /dev/null +++ b/include/rnc/ui/menus/stream_image.h @@ -0,0 +1,14 @@ +#ifndef LOMBYTE_RNC_UI_MENUS_STREAM_IMAGE_H +#define LOMBYTE_RNC_UI_MENUS_STREAM_IMAGE_H + +#include "types.h" + +struct MenuScreen; +struct MenuStreamImageScreen; + +s32 draw_menu_stream_image(struct MenuStreamImageScreen *) __asm__("FUN_00220790"); +s32 enter_menu_stream_image(struct MenuScreen *) __asm__("FUN_0021fce0"); +s32 leave_menu_stream_image(struct MenuScreen *) __asm__("FUN_0021fd78"); +s32 update_menu_stream_image(struct MenuScreen *) __asm__("FUN_0021f990"); + +#endif /* LOMBYTE_RNC_UI_MENUS_STREAM_IMAGE_H */ diff --git a/include/rnc/ui/menus/stream_image/draw_menu_stream_image.h b/include/rnc/ui/menus/stream_image/draw_menu_stream_image.h deleted file mode 100644 index c4d2821f4c..0000000000 --- a/include/rnc/ui/menus/stream_image/draw_menu_stream_image.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_STREAM_IMAGE_DRAW_MENU_STREAM_IMAGE_H -#define LOMBYTE_RNC_UI_MENUS_STREAM_IMAGE_DRAW_MENU_STREAM_IMAGE_H - -#include "types.h" - -struct MenuStreamImageScreen; - -s32 draw_menu_stream_image(struct MenuStreamImageScreen *) __asm__("FUN_00220790"); - -#endif /* LOMBYTE_RNC_UI_MENUS_STREAM_IMAGE_DRAW_MENU_STREAM_IMAGE_H */ diff --git a/include/rnc/ui/menus/stream_image/enter_menu_stream_image.h b/include/rnc/ui/menus/stream_image/enter_menu_stream_image.h deleted file mode 100644 index 3daa73ae9e..0000000000 --- a/include/rnc/ui/menus/stream_image/enter_menu_stream_image.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_STREAM_IMAGE_ENTER_MENU_STREAM_IMAGE_H -#define LOMBYTE_RNC_UI_MENUS_STREAM_IMAGE_ENTER_MENU_STREAM_IMAGE_H - -#include "types.h" - -struct MenuScreen; - -s32 enter_menu_stream_image(struct MenuScreen *) __asm__("FUN_0021fce0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_STREAM_IMAGE_ENTER_MENU_STREAM_IMAGE_H */ diff --git a/include/rnc/ui/menus/stream_image/leave_menu_stream_image.h b/include/rnc/ui/menus/stream_image/leave_menu_stream_image.h deleted file mode 100644 index 71b578ad44..0000000000 --- a/include/rnc/ui/menus/stream_image/leave_menu_stream_image.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_STREAM_IMAGE_LEAVE_MENU_STREAM_IMAGE_H -#define LOMBYTE_RNC_UI_MENUS_STREAM_IMAGE_LEAVE_MENU_STREAM_IMAGE_H - -#include "types.h" - -struct MenuScreen; - -s32 leave_menu_stream_image(struct MenuScreen *) __asm__("FUN_0021fd78"); - -#endif /* LOMBYTE_RNC_UI_MENUS_STREAM_IMAGE_LEAVE_MENU_STREAM_IMAGE_H */ diff --git a/include/rnc/ui/menus/stream_image/update_menu_stream_image.h b/include/rnc/ui/menus/stream_image/update_menu_stream_image.h deleted file mode 100644 index 582ae2de61..0000000000 --- a/include/rnc/ui/menus/stream_image/update_menu_stream_image.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_STREAM_IMAGE_UPDATE_MENU_STREAM_IMAGE_H -#define LOMBYTE_RNC_UI_MENUS_STREAM_IMAGE_UPDATE_MENU_STREAM_IMAGE_H - -#include "types.h" - -struct MenuScreen; - -s32 update_menu_stream_image(struct MenuScreen *) __asm__("FUN_0021f990"); - -#endif /* LOMBYTE_RNC_UI_MENUS_STREAM_IMAGE_UPDATE_MENU_STREAM_IMAGE_H */ diff --git a/include/rnc/ui/menus/streamed_moby.h b/include/rnc/ui/menus/streamed_moby.h new file mode 100644 index 0000000000..135f90f5a7 --- /dev/null +++ b/include/rnc/ui/menus/streamed_moby.h @@ -0,0 +1,13 @@ +#ifndef LOMBYTE_RNC_UI_MENUS_STREAMED_MOBY_H +#define LOMBYTE_RNC_UI_MENUS_STREAMED_MOBY_H + +#include "types.h" + +struct MenuScreen; +struct MenuStreamedMobyScreen; + +int enter_streamed_moby_screen(struct MenuStreamedMobyScreen *) __asm__("FUN_00225588"); +s32 leave_streamed_moby_screen(struct MenuScreen *) __asm__("FUN_00225660"); +s32 update_streamed_moby_animation(struct MenuScreen *) __asm__("FUN_002256e8"); + +#endif /* LOMBYTE_RNC_UI_MENUS_STREAMED_MOBY_H */ diff --git a/include/rnc/ui/menus/streamed_moby/enter_streamed_moby_screen.h b/include/rnc/ui/menus/streamed_moby/enter_streamed_moby_screen.h deleted file mode 100644 index e2bb268caa..0000000000 --- a/include/rnc/ui/menus/streamed_moby/enter_streamed_moby_screen.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_STREAMED_MOBY_ENTER_STREAMED_MOBY_SCREEN_H -#define LOMBYTE_RNC_UI_MENUS_STREAMED_MOBY_ENTER_STREAMED_MOBY_SCREEN_H - -#include "types.h" - -struct MenuStreamedMobyScreen; - -int enter_streamed_moby_screen(struct MenuStreamedMobyScreen *) __asm__("FUN_00225588"); - -#endif /* LOMBYTE_RNC_UI_MENUS_STREAMED_MOBY_ENTER_STREAMED_MOBY_SCREEN_H */ diff --git a/include/rnc/ui/menus/streamed_moby/leave_streamed_moby_screen.h b/include/rnc/ui/menus/streamed_moby/leave_streamed_moby_screen.h deleted file mode 100644 index 729e916041..0000000000 --- a/include/rnc/ui/menus/streamed_moby/leave_streamed_moby_screen.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_STREAMED_MOBY_LEAVE_STREAMED_MOBY_SCREEN_H -#define LOMBYTE_RNC_UI_MENUS_STREAMED_MOBY_LEAVE_STREAMED_MOBY_SCREEN_H - -#include "types.h" - -struct MenuScreen; - -s32 leave_streamed_moby_screen(struct MenuScreen *) __asm__("FUN_00225660"); - -#endif /* LOMBYTE_RNC_UI_MENUS_STREAMED_MOBY_LEAVE_STREAMED_MOBY_SCREEN_H */ diff --git a/include/rnc/ui/menus/streamed_moby/update_streamed_moby_animation.h b/include/rnc/ui/menus/streamed_moby/update_streamed_moby_animation.h deleted file mode 100644 index 79a97e3245..0000000000 --- a/include/rnc/ui/menus/streamed_moby/update_streamed_moby_animation.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_STREAMED_MOBY_UPDATE_STREAMED_MOBY_ANIMATION_H -#define LOMBYTE_RNC_UI_MENUS_STREAMED_MOBY_UPDATE_STREAMED_MOBY_ANIMATION_H - -#include "types.h" - -struct MenuScreen; - -s32 update_streamed_moby_animation(struct MenuScreen *) __asm__("FUN_002256e8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_STREAMED_MOBY_UPDATE_STREAMED_MOBY_ANIMATION_H */ diff --git a/include/rnc/ui/menus/system.h b/include/rnc/ui/menus/system.h new file mode 100644 index 0000000000..14fcb0e660 --- /dev/null +++ b/include/rnc/ui/menus/system.h @@ -0,0 +1,25 @@ +#ifndef LOMBYTE_RNC_UI_MENUS_SYSTEM_H +#define LOMBYTE_RNC_UI_MENUS_SYSTEM_H + +#include "types.h" + +struct MenuScreen; +struct Moby; +struct SceneTrigger; + +int clear_menu_selected_index(int *) __asm__("FUN_0021a318"); +void close_menu_system(void) __asm__("FUN_002191b8"); +void enter_main_menu(void); +int enter_timed_menu_sequence(struct MenuScreen *) __asm__("FUN_002223d8"); +s32 handle_menu_action_buttons(struct MenuScreen *) __asm__("FUN_00221968"); +int menu_draw_noop(void) __asm__("FUN_0021df28"); +int menu_leave_noop(void) __asm__("FUN_0021d1f0"); +int menu_update_noop(void) __asm__("FUN_0021bd98"); +void process_menu_entry(struct Moby *, struct SceneTrigger *, s32) __asm__("FUN_00216c48"); +s32 reset_menu_graphics_buffers(void) __asm__("FUN_0021cae0"); +int setup_menu_display_text(struct MenuScreen *) __asm__("FUN_0021ef78"); +s32 update_menu_entry_actions(struct MenuScreen *) __asm__("FUN_0021abf8"); +s32 update_menu_resource_stream(struct MenuScreen *) __asm__("FUN_0021fdc8"); +s32 update_timed_menu_sequence(struct MenuScreen *) __asm__("FUN_002223f0"); + +#endif /* LOMBYTE_RNC_UI_MENUS_SYSTEM_H */ diff --git a/include/rnc/ui/menus/system/clear_menu_selected_index.h b/include/rnc/ui/menus/system/clear_menu_selected_index.h deleted file mode 100644 index b3f6d0c19a..0000000000 --- a/include/rnc/ui/menus/system/clear_menu_selected_index.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SYSTEM_CLEAR_MENU_SELECTED_INDEX_H -#define LOMBYTE_RNC_UI_MENUS_SYSTEM_CLEAR_MENU_SELECTED_INDEX_H - -#include "types.h" - -int clear_menu_selected_index(int *) __asm__("FUN_0021a318"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SYSTEM_CLEAR_MENU_SELECTED_INDEX_H */ diff --git a/include/rnc/ui/menus/system/close_menu_system.h b/include/rnc/ui/menus/system/close_menu_system.h deleted file mode 100644 index 6d6159d359..0000000000 --- a/include/rnc/ui/menus/system/close_menu_system.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SYSTEM_CLOSE_MENU_SYSTEM_H -#define LOMBYTE_RNC_UI_MENUS_SYSTEM_CLOSE_MENU_SYSTEM_H - -#include "types.h" - -void close_menu_system(void) __asm__("FUN_002191b8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SYSTEM_CLOSE_MENU_SYSTEM_H */ diff --git a/include/rnc/ui/menus/system/enter_main_menu.h b/include/rnc/ui/menus/system/enter_main_menu.h deleted file mode 100644 index ea1df10ad1..0000000000 --- a/include/rnc/ui/menus/system/enter_main_menu.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SYSTEM_ENTER_MAIN_MENU_H -#define LOMBYTE_RNC_UI_MENUS_SYSTEM_ENTER_MAIN_MENU_H - -#include "types.h" - -void enter_main_menu(void); - -#endif /* LOMBYTE_RNC_UI_MENUS_SYSTEM_ENTER_MAIN_MENU_H */ diff --git a/include/rnc/ui/menus/system/enter_timed_menu_sequence.h b/include/rnc/ui/menus/system/enter_timed_menu_sequence.h deleted file mode 100644 index af179c3ae0..0000000000 --- a/include/rnc/ui/menus/system/enter_timed_menu_sequence.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SYSTEM_ENTER_TIMED_MENU_SEQUENCE_H -#define LOMBYTE_RNC_UI_MENUS_SYSTEM_ENTER_TIMED_MENU_SEQUENCE_H - -#include "types.h" - -struct MenuScreen; - -int enter_timed_menu_sequence(struct MenuScreen *) __asm__("FUN_002223d8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SYSTEM_ENTER_TIMED_MENU_SEQUENCE_H */ diff --git a/include/rnc/ui/menus/system/handle_menu_action_buttons.h b/include/rnc/ui/menus/system/handle_menu_action_buttons.h deleted file mode 100644 index 8b321fc999..0000000000 --- a/include/rnc/ui/menus/system/handle_menu_action_buttons.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SYSTEM_HANDLE_MENU_ACTION_BUTTONS_H -#define LOMBYTE_RNC_UI_MENUS_SYSTEM_HANDLE_MENU_ACTION_BUTTONS_H - -#include "types.h" - -struct MenuScreen; - -s32 handle_menu_action_buttons(struct MenuScreen *) __asm__("FUN_00221968"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SYSTEM_HANDLE_MENU_ACTION_BUTTONS_H */ diff --git a/include/rnc/ui/menus/system/menu_draw_noop.h b/include/rnc/ui/menus/system/menu_draw_noop.h deleted file mode 100644 index f4db137688..0000000000 --- a/include/rnc/ui/menus/system/menu_draw_noop.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SYSTEM_MENU_DRAW_NOOP_H -#define LOMBYTE_RNC_UI_MENUS_SYSTEM_MENU_DRAW_NOOP_H - -#include "types.h" - -int menu_draw_noop(void) __asm__("FUN_0021df28"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SYSTEM_MENU_DRAW_NOOP_H */ diff --git a/include/rnc/ui/menus/system/menu_leave_noop.h b/include/rnc/ui/menus/system/menu_leave_noop.h deleted file mode 100644 index 9433b6b5c7..0000000000 --- a/include/rnc/ui/menus/system/menu_leave_noop.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SYSTEM_MENU_LEAVE_NOOP_H -#define LOMBYTE_RNC_UI_MENUS_SYSTEM_MENU_LEAVE_NOOP_H - -#include "types.h" - -int menu_leave_noop(void) __asm__("FUN_0021d1f0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SYSTEM_MENU_LEAVE_NOOP_H */ diff --git a/include/rnc/ui/menus/system/menu_update_noop.h b/include/rnc/ui/menus/system/menu_update_noop.h deleted file mode 100644 index b329d11210..0000000000 --- a/include/rnc/ui/menus/system/menu_update_noop.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SYSTEM_MENU_UPDATE_NOOP_H -#define LOMBYTE_RNC_UI_MENUS_SYSTEM_MENU_UPDATE_NOOP_H - -#include "types.h" - -int menu_update_noop(void) __asm__("FUN_0021bd98"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SYSTEM_MENU_UPDATE_NOOP_H */ diff --git a/include/rnc/ui/menus/system/process_menu_entry.h b/include/rnc/ui/menus/system/process_menu_entry.h deleted file mode 100644 index e3ef6e1bee..0000000000 --- a/include/rnc/ui/menus/system/process_menu_entry.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SYSTEM_PROCESS_MENU_ENTRY_H -#define LOMBYTE_RNC_UI_MENUS_SYSTEM_PROCESS_MENU_ENTRY_H - -#include "types.h" - -struct Moby; -struct SceneTrigger; - -void process_menu_entry(struct Moby *, struct SceneTrigger *, s32) __asm__("FUN_00216c48"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SYSTEM_PROCESS_MENU_ENTRY_H */ diff --git a/include/rnc/ui/menus/system/reset_menu_graphics_buffers.h b/include/rnc/ui/menus/system/reset_menu_graphics_buffers.h deleted file mode 100644 index da93039db7..0000000000 --- a/include/rnc/ui/menus/system/reset_menu_graphics_buffers.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SYSTEM_RESET_MENU_GRAPHICS_BUFFERS_H -#define LOMBYTE_RNC_UI_MENUS_SYSTEM_RESET_MENU_GRAPHICS_BUFFERS_H - -#include "types.h" - -s32 reset_menu_graphics_buffers(void) __asm__("FUN_0021cae0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SYSTEM_RESET_MENU_GRAPHICS_BUFFERS_H */ diff --git a/include/rnc/ui/menus/system/setup_menu_display_text.h b/include/rnc/ui/menus/system/setup_menu_display_text.h deleted file mode 100644 index 36f4d36a84..0000000000 --- a/include/rnc/ui/menus/system/setup_menu_display_text.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SYSTEM_SETUP_MENU_DISPLAY_TEXT_H -#define LOMBYTE_RNC_UI_MENUS_SYSTEM_SETUP_MENU_DISPLAY_TEXT_H - -#include "types.h" - -struct MenuScreen; - -int setup_menu_display_text(struct MenuScreen *) __asm__("FUN_0021ef78"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SYSTEM_SETUP_MENU_DISPLAY_TEXT_H */ diff --git a/include/rnc/ui/menus/system/update_menu_entry_actions.h b/include/rnc/ui/menus/system/update_menu_entry_actions.h deleted file mode 100644 index f1db5b4f20..0000000000 --- a/include/rnc/ui/menus/system/update_menu_entry_actions.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SYSTEM_UPDATE_MENU_ENTRY_ACTIONS_H -#define LOMBYTE_RNC_UI_MENUS_SYSTEM_UPDATE_MENU_ENTRY_ACTIONS_H - -#include "types.h" - -struct MenuScreen; - -s32 update_menu_entry_actions(struct MenuScreen *) __asm__("FUN_0021abf8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SYSTEM_UPDATE_MENU_ENTRY_ACTIONS_H */ diff --git a/include/rnc/ui/menus/system/update_menu_resource_stream.h b/include/rnc/ui/menus/system/update_menu_resource_stream.h deleted file mode 100644 index c8ee139bf2..0000000000 --- a/include/rnc/ui/menus/system/update_menu_resource_stream.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SYSTEM_UPDATE_MENU_RESOURCE_STREAM_H -#define LOMBYTE_RNC_UI_MENUS_SYSTEM_UPDATE_MENU_RESOURCE_STREAM_H - -#include "types.h" - -struct MenuScreen; - -s32 update_menu_resource_stream(struct MenuScreen *) __asm__("FUN_0021fdc8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SYSTEM_UPDATE_MENU_RESOURCE_STREAM_H */ diff --git a/include/rnc/ui/menus/system/update_timed_menu_sequence.h b/include/rnc/ui/menus/system/update_timed_menu_sequence.h deleted file mode 100644 index dfb56a13bb..0000000000 --- a/include/rnc/ui/menus/system/update_timed_menu_sequence.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_SYSTEM_UPDATE_TIMED_MENU_SEQUENCE_H -#define LOMBYTE_RNC_UI_MENUS_SYSTEM_UPDATE_TIMED_MENU_SEQUENCE_H - -#include "types.h" - -struct MenuScreen; - -s32 update_timed_menu_sequence(struct MenuScreen *) __asm__("FUN_002223f0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_SYSTEM_UPDATE_TIMED_MENU_SEQUENCE_H */ diff --git a/include/rnc/ui/menus/weapons.h b/include/rnc/ui/menus/weapons.h new file mode 100644 index 0000000000..2c0e3e1d20 --- /dev/null +++ b/include/rnc/ui/menus/weapons.h @@ -0,0 +1,14 @@ +#ifndef LOMBYTE_RNC_UI_MENUS_WEAPONS_H +#define LOMBYTE_RNC_UI_MENUS_WEAPONS_H + +#include "types.h" + +struct MenuScreen; + +s32 count_gold_bolts(void) __asm__("FUN_00215290"); +s32 count_gold_weapons(void) __asm__("FUN_00215300"); +s32 draw_items_menu(struct MenuScreen *) __asm__("FUN_0021eb20"); +s32 draw_selected_item_ammo(s32) __asm__("FUN_0021f158"); +s32 obtain_all_gold_weapons_menu(struct MenuScreen *) __asm__("FUN_00222948"); + +#endif /* LOMBYTE_RNC_UI_MENUS_WEAPONS_H */ diff --git a/include/rnc/ui/menus/weapons/count_gold_bolts.h b/include/rnc/ui/menus/weapons/count_gold_bolts.h deleted file mode 100644 index 0dbd656535..0000000000 --- a/include/rnc/ui/menus/weapons/count_gold_bolts.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WEAPONS_COUNT_GOLD_BOLTS_H -#define LOMBYTE_RNC_UI_MENUS_WEAPONS_COUNT_GOLD_BOLTS_H - -#include "types.h" - -s32 count_gold_bolts(void) __asm__("FUN_00215290"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WEAPONS_COUNT_GOLD_BOLTS_H */ diff --git a/include/rnc/ui/menus/weapons/count_gold_weapons.h b/include/rnc/ui/menus/weapons/count_gold_weapons.h deleted file mode 100644 index 469a957950..0000000000 --- a/include/rnc/ui/menus/weapons/count_gold_weapons.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WEAPONS_COUNT_GOLD_WEAPONS_H -#define LOMBYTE_RNC_UI_MENUS_WEAPONS_COUNT_GOLD_WEAPONS_H - -#include "types.h" - -s32 count_gold_weapons(void) __asm__("FUN_00215300"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WEAPONS_COUNT_GOLD_WEAPONS_H */ diff --git a/include/rnc/ui/menus/weapons/draw_items_menu.h b/include/rnc/ui/menus/weapons/draw_items_menu.h deleted file mode 100644 index b532a063a5..0000000000 --- a/include/rnc/ui/menus/weapons/draw_items_menu.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WEAPONS_DRAW_ITEMS_MENU_H -#define LOMBYTE_RNC_UI_MENUS_WEAPONS_DRAW_ITEMS_MENU_H - -#include "types.h" - -struct MenuScreen; - -s32 draw_items_menu(struct MenuScreen *) __asm__("FUN_0021eb20"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WEAPONS_DRAW_ITEMS_MENU_H */ diff --git a/include/rnc/ui/menus/weapons/draw_selected_item_ammo.h b/include/rnc/ui/menus/weapons/draw_selected_item_ammo.h deleted file mode 100644 index 0cfd000cc9..0000000000 --- a/include/rnc/ui/menus/weapons/draw_selected_item_ammo.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WEAPONS_DRAW_SELECTED_ITEM_AMMO_H -#define LOMBYTE_RNC_UI_MENUS_WEAPONS_DRAW_SELECTED_ITEM_AMMO_H - -#include "types.h" - -s32 draw_selected_item_ammo(s32) __asm__("FUN_0021f158"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WEAPONS_DRAW_SELECTED_ITEM_AMMO_H */ diff --git a/include/rnc/ui/menus/weapons/obtain_all_gold_weapons_menu.h b/include/rnc/ui/menus/weapons/obtain_all_gold_weapons_menu.h deleted file mode 100644 index aa30cb5785..0000000000 --- a/include/rnc/ui/menus/weapons/obtain_all_gold_weapons_menu.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WEAPONS_OBTAIN_ALL_GOLD_WEAPONS_MENU_H -#define LOMBYTE_RNC_UI_MENUS_WEAPONS_OBTAIN_ALL_GOLD_WEAPONS_MENU_H - -#include "types.h" - -struct MenuScreen; - -s32 obtain_all_gold_weapons_menu(struct MenuScreen *) __asm__("FUN_00222948"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WEAPONS_OBTAIN_ALL_GOLD_WEAPONS_MENU_H */ diff --git a/include/rnc/ui/menus/widgets.h b/include/rnc/ui/menus/widgets.h new file mode 100644 index 0000000000..aec39f9e60 --- /dev/null +++ b/include/rnc/ui/menus/widgets.h @@ -0,0 +1,30 @@ +#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_H +#define LOMBYTE_RNC_UI_MENUS_WIDGETS_H + +#include "types.h" + +struct MenuScreen; +struct OptMenu; +struct ThreeOptionMenu; + +s32 draw_localized_three_option_menu(struct ThreeOptionMenu *) __asm__("FUN_00222a98"); +s32 draw_menu_choice_list(struct OptMenu *) __asm__("FUN_00221460"); +s32 draw_menu_icon_list(struct MenuScreen *) __asm__("FUN_00219fa0"); +s32 draw_menu_item_grid(struct MenuScreen *) __asm__("FUN_0021d948"); +s32 draw_menu_selection_text(struct MenuScreen *) __asm__("FUN_00222d98"); +int draw_menu_side_indicator(struct MenuScreen *) __asm__("FUN_00221f58"); +int draw_menu_text_box(struct MenuScreen *) __asm__("FUN_00222768"); +s32 draw_menu_text_list(struct MenuScreen *) __asm__("FUN_0021d4a8"); +int draw_prompt_box(struct MenuScreen *) __asm__("FUN_00221b50"); +s32 draw_selected_menu_item_text(struct MenuScreen *) __asm__("FUN_002220f0"); +int enter_menu_choice_list(void) __asm__("FUN_0021a308"); +s32 enter_menu_help_text(struct MenuScreen *) __asm__("FUN_0021d1f8"); +s32 enter_menu_prompt(struct MenuScreen *) __asm__("FUN_00221a48"); +int leave_menu_choice_list(void) __asm__("FUN_0021a310"); +s32 leave_menu_prompt(struct MenuScreen *) __asm__("FUN_00221a88"); +int render_configured_text_label(struct MenuScreen *) __asm__("FUN_0021a328"); +s32 restore_menu_help_text(struct MenuScreen *) __asm__("FUN_0021d2c8"); +s32 update_menu_choice_list(struct MenuScreen *) __asm__("FUN_002212b8"); +int update_menu_help_text_load(struct MenuScreen *) __asm__("FUN_0021d338"); + +#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_H */ diff --git a/include/rnc/ui/menus/widgets/draw_localized_three_option_menu.h b/include/rnc/ui/menus/widgets/draw_localized_three_option_menu.h deleted file mode 100644 index 3b040fa010..0000000000 --- a/include/rnc/ui/menus/widgets/draw_localized_three_option_menu.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_LOCALIZED_THREE_OPTION_MENU_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_LOCALIZED_THREE_OPTION_MENU_H - -#include "types.h" - -struct ThreeOptionMenu; - -s32 draw_localized_three_option_menu(struct ThreeOptionMenu *) __asm__("FUN_00222a98"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_LOCALIZED_THREE_OPTION_MENU_H */ diff --git a/include/rnc/ui/menus/widgets/draw_menu_choice_list.h b/include/rnc/ui/menus/widgets/draw_menu_choice_list.h deleted file mode 100644 index 681d00c9d0..0000000000 --- a/include/rnc/ui/menus/widgets/draw_menu_choice_list.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_CHOICE_LIST_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_CHOICE_LIST_H - -#include "types.h" - -struct OptMenu; - -s32 draw_menu_choice_list(struct OptMenu *) __asm__("FUN_00221460"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_CHOICE_LIST_H */ diff --git a/include/rnc/ui/menus/widgets/draw_menu_icon_list.h b/include/rnc/ui/menus/widgets/draw_menu_icon_list.h deleted file mode 100644 index 6e206c0f7a..0000000000 --- a/include/rnc/ui/menus/widgets/draw_menu_icon_list.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_ICON_LIST_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_ICON_LIST_H - -#include "types.h" - -struct MenuScreen; - -s32 draw_menu_icon_list(struct MenuScreen *) __asm__("FUN_00219fa0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_ICON_LIST_H */ diff --git a/include/rnc/ui/menus/widgets/draw_menu_item_grid.h b/include/rnc/ui/menus/widgets/draw_menu_item_grid.h deleted file mode 100644 index d239228b2a..0000000000 --- a/include/rnc/ui/menus/widgets/draw_menu_item_grid.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_ITEM_GRID_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_ITEM_GRID_H - -#include "types.h" - -struct MenuScreen; - -s32 draw_menu_item_grid(struct MenuScreen *) __asm__("FUN_0021d948"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_ITEM_GRID_H */ diff --git a/include/rnc/ui/menus/widgets/draw_menu_selection_text.h b/include/rnc/ui/menus/widgets/draw_menu_selection_text.h deleted file mode 100644 index f945f510c1..0000000000 --- a/include/rnc/ui/menus/widgets/draw_menu_selection_text.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_SELECTION_TEXT_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_SELECTION_TEXT_H - -#include "types.h" - -struct MenuScreen; - -s32 draw_menu_selection_text(struct MenuScreen *) __asm__("FUN_00222d98"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_SELECTION_TEXT_H */ diff --git a/include/rnc/ui/menus/widgets/draw_menu_side_indicator.h b/include/rnc/ui/menus/widgets/draw_menu_side_indicator.h deleted file mode 100644 index 5e1556add0..0000000000 --- a/include/rnc/ui/menus/widgets/draw_menu_side_indicator.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_SIDE_INDICATOR_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_SIDE_INDICATOR_H - -#include "types.h" - -struct MenuScreen; - -int draw_menu_side_indicator(struct MenuScreen *) __asm__("FUN_00221f58"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_SIDE_INDICATOR_H */ diff --git a/include/rnc/ui/menus/widgets/draw_menu_text_box.h b/include/rnc/ui/menus/widgets/draw_menu_text_box.h deleted file mode 100644 index a030a5fbd5..0000000000 --- a/include/rnc/ui/menus/widgets/draw_menu_text_box.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_TEXT_BOX_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_TEXT_BOX_H - -#include "types.h" - -struct MenuScreen; - -int draw_menu_text_box(struct MenuScreen *) __asm__("FUN_00222768"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_TEXT_BOX_H */ diff --git a/include/rnc/ui/menus/widgets/draw_menu_text_list.h b/include/rnc/ui/menus/widgets/draw_menu_text_list.h deleted file mode 100644 index bf6bce4b6d..0000000000 --- a/include/rnc/ui/menus/widgets/draw_menu_text_list.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_TEXT_LIST_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_TEXT_LIST_H - -#include "types.h" - -struct MenuScreen; - -s32 draw_menu_text_list(struct MenuScreen *) __asm__("FUN_0021d4a8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_MENU_TEXT_LIST_H */ diff --git a/include/rnc/ui/menus/widgets/draw_prompt_box.h b/include/rnc/ui/menus/widgets/draw_prompt_box.h deleted file mode 100644 index 14041bf1c0..0000000000 --- a/include/rnc/ui/menus/widgets/draw_prompt_box.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_PROMPT_BOX_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_PROMPT_BOX_H - -#include "types.h" - -struct MenuScreen; - -int draw_prompt_box(struct MenuScreen *) __asm__("FUN_00221b50"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_PROMPT_BOX_H */ diff --git a/include/rnc/ui/menus/widgets/draw_selected_menu_item_text.h b/include/rnc/ui/menus/widgets/draw_selected_menu_item_text.h deleted file mode 100644 index 1770718905..0000000000 --- a/include/rnc/ui/menus/widgets/draw_selected_menu_item_text.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_SELECTED_MENU_ITEM_TEXT_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_SELECTED_MENU_ITEM_TEXT_H - -#include "types.h" - -struct MenuScreen; - -s32 draw_selected_menu_item_text(struct MenuScreen *) __asm__("FUN_002220f0"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_DRAW_SELECTED_MENU_ITEM_TEXT_H */ diff --git a/include/rnc/ui/menus/widgets/enter_menu_choice_list.h b/include/rnc/ui/menus/widgets/enter_menu_choice_list.h deleted file mode 100644 index 3efd2cee7d..0000000000 --- a/include/rnc/ui/menus/widgets/enter_menu_choice_list.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_ENTER_MENU_CHOICE_LIST_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_ENTER_MENU_CHOICE_LIST_H - -#include "types.h" - -int enter_menu_choice_list(void) __asm__("FUN_0021a308"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_ENTER_MENU_CHOICE_LIST_H */ diff --git a/include/rnc/ui/menus/widgets/enter_menu_help_text.h b/include/rnc/ui/menus/widgets/enter_menu_help_text.h deleted file mode 100644 index 7b08adc7cd..0000000000 --- a/include/rnc/ui/menus/widgets/enter_menu_help_text.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_ENTER_MENU_HELP_TEXT_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_ENTER_MENU_HELP_TEXT_H - -#include "types.h" - -struct MenuScreen; - -s32 enter_menu_help_text(struct MenuScreen *) __asm__("FUN_0021d1f8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_ENTER_MENU_HELP_TEXT_H */ diff --git a/include/rnc/ui/menus/widgets/enter_menu_prompt.h b/include/rnc/ui/menus/widgets/enter_menu_prompt.h deleted file mode 100644 index 628bc92f5c..0000000000 --- a/include/rnc/ui/menus/widgets/enter_menu_prompt.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_ENTER_MENU_PROMPT_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_ENTER_MENU_PROMPT_H - -#include "types.h" - -struct MenuScreen; - -s32 enter_menu_prompt(struct MenuScreen *) __asm__("FUN_00221a48"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_ENTER_MENU_PROMPT_H */ diff --git a/include/rnc/ui/menus/widgets/leave_menu_choice_list.h b/include/rnc/ui/menus/widgets/leave_menu_choice_list.h deleted file mode 100644 index 5ddc9ac6cc..0000000000 --- a/include/rnc/ui/menus/widgets/leave_menu_choice_list.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_LEAVE_MENU_CHOICE_LIST_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_LEAVE_MENU_CHOICE_LIST_H - -#include "types.h" - -int leave_menu_choice_list(void) __asm__("FUN_0021a310"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_LEAVE_MENU_CHOICE_LIST_H */ diff --git a/include/rnc/ui/menus/widgets/leave_menu_prompt.h b/include/rnc/ui/menus/widgets/leave_menu_prompt.h deleted file mode 100644 index 104a4b6e85..0000000000 --- a/include/rnc/ui/menus/widgets/leave_menu_prompt.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_LEAVE_MENU_PROMPT_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_LEAVE_MENU_PROMPT_H - -#include "types.h" - -struct MenuScreen; - -s32 leave_menu_prompt(struct MenuScreen *) __asm__("FUN_00221a88"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_LEAVE_MENU_PROMPT_H */ diff --git a/include/rnc/ui/menus/widgets/render_configured_text_label.h b/include/rnc/ui/menus/widgets/render_configured_text_label.h deleted file mode 100644 index f8d0f6d136..0000000000 --- a/include/rnc/ui/menus/widgets/render_configured_text_label.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_RENDER_CONFIGURED_TEXT_LABEL_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_RENDER_CONFIGURED_TEXT_LABEL_H - -#include "types.h" - -struct MenuScreen; - -int render_configured_text_label(struct MenuScreen *) __asm__("FUN_0021a328"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_RENDER_CONFIGURED_TEXT_LABEL_H */ diff --git a/include/rnc/ui/menus/widgets/restore_menu_help_text.h b/include/rnc/ui/menus/widgets/restore_menu_help_text.h deleted file mode 100644 index 6935b296b7..0000000000 --- a/include/rnc/ui/menus/widgets/restore_menu_help_text.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_RESTORE_MENU_HELP_TEXT_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_RESTORE_MENU_HELP_TEXT_H - -#include "types.h" - -struct MenuScreen; - -s32 restore_menu_help_text(struct MenuScreen *) __asm__("FUN_0021d2c8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_RESTORE_MENU_HELP_TEXT_H */ diff --git a/include/rnc/ui/menus/widgets/update_menu_choice_list.h b/include/rnc/ui/menus/widgets/update_menu_choice_list.h deleted file mode 100644 index e46ec27cb4..0000000000 --- a/include/rnc/ui/menus/widgets/update_menu_choice_list.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_UPDATE_MENU_CHOICE_LIST_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_UPDATE_MENU_CHOICE_LIST_H - -#include "types.h" - -struct MenuScreen; - -s32 update_menu_choice_list(struct MenuScreen *) __asm__("FUN_002212b8"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_UPDATE_MENU_CHOICE_LIST_H */ diff --git a/include/rnc/ui/menus/widgets/update_menu_help_text_load.h b/include/rnc/ui/menus/widgets/update_menu_help_text_load.h deleted file mode 100644 index e4dc4104a8..0000000000 --- a/include/rnc/ui/menus/widgets/update_menu_help_text_load.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_MENUS_WIDGETS_UPDATE_MENU_HELP_TEXT_LOAD_H -#define LOMBYTE_RNC_UI_MENUS_WIDGETS_UPDATE_MENU_HELP_TEXT_LOAD_H - -#include "types.h" - -struct MenuScreen; - -int update_menu_help_text_load(struct MenuScreen *) __asm__("FUN_0021d338"); - -#endif /* LOMBYTE_RNC_UI_MENUS_WIDGETS_UPDATE_MENU_HELP_TEXT_LOAD_H */ diff --git a/include/rnc/ui/text.h b/include/rnc/ui/text.h new file mode 100644 index 0000000000..efaa071553 --- /dev/null +++ b/include/rnc/ui/text.h @@ -0,0 +1,12 @@ +#ifndef LOMBYTE_RNC_UI_TEXT_H +#define LOMBYTE_RNC_UI_TEXT_H + +#include "types.h" + +struct MenuScreen; + +void link_localized_display_text(void) __asm__("FUN_001fdd58"); +s32 rebuild_configured_text_label_list(void) __asm__("FUN_0021a1e0"); +s32 render_localized_ui_entry_list(struct MenuScreen *) __asm__("FUN_0021b1c8"); + +#endif /* LOMBYTE_RNC_UI_TEXT_H */ diff --git a/include/rnc/ui/text/font.h b/include/rnc/ui/text/font.h new file mode 100644 index 0000000000..8072ab434e --- /dev/null +++ b/include/rnc/ui/text/font.h @@ -0,0 +1,15 @@ +#ifndef LOMBYTE_RNC_UI_TEXT_FONT_H +#define LOMBYTE_RNC_UI_TEXT_FONT_H + +#include "types.h" + +struct Glyph; + +void font_print(s32, s32, u64, u8 *, s32, s64, struct Glyph *) __asm__("FUN_001f62b0"); +s32 font_print_center(s32, s32, s32, s32, s32) __asm__("FUN_001f6af0"); +s32 font_print_center_large(s32, s32, s32, s32, s32) __asm__("FUN_001f6c20"); +s32 font_print_wrapped(s32, s32, s32, s32, u64, u8 *, s32, u64, struct Glyph *) __asm__("FUN_001f6cb8"); +void font_set_window(void *, int, int, int, int, int, int, int, int); +void load_debug_font(void) __asm__("FUN_001e9338"); + +#endif /* LOMBYTE_RNC_UI_TEXT_FONT_H */ diff --git a/include/rnc/ui/text/font/font_print.h b/include/rnc/ui/text/font/font_print.h deleted file mode 100644 index 44c939ce17..0000000000 --- a/include/rnc/ui/text/font/font_print.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_TEXT_FONT_FONT_PRINT_H -#define LOMBYTE_RNC_UI_TEXT_FONT_FONT_PRINT_H - -#include "types.h" - -struct Glyph; - -void font_print(s32, s32, u64, u8 *, s32, s64, struct Glyph *) __asm__("FUN_001f62b0"); - -#endif /* LOMBYTE_RNC_UI_TEXT_FONT_FONT_PRINT_H */ diff --git a/include/rnc/ui/text/font/font_print_center.h b/include/rnc/ui/text/font/font_print_center.h deleted file mode 100644 index bf7ac80926..0000000000 --- a/include/rnc/ui/text/font/font_print_center.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_TEXT_FONT_FONT_PRINT_CENTER_H -#define LOMBYTE_RNC_UI_TEXT_FONT_FONT_PRINT_CENTER_H - -#include "types.h" - -s32 font_print_center(s32, s32, s32, s32, s32) __asm__("FUN_001f6af0"); - -#endif /* LOMBYTE_RNC_UI_TEXT_FONT_FONT_PRINT_CENTER_H */ diff --git a/include/rnc/ui/text/font/font_print_center_large.h b/include/rnc/ui/text/font/font_print_center_large.h deleted file mode 100644 index 751e997f47..0000000000 --- a/include/rnc/ui/text/font/font_print_center_large.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_TEXT_FONT_FONT_PRINT_CENTER_LARGE_H -#define LOMBYTE_RNC_UI_TEXT_FONT_FONT_PRINT_CENTER_LARGE_H - -#include "types.h" - -s32 font_print_center_large(s32, s32, s32, s32, s32) __asm__("FUN_001f6c20"); - -#endif /* LOMBYTE_RNC_UI_TEXT_FONT_FONT_PRINT_CENTER_LARGE_H */ diff --git a/include/rnc/ui/text/font/font_print_wrapped.h b/include/rnc/ui/text/font/font_print_wrapped.h deleted file mode 100644 index 7c3d03c50a..0000000000 --- a/include/rnc/ui/text/font/font_print_wrapped.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_TEXT_FONT_FONT_PRINT_WRAPPED_H -#define LOMBYTE_RNC_UI_TEXT_FONT_FONT_PRINT_WRAPPED_H - -#include "types.h" - -struct Glyph; - -s32 font_print_wrapped(s32, s32, s32, s32, u64, u8 *, s32, u64, struct Glyph *) __asm__("FUN_001f6cb8"); - -#endif /* LOMBYTE_RNC_UI_TEXT_FONT_FONT_PRINT_WRAPPED_H */ diff --git a/include/rnc/ui/text/font/font_set_window.h b/include/rnc/ui/text/font/font_set_window.h deleted file mode 100644 index 93d7230f9a..0000000000 --- a/include/rnc/ui/text/font/font_set_window.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_TEXT_FONT_FONT_SET_WINDOW_H -#define LOMBYTE_RNC_UI_TEXT_FONT_FONT_SET_WINDOW_H - -#include "types.h" - -void font_set_window(void *, int, int, int, int, int, int, int, int); - -#endif /* LOMBYTE_RNC_UI_TEXT_FONT_FONT_SET_WINDOW_H */ diff --git a/include/rnc/ui/text/font/load_debug_font.h b/include/rnc/ui/text/font/load_debug_font.h deleted file mode 100644 index 781e43b971..0000000000 --- a/include/rnc/ui/text/font/load_debug_font.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_TEXT_FONT_LOAD_DEBUG_FONT_H -#define LOMBYTE_RNC_UI_TEXT_FONT_LOAD_DEBUG_FONT_H - -#include "types.h" - -void load_debug_font(void) __asm__("FUN_001e9338"); - -#endif /* LOMBYTE_RNC_UI_TEXT_FONT_LOAD_DEBUG_FONT_H */ diff --git a/include/rnc/ui/text/link_localized_display_text.h b/include/rnc/ui/text/link_localized_display_text.h deleted file mode 100644 index 4c8c8d4297..0000000000 --- a/include/rnc/ui/text/link_localized_display_text.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_TEXT_LINK_LOCALIZED_DISPLAY_TEXT_H -#define LOMBYTE_RNC_UI_TEXT_LINK_LOCALIZED_DISPLAY_TEXT_H - -#include "types.h" - -void link_localized_display_text(void) __asm__("FUN_001fdd58"); - -#endif /* LOMBYTE_RNC_UI_TEXT_LINK_LOCALIZED_DISPLAY_TEXT_H */ diff --git a/include/rnc/ui/text/rebuild_configured_text_label_list.h b/include/rnc/ui/text/rebuild_configured_text_label_list.h deleted file mode 100644 index 6117e3f71a..0000000000 --- a/include/rnc/ui/text/rebuild_configured_text_label_list.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_TEXT_REBUILD_CONFIGURED_TEXT_LABEL_LIST_H -#define LOMBYTE_RNC_UI_TEXT_REBUILD_CONFIGURED_TEXT_LABEL_LIST_H - -#include "types.h" - -s32 rebuild_configured_text_label_list(void) __asm__("FUN_0021a1e0"); - -#endif /* LOMBYTE_RNC_UI_TEXT_REBUILD_CONFIGURED_TEXT_LABEL_LIST_H */ diff --git a/include/rnc/ui/text/render_localized_ui_entry_list.h b/include/rnc/ui/text/render_localized_ui_entry_list.h deleted file mode 100644 index 3815c50f9c..0000000000 --- a/include/rnc/ui/text/render_localized_ui_entry_list.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_TEXT_RENDER_LOCALIZED_UI_ENTRY_LIST_H -#define LOMBYTE_RNC_UI_TEXT_RENDER_LOCALIZED_UI_ENTRY_LIST_H - -#include "types.h" - -struct MenuScreen; - -s32 render_localized_ui_entry_list(struct MenuScreen *) __asm__("FUN_0021b1c8"); - -#endif /* LOMBYTE_RNC_UI_TEXT_RENDER_LOCALIZED_UI_ENTRY_LIST_H */ diff --git a/include/rnc/ui/vendor.h b/include/rnc/ui/vendor.h new file mode 100644 index 0000000000..9e11bc29d9 --- /dev/null +++ b/include/rnc/ui/vendor.h @@ -0,0 +1,9 @@ +#ifndef LOMBYTE_RNC_UI_VENDOR_H +#define LOMBYTE_RNC_UI_VENDOR_H + +#include "types.h" + +void draw_centered_capture_background(s32, s32) __asm__("FUN_001fb740"); +void render_vendor_capture_texture_overlays_pass(s32, f32, f32) __asm__("FUN_00239328"); + +#endif /* LOMBYTE_RNC_UI_VENDOR_H */ diff --git a/include/rnc/ui/vendor/draw_centered_capture_background.h b/include/rnc/ui/vendor/draw_centered_capture_background.h deleted file mode 100644 index 036cfbdb02..0000000000 --- a/include/rnc/ui/vendor/draw_centered_capture_background.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_VENDOR_DRAW_CENTERED_CAPTURE_BACKGROUND_H -#define LOMBYTE_RNC_UI_VENDOR_DRAW_CENTERED_CAPTURE_BACKGROUND_H - -#include "types.h" - -void draw_centered_capture_background(s32, s32) __asm__("FUN_001fb740"); - -#endif /* LOMBYTE_RNC_UI_VENDOR_DRAW_CENTERED_CAPTURE_BACKGROUND_H */ diff --git a/include/rnc/ui/vendor/render_vendor_capture_texture_overlays_pass.h b/include/rnc/ui/vendor/render_vendor_capture_texture_overlays_pass.h deleted file mode 100644 index 031db49f44..0000000000 --- a/include/rnc/ui/vendor/render_vendor_capture_texture_overlays_pass.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef LOMBYTE_RNC_UI_VENDOR_RENDER_VENDOR_CAPTURE_TEXTURE_OVERLAYS_PASS_H -#define LOMBYTE_RNC_UI_VENDOR_RENDER_VENDOR_CAPTURE_TEXTURE_OVERLAYS_PASS_H - -#include "types.h" - -void render_vendor_capture_texture_overlays_pass(s32, f32, f32) __asm__("FUN_00239328"); - -#endif /* LOMBYTE_RNC_UI_VENDOR_RENDER_VENDOR_CAPTURE_TEXTURE_OVERLAYS_PASS_H */ diff --git a/include/rnc/weapons.h b/include/rnc/weapons.h new file mode 100644 index 0000000000..c172353357 --- /dev/null +++ b/include/rnc/weapons.h @@ -0,0 +1,10 @@ +#ifndef LOMBYTE_RNC_WEAPONS_H +#define LOMBYTE_RNC_WEAPONS_H + +#include "types.h" + +struct MenuScreen; + +s32 load_hand_gadget(struct MenuScreen *) __asm__("FUN_00224368"); + +#endif /* LOMBYTE_RNC_WEAPONS_H */ diff --git a/include/rnc/weapons/load_hand_gadget.h b/include/rnc/weapons/load_hand_gadget.h deleted file mode 100644 index e1ddc5c948..0000000000 --- a/include/rnc/weapons/load_hand_gadget.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LOMBYTE_RNC_WEAPONS_LOAD_HAND_GADGET_H -#define LOMBYTE_RNC_WEAPONS_LOAD_HAND_GADGET_H - -#include "types.h" - -struct MenuScreen; - -s32 load_hand_gadget(struct MenuScreen *) __asm__("FUN_00224368"); - -#endif /* LOMBYTE_RNC_WEAPONS_LOAD_HAND_GADGET_H */ diff --git a/src/README.md b/src/README.md index a52d4a9d4d..8c0ee18af0 100644 --- a/src/README.md +++ b/src/README.md @@ -37,6 +37,8 @@ Rules: in `assembly/` or in the boot tree; at most three folders deep (`overlays/shared/` and `overlays/lNN/` count as the top). - Headers mirror the source path under `include/rnc/` (`include/rnc/overlay/` for level code). + The prototypes of one source folder share one header named after it + (`src/audio/decoder/*.c` → `include/rnc/audio/decoder.h`); types keep their own headers. Each file's owner path in `config/us/rnc1.us.yaml` must match its location. Moving or renaming a file follows [docs/contributing/code-cleanup.md](../docs/contributing/code-cleanup.md). diff --git a/src/audio/banks/snd_bank_load_by_loc.c b/src/audio/banks/snd_bank_load_by_loc.c index 512a59ac99..dcb21ecfb5 100644 --- a/src/audio/banks/snd_bank_load_by_loc.c +++ b/src/audio/banks/snd_bank_load_by_loc.c @@ -1,8 +1,7 @@ #include "types.h" #include "rnc/audio/sound_state.h" -#include "rnc/sdk/libc/stdio/printf.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_check_stat_rpc.h" +#include "rnc/sdk/libc/stdio.h" +#include "rnc/sdk/rpc/rpc.h" extern s32 snd_cd_bank_load_request[] __asm__("D_00137B40"); extern char snd_non_idle_error_string[] __asm__("D_00153D20"); diff --git a/src/audio/banks/snd_bank_load_from_ee_cb.c b/src/audio/banks/snd_bank_load_from_ee_cb.c index ff8f466e49..7fb1315339 100644 --- a/src/audio/banks/snd_bank_load_from_ee_cb.c +++ b/src/audio/banks/snd_bank_load_from_ee_cb.c @@ -1,8 +1,7 @@ #include "types.h" #include "rnc/audio/sound_state.h" -#include "rnc/sdk/libc/stdio/printf.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_check_stat_rpc.h" +#include "rnc/sdk/libc/stdio.h" +#include "rnc/sdk/rpc/rpc.h" extern s32 snd_cd_load_error __asm__("D_0015EC88") __attribute__((sda)); extern s32 snd_cd_callback_fn __asm__("D_0015ECD0") __attribute__((sda)); diff --git a/src/audio/decoder/audio_dec_delete.c b/src/audio/decoder/audio_dec_delete.c index dd47edc0f5..695e4a8d16 100644 --- a/src/audio/decoder/audio_dec_delete.c +++ b/src/audio/decoder/audio_dec_delete.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/audio/movie/snd_close_movie_sound.h" +#include "rnc/audio/movie.h" s32 audio_dec_delete(s32 unused_arg) __asm__("FUN_0023ac90"); diff --git a/src/audio/decoder/is_audio_ok.c b/src/audio/decoder/is_audio_ok.c index d4f8066757..2772e80569 100644 --- a/src/audio/decoder/is_audio_ok.c +++ b/src/audio/decoder/is_audio_ok.c @@ -2,7 +2,7 @@ #include "rnc/data_labels.h" #include "rnc/movies/decoder/decoder_globals.h" #include "rnc/movies/player/movie_player.h" -#include "rnc/audio/decoder/audio_dec_is_preset.h" +#include "rnc/audio/decoder.h" s32 is_audio_ok(void) __asm__("FUN_0023a790"); diff --git a/src/audio/decoder/send_to_spu.c b/src/audio/decoder/send_to_spu.c index 71c08f75d8..3cc54d83e2 100644 --- a/src/audio/decoder/send_to_spu.c +++ b/src/audio/decoder/send_to_spu.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/audio/decoder/audio_dec.h" -#include "rnc/audio/movie/snd_update_movie_adpcm.h" +#include "rnc/audio/movie.h" extern void FlushCache(s32); extern s32 sceSifSetDma(void *, s32); diff --git a/src/audio/movie/snd_get_movie_nax.c b/src/audio/movie/snd_get_movie_nax.c index 3ec10ddff2..b8b6b7a88d 100644 --- a/src/audio/movie/snd_get_movie_nax.c +++ b/src/audio/movie/snd_get_movie_nax.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/audio/rpc/snd_send_iop_command_and_wait.h" +#include "rnc/audio/rpc.h" void snd_get_movie_nax(void) __asm__("FUN_0012f178"); diff --git a/src/audio/movie/snd_reset_movie_sound.c b/src/audio/movie/snd_reset_movie_sound.c index f936c12927..66d8f2d2dc 100644 --- a/src/audio/movie/snd_reset_movie_sound.c +++ b/src/audio/movie/snd_reset_movie_sound.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/audio/rpc/snd_send_iop_command_and_wait.h" +#include "rnc/audio/rpc.h" void snd_reset_movie_sound(void) __asm__("FUN_0012f0a8"); diff --git a/src/audio/music/music_start_track.c b/src/audio/music/music_start_track.c index f06614dea6..40dff1f505 100644 --- a/src/audio/music/music_start_track.c +++ b/src/audio/music/music_start_track.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/audio/music/music_stream_state.h" #include "rnc/streaming/disc_table.h" -#include "rnc/audio/streaming/music_callbacks/music_primary_start_callback.h" +#include "rnc/audio/streaming/music_callbacks.h" extern void snd_play_vag_stream_by_loc_ex_cb( s32, s32, s32, s32, s16, s32, s32, s32, s32, void (*)(), u64) __asm__("func_0012EC08"); diff --git a/src/audio/music/music_start_track_10000.c b/src/audio/music/music_start_track_10000.c index f92015a9bf..adb7449d52 100644 --- a/src/audio/music/music_start_track_10000.c +++ b/src/audio/music/music_start_track_10000.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/audio/music/music_stream_state.h" #include "rnc/streaming/disc_table.h" -#include "rnc/audio/streaming/music_callbacks/music_secondary_start_callback.h" +#include "rnc/audio/streaming/music_callbacks.h" extern s32 snd_play_vag_stream_by_loc_ex_cb() __asm__("func_0012EC08"); diff --git a/src/audio/music/music_start_track_20000.c b/src/audio/music/music_start_track_20000.c index c3a2c9e97d..2a029ff55e 100644 --- a/src/audio/music/music_start_track_20000.c +++ b/src/audio/music/music_start_track_20000.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/audio/music/music_stream_state.h" #include "rnc/streaming/disc_table.h" -#include "rnc/audio/streaming/music_callbacks/music_secondary_start_callback.h" +#include "rnc/audio/streaming/music_callbacks.h" extern s32 snd_play_vag_stream_by_loc_ex_cb() __asm__("func_0012EC08"); diff --git a/src/audio/music/music_start_track_body.c b/src/audio/music/music_start_track_body.c index 191a019d68..8f54780131 100644 --- a/src/audio/music/music_start_track_body.c +++ b/src/audio/music/music_start_track_body.c @@ -1,7 +1,7 @@ /* Ported from rac1-decomp (src/game/music.c, set_sound_handle_id). */ #include "rnc/streaming/disc_table.h" #include "rnc/audio/music/music_stream_state.h" -#include "rnc/audio/streaming/music_callbacks/music_primary_replace_callback.h" +#include "rnc/audio/streaming/music_callbacks.h" extern void snd_play_vag_stream_by_loc_ex_cb(int, int, diff --git a/src/audio/music/music_start_track_by_id.c b/src/audio/music/music_start_track_by_id.c index 5e33a72709..55567a5163 100644 --- a/src/audio/music/music_start_track_by_id.c +++ b/src/audio/music/music_start_track_by_id.c @@ -2,12 +2,7 @@ #include "rnc/audio/music/music_stream_state.h" #include "rnc/globals.h" #include "rnc/data_labels.h" -#include "rnc/audio/music/music_start_track_10000.h" -#include "rnc/audio/music/music_start_track_20000.h" -#include "rnc/audio/music/music_start_track_30000.h" -#include "rnc/audio/music/music_start_track_40000.h" -#include "rnc/audio/music/music_start_track_50000.h" -#include "rnc/audio/music/music_start_track_60000.h" +#include "rnc/audio/music.h" extern u8 scene_sounds[] __asm__("D_0013A664"); // D_002169C0 is a code address retail passes as a pointer, not a data symbol; diff --git a/src/audio/music/music_transition.c b/src/audio/music/music_transition.c index b60bca7d4c..2ec394a8f1 100644 --- a/src/audio/music/music_transition.c +++ b/src/audio/music/music_transition.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/audio/music/music_stream_state.h" #include "rnc/streaming/disc_table.h" -#include "rnc/audio/streaming/music_callbacks/music_transition_start_callback.h" +#include "rnc/audio/streaming/music_callbacks.h" extern s32 snd_play_vag_stream_by_loc_ex_cb( s32, s32, s32, s32, s16, s32, s32, s32, s32, void (*)(), u64) __asm__("func_0012EC08"); diff --git a/src/audio/music/music_update_stream.c b/src/audio/music/music_update_stream.c index a300076ac8..1c9a5a5f36 100644 --- a/src/audio/music/music_update_stream.c +++ b/src/audio/music/music_update_stream.c @@ -1,7 +1,6 @@ #include "rnc/math/asm_helpers.h" -#include "rnc/audio/streaming/music_callbacks/music_channel_ready_callback.h" -#include "rnc/audio/streaming/music_callbacks/music_remaining_time_callback.h" -#include "rnc/audio/streaming/vag/snd_pause_vag_stream.h" +#include "rnc/audio/streaming/music_callbacks.h" +#include "rnc/audio/streaming/vag.h" /* Ported from rac1-decomp (src/game/music.c, func_00216F48). */ extern void snd_continue_vag_stream(void *) __asm__("func_0012ECA0"); diff --git a/src/audio/music/process_bgm_display_text_event.c b/src/audio/music/process_bgm_display_text_event.c index 5322856b40..09c3257c2d 100644 --- a/src/audio/music/process_bgm_display_text_event.c +++ b/src/audio/music/process_bgm_display_text_event.c @@ -3,7 +3,7 @@ #include "rnc/ui/text/font_state.h" #include "rnc/game/game_globals.h" #include "rnc/math/fast_math.h" -#include "rnc/rendering/packets/emit_textured_rectangle.h" +#include "rnc/rendering/packets.h" struct Glyph { u8 u; diff --git a/src/audio/rpc/snd_returns.c b/src/audio/rpc/snd_returns.c index aaa9bbf1d2..adbc3b1529 100644 --- a/src/audio/rpc/snd_returns.c +++ b/src/audio/rpc/snd_returns.c @@ -1,8 +1,8 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/audio/sound_state.h" -#include "rnc/sdk/libc/stdio/printf.h" -#include "rnc/sdk/rpc/rpc/sce_sif_check_stat_rpc.h" +#include "rnc/sdk/libc/stdio.h" +#include "rnc/sdk/rpc/rpc.h" /* The IOP return buffer this file owns: both functions below reach these gp-relative, which needs their definitions ahead of them. */ diff --git a/src/audio/rpc/snd_send_current_batch.c b/src/audio/rpc/snd_send_current_batch.c index da8bed63f6..ee38ef7b2e 100644 --- a/src/audio/rpc/snd_send_current_batch.c +++ b/src/audio/rpc/snd_send_current_batch.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/libc/stdio/printf.h" +#include "rnc/sdk/libc/stdio.h" extern s32 snd_batch_index __asm__("D_0015ECC0"); extern s32 *snd_batch_command_buffers[2] __asm__("D_0015ECA0"); diff --git a/src/audio/rpc/snd_send_iop_command_and_wait.c b/src/audio/rpc/snd_send_iop_command_and_wait.c index 20b22bc8c5..6b816ffc20 100644 --- a/src/audio/rpc/snd_send_iop_command_and_wait.c +++ b/src/audio/rpc/snd_send_iop_command_and_wait.c @@ -1,8 +1,7 @@ #include "types.h" -#include "rnc/audio/rpc/snd_returns.h" -#include "rnc/sdk/libc/stdio/printf.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_check_stat_rpc.h" +#include "rnc/audio/rpc.h" +#include "rnc/sdk/libc/stdio.h" +#include "rnc/sdk/rpc/rpc.h" extern s32 *snd_current_buffer __asm__("D_0015EC80") __attribute__((sda)); extern s32 snd_batch_index __asm__("D_0015ECC0") __attribute__((sda)); diff --git a/src/audio/rpc/snd_send_iop_command_no_wait.c b/src/audio/rpc/snd_send_iop_command_no_wait.c index 1495d65e2a..417a7c0ff5 100644 --- a/src/audio/rpc/snd_send_iop_command_no_wait.c +++ b/src/audio/rpc/snd_send_iop_command_no_wait.c @@ -1,9 +1,8 @@ #include "types.h" #include "rnc/audio/rpc/snd_send_iop_command_no_wait_globals.h" -#include "rnc/audio/rpc/snd_returns.h" -#include "rnc/sdk/libc/stdio/printf.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_check_stat_rpc.h" +#include "rnc/audio/rpc.h" +#include "rnc/sdk/libc/stdio.h" +#include "rnc/sdk/rpc/rpc.h" struct SndCb { s32 func; diff --git a/src/audio/snd_start_sound_system.c b/src/audio/snd_start_sound_system.c index 19c18563b5..41880d6332 100644 --- a/src/audio/snd_start_sound_system.c +++ b/src/audio/snd_start_sound_system.c @@ -5,9 +5,8 @@ #include "sda.h" #include "rnc/audio/sound_read_work.h" #include "rnc/audio/snd_start_sound_system_globals.h" -#include "rnc/sdk/libc/stdio/printf.h" -#include "rnc/sdk/rpc/rpc/sce_sif_bind_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_init_rpc.h" +#include "rnc/sdk/libc/stdio.h" +#include "rnc/sdk/rpc/rpc.h" struct SifClientDataStartSound { u8 pad_0[0x24]; diff --git a/src/audio/sound/calculate_voice_volume.c b/src/audio/sound/calculate_voice_volume.c index a5e7b8d2fe..77d069e252 100644 --- a/src/audio/sound/calculate_voice_volume.c +++ b/src/audio/sound/calculate_voice_volume.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/camera/camera_globals.h" -#include "rnc/audio/sound/calculate_voice_distance_volume.h" +#include "rnc/audio/sound.h" extern f32 fast_vec_dist(s32, u32) __asm__("func_001F9B48"); diff --git a/src/audio/sound/initialize_gameplay_sound_system.c b/src/audio/sound/initialize_gameplay_sound_system.c index d99a8a1817..c4b75f5ca2 100644 --- a/src/audio/sound/initialize_gameplay_sound_system.c +++ b/src/audio/sound/initialize_gameplay_sound_system.c @@ -6,11 +6,10 @@ #include "rnc/game/options.h" #include "rnc/audio/mixer/snd_set_master_volume.h" #include "rnc/audio/mixer/snd_set_playback_mode.h" -#include "rnc/audio/effects/snd_pre_alloc_reverb_work_area.h" -#include "rnc/audio/mixer/snd_set_group_voice_range.h" -#include "rnc/audio/mixer/snd_set_mixer_mode.h" -#include "rnc/audio/music/reset_music.h" -#include "rnc/audio/snd_start_sound_system.h" +#include "rnc/audio/effects.h" +#include "rnc/audio/mixer.h" +#include "rnc/audio/music.h" +#include "rnc/audio.h" /* The 0x70-byte header in front of the voices, then thirty 0x70-byte voices. */ typedef struct { diff --git a/src/audio/streaming/read_disc_sectors_and_wait.c b/src/audio/streaming/read_disc_sectors_and_wait.c index 2a3e3701ea..86d4494379 100644 --- a/src/audio/streaming/read_disc_sectors_and_wait.c +++ b/src/audio/streaming/read_disc_sectors_and_wait.c @@ -2,7 +2,7 @@ #include "rnc/audio/music/music_stream_state.h" #include "rnc/audio/rpc/snd_hold_command_batches.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" +#include "rnc/sdk/graph.h" extern s32 snd_flush_sound_commands() __asm__("func_0012DC80"); extern s32 snd_reset_state_and_flush_commands() __asm__("func_0012EB00"); diff --git a/src/audio/streaming/register_audio_stream_callback.c b/src/audio/streaming/register_audio_stream_callback.c index 262c070a69..810ce0bae8 100644 --- a/src/audio/streaming/register_audio_stream_callback.c +++ b/src/audio/streaming/register_audio_stream_callback.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/audio/streaming/finish_audio_stream_read.h" +#include "rnc/audio/streaming.h" #include "rnc/audio/streaming/safe_cd/snd_stream_safe_cd_callback.h" void register_audio_stream_callback(void) __asm__("FUN_00215420"); diff --git a/src/audio/streaming/safe_cd/snd_stream_safe_cd_break.c b/src/audio/streaming/safe_cd/snd_stream_safe_cd_break.c index 30d4eb15f6..9abf54a0ea 100644 --- a/src/audio/streaming/safe_cd/snd_stream_safe_cd_break.c +++ b/src/audio/streaming/safe_cd/snd_stream_safe_cd_break.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/audio/sound_state.h" -#include "rnc/sdk/storage/cdvd/scecdbreak.h" +#include "rnc/sdk/storage/cdvd.h" extern s32 snd_send_iop_command_no_wait() __asm__("func_0012E6E0"); s32 snd_stream_safe_cd_break(void) __asm__("FUN_0012eea8"); diff --git a/src/audio/streaming/safe_cd/snd_stream_safe_cd_callback.c b/src/audio/streaming/safe_cd/snd_stream_safe_cd_callback.c index 8daaf88d77..f201837004 100644 --- a/src/audio/streaming/safe_cd/snd_stream_safe_cd_callback.c +++ b/src/audio/streaming/safe_cd/snd_stream_safe_cd_callback.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/audio/sound_state.h" -#include "rnc/sdk/storage/cdvd/sceCdCallback.h" +#include "rnc/sdk/storage/cdvd.h" s32 snd_stream_safe_cd_callback(s32 callback) __asm__("FUN_0012ef28"); diff --git a/src/audio/streaming/safe_cd/snd_stream_safe_cd_get_error.c b/src/audio/streaming/safe_cd/snd_stream_safe_cd_get_error.c index b79063d3f0..4c7b2f41e1 100644 --- a/src/audio/streaming/safe_cd/snd_stream_safe_cd_get_error.c +++ b/src/audio/streaming/safe_cd/snd_stream_safe_cd_get_error.c @@ -2,7 +2,7 @@ #include "rnc/audio/sound_read_work.h" #include "rnc/data_labels.h" #include "rnc/audio/sound_state.h" -#include "rnc/sdk/storage/cdvd/sceCdGetError.h" +#include "rnc/sdk/storage/cdvd.h" s32 snd_stream_safe_cd_get_error(s32 unused_arg) __asm__("FUN_0012eef0"); diff --git a/src/audio/streaming/safe_cd/snd_stream_safe_cd_sync.c b/src/audio/streaming/safe_cd/snd_stream_safe_cd_sync.c index d172d0d24a..13119d9638 100644 --- a/src/audio/streaming/safe_cd/snd_stream_safe_cd_sync.c +++ b/src/audio/streaming/safe_cd/snd_stream_safe_cd_sync.c @@ -2,7 +2,7 @@ #include "rnc/audio/sound_read_work.h" #include "rnc/data_labels.h" #include "rnc/audio/sound_state.h" -#include "rnc/sdk/storage/cdvd/scecdsync.h" +#include "rnc/sdk/storage/cdvd.h" extern void FlushCache(s32); extern void snd_flush_sound_commands(void) __asm__("func_0012DC80"); diff --git a/src/audio/streaming/snd_stop_all_streams.c b/src/audio/streaming/snd_stop_all_streams.c index 2608f6376a..63037e9e14 100644 --- a/src/audio/streaming/snd_stop_all_streams.c +++ b/src/audio/streaming/snd_stop_all_streams.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/audio/rpc/snd_send_iop_command_no_wait.h" +#include "rnc/audio/rpc.h" void snd_stop_all_streams(void) __asm__("FUN_0012ebd0"); diff --git a/src/audio/streaming/start_audio_stream_read.c b/src/audio/streaming/start_audio_stream_read.c index 870ba79f1e..537a4f85e8 100644 --- a/src/audio/streaming/start_audio_stream_read.c +++ b/src/audio/streaming/start_audio_stream_read.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/audio/music/music_stream_state.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/sdk/debug.h" extern u8 cd_read_start_failure_message[] __asm__("D_001E8650"); extern s32 RaiseKernelTrap(); diff --git a/src/audio/streaming/submit_audio_stream_io_request.c b/src/audio/streaming/submit_audio_stream_io_request.c index a7fad9b876..f1818aa994 100644 --- a/src/audio/streaming/submit_audio_stream_io_request.c +++ b/src/audio/streaming/submit_audio_stream_io_request.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/libcdvd.h" #include "rnc/data_labels.h" -#include "rnc/sdk/storage/cdvd/sceCdRead.h" +#include "rnc/sdk/storage/cdvd.h" extern sceCdRMode cd_read_request_mode_template[] __asm__("D_00151700"); s32 submit_audio_stream_io_request(void *buf, u32 lsn, u32 sectors) __asm__("FUN_00216728"); diff --git a/src/audio/streaming/update_audio_stream_until_idle.c b/src/audio/streaming/update_audio_stream_until_idle.c index 5d35079a18..5b2e61c2ef 100644 --- a/src/audio/streaming/update_audio_stream_until_idle.c +++ b/src/audio/streaming/update_audio_stream_until_idle.c @@ -2,7 +2,7 @@ #include "rnc/audio/music/music_stream_state.h" #include "rnc/audio/rpc/snd_hold_command_batches.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" +#include "rnc/sdk/graph.h" extern s32 snd_flush_sound_commands() __asm__("func_0012DC80"); extern s32 snd_reset_state_and_flush_commands() __asm__("func_0012EB00"); diff --git a/src/audio/voices/pause_all_sounds.c b/src/audio/voices/pause_all_sounds.c index 6ca338d465..3165f6326f 100644 --- a/src/audio/voices/pause_all_sounds.c +++ b/src/audio/voices/pause_all_sounds.c @@ -7,55 +7,23 @@ #include "rnc/globals.h" #include "rnc/ui/menus/menu_globals.h" #include "rnc/audio/voices/snd_pause_all_sounds_in_group.h" -#include "rnc/audio/music/music_pause.h" +#include "rnc/audio/music.h" #include "rnc/audio/rpc/snd_flush_sound_commands.h" -#include "rnc/audio/streaming/advance_audio_stream_state.h" -#include "rnc/game/missions/update_mission_list.h" -#include "rnc/rendering/effects/draw_transition_overlay.h" -#include "rnc/ui/map/draw_map_screen.h" -#include "rnc/ui/map/draw_map_screen_layers.h" -#include "rnc/ui/map/draw_map_screen_overlay.h" -#include "rnc/ui/map/leave_map_screen.h" -#include "rnc/ui/menus/item_preview/clear_menu_preview_pair.h" -#include "rnc/ui/menus/item_preview/draw_item_preview_screen.h" -#include "rnc/ui/menus/item_preview/draw_menu_preview_objects.h" -#include "rnc/ui/menus/item_preview/enter_item_preview.h" -#include "rnc/ui/menus/item_preview/initialize_menu_preview_objects.h" -#include "rnc/ui/menus/item_preview/release_menu_preview_objects.h" -#include "rnc/ui/menus/item_preview/update_item_preview_moby.h" -#include "rnc/ui/menus/missions/draw_missions_menu.h" -#include "rnc/ui/menus/missions/draw_missions_menu2.h" -#include "rnc/ui/menus/missions/enter_menu_mission_list.h" -#include "rnc/ui/menus/missions/update_menu_mission_list.h" -#include "rnc/ui/menus/pause/draw_pause_ring.h" -#include "rnc/ui/menus/pause/find_next_pause_page.h" -#include "rnc/ui/menus/pause/pause_stage_sprite_lists.h" -#include "rnc/ui/menus/pause/set_menu_pause_flag_state.h" -#include "rnc/ui/menus/save_data/draw_checking_memory_card_data_menu.h" -#include "rnc/ui/menus/save_data/reset_pause_memory_card_state.h" -#include "rnc/ui/menus/selection/load_selection_list.h" -#include "rnc/ui/menus/selection/update_menu_grid_selection.h" -#include "rnc/ui/menus/selection/update_menu_item_slots.h" -#include "rnc/ui/menus/stream_image/draw_menu_stream_image.h" -#include "rnc/ui/menus/stream_image/enter_menu_stream_image.h" -#include "rnc/ui/menus/stream_image/leave_menu_stream_image.h" -#include "rnc/ui/menus/stream_image/update_menu_stream_image.h" -#include "rnc/ui/menus/system/clear_menu_selected_index.h" -#include "rnc/ui/menus/system/menu_draw_noop.h" -#include "rnc/ui/menus/system/menu_leave_noop.h" -#include "rnc/ui/menus/system/menu_update_noop.h" -#include "rnc/ui/menus/system/reset_menu_graphics_buffers.h" -#include "rnc/ui/menus/system/update_menu_entry_actions.h" -#include "rnc/ui/menus/system/update_menu_resource_stream.h" -#include "rnc/ui/menus/weapons/draw_selected_item_ammo.h" -#include "rnc/ui/menus/widgets/draw_menu_item_grid.h" -#include "rnc/ui/menus/widgets/draw_menu_text_list.h" -#include "rnc/ui/menus/widgets/enter_menu_help_text.h" -#include "rnc/ui/menus/widgets/render_configured_text_label.h" -#include "rnc/ui/menus/widgets/restore_menu_help_text.h" -#include "rnc/ui/menus/widgets/update_menu_help_text_load.h" -#include "rnc/ui/text/render_localized_ui_entry_list.h" -#include "rnc/weapons/load_hand_gadget.h" +#include "rnc/audio/streaming.h" +#include "rnc/game/missions.h" +#include "rnc/rendering/effects.h" +#include "rnc/ui/map.h" +#include "rnc/ui/menus/item_preview.h" +#include "rnc/ui/menus/missions.h" +#include "rnc/ui/menus/pause.h" +#include "rnc/ui/menus/save_data.h" +#include "rnc/ui/menus/selection.h" +#include "rnc/ui/menus/stream_image.h" +#include "rnc/ui/menus/system.h" +#include "rnc/ui/menus/weapons.h" +#include "rnc/ui/menus/widgets.h" +#include "rnc/ui/text.h" +#include "rnc/weapons.h" extern s32 D_0015F674 MACRO_ADDR; extern s32 D_00141660[]; diff --git a/src/audio/voices/set_sound_handle_id.c b/src/audio/voices/set_sound_handle_id.c index c22c84d684..ebd4101572 100644 --- a/src/audio/voices/set_sound_handle_id.c +++ b/src/audio/voices/set_sound_handle_id.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/sdk/debug.h" struct Handle { u32 id; diff --git a/src/audio/voices/sound_update.c b/src/audio/voices/sound_update.c index 19b540d32c..f82d5fa629 100644 --- a/src/audio/voices/sound_update.c +++ b/src/audio/voices/sound_update.c @@ -16,17 +16,10 @@ #include "rnc/audio/sound/calculate_voice_volume.h" #include "rnc/audio/voices/snd_stop_sound.h" #include "rnc/audio/voice_pool.h" -#include "rnc/audio/effects/snd_auto_reverb.h" -#include "rnc/audio/music/music_update.h" -#include "rnc/audio/sound/calculate_voice_pan.h" -#include "rnc/audio/sound/clamp_voice_position_to_collision.h" -#include "rnc/audio/sound/snd_get_doppler_pitch_mod.h" -#include "rnc/audio/sound/test_voice_occlusion.h" -#include "rnc/audio/sound/voice_start_callback.h" -#include "rnc/audio/sound/voice_update_callback.h" -#include "rnc/audio/voices/snd_play_sound_vol_pan_pmpb.h" -#include "rnc/audio/voices/snd_set_sound_params_cb.h" -#include "rnc/audio/voices/snd_sound_is_still_playing_cb.h" +#include "rnc/audio/effects.h" +#include "rnc/audio/music.h" +#include "rnc/audio/sound.h" +#include "rnc/audio/voices.h" extern f32 sound_water_height_threshold[] __asm__("D_0013F640"); extern s32 use_alt_fog[] __asm__("D_001872D4"); diff --git a/src/camera/update_camera.c b/src/camera/update_camera.c index 1a3ca9b28a..87b25ca3b9 100644 --- a/src/camera/update_camera.c +++ b/src/camera/update_camera.c @@ -8,9 +8,7 @@ #include "rnc/math/asm_helpers.h" #include "rnc/math/rotations/matrix_to_euler.h" #include "rnc/camera/update_camera_tracking_state.h" -#include "rnc/camera/advance_timed_camera_control.h" -#include "rnc/camera/update_camera_blend.h" -#include "rnc/camera/update_camera_environment_from_regions.h" +#include "rnc/camera.h" #include "rnc/camera/update_cam.h" extern int text_screen_active[] __asm__("D_001E6400"); @@ -18,7 +16,6 @@ extern char camera_shake_vectors[] __asm__("D_001870A0"); extern unsigned char D_0015EDB4[4] MACRO_ADDR; extern void refresh_camera_control_flags(void) __asm__("func_001ED940"); extern void start_camera_blend(struct UpdateCam *) __asm__("func_001EC8A0"); -extern int update_all_cameras(void) __asm__("func_001EC420"); extern void apply_camera_shake(void *, int) __asm__("func_001ED360"); extern void update_camera_underwater_flag(void) __asm__("func_001ED7F0"); extern void fast_vec_cross(void *, void *, void *) __asm__("func_001F9AD8"); diff --git a/src/camera/update_camera_blend.c b/src/camera/update_camera_blend.c index aef2a7d0e8..156aadb933 100644 --- a/src/camera/update_camera_blend.c +++ b/src/camera/update_camera_blend.c @@ -6,7 +6,7 @@ #include "rnc/camera/camera_globals.h" #include "rnc/camera/update_cam.h" -#include "rnc/camera/advance_alternate_camera_transition.h" +#include "rnc/camera.h" extern int step_camera_blend(void *, struct CameraBlend *) __asm__("func_001ECAF8"); diff --git a/src/check/help_record_layout_check.c b/src/check/help_record_layout_check.c index 9109273ab3..e550f0e2a1 100644 --- a/src/check/help_record_layout_check.c +++ b/src/check/help_record_layout_check.c @@ -8,5 +8,5 @@ SIZE_CHECK(record, HelpRecord, 8); OFFSET_CHECK(count, HelpRecord, count, 0); -OFFSET_CHECK(best, HelpRecord, best, 2); -OFFSET_CHECK(flags, HelpRecord, flags, 4); +OFFSET_CHECK(latest_time_bucket, HelpRecord, latest_time_bucket, 2); +OFFSET_CHECK(level_flags, HelpRecord, level_flags, 4); diff --git a/src/check/help_window_layout_check.c b/src/check/help_window_layout_check.c new file mode 100644 index 0000000000..32a4a1ea03 --- /dev/null +++ b/src/check/help_window_layout_check.c @@ -0,0 +1,67 @@ +/* Compile-time RC1 EE layouts; never linked into the game. */ + +#define OFFSET_CHECK(name, type, field, off) \ + typedef char offset_check_##name[((unsigned long)&((type *)0)->field == (off)) ? 1 : -1] + +#define SIZE_CHECK(name, type, size) \ + typedef char size_check_##name[(sizeof(type) == (size)) ? 1 : -1] + +#include "rnc/ui/help/help_state.h" + +#include "rnc/ui/help/message_entry.h" + +#include "rnc/game/usage_stats.h" + +SIZE_CHECK(window, HelpState, 0x40); + +SIZE_CHECK(message, HelpMessageEntry, 0x10); + +SIZE_CHECK(usage, struct UsageStat, 8); + +OFFSET_CHECK(window_state, HelpState, state, 0x00); + +OFFSET_CHECK(window_state_timer, HelpState, timer, 0x04); + +OFFSET_CHECK(window_target_half_width, HelpState, half_width, 0x08); + +OFFSET_CHECK(window_target_half_height, HelpState, half_height, 0x0C); + +OFFSET_CHECK(window_center_x, HelpState, center_x, 0x10); + +OFFSET_CHECK(window_center_y, HelpState, center_y, 0x14); + +OFFSET_CHECK(window_frame_half_width, HelpState, frame_half_width, 0x18); + +OFFSET_CHECK(window_frame_half_height, HelpState, frame_half_height, 0x1C); + +OFFSET_CHECK(window_message_index, HelpState, msg, 0x20); + +OFFSET_CHECK(window_pending_message_id, HelpState, pending, 0x24); + +OFFSET_CHECK(window_help_record_index, HelpState, entry, 0x28); + +OFFSET_CHECK(window_message_count, HelpState, count, 0x2C); + +OFFSET_CHECK(window_input_delay_elapsed, HelpState, started, 0x30); + +OFFSET_CHECK(window_input_delay_timer, HelpState, delay, 0x34); + +OFFSET_CHECK(window_queued, HelpState, queued, 0x38); + +OFFSET_CHECK(window_shown, HelpState, shown, 0x3A); + +OFFSET_CHECK(window_wait_timer, HelpState, wait, 0x3C); + +OFFSET_CHECK(message_text, HelpMessageEntry, text, 0); + +OFFSET_CHECK(message_message_id, HelpMessageEntry, message_id, 4); + +OFFSET_CHECK(message_audio_track_offset, HelpMessageEntry, audio_track_offset, 8); + +OFFSET_CHECK(message_unknown_0C, HelpMessageEntry, unknown_0C, 12); + +OFFSET_CHECK(usage_count, struct UsageStat, count, 0); + +OFFSET_CHECK(usage_time, struct UsageStat, latest_time_bucket, 2); + +OFFSET_CHECK(usage_flags, struct UsageStat, level_mask, 4); diff --git a/src/game/initialize_level_runtime.c b/src/game/initialize_level_runtime.c index 0bce7ebd87..e2e6019c53 100644 --- a/src/game/initialize_level_runtime.c +++ b/src/game/initialize_level_runtime.c @@ -12,10 +12,10 @@ #include "rnc/world/loaders/parse_space_scene_chunk.h" #include "rnc/audio/banks/snd_bank_load_from_ee_cb.h" #include "rnc/rendering/frame/reset_draw_globals.h" -#include "rnc/rendering/texture/parse_particle_textures.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" -#include "rnc/sdk/libc/stdlib/rand.h" -#include "rnc/sdk/storage/cdvd/scecdsync.h" +#include "rnc/rendering/texture.h" +#include "rnc/sdk/graph.h" +#include "rnc/sdk/libc/stdlib.h" +#include "rnc/sdk/storage/cdvd.h" void initialize_level_runtime(void) __asm__("FUN_00230f60"); diff --git a/src/game/load_level_zero_preserving_progress.c b/src/game/load_level_zero_preserving_progress.c index 91079ae88e..dfd43d3328 100644 --- a/src/game/load_level_zero_preserving_progress.c +++ b/src/game/load_level_zero_preserving_progress.c @@ -5,8 +5,8 @@ #include "rnc/data_labels.h" #include "rnc/game/options.h" #include "rnc/game/game_globals.h" -#include "rnc/sdk/scf/sce_scf_get_local_timefrom_rtc.h" -#include "rnc/sdk/storage/cdvd/scecdreadclock.h" +#include "rnc/sdk/scf.h" +#include "rnc/sdk/storage/cdvd.h" /* Preserves selected state across load_and_initialize_level_chunk using scratchpad copies. Only listed bytes of item_available are restored; each D_00141EA0 entry is diff --git a/src/game/mode_freeze_init.c b/src/game/mode_freeze_init.c index 50c2cc358c..678ba08ce1 100644 --- a/src/game/mode_freeze_init.c +++ b/src/game/mode_freeze_init.c @@ -2,7 +2,7 @@ #include "rnc/game/freeze_mode_state.h" #include "rnc/globals.h" #include "rnc/audio/voices/snd_pause_all_sounds_in_group.h" -#include "rnc/audio/music/music_pause.h" +#include "rnc/audio/music.h" extern s32 scale_game_frames(s32) __asm__("func_001F96F8"); extern s32 get_help_message_text() __asm__("func_001FDD10"); diff --git a/src/game/process_global_state_flags.c b/src/game/process_global_state_flags.c index 1adc7bbc8b..1715430321 100644 --- a/src/game/process_global_state_flags.c +++ b/src/game/process_global_state_flags.c @@ -7,7 +7,7 @@ #include "rnc/input/pad_state.h" #include "rnc/data_labels.h" -#include "rnc/game/transitions/request_space_load.h" +#include "rnc/game/transitions.h" extern u8 preserved_gold_bolt_flags[] __asm__("D_0014BF08"); extern u8 circle_target_menu_page[] __asm__("D_001D4EC0"); diff --git a/src/game/run_game_main_loop.c b/src/game/run_game_main_loop.c index 1f5c0ff14d..1b47d984dc 100644 --- a/src/game/run_game_main_loop.c +++ b/src/game/run_game_main_loop.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/syscalls/update_rfu_dispatch_state.h" +#include "rnc/sdk/syscalls.h" extern void startlevel(void) __asm__("func_001E9658"); extern void *parse_bin(void) __asm__("func_0012D8F8"); diff --git a/src/game/service_level_archive_load.c b/src/game/service_level_archive_load.c index e1f8bcc9cb..f4f47ab8fe 100644 --- a/src/game/service_level_archive_load.c +++ b/src/game/service_level_archive_load.c @@ -6,10 +6,8 @@ #include "rnc/audio/streaming/submit_audio_stream_io_request.h" #include "rnc/audio/banks/snd_unload_bank.h" #include "rnc/audio/banks/snd_resolve_bank_xrefs.h" -#include "rnc/audio/sound/store_sound_bank_handle_callback.h" -#include "rnc/sdk/storage/cdvd/sceCdGetError.h" -#include "rnc/sdk/storage/cdvd/scecdbreak.h" -#include "rnc/sdk/storage/cdvd/scecdsync.h" +#include "rnc/audio/sound.h" +#include "rnc/sdk/storage/cdvd.h" struct LevelArchiveHeader { u8 pad_0[8]; diff --git a/src/game/start_level.c b/src/game/start_level.c index a371ba66e7..eb4b10a0cd 100644 --- a/src/game/start_level.c +++ b/src/game/start_level.c @@ -4,9 +4,8 @@ #include "types.h" #include "rnc/runtime/callbacks/count_vsync.h" #include "rnc/sdk/graph/sce_gs_sync_path.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" -#include "rnc/sdk/graph/sce_gs_sync_v_callback.h" -#include "rnc/sdk/storage/cdvd/scecdsync.h" +#include "rnc/sdk/graph.h" +#include "rnc/sdk/storage/cdvd.h" extern int decode_mode_macro __asm__("D_0015EED8") MACRO_ADDR; diff --git a/src/game/startlevel.c b/src/game/startlevel.c index 6ff3391183..9b0ba6a4d2 100644 --- a/src/game/startlevel.c +++ b/src/game/startlevel.c @@ -10,13 +10,11 @@ #include "rnc/game/transitions/do_space_transition.h" #include "rnc/game/startlevel.h" #include "rnc/game/transitions/transition_do_transition.h" -#include "rnc/rendering/frame/reset_draw_config.h" -#include "rnc/rendering/frame/set_background_color.h" -#include "rnc/rendering/texture/reset_gs_texture_allocation.h" -#include "rnc/save/check_memory_card.h" -#include "rnc/sdk/debug/debug_print.h" -#include "rnc/sdk/graph/sce_gs_reset_graph.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" +#include "rnc/rendering/frame.h" +#include "rnc/rendering/texture.h" +#include "rnc/save.h" +#include "rnc/sdk/debug.h" +#include "rnc/sdk/graph.h" typedef struct { s32 off; diff --git a/src/game/transitions/do_space_transition.c b/src/game/transitions/do_space_transition.c index 84c6ebb828..84168626fe 100644 --- a/src/game/transitions/do_space_transition.c +++ b/src/game/transitions/do_space_transition.c @@ -4,11 +4,11 @@ #include "rnc/math/fast_math.h" #include "rnc/audio/streaming/safe_cd/snd_stream_safe_cd_callback.h" #include "rnc/game/transitions/tick_space_transition.h" -#include "rnc/rendering/frame/set_background_color.h" -#include "rnc/sdk/debug/debug_print.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" -#include "rnc/sdk/storage/cdvd/scecdsync.h" -#include "rnc/ui/loading/play_level_loading_slides.h" +#include "rnc/rendering/frame.h" +#include "rnc/sdk/debug.h" +#include "rnc/sdk/graph.h" +#include "rnc/sdk/storage/cdvd.h" +#include "rnc/ui/loading.h" struct Globals_0013DD58 { u8 unk0; diff --git a/src/game/transitions/play_level_transition_movie.c b/src/game/transitions/play_level_transition_movie.c index 42018cab6e..89f922c324 100644 --- a/src/game/transitions/play_level_transition_movie.c +++ b/src/game/transitions/play_level_transition_movie.c @@ -4,8 +4,7 @@ #include "rnc/audio/voice_pool.h" #include "rnc/runtime/callbacks/count_vsync.h" #include "rnc/sdk/graph/sce_gs_sync_path.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" -#include "rnc/sdk/graph/sce_gs_sync_v_callback.h" +#include "rnc/sdk/graph.h" extern s32 D_001940D4[]; extern void play_mpeg_movie(s32, s32, s32, s32, s32) __asm__("func_0023A3B8"); diff --git a/src/game/transitions/transition_default_draw.c b/src/game/transitions/transition_default_draw.c index 7ad11568f3..f14ed885d0 100644 --- a/src/game/transitions/transition_default_draw.c +++ b/src/game/transitions/transition_default_draw.c @@ -5,7 +5,7 @@ #include "rnc/rendering/render_globals.h" #include "rnc/math/asm_helpers.h" #include "rnc/mobys/prune_moby_references.h" -#include "rnc/rendering/packets/append_dma_tag.h" +#include "rnc/rendering/packets.h" struct Globals_0016045C { u8 pad_0[0x4]; diff --git a/src/game/transitions/transition_do_transition.c b/src/game/transitions/transition_do_transition.c index b43834622e..5925849f4d 100644 --- a/src/game/transitions/transition_do_transition.c +++ b/src/game/transitions/transition_do_transition.c @@ -15,14 +15,12 @@ #include "rnc/ui/hud/banks/hud_heap_reset.h" #include "rnc/ui/hud/init_hud.h" #include "rnc/game/transitions/transition_do_transition.h" -#include "rnc/audio/voices/allocate_voice_for_group_entry.h" -#include "rnc/audio/voices/is_voice_active.h" -#include "rnc/game/start_level.h" -#include "rnc/game/transitions/transition_load_wad.h" -#include "rnc/sdk/graph/sce_gs_reset_graph.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" -#include "rnc/sdk/libc/stdlib/rand.h" -#include "rnc/ui/help/load_help_message_group.h" +#include "rnc/audio/voices.h" +#include "rnc/game.h" +#include "rnc/game/transitions.h" +#include "rnc/sdk/graph.h" +#include "rnc/sdk/libc/stdlib.h" +#include "rnc/ui/help.h" typedef struct { s32 off; diff --git a/src/game/transitions/transition_load_wad.c b/src/game/transitions/transition_load_wad.c index 5433edbf0a..214f4ae27e 100644 --- a/src/game/transitions/transition_load_wad.c +++ b/src/game/transitions/transition_load_wad.c @@ -15,11 +15,10 @@ #include "rnc/world/loaders/parse_space_scene_chunk.h" #include "rnc/audio/streaming/update_audio_stream_until_idle.h" #include "rnc/rendering/frame/initialize_level_render_state.h" -#include "rnc/rendering/texture/parse_particle_textures.h" -#include "rnc/sdk/graph/sce_gs_exec_load_image.h" -#include "rnc/sdk/graph/sce_gs_set_def_load_image.h" +#include "rnc/rendering/texture.h" +#include "rnc/sdk/graph.h" #include "rnc/sdk/graph/sce_gs_sync_path.h" -#include "rnc/ui/help/load_help_message_group.h" +#include "rnc/ui/help.h" typedef struct { s32 x0; diff --git a/src/game/update_gameplay_frame.c b/src/game/update_gameplay_frame.c index 4b20b1634b..da27dea9b6 100644 --- a/src/game/update_gameplay_frame.c +++ b/src/game/update_gameplay_frame.c @@ -6,9 +6,8 @@ #include "rnc/globals.h" #include "rnc/game/game_globals.h" #include "rnc/world/loaders/parse_space_scene_chunk.h" -#include "rnc/rendering/frame/callbacks/noop_callback_h.h" -#include "rnc/rendering/frame/callbacks/noop_callback_i.h" -#include "rnc/ui/menus/system/enter_main_menu.h" +#include "rnc/rendering/frame/callbacks.h" +#include "rnc/ui/menus/system.h" typedef struct { f32 x, y, z, w; diff --git a/src/game/update_level_gameplay_frame.c b/src/game/update_level_gameplay_frame.c index f76e08bfb7..50af0b1364 100644 --- a/src/game/update_level_gameplay_frame.c +++ b/src/game/update_level_gameplay_frame.c @@ -7,9 +7,8 @@ #include "rnc/mobys/moby_spawn.h" #include "rnc/audio/rpc/snd_hold_command_batches.h" #include "rnc/world/loaders/parse_space_scene_chunk.h" -#include "rnc/rendering/frame/callbacks/noop_callback_h.h" -#include "rnc/rendering/frame/callbacks/noop_callback_i.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/rendering/frame/callbacks.h" +#include "rnc/sdk/libc/stdlib.h" typedef union { u128 quadword; diff --git a/src/game/update_mode_freeze.c b/src/game/update_mode_freeze.c index 0bd9bca93f..11039f62e7 100644 --- a/src/game/update_mode_freeze.c +++ b/src/game/update_mode_freeze.c @@ -7,8 +7,8 @@ #include "rnc/game/options.h" #include "rnc/ui/menus/menu_globals.h" #include "rnc/audio/voices/snd_continue_all_sounds_in_group.h" -#include "rnc/game/transitions/request_space_load.h" -#include "rnc/runtime/decrement_resource_counter.h" +#include "rnc/game/transitions.h" +#include "rnc/runtime.h" extern u16 D_0013E05A[]; extern u8 saved_camera_vectors[] __asm__("D_00141050"); diff --git a/src/input/init_pads.c b/src/input/init_pads.c index 28db62ceb7..de8b6d172b 100644 --- a/src/input/init_pads.c +++ b/src/input/init_pads.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/input/pad_state.h" -#include "rnc/sdk/input/dbc/sceDbcInit.h" +#include "rnc/sdk/input/dbc.h" typedef struct { s32 port; diff --git a/src/input/poll_pad_device_state.c b/src/input/poll_pad_device_state.c index 2e08ca6eff..6171bcfb0c 100644 --- a/src/input/poll_pad_device_state.c +++ b/src/input/poll_pad_device_state.c @@ -1,8 +1,5 @@ #include "types.h" -#include "rnc/sdk/input/sce_pad2_get_button_profile.h" -#include "rnc/sdk/input/sce_pad2_get_state.h" -#include "rnc/sdk/input/sce_pad2_read.h" -#include "rnc/sdk/input/sce_vib_get_profile.h" +#include "rnc/sdk/input.h" struct PAD { u8 pad0[0x180]; diff --git a/src/input/update_primary_pad_state.c b/src/input/update_primary_pad_state.c index b3720fb5c9..d494746cf2 100644 --- a/src/input/update_primary_pad_state.c +++ b/src/input/update_primary_pad_state.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/input/pad_state.h" -#include "rnc/input/poll_pad_device_state.h" +#include "rnc/input.h" void update_primary_pad_state(void) __asm__("FUN_00217a10"); diff --git a/src/math/random/random_angle_radians.c b/src/math/random/random_angle_radians.c index 3c4188682b..5eaf4e4ee5 100644 --- a/src/math/random/random_angle_radians.c +++ b/src/math/random/random_angle_radians.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/math/random.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/sdk/libc/stdlib.h" f32 random_angle_radians(void) __asm__("FUN_00213308"); diff --git a/src/math/random/random_float_between.c b/src/math/random/random_float_between.c index ec834a6c32..858309409a 100644 --- a/src/math/random/random_float_between.c +++ b/src/math/random/random_float_between.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/math/random.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/sdk/libc/stdlib.h" f32 random_float_between(f32 range_start, f32 range_end) __asm__("FUN_002132a8"); diff --git a/src/mobys/animation/update_resident_dialogue_animation_state.c b/src/mobys/animation/update_resident_dialogue_animation_state.c index 5cebd06eaa..189af9ede4 100644 --- a/src/mobys/animation/update_resident_dialogue_animation_state.c +++ b/src/mobys/animation/update_resident_dialogue_animation_state.c @@ -7,7 +7,7 @@ #include "rnc/mobys/attach_manipulator.h" #include "rnc/audio/streaming/continue_audio_stream_if_ready.h" #include "rnc/mobys/detach_manipulator.h" -#include "rnc/mobys/animation/is_value_within_interpolated_window.h" +#include "rnc/mobys/animation.h" typedef struct { u8 pad0[0x20]; diff --git a/src/mobys/create_moby.c b/src/mobys/create_moby.c index e5c9bc646a..3902b1ec25 100644 --- a/src/mobys/create_moby.c +++ b/src/mobys/create_moby.c @@ -3,7 +3,7 @@ #include "sda.h" #include "rnc/mobys/moby.h" #include "rnc/game/game_globals.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/sdk/debug.h" extern s32 num_spawnable_mobys __asm__("D_0015FEFC") MACRO_ADDR; extern struct Moby *moby_instance_end __asm__("D_0015FF1C"); diff --git a/src/mobys/resolve_moby_hit_response.c b/src/mobys/resolve_moby_hit_response.c index 304af2f272..929a90e182 100644 --- a/src/mobys/resolve_moby_hit_response.c +++ b/src/mobys/resolve_moby_hit_response.c @@ -4,7 +4,7 @@ #include "rnc/math/asm_helpers.h" #include "rnc/mobys/get_moby_target_info.h" #include "rnc/mobys/hit_response_tables.h" -#include "rnc/mobys/get_moby_hit_state.h" +#include "rnc/mobys.h" typedef unsigned int u128_25a478 __attribute__((mode(TI), aligned(16))); diff --git a/src/movies/decoder/callbacks/mpeg_error.c b/src/movies/decoder/callbacks/mpeg_error.c index bffb04ed40..7dc29ca454 100644 --- a/src/movies/decoder/callbacks/mpeg_error.c +++ b/src/movies/decoder/callbacks/mpeg_error.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/sdk/debug.h" struct MpegErrorData { u8 pad_0[0x4]; diff --git a/src/movies/decoder/dec_bs0.c b/src/movies/decoder/dec_bs0.c index b123da65ef..5a947d5843 100644 --- a/src/movies/decoder/dec_bs0.c +++ b/src/movies/decoder/dec_bs0.c @@ -6,10 +6,8 @@ #include "types.h" #include "rnc/movies/decoder/video_dec.h" #include "rnc/movies/player/movie_player.h" -#include "rnc/sdk/debug/debug_print.h" -#include "rnc/sdk/mpeg/api/sce_mpeg_get_picture.h" -#include "rnc/sdk/mpeg/api/sce_mpeg_is_end.h" -#include "rnc/sdk/mpeg/api/sce_mpeg_reset.h" +#include "rnc/sdk/debug.h" +#include "rnc/sdk/mpeg/api.h" extern struct MoviePlayer *movie_player_macro __asm__("D_0016120C") MACRO_ADDR; #define voBuf (movie_player_macro->vo_buf) diff --git a/src/movies/decoder/dma/set_d3_chcr.c b/src/movies/decoder/dma/set_d3_chcr.c index 92b6da6b85..973a51ed41 100644 --- a/src/movies/decoder/dma/set_d3_chcr.c +++ b/src/movies/decoder/dma/set_d3_chcr.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" extern void DIntr(void); diff --git a/src/movies/decoder/dma/set_d4_chcr.c b/src/movies/decoder/dma/set_d4_chcr.c index c14d462164..866ae79fa0 100644 --- a/src/movies/decoder/dma/set_d4_chcr.c +++ b/src/movies/decoder/dma/set_d4_chcr.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" extern void DIntr(void); diff --git a/src/movies/decoder/mpeg_restart_video_dma.c b/src/movies/decoder/mpeg_restart_video_dma.c index 8f23ced559..8ece8c32de 100644 --- a/src/movies/decoder/mpeg_restart_video_dma.c +++ b/src/movies/decoder/mpeg_restart_video_dma.c @@ -1,6 +1,6 @@ #include "sda.h" #include "rnc/movies/player/movie_player.h" -#include "rnc/movies/decoder/video_input/vi_buf_restart_dma.h" +#include "rnc/movies/decoder/video_input.h" extern struct MoviePlayer *movie_player_macro __asm__("D_0016120C") MACRO_ADDR; diff --git a/src/movies/decoder/read_cd_stream_sectors.c b/src/movies/decoder/read_cd_stream_sectors.c index 6115faa848..1c62b5d797 100644 --- a/src/movies/decoder/read_cd_stream_sectors.c +++ b/src/movies/decoder/read_cd_stream_sectors.c @@ -1,6 +1,5 @@ #include "types.h" -#include "rnc/sdk/storage/cdvd/sceCdRead.h" -#include "rnc/sdk/storage/cdvd/scecdsync.h" +#include "rnc/sdk/storage/cdvd.h" struct CdStream { u8 pad_0[0x4]; diff --git a/src/movies/decoder/read_mpeg.c b/src/movies/decoder/read_mpeg.c index a53f1eef8b..cd0e191cca 100644 --- a/src/movies/decoder/read_mpeg.c +++ b/src/movies/decoder/read_mpeg.c @@ -7,11 +7,11 @@ #include "rnc/game/options.h" #include "rnc/audio/mixer/snd_set_master_volume.h" #include "rnc/audio/voice_pool.h" -#include "rnc/audio/decoder/audio_dec_reset.h" -#include "rnc/movies/decoder/video_dec_is_flushed.h" -#include "rnc/movies/display/end_display.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" -#include "rnc/sdk/mpeg/api/sce_mpeg_demux_pss_ring.h" +#include "rnc/audio/decoder.h" +#include "rnc/movies/decoder.h" +#include "rnc/movies/display.h" +#include "rnc/sdk/graph.h" +#include "rnc/sdk/mpeg/api.h" extern struct PadStateWords pad_words __asm__("D_0013C940"); extern s32 D_0015EEA0; diff --git a/src/movies/decoder/video_dec_delete.c b/src/movies/decoder/video_dec_delete.c index e425ae12c9..e168e2572c 100644 --- a/src/movies/decoder/video_dec_delete.c +++ b/src/movies/decoder/video_dec_delete.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/movies/decoder/video_input/vi_buf_delete.h" +#include "rnc/movies/decoder/video_input.h" extern s32 sceMpegDelete(struct sceMpeg *mpeg) __asm__("FUN_0012b9e0"); s32 video_dec_delete(s32 video_dec) __asm__("FUN_0023cc38"); diff --git a/src/movies/decoder/video_dec_input_count.c b/src/movies/decoder/video_dec_input_count.c index 296cc8f8ec..8ff626d9a7 100644 --- a/src/movies/decoder/video_dec_input_count.c +++ b/src/movies/decoder/video_dec_input_count.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/movies/decoder/video_dec.h" -#include "rnc/movies/decoder/video_input/vi_buf_count.h" +#include "rnc/movies/decoder/video_input.h" s32 video_dec_input_count(struct VideoDec *video_dec) __asm__("FUN_0023cce0"); diff --git a/src/movies/decoder/video_dec_is_flushed.c b/src/movies/decoder/video_dec_is_flushed.c index f4091b64eb..f7ce1b8184 100644 --- a/src/movies/decoder/video_dec_is_flushed.c +++ b/src/movies/decoder/video_dec_is_flushed.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/movies/decoder/video_dec.h" -#include "rnc/sdk/mpeg/api/sce_mpeg_is_ref_buff_empty.h" +#include "rnc/sdk/mpeg/api.h" extern s32 video_dec_input_count(struct VideoDec *video_dec) __asm__("func_0023CCE0"); s32 video_dec_is_flushed(struct VideoDec *video_dec) __asm__("FUN_0023cde0"); diff --git a/src/movies/decoder/video_input/vi_buf_add_dma.c b/src/movies/decoder/video_input/vi_buf_add_dma.c index 7407f998de..986691e32a 100644 --- a/src/movies/decoder/video_input/vi_buf_add_dma.c +++ b/src/movies/decoder/video_input/vi_buf_add_dma.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/movies/decoder/buffers/get_fifo_index.h" -#include "rnc/movies/decoder/dma/sc_tag2.h" -#include "rnc/movies/player/err_message.h" +#include "rnc/movies/decoder/dma.h" +#include "rnc/movies/player.h" typedef struct { u64 lo; diff --git a/src/movies/decoder/video_input/vi_buf_reset.c b/src/movies/decoder/video_input/vi_buf_reset.c index b7edc68314..39f987d6ff 100644 --- a/src/movies/decoder/video_input/vi_buf_reset.c +++ b/src/movies/decoder/video_input/vi_buf_reset.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/movies/decoder/vi_buf.h" #include "rnc/sdk/eetypes.h" -#include "rnc/movies/decoder/dma/sc_tag2.h" +#include "rnc/movies/decoder/dma.h" #define DPUT(a, v) (*(volatile u32 *)(a) = (v)) #define DMA_ADDR(p) ((u32)(p) & 0x0FFFFFFF) extern void set_d4_chcr(s32) __asm__("FUN_0023bbb0"); diff --git a/src/movies/decoder/video_output/vo_buf_inc_count.c b/src/movies/decoder/video_output/vo_buf_inc_count.c index 706361f36b..a746710854 100644 --- a/src/movies/decoder/video_output/vo_buf_inc_count.c +++ b/src/movies/decoder/video_output/vo_buf_inc_count.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/movies/decoder/vo_buf.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" extern s32 DIntr(void); void vo_buf_inc_count(struct VoBuf *buf) __asm__("FUN_0023d210"); diff --git a/src/movies/display/set_pal_mode.c b/src/movies/display/set_pal_mode.c index 5ced48c79c..8d217b21bd 100644 --- a/src/movies/display/set_pal_mode.c +++ b/src/movies/display/set_pal_mode.c @@ -7,8 +7,7 @@ #include "rnc/rendering/draw_environment.h" #include "rnc/rendering/render_globals.h" #include "rnc/rendering/packets/put_draw_buffer_large.h" -#include "rnc/sdk/graph/sce_gs_exec_load_image.h" -#include "rnc/sdk/graph/sce_gs_set_def_load_image.h" +#include "rnc/sdk/graph.h" extern s32 display_buffer_address __asm__("D_0015EE80"); extern void fill_transfer_words(u8 *, s32, s32) __asm__("FUN_001f97e8"); diff --git a/src/movies/display/start_display.c b/src/movies/display/start_display.c index ab873b5299..f73c8a4785 100644 --- a/src/movies/display/start_display.c +++ b/src/movies/display/start_display.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/movies/decoder/decoder_globals.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" +#include "rnc/sdk/graph.h" extern volatile s32 D_001611E4; diff --git a/src/movies/player/err_message.c b/src/movies/player/err_message.c index 818dab22a0..e9e3bbd627 100644 --- a/src/movies/player/err_message.c +++ b/src/movies/player/err_message.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/sdk/debug.h" extern u8 movie_error_message[] __asm__("D_001611F8"); void err_message(s32 error_code) __asm__("FUN_0023ab78"); diff --git a/src/movies/player/init_all.c b/src/movies/player/init_all.c index 98833596f6..80b339c7f4 100644 --- a/src/movies/player/init_all.c +++ b/src/movies/player/init_all.c @@ -2,13 +2,11 @@ #include "asm.h" #include "rnc/movies/decoder/decoder_globals.h" #include "rnc/movies/player/movie_player.h" -#include "rnc/audio/decoder/audio_dec_create.h" -#include "rnc/movies/decoder/mpeg_cd_stream_open.h" -#include "rnc/movies/decoder/video_dec_create.h" -#include "rnc/movies/decoder/video_dec_set_stream.h" -#include "rnc/movies/display/handler_end_image.h" -#include "rnc/sdk/debug/debug_print.h" -#include "rnc/sdk/mpeg/api/sce_mpeg_init.h" +#include "rnc/audio/decoder.h" +#include "rnc/movies/decoder.h" +#include "rnc/movies/display.h" +#include "rnc/sdk/debug.h" +#include "rnc/sdk/mpeg/api.h" extern u8 movie_open_error_text[18] __asm__("D_001E8AF0"); diff --git a/src/movies/player/term_all.c b/src/movies/player/term_all.c index ed848a9b0f..19a6aec401 100644 --- a/src/movies/player/term_all.c +++ b/src/movies/player/term_all.c @@ -2,8 +2,8 @@ #include "rnc/data_labels.h" #include "rnc/movies/decoder/decoder_globals.h" #include "rnc/movies/player/movie_player.h" -#include "rnc/movies/decoder/mpeg_cd_stream_close.h" -#include "rnc/sdk/storage/cdvd/scecdsync.h" +#include "rnc/movies/decoder.h" +#include "rnc/sdk/storage/cdvd.h" extern s32 DeleteThread(); extern s32 RemoveDmacHandler(); diff --git a/src/overlays/l00/level_class_tables.c b/src/overlays/l00/level_class_tables.c index 1dc864baed..a794a6ce65 100644 --- a/src/overlays/l00/level_class_tables.c +++ b/src/overlays/l00/level_class_tables.c @@ -1,77 +1,27 @@ -#include "rnc/mobys/quad_moby_update.h" -#include "rnc/overlay/l00/mobys/beam_slot_controller.h" -#include "rnc/overlay/l00/mobys/clank_cutscene_trigger.h" -#include "rnc/overlay/l00/mobys/cutscene_effects.h" -#include "rnc/overlay/l00/mobys/help_hints.h" -#include "rnc/overlay/l00/mobys/veldin_robot_enemy.h" -#include "rnc/overlay/shared/audio/emitters/distance_emitter.h" -#include "rnc/overlay/shared/audio/emitters/random_position_emitter.h" -#include "rnc/overlay/shared/camera/aim_volume_camera.h" -#include "rnc/overlay/shared/camera/follow_camera_setup.h" -#include "rnc/overlay/shared/camera/follow_camera_update.h" -#include "rnc/overlay/shared/camera/hero_aligned_camera.h" -#include "rnc/overlay/shared/camera/orbit_camera.h" +#include "rnc/mobys.h" +#include "rnc/overlay/l00/mobys.h" +#include "rnc/overlay/shared/audio/emitters.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/camera/scripted_camera.h" #include "rnc/overlay/shared/camera/swing_volume_camera.h" -#include "rnc/overlay/shared/camera/target_tracking_camera.h" -#include "rnc/overlay/shared/enemies/horny_toad.h" -#include "rnc/overlay/shared/mobys/camera_object.h" -#include "rnc/overlay/shared/pickups/crate.h" -#include "rnc/overlay/shared/pickups/crate_fragment.h" +#include "rnc/overlay/shared/enemies.h" +#include "rnc/overlay/shared/mobys.h" +#include "rnc/overlay/shared/pickups.h" #include "rnc/overlay/shared/pickups/infobot.h" -#include "rnc/overlay/shared/pickups/nanotech_ball.h" -#include "rnc/overlay/shared/pickups/pilots_helmet.h" -#include "rnc/overlay/shared/pickups/weapon_ammo.h" #include "rnc/overlay/shared/props/grow_and_fade_out.h" -#include "rnc/overlay/shared/props/hydrodisplacer.h" -#include "rnc/overlay/shared/props/particle_spawner_smoke_fire.h" +#include "rnc/overlay/shared/props.h" #include "rnc/overlay/shared/props/particle_spawner_smoke_fire_controller.h" -#include "rnc/overlay/shared/props/plant.h" -#include "rnc/overlay/shared/props/pterodactyl.h" -#include "rnc/overlay/shared/props/red_orb.h" -#include "rnc/overlay/shared/props/tumbling_part.h" -#include "rnc/overlay/shared/rendering/effects/debris.h" +#include "rnc/overlay/shared/rendering/effects.h" #include "rnc/overlay/shared/rendering/effects/explosion_light.h" -#include "rnc/overlay/shared/rendering/effects/glow_particle.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" -#include "rnc/overlay/shared/vehicles/veldin_ship.h" -#include "rnc/overlay/shared/vendor/vendor.h" -#include "rnc/overlay/shared/vendor/vendor_orb.h" -#include "rnc/overlay/shared/weapons/blaster.h" -#include "rnc/overlay/shared/weapons/blaster_shot.h" -#include "rnc/overlay/shared/weapons/bomb_glove.h" +#include "rnc/overlay/shared/vehicles.h" +#include "rnc/overlay/shared/vendor.h" +#include "rnc/overlay/shared/weapons.h" #include "rnc/overlay/shared/weapons/bomb_glove_bomb.h" -#include "rnc/overlay/shared/weapons/decoy.h" -#include "rnc/overlay/shared/weapons/decoy_glove.h" #include "rnc/overlay/shared/weapons/devastator.h" -#include "rnc/overlay/shared/weapons/doom_bot.h" -#include "rnc/overlay/shared/weapons/drone.h" -#include "rnc/overlay/shared/weapons/glove_of_doom.h" -#include "rnc/overlay/shared/weapons/glove_of_doom_bomb.h" -#include "rnc/overlay/shared/weapons/gold_devastator_missile.h" -#include "rnc/overlay/shared/weapons/helipack.h" -#include "rnc/overlay/shared/weapons/linked_moby_states_update.h" -#include "rnc/overlay/shared/weapons/metal_detector.h" #include "rnc/overlay/shared/weapons/mine.h" -#include "rnc/overlay/shared/weapons/mine_glove.h" -#include "rnc/overlay/shared/weapons/morphoray.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken_feather.h" -#include "rnc/overlay/shared/weapons/morphoray_target_effect.h" -#include "rnc/overlay/shared/weapons/pyrocitor.h" -#include "rnc/overlay/shared/weapons/ryno.h" -#include "rnc/overlay/shared/weapons/ryno_rocket.h" #include "rnc/overlay/shared/weapons/suckcannon.h" -#include "rnc/overlay/shared/weapons/swingshot.h" #include "rnc/overlay/shared/weapons/swingshot_hook.h" -#include "rnc/overlay/shared/weapons/taunter.h" -#include "rnc/overlay/shared/weapons/tesla_claw.h" -#include "rnc/overlay/shared/weapons/thruster_pack_flame.h" -#include "rnc/overlay/shared/weapons/trailing_flame.h" -#include "rnc/overlay/shared/weapons/trespasser.h" -#include "rnc/overlay/shared/weapons/visibomb.h" -#include "rnc/overlay/shared/weapons/visibomb_missile.h" -#include "rnc/overlay/shared/weapons/walloper.h" /* The level's moby classes, camera types and sound emitter types: the tables the executable's code looks ids up in (sections lvl.vtbl, lvl.camvtbl and lvl.sndvtbl). */ diff --git a/src/overlays/l01/hero/hero_set_state.c b/src/overlays/l01/hero/hero_set_state.c index 4aa1f1e682..f21ab013e6 100644 --- a/src/overlays/l01/hero/hero_set_state.c +++ b/src/overlays/l01/hero/hero_set_state.c @@ -402,8 +402,8 @@ int l01_hero_set_state(int a, int b) { } { struct UsageStat *h = usage_stats.stat; - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } { struct Hero *q = &hero; @@ -417,8 +417,8 @@ int l01_hero_set_state(int a, int b) { } { struct UsageStat *h = usage_stats.stat; - if (scale_game_frames(D_0015EEA4) / 600 > h[29].unk2) { - h[29].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[29].latest_time_bucket) { + h[29].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[29].level_mask = h[29].level_mask | (1 << current_level_index) | 0x80000000; } @@ -1167,8 +1167,8 @@ int l01_hero_set_state(int a, int b) { if (h[0].count <= 0xFFFE) { h[0].count = h[0].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[0].unk2) { - h[0].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[0].latest_time_bucket) { + h[0].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[0].level_mask = h[0].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -1197,16 +1197,17 @@ int l01_hero_set_state(int a, int b) { if (h[1].count <= 0xFFFE) { h[1].count = h[1].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[1].unk2) { - h[1].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[1].latest_time_bucket) { + h[1].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[1].level_mask = h[1].level_mask | (1 << current_level_index) | 0x80000000; item_usage_stats_base = (struct UsageStat *)item_usage; if (item_usage_stats_base[37].count <= 0xFFFE) { item_usage_stats_base[37].count = item_usage_stats_base[37].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > item_usage_stats_base[37].unk2) { - item_usage_stats_base[37].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + item_usage_stats_base[37].latest_time_bucket) { + item_usage_stats_base[37].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } item_usage_stats_base[37].level_mask = item_usage_stats_base[37].level_mask | (1 << current_level_index) | 0x80000000; @@ -1245,8 +1246,8 @@ int l01_hero_set_state(int a, int b) { if (h[8].count <= 0xFFFE) { h[8].count = h[8].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[8].unk2) { - h[8].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[8].latest_time_bucket) { + h[8].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } q = &hero; h[8].level_mask = h[8].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l01/hero/update_hero_motion_for_current_state.c b/src/overlays/l01/hero/update_hero_motion_for_current_state.c index cd48138eef..ab149dd91a 100644 --- a/src/overlays/l01/hero/update_hero_motion_for_current_state.c +++ b/src/overlays/l01/hero/update_hero_motion_for_current_state.c @@ -191,7 +191,7 @@ void integrate_hero_movement(void) { } } -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/input/pad_state.h" typedef union { @@ -497,8 +497,10 @@ void update_hero_motion_for_current_state(void) { if (usage_stats.stat[18].count < 0xFFFF) { usage_stats.stat[18].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[18].unk2) { - usage_stats.stat[18].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[18].latest_time_bucket) { + usage_stats.stat[18].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[18].level_mask = usage_stats.stat[18].level_mask | (1 << current_level_index) | 0x80000000; @@ -787,8 +789,8 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[11].count++; } } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[11].unk2) { - usage_stats.stat[11].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[11].latest_time_bucket) { + usage_stats.stat[11].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[11].level_mask = usage_stats.stat[11].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l01/hero/update_hero_state_machine.c b/src/overlays/l01/hero/update_hero_state_machine.c index f838b79769..482d602fc2 100644 --- a/src/overlays/l01/hero/update_hero_state_machine.c +++ b/src/overlays/l01/hero/update_hero_state_machine.c @@ -5,7 +5,7 @@ #include "asm.h" #include "qcopy.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/input/pad_state.h" #include "rnc/hero/hero.h" #include "rnc/game/usage_stats.h" @@ -216,8 +216,10 @@ void update_hero_state_machine(void) { if (usage_stats.stat[31].count < 0xFFFF) { usage_stats.stat[31].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[31].unk2) { - usage_stats.stat[31].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[31].latest_time_bucket) { + usage_stats.stat[31].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[31].level_mask = usage_stats.stat[31].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l01/mobys/agnogg_ship_front.c b/src/overlays/l01/mobys/agnogg_ship_front.c index 44baff3832..5f020c0ae3 100644 --- a/src/overlays/l01/mobys/agnogg_ship_front.c +++ b/src/overlays/l01/mobys/agnogg_ship_front.c @@ -11,10 +11,10 @@ #include "rnc/overlay/shared/game/level_save_state.h" #include "rnc/overlay/shared/world/level_labels.h" #include "rnc/game/game_globals.h" -#include "rnc/overlay/shared/game/initialize_level_transition_with_audio.h" +#include "rnc/overlay/shared/game.h" #include "rnc/overlay/shared/game/queue_planet_unlock_message.h" #include "rnc/overlay/shared/game/unlock_planet.h" -#include "rnc/overlay/shared/mobys/show_tracked_moby.h" +#include "rnc/overlay/shared/mobys.h" #include "rnc/rendering/clip_volume.h" typedef struct { diff --git a/src/overlays/l01/mobys/bounded_scroll_layers.c b/src/overlays/l01/mobys/bounded_scroll_layers.c index f68a71c7b8..122f6fdb78 100644 --- a/src/overlays/l01/mobys/bounded_scroll_layers.c +++ b/src/overlays/l01/mobys/bounded_scroll_layers.c @@ -7,7 +7,7 @@ #include "rnc/math/vector.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" #include "rnc/overlay/l01/scroll_layer.h" -#include "rnc/overlay/l01/scroll_layers.h" +#include "rnc/overlay/l01.h" s32 bounded_scroll_layers_bounds_computed __asm__("D_L01_00161BA0") = 0; diff --git a/src/overlays/l01/mobys/falling_splash_moby.c b/src/overlays/l01/mobys/falling_splash_moby.c index 037b9b19e0..03762aa7c4 100644 --- a/src/overlays/l01/mobys/falling_splash_moby.c +++ b/src/overlays/l01/mobys/falling_splash_moby.c @@ -7,7 +7,7 @@ #include "rnc/mobys/moby_spawn.h" #include "rnc/overlay/shared/world/level_labels.h" #include "rnc/overlay/shared/math/random/random_int_between.h" -#include "rnc/overlay/shared/vendor/draw_vendor_purchase_text.h" +#include "rnc/overlay/shared/vendor.h" extern s32 collision_line(void *, void *, s32, void *, void *) __asm__("FUN_001efa68"); diff --git a/src/overlays/l01/mobys/help_hints.c b/src/overlays/l01/mobys/help_hints.c index 60ca9f9b25..73938cda6b 100644 --- a/src/overlays/l01/mobys/help_hints.c +++ b/src/overlays/l01/mobys/help_hints.c @@ -16,23 +16,16 @@ struct L01HelpState { s32 cur; }; -/* Per-message help record at D_00141968: id 0xFFFF = disabled. */ -struct L01HelpRecord { - u16 id; - u16 pad; - s32 v; -}; - extern struct L01HelpState help_state __asm__("D_L01_00179890"); -extern struct L01HelpRecord help_records[] __asm__("D_00141968"); -extern s32 cutscene_mode_macro __asm__("D_L01_0015F5C4") MACRO_ADDR; -extern s32 D_L01_0015F688 MACRO_ADDR; -extern s32 D_L01_0015F68C MACRO_ADDR; -extern struct Moby *moby_list __asm__("D_L01_0015FFE4") MACRO_ADDR; -extern s32 help_request(s32, s32) __asm__("FUN_L00_00203908"); -extern s32 is_moby_in_state_one(void *) __asm__("FUN_L00_002d8128"); -extern s32 check_scaled_vector_bsphere(f32, void *) __asm__("FUN_L01_00275690"); +extern struct UsageStat help_records[] __asm__("D_00141968"); +extern s32 cutscene_mode_macro __asm__("D_L01_0015F5C4") MACRO_ADDR; +extern s32 D_L01_0015F688 MACRO_ADDR; +extern s32 D_L01_0015F68C MACRO_ADDR; +extern struct Moby *moby_list __asm__("D_L01_0015FFE4") MACRO_ADDR; +extern s32 help_request(s32, s32) __asm__("FUN_L00_00203908"); +extern s32 is_moby_in_state_one(void *) __asm__("FUN_L00_002d8128"); +extern s32 check_scaled_vector_bsphere(f32, void *) __asm__("FUN_L01_00275690"); extern int D_0015EEA4_macro __asm__("D_0015EEA4") MACRO_ADDR; extern s32 current_level_index_macro __asm__("D_0015ED84") MACRO_ADDR; @@ -63,55 +56,60 @@ void help_hints_update(struct Moby *moby) { case TUTORIAL_HINT_STATE_UPDATE: if (level_frame_count < scale_game_frames(400) && usage_stats.stat[12].count != 0 && usage_stats.stat[11].count == 0) { - if (scale_game_frames(D_0015EEA4_macro) - usage_stats.stat[12].unk2 * 600 < + if (scale_game_frames(D_0015EEA4_macro) - + usage_stats.stat[12].latest_time_bucket * 600 < scale_game_frames(1100) && - help_records[0x51].v >= 0) { + help_records[0x51].level_mask >= 0) { help_request(0x4E27, 0x51); } } if (level_frame_count < scale_game_frames(400) && usage_stats.stat[29].count != 0) { - if (scale_game_frames(D_0015EEA4_macro) - usage_stats.stat[29].unk2 * 600 < + if (scale_game_frames(D_0015EEA4_macro) - + usage_stats.stat[29].latest_time_bucket * 600 < scale_game_frames(1100) && - help_records[0x72].v >= 0) { + help_records[0x72].level_mask >= 0) { help_request(0x4E28, 0x72); } } if (cutscene_mode_macro == 0) { if (level_available[3] != 0 && level_available[2] == 0 && help_state.state == 0 && - help_state.cur == -1 && help_records[4].id == 0) { + help_state.cur == -1 && help_records[4].count == 0) { help_request(0x3E8, 4); } else if (level_available[3] == 0 && level_available[2] != 0 && - help_state.state == 0 && help_state.cur == -1 && help_records[5].id == 0) { + help_state.state == 0 && help_state.cur == -1 && + help_records[5].count == 0) { help_request(0x3E9, 5); } else if (level_available[3] != 0 && level_available[2] != 0 && - help_state.state == 0 && help_state.cur == -1 && help_records[6].id == 0 && - help_records[4].id == 0) { + help_state.state == 0 && help_state.cur == -1 && + help_records[6].count == 0 && help_records[4].count == 0) { help_request(0x3EA, 6); } } if (is_point_inside_clip_volume(&hero.motion.pos, tutorial_hint_vars[15]) && ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9) && help_state.state == 0 && help_state.cur == -1) { - usage_time_value = scale_game_frames(D_0015EEA4_macro) - usage_stats.stat[9].unk2 * 600; + usage_time_value = + scale_game_frames(D_0015EEA4_macro) - usage_stats.stat[9].latest_time_bucket * 600; /* "< 1" rather than "!": cc1 would otherwise test the bit as (v >> level) & 1 */ if (scale_game_frames(216000) < usage_time_value && - (u32)(help_records[0x43].v & (1 << current_level_index_macro)) < 1) { + (u32)(help_records[0x43].level_mask & (1 << current_level_index_macro)) < 1) { help_request(0x3EF, 0x43); } } if (is_point_inside_clip_volume(&hero.motion.pos, tutorial_hint_vars[14]) && ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9) && D_L01_0015F68C < 3 && help_state.state == 0 && help_state.cur == -1 && - help_records[0x40].id == 0) { + help_records[0x40].count == 0) { help_request(0x3EC, 0x40); } if (is_point_inside_clip_volume(&hero.motion.pos, tutorial_hint_vars[14]) && ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9) && hero.state.current == 1 && D_L01_0015F688 == -1 && help_state.state == 0 && - help_state.cur == -1 && help_records[0x40].id != 0 && help_records[0x41].id == 0) { + help_state.cur == -1 && help_records[0x40].count != 0 && + help_records[0x41].count == 0) { help_request(0x3ED, 0x41); } - if (help_records[0x42].id < 2 && + if (help_records[0x42].count < 2 && is_point_inside_clip_volume(&hero.motion.pos, tutorial_hint_vars[12]) && hero.state.prev == 0x3B && hero.state_timer == 0) { for (hint_candidate_moby = moby_list; hint_candidate_moby != 0; @@ -139,8 +137,9 @@ void help_hints_update(struct Moby *moby) { usage_stats.stat[22].count++; } usage_time_value = scale_game_frames(D_0015EEA4_macro) / 600; - if (usage_stats.stat[22].unk2 < usage_time_value) { - usage_stats.stat[22].unk2 = scale_game_frames(D_0015EEA4_macro) / 600; + if (usage_stats.stat[22].latest_time_bucket < usage_time_value) { + usage_stats.stat[22].latest_time_bucket = + scale_game_frames(D_0015EEA4_macro) / 600; } usage_stats.stat[22].level_mask = usage_stats.stat[22].level_mask | (1 << current_level_index_macro) | 0x80000000; @@ -152,14 +151,15 @@ void help_hints_update(struct Moby *moby) { usage_stats.stat[23].count++; } usage_time_value = scale_game_frames(D_0015EEA4_macro) / 600; - if (usage_stats.stat[23].unk2 < usage_time_value) { - usage_stats.stat[23].unk2 = scale_game_frames(D_0015EEA4_macro) / 600; + if (usage_stats.stat[23].latest_time_bucket < usage_time_value) { + usage_stats.stat[23].latest_time_bucket = + scale_game_frames(D_0015EEA4_macro) / 600; } usage_stats.stat[23].level_mask = usage_stats.stat[23].level_mask | (1 << current_level_index_macro) | 0x80000000; } } else if (hero.state.control_mode == 0x11) { - help_records[0x44].id = 0xFFFF; + help_records[0x44].count = 0xFFFF; } else { tutorial_hint_vars[11] = 0; } @@ -167,16 +167,17 @@ void help_hints_update(struct Moby *moby) { health_hint_candidate_moby = health_hint_candidate_moby->next) { if (health_hint_candidate_moby->oclass == 0x326 && fast_vec_dist(&health_hint_candidate_moby->pos, &hero.motion.pos) < 10.0f && - help_state.state == 0 && help_state.cur == -1 && help_records[1].id == 0 && - help_records[2].id == 0 && usage_stats.stat[13].count == 0 && + help_state.state == 0 && help_state.cur == -1 && help_records[1].count == 0 && + help_records[2].count == 0 && usage_stats.stat[13].count == 0 && is_moby_in_state_one(health_hint_candidate_moby) == 0) { if (hero.health.hp < hero_max_health) { if (usage_stats.stat[13].count < 0xFFFF) { usage_stats.stat[13].count++; } usage_time_value = scale_game_frames(D_0015EEA4_macro) / 600; - if (usage_stats.stat[13].unk2 < usage_time_value) { - usage_stats.stat[13].unk2 = scale_game_frames(D_0015EEA4_macro) / 600; + if (usage_stats.stat[13].latest_time_bucket < usage_time_value) { + usage_stats.stat[13].latest_time_bucket = + scale_game_frames(D_0015EEA4_macro) / 600; } usage_stats.stat[13].level_mask = usage_stats.stat[13].level_mask | (1 << current_level_index_macro) | 0x80000000; diff --git a/src/overlays/l01/mobys/pulsing_scroll_layers.c b/src/overlays/l01/mobys/pulsing_scroll_layers.c index 18273cf996..dfe44c45b5 100644 --- a/src/overlays/l01/mobys/pulsing_scroll_layers.c +++ b/src/overlays/l01/mobys/pulsing_scroll_layers.c @@ -2,7 +2,7 @@ #include "types.h" #include "rnc/math/fast_math.h" #include "rnc/overlay/l01/scroll_layer.h" -#include "rnc/overlay/l01/scroll_layers.h" +#include "rnc/overlay/l01.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" #include "rnc/runtime/callbacks/add_draw_callback.h" diff --git a/src/overlays/l01/mobys/rippling_scroll_layers.c b/src/overlays/l01/mobys/rippling_scroll_layers.c index db23071a3f..526dadc0be 100644 --- a/src/overlays/l01/mobys/rippling_scroll_layers.c +++ b/src/overlays/l01/mobys/rippling_scroll_layers.c @@ -6,7 +6,7 @@ #include "sda.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" #include "rnc/overlay/l01/scroll_layer.h" -#include "rnc/overlay/l01/scroll_layers.h" +#include "rnc/overlay/l01.h" extern s32 level_frame_count __asm__("D_L01_0015F5CC") MACRO_ADDR; diff --git a/src/overlays/l01/mobys/water_lily.c b/src/overlays/l01/mobys/water_lily.c index 26601b6be2..952377ac63 100644 --- a/src/overlays/l01/mobys/water_lily.c +++ b/src/overlays/l01/mobys/water_lily.c @@ -10,7 +10,7 @@ #include "sda.h" #include "qcopy.h" -#include "rnc/camera/resolve_camera_surface_height.h" +#include "rnc/camera.h" #include "rnc/overlay/shared/math/interpolation/spring_turn.h" extern f32 frame_time_macro __asm__("D_0015ED6C") MACRO_ADDR; diff --git a/src/overlays/l02/hero/hero_set_state.c b/src/overlays/l02/hero/hero_set_state.c index b15c755bad..7df557eb61 100644 --- a/src/overlays/l02/hero/hero_set_state.c +++ b/src/overlays/l02/hero/hero_set_state.c @@ -8,7 +8,7 @@ #include "rnc/math/asm_helpers.h" #include "qcopy.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/input/pad_state.h" #include "rnc/game/usage_stats.h" #include "rnc/data_labels.h" @@ -435,8 +435,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -481,8 +481,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -1052,8 +1052,8 @@ int hero_set_state(int a, int b) { if (h[0].count <= 0xFFFE) { h[0].count = h[0].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[0].unk2) { - h[0].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[0].latest_time_bucket) { + h[0].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[0].level_mask = h[0].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -1082,16 +1082,17 @@ int hero_set_state(int a, int b) { if (h[1].count <= 0xFFFE) { h[1].count = h[1].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[1].unk2) { - h[1].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[1].latest_time_bucket) { + h[1].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[1].level_mask = h[1].level_mask | (1 << current_level_index) | 0x80000000; item_usage_stats_base = (struct UsageStat *)item_usage; if (item_usage_stats_base[37].count <= 0xFFFE) { item_usage_stats_base[37].count = item_usage_stats_base[37].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > item_usage_stats_base[37].unk2) { - item_usage_stats_base[37].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + item_usage_stats_base[37].latest_time_bucket) { + item_usage_stats_base[37].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } item_usage_stats_base[37].level_mask = item_usage_stats_base[37].level_mask | (1 << current_level_index) | 0x80000000; @@ -1130,8 +1131,8 @@ int hero_set_state(int a, int b) { if (h[8].count <= 0xFFFE) { h[8].count = h[8].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[8].unk2) { - h[8].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[8].latest_time_bucket) { + h[8].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } q = &hero; h[8].level_mask = h[8].level_mask | (1 << current_level_index) | 0x80000000; @@ -1911,8 +1912,10 @@ void update_hero_state_transitions(void) { if (usage_stats.stat[31].count < 0xFFFF) { usage_stats.stat[31].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[31].unk2) { - usage_stats.stat[31].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[31].latest_time_bucket) { + usage_stats.stat[31].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[31].level_mask = usage_stats.stat[31].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l02/hero/update_hero_state_motion.c b/src/overlays/l02/hero/update_hero_state_motion.c index 288abc8497..5b7bbaafeb 100644 --- a/src/overlays/l02/hero/update_hero_state_motion.c +++ b/src/overlays/l02/hero/update_hero_state_motion.c @@ -9,7 +9,7 @@ #include "rnc/hero/hero.h" #include "rnc/globals.h" #include "asm.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/math/quad.h" #include "rnc/overlay/shared/world/collision.h" #include "rnc/overlay/shared/mobys/entities.h" @@ -807,8 +807,10 @@ void update_hero_state_motion(void) { if (usage_stats.stat[18].count < 0xFFFF) { usage_stats.stat[18].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[18].unk2) { - usage_stats.stat[18].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[18].latest_time_bucket) { + usage_stats.stat[18].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[18].level_mask = usage_stats.stat[18].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l02/mobys/rocket_launcher.c b/src/overlays/l02/mobys/rocket_launcher.c index d53656d045..1e9c45d618 100644 --- a/src/overlays/l02/mobys/rocket_launcher.c +++ b/src/overlays/l02/mobys/rocket_launcher.c @@ -9,7 +9,7 @@ #include "rnc/mobys/animation/blend_moby_animation.h" #include "rnc/overlay/l02/mobys/rocket_launcher_globals.h" #include "rnc/audio/voice_alloc.h" -#include "rnc/overlay/l02/mobys/rocket_launcher_projectile.h" +#include "rnc/overlay/l02/mobys.h" #include "rnc/overlay/shared/audio/voices/voice_is_playing.h" extern float D_0015ED6C; diff --git a/src/overlays/l02/mobys/skids_agent.c b/src/overlays/l02/mobys/skids_agent.c index 4fe1f0656b..b5fe3e7d9a 100644 --- a/src/overlays/l02/mobys/skids_agent.c +++ b/src/overlays/l02/mobys/skids_agent.c @@ -31,8 +31,8 @@ #include "rnc/overlay/shared/mobys/attach_big_head_cheat_manipulator.h" #include "rnc/overlay/l02/mobys/watcher_npc.h" -#include "rnc/overlay/l02/mobys/skid_mcmarx.h" -#include "rnc/overlay/shared/streaming/start_indexed_disc_stream.h" +#include "rnc/overlay/l02/mobys.h" +#include "rnc/overlay/shared/streaming.h" extern u8 D_0013D506 NOT_SDA; extern u8 big_head_cheat_enabled_macro __asm__("D_0015EDB0") MACRO_ADDR; @@ -144,21 +144,22 @@ void skids_agent_update(struct Moby *moby) { } else if (item_available[0x5] == 0 && vector_distance_xy(&moby->pos, &hero.motion.pos) < 3.0f) { if (D_00141968[14].count != 0) { - usage_time_value = scale_game_frames(D_0015EEA4) - D_00141968[14].unk2 * 600; + usage_time_value = + scale_game_frames(D_0015EEA4) - D_00141968[14].latest_time_bucket * 600; if ((int)(scale_game_frames(0x12) * 60.0f) < usage_time_value || - D_00141968[14].unk2 * 600 == 0) { + D_00141968[14].latest_time_bucket * 600 == 0) { help_request(0x7D4, 0xE); } else { usage_time_value = scale_game_frames(D_0015EEA4) / 600; - if (D_00141968[14].unk2 < usage_time_value) { - D_00141968[14].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (D_00141968[14].latest_time_bucket < usage_time_value) { + D_00141968[14].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } } } else { D_00141968[14].count++; usage_time_value = scale_game_frames(D_0015EEA4) / 600; - if (D_00141968[14].unk2 < usage_time_value) { - D_00141968[14].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (D_00141968[14].latest_time_bucket < usage_time_value) { + D_00141968[14].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } D_00141968[14].level_mask = D_00141968[14].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l02/mobys/transport_pod.c b/src/overlays/l02/mobys/transport_pod.c index ab51454483..22abfc49b2 100644 --- a/src/overlays/l02/mobys/transport_pod.c +++ b/src/overlays/l02/mobys/transport_pod.c @@ -446,7 +446,7 @@ void transport_pod_update(unsigned char *moby) { ((struct Moby *)moby)->pos.z + 4.0f) < 0.01f) { { adjusted_help_ticks = - scale_game_frames(D_0015EEA4_gp) - usage_stats.stat[9].unk2 * 600; + scale_game_frames(D_0015EEA4_gp) - usage_stats.stat[9].latest_time_bucket * 600; } help_request_threshold_ticks = scale_game_frames(3600) * 60.0f; if (help_request_threshold_ticks < adjusted_help_ticks) { diff --git a/src/overlays/l03/hero/hero_set_state.c b/src/overlays/l03/hero/hero_set_state.c index f51a600952..389fff64df 100644 --- a/src/overlays/l03/hero/hero_set_state.c +++ b/src/overlays/l03/hero/hero_set_state.c @@ -410,8 +410,8 @@ int hero_set_state(int a, int b) { { struct UsageStat *h = usage_stats.stat; struct Hero *q; - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -424,8 +424,8 @@ int hero_set_state(int a, int b) { { struct UsageStat *h = usage_stats.stat; char *v; - if (scale_game_frames(D_0015EEA4) / 600 > h[29].unk2) { - h[29].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[29].latest_time_bucket) { + h[29].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[29].level_mask = h[29].level_mask | (1 << current_level_index) | 0x80000000; v = (char *)&hero.motion.momentum; @@ -664,8 +664,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -710,8 +710,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -1315,8 +1315,8 @@ int hero_set_state(int a, int b) { if (h[0].count <= 0xFFFE) { h[0].count = h[0].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[0].unk2) { - h[0].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[0].latest_time_bucket) { + h[0].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[0].level_mask = h[0].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -1345,16 +1345,16 @@ int hero_set_state(int a, int b) { if (h[1].count <= 0xFFFE) { h[1].count = h[1].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[1].unk2) { - h[1].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[1].latest_time_bucket) { + h[1].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[1].level_mask = h[1].level_mask | (1 << current_level_index) | 0x80000000; item_usage_base = (struct UsageStat *)item_usage; if (item_usage_base[37].count <= 0xFFFE) { item_usage_base[37].count = item_usage_base[37].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > item_usage_base[37].unk2) { - item_usage_base[37].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > item_usage_base[37].latest_time_bucket) { + item_usage_base[37].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } item_usage_base[37].level_mask = item_usage_base[37].level_mask | (1 << current_level_index) | 0x80000000; @@ -1393,8 +1393,8 @@ int hero_set_state(int a, int b) { if (h[8].count <= 0xFFFE) { h[8].count = h[8].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[8].unk2) { - h[8].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[8].latest_time_bucket) { + h[8].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } q = &hero; h[8].level_mask = h[8].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l03/hero/update_hero_motion_for_current_state.c b/src/overlays/l03/hero/update_hero_motion_for_current_state.c index 9ddff53f54..846276b5e8 100644 --- a/src/overlays/l03/hero/update_hero_motion_for_current_state.c +++ b/src/overlays/l03/hero/update_hero_motion_for_current_state.c @@ -380,8 +380,9 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[18].count++; } t = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[18].unk2 < t) { - usage_stats.stat[18].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[18].latest_time_bucket < t) { + usage_stats.stat[18].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } D_L03_0015F688_gp = -1; usage_stats.stat[18].level_mask = @@ -641,8 +642,9 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[11].count++; } use_seconds = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[11].unk2 < use_seconds) { - usage_stats.stat[11].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[11].latest_time_bucket < use_seconds) { + usage_stats.stat[11].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[11].level_mask = usage_stats.stat[11].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l03/hero/update_hero_state_machine.c b/src/overlays/l03/hero/update_hero_state_machine.c index f32e4c8de6..7367316230 100644 --- a/src/overlays/l03/hero/update_hero_state_machine.c +++ b/src/overlays/l03/hero/update_hero_state_machine.c @@ -5,7 +5,7 @@ #include "asm.h" #include "qcopy.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/input/pad_state.h" #include "rnc/hero/hero.h" #include "rnc/game/usage_stats.h" @@ -218,8 +218,10 @@ void update_hero_state_machine(void) { if (usage_stats.stat[31].count < 0xFFFF) { usage_stats.stat[31].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[31].unk2) { - usage_stats.stat[31].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[31].latest_time_bucket) { + usage_stats.stat[31].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[31].level_mask = usage_stats.stat[31].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l03/level_class_tables.c b/src/overlays/l03/level_class_tables.c index 39f91fc331..6531f9a699 100644 --- a/src/overlays/l03/level_class_tables.c +++ b/src/overlays/l03/level_class_tables.c @@ -1,106 +1,32 @@ -#include "rnc/mobys/quad_moby_update.h" -#include "rnc/overlay/l03/hero_relative_camera.h" -#include "rnc/overlay/l03/mobys/big_al.h" -#include "rnc/overlay/l03/mobys/cutscene_effects.h" -#include "rnc/overlay/l03/mobys/helga.h" -#include "rnc/overlay/l03/mobys/help_hints.h" +#include "rnc/mobys.h" +#include "rnc/overlay/l03.h" +#include "rnc/overlay/l03/mobys.h" #include "rnc/overlay/l03/mobys/homing_rocket.h" -#include "rnc/overlay/l03/mobys/kerwan_path_enemy.h" -#include "rnc/overlay/l03/mobys/lightpost.h" -#include "rnc/overlay/l03/mobys/metropolis_train_carriage.h" -#include "rnc/overlay/l03/mobys/metropolis_train_locomotive.h" -#include "rnc/overlay/l03/mobys/mine.h" -#include "rnc/overlay/l03/mobys/mine_layer.h" -#include "rnc/overlay/l03/mobys/moving_platform_small.h" -#include "rnc/overlay/l03/mobys/path_mover.h" -#include "rnc/overlay/l03/mobys/path_mover_spawner.h" -#include "rnc/overlay/l03/mobys/rail_lift.h" -#include "rnc/overlay/l03/mobys/red_ship_1.h" -#include "rnc/overlay/l03/mobys/robo_shack_sign.h" #include "rnc/overlay/l03/mobys/robot_dog.h" -#include "rnc/overlay/l03/mobys/robot_qwark.h" #include "rnc/overlay/l03/mobys/taxi.h" -#include "rnc/overlay/shared/audio/emitters/distance_emitter.h" -#include "rnc/overlay/shared/audio/emitters/music_switch_emitter.h" -#include "rnc/overlay/shared/audio/emitters/reverb_box_emitter.h" -#include "rnc/overlay/shared/camera/clip_volume_camera.h" -#include "rnc/overlay/shared/camera/follow_camera_setup.h" -#include "rnc/overlay/shared/camera/follow_camera_update.h" -#include "rnc/overlay/shared/camera/hero_aligned_camera.h" -#include "rnc/overlay/shared/camera/moby_controlled_camera.h" -#include "rnc/overlay/shared/camera/orbit_camera.h" +#include "rnc/overlay/shared/audio/emitters.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/camera/scripted_camera.h" #include "rnc/overlay/shared/camera/swing_volume_camera.h" -#include "rnc/overlay/shared/camera/target_tracking_camera.h" -#include "rnc/overlay/shared/cutscenes/fred_1.h" -#include "rnc/overlay/shared/cutscenes/qwark_rilgar.h" +#include "rnc/overlay/shared/cutscenes.h" #include "rnc/overlay/shared/enemies/blarg_helicopter.h" -#include "rnc/overlay/shared/enemies/blarg_helicopter_spark.h" -#include "rnc/overlay/shared/enemies/bomb_spawner.h" -#include "rnc/overlay/shared/enemies/bomb_spawner_bomb.h" -#include "rnc/overlay/shared/enemies/sandmouse.h" -#include "rnc/overlay/shared/enemies/sandmouse_house.h" -#include "rnc/overlay/shared/enemies/sandmouse_projectile.h" -#include "rnc/overlay/shared/mobys/camera_object.h" -#include "rnc/overlay/shared/mobys/falling_moby_update.h" -#include "rnc/overlay/shared/mobys/moby_draw_callback_update.h" -#include "rnc/overlay/shared/pickups/buried_bolts.h" -#include "rnc/overlay/shared/pickups/crate.h" -#include "rnc/overlay/shared/pickups/crate_fragment.h" +#include "rnc/overlay/shared/enemies.h" +#include "rnc/overlay/shared/mobys.h" +#include "rnc/overlay/shared/pickups.h" #include "rnc/overlay/shared/pickups/infobot.h" -#include "rnc/overlay/shared/pickups/nanotech_ball.h" -#include "rnc/overlay/shared/pickups/pilots_helmet.h" -#include "rnc/overlay/shared/pickups/weapon_ammo.h" -#include "rnc/overlay/shared/props/garage_door.h" +#include "rnc/overlay/shared/props.h" #include "rnc/overlay/shared/props/grow_and_fade_out.h" -#include "rnc/overlay/shared/props/hydrodisplacer.h" -#include "rnc/overlay/shared/props/novalis_elevator.h" #include "rnc/overlay/shared/props/rock.h" -#include "rnc/overlay/shared/props/statue.h" -#include "rnc/overlay/shared/props/swingshot_versatarget.h" -#include "rnc/overlay/shared/props/tumbling_part.h" -#include "rnc/overlay/shared/rendering/effects/debris.h" +#include "rnc/overlay/shared/rendering/effects.h" #include "rnc/overlay/shared/rendering/effects/explosion_light.h" -#include "rnc/overlay/shared/rendering/effects/glow_particle.h" -#include "rnc/overlay/shared/rendering/effects/parent_following_effect.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" -#include "rnc/overlay/shared/vendor/vendor.h" -#include "rnc/overlay/shared/vendor/vendor_orb.h" -#include "rnc/overlay/shared/weapons/blaster.h" -#include "rnc/overlay/shared/weapons/blaster_shot.h" -#include "rnc/overlay/shared/weapons/bomb_glove.h" +#include "rnc/overlay/shared/vendor.h" +#include "rnc/overlay/shared/weapons.h" #include "rnc/overlay/shared/weapons/bomb_glove_bomb.h" -#include "rnc/overlay/shared/weapons/decoy.h" -#include "rnc/overlay/shared/weapons/decoy_glove.h" #include "rnc/overlay/shared/weapons/devastator.h" -#include "rnc/overlay/shared/weapons/doom_bot.h" -#include "rnc/overlay/shared/weapons/drone.h" -#include "rnc/overlay/shared/weapons/glove_of_doom.h" -#include "rnc/overlay/shared/weapons/glove_of_doom_bomb.h" -#include "rnc/overlay/shared/weapons/gold_devastator_missile.h" -#include "rnc/overlay/shared/weapons/helipack.h" -#include "rnc/overlay/shared/weapons/linked_moby_states_update.h" -#include "rnc/overlay/shared/weapons/metal_detector.h" #include "rnc/overlay/shared/weapons/mine.h" -#include "rnc/overlay/shared/weapons/mine_glove.h" -#include "rnc/overlay/shared/weapons/morphoray.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken_feather.h" -#include "rnc/overlay/shared/weapons/morphoray_target_effect.h" -#include "rnc/overlay/shared/weapons/pyrocitor.h" -#include "rnc/overlay/shared/weapons/ryno.h" -#include "rnc/overlay/shared/weapons/ryno_rocket.h" #include "rnc/overlay/shared/weapons/suckcannon.h" -#include "rnc/overlay/shared/weapons/swingshot.h" #include "rnc/overlay/shared/weapons/swingshot_hook.h" -#include "rnc/overlay/shared/weapons/taunter.h" -#include "rnc/overlay/shared/weapons/tesla_claw.h" -#include "rnc/overlay/shared/weapons/thruster_pack_flame.h" -#include "rnc/overlay/shared/weapons/trailing_flame.h" -#include "rnc/overlay/shared/weapons/trespasser.h" -#include "rnc/overlay/shared/weapons/visibomb.h" -#include "rnc/overlay/shared/weapons/visibomb_missile.h" -#include "rnc/overlay/shared/weapons/walloper.h" /* The level's moby classes, camera types and sound emitter types: the tables the executable's code looks ids up in (sections lvl.vtbl, lvl.camvtbl and lvl.sndvtbl). */ diff --git a/src/overlays/l03/mobys/help_hints.c b/src/overlays/l03/mobys/help_hints.c index ab860d1899..8b5ea34ca4 100644 --- a/src/overlays/l03/mobys/help_hints.c +++ b/src/overlays/l03/mobys/help_hints.c @@ -22,13 +22,6 @@ struct L03HelpState { s32 cur; }; -/* Per-message help record at D_00141968 (same layout as P00203908): id 0xFFFF = disabled. */ -struct L03HelpRecord { - u16 id; - u16 pad; - s32 v; -}; - /* One of the 37 item entries at D_L03_00179BC0 (stride 0x4C, as Entry_L02_0017A140 in l02). */ struct L03ItemEntry { s32 pad0; @@ -39,9 +32,9 @@ struct L03ItemEntry { extern struct L03HelpState l03_help_message_playback_state __asm__("D_L03_00179510"); -extern struct L03HelpRecord help_records[] __asm__("D_00141968"); -extern struct L03ItemEntry D_L03_00179BC0[]; -extern struct Moby *D_L03_0015FFE4; +extern struct UsageStat help_records[] __asm__("D_00141968"); +extern struct L03ItemEntry D_L03_00179BC0[]; +extern struct Moby *D_L03_0015FFE4; /* Kerwan tutorial hint triggers: plays help messages and counts usage stats while the hero is inside the moby's clip volumes. */ void help_hints_update(struct Moby *moby) __asm__("FUN_L03_002df520"); @@ -75,19 +68,19 @@ void help_hints_update(struct Moby *moby) { if (is_point_inside_clip_volume(&hero.motion.pos, tutorial_hint_state[0]) && ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9) && l03_help_message_playback_state.state == 0 && - l03_help_message_playback_state.cur == -1 && help_records[0x14].v >= 0) { + l03_help_message_playback_state.cur == -1 && help_records[0x14].level_mask >= 0) { help_request(0xBB8, 0x14); } if (is_point_inside_clip_volume(&hero.motion.pos, tutorial_hint_state[3]) && ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9) && l03_help_message_playback_state.state == 0 && - l03_help_message_playback_state.cur == -1 && help_records[0x15].v >= 0) { + l03_help_message_playback_state.cur == -1 && help_records[0x15].level_mask >= 0) { help_request(0xBB9, 0x15); } if (is_point_inside_clip_volume(&hero.motion.pos, tutorial_hint_state[6]) && ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9) && l03_help_message_playback_state.state == 0 && - l03_help_message_playback_state.cur == -1 && help_records[0x17].v >= 0) { + l03_help_message_playback_state.cur == -1 && help_records[0x17].level_mask >= 0) { help_request(0xBBB, 0x17); } } @@ -96,8 +89,8 @@ void help_hints_update(struct Moby *moby) { ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9)) { usage_stats.stat[3].count++; scaled_time_value = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[3].unk2 < scaled_time_value) { - usage_stats.stat[3].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[3].latest_time_bucket < scaled_time_value) { + usage_stats.stat[3].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[3].level_mask = usage_stats.stat[3].level_mask | (1 << current_level_index) | 0x80000000; @@ -117,14 +110,15 @@ void help_hints_update(struct Moby *moby) { ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9) && tutorial_hint_state[20] % 6 == 0 && tutorial_hint_state[20] != 0 && l03_help_message_playback_state.state == 0 && - l03_help_message_playback_state.cur == -1 && help_records[0x16].id == 0) { + l03_help_message_playback_state.cur == -1 && help_records[0x16].count == 0) { help_request(0xBBA, 0x16); } if (is_point_inside_clip_volume(&hero.motion.pos, tutorial_hint_state[10]) && ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9) && l03_help_message_playback_state.state == 0 && - l03_help_message_playback_state.cur == -1 && help_records[0x18].id == 0) { - scaled_time_value = scale_game_frames(D_0015EEA4) - usage_stats.stat[9].unk2 * 600; + l03_help_message_playback_state.cur == -1 && help_records[0x18].count == 0) { + scaled_time_value = + scale_game_frames(D_0015EEA4) - usage_stats.stat[9].latest_time_bucket * 600; if (scale_game_frames(216000) < scaled_time_value) { help_request(0xBBC, 0x18); } @@ -141,7 +135,7 @@ void help_hints_update(struct Moby *moby) { ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9) && hero.state.current != 0x1E && item_available[0xF] != 0 && get_ammo(0xF) >= 0x15 && l03_help_message_playback_state.state == 0 && - l03_help_message_playback_state.cur == -1 && help_records[0x4A].id == 0 && + l03_help_message_playback_state.cur == -1 && help_records[0x4A].count == 0 && usage_stats.stat[19].count == 0) { help_request(0x4E20, 0x4A); } else if (hero.state.current == 0x1E) { @@ -149,8 +143,8 @@ void help_hints_update(struct Moby *moby) { usage_stats.stat[19].count++; } scaled_time_value = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[19].unk2 < scaled_time_value) { - usage_stats.stat[19].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[19].latest_time_bucket < scaled_time_value) { + usage_stats.stat[19].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[19].level_mask = usage_stats.stat[19].level_mask | (1 << current_level_index) | 0x80000000; @@ -158,26 +152,26 @@ void help_hints_update(struct Moby *moby) { if (is_point_inside_clip_volume(&hero.motion.pos, tutorial_hint_state[14]) && ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9) && D_L03_0015F68C < 3 && l03_help_message_playback_state.state == 0 && - l03_help_message_playback_state.cur == -1 && help_records[0x40].id == 0) { + l03_help_message_playback_state.cur == -1 && help_records[0x40].count == 0) { help_request(0x3EC, 0x40); } if (is_point_inside_clip_volume(&hero.motion.pos, tutorial_hint_state[14]) && ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9) && hero.state.current == HERO_STATE_LOOK && D_L03_0015F688 == -1 && l03_help_message_playback_state.state == 0 && - l03_help_message_playback_state.cur == -1 && help_records[0x40].id != 0 && - help_records[0x41].id == 0) { + l03_help_message_playback_state.cur == -1 && help_records[0x40].count != 0 && + help_records[0x41].count == 0) { help_request(0x3ED, 0x41); } if (is_point_inside_clip_volume(&hero.motion.pos, tutorial_hint_state[16]) && ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9) && l03_help_message_playback_state.state == 0 && - l03_help_message_playback_state.cur == -1 && help_records[0x54].id == 0) { + l03_help_message_playback_state.cur == -1 && help_records[0x54].count == 0) { help_request(0xBC0, 0x54); } if (D_L03_0015F5C4 == 0 && item_available[0x34] != 0 && l03_help_message_playback_state.state == 0 && - l03_help_message_playback_state.cur == -1 && help_records[0x19].id == 0) { + l03_help_message_playback_state.cur == -1 && help_records[0x19].count == 0) { help_request(0xBBD, 0x19); } if (is_point_inside_clip_volume(&hero.motion.pos, tutorial_hint_state[13]) && @@ -185,8 +179,8 @@ void help_hints_update(struct Moby *moby) { ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9)) { usage_stats.stat[15].count++; scaled_time_value = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[15].unk2 < scaled_time_value) { - usage_stats.stat[15].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[15].latest_time_bucket < scaled_time_value) { + usage_stats.stat[15].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[15].level_mask = usage_stats.stat[15].level_mask | (1 << current_level_index) | 0x80000000; @@ -198,14 +192,14 @@ void help_hints_update(struct Moby *moby) { if (usage_stats.stat[15].count == 0 && ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9) && tutorial_hint_state[21] >= 3 && l03_help_message_playback_state.state == 0 && - l03_help_message_playback_state.cur == -1 && help_records[0x1A].id == 0) { + l03_help_message_playback_state.cur == -1 && help_records[0x1A].count == 0) { help_request(0xBBE, 0x1A); } if (hero.state.current == 0x74 && usage_stats.stat[16].count == 0) { usage_stats.stat[16].count++; scaled_time_value = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[16].unk2 < scaled_time_value) { - usage_stats.stat[16].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[16].latest_time_bucket < scaled_time_value) { + usage_stats.stat[16].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[16].level_mask = usage_stats.stat[16].level_mask | (1 << current_level_index) | 0x80000000; @@ -213,17 +207,17 @@ void help_hints_update(struct Moby *moby) { if (is_point_inside_clip_volume(&hero.motion.pos, tutorial_hint_state[11]) && usage_stats.stat[16].count == 0 && hero.state.control_mode == 6 && hero.items[0].item_id == 8 && l03_help_message_playback_state.state == 0 && - l03_help_message_playback_state.cur == -1 && help_records[0x1B].id == 0) { + l03_help_message_playback_state.cur == -1 && help_records[0x1B].count == 0) { help_request(0xBBF, 0x1B); } if (is_point_inside_clip_volume(&hero.motion.pos, tutorial_hint_state[17]) && ((u32)hero.state.control_mode < 2 || hero.state.control_mode == 9) && l03_help_message_playback_state.state == 0 && - l03_help_message_playback_state.cur == -1 && help_records[0x79].id == 0) { + l03_help_message_playback_state.cur == -1 && help_records[0x79].count == 0) { help_request(0x4E2F, 0x79); } if (is_point_inside_clip_volume(&hero.motion.pos, tutorial_hint_state[31]) && - (u32)hero.state.control_mode < 2 && help_records[0x4F].id == 0 && + (u32)hero.state.control_mode < 2 && help_records[0x4F].count == 0 && usage_stats.stat[20].count == 0) { s32 owned = 0; for (i = 0; i < 37; i++) { diff --git a/src/overlays/l03/mobys/metropolis_train_locomotive.c b/src/overlays/l03/mobys/metropolis_train_locomotive.c index 99f9db6e8f..1b9ea52cf2 100644 --- a/src/overlays/l03/mobys/metropolis_train_locomotive.c +++ b/src/overlays/l03/mobys/metropolis_train_locomotive.c @@ -20,7 +20,7 @@ #include "rnc/overlay/shared/world/level_path.h" #include "rnc/overlay/shared/world/cuboid.h" #include "rnc/overlay/shared/mobys/is_hero_on_moby.h" -#include "rnc/overlay/shared/mobys/is_moby_class_23e_in_state_14.h" +#include "rnc/overlay/shared/mobys.h" /* Places a train: puts the engine at `at` facing ang (offset back by its length), then lays each linked * car behind the previous one along ang, updating their motion deltas, and enables the coupling moby. */ diff --git a/src/overlays/l03/mobys/rail_lift.c b/src/overlays/l03/mobys/rail_lift.c index b211db9328..42815a2300 100644 --- a/src/overlays/l03/mobys/rail_lift.c +++ b/src/overlays/l03/mobys/rail_lift.c @@ -14,7 +14,7 @@ #include "rnc/globals.h" #include "rnc/math_consts.h" #include "sda.h" -#include "rnc/mobys/animation/queue_animation_update.h" +#include "rnc/mobys/animation.h" #include "rnc/overlay/shared/hero/set_hero_animation.h" #include "rnc/overlay/shared/mobys/is_hero_on_moby.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" diff --git a/src/overlays/l04/level_class_tables.c b/src/overlays/l04/level_class_tables.c index 634a30a41f..5b4f32efad 100644 --- a/src/overlays/l04/level_class_tables.c +++ b/src/overlays/l04/level_class_tables.c @@ -1,98 +1,27 @@ -#include "rnc/mobys/quad_moby_update.h" -#include "rnc/overlay/l04/mobys/big_axebot.h" -#include "rnc/overlay/l04/mobys/blarg_trooper.h" -#include "rnc/overlay/l04/mobys/butterfly_swarm.h" -#include "rnc/overlay/l04/mobys/circular_saw_enemy.h" -#include "rnc/overlay/l04/mobys/cutscene_camera_target.h" -#include "rnc/overlay/l04/mobys/eudora_bridge.h" -#include "rnc/overlay/l04/mobys/floating_platform.h" -#include "rnc/overlay/l04/mobys/help_hints.h" -#include "rnc/overlay/l04/mobys/leaf.h" -#include "rnc/overlay/l04/mobys/lieutenant.h" -#include "rnc/overlay/l04/mobys/path_progress_mover.h" -#include "rnc/overlay/l04/mobys/pipe.h" -#include "rnc/overlay/l04/mobys/platform_booster.h" -#include "rnc/overlay/l04/mobys/random_interval_animation.h" -#include "rnc/overlay/l04/mobys/snow_plow.h" -#include "rnc/overlay/l04/mobys/suck_cannon.h" -#include "rnc/overlay/l04/mobys/translation_delta_matrix.h" -#include "rnc/overlay/l04/mobys/transport_ship.h" -#include "rnc/overlay/l04/mobys/upper_door.h" -#include "rnc/overlay/l04/mobys/woodcut_bot.h" -#include "rnc/overlay/l04/mobys/woodcut_bot_debris.h" -#include "rnc/overlay/shared/audio/emitters/music_switch_emitter.h" -#include "rnc/overlay/shared/camera/aim_volume_camera.h" -#include "rnc/overlay/shared/camera/clip_volume_camera.h" -#include "rnc/overlay/shared/camera/follow_camera_setup.h" -#include "rnc/overlay/shared/camera/follow_camera_update.h" -#include "rnc/overlay/shared/camera/hero_aligned_camera.h" -#include "rnc/overlay/shared/camera/orbit_camera.h" +#include "rnc/mobys.h" +#include "rnc/overlay/l04/mobys.h" +#include "rnc/overlay/shared/audio/emitters.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/camera/scripted_camera.h" #include "rnc/overlay/shared/camera/swing_volume_camera.h" -#include "rnc/overlay/shared/camera/target_tracking_camera.h" -#include "rnc/overlay/shared/enemies/blarg_trooper_projectile.h" -#include "rnc/overlay/shared/enemies/horny_toad.h" -#include "rnc/overlay/shared/enemies/sand_mouse.h" -#include "rnc/overlay/shared/enemies/sandmouse.h" -#include "rnc/overlay/shared/enemies/sandmouse_house.h" -#include "rnc/overlay/shared/enemies/sandmouse_projectile.h" -#include "rnc/overlay/shared/mobys/camera_object.h" +#include "rnc/overlay/shared/enemies.h" +#include "rnc/overlay/shared/mobys.h" #include "rnc/overlay/shared/mobys/suck_cannon_methods.h" -#include "rnc/overlay/shared/pickups/buried_bolts.h" -#include "rnc/overlay/shared/pickups/crate.h" -#include "rnc/overlay/shared/pickups/crate_fragment.h" +#include "rnc/overlay/shared/pickups.h" #include "rnc/overlay/shared/pickups/infobot.h" -#include "rnc/overlay/shared/pickups/nanotech_ball.h" -#include "rnc/overlay/shared/pickups/pilots_helmet.h" -#include "rnc/overlay/shared/pickups/weapon_ammo.h" -#include "rnc/overlay/shared/props/bolt_crank.h" +#include "rnc/overlay/shared/props.h" #include "rnc/overlay/shared/props/grow_and_fade_out.h" -#include "rnc/overlay/shared/props/hydrodisplacer.h" #include "rnc/overlay/shared/props/rock.h" -#include "rnc/overlay/shared/props/swingshot_versatarget.h" -#include "rnc/overlay/shared/props/trespasser_pad.h" -#include "rnc/overlay/shared/props/tumbling_part.h" -#include "rnc/overlay/shared/rendering/effects/debris.h" +#include "rnc/overlay/shared/rendering/effects.h" #include "rnc/overlay/shared/rendering/effects/explosion_light.h" -#include "rnc/overlay/shared/rendering/effects/glow_particle.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" -#include "rnc/overlay/shared/vendor/vendor.h" -#include "rnc/overlay/shared/vendor/vendor_orb.h" -#include "rnc/overlay/shared/weapons/blaster.h" -#include "rnc/overlay/shared/weapons/blaster_shot.h" -#include "rnc/overlay/shared/weapons/bomb_glove.h" +#include "rnc/overlay/shared/vendor.h" +#include "rnc/overlay/shared/weapons.h" #include "rnc/overlay/shared/weapons/bomb_glove_bomb.h" -#include "rnc/overlay/shared/weapons/decoy.h" -#include "rnc/overlay/shared/weapons/decoy_glove.h" #include "rnc/overlay/shared/weapons/devastator.h" -#include "rnc/overlay/shared/weapons/doom_bot.h" -#include "rnc/overlay/shared/weapons/drone.h" -#include "rnc/overlay/shared/weapons/glove_of_doom.h" -#include "rnc/overlay/shared/weapons/glove_of_doom_bomb.h" -#include "rnc/overlay/shared/weapons/gold_devastator_missile.h" -#include "rnc/overlay/shared/weapons/helipack.h" -#include "rnc/overlay/shared/weapons/linked_moby_states_update.h" -#include "rnc/overlay/shared/weapons/metal_detector.h" #include "rnc/overlay/shared/weapons/mine.h" -#include "rnc/overlay/shared/weapons/mine_glove.h" -#include "rnc/overlay/shared/weapons/morphoray.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken_feather.h" -#include "rnc/overlay/shared/weapons/morphoray_target_effect.h" -#include "rnc/overlay/shared/weapons/pyrocitor.h" -#include "rnc/overlay/shared/weapons/ryno.h" -#include "rnc/overlay/shared/weapons/ryno_rocket.h" #include "rnc/overlay/shared/weapons/suckcannon.h" -#include "rnc/overlay/shared/weapons/swingshot.h" #include "rnc/overlay/shared/weapons/swingshot_hook.h" -#include "rnc/overlay/shared/weapons/taunter.h" -#include "rnc/overlay/shared/weapons/tesla_claw.h" -#include "rnc/overlay/shared/weapons/thruster_pack_flame.h" -#include "rnc/overlay/shared/weapons/trailing_flame.h" -#include "rnc/overlay/shared/weapons/trespasser.h" -#include "rnc/overlay/shared/weapons/visibomb.h" -#include "rnc/overlay/shared/weapons/visibomb_missile.h" -#include "rnc/overlay/shared/weapons/walloper.h" /* The level's moby classes, camera types and sound emitter types: the tables the executable's code looks ids up in (sections lvl.vtbl, lvl.camvtbl and lvl.sndvtbl). */ diff --git a/src/overlays/l04/mobys/help_hints.c b/src/overlays/l04/mobys/help_hints.c index 52d031a106..a34d313ad0 100644 --- a/src/overlays/l04/mobys/help_hints.c +++ b/src/overlays/l04/mobys/help_hints.c @@ -91,8 +91,8 @@ void help_hints_update(Moby *moby) { if (usage[0x18].count < 0xFFFF) { usage[0x18].count++; } - if (scale_game_frames(D_0015EEA4_macro) / 600 > usage[0x18].unk2) { - usage[0x18].unk2 = scale_game_frames(D_0015EEA4_macro) / 600; + if (scale_game_frames(D_0015EEA4_macro) / 600 > usage[0x18].latest_time_bucket) { + usage[0x18].latest_time_bucket = scale_game_frames(D_0015EEA4_macro) / 600; } usage[0x18].level_mask = usage[0x18].level_mask | (1 << current_level_index_macro) | 0x80000000; @@ -210,8 +210,9 @@ void help_hints_update(Moby *moby) { if (count <= 0xFFFE) { usage[0x11].count = count + 1; } - if (scale_game_frames(D_0015EEA4_macro) / 600 > usage[0x11].unk2) { - usage[0x11].unk2 = scale_game_frames(D_0015EEA4_macro) / 600; + if (scale_game_frames(D_0015EEA4_macro) / 600 > + usage[0x11].latest_time_bucket) { + usage[0x11].latest_time_bucket = scale_game_frames(D_0015EEA4_macro) / 600; } usage[0x11].level_mask = usage[0x11].level_mask | (1 << current_level_index_macro) | 0x80000000; @@ -297,8 +298,8 @@ void help_hints_update(Moby *moby) { int now; usage[0x19].count++; now = scale_game_frames(D_0015EEA4_macro) / 600; - if (usage[0x19].unk2 < now) { - usage[0x19].unk2 = scale_game_frames(D_0015EEA4_macro) / 600; + if (usage[0x19].latest_time_bucket < now) { + usage[0x19].latest_time_bucket = scale_game_frames(D_0015EEA4_macro) / 600; } usage[0x19].level_mask = usage[0x19].level_mask | (1 << current_level_index_macro) | 0x80000000; diff --git a/src/overlays/l04/mobys/random_interval_animation.c b/src/overlays/l04/mobys/random_interval_animation.c index 40c90246d7..1328f72d0b 100644 --- a/src/overlays/l04/mobys/random_interval_animation.c +++ b/src/overlays/l04/mobys/random_interval_animation.c @@ -3,7 +3,7 @@ #include "rnc/mobys/moby.h" #include "rnc/math/fast_math.h" #include "rnc/mobys/animation/blend_moby_animation.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/sdk/libc/stdlib.h" /* Ported from rac1-decomp (src/overlays/l04_eudora/vendor_0029FCF0.c: func_L04_002A6C20), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/l05/hero/apply_hero_ground_material_effects.c b/src/overlays/l05/hero/apply_hero_ground_material_effects.c index 15155fc26c..f53ccc02dc 100644 --- a/src/overlays/l05/hero/apply_hero_ground_material_effects.c +++ b/src/overlays/l05/hero/apply_hero_ground_material_effects.c @@ -4,7 +4,7 @@ #include "rnc/hero/hero.h" #include "rnc/globals.h" #include "asm.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/world/collision.h" #include "sda.h" #include "rnc/math/asm_helpers.h" diff --git a/src/overlays/l05/hero/hero_set_state.c b/src/overlays/l05/hero/hero_set_state.c index 5a9be6bd6d..76114beba0 100644 --- a/src/overlays/l05/hero/hero_set_state.c +++ b/src/overlays/l05/hero/hero_set_state.c @@ -423,8 +423,8 @@ int hero_set_state(int a, int b) { { struct UsageStat *h = usage_stats.stat; struct Hero *q; - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -437,8 +437,8 @@ int hero_set_state(int a, int b) { { struct UsageStat *h = usage_stats.stat; char *v; - if (scale_game_frames(D_0015EEA4) / 600 > h[29].unk2) { - h[29].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[29].latest_time_bucket) { + h[29].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[29].level_mask = h[29].level_mask | (1 << current_level_index) | 0x80000000; v = (char *)&hero.motion.momentum; @@ -859,8 +859,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -905,8 +905,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -1545,8 +1545,8 @@ int hero_set_state(int a, int b) { if (h[0].count <= 0xFFFE) { h[0].count = h[0].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[0].unk2) { - h[0].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[0].latest_time_bucket) { + h[0].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[0].level_mask = h[0].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -1575,16 +1575,16 @@ int hero_set_state(int a, int b) { if (h[1].count <= 0xFFFE) { h[1].count = h[1].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[1].unk2) { - h[1].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[1].latest_time_bucket) { + h[1].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[1].level_mask = h[1].level_mask | (1 << current_level_index) | 0x80000000; item_usage_stats = (struct UsageStat *)item_usage; if (item_usage_stats[37].count <= 0xFFFE) { item_usage_stats[37].count = item_usage_stats[37].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > item_usage_stats[37].unk2) { - item_usage_stats[37].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > item_usage_stats[37].latest_time_bucket) { + item_usage_stats[37].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } item_usage_stats[37].level_mask = item_usage_stats[37].level_mask | (1 << current_level_index) | 0x80000000; @@ -1623,8 +1623,8 @@ int hero_set_state(int a, int b) { if (h[8].count <= 0xFFFE) { h[8].count = h[8].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[8].unk2) { - h[8].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[8].latest_time_bucket) { + h[8].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } q = &hero; h[8].level_mask = h[8].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l05/hero/update_hero_motion_by_state.c b/src/overlays/l05/hero/update_hero_motion_by_state.c index 21e857012a..722732fd9a 100644 --- a/src/overlays/l05/hero/update_hero_motion_by_state.c +++ b/src/overlays/l05/hero/update_hero_motion_by_state.c @@ -336,8 +336,9 @@ void update_hero_motion_by_state(void) { usage_stats.stat[18].count++; } t = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[18].unk2 < t) { - usage_stats.stat[18].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[18].latest_time_bucket < t) { + usage_stats.stat[18].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } D_L05_0015F688 = -1; usage_stats.stat[18].level_mask = @@ -602,8 +603,9 @@ void update_hero_motion_by_state(void) { usage_stats.stat[11].count++; } use_seconds = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[11].unk2 < use_seconds) { - usage_stats.stat[11].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[11].latest_time_bucket < use_seconds) { + usage_stats.stat[11].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[11].level_mask = usage_stats.stat[11].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l05/hero/update_hero_state_machine.c b/src/overlays/l05/hero/update_hero_state_machine.c index be79cd882a..01b880b4a4 100644 --- a/src/overlays/l05/hero/update_hero_state_machine.c +++ b/src/overlays/l05/hero/update_hero_state_machine.c @@ -5,7 +5,7 @@ #include "asm.h" #include "qcopy.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/input/pad_state.h" #include "rnc/hero/hero.h" #include "rnc/game/usage_stats.h" @@ -223,8 +223,10 @@ void update_hero_state_machine(void) { if (usage_stats.stat[31].count < 0xFFFF) { usage_stats.stat[31].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[31].unk2) { - usage_stats.stat[31].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[31].latest_time_bucket) { + usage_stats.stat[31].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[31].level_mask = usage_stats.stat[31].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l05/level_class_tables.c b/src/overlays/l05/level_class_tables.c index 9bc1973cb9..c8d52bf94d 100644 --- a/src/overlays/l05/level_class_tables.c +++ b/src/overlays/l05/level_class_tables.c @@ -1,116 +1,28 @@ -#include "rnc/mobys/quad_moby_update.h" -#include "rnc/overlay/l05/mobys/amoeboid.h" -#include "rnc/overlay/l05/mobys/box.h" -#include "rnc/overlay/l05/mobys/cutscene_camera_target.h" -#include "rnc/overlay/l05/mobys/drain_cover.h" -#include "rnc/overlay/l05/mobys/electric_gate.h" -#include "rnc/overlay/l05/mobys/elevator_with_button.h" -#include "rnc/overlay/l05/mobys/extermibot.h" -#include "rnc/overlay/l05/mobys/extermitank.h" -#include "rnc/overlay/l05/mobys/floating_platform.h" -#include "rnc/overlay/l05/mobys/fog_zone.h" -#include "rnc/overlay/l05/mobys/help_hints.h" -#include "rnc/overlay/l05/mobys/hero_clip_volume_outputs.h" -#include "rnc/overlay/l05/mobys/hoverboard_girl.h" -#include "rnc/overlay/l05/mobys/ocean_rilgar.h" -#include "rnc/overlay/l05/mobys/pipe_mounted_grating.h" -#include "rnc/overlay/l05/mobys/qwarks_bouncer.h" -#include "rnc/overlay/l05/mobys/qwarks_trailer.h" -#include "rnc/overlay/l05/mobys/rising_gate.h" -#include "rnc/overlay/l05/mobys/scenery_ship.h" -#include "rnc/overlay/l05/mobys/shady_salesman.h" -#include "rnc/overlay/l05/mobys/sharkigator.h" -#include "rnc/overlay/l05/mobys/skid_mcmarx.h" -#include "rnc/overlay/l05/mobys/taxi.h" -#include "rnc/overlay/l05/mobys/television.h" -#include "rnc/overlay/l05/mobys/triggered_moby_yaw.h" -#include "rnc/overlay/l05/mobys/triggered_motion.h" -#include "rnc/overlay/l05/mobys/triggered_slide.h" -#include "rnc/overlay/l05/mobys/triggered_spray_emitter.h" -#include "rnc/overlay/l05/mobys/water.h" -#include "rnc/overlay/shared/audio/emitters/box_emitter.h" -#include "rnc/overlay/shared/audio/emitters/distance_emitter.h" -#include "rnc/overlay/shared/audio/emitters/listener_emitter.h" -#include "rnc/overlay/shared/audio/emitters/music_switch_emitter.h" -#include "rnc/overlay/shared/audio/emitters/random_position_emitter.h" -#include "rnc/overlay/shared/audio/emitters/reverb_box_emitter.h" -#include "rnc/overlay/shared/camera/follow_camera_setup.h" -#include "rnc/overlay/shared/camera/follow_camera_update.h" -#include "rnc/overlay/shared/camera/grindrail_camera.h" -#include "rnc/overlay/shared/camera/hero_aligned_camera.h" -#include "rnc/overlay/shared/camera/hoverboard_camera.h" -#include "rnc/overlay/shared/camera/orbit_camera.h" +#include "rnc/mobys.h" +#include "rnc/overlay/l05/mobys.h" +#include "rnc/overlay/shared/audio/emitters.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/camera/scripted_camera.h" #include "rnc/overlay/shared/camera/swing_volume_camera.h" -#include "rnc/overlay/shared/camera/target_tracking_camera.h" -#include "rnc/overlay/shared/cutscenes/qwark_rilgar.h" -#include "rnc/overlay/shared/enemies/blarg_gun.h" -#include "rnc/overlay/shared/enemies/large_amoeboid.h" -#include "rnc/overlay/shared/enemies/sandmouse.h" -#include "rnc/overlay/shared/enemies/sandmouse_house.h" -#include "rnc/overlay/shared/enemies/sandmouse_projectile.h" -#include "rnc/overlay/shared/mobys/camera_object.h" -#include "rnc/overlay/shared/pickups/buried_bolts.h" -#include "rnc/overlay/shared/pickups/crate.h" -#include "rnc/overlay/shared/pickups/crate_fragment.h" +#include "rnc/overlay/shared/cutscenes.h" +#include "rnc/overlay/shared/enemies.h" +#include "rnc/overlay/shared/mobys.h" +#include "rnc/overlay/shared/pickups.h" #include "rnc/overlay/shared/pickups/infobot.h" -#include "rnc/overlay/shared/pickups/nanotech_ball.h" -#include "rnc/overlay/shared/pickups/pilots_helmet.h" -#include "rnc/overlay/shared/pickups/weapon_ammo.h" -#include "rnc/overlay/shared/props/breakable_lamp.h" -#include "rnc/overlay/shared/props/floor_button.h" +#include "rnc/overlay/shared/props.h" #include "rnc/overlay/shared/props/grow_and_fade_out.h" -#include "rnc/overlay/shared/props/hoverboard_ring.h" -#include "rnc/overlay/shared/props/hydrodisplacer.h" -#include "rnc/overlay/shared/props/hydrodisplacer_faucet.h" -#include "rnc/overlay/shared/props/lamp.h" -#include "rnc/overlay/shared/props/moby_state_trigger.h" -#include "rnc/overlay/shared/props/red_orb.h" #include "rnc/overlay/shared/props/rock.h" -#include "rnc/overlay/shared/props/swingshot_versatarget.h" -#include "rnc/overlay/shared/props/tumbling_part.h" -#include "rnc/overlay/shared/rendering/effects/debris.h" +#include "rnc/overlay/shared/rendering/effects.h" #include "rnc/overlay/shared/rendering/effects/explosion_light.h" -#include "rnc/overlay/shared/rendering/effects/glow_particle.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" -#include "rnc/overlay/shared/vehicles/hoverboard.h" -#include "rnc/overlay/shared/vendor/vendor.h" -#include "rnc/overlay/shared/vendor/vendor_orb.h" -#include "rnc/overlay/shared/weapons/blaster.h" -#include "rnc/overlay/shared/weapons/blaster_shot.h" -#include "rnc/overlay/shared/weapons/bomb_glove.h" +#include "rnc/overlay/shared/vehicles.h" +#include "rnc/overlay/shared/vendor.h" +#include "rnc/overlay/shared/weapons.h" #include "rnc/overlay/shared/weapons/bomb_glove_bomb.h" -#include "rnc/overlay/shared/weapons/decoy.h" -#include "rnc/overlay/shared/weapons/decoy_glove.h" #include "rnc/overlay/shared/weapons/devastator.h" -#include "rnc/overlay/shared/weapons/doom_bot.h" -#include "rnc/overlay/shared/weapons/drone.h" -#include "rnc/overlay/shared/weapons/glove_of_doom.h" -#include "rnc/overlay/shared/weapons/glove_of_doom_bomb.h" -#include "rnc/overlay/shared/weapons/gold_devastator_missile.h" -#include "rnc/overlay/shared/weapons/helipack.h" -#include "rnc/overlay/shared/weapons/linked_moby_states_update.h" -#include "rnc/overlay/shared/weapons/metal_detector.h" #include "rnc/overlay/shared/weapons/mine.h" -#include "rnc/overlay/shared/weapons/mine_glove.h" -#include "rnc/overlay/shared/weapons/morphoray.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken_feather.h" -#include "rnc/overlay/shared/weapons/morphoray_target_effect.h" -#include "rnc/overlay/shared/weapons/pyrocitor.h" -#include "rnc/overlay/shared/weapons/ryno.h" -#include "rnc/overlay/shared/weapons/ryno_rocket.h" #include "rnc/overlay/shared/weapons/suckcannon.h" -#include "rnc/overlay/shared/weapons/swingshot.h" #include "rnc/overlay/shared/weapons/swingshot_hook.h" -#include "rnc/overlay/shared/weapons/taunter.h" -#include "rnc/overlay/shared/weapons/tesla_claw.h" -#include "rnc/overlay/shared/weapons/thruster_pack_flame.h" -#include "rnc/overlay/shared/weapons/trailing_flame.h" -#include "rnc/overlay/shared/weapons/trespasser.h" -#include "rnc/overlay/shared/weapons/visibomb.h" -#include "rnc/overlay/shared/weapons/visibomb_missile.h" -#include "rnc/overlay/shared/weapons/walloper.h" /* The level's moby classes, camera types and sound emitter types: the tables the executable's code looks ids up in (sections lvl.vtbl, lvl.camvtbl and lvl.sndvtbl). */ diff --git a/src/overlays/l05/mobys/help_hints.c b/src/overlays/l05/mobys/help_hints.c index 7a53d7f314..cf5da87359 100644 --- a/src/overlays/l05/mobys/help_hints.c +++ b/src/overlays/l05/mobys/help_hints.c @@ -9,7 +9,7 @@ #include "rnc/overlay/l05/mobys/help_hints_globals.h" #include "rnc/math/fast_math.h" #include "rnc/math/asm_helpers.h" -#include "rnc/overlay/shared/enemies/horny_toad.h" +#include "rnc/overlay/shared/enemies.h" extern char D_0013F3D0[]; extern int camera_secondary_mode_lui __asm__("D_001413D4") NOT_SDA, D_001413DC NOT_SDA, @@ -23,29 +23,24 @@ extern f32 D_0013F3D8, D_0013F3DC; extern void help_request(int, int) __asm__("FUN_L00_00203908"); typedef unsigned int L05Vector __attribute__((mode(TI), aligned(16))); -typedef struct { - unsigned short count, best; - int flags; -} VendorEventRecord; - -extern VendorEventRecord D_00141968[]; -#define D_00141B8C (D_00141968[68].flags) -#define D_00141BAC (D_00141968[72].flags) -#define D_00141BF4 (D_00141968[81].flags) -#define D_00141CFC (D_00141968[114].flags) -#define D_00141A82 (D_00141968[35].best) +extern struct UsageStat D_00141968[]; +#define D_00141B8C (D_00141968[68].level_mask) +#define D_00141BAC (D_00141968[72].level_mask) +#define D_00141BF4 (D_00141968[81].level_mask) +#define D_00141CFC (D_00141968[114].level_mask) +#define D_00141A82 (D_00141968[35].latest_time_bucket) #define D_00141A88 (D_00141968[36].count) -#define D_00141A8A (D_00141968[36].best) -#define D_00141A8C (D_00141968[36].flags) +#define D_00141A8A (D_00141968[36].latest_time_bucket) +#define D_00141A8C (D_00141968[36].level_mask) #define D_00141A90 (D_00141968[37].count) -#define D_00141A92 (D_00141968[37].best) -#define D_00141A94 (D_00141968[37].flags) +#define D_00141A92 (D_00141968[37].latest_time_bucket) +#define D_00141A94 (D_00141968[37].level_mask) #define D_00141A98 (D_00141968[38].count) -#define D_00141A9C (D_00141968[38].flags) +#define D_00141A9C (D_00141968[38].level_mask) #define D_00141A78 (D_00141968[34].count) #define D_00141C58 (D_00141968[94].count) -#define D_00141C5A (D_00141968[94].best) -#define D_00141C5C (D_00141968[94].flags) +#define D_00141C5A (D_00141968[94].latest_time_bucket) +#define D_00141C5C (D_00141968[94].level_mask) #define D_00141B88 (D_00141968[68].count) #define D_00141BB8 (D_00141968[74].count) typedef struct { @@ -107,7 +102,8 @@ void help_hints_update(struct Moby *moby) { } } if (is_point_inside_clip_volume(D_0013F3D0, gameplay_event_pvars[16])) { - elapsed = scale_game_frames(gameplay_event_frame_count) - usage_stats.stat[9].unk2 * 600; + elapsed = scale_game_frames(gameplay_event_frame_count) - + usage_stats.stat[9].latest_time_bucket * 600; limit = (int)((float)scale_game_frames(0xe10) * 60.0f); if (limit < elapsed && (unsigned int)(D_00141BAC & (1 << gameplay_event_level_index)) < 1) help_request(0x7dd, 0x48); diff --git a/src/overlays/l05/mobys/scenery_ship.c b/src/overlays/l05/mobys/scenery_ship.c index 3e544c4e0f..dfba8f5234 100644 --- a/src/overlays/l05/mobys/scenery_ship.c +++ b/src/overlays/l05/mobys/scenery_ship.c @@ -10,7 +10,7 @@ #include "rnc/math/random.h" #include "rnc/runtime/callbacks/add_draw_callback.h" #include "rnc/mobys/moby_spawn.h" -#include "rnc/camera/sample_camera_path.h" +#include "rnc/camera.h" #include "rnc/overlay/shared/audio/voices/voice_is_playing.h" #include "rnc/rendering/effect_texture.h" diff --git a/src/overlays/l05/mobys/skid_mcmarx.c b/src/overlays/l05/mobys/skid_mcmarx.c index 962d3542e9..7db8a93e2c 100644 --- a/src/overlays/l05/mobys/skid_mcmarx.c +++ b/src/overlays/l05/mobys/skid_mcmarx.c @@ -12,7 +12,7 @@ #include "rnc/math/random.h" #include "rnc/overlay/shared/math/interpolation/spring_turn.h" #include "rnc/overlay/shared/math/random/random_int_between.h" -#include "rnc/overlay/shared/mobys/add_moby_frames_for_group_proximity.h" +#include "rnc/overlay/shared/mobys.h" extern void *create_moby() __asm__("FUN_0020c4f8"); diff --git a/src/overlays/l05/mobys/water.c b/src/overlays/l05/mobys/water.c index f5ff6064c3..d035c458b4 100644 --- a/src/overlays/l05/mobys/water.c +++ b/src/overlays/l05/mobys/water.c @@ -14,7 +14,7 @@ #include "rnc/runtime/callbacks/add_draw_callback.h" #include "rnc/math/interpolation/advance_accelerated_scalar.h" #include "rnc/math/random.h" -#include "rnc/overlay/l05/render_level_water_grids.h" +#include "rnc/overlay/l05.h" extern float random_float_between(float, float) __asm__("FUN_002132a8"); extern float fast_cos(float); diff --git a/src/overlays/l06/hero/hero_set_state.c b/src/overlays/l06/hero/hero_set_state.c index 8c571a7137..e066e67e77 100644 --- a/src/overlays/l06/hero/hero_set_state.c +++ b/src/overlays/l06/hero/hero_set_state.c @@ -417,8 +417,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -463,8 +463,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -1193,8 +1193,8 @@ int hero_set_state(int a, int b) { if (h[0].count <= 0xFFFE) { h[0].count = h[0].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[0].unk2) { - h[0].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[0].latest_time_bucket) { + h[0].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[0].level_mask = h[0].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -1223,16 +1223,16 @@ int hero_set_state(int a, int b) { if (h[1].count <= 0xFFFE) { h[1].count = h[1].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[1].unk2) { - h[1].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[1].latest_time_bucket) { + h[1].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[1].level_mask = h[1].level_mask | (1 << current_level_index) | 0x80000000; item_usage_base = (struct UsageStat *)item_usage; if (item_usage_base[37].count <= 0xFFFE) { item_usage_base[37].count = item_usage_base[37].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > item_usage_base[37].unk2) { - item_usage_base[37].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > item_usage_base[37].latest_time_bucket) { + item_usage_base[37].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } item_usage_base[37].level_mask = item_usage_base[37].level_mask | (1 << current_level_index) | 0x80000000; @@ -1271,8 +1271,8 @@ int hero_set_state(int a, int b) { if (h[8].count <= 0xFFFE) { h[8].count = h[8].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[8].unk2) { - h[8].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[8].latest_time_bucket) { + h[8].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } q = &hero; h[8].level_mask = h[8].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l06/hero/update_hero_motion_for_current_state.c b/src/overlays/l06/hero/update_hero_motion_for_current_state.c index 193220f2f3..94edf6d7bc 100644 --- a/src/overlays/l06/hero/update_hero_motion_for_current_state.c +++ b/src/overlays/l06/hero/update_hero_motion_for_current_state.c @@ -6,7 +6,7 @@ #include "rnc/hero/hero.h" #include "rnc/globals.h" #include "asm.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/math/quad.h" #include "rnc/overlay/shared/world/collision.h" #include "rnc/overlay/shared/mobys/entities.h" @@ -1068,8 +1068,9 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[18].count++; } t = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[18].unk2 < t) { - usage_stats.stat[18].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[18].latest_time_bucket < t) { + usage_stats.stat[18].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } D_L06_0015F688 = -1; usage_stats.stat[18].level_mask = diff --git a/src/overlays/l06/hero/update_hero_state_machine.c b/src/overlays/l06/hero/update_hero_state_machine.c index 2465705200..473d924a98 100644 --- a/src/overlays/l06/hero/update_hero_state_machine.c +++ b/src/overlays/l06/hero/update_hero_state_machine.c @@ -5,7 +5,7 @@ #include "asm.h" #include "qcopy.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/math/quad.h" #include "rnc/input/pad_state.h" #include "rnc/hero/hero.h" @@ -245,8 +245,10 @@ void update_hero_state_machine(void) { if (usage_stats.stat[31].count < 0xFFFF) { usage_stats.stat[31].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[31].unk2) { - usage_stats.stat[31].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[31].latest_time_bucket) { + usage_stats.stat[31].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[31].level_mask = usage_stats.stat[31].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l06/level_class_tables.c b/src/overlays/l06/level_class_tables.c index 4c69bf708c..c6106728d9 100644 --- a/src/overlays/l06/level_class_tables.c +++ b/src/overlays/l06/level_class_tables.c @@ -1,111 +1,30 @@ -#include "rnc/mobys/quad_moby_update.h" +#include "rnc/mobys.h" #include "rnc/overlay/l06/mobys/alien_queen.h" #include "rnc/overlay/l06/mobys/alien_queen_slider.h" -#include "rnc/overlay/l06/mobys/alien_snapper.h" -#include "rnc/overlay/l06/mobys/alien_snapper_spawner.h" -#include "rnc/overlay/l06/mobys/beam_barrier.h" -#include "rnc/overlay/l06/mobys/breakable_prop.h" -#include "rnc/overlay/l06/mobys/breakable_prop_variant.h" -#include "rnc/overlay/l06/mobys/breakable_window.h" -#include "rnc/overlay/l06/mobys/breakaway_piece.h" -#include "rnc/overlay/l06/mobys/countdown_sequence.h" -#include "rnc/overlay/l06/mobys/cutscene_camera_target.h" -#include "rnc/overlay/l06/mobys/drawbridge.h" -#include "rnc/overlay/l06/mobys/dual_texture_meshes.h" -#include "rnc/overlay/l06/mobys/elevator.h" -#include "rnc/overlay/l06/mobys/fred.h" -#include "rnc/overlay/l06/mobys/hangar_door.h" -#include "rnc/overlay/l06/mobys/help_hints.h" -#include "rnc/overlay/l06/mobys/red_button.h" -#include "rnc/overlay/l06/mobys/shuttle.h" -#include "rnc/overlay/l06/mobys/spark_emitter.h" -#include "rnc/overlay/l06/mobys/split_door.h" -#include "rnc/overlay/l06/mobys/switchable_beam_barrier.h" -#include "rnc/overlay/l06/mobys/toxic_gas_vent.h" -#include "rnc/overlay/shared/camera/aim_volume_camera.h" -#include "rnc/overlay/shared/camera/follow_camera_setup.h" -#include "rnc/overlay/shared/camera/follow_camera_update.h" -#include "rnc/overlay/shared/camera/hero_aligned_camera.h" -#include "rnc/overlay/shared/camera/moby_controlled_camera.h" -#include "rnc/overlay/shared/camera/orbit_camera.h" +#include "rnc/overlay/l06/mobys.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/camera/scripted_camera.h" #include "rnc/overlay/shared/camera/swing_volume_camera.h" -#include "rnc/overlay/shared/camera/target_tracking_camera.h" -#include "rnc/overlay/shared/enemies/billboard_projectile.h" -#include "rnc/overlay/shared/enemies/blarg_space_commando.h" -#include "rnc/overlay/shared/enemies/frog.h" +#include "rnc/overlay/shared/enemies.h" #include "rnc/overlay/shared/enemies/gadgebot.h" #include "rnc/overlay/shared/enemies/gadgebot_spawn_container.h" #include "rnc/overlay/shared/enemies/gadgebot_spawn_pad.h" -#include "rnc/overlay/shared/enemies/ground_melee_enemy.h" -#include "rnc/overlay/shared/enemies/sandmouse.h" -#include "rnc/overlay/shared/enemies/sandmouse_house.h" -#include "rnc/overlay/shared/enemies/sandmouse_projectile.h" -#include "rnc/overlay/shared/mobys/camera_object.h" -#include "rnc/overlay/shared/pickups/buried_bolts.h" -#include "rnc/overlay/shared/pickups/crate.h" -#include "rnc/overlay/shared/pickups/crate_fragment.h" -#include "rnc/overlay/shared/pickups/gadget_pickup.h" +#include "rnc/overlay/shared/mobys.h" +#include "rnc/overlay/shared/pickups.h" #include "rnc/overlay/shared/pickups/infobot.h" -#include "rnc/overlay/shared/pickups/nanotech_ball.h" -#include "rnc/overlay/shared/pickups/pilots_helmet.h" -#include "rnc/overlay/shared/pickups/weapon_ammo.h" -#include "rnc/overlay/shared/props/bot_door_lock.h" -#include "rnc/overlay/shared/props/breakable_prop.h" -#include "rnc/overlay/shared/props/energy_sphere.h" -#include "rnc/overlay/shared/props/energy_sphere_holder.h" -#include "rnc/overlay/shared/props/flickering_point_light.h" -#include "rnc/overlay/shared/props/group_rotator.h" +#include "rnc/overlay/shared/props.h" #include "rnc/overlay/shared/props/grow_and_fade_out.h" -#include "rnc/overlay/shared/props/hydrodisplacer.h" -#include "rnc/overlay/shared/props/respawn_volume.h" #include "rnc/overlay/shared/props/rock.h" -#include "rnc/overlay/shared/props/spinning_fragment.h" -#include "rnc/overlay/shared/props/swingshot_versatarget.h" -#include "rnc/overlay/shared/props/trespasser_pad.h" -#include "rnc/overlay/shared/props/tumbling_part.h" -#include "rnc/overlay/shared/rendering/effects/debris.h" +#include "rnc/overlay/shared/rendering/effects.h" #include "rnc/overlay/shared/rendering/effects/explosion_light.h" -#include "rnc/overlay/shared/rendering/effects/glow_particle.h" -#include "rnc/overlay/shared/rendering/effects/timed_sprite_effect.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" -#include "rnc/overlay/shared/vendor/vendor.h" -#include "rnc/overlay/shared/vendor/vendor_orb.h" -#include "rnc/overlay/shared/weapons/blaster.h" -#include "rnc/overlay/shared/weapons/blaster_shot.h" -#include "rnc/overlay/shared/weapons/bomb_glove.h" +#include "rnc/overlay/shared/vendor.h" +#include "rnc/overlay/shared/weapons.h" #include "rnc/overlay/shared/weapons/bomb_glove_bomb.h" -#include "rnc/overlay/shared/weapons/decoy.h" -#include "rnc/overlay/shared/weapons/decoy_glove.h" #include "rnc/overlay/shared/weapons/devastator.h" -#include "rnc/overlay/shared/weapons/doom_bot.h" -#include "rnc/overlay/shared/weapons/drone.h" -#include "rnc/overlay/shared/weapons/glove_of_doom.h" -#include "rnc/overlay/shared/weapons/glove_of_doom_bomb.h" -#include "rnc/overlay/shared/weapons/gold_devastator_missile.h" -#include "rnc/overlay/shared/weapons/helipack.h" -#include "rnc/overlay/shared/weapons/linked_moby_states_update.h" -#include "rnc/overlay/shared/weapons/metal_detector.h" #include "rnc/overlay/shared/weapons/mine.h" -#include "rnc/overlay/shared/weapons/mine_glove.h" -#include "rnc/overlay/shared/weapons/morphoray.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken_feather.h" -#include "rnc/overlay/shared/weapons/morphoray_target_effect.h" -#include "rnc/overlay/shared/weapons/pyrocitor.h" -#include "rnc/overlay/shared/weapons/ryno.h" -#include "rnc/overlay/shared/weapons/ryno_rocket.h" #include "rnc/overlay/shared/weapons/suckcannon.h" -#include "rnc/overlay/shared/weapons/swingshot.h" #include "rnc/overlay/shared/weapons/swingshot_hook.h" -#include "rnc/overlay/shared/weapons/taunter.h" -#include "rnc/overlay/shared/weapons/tesla_claw.h" -#include "rnc/overlay/shared/weapons/thruster_pack_flame.h" -#include "rnc/overlay/shared/weapons/trailing_flame.h" -#include "rnc/overlay/shared/weapons/trespasser.h" -#include "rnc/overlay/shared/weapons/visibomb.h" -#include "rnc/overlay/shared/weapons/visibomb_missile.h" -#include "rnc/overlay/shared/weapons/walloper.h" /* The level's moby classes, camera types and sound emitter types: the tables the executable's code looks ids up in (sections lvl.vtbl, lvl.camvtbl and lvl.sndvtbl). */ diff --git a/src/overlays/l06/load_level_archive_resources.c b/src/overlays/l06/load_level_archive_resources.c index 40a5e92139..fbaec12089 100644 --- a/src/overlays/l06/load_level_archive_resources.c +++ b/src/overlays/l06/load_level_archive_resources.c @@ -28,10 +28,10 @@ #include "rnc/world/loaders/unpack_point_records.h" #include "rnc/world/loaders/upload_texture_images.h" #include "rnc/overlay/shared/game/restore_or_clear_level_state.h" -#include "rnc/rendering/shrubs/register_shrub_render_class.h" -#include "rnc/rendering/texture/parse_particle_textures.h" -#include "rnc/rendering/tfrags/initialize_tfrag_render_data.h" -#include "rnc/rendering/ties/register_object_render_class.h" +#include "rnc/rendering/shrubs.h" +#include "rnc/rendering/texture.h" +#include "rnc/rendering/tfrags.h" +#include "rnc/rendering/ties.h" typedef struct { char *f0; /* 0x00 */ diff --git a/src/overlays/l06/mobys/alien_queen.c b/src/overlays/l06/mobys/alien_queen.c index 0e51225183..e16419bfb3 100644 --- a/src/overlays/l06/mobys/alien_queen.c +++ b/src/overlays/l06/mobys/alien_queen.c @@ -21,7 +21,7 @@ #include "rnc/math/interpolation/advance_accelerated_scalar.h" #include "rnc/math/random.h" #include "rnc/overlay/l06/hero/hero_set_state.h" -#include "rnc/overlay/shared/camera/moby_controlled_camera.h" +#include "rnc/overlay/shared/camera.h" extern int D_L06_001ABFC0[]; extern int D_L06_0015FFD8_d __asm__("D_L06_0015FFD8"); diff --git a/src/overlays/l06/mobys/beam_barrier.c b/src/overlays/l06/mobys/beam_barrier.c index 102daac078..e0ce819da7 100644 --- a/src/overlays/l06/mobys/beam_barrier.c +++ b/src/overlays/l06/mobys/beam_barrier.c @@ -275,12 +275,12 @@ void beam_barrier_update(struct Moby *moby) { } { int best = scale_game_frames(D_0015EEA4_macro) / 600; - if ((int)D_00141968[43].best < best) { + if ((int)D_00141968[43].latest_time_bucket < best) { int new_best = scale_game_frames(D_0015EEA4_macro) / 600; - D_00141968[43].best = new_best; + D_00141968[43].latest_time_bucket = new_best; } - D_00141968[43].flags = - D_00141968[43].flags | (1 << current_level_index_macro) | 0x80000000; + D_00141968[43].level_flags = + D_00141968[43].level_flags | (1 << current_level_index_macro) | 0x80000000; } } return; diff --git a/src/overlays/l06/mobys/breakable_window.c b/src/overlays/l06/mobys/breakable_window.c index 53b973607c..1aa7b08238 100644 --- a/src/overlays/l06/mobys/breakable_window.c +++ b/src/overlays/l06/mobys/breakable_window.c @@ -14,7 +14,7 @@ #include "rnc/overlay/l06/hero/hero_set_state.h" #include "rnc/overlay/l06/scripted_camera_sequence.h" #include "rnc/math/interpolation/advance_accelerated_scalar.h" -#include "rnc/overlay/shared/props/spinning_fragment.h" +#include "rnc/overlay/shared/props.h" extern float D_L06_00167540[]; extern void draw_geometry_quad(void *, void *, int) __asm__("FUN_001f7d30"); diff --git a/src/overlays/l06/mobys/countdown_sequence.c b/src/overlays/l06/mobys/countdown_sequence.c index 7498287c48..e5e820442e 100644 --- a/src/overlays/l06/mobys/countdown_sequence.c +++ b/src/overlays/l06/mobys/countdown_sequence.c @@ -14,8 +14,7 @@ #include "rnc/overlay/l06/scripted_camera_sequence.h" #include "rnc/overlay/l06/mobys/countdown_sequence_globals.h" #include "rnc/math/random.h" -#include "rnc/overlay/l06/mobys/draw_pulsing_timer_display.h" -#include "rnc/overlay/l06/mobys/spark_emitter.h" +#include "rnc/overlay/l06/mobys.h" #include "rnc/overlay/shared/mobys/count_active_moby_group_members.h" extern int D_L06_001ABFC0_u[] __asm__("D_L06_001ABFC0"); diff --git a/src/overlays/l06/mobys/draw_pulsing_timer_display.c b/src/overlays/l06/mobys/draw_pulsing_timer_display.c index 05d228d76d..5e01b9b9bc 100644 --- a/src/overlays/l06/mobys/draw_pulsing_timer_display.c +++ b/src/overlays/l06/mobys/draw_pulsing_timer_display.c @@ -6,8 +6,7 @@ #include "rnc/math/asm_helpers.h" #include "rnc/math/random.h" #include "rnc/ui/frames/draw_ui_frame.h" -#include "rnc/ui/text/font/font_print_center.h" -#include "rnc/ui/text/font/font_print_center_large.h" +#include "rnc/ui/text/font.h" /* Ported from rac1-decomp (src/overlays/shared/vendor_002FF000.c: func_L06_00303630), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/l06/mobys/help_hints.c b/src/overlays/l06/mobys/help_hints.c index 1c5c905fcf..9f9808464f 100644 --- a/src/overlays/l06/mobys/help_hints.c +++ b/src/overlays/l06/mobys/help_hints.c @@ -50,8 +50,8 @@ void help_hints_update(struct Moby *moby) { if (help_records[0x2F].count <= 0xFFFE) { help_records[0x2F].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > help_records[0x2F].unk2) { - help_records[0x2F].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > help_records[0x2F].latest_time_bucket) { + help_records[0x2F].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } help_records[0x2F].level_mask = help_records[0x2F].level_mask | (1 << current_level_index) | 0x80000000; @@ -60,8 +60,8 @@ void help_hints_update(struct Moby *moby) { if (help_records[0x2E].count <= 0xFFFE) { help_records[0x2E].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > help_records[0x2E].unk2) { - help_records[0x2E].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > help_records[0x2E].latest_time_bucket) { + help_records[0x2E].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } help_records[0x2E].level_mask = help_records[0x2E].level_mask | (1 << current_level_index) | 0x80000000; @@ -77,19 +77,22 @@ void help_hints_update(struct Moby *moby) { indexed_moby->state != 0xFE && indexed_moby->state != 0xFD && indexed_moby->state != 1) { if (help_records[0x28].count != 0) { - elapsed = scale_game_frames(D_0015EEA4) - help_records[0x28].unk2 * 600; + elapsed = + scale_game_frames(D_0015EEA4) - help_records[0x28].latest_time_bucket * 600; if ((int)(scale_game_frames(18) * 60.0f) < elapsed || - help_records[0x28].unk2 * 600 == 0) { + help_records[0x28].latest_time_bucket * 600 == 0) { help_request(0x1771, 0x28); - } else if (scale_game_frames(D_0015EEA4) / 600 > help_records[0x28].unk2) { - help_records[0x28].unk2 = scale_game_frames(D_0015EEA4) / 600; + } else if (scale_game_frames(D_0015EEA4) / 600 > + help_records[0x28].latest_time_bucket) { + help_records[0x28].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } } else { if (help_records[0x28].count <= 0xFFFE) { help_records[0x28].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > help_records[0x28].unk2) { - help_records[0x28].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + help_records[0x28].latest_time_bucket) { + help_records[0x28].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } help_records[0x28].level_mask = help_records[0x28].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l07/load_level_assets.c b/src/overlays/l07/load_level_assets.c index 6ab730d90b..d88d5ca280 100644 --- a/src/overlays/l07/load_level_assets.c +++ b/src/overlays/l07/load_level_assets.c @@ -26,10 +26,10 @@ #include "rnc/world/loaders/unpack_point_records.h" #include "rnc/world/loaders/upload_texture_images.h" #include "rnc/overlay/shared/game/restore_or_clear_level_state.h" -#include "rnc/rendering/shrubs/register_shrub_render_class.h" -#include "rnc/rendering/texture/parse_particle_textures.h" -#include "rnc/rendering/tfrags/initialize_tfrag_render_data.h" -#include "rnc/rendering/ties/register_object_render_class.h" +#include "rnc/rendering/shrubs.h" +#include "rnc/rendering/texture.h" +#include "rnc/rendering/tfrags.h" +#include "rnc/rendering/ties.h" typedef struct { char *f0; /* 0x00 */ diff --git a/src/overlays/l07/mobys/homing_mine.c b/src/overlays/l07/mobys/homing_mine.c index 5dcadee256..6b4898c9e2 100644 --- a/src/overlays/l07/mobys/homing_mine.c +++ b/src/overlays/l07/mobys/homing_mine.c @@ -11,7 +11,7 @@ #include "rnc/overlay/shared/world/level_labels.h" #include "rnc/overlay/shared/mobys/find_moby_hit.h" #include "rnc/mobys/moby_spawn.h" -#include "rnc/overlay/l07/mobys/get_target_sight.h" +#include "rnc/overlay/l07/mobys.h" extern s32 collect_mobies_in_sphere(f32, void *, s32, void *, void *) __asm__("FUN_L00_001f2868"); extern int resolve_moby_hit_response(void *, void *, void *, int, int *, int, int, int) __asm__("FUN_00213928"); diff --git a/src/overlays/l07/mobys/machinegun_turret.c b/src/overlays/l07/mobys/machinegun_turret.c index cec3833d9e..4122ba354d 100644 --- a/src/overlays/l07/mobys/machinegun_turret.c +++ b/src/overlays/l07/mobys/machinegun_turret.c @@ -9,7 +9,7 @@ #include "sda.h" #include "rnc/overlay/shared/world/level_labels.h" #include "rnc/overlay/shared/mobys/find_moby_hit.h" -#include "rnc/overlay/l07/mobys/machinegun_turret_projectile.h" +#include "rnc/overlay/l07/mobys.h" #include "rnc/overlay/shared/rendering/effects/spawn_explosion.h" extern int resolve_moby_hit_response(void *, void *, void *, int, int *, int, int, int) __asm__("FUN_00213928"); diff --git a/src/overlays/l07/mobys/snagglebeast_effects.c b/src/overlays/l07/mobys/snagglebeast_effects.c index 7a936aec69..25999c4aaa 100644 --- a/src/overlays/l07/mobys/snagglebeast_effects.c +++ b/src/overlays/l07/mobys/snagglebeast_effects.c @@ -9,7 +9,7 @@ #include "rnc/game/item_state.h" #include "rnc/rendering/effect_texture.h" #include "qcopy.h" -#include "rnc/overlay/l07/mobys/growing_ballistic_moby.h" +#include "rnc/overlay/l07/mobys.h" #include "rnc/overlay/shared/rendering/effects/glow_quads_draw.h" #include "rnc/overlay/shared/rendering/effects/particles.h" #include "rnc/overlay/shared/rendering/effects/spawn_explosion.h" diff --git a/src/overlays/l07/mobys/umbris_scene_progression.c b/src/overlays/l07/mobys/umbris_scene_progression.c index 46d1e43e82..327988f1c5 100644 --- a/src/overlays/l07/mobys/umbris_scene_progression.c +++ b/src/overlays/l07/mobys/umbris_scene_progression.c @@ -9,7 +9,7 @@ #include "rnc/math/asm_helpers.h" #include "rnc/game/item_state.h" #include "rnc/mobys/moby_spawn.h" -#include "rnc/overlay/l07/clear_bit_grid_rectangle.h" +#include "rnc/overlay/l07.h" #include "rnc/overlay/shared/game/unlock_planet.h" #include "rnc/rendering/clip_volume.h" #include "rnc/save/memcard_save_data.h" diff --git a/src/overlays/l08/hero/hero_set_state.c b/src/overlays/l08/hero/hero_set_state.c index a566c71229..b19e34f4d9 100644 --- a/src/overlays/l08/hero/hero_set_state.c +++ b/src/overlays/l08/hero/hero_set_state.c @@ -410,8 +410,8 @@ int hero_set_state(int a, int b) { { struct UsageStat *h = usage_stats.stat; struct Hero *q; - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -424,8 +424,8 @@ int hero_set_state(int a, int b) { { struct UsageStat *h = usage_stats.stat; char *v; - if (scale_game_frames(D_0015EEA4) / 600 > h[29].unk2) { - h[29].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[29].latest_time_bucket) { + h[29].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[29].level_mask = h[29].level_mask | (1 << current_level_index) | 0x80000000; v = (char *)&hero.motion.momentum; @@ -680,8 +680,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -726,8 +726,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -1411,8 +1411,8 @@ int hero_set_state(int a, int b) { if (h[0].count <= 0xFFFE) { h[0].count = h[0].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[0].unk2) { - h[0].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[0].latest_time_bucket) { + h[0].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[0].level_mask = h[0].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -1441,16 +1441,16 @@ int hero_set_state(int a, int b) { if (h[1].count <= 0xFFFE) { h[1].count = h[1].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[1].unk2) { - h[1].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[1].latest_time_bucket) { + h[1].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[1].level_mask = h[1].level_mask | (1 << current_level_index) | 0x80000000; item_usage_stats = (struct UsageStat *)item_usage; if (item_usage_stats[37].count <= 0xFFFE) { item_usage_stats[37].count = item_usage_stats[37].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > item_usage_stats[37].unk2) { - item_usage_stats[37].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > item_usage_stats[37].latest_time_bucket) { + item_usage_stats[37].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } item_usage_stats[37].level_mask = item_usage_stats[37].level_mask | (1 << current_level_index) | 0x80000000; @@ -1489,8 +1489,8 @@ int hero_set_state(int a, int b) { if (h[8].count <= 0xFFFE) { h[8].count = h[8].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[8].unk2) { - h[8].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[8].latest_time_bucket) { + h[8].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } q = &hero; h[8].level_mask = h[8].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l08/hero/update_hero_motion_for_current_state.c b/src/overlays/l08/hero/update_hero_motion_for_current_state.c index a4caa4aaf2..839821bc3a 100644 --- a/src/overlays/l08/hero/update_hero_motion_for_current_state.c +++ b/src/overlays/l08/hero/update_hero_motion_for_current_state.c @@ -444,8 +444,9 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[18].count++; } t = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[18].unk2 < t) { - usage_stats.stat[18].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[18].latest_time_bucket < t) { + usage_stats.stat[18].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } D_L08_0015F688 = -1; usage_stats.stat[18].level_mask = @@ -705,8 +706,9 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[11].count++; } use_seconds = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[11].unk2 < use_seconds) { - usage_stats.stat[11].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[11].latest_time_bucket < use_seconds) { + usage_stats.stat[11].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[11].level_mask = usage_stats.stat[11].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l08/hero/update_hero_state_transitions.c b/src/overlays/l08/hero/update_hero_state_transitions.c index 585e4d0eae..90a492ecf5 100644 --- a/src/overlays/l08/hero/update_hero_state_transitions.c +++ b/src/overlays/l08/hero/update_hero_state_transitions.c @@ -5,7 +5,7 @@ #include "asm.h" #include "qcopy.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/math/quad.h" #include "rnc/input/pad_state.h" #include "rnc/hero/hero.h" @@ -240,8 +240,10 @@ void update_hero_state_transitions(void) { if (usage_stats.stat[31].count < 0xFFFF) { usage_stats.stat[31].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[31].unk2) { - usage_stats.stat[31].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[31].latest_time_bucket) { + usage_stats.stat[31].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[31].level_mask = usage_stats.stat[31].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l08/level_class_tables.c b/src/overlays/l08/level_class_tables.c index ecd51a0797..287e8b0f5b 100644 --- a/src/overlays/l08/level_class_tables.c +++ b/src/overlays/l08/level_class_tables.c @@ -1,121 +1,29 @@ -#include "rnc/mobys/quad_moby_update.h" -#include "rnc/overlay/l08/mobys/batalia_cannon.h" -#include "rnc/overlay/l08/mobys/batalia_deserter.h" -#include "rnc/overlay/l08/mobys/batalia_textured_effect.h" -#include "rnc/overlay/l08/mobys/blarg_bombthrower.h" -#include "rnc/overlay/l08/mobys/bolt_pickup.h" -#include "rnc/overlay/l08/mobys/bolt_thief.h" -#include "rnc/overlay/l08/mobys/bomb.h" -#include "rnc/overlay/l08/mobys/bomber_tank.h" +#include "rnc/mobys.h" +#include "rnc/overlay/l08/mobys.h" #include "rnc/overlay/l08/mobys/bomber_tank_bomb.h" -#include "rnc/overlay/l08/mobys/commando.h" -#include "rnc/overlay/l08/mobys/cutscene_camera_target.h" -#include "rnc/overlay/l08/mobys/effect_emitter.h" -#include "rnc/overlay/l08/mobys/falling_debris.h" -#include "rnc/overlay/l08/mobys/flickering_mesh_effect.h" -#include "rnc/overlay/l08/mobys/gunship.h" -#include "rnc/overlay/l08/mobys/heavy_gunship.h" -#include "rnc/overlay/l08/mobys/help_hints.h" -#include "rnc/overlay/l08/mobys/landmine.h" -#include "rnc/overlay/l08/mobys/layered_mesh_effect.h" -#include "rnc/overlay/l08/mobys/lift.h" -#include "rnc/overlay/l08/mobys/path_following_moby.h" #include "rnc/overlay/l08/mobys/rocket.h" -#include "rnc/overlay/l08/mobys/shattering_prop.h" -#include "rnc/overlay/l08/mobys/shrub.h" -#include "rnc/overlay/l08/mobys/shuttle.h" -#include "rnc/overlay/l08/mobys/swing_gate.h" -#include "rnc/overlay/l08/mobys/the_plumber_batalia.h" -#include "rnc/overlay/l08/mobys/water_surface.h" -#include "rnc/overlay/shared/audio/emitters/box_emitter.h" -#include "rnc/overlay/shared/audio/emitters/distance_emitter.h" -#include "rnc/overlay/shared/audio/emitters/ground_height_emitter.h" -#include "rnc/overlay/shared/audio/emitters/music_switch_emitter.h" -#include "rnc/overlay/shared/audio/emitters/reverb_box_emitter.h" -#include "rnc/overlay/shared/camera/aim_volume_camera.h" -#include "rnc/overlay/shared/camera/follow_camera_setup.h" -#include "rnc/overlay/shared/camera/follow_camera_update.h" -#include "rnc/overlay/shared/camera/grindrail_camera.h" -#include "rnc/overlay/shared/camera/hero_aligned_camera.h" -#include "rnc/overlay/shared/camera/moby_controlled_camera.h" -#include "rnc/overlay/shared/camera/orbit_camera.h" +#include "rnc/overlay/shared/audio/emitters.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/camera/scripted_camera.h" -#include "rnc/overlay/shared/camera/target_tracking_camera.h" -#include "rnc/overlay/shared/cutscenes/the_plumber.h" -#include "rnc/overlay/shared/enemies/billboard_projectile.h" -#include "rnc/overlay/shared/enemies/blarg_gun.h" -#include "rnc/overlay/shared/enemies/blarg_paratrooper.h" -#include "rnc/overlay/shared/enemies/bomb_spawner.h" -#include "rnc/overlay/shared/enemies/bomb_spawner_bomb.h" -#include "rnc/overlay/shared/enemies/ground_melee_enemy.h" -#include "rnc/overlay/shared/enemies/paratrooper_fire_bolt.h" -#include "rnc/overlay/shared/enemies/sandmouse.h" -#include "rnc/overlay/shared/enemies/sandmouse_house.h" -#include "rnc/overlay/shared/enemies/sandmouse_projectile.h" -#include "rnc/overlay/shared/enemies/scoutbot.h" -#include "rnc/overlay/shared/enemies/smoke_trail_projectile.h" -#include "rnc/overlay/shared/mobys/camera_object.h" -#include "rnc/overlay/shared/pickups/buried_bolts.h" -#include "rnc/overlay/shared/pickups/crate.h" -#include "rnc/overlay/shared/pickups/crate_fragment.h" +#include "rnc/overlay/shared/cutscenes.h" +#include "rnc/overlay/shared/enemies.h" +#include "rnc/overlay/shared/mobys.h" +#include "rnc/overlay/shared/pickups.h" #include "rnc/overlay/shared/pickups/infobot.h" -#include "rnc/overlay/shared/pickups/nanotech_ball.h" -#include "rnc/overlay/shared/pickups/pilots_helmet.h" -#include "rnc/overlay/shared/pickups/weapon_ammo.h" -#include "rnc/overlay/shared/props/bolt_crank.h" -#include "rnc/overlay/shared/props/directional_spark_emitter.h" +#include "rnc/overlay/shared/props.h" #include "rnc/overlay/shared/props/grow_and_fade_out.h" -#include "rnc/overlay/shared/props/hydrodisplacer.h" -#include "rnc/overlay/shared/props/plant.h" -#include "rnc/overlay/shared/props/respawn_volume.h" #include "rnc/overlay/shared/props/rock.h" -#include "rnc/overlay/shared/props/trackdrive_left.h" -#include "rnc/overlay/shared/props/trespasser_pad.h" -#include "rnc/overlay/shared/props/tumbling_part.h" -#include "rnc/overlay/shared/rendering/effects/debris.h" +#include "rnc/overlay/shared/rendering/effects.h" #include "rnc/overlay/shared/rendering/effects/explosion_light.h" -#include "rnc/overlay/shared/rendering/effects/glow_particle.h" #include "rnc/overlay/shared/rendering/effects/ground_particle_scatter.h" -#include "rnc/overlay/shared/rendering/effects/radial_particle_emitter.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" -#include "rnc/overlay/shared/vendor/vendor.h" -#include "rnc/overlay/shared/vendor/vendor_orb.h" -#include "rnc/overlay/shared/weapons/blaster.h" -#include "rnc/overlay/shared/weapons/blaster_shot.h" -#include "rnc/overlay/shared/weapons/bomb_glove.h" +#include "rnc/overlay/shared/vendor.h" +#include "rnc/overlay/shared/weapons.h" #include "rnc/overlay/shared/weapons/bomb_glove_bomb.h" -#include "rnc/overlay/shared/weapons/decoy.h" -#include "rnc/overlay/shared/weapons/decoy_glove.h" #include "rnc/overlay/shared/weapons/devastator.h" -#include "rnc/overlay/shared/weapons/doom_bot.h" -#include "rnc/overlay/shared/weapons/drone.h" -#include "rnc/overlay/shared/weapons/glove_of_doom.h" -#include "rnc/overlay/shared/weapons/glove_of_doom_bomb.h" -#include "rnc/overlay/shared/weapons/gold_devastator_missile.h" -#include "rnc/overlay/shared/weapons/helipack.h" -#include "rnc/overlay/shared/weapons/linked_moby_states_update.h" -#include "rnc/overlay/shared/weapons/metal_detector.h" #include "rnc/overlay/shared/weapons/mine.h" -#include "rnc/overlay/shared/weapons/mine_glove.h" -#include "rnc/overlay/shared/weapons/morphoray.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken_feather.h" -#include "rnc/overlay/shared/weapons/morphoray_target_effect.h" -#include "rnc/overlay/shared/weapons/pyrocitor.h" -#include "rnc/overlay/shared/weapons/ryno.h" -#include "rnc/overlay/shared/weapons/ryno_rocket.h" #include "rnc/overlay/shared/weapons/suckcannon.h" -#include "rnc/overlay/shared/weapons/swingshot.h" #include "rnc/overlay/shared/weapons/swingshot_hook.h" -#include "rnc/overlay/shared/weapons/taunter.h" -#include "rnc/overlay/shared/weapons/tesla_claw.h" -#include "rnc/overlay/shared/weapons/thruster_pack_flame.h" -#include "rnc/overlay/shared/weapons/trailing_flame.h" -#include "rnc/overlay/shared/weapons/trespasser.h" -#include "rnc/overlay/shared/weapons/turret_rocket.h" -#include "rnc/overlay/shared/weapons/visibomb.h" -#include "rnc/overlay/shared/weapons/visibomb_missile.h" -#include "rnc/overlay/shared/weapons/walloper.h" /* The level's moby classes, camera types and sound emitter types: the tables the executable's code looks ids up in (sections lvl.vtbl, lvl.camvtbl and lvl.sndvtbl). */ diff --git a/src/overlays/l08/mobys/batalia_cannon.c b/src/overlays/l08/mobys/batalia_cannon.c index 3d18f3605c..bbc288cca9 100644 --- a/src/overlays/l08/mobys/batalia_cannon.c +++ b/src/overlays/l08/mobys/batalia_cannon.c @@ -23,7 +23,7 @@ #include "rnc/overlay/l08/hero/hero_set_state.h" #include "rnc/overlay/shared/math/vu0_vector_ops.h" #include "rnc/mobys/moby_spawn.h" -#include "rnc/overlay/shared/weapons/turret_rocket.h" +#include "rnc/overlay/shared/weapons.h" /* finds the first of eight linked entries whose direction lines up with the moby */ /* Ported from rac1-decomp (src/overlays/l08_batalia/vendor_002E0258.c: func_L08_002E15A0), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/l08/mobys/bolt_pickup.c b/src/overlays/l08/mobys/bolt_pickup.c index 4fddf4c65f..cff558b21b 100644 --- a/src/overlays/l08/mobys/bolt_pickup.c +++ b/src/overlays/l08/mobys/bolt_pickup.c @@ -9,8 +9,8 @@ #include "sda.h" #include "rnc/audio/voice_alloc.h" #include "rnc/math/random.h" -#include "rnc/mobys/animation/queue_animation_update.h" -#include "rnc/overlay/l08/mobys/spawn_moby_offset_effect.h" +#include "rnc/mobys/animation.h" +#include "rnc/overlay/l08/mobys.h" /* Ported from rac1-decomp (src/overlays/l08_batalia/vendor_002B9438.c: func_L08_002B9438), where it is exact; names translated to the US level program. */ extern void copy_hero_moby_field_38(void *) __asm__("FUN_L00_0025d1b8"); diff --git a/src/overlays/l08/mobys/effect_emitter.c b/src/overlays/l08/mobys/effect_emitter.c index 97d0ca683a..727a67db2b 100644 --- a/src/overlays/l08/mobys/effect_emitter.c +++ b/src/overlays/l08/mobys/effect_emitter.c @@ -9,7 +9,7 @@ #include "rnc/math/asm_helpers.h" #include "rnc/math/random.h" #include "rnc/game/item_state.h" -#include "rnc/overlay/l08/mobys/spawn_moby_offset_effect.h" +#include "rnc/overlay/l08/mobys.h" /* Ported from rac1-decomp (src/overlays/l08_batalia/vendor_002EAF48.c: func_L08_0030A150), where it is exact; names translated to the US level program. */ void effect_emitter_update(struct Moby *moby) __asm__("FUN_L08_00308c90"); diff --git a/src/overlays/l08/mobys/help_hints.c b/src/overlays/l08/mobys/help_hints.c index 147c74f35e..e010dcedc3 100644 --- a/src/overlays/l08/mobys/help_hints.c +++ b/src/overlays/l08/mobys/help_hints.c @@ -10,16 +10,12 @@ #include "rnc/overlay/shared/mobys/select_auto_aim_target_moby.h" #include "rnc/audio/voices/allocate_voice_for_bank_entry.h" -typedef struct { - u16 count; - u16 best; - u32 flags; -} VendorEventRecord; +#include "rnc/ui/help/help_record.h" #include "rnc/game/item_state.h" -extern VendorEventRecord help_records[] __asm__("D_00141968"); -extern void help_request(s32, s32) __asm__("FUN_L00_00203908"); +extern HelpRecord help_records[] __asm__("D_00141968"); +extern void help_request(s32, s32) __asm__("FUN_L00_00203908"); typedef struct { s32 first; @@ -61,14 +57,14 @@ void help_hints_update(struct Moby *moby) { } if (item_available[29] == 0) { if (is_point_inside_clip_volume(&hero.motion.pos, event_trigger_data->first)) { - elapsed = scale_game_frames(D_0015EEA4) - help_records[48].best * 600; + elapsed = scale_game_frames(D_0015EEA4) - help_records[48].latest_time_bucket * 600; if ((s32)((f32)scale_game_frames(18) * 60.0f) < elapsed || - help_records[48].best * 600 == 0) { + help_records[48].latest_time_bucket * 600 == 0) { help_request(8000, 0x30); } else { time = scale_game_frames(D_0015EEA4) / 600; - if (help_records[48].best < time) - help_records[48].best = scale_game_frames(D_0015EEA4) / 600; + if (help_records[48].latest_time_bucket < time) + help_records[48].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } } } @@ -76,36 +72,36 @@ void help_hints_update(struct Moby *moby) { if (is_point_inside_clip_volume(&hero.motion.pos, event_trigger_data->first) && alternate_item_available[47] == 0) { if (help_records[49].count != 0) { - elapsed = scale_game_frames(D_0015EEA4) - help_records[49].best * 600; + elapsed = scale_game_frames(D_0015EEA4) - help_records[49].latest_time_bucket * 600; if ((s32)((f32)scale_game_frames(18) * 60.0f) < elapsed || - help_records[49].best * 600 == 0) { + help_records[49].latest_time_bucket * 600 == 0) { help_request(8001, 0x31); } else { time = scale_game_frames(D_0015EEA4) / 600; - if (help_records[49].best < time) - help_records[49].best = scale_game_frames(D_0015EEA4) / 600; + if (help_records[49].latest_time_bucket < time) + help_records[49].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } } else { help_records[49].count++; time = scale_game_frames(D_0015EEA4) / 600; - if (help_records[49].best < time) - help_records[49].best = scale_game_frames(D_0015EEA4) / 600; - help_records[49].flags = - help_records[49].flags | (1 << current_level_index) | 0x80000000; + if (help_records[49].latest_time_bucket < time) + help_records[49].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; + help_records[49].level_flags = + help_records[49].level_flags | (1 << current_level_index) | 0x80000000; } } } if (item_available[28] == 0) { if (is_point_inside_clip_volume(&hero.motion.pos, event_trigger_data->second) && D_0013DD4A != 0) { - elapsed = scale_game_frames(D_0015EEA4) - help_records[50].best * 600; + elapsed = scale_game_frames(D_0015EEA4) - help_records[50].latest_time_bucket * 600; if ((s32)((f32)scale_game_frames(18) * 60.0f) < elapsed || - help_records[50].best * 600 == 0) { + help_records[50].latest_time_bucket * 600 == 0) { help_request(8002, 0x32); } else { time = scale_game_frames(D_0015EEA4) / 600; - if (help_records[50].best < time) - help_records[50].best = scale_game_frames(D_0015EEA4) / 600; + if (help_records[50].latest_time_bucket < time) + help_records[50].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } goto sample_volume; } @@ -114,22 +110,23 @@ void help_hints_update(struct Moby *moby) { if (is_point_inside_clip_volume(&hero.motion.pos, event_trigger_data->second) && D_0013DD4A != 0) { if (help_records[112].count != 0) { - elapsed = scale_game_frames(D_0015EEA4) - help_records[112].best * 600; + elapsed = + scale_game_frames(D_0015EEA4) - help_records[112].latest_time_bucket * 600; if ((s32)((f32)scale_game_frames(18) * 60.0f) < elapsed || - help_records[112].best * 600 == 0) { + help_records[112].latest_time_bucket * 600 == 0) { help_request(8005, 0x70); } else { time = scale_game_frames(D_0015EEA4) / 600; - if (help_records[112].best < time) - help_records[112].best = scale_game_frames(D_0015EEA4) / 600; + if (help_records[112].latest_time_bucket < time) + help_records[112].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } } else { help_records[112].count++; time = scale_game_frames(D_0015EEA4) / 600; - if (help_records[112].best < time) - help_records[112].best = scale_game_frames(D_0015EEA4) / 600; - help_records[112].flags = - help_records[112].flags | (1 << current_level_index) | 0x80000000; + if (help_records[112].latest_time_bucket < time) + help_records[112].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; + help_records[112].level_flags = + help_records[112].level_flags | (1 << current_level_index) | 0x80000000; } } } diff --git a/src/overlays/l08/mobys/path_following_moby.c b/src/overlays/l08/mobys/path_following_moby.c index fd2d98f1b9..8e65986b59 100644 --- a/src/overlays/l08/mobys/path_following_moby.c +++ b/src/overlays/l08/mobys/path_following_moby.c @@ -15,7 +15,7 @@ /* Ported from rac1-decomp src/overlays/l08_batalia/vendor_002B9438.c (func_L08_002B94B0) */ #include "qcopy.h" -#include "rnc/camera/sample_camera_path.h" +#include "rnc/camera.h" #include "rnc/overlay/shared/mobys/select_auto_aim_target_moby.h" extern float D_0015ED70; diff --git a/src/overlays/l08/mobys/shuttle.c b/src/overlays/l08/mobys/shuttle.c index a3ea0f22bb..1f79a59855 100644 --- a/src/overlays/l08/mobys/shuttle.c +++ b/src/overlays/l08/mobys/shuttle.c @@ -11,7 +11,7 @@ /* Ported from rac1-decomp src/overlays/l08_batalia/vendor_002B9438.c (func_L08_002B94B0) */ #include "qcopy.h" -#include "rnc/camera/sample_camera_path.h" +#include "rnc/camera.h" #include "rnc/math/interpolation/advance_accelerated_scalar.h" extern float D_0015ED70; diff --git a/src/overlays/l08/mobys/spawn_moby_offset_effect.c b/src/overlays/l08/mobys/spawn_moby_offset_effect.c index f714b27b46..b61df510eb 100644 --- a/src/overlays/l08/mobys/spawn_moby_offset_effect.c +++ b/src/overlays/l08/mobys/spawn_moby_offset_effect.c @@ -7,7 +7,7 @@ #include "rnc/math/fast_math.h" #include "rnc/math/asm_helpers.h" #include "rnc/overlay/shared/rendering/effects/create_part.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/sdk/libc/stdlib.h" /* Spawns an effect moby at the position of moby a. */ /* Ported from rac1-decomp (src/overlays/l08_batalia/partupd_0027ACC8.c: func_L08_0027ACC8), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/l09/level_class_tables.c b/src/overlays/l09/level_class_tables.c index f1dd919d63..90a21bae16 100644 --- a/src/overlays/l09/level_class_tables.c +++ b/src/overlays/l09/level_class_tables.c @@ -1,99 +1,27 @@ -#include "rnc/mobys/quad_moby_update.h" -#include "rnc/overlay/l09/mobys/airship_chain_link.h" -#include "rnc/overlay/l09/mobys/airship_part.h" -#include "rnc/overlay/l09/mobys/asteroid.h" -#include "rnc/overlay/l09/mobys/barrier.h" -#include "rnc/overlay/l09/mobys/damage_causer.h" -#include "rnc/overlay/l09/mobys/destructible_prop.h" -#include "rnc/overlay/l09/mobys/display.h" -#include "rnc/overlay/l09/mobys/drifting_moby.h" -#include "rnc/overlay/l09/mobys/elevator.h" -#include "rnc/overlay/l09/mobys/floating_ship_piece.h" -#include "rnc/overlay/l09/mobys/help_hints.h" -#include "rnc/overlay/l09/mobys/lamp.h" -#include "rnc/overlay/l09/mobys/platform.h" -#include "rnc/overlay/l09/mobys/refueling_station.h" -#include "rnc/overlay/l09/mobys/shrinking_tumbling_debris.h" -#include "rnc/overlay/l09/mobys/shuttle.h" -#include "rnc/overlay/l09/mobys/tumbling_debris.h" -#include "rnc/overlay/l09/mobys/turret.h" -#include "rnc/overlay/shared/audio/emitters/box_emitter.h" -#include "rnc/overlay/shared/audio/emitters/distance_emitter.h" -#include "rnc/overlay/shared/audio/emitters/reverb_box_emitter.h" -#include "rnc/overlay/shared/camera/aim_volume_camera.h" -#include "rnc/overlay/shared/camera/follow_camera_setup.h" -#include "rnc/overlay/shared/camera/follow_camera_update.h" -#include "rnc/overlay/shared/camera/hero_aligned_camera.h" -#include "rnc/overlay/shared/camera/orbit_camera.h" +#include "rnc/mobys.h" +#include "rnc/overlay/l09/mobys.h" +#include "rnc/overlay/shared/audio/emitters.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/camera/scripted_camera.h" #include "rnc/overlay/shared/camera/swing_volume_camera.h" -#include "rnc/overlay/shared/camera/target_tracking_camera.h" -#include "rnc/overlay/shared/enemies/billboard_projectile.h" -#include "rnc/overlay/shared/enemies/blarg_paratrooper.h" -#include "rnc/overlay/shared/enemies/ground_melee_enemy.h" -#include "rnc/overlay/shared/enemies/paratrooper_fire_bolt.h" -#include "rnc/overlay/shared/enemies/seeker.h" -#include "rnc/overlay/shared/enemies/smoke_trail_projectile.h" -#include "rnc/overlay/shared/enemies/spawner.h" +#include "rnc/overlay/shared/enemies.h" #include "rnc/overlay/shared/enemies/spawner_egg.h" -#include "rnc/overlay/shared/mobys/camera_object.h" -#include "rnc/overlay/shared/mobys/moby_draw_registration_update.h" -#include "rnc/overlay/shared/pickups/buried_bolts.h" -#include "rnc/overlay/shared/pickups/crate.h" -#include "rnc/overlay/shared/pickups/crate_fragment.h" -#include "rnc/overlay/shared/pickups/nanotech_ball.h" -#include "rnc/overlay/shared/pickups/pilots_helmet.h" -#include "rnc/overlay/shared/pickups/weapon_ammo.h" +#include "rnc/overlay/shared/mobys.h" +#include "rnc/overlay/shared/pickups.h" #include "rnc/overlay/shared/props/grow_and_fade_out.h" -#include "rnc/overlay/shared/props/hydrodisplacer.h" -#include "rnc/overlay/shared/props/moby_state_trigger.h" +#include "rnc/overlay/shared/props.h" #include "rnc/overlay/shared/props/rock.h" -#include "rnc/overlay/shared/props/swingshot_versatarget.h" -#include "rnc/overlay/shared/props/tumbling_part.h" -#include "rnc/overlay/shared/rendering/effects/debris.h" +#include "rnc/overlay/shared/rendering/effects.h" #include "rnc/overlay/shared/rendering/effects/explosion_light.h" -#include "rnc/overlay/shared/rendering/effects/glow_particle.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" -#include "rnc/overlay/shared/vehicles/background_ship_1.h" -#include "rnc/overlay/shared/vehicles/background_ship_2.h" -#include "rnc/overlay/shared/vendor/vendor.h" -#include "rnc/overlay/shared/vendor/vendor_orb.h" -#include "rnc/overlay/shared/weapons/blaster.h" -#include "rnc/overlay/shared/weapons/blaster_shot.h" -#include "rnc/overlay/shared/weapons/bomb_glove.h" +#include "rnc/overlay/shared/vehicles.h" +#include "rnc/overlay/shared/vendor.h" +#include "rnc/overlay/shared/weapons.h" #include "rnc/overlay/shared/weapons/bomb_glove_bomb.h" -#include "rnc/overlay/shared/weapons/decoy.h" -#include "rnc/overlay/shared/weapons/decoy_glove.h" #include "rnc/overlay/shared/weapons/devastator.h" -#include "rnc/overlay/shared/weapons/doom_bot.h" -#include "rnc/overlay/shared/weapons/drone.h" -#include "rnc/overlay/shared/weapons/glove_of_doom.h" -#include "rnc/overlay/shared/weapons/glove_of_doom_bomb.h" -#include "rnc/overlay/shared/weapons/gold_devastator_missile.h" -#include "rnc/overlay/shared/weapons/helipack.h" -#include "rnc/overlay/shared/weapons/linked_moby_states_update.h" -#include "rnc/overlay/shared/weapons/metal_detector.h" #include "rnc/overlay/shared/weapons/mine.h" -#include "rnc/overlay/shared/weapons/mine_glove.h" -#include "rnc/overlay/shared/weapons/morphoray.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken_feather.h" -#include "rnc/overlay/shared/weapons/morphoray_target_effect.h" -#include "rnc/overlay/shared/weapons/pyrocitor.h" -#include "rnc/overlay/shared/weapons/ryno.h" -#include "rnc/overlay/shared/weapons/ryno_rocket.h" #include "rnc/overlay/shared/weapons/suckcannon.h" -#include "rnc/overlay/shared/weapons/swingshot.h" #include "rnc/overlay/shared/weapons/swingshot_hook.h" -#include "rnc/overlay/shared/weapons/taunter.h" -#include "rnc/overlay/shared/weapons/tesla_claw.h" -#include "rnc/overlay/shared/weapons/thruster_pack_flame.h" -#include "rnc/overlay/shared/weapons/trailing_flame.h" -#include "rnc/overlay/shared/weapons/trespasser.h" -#include "rnc/overlay/shared/weapons/turret_shot.h" -#include "rnc/overlay/shared/weapons/visibomb.h" -#include "rnc/overlay/shared/weapons/visibomb_missile.h" -#include "rnc/overlay/shared/weapons/walloper.h" /* The level's moby classes, camera types and sound emitter types: the tables the executable's code looks ids up in (sections lvl.vtbl, lvl.camvtbl and lvl.sndvtbl). */ diff --git a/src/overlays/l09/mobys/asteroid.c b/src/overlays/l09/mobys/asteroid.c index d0a650a653..d90d856188 100644 --- a/src/overlays/l09/mobys/asteroid.c +++ b/src/overlays/l09/mobys/asteroid.c @@ -15,7 +15,7 @@ #include "rnc/overlay/shared/vendor/vendor_volume.h" #include "rnc/overlay/shared/world/level_path.h" #include "rnc/overlay/shared/math/random/random_int_between.h" -#include "rnc/overlay/shared/mobys/compute_advanced_moby_path_position.h" +#include "rnc/overlay/shared/mobys.h" #include "rnc/overlay/shared/rendering/effects/update_three_phase_effect_particle.h" extern float D_L09_00166F40[]; diff --git a/src/overlays/l09/mobys/barrier.c b/src/overlays/l09/mobys/barrier.c index 25e57dc1ba..6411db55cf 100644 --- a/src/overlays/l09/mobys/barrier.c +++ b/src/overlays/l09/mobys/barrier.c @@ -17,7 +17,7 @@ #include "rnc/overlay/shared/mobys/evaluate_moby_animation_pose.h" #include "rnc/overlay/shared/math/vu0_vector_ops.h" #include "rnc/mobys/moby.h" -#include "rnc/overlay/l09/mobys/display.h" +#include "rnc/overlay/l09/mobys.h" typedef struct Moby Moby; diff --git a/src/overlays/l09/mobys/display.c b/src/overlays/l09/mobys/display.c index 3a910b504d..1c3503da58 100644 --- a/src/overlays/l09/mobys/display.c +++ b/src/overlays/l09/mobys/display.c @@ -18,7 +18,7 @@ #include "sda.h" #include "rnc/game/game_globals.h" #include "rnc/overlay/shared/math/random/random_int_between.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/sdk/libc/stdlib.h" /* spawns a moby of the given class at a source moby's position */ /* Ported from rac1-decomp (src/overlays/l09_gaspar/vendor_002C2B08.c: func_L09_002EEEB0), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/l10/mobys/bomb.c b/src/overlays/l10/mobys/bomb.c index ede8c3992e..fee5ff07b0 100644 --- a/src/overlays/l10/mobys/bomb.c +++ b/src/overlays/l10/mobys/bomb.c @@ -14,7 +14,7 @@ #include "qcopy.h" #include "rnc/overlay/shared/math/quad.h" -#include "rnc/overlay/shared/math/rotations/step_rotation_toward_target.h" +#include "rnc/overlay/shared/math/rotations.h" extern float D_0015ED6C; extern float D_0015ED70; diff --git a/src/overlays/l10/mobys/gadgebot_telepot_pad.c b/src/overlays/l10/mobys/gadgebot_telepot_pad.c index 2af64846f5..15a6a1ed2e 100644 --- a/src/overlays/l10/mobys/gadgebot_telepot_pad.c +++ b/src/overlays/l10/mobys/gadgebot_telepot_pad.c @@ -14,7 +14,7 @@ #include "rnc/overlay/l10/mobys/gadgebot_telepot_pad_globals.h" #include "qcopy.h" -#include "rnc/overlay/shared/camera/follow_camera_set_distance.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/math/random/random_int_between.h" extern void set_race_camera(void *, void *, int, int) __asm__("FUN_L00_00216f90"); diff --git a/src/overlays/l10/mobys/gun.c b/src/overlays/l10/mobys/gun.c index 687e97c544..ff3b17b62c 100644 --- a/src/overlays/l10/mobys/gun.c +++ b/src/overlays/l10/mobys/gun.c @@ -11,7 +11,7 @@ #include "rnc/mobys/moby_spawn.h" #include "rnc/math/spherical_offset.h" #include "rnc/overlay/shared/math/vu0_vector_ops.h" -#include "rnc/overlay/shared/weapons/turret_shot.h" +#include "rnc/overlay/shared/weapons.h" typedef struct Moby Moby; extern struct Moby *D_L10_0015FFD0_macro[] __asm__("D_L10_0015FFD0") MACRO_ADDR; diff --git a/src/overlays/l10/mobys/hero_relocation_trigger.c b/src/overlays/l10/mobys/hero_relocation_trigger.c index 66f312a13e..e634e71274 100644 --- a/src/overlays/l10/mobys/hero_relocation_trigger.c +++ b/src/overlays/l10/mobys/hero_relocation_trigger.c @@ -104,8 +104,8 @@ void hero_relocation_trigger_update(struct Moby *moby) { if (usage_stats.stat[32].count <= 0xFFFE) { usage_stats.stat[32].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[32].unk2) { - usage_stats.stat[32].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[32].latest_time_bucket) { + usage_stats.stat[32].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[32].level_mask = usage_stats.stat[32].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l10/mobys/linked_moby_hitbox.c b/src/overlays/l10/mobys/linked_moby_hitbox.c index 1cc718994d..2f083b66ae 100644 --- a/src/overlays/l10/mobys/linked_moby_hitbox.c +++ b/src/overlays/l10/mobys/linked_moby_hitbox.c @@ -12,7 +12,7 @@ #include "qcopy.h" #include "rnc/overlay/shared/math/quad.h" -#include "rnc/overlay/shared/mobys/spawn_nearby_effect_without_direction.h" +#include "rnc/overlay/shared/mobys.h" extern int debug_print() __asm__("FUN_001e93b0"); extern char *D_L10_0015FFD8_p __asm__("D_L10_0015FFD8"); diff --git a/src/overlays/l10/mobys/magnetboots.c b/src/overlays/l10/mobys/magnetboots.c index fb6869f5cb..16505d4552 100644 --- a/src/overlays/l10/mobys/magnetboots.c +++ b/src/overlays/l10/mobys/magnetboots.c @@ -14,7 +14,7 @@ #include "rnc/mobys/moby_spawn.h" #include "rnc/overlay/l10/mobys/magnetboots_globals.h" -#include "rnc/overlay/shared/enemies/blarg_ship_rocket.h" +#include "rnc/overlay/shared/enemies.h" #include "rnc/overlay/shared/game/unlock_planet.h" /* Spinning pickup: waits until the hero is close and level with it, then plays the scene, saves and goes away. */ diff --git a/src/overlays/l11/hero/hero_set_state.c b/src/overlays/l11/hero/hero_set_state.c index 1d136bd858..dc0aab7422 100644 --- a/src/overlays/l11/hero/hero_set_state.c +++ b/src/overlays/l11/hero/hero_set_state.c @@ -399,8 +399,8 @@ int hero_set_state(int a, int b) { } { struct UsageStat *h = usage_stats.stat; - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } { struct Hero *q = &hero; @@ -414,8 +414,8 @@ int hero_set_state(int a, int b) { } { struct UsageStat *h = usage_stats.stat; - if (scale_game_frames(D_0015EEA4) / 600 > h[29].unk2) { - h[29].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[29].latest_time_bucket) { + h[29].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[29].level_mask = h[29].level_mask | (1 << current_level_index) | 0x80000000; } @@ -669,8 +669,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -715,8 +715,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -1294,8 +1294,8 @@ int hero_set_state(int a, int b) { if (h[0].count <= 0xFFFE) { h[0].count = h[0].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[0].unk2) { - h[0].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[0].latest_time_bucket) { + h[0].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[0].level_mask = h[0].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -1324,16 +1324,16 @@ int hero_set_state(int a, int b) { if (h[1].count <= 0xFFFE) { h[1].count = h[1].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[1].unk2) { - h[1].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[1].latest_time_bucket) { + h[1].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[1].level_mask = h[1].level_mask | (1 << current_level_index) | 0x80000000; item_usage_base = (struct UsageStat *)item_usage; if (item_usage_base[37].count <= 0xFFFE) { item_usage_base[37].count = item_usage_base[37].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > item_usage_base[37].unk2) { - item_usage_base[37].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > item_usage_base[37].latest_time_bucket) { + item_usage_base[37].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } item_usage_base[37].level_mask = item_usage_base[37].level_mask | (1 << current_level_index) | 0x80000000; @@ -1372,8 +1372,8 @@ int hero_set_state(int a, int b) { if (h[8].count <= 0xFFFE) { h[8].count = h[8].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[8].unk2) { - h[8].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[8].latest_time_bucket) { + h[8].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } q = &hero; h[8].level_mask = h[8].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l11/hero/update_hero_motion_by_state.c b/src/overlays/l11/hero/update_hero_motion_by_state.c index 5c9210b13a..658cea833a 100644 --- a/src/overlays/l11/hero/update_hero_motion_by_state.c +++ b/src/overlays/l11/hero/update_hero_motion_by_state.c @@ -428,8 +428,9 @@ void update_hero_motion_by_state(void) { usage_stats.stat[18].count++; } t = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[18].unk2 < t) { - usage_stats.stat[18].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[18].latest_time_bucket < t) { + usage_stats.stat[18].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } D_L11_0015F688 = -1; usage_stats.stat[18].level_mask = @@ -690,8 +691,9 @@ void update_hero_motion_by_state(void) { usage_stats.stat[11].count++; } use_seconds = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[11].unk2 < use_seconds) { - usage_stats.stat[11].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[11].latest_time_bucket < use_seconds) { + usage_stats.stat[11].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[11].level_mask = usage_stats.stat[11].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l11/hero/update_hero_state_transitions.c b/src/overlays/l11/hero/update_hero_state_transitions.c index e8dd2569e7..58d546c099 100644 --- a/src/overlays/l11/hero/update_hero_state_transitions.c +++ b/src/overlays/l11/hero/update_hero_state_transitions.c @@ -6,7 +6,7 @@ #include "asm.h" #include "qcopy.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/input/pad_state.h" #include "rnc/hero/hero.h" #include "rnc/game/usage_stats.h" @@ -207,8 +207,10 @@ void update_hero_state_transitions(void) { if (usage_stats.stat[31].count < 0xFFFF) { usage_stats.stat[31].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[31].unk2) { - usage_stats.stat[31].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[31].latest_time_bucket) { + usage_stats.stat[31].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[31].level_mask = usage_stats.stat[31].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l11/mobys/fred_pokitaru.c b/src/overlays/l11/mobys/fred_pokitaru.c index 8abde0b458..74be6846c2 100644 --- a/src/overlays/l11/mobys/fred_pokitaru.c +++ b/src/overlays/l11/mobys/fred_pokitaru.c @@ -104,12 +104,13 @@ void fred_pokitaru_update(struct Moby *moby) { if (alternate_item_available[1] == 0 && discount_purchase_pricing[0] == 0) { if (fast_vec_dist(&moby->pos, hero.motion.pos.f) < 4.0f) { int help_frame_delta = - scale_game_frames(D_0015EEA4) - help_records[0x86].unk2 * 600; + scale_game_frames(D_0015EEA4) - help_records[0x86].latest_time_bucket * 600; if ((int)(scale_game_frames(18) * 60.0f) < help_frame_delta || - help_records[0x86].unk2 * 600 == 0) { + help_records[0x86].latest_time_bucket * 600 == 0) { help_request(0x2B03, 0x86); - } else if (scale_game_frames(D_0015EEA4) / 600 > help_records[0x86].unk2) { - help_records[0x86].unk2 = scale_game_frames(D_0015EEA4) / 600; + } else if (scale_game_frames(D_0015EEA4) / 600 > + help_records[0x86].latest_time_bucket) { + help_records[0x86].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } } } diff --git a/src/overlays/l11/mobys/jet_fighter.c b/src/overlays/l11/mobys/jet_fighter.c index a299f97370..4b66a80e60 100644 --- a/src/overlays/l11/mobys/jet_fighter.c +++ b/src/overlays/l11/mobys/jet_fighter.c @@ -544,8 +544,8 @@ void draw_ship_hud(struct Moby *moby) { if (help_records[0x58].count < 0xFFFF) { help_records[0x58].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > help_records[0x58].unk2) { - help_records[0x58].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > help_records[0x58].latest_time_bucket) { + help_records[0x58].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } help_records[0x58].level_mask = help_records[0x58].level_mask | (1 << current_level_index) | 0x80000000; @@ -900,8 +900,8 @@ void update_player_ship_flight(struct Moby *ship_moby, ShipVars_2838 *ship_vars) if (usage_stats.stat[28].count < 0xFFFF) { usage_stats.stat[28].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[28].unk2) { - usage_stats.stat[28].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[28].latest_time_bucket) { + usage_stats.stat[28].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[28].level_mask = usage_stats.stat[28].level_mask | (1 << current_level_index) | 0x80000000; @@ -1357,13 +1357,14 @@ void jet_fighter_update(struct Moby *moby) { try_set_help_message(7, 0x2B09); } else { frames_since_help_timestamp = - scale_game_frames(D_0015EEA4) - help_records[0x3C].unk2 * 600; + scale_game_frames(D_0015EEA4) - help_records[0x3C].latest_time_bucket * 600; if (frames_since_help_timestamp > (int)((float)scale_game_frames(0x12) * 60.0f) || - help_records[0x3C].unk2 * 600 == 0) { + help_records[0x3C].latest_time_bucket * 600 == 0) { help_request(0x2AFA, 0x3C); - } else if (scale_game_frames(D_0015EEA4) / 600 > help_records[0x3C].unk2) { - help_records[0x3C].unk2 = scale_game_frames(D_0015EEA4) / 600; + } else if (scale_game_frames(D_0015EEA4) / 600 > + help_records[0x3C].latest_time_bucket) { + help_records[0x3C].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } } if (item_available[7] != 0 && (D_0013CAE4 & 0x10)) { diff --git a/src/overlays/l11/mobys/link_triggered_moby_turn.c b/src/overlays/l11/mobys/link_triggered_moby_turn.c index 4b73b3e38a..1f25bb6d1e 100644 --- a/src/overlays/l11/mobys/link_triggered_moby_turn.c +++ b/src/overlays/l11/mobys/link_triggered_moby_turn.c @@ -9,7 +9,7 @@ #include "rnc/mobys/moby_spawn.h" #include "rnc/audio/voice_alloc.h" #include "rnc/overlay/shared/world/level_labels.h" -#include "rnc/overlay/shared/mobys/test_linked_moby_turn_trigger.h" +#include "rnc/overlay/shared/mobys.h" extern float fast_add_rotations(float, float); diff --git a/src/overlays/l11/mobys/seesaw_platform.c b/src/overlays/l11/mobys/seesaw_platform.c index 276e60334b..71f0fd52dc 100644 --- a/src/overlays/l11/mobys/seesaw_platform.c +++ b/src/overlays/l11/mobys/seesaw_platform.c @@ -10,7 +10,7 @@ #include "rnc/math/asm_helpers.h" #include "rnc/mobys/moby_spawn.h" #include "rnc/overlay/shared/game/unlock_planet.h" -#include "rnc/overlay/l11/hero/hero_set_state.h" +#include "rnc/overlay/l11/hero.h" extern float fast_add_rotations(float, float); diff --git a/src/overlays/l12/hero/hero_set_state.c b/src/overlays/l12/hero/hero_set_state.c index b114a48779..6b2cfbf87e 100644 --- a/src/overlays/l12/hero/hero_set_state.c +++ b/src/overlays/l12/hero/hero_set_state.c @@ -405,8 +405,8 @@ int hero_set_state(int a, int b) { } { struct UsageStat *h = usage_stats.stat; - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } { struct Hero *q = &hero; @@ -420,8 +420,8 @@ int hero_set_state(int a, int b) { } { struct UsageStat *h = usage_stats.stat; - if (scale_game_frames(D_0015EEA4) / 600 > h[29].unk2) { - h[29].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[29].latest_time_bucket) { + h[29].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[29].level_mask = h[29].level_mask | (1 << current_level_index) | 0x80000000; } @@ -703,8 +703,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -749,8 +749,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -1328,8 +1328,8 @@ int hero_set_state(int a, int b) { if (h[0].count <= 0xFFFE) { h[0].count = h[0].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[0].unk2) { - h[0].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[0].latest_time_bucket) { + h[0].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[0].level_mask = h[0].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -1358,16 +1358,16 @@ int hero_set_state(int a, int b) { if (h[1].count <= 0xFFFE) { h[1].count = h[1].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[1].unk2) { - h[1].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[1].latest_time_bucket) { + h[1].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[1].level_mask = h[1].level_mask | (1 << current_level_index) | 0x80000000; item_usage_base = (struct UsageStat *)item_usage; if (item_usage_base[37].count <= 0xFFFE) { item_usage_base[37].count = item_usage_base[37].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > item_usage_base[37].unk2) { - item_usage_base[37].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > item_usage_base[37].latest_time_bucket) { + item_usage_base[37].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } item_usage_base[37].level_mask = item_usage_base[37].level_mask | (1 << current_level_index) | 0x80000000; @@ -1406,8 +1406,8 @@ int hero_set_state(int a, int b) { if (h[8].count <= 0xFFFE) { h[8].count = h[8].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[8].unk2) { - h[8].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[8].latest_time_bucket) { + h[8].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } q = &hero; h[8].level_mask = h[8].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l12/hero/update_hero_motion_for_current_state.c b/src/overlays/l12/hero/update_hero_motion_for_current_state.c index 6b3e754d1f..084c09790a 100644 --- a/src/overlays/l12/hero/update_hero_motion_for_current_state.c +++ b/src/overlays/l12/hero/update_hero_motion_for_current_state.c @@ -6,7 +6,7 @@ #include "rnc/hero/hero_state.h" #include "rnc/globals.h" #include "asm.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/world/collision.h" #include "rnc/hero/hero.h" #include "rnc/game/usage_stats.h" @@ -714,8 +714,9 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[18].count++; } t = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[18].unk2 < t) { - usage_stats.stat[18].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[18].latest_time_bucket < t) { + usage_stats.stat[18].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } D_L12_0015F688 = -1; usage_stats.stat[18].level_mask = @@ -980,8 +981,9 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[11].count++; } use_seconds = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[11].unk2 < use_seconds) { - usage_stats.stat[11].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[11].latest_time_bucket < use_seconds) { + usage_stats.stat[11].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[11].level_mask = usage_stats.stat[11].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l12/hero/update_hero_state_transitions.c b/src/overlays/l12/hero/update_hero_state_transitions.c index 602f18ac9c..d6281997c6 100644 --- a/src/overlays/l12/hero/update_hero_state_transitions.c +++ b/src/overlays/l12/hero/update_hero_state_transitions.c @@ -6,7 +6,7 @@ #include "asm.h" #include "qcopy.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/input/pad_state.h" #include "rnc/hero/hero.h" #include "rnc/game/usage_stats.h" @@ -208,8 +208,10 @@ void update_hero_state_transitions(void) { if (usage_stats.stat[31].count < 0xFFFF) { usage_stats.stat[31].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[31].unk2) { - usage_stats.stat[31].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[31].latest_time_bucket) { + usage_stats.stat[31].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[31].level_mask = usage_stats.stat[31].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l12/level_class_tables.c b/src/overlays/l12/level_class_tables.c index 37a98bc433..de3335d2bf 100644 --- a/src/overlays/l12/level_class_tables.c +++ b/src/overlays/l12/level_class_tables.c @@ -1,108 +1,29 @@ -#include "rnc/mobys/quad_moby_update.h" -#include "rnc/overlay/l12/mobys/blarg_helicopter.h" -#include "rnc/overlay/l12/mobys/blarg_trooper.h" -#include "rnc/overlay/l12/mobys/clip_volume_scene_trigger.h" -#include "rnc/overlay/l12/mobys/crane_arm.h" -#include "rnc/overlay/l12/mobys/cutscene_camera_target.h" -#include "rnc/overlay/l12/mobys/edwina.h" -#include "rnc/overlay/l12/mobys/effects_draw_trigger.h" -#include "rnc/overlay/l12/mobys/helicopter.h" -#include "rnc/overlay/l12/mobys/help_hints.h" -#include "rnc/overlay/l12/mobys/homing_mine.h" -#include "rnc/overlay/l12/mobys/homing_mine_spawner.h" +#include "rnc/mobys.h" +#include "rnc/overlay/l12/mobys.h" #include "rnc/overlay/l12/mobys/hoven_anklebiter.h" -#include "rnc/overlay/l12/mobys/hoven_turret.h" -#include "rnc/overlay/l12/mobys/jittered_quad_layers.h" -#include "rnc/overlay/l12/mobys/lamp.h" #include "rnc/overlay/l12/mobys/miner.h" -#include "rnc/overlay/l12/mobys/oscillating_target_link.h" -#include "rnc/overlay/l12/mobys/planetbuster_maximus_part.h" -#include "rnc/overlay/l12/mobys/platform.h" -#include "rnc/overlay/l12/mobys/rocket.h" -#include "rnc/overlay/l12/mobys/scrolling_texture_layers.h" -#include "rnc/overlay/l12/mobys/water_reservoir.h" -#include "rnc/overlay/l12/mobys/water_tile.h" -#include "rnc/overlay/shared/audio/emitters/box_emitter.h" -#include "rnc/overlay/shared/audio/emitters/distance_emitter.h" -#include "rnc/overlay/shared/audio/emitters/listener_emitter.h" -#include "rnc/overlay/shared/audio/emitters/music_switch_emitter.h" -#include "rnc/overlay/shared/audio/emitters/reverb_box_emitter.h" -#include "rnc/overlay/shared/camera/follow_camera_setup.h" -#include "rnc/overlay/shared/camera/follow_camera_update.h" -#include "rnc/overlay/shared/camera/hero_aligned_camera.h" -#include "rnc/overlay/shared/camera/moby_controlled_camera.h" -#include "rnc/overlay/shared/camera/orbit_camera.h" +#include "rnc/overlay/shared/audio/emitters.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/camera/scripted_camera.h" #include "rnc/overlay/shared/camera/swing_volume_camera.h" -#include "rnc/overlay/shared/camera/target_tracking_camera.h" -#include "rnc/overlay/shared/enemies/blarg_commander.h" -#include "rnc/overlay/shared/enemies/blarg_trooper_projectile.h" -#include "rnc/overlay/shared/enemies/ground_melee_enemy.h" -#include "rnc/overlay/shared/enemies/sandmouse.h" -#include "rnc/overlay/shared/enemies/sandmouse_house.h" -#include "rnc/overlay/shared/enemies/sandmouse_projectile.h" -#include "rnc/overlay/shared/mobys/camera_object.h" -#include "rnc/overlay/shared/mobys/falling_moby_update.h" -#include "rnc/overlay/shared/mobys/remove_when_near_hero_update.h" -#include "rnc/overlay/shared/pickups/buried_bolts.h" -#include "rnc/overlay/shared/pickups/crate.h" -#include "rnc/overlay/shared/pickups/crate_fragment.h" +#include "rnc/overlay/shared/enemies.h" +#include "rnc/overlay/shared/mobys.h" +#include "rnc/overlay/shared/pickups.h" #include "rnc/overlay/shared/pickups/infobot.h" -#include "rnc/overlay/shared/pickups/nanotech_ball.h" -#include "rnc/overlay/shared/pickups/pilots_helmet.h" -#include "rnc/overlay/shared/pickups/weapon_ammo.h" -#include "rnc/overlay/shared/props/escalator.h" +#include "rnc/overlay/shared/props.h" #include "rnc/overlay/shared/props/grow_and_fade_out.h" -#include "rnc/overlay/shared/props/hydrodisplacer.h" -#include "rnc/overlay/shared/props/hydrodisplacer_faucet.h" -#include "rnc/overlay/shared/props/moby_state_trigger.h" #include "rnc/overlay/shared/props/rock.h" -#include "rnc/overlay/shared/props/swingshot_versatarget.h" -#include "rnc/overlay/shared/props/timed_activation_pads.h" -#include "rnc/overlay/shared/props/tumbling_part.h" -#include "rnc/overlay/shared/rendering/effects/debris.h" +#include "rnc/overlay/shared/rendering/effects.h" #include "rnc/overlay/shared/rendering/effects/explosion_light.h" -#include "rnc/overlay/shared/rendering/effects/glow_particle.h" #include "rnc/overlay/shared/rendering/effects/ground_particle_scatter.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" -#include "rnc/overlay/shared/vendor/vendor.h" -#include "rnc/overlay/shared/vendor/vendor_orb.h" -#include "rnc/overlay/shared/weapons/blaster.h" -#include "rnc/overlay/shared/weapons/blaster_shot.h" -#include "rnc/overlay/shared/weapons/bomb_glove.h" +#include "rnc/overlay/shared/vendor.h" +#include "rnc/overlay/shared/weapons.h" #include "rnc/overlay/shared/weapons/bomb_glove_bomb.h" -#include "rnc/overlay/shared/weapons/decoy.h" -#include "rnc/overlay/shared/weapons/decoy_glove.h" #include "rnc/overlay/shared/weapons/devastator.h" -#include "rnc/overlay/shared/weapons/doom_bot.h" -#include "rnc/overlay/shared/weapons/drone.h" -#include "rnc/overlay/shared/weapons/glove_of_doom.h" -#include "rnc/overlay/shared/weapons/glove_of_doom_bomb.h" -#include "rnc/overlay/shared/weapons/gold_devastator_missile.h" -#include "rnc/overlay/shared/weapons/helipack.h" -#include "rnc/overlay/shared/weapons/linked_moby_states_update.h" -#include "rnc/overlay/shared/weapons/metal_detector.h" #include "rnc/overlay/shared/weapons/mine.h" -#include "rnc/overlay/shared/weapons/mine_glove.h" -#include "rnc/overlay/shared/weapons/morphoray.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken_feather.h" -#include "rnc/overlay/shared/weapons/morphoray_target_effect.h" -#include "rnc/overlay/shared/weapons/pyrocitor.h" -#include "rnc/overlay/shared/weapons/ryno.h" -#include "rnc/overlay/shared/weapons/ryno_rocket.h" #include "rnc/overlay/shared/weapons/suckcannon.h" -#include "rnc/overlay/shared/weapons/swingshot.h" #include "rnc/overlay/shared/weapons/swingshot_hook.h" -#include "rnc/overlay/shared/weapons/taunter.h" -#include "rnc/overlay/shared/weapons/tesla_claw.h" -#include "rnc/overlay/shared/weapons/thruster_pack_flame.h" -#include "rnc/overlay/shared/weapons/trailing_flame.h" -#include "rnc/overlay/shared/weapons/trespasser.h" -#include "rnc/overlay/shared/weapons/turret_rocket.h" -#include "rnc/overlay/shared/weapons/visibomb.h" -#include "rnc/overlay/shared/weapons/visibomb_missile.h" -#include "rnc/overlay/shared/weapons/walloper.h" /* The level's moby classes, camera types and sound emitter types: the tables the executable's code looks ids up in (sections lvl.vtbl, lvl.camvtbl and lvl.sndvtbl). */ diff --git a/src/overlays/l12/mobys/hoven_anklebiter.c b/src/overlays/l12/mobys/hoven_anklebiter.c index dbd72f81be..493f9aa0ec 100644 --- a/src/overlays/l12/mobys/hoven_anklebiter.c +++ b/src/overlays/l12/mobys/hoven_anklebiter.c @@ -19,7 +19,7 @@ #include "rnc/overlay/l12/mobys/hoven_anklebiter.h" #include "rnc/overlay/shared/math/random/random_int_between.h" #include "rnc/overlay/shared/mobys/count_active_moby_group_members.h" -#include "rnc/overlay/shared/mobys/find_point_ahead.h" +#include "rnc/overlay/shared/mobys.h" #include "rnc/overlay/shared/mobys/test_path_segment_strict_crossing.h" #include "rnc/overlay/shared/weapons/suckcannon.h" diff --git a/src/overlays/l12/mobys/scrolling_texture_layers.c b/src/overlays/l12/mobys/scrolling_texture_layers.c index 8c8586e341..3f9f585487 100644 --- a/src/overlays/l12/mobys/scrolling_texture_layers.c +++ b/src/overlays/l12/mobys/scrolling_texture_layers.c @@ -10,7 +10,7 @@ #include "rnc/runtime/callbacks/add_draw_callback.h" #include "rnc/ui/text/font/font_queue_vu_state.h" #include "rnc/overlay/shared/rendering/mesh_batch.h" -#include "rnc/overlay/shared/rendering/effects/draw_scrolled_mesh_batch.h" +#include "rnc/overlay/shared/rendering/effects.h" #include "rnc/rendering/effect_texture.h" typedef struct Moby Moby; diff --git a/src/overlays/l13/mobys/asteroid.c b/src/overlays/l13/mobys/asteroid.c index 4d8a7aa4bf..6245b8e3ba 100644 --- a/src/overlays/l13/mobys/asteroid.c +++ b/src/overlays/l13/mobys/asteroid.c @@ -15,7 +15,7 @@ #include "rnc/overlay/shared/world/level_labels.h" #include "rnc/math/random.h" #include "rnc/overlay/shared/math/random/random_int_between.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/sdk/libc/stdlib.h" enum AsteroidSpinAxis { SPIN_AXIS_X = 0x0, diff --git a/src/overlays/l13/mobys/blarg_space_fighter.c b/src/overlays/l13/mobys/blarg_space_fighter.c index 285b2eba3e..8b9f1d0727 100644 --- a/src/overlays/l13/mobys/blarg_space_fighter.c +++ b/src/overlays/l13/mobys/blarg_space_fighter.c @@ -9,10 +9,10 @@ #include "rnc/math/asm_helpers.h" #include "rnc/overlay/shared/rendering/effects/spawn_type_10_particle.h" #include "rnc/audio/voice_alloc.h" -#include "rnc/overlay/shared/enemies/blarg_ship_shot.h" -#include "rnc/overlay/shared/pickups/fighter_jet_crate.h" +#include "rnc/overlay/shared/enemies.h" +#include "rnc/overlay/shared/pickups.h" #include "rnc/overlay/shared/rendering/effects/spawn_explosion.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/sdk/libc/stdlib.h" extern char *find_moby_hit(void *, int, int) __asm__("FUN_L00_0025a420"); diff --git a/src/overlays/l13/mobys/controller_linked_gate.c b/src/overlays/l13/mobys/controller_linked_gate.c index 526c238dc2..fb9a9477ec 100644 --- a/src/overlays/l13/mobys/controller_linked_gate.c +++ b/src/overlays/l13/mobys/controller_linked_gate.c @@ -4,7 +4,7 @@ #include "rnc/mobys/moby.h" #include "rnc/math/asm_helpers.h" #include "rnc/overlay/shared/rendering/set_moby_color.h" -#include "rnc/overlay/shared/mobys/allocate_moby_animation_slot.h" +#include "rnc/overlay/shared/mobys.h" extern int D_L13_0015FFD8; diff --git a/src/overlays/l13/mobys/forcefield_tower.c b/src/overlays/l13/mobys/forcefield_tower.c index 74a4f2a4c4..c91a6087fa 100644 --- a/src/overlays/l13/mobys/forcefield_tower.c +++ b/src/overlays/l13/mobys/forcefield_tower.c @@ -16,7 +16,7 @@ #include "rnc/math/random.h" #include "rnc/overlay/shared/audio/voices/voice_is_playing.h" #include "rnc/overlay/shared/math/random/random_int_between.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/sdk/debug.h" extern char *find_moby_hit(void *, int, int) __asm__("FUN_L00_0025a420"); diff --git a/src/overlays/l13/mobys/gemlik_scene_controller.c b/src/overlays/l13/mobys/gemlik_scene_controller.c index 0a21df98e4..2e9f51ed05 100644 --- a/src/overlays/l13/mobys/gemlik_scene_controller.c +++ b/src/overlays/l13/mobys/gemlik_scene_controller.c @@ -9,7 +9,7 @@ #include "rnc/game/item_state.h" #include "rnc/overlay/shared/world/level_labels.h" #include "rnc/mobys/moby_spawn.h" -#include "rnc/overlay/shared/game/initialize_level_transition_with_audio.h" +#include "rnc/overlay/shared/game.h" extern int D_L13_0015F5C4; diff --git a/src/overlays/l13/mobys/moby_path_follower.c b/src/overlays/l13/mobys/moby_path_follower.c index efd7153a53..f0c829d490 100644 --- a/src/overlays/l13/mobys/moby_path_follower.c +++ b/src/overlays/l13/mobys/moby_path_follower.c @@ -5,7 +5,7 @@ #include "rnc/overlay/shared/world/level_labels.h" #include "qcopy.h" #include "rnc/mobys/moby_spawn.h" -#include "rnc/overlay/shared/mobys/compute_advanced_moby_path_position.h" +#include "rnc/overlay/shared/mobys.h" extern float fast_vec_dist(void *, void *); diff --git a/src/overlays/l13/mobys/qwarks_starfighter_shield.c b/src/overlays/l13/mobys/qwarks_starfighter_shield.c index 23738730a3..cadb04995f 100644 --- a/src/overlays/l13/mobys/qwarks_starfighter_shield.c +++ b/src/overlays/l13/mobys/qwarks_starfighter_shield.c @@ -6,7 +6,7 @@ #include "rnc/math/asm_helpers.h" #include "rnc/overlay/shared/hero/copy_hero_moby_field_38.h" #include "rnc/overlay/shared/mobys/evaluate_moby_animation_pose.h" -#include "rnc/overlay/shared/mobys/allocate_moby_animation_slot.h" +#include "rnc/overlay/shared/mobys.h" extern void mark_moby_for_removal(void *) __asm__("FUN_0020c828"); diff --git a/src/overlays/l14/hero/hero_set_state.c b/src/overlays/l14/hero/hero_set_state.c index 07d23a2930..684d2aca61 100644 --- a/src/overlays/l14/hero/hero_set_state.c +++ b/src/overlays/l14/hero/hero_set_state.c @@ -448,8 +448,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -494,8 +494,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -1153,8 +1153,8 @@ int hero_set_state(int a, int b) { if (h[0].count <= 0xFFFE) { h[0].count = h[0].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[0].unk2) { - h[0].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[0].latest_time_bucket) { + h[0].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[0].level_mask = h[0].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -1183,16 +1183,17 @@ int hero_set_state(int a, int b) { if (h[1].count <= 0xFFFE) { h[1].count = h[1].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[1].unk2) { - h[1].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[1].latest_time_bucket) { + h[1].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[1].level_mask = h[1].level_mask | (1 << current_level_index) | 0x80000000; item_usage_stats_base = (struct UsageStat *)item_usage; if (item_usage_stats_base[37].count <= 0xFFFE) { item_usage_stats_base[37].count = item_usage_stats_base[37].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > item_usage_stats_base[37].unk2) { - item_usage_stats_base[37].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + item_usage_stats_base[37].latest_time_bucket) { + item_usage_stats_base[37].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } item_usage_stats_base[37].level_mask = item_usage_stats_base[37].level_mask | (1 << current_level_index) | 0x80000000; @@ -1231,8 +1232,8 @@ int hero_set_state(int a, int b) { if (h[8].count <= 0xFFFE) { h[8].count = h[8].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[8].unk2) { - h[8].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[8].latest_time_bucket) { + h[8].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } q = &hero; h[8].level_mask = h[8].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l14/hero/process_hero_state_transitions.c b/src/overlays/l14/hero/process_hero_state_transitions.c index 57557da4b9..af0fe8fa2e 100644 --- a/src/overlays/l14/hero/process_hero_state_transitions.c +++ b/src/overlays/l14/hero/process_hero_state_transitions.c @@ -5,7 +5,7 @@ #include "asm.h" #include "qcopy.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/math/quad.h" #include "rnc/input/pad_state.h" #include "rnc/hero/hero.h" @@ -225,8 +225,10 @@ void process_hero_state_transitions(void) { if (usage_stats.stat[31].count < 0xFFFF) { usage_stats.stat[31].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[31].unk2) { - usage_stats.stat[31].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[31].latest_time_bucket) { + usage_stats.stat[31].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[31].level_mask = usage_stats.stat[31].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l14/hero/update_hero_motion_by_state.c b/src/overlays/l14/hero/update_hero_motion_by_state.c index 4b2ec667e0..f659914564 100644 --- a/src/overlays/l14/hero/update_hero_motion_by_state.c +++ b/src/overlays/l14/hero/update_hero_motion_by_state.c @@ -6,7 +6,7 @@ #include "rnc/hero/hero.h" #include "rnc/globals.h" #include "asm.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/math/quad.h" #include "rnc/overlay/shared/mobys/entities.h" #include "rnc/game/usage_stats.h" @@ -583,8 +583,9 @@ void update_hero_motion_by_state(void) { usage_stats.stat[18].count++; } t = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[18].unk2 < t) { - usage_stats.stat[18].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[18].latest_time_bucket < t) { + usage_stats.stat[18].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } D_L14_0015F688 = -1; usage_stats.stat[18].level_mask = diff --git a/src/overlays/l14/mobys/path_lightning_controller.c b/src/overlays/l14/mobys/path_lightning_controller.c index 9a9878d52d..2a4dd0db09 100644 --- a/src/overlays/l14/mobys/path_lightning_controller.c +++ b/src/overlays/l14/mobys/path_lightning_controller.c @@ -12,9 +12,9 @@ #include "rnc/overlay/shared/math/random/random_int_between.h" #include "rnc/math/random.h" #include "sda.h" -#include "rnc/overlay/shared/game/initialize_level_transition_with_audio.h" +#include "rnc/overlay/shared/game.h" #include "rnc/overlay/shared/math/random/random_vector.h" -#include "rnc/overlay/shared/mobys/show_tracked_moby.h" +#include "rnc/overlay/shared/mobys.h" extern char D_L14_001674C0[]; diff --git a/src/overlays/l14/mobys/platform.c b/src/overlays/l14/mobys/platform.c index 007ec5d2e2..6eb51a4842 100644 --- a/src/overlays/l14/mobys/platform.c +++ b/src/overlays/l14/mobys/platform.c @@ -28,7 +28,7 @@ #include "rnc/overlay/shared/rendering/effects/glow_quads_draw.h" #include "rnc/world/collision/collision_line.h" #include "qzero.h" -#include "rnc/audio/voices/allocate_voice_slot.h" +#include "rnc/audio/voices.h" extern float D_L14_0015F580[] MACRO_ADDR; diff --git a/src/overlays/l14/mobys/racer.c b/src/overlays/l14/mobys/racer.c index ff1170b208..b1f0f95bdb 100644 --- a/src/overlays/l14/mobys/racer.c +++ b/src/overlays/l14/mobys/racer.c @@ -12,7 +12,7 @@ #include "sda.h" #include "rnc/overlay/l14/mobys/racer_globals.h" #include "rnc/mobys/moby_spawn.h" -#include "rnc/overlay/l14/mobys/racer_path_and_weapon.h" +#include "rnc/overlay/l14/mobys.h" #include "rnc/overlay/shared/enemies/path_or_ballistic_debris.h" #include "rnc/overlay/shared/enemies/plasmabot_death_debris.h" diff --git a/src/overlays/l14/mobys/rocket_strike_fighter.c b/src/overlays/l14/mobys/rocket_strike_fighter.c index d4a0e44ca6..1c0f782408 100644 --- a/src/overlays/l14/mobys/rocket_strike_fighter.c +++ b/src/overlays/l14/mobys/rocket_strike_fighter.c @@ -25,9 +25,9 @@ #include "rnc/mobys/moby_spawn.h" #include "rnc/overlay/shared/math/random/random_int_between.h" #include "rnc/overlay/shared/mobys/select_auto_aim_target_moby.h" -#include "rnc/overlay/shared/props/initialize_energy_sphere_holder_vars.h" +#include "rnc/overlay/shared/props.h" #include "rnc/overlay/shared/rendering/effects/spawn_explosion.h" -#include "rnc/overlay/shared/vendor/flag_vendor_item.h" +#include "rnc/overlay/shared/vendor.h" extern float vector_length_xy(void *); diff --git a/src/overlays/l14/path_camera.c b/src/overlays/l14/path_camera.c index 6c69362fc7..6469fafa94 100644 --- a/src/overlays/l14/path_camera.c +++ b/src/overlays/l14/path_camera.c @@ -11,7 +11,7 @@ #include "rnc/overlay/shared/world/level_path.h" #include "rnc/overlay/shared/world/cuboid.h" #include "rnc/camera/update_cam.h" -#include "rnc/overlay/l14/mobys/racer_path_and_weapon.h" +#include "rnc/overlay/l14/mobys.h" #include "rnc/overlay/shared/camera/path_flythrough_camera.h" #include "rnc/overlay/shared/rendering/effects/spawn_explosion.h" diff --git a/src/overlays/l15/hero/hero_set_state.c b/src/overlays/l15/hero/hero_set_state.c index c4382a5e6f..393c7ebf60 100644 --- a/src/overlays/l15/hero/hero_set_state.c +++ b/src/overlays/l15/hero/hero_set_state.c @@ -380,8 +380,8 @@ int hero_set_state(int a, int b) { { struct UsageStat *h = usage_stats.stat; struct Hero *q; - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -394,8 +394,8 @@ int hero_set_state(int a, int b) { { struct UsageStat *h = usage_stats.stat; char *v; - if (scale_game_frames(D_0015EEA4) / 600 > h[29].unk2) { - h[29].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[29].latest_time_bucket) { + h[29].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[29].level_mask = h[29].level_mask | (1 << current_level_index) | 0x80000000; v = (char *)&hero.motion.momentum; @@ -633,8 +633,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -679,8 +679,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -1299,8 +1299,8 @@ int hero_set_state(int a, int b) { if (h[0].count <= 0xFFFE) { h[0].count = h[0].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[0].unk2) { - h[0].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[0].latest_time_bucket) { + h[0].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[0].level_mask = h[0].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -1329,16 +1329,16 @@ int hero_set_state(int a, int b) { if (h[1].count <= 0xFFFE) { h[1].count = h[1].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[1].unk2) { - h[1].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[1].latest_time_bucket) { + h[1].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[1].level_mask = h[1].level_mask | (1 << current_level_index) | 0x80000000; item_usage_base = (struct UsageStat *)item_usage; if (item_usage_base[37].count <= 0xFFFE) { item_usage_base[37].count = item_usage_base[37].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > item_usage_base[37].unk2) { - item_usage_base[37].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > item_usage_base[37].latest_time_bucket) { + item_usage_base[37].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } item_usage_base[37].level_mask = item_usage_base[37].level_mask | (1 << current_level_index) | 0x80000000; @@ -1377,8 +1377,8 @@ int hero_set_state(int a, int b) { if (h[8].count <= 0xFFFE) { h[8].count = h[8].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[8].unk2) { - h[8].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[8].latest_time_bucket) { + h[8].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } q = &hero; h[8].level_mask = h[8].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l15/hero/update_hero_motion_for_current_state.c b/src/overlays/l15/hero/update_hero_motion_for_current_state.c index 24eed81293..019c0acca8 100644 --- a/src/overlays/l15/hero/update_hero_motion_for_current_state.c +++ b/src/overlays/l15/hero/update_hero_motion_for_current_state.c @@ -651,8 +651,9 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[18].count++; } t = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[18].unk2 < t) { - usage_stats.stat[18].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[18].latest_time_bucket < t) { + usage_stats.stat[18].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } D_L15_0015F688 = -1; usage_stats.stat[18].level_mask = @@ -873,8 +874,9 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[11].count++; } use_seconds = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[11].unk2 < use_seconds) { - usage_stats.stat[11].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[11].latest_time_bucket < use_seconds) { + usage_stats.stat[11].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[11].level_mask = usage_stats.stat[11].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l15/hero/update_hero_state_machine.c b/src/overlays/l15/hero/update_hero_state_machine.c index 2e9f5aa7cc..b627e5f1a4 100644 --- a/src/overlays/l15/hero/update_hero_state_machine.c +++ b/src/overlays/l15/hero/update_hero_state_machine.c @@ -6,7 +6,7 @@ #include "asm.h" #include "qcopy.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/input/pad_state.h" #include "rnc/hero/hero.h" #include "rnc/game/usage_stats.h" @@ -224,8 +224,10 @@ void update_hero_state_machine(void) { if (usage_stats.stat[31].count < 0xFFFF) { usage_stats.stat[31].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[31].unk2) { - usage_stats.stat[31].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[31].latest_time_bucket) { + usage_stats.stat[31].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[31].level_mask = usage_stats.stat[31].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l15/moby_follow_camera.c b/src/overlays/l15/moby_follow_camera.c index d59931d651..d50171ebcc 100644 --- a/src/overlays/l15/moby_follow_camera.c +++ b/src/overlays/l15/moby_follow_camera.c @@ -6,7 +6,7 @@ #include "rnc/math/asm_helpers.h" #include "rnc/camera/follow_cam.h" #include "rnc/overlay/shared/rendering/culling/test_point_in_transformed_unit_cylinder.h" -#include "rnc/overlay/shared/camera/follow_camera_set_distance.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/camera/set_nonzero_follow_camera_parameters.h" #include "rnc/rendering/clip_volume.h" diff --git a/src/overlays/l15/mobys/bolt_grabber.c b/src/overlays/l15/mobys/bolt_grabber.c index 12d34cb471..035361cc7b 100644 --- a/src/overlays/l15/mobys/bolt_grabber.c +++ b/src/overlays/l15/mobys/bolt_grabber.c @@ -8,7 +8,7 @@ #include "rnc/overlay/shared/mobys/select_auto_aim_target_moby.h" #include "rnc/save/memcard_save_data.h" #include "rnc/overlay/shared/pickups/infobot.h" -#include "rnc/overlay/shared/enemies/blarg_ship_rocket.h" +#include "rnc/overlay/shared/enemies.h" #include "rnc/overlay/shared/game/unlock_planet.h" extern void mark_moby_for_removal(void *) __asm__("func_0020C828"); diff --git a/src/overlays/l15/mobys/poison_vessel.c b/src/overlays/l15/mobys/poison_vessel.c index be6592c7cc..40b377d117 100644 --- a/src/overlays/l15/mobys/poison_vessel.c +++ b/src/overlays/l15/mobys/poison_vessel.c @@ -10,7 +10,7 @@ #include "rnc/game/level_state.h" #include "rnc/overlay/l15/mobys/poison_vessel_globals.h" #include "rnc/overlay/shared/game/unlock_planet.h" -#include "rnc/overlay/shared/mobys/get_moby_pvars_link.h" +#include "rnc/overlay/shared/mobys.h" extern void *create_moby() __asm__("FUN_0020c4f8"); diff --git a/src/overlays/l16/hero/apply_hero_ground_material_effects.c b/src/overlays/l16/hero/apply_hero_ground_material_effects.c index 1a6e6d261f..0844d6dd0e 100644 --- a/src/overlays/l16/hero/apply_hero_ground_material_effects.c +++ b/src/overlays/l16/hero/apply_hero_ground_material_effects.c @@ -4,7 +4,7 @@ #include "rnc/hero/hero.h" #include "rnc/globals.h" #include "asm.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/world/collision.h" #include "rnc/data_labels.h" #include "rnc/math/fast_math.h" diff --git a/src/overlays/l16/hero/hero_set_state.c b/src/overlays/l16/hero/hero_set_state.c index c229e0c790..921b18e374 100644 --- a/src/overlays/l16/hero/hero_set_state.c +++ b/src/overlays/l16/hero/hero_set_state.c @@ -425,8 +425,8 @@ int hero_set_state(int a, int b) { { struct UsageStat *h = usage_stats.stat; struct Hero *q; - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -439,8 +439,8 @@ int hero_set_state(int a, int b) { { struct UsageStat *h = usage_stats.stat; char *v; - if (scale_game_frames(D_0015EEA4) / 600 > h[29].unk2) { - h[29].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[29].latest_time_bucket) { + h[29].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[29].level_mask = h[29].level_mask | (1 << current_level_index) | 0x80000000; v = (char *)&hero.motion.momentum; @@ -864,8 +864,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -910,8 +910,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -1594,8 +1594,8 @@ int hero_set_state(int a, int b) { if (h[0].count <= 0xFFFE) { h[0].count = h[0].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[0].unk2) { - h[0].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[0].latest_time_bucket) { + h[0].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[0].level_mask = h[0].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -1624,16 +1624,17 @@ int hero_set_state(int a, int b) { if (h[1].count <= 0xFFFE) { h[1].count = h[1].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[1].unk2) { - h[1].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[1].latest_time_bucket) { + h[1].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[1].level_mask = h[1].level_mask | (1 << current_level_index) | 0x80000000; item_usage_stats_base = (struct UsageStat *)item_usage; if (item_usage_stats_base[37].count <= 0xFFFE) { item_usage_stats_base[37].count = item_usage_stats_base[37].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > item_usage_stats_base[37].unk2) { - item_usage_stats_base[37].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + item_usage_stats_base[37].latest_time_bucket) { + item_usage_stats_base[37].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } item_usage_stats_base[37].level_mask = item_usage_stats_base[37].level_mask | (1 << current_level_index) | 0x80000000; @@ -1672,8 +1673,8 @@ int hero_set_state(int a, int b) { if (h[8].count <= 0xFFFE) { h[8].count = h[8].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[8].unk2) { - h[8].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[8].latest_time_bucket) { + h[8].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } q = &hero; h[8].level_mask = h[8].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l16/hero/update_hero_motion_for_current_state.c b/src/overlays/l16/hero/update_hero_motion_for_current_state.c index 7baa569aa2..16d9f4dfc3 100644 --- a/src/overlays/l16/hero/update_hero_motion_for_current_state.c +++ b/src/overlays/l16/hero/update_hero_motion_for_current_state.c @@ -339,8 +339,9 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[18].count++; } t = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[18].unk2 < t) { - usage_stats.stat[18].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[18].latest_time_bucket < t) { + usage_stats.stat[18].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } D_L16_0015F688 = -1; usage_stats.stat[18].level_mask = @@ -602,8 +603,9 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[11].count++; } use_seconds = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[11].unk2 < use_seconds) { - usage_stats.stat[11].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[11].latest_time_bucket < use_seconds) { + usage_stats.stat[11].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[11].level_mask = usage_stats.stat[11].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l16/hero/update_hero_state_transitions.c b/src/overlays/l16/hero/update_hero_state_transitions.c index 97a360211f..fd2b1a8c50 100644 --- a/src/overlays/l16/hero/update_hero_state_transitions.c +++ b/src/overlays/l16/hero/update_hero_state_transitions.c @@ -5,7 +5,7 @@ #include "asm.h" #include "qcopy.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/math/quad.h" #include "rnc/input/pad_state.h" #include "rnc/hero/hero.h" @@ -246,8 +246,10 @@ void update_hero_state_transitions(void) { if (usage_stats.stat[31].count < 0xFFFF) { usage_stats.stat[31].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[31].unk2) { - usage_stats.stat[31].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[31].latest_time_bucket) { + usage_stats.stat[31].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[31].level_mask = usage_stats.stat[31].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l16/level_class_tables.c b/src/overlays/l16/level_class_tables.c index 4170212ba9..c03a9c82eb 100644 --- a/src/overlays/l16/level_class_tables.c +++ b/src/overlays/l16/level_class_tables.c @@ -1,114 +1,30 @@ -#include "rnc/mobys/quad_moby_update.h" -#include "rnc/overlay/l16/mobys/bolt_thief.h" -#include "rnc/overlay/l16/mobys/bomb.h" -#include "rnc/overlay/l16/mobys/breakable_prop.h" -#include "rnc/overlay/l16/mobys/chicken_relocator.h" -#include "rnc/overlay/l16/mobys/chomper.h" -#include "rnc/overlay/l16/mobys/clip_volume_dialogue_trigger.h" -#include "rnc/overlay/l16/mobys/conveyor_belt.h" -#include "rnc/overlay/l16/mobys/cutscene_joint_trails.h" +#include "rnc/mobys.h" +#include "rnc/overlay/l16/mobys.h" #include "rnc/overlay/l16/mobys/door.h" -#include "rnc/overlay/l16/mobys/elevator.h" -#include "rnc/overlay/l16/mobys/gadgetron_ceo.h" -#include "rnc/overlay/l16/mobys/gadgetron_sign.h" -#include "rnc/overlay/l16/mobys/grindrail_button.h" -#include "rnc/overlay/l16/mobys/grindrail_gate.h" -#include "rnc/overlay/l16/mobys/help_desk_lady.h" -#include "rnc/overlay/l16/mobys/linked_pair_ribbons.h" -#include "rnc/overlay/l16/mobys/local_bounds_command_trigger.h" -#include "rnc/overlay/l16/mobys/path_following_rocket.h" -#include "rnc/overlay/l16/mobys/path_walker.h" -#include "rnc/overlay/l16/mobys/reflection_mesh.h" -#include "rnc/overlay/l16/mobys/reflection_mesh_pair.h" #include "rnc/overlay/l16/mobys/reflection_mesh_trio.h" -#include "rnc/overlay/l16/mobys/reflection_mesh_trio_b.h" -#include "rnc/overlay/l16/mobys/rocket.h" -#include "rnc/overlay/l16/mobys/spinning_sprite_effect.h" -#include "rnc/overlay/l16/mobys/taxi.h" #include "rnc/overlay/l16/mobys/test_dummy.h" -#include "rnc/overlay/l16/mobys/test_dummy_challenge.h" #include "rnc/overlay/l16/mobys/test_dummy_door.h" -#include "rnc/overlay/l16/mobys/test_dummy_on_hoverboard.h" -#include "rnc/overlay/l16/mobys/wall_button.h" -#include "rnc/overlay/l16/mobys/wall_button_blocker.h" -#include "rnc/overlay/shared/audio/emitters/box_emitter.h" -#include "rnc/overlay/shared/audio/emitters/music_switch_emitter.h" -#include "rnc/overlay/shared/audio/emitters/reverb_box_emitter.h" -#include "rnc/overlay/shared/camera/aim_volume_camera.h" -#include "rnc/overlay/shared/camera/follow_camera_setup.h" -#include "rnc/overlay/shared/camera/follow_camera_update.h" -#include "rnc/overlay/shared/camera/grindrail_camera.h" -#include "rnc/overlay/shared/camera/hero_aligned_camera.h" -#include "rnc/overlay/shared/camera/hoverboard_camera.h" -#include "rnc/overlay/shared/camera/orbit_camera.h" +#include "rnc/overlay/shared/audio/emitters.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/camera/scripted_camera.h" -#include "rnc/overlay/shared/camera/target_tracking_camera.h" -#include "rnc/overlay/shared/enemies/armed_transport.h" -#include "rnc/overlay/shared/enemies/armed_transport_rocket.h" -#include "rnc/overlay/shared/enemies/blarg_elite_commando.h" +#include "rnc/overlay/shared/enemies.h" #include "rnc/overlay/shared/enemies/blarg_elite_commando_rocket.h" -#include "rnc/overlay/shared/enemies/bolt_thief_mine.h" -#include "rnc/overlay/shared/enemies/ground_melee_enemy.h" -#include "rnc/overlay/shared/enemies/seeker.h" -#include "rnc/overlay/shared/mobys/camera_object.h" -#include "rnc/overlay/shared/mobys/draw_only_moby_update.h" -#include "rnc/overlay/shared/pickups/buried_bolts.h" -#include "rnc/overlay/shared/pickups/crate.h" -#include "rnc/overlay/shared/pickups/crate_fragment.h" -#include "rnc/overlay/shared/pickups/nanotech_ball.h" -#include "rnc/overlay/shared/pickups/pilots_helmet.h" -#include "rnc/overlay/shared/pickups/weapon_ammo.h" -#include "rnc/overlay/shared/props/grindrail_barrier.h" +#include "rnc/overlay/shared/mobys.h" +#include "rnc/overlay/shared/pickups.h" +#include "rnc/overlay/shared/props.h" #include "rnc/overlay/shared/props/grow_and_fade_out.h" -#include "rnc/overlay/shared/props/hoverboard_ring.h" -#include "rnc/overlay/shared/props/hydrodisplacer.h" -#include "rnc/overlay/shared/props/ocean_pokitaru.h" #include "rnc/overlay/shared/props/rock.h" -#include "rnc/overlay/shared/props/swingshot_versatarget.h" -#include "rnc/overlay/shared/props/tumbling_part.h" -#include "rnc/overlay/shared/rendering/effects/debris.h" +#include "rnc/overlay/shared/rendering/effects.h" #include "rnc/overlay/shared/rendering/effects/explosion_light.h" -#include "rnc/overlay/shared/rendering/effects/glow_particle.h" -#include "rnc/overlay/shared/rendering/effects/parent_following_effect.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" -#include "rnc/overlay/shared/vehicles/hoverboard.h" -#include "rnc/overlay/shared/vendor/vendor.h" -#include "rnc/overlay/shared/vendor/vendor_orb.h" -#include "rnc/overlay/shared/weapons/blaster.h" -#include "rnc/overlay/shared/weapons/blaster_shot.h" -#include "rnc/overlay/shared/weapons/bomb_glove.h" +#include "rnc/overlay/shared/vehicles.h" +#include "rnc/overlay/shared/vendor.h" +#include "rnc/overlay/shared/weapons.h" #include "rnc/overlay/shared/weapons/bomb_glove_bomb.h" -#include "rnc/overlay/shared/weapons/decoy.h" -#include "rnc/overlay/shared/weapons/decoy_glove.h" #include "rnc/overlay/shared/weapons/devastator.h" -#include "rnc/overlay/shared/weapons/doom_bot.h" -#include "rnc/overlay/shared/weapons/drone.h" -#include "rnc/overlay/shared/weapons/glove_of_doom.h" -#include "rnc/overlay/shared/weapons/glove_of_doom_bomb.h" -#include "rnc/overlay/shared/weapons/gold_devastator_missile.h" -#include "rnc/overlay/shared/weapons/helipack.h" -#include "rnc/overlay/shared/weapons/linked_moby_states_update.h" -#include "rnc/overlay/shared/weapons/metal_detector.h" #include "rnc/overlay/shared/weapons/mine.h" -#include "rnc/overlay/shared/weapons/mine_glove.h" -#include "rnc/overlay/shared/weapons/morphoray.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken_feather.h" -#include "rnc/overlay/shared/weapons/morphoray_target_effect.h" -#include "rnc/overlay/shared/weapons/pyrocitor.h" -#include "rnc/overlay/shared/weapons/ryno.h" -#include "rnc/overlay/shared/weapons/ryno_rocket.h" #include "rnc/overlay/shared/weapons/suckcannon.h" -#include "rnc/overlay/shared/weapons/swingshot.h" #include "rnc/overlay/shared/weapons/swingshot_hook.h" -#include "rnc/overlay/shared/weapons/taunter.h" -#include "rnc/overlay/shared/weapons/tesla_claw.h" -#include "rnc/overlay/shared/weapons/thruster_pack_flame.h" -#include "rnc/overlay/shared/weapons/trailing_flame.h" -#include "rnc/overlay/shared/weapons/trespasser.h" -#include "rnc/overlay/shared/weapons/visibomb.h" -#include "rnc/overlay/shared/weapons/visibomb_missile.h" -#include "rnc/overlay/shared/weapons/walloper.h" /* The level's moby classes, camera types and sound emitter types: the tables the executable's code looks ids up in (sections lvl.vtbl, lvl.camvtbl and lvl.sndvtbl). */ diff --git a/src/overlays/l16/mobys/taxi.c b/src/overlays/l16/mobys/taxi.c index 2d2ed1579d..b635478c30 100644 --- a/src/overlays/l16/mobys/taxi.c +++ b/src/overlays/l16/mobys/taxi.c @@ -39,7 +39,7 @@ #include "rnc/overlay/shared/world/level_labels.h" #include "rnc/ui/help/try_set_help_message.h" #include "rnc/audio/voice_alloc.h" -#include "rnc/camera/sample_camera_path.h" +#include "rnc/camera.h" #include "rnc/math/interpolation/advance_accelerated_scalar.h" extern float fast_add_rotations(float, float); diff --git a/src/overlays/l16/mobys/wall_button.c b/src/overlays/l16/mobys/wall_button.c index 38b5447b0c..3bedbefe02 100644 --- a/src/overlays/l16/mobys/wall_button.c +++ b/src/overlays/l16/mobys/wall_button.c @@ -16,7 +16,7 @@ #include "rnc/overlay/shared/rendering/effects/spawn_type_10_particle.h" #include "rnc/world/collision/collision_line.h" #include "rnc/math/random.h" -#include "rnc/overlay/l16/mobys/wall_button_blocker.h" +#include "rnc/overlay/l16/mobys.h" extern float D_0015ED6C; diff --git a/src/overlays/l17/hero/hero_set_state.c b/src/overlays/l17/hero/hero_set_state.c index c5a3f8a83b..ff89ae6ec7 100644 --- a/src/overlays/l17/hero/hero_set_state.c +++ b/src/overlays/l17/hero/hero_set_state.c @@ -436,8 +436,8 @@ int hero_set_state(int a, int b) { } { struct UsageStat *h = usage_stats.stat; - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } { struct Hero *q = &hero; @@ -451,8 +451,8 @@ int hero_set_state(int a, int b) { } { struct UsageStat *h = usage_stats.stat; - if (scale_game_frames(D_0015EEA4) / 600 > h[29].unk2) { - h[29].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[29].latest_time_bucket) { + h[29].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[29].level_mask = h[29].level_mask | (1 << current_level_index) | 0x80000000; } @@ -745,8 +745,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -791,8 +791,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -1605,8 +1605,8 @@ int hero_set_state(int a, int b) { if (h[0].count <= 0xFFFE) { h[0].count = h[0].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[0].unk2) { - h[0].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[0].latest_time_bucket) { + h[0].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[0].level_mask = h[0].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -1635,16 +1635,16 @@ int hero_set_state(int a, int b) { if (h[1].count <= 0xFFFE) { h[1].count = h[1].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[1].unk2) { - h[1].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[1].latest_time_bucket) { + h[1].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[1].level_mask = h[1].level_mask | (1 << current_level_index) | 0x80000000; item_usage_stats = (struct UsageStat *)item_usage; if (item_usage_stats[37].count <= 0xFFFE) { item_usage_stats[37].count = item_usage_stats[37].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > item_usage_stats[37].unk2) { - item_usage_stats[37].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > item_usage_stats[37].latest_time_bucket) { + item_usage_stats[37].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } item_usage_stats[37].level_mask = item_usage_stats[37].level_mask | (1 << current_level_index) | 0x80000000; @@ -1683,8 +1683,8 @@ int hero_set_state(int a, int b) { if (h[8].count <= 0xFFFE) { h[8].count = h[8].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[8].unk2) { - h[8].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[8].latest_time_bucket) { + h[8].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } q = &hero; h[8].level_mask = h[8].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l17/hero/process_hero_hit_response.c b/src/overlays/l17/hero/process_hero_hit_response.c index b332e51f77..6f6f4eec8e 100644 --- a/src/overlays/l17/hero/process_hero_hit_response.c +++ b/src/overlays/l17/hero/process_hero_hit_response.c @@ -3,7 +3,7 @@ #include "rnc/hero/hero.h" #include "rnc/globals.h" #include "asm.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/math/quad.h" #include "rnc/overlay/shared/mobys/entities.h" #include "rnc/data_labels.h" diff --git a/src/overlays/l17/hero/update_hero_motion_for_current_state.c b/src/overlays/l17/hero/update_hero_motion_for_current_state.c index 3c85106b9b..8a418b375b 100644 --- a/src/overlays/l17/hero/update_hero_motion_for_current_state.c +++ b/src/overlays/l17/hero/update_hero_motion_for_current_state.c @@ -329,8 +329,9 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[18].count++; } t = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[18].unk2 < t) { - usage_stats.stat[18].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[18].latest_time_bucket < t) { + usage_stats.stat[18].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } D_L17_0015F688 = -1; usage_stats.stat[18].level_mask = @@ -599,8 +600,9 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[11].count++; } use_seconds = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[11].unk2 < use_seconds) { - usage_stats.stat[11].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[11].latest_time_bucket < use_seconds) { + usage_stats.stat[11].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[11].level_mask = usage_stats.stat[11].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l17/hero/update_hero_state_transitions.c b/src/overlays/l17/hero/update_hero_state_transitions.c index 75e16ce14c..a048a27c1b 100644 --- a/src/overlays/l17/hero/update_hero_state_transitions.c +++ b/src/overlays/l17/hero/update_hero_state_transitions.c @@ -5,7 +5,7 @@ #include "asm.h" #include "qcopy.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/math/quad.h" #include "rnc/input/pad_state.h" #include "rnc/hero/hero.h" @@ -265,8 +265,10 @@ void update_hero_state_transitions(void) { if (usage_stats.stat[31].count < 0xFFFF) { usage_stats.stat[31].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[31].unk2) { - usage_stats.stat[31].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[31].latest_time_bucket) { + usage_stats.stat[31].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[31].level_mask = usage_stats.stat[31].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l17/level_class_tables.c b/src/overlays/l17/level_class_tables.c index ffb376c281..4a65e5b12c 100644 --- a/src/overlays/l17/level_class_tables.c +++ b/src/overlays/l17/level_class_tables.c @@ -1,112 +1,28 @@ -#include "rnc/mobys/quad_moby_update.h" -#include "rnc/overlay/l17/mobys/blarg_ship.h" -#include "rnc/overlay/l17/mobys/breakaway_prop.h" -#include "rnc/overlay/l17/mobys/camera_box_watcher.h" -#include "rnc/overlay/l17/mobys/cutscene_camera_target.h" -#include "rnc/overlay/l17/mobys/door.h" -#include "rnc/overlay/l17/mobys/dreks_fleet_turret.h" -#include "rnc/overlay/l17/mobys/dreks_fleet_turret_shot.h" -#include "rnc/overlay/l17/mobys/fighter_jet.h" -#include "rnc/overlay/l17/mobys/fleet_backdrop.h" -#include "rnc/overlay/l17/mobys/fleet_beam.h" -#include "rnc/overlay/l17/mobys/fleet_rotating_radial_effect.h" -#include "rnc/overlay/l17/mobys/floating_mine.h" -#include "rnc/overlay/l17/mobys/magnet_elevator.h" -#include "rnc/overlay/l17/mobys/robot_dog.h" -#include "rnc/overlay/l17/mobys/shattering_prop.h" -#include "rnc/overlay/l17/mobys/shuttle.h" -#include "rnc/overlay/shared/audio/emitters/listener_emitter.h" -#include "rnc/overlay/shared/camera/follow_camera_setup.h" -#include "rnc/overlay/shared/camera/follow_camera_update.h" -#include "rnc/overlay/shared/camera/grindrail_camera.h" -#include "rnc/overlay/shared/camera/hero_aligned_camera.h" -#include "rnc/overlay/shared/camera/orbit_camera.h" +#include "rnc/mobys.h" +#include "rnc/overlay/l17/mobys.h" +#include "rnc/overlay/shared/audio/emitters.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/camera/scripted_camera.h" #include "rnc/overlay/shared/camera/swing_volume_camera.h" -#include "rnc/overlay/shared/camera/target_tracking_camera.h" -#include "rnc/overlay/shared/enemies/billboard_projectile.h" +#include "rnc/overlay/shared/enemies.h" #include "rnc/overlay/shared/enemies/blarg_elite_commando_rocket.h" -#include "rnc/overlay/shared/enemies/blarg_ship_rocket.h" -#include "rnc/overlay/shared/enemies/blarg_ship_shot.h" -#include "rnc/overlay/shared/enemies/ground_melee_enemy.h" -#include "rnc/overlay/shared/enemies/hero_seeking_mine.h" -#include "rnc/overlay/shared/enemies/sentrybot.h" -#include "rnc/overlay/shared/enemies/sentrybot_alarm.h" -#include "rnc/overlay/shared/enemies/sentrybot_projectile.h" -#include "rnc/overlay/shared/enemies/smoke_trail_projectile.h" -#include "rnc/overlay/shared/enemies/spiderbot.h" -#include "rnc/overlay/shared/mobys/camera_object.h" -#include "rnc/overlay/shared/mobys/draw_only_moby_update.h" -#include "rnc/overlay/shared/pickups/buried_bolts.h" -#include "rnc/overlay/shared/pickups/codebot.h" -#include "rnc/overlay/shared/pickups/crate.h" -#include "rnc/overlay/shared/pickups/crate_fragment.h" -#include "rnc/overlay/shared/pickups/fighter_jet_crate.h" +#include "rnc/overlay/shared/mobys.h" +#include "rnc/overlay/shared/pickups.h" #include "rnc/overlay/shared/pickups/infobot.h" -#include "rnc/overlay/shared/pickups/nanotech_ball.h" -#include "rnc/overlay/shared/pickups/pilots_helmet.h" -#include "rnc/overlay/shared/pickups/weapon_ammo.h" -#include "rnc/overlay/shared/props/electric_beam.h" -#include "rnc/overlay/shared/props/electric_water.h" -#include "rnc/overlay/shared/props/energy_sphere.h" -#include "rnc/overlay/shared/props/energy_sphere_holder.h" -#include "rnc/overlay/shared/props/floor_button.h" -#include "rnc/overlay/shared/props/group_rotator.h" +#include "rnc/overlay/shared/props.h" #include "rnc/overlay/shared/props/grow_and_fade_out.h" -#include "rnc/overlay/shared/props/hydrodisplacer.h" -#include "rnc/overlay/shared/props/linked_spark_emitter.h" -#include "rnc/overlay/shared/props/moby_state_trigger.h" -#include "rnc/overlay/shared/props/ripple_strips.h" #include "rnc/overlay/shared/props/rock.h" -#include "rnc/overlay/shared/props/swingshot_versatarget.h" -#include "rnc/overlay/shared/props/tumbling_part.h" -#include "rnc/overlay/shared/props/underwater_door.h" -#include "rnc/overlay/shared/props/underwater_ring.h" -#include "rnc/overlay/shared/props/updraft_vent.h" -#include "rnc/overlay/shared/rendering/effects/debris.h" +#include "rnc/overlay/shared/rendering/effects.h" #include "rnc/overlay/shared/rendering/effects/explosion_light.h" -#include "rnc/overlay/shared/rendering/effects/glow_particle.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" -#include "rnc/overlay/shared/vehicles/fighter_jet_missile.h" -#include "rnc/overlay/shared/vehicles/fighter_jet_rocket.h" -#include "rnc/overlay/shared/vehicles/ship_rocket.h" -#include "rnc/overlay/shared/vendor/vendor.h" -#include "rnc/overlay/shared/vendor/vendor_orb.h" -#include "rnc/overlay/shared/weapons/blaster.h" -#include "rnc/overlay/shared/weapons/blaster_shot.h" -#include "rnc/overlay/shared/weapons/bomb_glove.h" +#include "rnc/overlay/shared/vehicles.h" +#include "rnc/overlay/shared/vendor.h" +#include "rnc/overlay/shared/weapons.h" #include "rnc/overlay/shared/weapons/bomb_glove_bomb.h" -#include "rnc/overlay/shared/weapons/decoy.h" -#include "rnc/overlay/shared/weapons/decoy_glove.h" #include "rnc/overlay/shared/weapons/devastator.h" -#include "rnc/overlay/shared/weapons/doom_bot.h" -#include "rnc/overlay/shared/weapons/drone.h" -#include "rnc/overlay/shared/weapons/glove_of_doom.h" -#include "rnc/overlay/shared/weapons/glove_of_doom_bomb.h" -#include "rnc/overlay/shared/weapons/gold_devastator_missile.h" -#include "rnc/overlay/shared/weapons/helipack.h" -#include "rnc/overlay/shared/weapons/linked_moby_states_update.h" -#include "rnc/overlay/shared/weapons/metal_detector.h" #include "rnc/overlay/shared/weapons/mine.h" -#include "rnc/overlay/shared/weapons/mine_glove.h" -#include "rnc/overlay/shared/weapons/morphoray.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken_feather.h" -#include "rnc/overlay/shared/weapons/morphoray_target_effect.h" -#include "rnc/overlay/shared/weapons/pyrocitor.h" -#include "rnc/overlay/shared/weapons/ryno.h" -#include "rnc/overlay/shared/weapons/ryno_rocket.h" #include "rnc/overlay/shared/weapons/suckcannon.h" -#include "rnc/overlay/shared/weapons/swingshot.h" #include "rnc/overlay/shared/weapons/swingshot_hook.h" -#include "rnc/overlay/shared/weapons/taunter.h" -#include "rnc/overlay/shared/weapons/tesla_claw.h" -#include "rnc/overlay/shared/weapons/thruster_pack_flame.h" -#include "rnc/overlay/shared/weapons/trailing_flame.h" -#include "rnc/overlay/shared/weapons/trespasser.h" -#include "rnc/overlay/shared/weapons/visibomb.h" -#include "rnc/overlay/shared/weapons/visibomb_missile.h" -#include "rnc/overlay/shared/weapons/walloper.h" /* The level's moby classes, camera types and sound emitter types: the tables the executable's code looks ids up in (sections lvl.vtbl, lvl.camvtbl and lvl.sndvtbl). */ diff --git a/src/overlays/l17/mobys/camera_box_watcher.c b/src/overlays/l17/mobys/camera_box_watcher.c index be00a4029c..08faabbe8c 100644 --- a/src/overlays/l17/mobys/camera_box_watcher.c +++ b/src/overlays/l17/mobys/camera_box_watcher.c @@ -17,9 +17,9 @@ #include "rnc/game/game_globals.h" #include "rnc/game/item_state.h" #include "rnc/overlay/shared/camera/follow_camera_angle_blend.h" -#include "rnc/overlay/shared/camera/follow_camera_set_distance.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/hero/hero_switch_item.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/sdk/debug.h" /* Update for moby class 1470: watches camera boxes around the hero, gives skill points and help messages, and turns the camera. */ /* Ported from rac1-decomp (src/overlays/l17_fleet/vendor_002F1558.c: func_L17_002F4210), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/l17/mobys/dreks_fleet_turret.c b/src/overlays/l17/mobys/dreks_fleet_turret.c index f92ff8509b..f9710c7e1e 100644 --- a/src/overlays/l17/mobys/dreks_fleet_turret.c +++ b/src/overlays/l17/mobys/dreks_fleet_turret.c @@ -18,7 +18,7 @@ #include "rnc/world/collision/collision_line.h" #include "qcopy.h" #include "qzero.h" -#include "rnc/overlay/l17/mobys/blarg_ship.h" +#include "rnc/overlay/l17/mobys.h" extern int hit_reaction(void *, void *, void *, int, void *, void *, int, int) __asm__("FUN_L00_0025a478"); diff --git a/src/overlays/l17/mobys/fleet_rotating_radial_effect.c b/src/overlays/l17/mobys/fleet_rotating_radial_effect.c index bfa6adcd3d..0eab6686d2 100644 --- a/src/overlays/l17/mobys/fleet_rotating_radial_effect.c +++ b/src/overlays/l17/mobys/fleet_rotating_radial_effect.c @@ -20,7 +20,7 @@ #include "rnc/overlay/shared/hero/hero_switch_item.h" #include "rnc/overlay/shared/rendering/effects/particles.h" #include "rnc/rendering/effect_texture.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/sdk/libc/stdlib.h" /* Fleet moby 669 update: spins up, then sprays particles from points on a rotating ring. */ /* Ported from rac1-decomp (src/overlays/l17_fleet/vendor_002AA068.c: func_L17_002D8CC8), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/l17/mobys/floating_mine.c b/src/overlays/l17/mobys/floating_mine.c index d9a4be0f9e..2a8eb24d0c 100644 --- a/src/overlays/l17/mobys/floating_mine.c +++ b/src/overlays/l17/mobys/floating_mine.c @@ -12,7 +12,7 @@ #include "rnc/overlay/shared/mobys/find_moby_hit.h" #include "rnc/overlay/shared/math/quad.h" #include "qcopy.h" -#include "rnc/camera/resolve_camera_surface_height.h" +#include "rnc/camera.h" extern int hit_reaction(void *, void *, void *, int, void *, void *, int, int) __asm__("FUN_L00_0025a478"); diff --git a/src/overlays/l18/hero/hero_set_state.c b/src/overlays/l18/hero/hero_set_state.c index dc33ef6326..5bc1be4005 100644 --- a/src/overlays/l18/hero/hero_set_state.c +++ b/src/overlays/l18/hero/hero_set_state.c @@ -382,8 +382,8 @@ int hero_set_state(int a, int b) { { struct UsageStat *h = usage_stats.stat; struct Hero *q; - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -396,8 +396,8 @@ int hero_set_state(int a, int b) { { struct UsageStat *h = usage_stats.stat; char *v; - if (scale_game_frames(D_0015EEA4) / 600 > h[29].unk2) { - h[29].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[29].latest_time_bucket) { + h[29].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[29].level_mask = h[29].level_mask | (1 << current_level_index) | 0x80000000; v = (char *)&hero.motion.momentum; @@ -675,8 +675,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -721,8 +721,8 @@ int hero_set_state(int a, int b) { if (h[12].count <= 0xFFFE) { h[12].count = h[12].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[12].level_mask = h[12].level_mask | (1 << current_level_index) | 0x80000000; } @@ -1453,8 +1453,8 @@ int hero_set_state(int a, int b) { if (h[0].count <= 0xFFFE) { h[0].count = h[0].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[0].unk2) { - h[0].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[0].latest_time_bucket) { + h[0].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[0].level_mask = h[0].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -1483,16 +1483,17 @@ int hero_set_state(int a, int b) { if (h[1].count <= 0xFFFE) { h[1].count = h[1].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[1].unk2) { - h[1].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[1].latest_time_bucket) { + h[1].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[1].level_mask = h[1].level_mask | (1 << current_level_index) | 0x80000000; item_usage_stats_base = (struct UsageStat *)item_usage; if (item_usage_stats_base[37].count <= 0xFFFE) { item_usage_stats_base[37].count = item_usage_stats_base[37].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > item_usage_stats_base[37].unk2) { - item_usage_stats_base[37].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + item_usage_stats_base[37].latest_time_bucket) { + item_usage_stats_base[37].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } item_usage_stats_base[37].level_mask = item_usage_stats_base[37].level_mask | (1 << current_level_index) | 0x80000000; @@ -1531,8 +1532,8 @@ int hero_set_state(int a, int b) { if (h[8].count <= 0xFFFE) { h[8].count = h[8].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[8].unk2) { - h[8].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[8].latest_time_bucket) { + h[8].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } q = &hero; h[8].level_mask = h[8].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l18/hero/process_hero_state_transitions.c b/src/overlays/l18/hero/process_hero_state_transitions.c index 6ee7c890fd..241f03906e 100644 --- a/src/overlays/l18/hero/process_hero_state_transitions.c +++ b/src/overlays/l18/hero/process_hero_state_transitions.c @@ -6,7 +6,7 @@ #include "asm.h" #include "qcopy.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/math/quad.h" #include "rnc/input/pad_state.h" #include "rnc/hero/hero.h" @@ -247,8 +247,10 @@ void process_hero_state_transitions(void) { if (usage_stats.stat[31].count < 0xFFFF) { usage_stats.stat[31].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[31].unk2) { - usage_stats.stat[31].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[31].latest_time_bucket) { + usage_stats.stat[31].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[31].level_mask = usage_stats.stat[31].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l18/hero/update_hero_motion_for_current_state.c b/src/overlays/l18/hero/update_hero_motion_for_current_state.c index 4502a87a23..0f93720561 100644 --- a/src/overlays/l18/hero/update_hero_motion_for_current_state.c +++ b/src/overlays/l18/hero/update_hero_motion_for_current_state.c @@ -330,8 +330,9 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[18].count++; } t = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[18].unk2 < t) { - usage_stats.stat[18].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[18].latest_time_bucket < t) { + usage_stats.stat[18].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } D_L18_0015F688 = -1; usage_stats.stat[18].level_mask = @@ -551,8 +552,9 @@ void update_hero_motion_for_current_state(void) { usage_stats.stat[11].count++; } use_seconds = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[11].unk2 < use_seconds) { - usage_stats.stat[11].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[11].latest_time_bucket < use_seconds) { + usage_stats.stat[11].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[11].level_mask = usage_stats.stat[11].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/l18/level_class_tables.c b/src/overlays/l18/level_class_tables.c index e7e6472eb5..ab29117b6e 100644 --- a/src/overlays/l18/level_class_tables.c +++ b/src/overlays/l18/level_class_tables.c @@ -1,116 +1,29 @@ #include "rnc/audio/streaming/register_audio_stream_callback.h" -#include "rnc/mobys/quad_moby_update.h" -#include "rnc/overlay/l18/mobys/camera_transition.h" -#include "rnc/overlay/l18/mobys/child_carrier.h" -#include "rnc/overlay/l18/mobys/cutscene_effects.h" -#include "rnc/overlay/l18/mobys/cutscene_joint_trail.h" -#include "rnc/overlay/l18/mobys/deplanetizer_gun.h" -#include "rnc/overlay/l18/mobys/destructible_scenery.h" -#include "rnc/overlay/l18/mobys/drek_boss_damage_ring.h" -#include "rnc/overlay/l18/mobys/drek_boss_electric_ball.h" -#include "rnc/overlay/l18/mobys/drek_boss_ring_projectile.h" +#include "rnc/mobys.h" +#include "rnc/overlay/l18/mobys.h" #include "rnc/overlay/l18/mobys/drek_fight_missile.h" -#include "rnc/overlay/l18/mobys/drek_final_boss_robot.h" #include "rnc/overlay/l18/mobys/falling_moby_group.h" -#include "rnc/overlay/l18/mobys/floating_platform.h" -#include "rnc/overlay/l18/mobys/gadgebot.h" -#include "rnc/overlay/l18/mobys/grind_rail_junction.h" -#include "rnc/overlay/l18/mobys/hidden_deplanetizer_gun.h" -#include "rnc/overlay/l18/mobys/inert_moby.h" -#include "rnc/overlay/l18/mobys/lift.h" -#include "rnc/overlay/l18/mobys/mine.h" -#include "rnc/overlay/l18/mobys/rocket.h" -#include "rnc/overlay/l18/mobys/rocket_tank.h" -#include "rnc/overlay/l18/mobys/rocket_tank_rocket.h" -#include "rnc/overlay/l18/mobys/thruster_pack_lock_green.h" -#include "rnc/overlay/l18/mobys/thruster_pack_lock_red.h" -#include "rnc/overlay/l18/mobys/trespasser_barrier.h" -#include "rnc/overlay/shared/audio/emitters/distance_emitter.h" -#include "rnc/overlay/shared/audio/emitters/listener_emitter.h" -#include "rnc/overlay/shared/audio/emitters/music_switch_emitter.h" -#include "rnc/overlay/shared/audio/emitters/random_position_emitter.h" -#include "rnc/overlay/shared/audio/emitters/reverb_box_emitter.h" -#include "rnc/overlay/shared/camera/aim_volume_camera.h" -#include "rnc/overlay/shared/camera/follow_camera_setup.h" -#include "rnc/overlay/shared/camera/follow_camera_update.h" -#include "rnc/overlay/shared/camera/hero_aligned_camera.h" -#include "rnc/overlay/shared/camera/moby_controlled_camera.h" -#include "rnc/overlay/shared/camera/orbit_camera.h" +#include "rnc/overlay/shared/audio/emitters.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/camera/scripted_camera.h" -#include "rnc/overlay/shared/camera/target_tracking_camera.h" -#include "rnc/overlay/shared/enemies/armed_transport.h" -#include "rnc/overlay/shared/enemies/armed_transport_rocket.h" -#include "rnc/overlay/shared/enemies/blarg_elite_commando.h" +#include "rnc/overlay/shared/enemies.h" #include "rnc/overlay/shared/enemies/blarg_elite_commando_rocket.h" -#include "rnc/overlay/shared/enemies/ground_melee_enemy.h" -#include "rnc/overlay/shared/enemies/horny_toad.h" -#include "rnc/overlay/shared/mobys/camera_object.h" -#include "rnc/overlay/shared/pickups/buried_bolts.h" -#include "rnc/overlay/shared/pickups/crate.h" -#include "rnc/overlay/shared/pickups/crate_fragment.h" -#include "rnc/overlay/shared/pickups/nanotech_ball.h" -#include "rnc/overlay/shared/pickups/pilots_helmet.h" -#include "rnc/overlay/shared/pickups/weapon_ammo.h" -#include "rnc/overlay/shared/props/floor_button.h" -#include "rnc/overlay/shared/props/grindrail_barrier.h" -#include "rnc/overlay/shared/props/group_rotator.h" +#include "rnc/overlay/shared/mobys.h" +#include "rnc/overlay/shared/pickups.h" +#include "rnc/overlay/shared/props.h" #include "rnc/overlay/shared/props/grow_and_fade_out.h" -#include "rnc/overlay/shared/props/hydrodisplacer.h" -#include "rnc/overlay/shared/props/hydrodisplacer_faucet.h" -#include "rnc/overlay/shared/props/pterodactyl.h" -#include "rnc/overlay/shared/props/red_orb.h" -#include "rnc/overlay/shared/props/respawn_volume.h" #include "rnc/overlay/shared/props/rock.h" -#include "rnc/overlay/shared/props/swingshot_versatarget.h" -#include "rnc/overlay/shared/props/trackdrive_left.h" -#include "rnc/overlay/shared/props/trespasser_pad.h" -#include "rnc/overlay/shared/props/tumbling_part.h" -#include "rnc/overlay/shared/rendering/effects/debris.h" +#include "rnc/overlay/shared/rendering/effects.h" #include "rnc/overlay/shared/rendering/effects/explosion_light.h" -#include "rnc/overlay/shared/rendering/effects/glow_particle.h" -#include "rnc/overlay/shared/rendering/effects/timed_sprite_effect.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" -#include "rnc/overlay/shared/vehicles/giant_clank_charged_blast.h" -#include "rnc/overlay/shared/vehicles/giant_clank_hit_sphere.h" -#include "rnc/overlay/shared/vehicles/giant_clank_missile.h" -#include "rnc/overlay/shared/vehicles/giant_clank_pad.h" -#include "rnc/overlay/shared/vendor/vendor.h" -#include "rnc/overlay/shared/vendor/vendor_orb.h" -#include "rnc/overlay/shared/weapons/blaster.h" -#include "rnc/overlay/shared/weapons/blaster_shot.h" -#include "rnc/overlay/shared/weapons/bomb_glove.h" +#include "rnc/overlay/shared/vehicles.h" +#include "rnc/overlay/shared/vendor.h" +#include "rnc/overlay/shared/weapons.h" #include "rnc/overlay/shared/weapons/bomb_glove_bomb.h" -#include "rnc/overlay/shared/weapons/decoy.h" -#include "rnc/overlay/shared/weapons/decoy_glove.h" #include "rnc/overlay/shared/weapons/devastator.h" -#include "rnc/overlay/shared/weapons/doom_bot.h" -#include "rnc/overlay/shared/weapons/drone.h" -#include "rnc/overlay/shared/weapons/glove_of_doom.h" -#include "rnc/overlay/shared/weapons/glove_of_doom_bomb.h" -#include "rnc/overlay/shared/weapons/gold_devastator_missile.h" -#include "rnc/overlay/shared/weapons/helipack.h" -#include "rnc/overlay/shared/weapons/linked_moby_states_update.h" -#include "rnc/overlay/shared/weapons/metal_detector.h" #include "rnc/overlay/shared/weapons/mine.h" -#include "rnc/overlay/shared/weapons/mine_glove.h" -#include "rnc/overlay/shared/weapons/morphoray.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken_feather.h" -#include "rnc/overlay/shared/weapons/morphoray_target_effect.h" -#include "rnc/overlay/shared/weapons/pyrocitor.h" -#include "rnc/overlay/shared/weapons/ryno.h" -#include "rnc/overlay/shared/weapons/ryno_rocket.h" #include "rnc/overlay/shared/weapons/suckcannon.h" -#include "rnc/overlay/shared/weapons/swingshot.h" #include "rnc/overlay/shared/weapons/swingshot_hook.h" -#include "rnc/overlay/shared/weapons/taunter.h" -#include "rnc/overlay/shared/weapons/tesla_claw.h" -#include "rnc/overlay/shared/weapons/thruster_pack_flame.h" -#include "rnc/overlay/shared/weapons/trailing_flame.h" -#include "rnc/overlay/shared/weapons/trespasser.h" -#include "rnc/overlay/shared/weapons/visibomb.h" -#include "rnc/overlay/shared/weapons/visibomb_missile.h" -#include "rnc/overlay/shared/weapons/walloper.h" /* The level's moby classes, camera types and sound emitter types: the tables the executable's code looks ids up in (sections lvl.vtbl, lvl.camvtbl and lvl.sndvtbl). */ diff --git a/src/overlays/l18/load_level_core_data.c b/src/overlays/l18/load_level_core_data.c index ec0d760903..934b22cb26 100644 --- a/src/overlays/l18/load_level_core_data.c +++ b/src/overlays/l18/load_level_core_data.c @@ -22,10 +22,10 @@ #include "rnc/world/loaders/unpack_point_records.h" #include "rnc/world/loaders/upload_texture_images.h" #include "rnc/overlay/shared/game/restore_or_clear_level_state.h" -#include "rnc/rendering/shrubs/register_shrub_render_class.h" -#include "rnc/rendering/texture/parse_particle_textures.h" -#include "rnc/rendering/tfrags/initialize_tfrag_render_data.h" -#include "rnc/rendering/ties/register_object_render_class.h" +#include "rnc/rendering/shrubs.h" +#include "rnc/rendering/texture.h" +#include "rnc/rendering/tfrags.h" +#include "rnc/rendering/ties.h" typedef struct { char *f0; /* 0x00 */ diff --git a/src/overlays/l18/mobys/drek_boss_electric_ball.c b/src/overlays/l18/mobys/drek_boss_electric_ball.c index 8cda173e19..58646119f5 100644 --- a/src/overlays/l18/mobys/drek_boss_electric_ball.c +++ b/src/overlays/l18/mobys/drek_boss_electric_ball.c @@ -16,7 +16,7 @@ #include "rnc/overlay/shared/world/level_spline.h" #include "rnc/math/random.h" #include "rnc/overlay/shared/math/random/random_int_between.h" -#include "rnc/overlay/shared/props/electric_water.h" +#include "rnc/overlay/shared/props.h" #include "rnc/overlay/shared/rendering/effects/spawn_explosion.h" #include "rnc/rendering/view/build_look_at_matrix.h" #include "rnc/world/collision/ground_probe.h" diff --git a/src/overlays/l18/mobys/falling_moby_group.c b/src/overlays/l18/mobys/falling_moby_group.c index a9177211af..3ccabf9cfb 100644 --- a/src/overlays/l18/mobys/falling_moby_group.c +++ b/src/overlays/l18/mobys/falling_moby_group.c @@ -33,7 +33,7 @@ #include "rnc/data_labels.h" #include "rnc/game/options.h" #include "rnc/math/random.h" -#include "rnc/overlay/l18/mobys/child_carrier.h" +#include "rnc/overlay/l18/mobys.h" extern void mark_moby_for_removal(void *) __asm__("FUN_0020c828"); diff --git a/src/overlays/l18/mobys/floating_platform.c b/src/overlays/l18/mobys/floating_platform.c index 9bbaa1f8ce..7ca81bfd98 100644 --- a/src/overlays/l18/mobys/floating_platform.c +++ b/src/overlays/l18/mobys/floating_platform.c @@ -17,7 +17,7 @@ #include "rnc/audio/voice_alloc.h" #include "rnc/math/random.h" #include "rnc/mobys/moby_spawn.h" -#include "rnc/overlay/l18/hero/hero_set_state.h" +#include "rnc/overlay/l18/hero.h" #include "rnc/overlay/shared/math/random/random_int_between.h" void update_floating_platform_tilt_and_bob(struct Moby *moby) __asm__("FUN_L18_002d8710"); diff --git a/src/overlays/l18/mobys/thruster_pack_lock_red.c b/src/overlays/l18/mobys/thruster_pack_lock_red.c index 0c7135d2d6..e56003c88f 100644 --- a/src/overlays/l18/mobys/thruster_pack_lock_red.c +++ b/src/overlays/l18/mobys/thruster_pack_lock_red.c @@ -121,17 +121,18 @@ void thruster_pack_lock_red_update(struct Moby *moby) { int one = 1; if ((help[0x2B02].level_mask & (one << current_level_index)) == 0) { if (help[0x71].count != 0) { - if (scale_game_frames(D_0015EEA4) - help[0x71].unk2 * 600 > + if (scale_game_frames(D_0015EEA4) - help[0x71].latest_time_bucket * 600 > (int)((float)scale_game_frames(0x12) * 60.0f) || - help[0x71].unk2 * 600 == 0) { + help[0x71].latest_time_bucket * 600 == 0) { help_request(0x2B02, 0x71); - } else if (scale_game_frames(D_0015EEA4) / 600 > help[0x71].unk2) { - help[0x71].unk2 = scale_game_frames(D_0015EEA4) / 600; + } else if (scale_game_frames(D_0015EEA4) / 600 > + help[0x71].latest_time_bucket) { + help[0x71].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } } else { help[0x71].count++; - if (scale_game_frames(D_0015EEA4) / 600 > help[0x71].unk2) { - help[0x71].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > help[0x71].latest_time_bucket) { + help[0x71].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } help[0x71].level_mask = help[0x71].level_mask | (one << current_level_index) | 0x80000000; diff --git a/src/overlays/shared/audio/emitters/reverb_box_emitter.c b/src/overlays/shared/audio/emitters/reverb_box_emitter.c index 8959db5527..75cc0d7e0e 100644 --- a/src/overlays/shared/audio/emitters/reverb_box_emitter.c +++ b/src/overlays/shared/audio/emitters/reverb_box_emitter.c @@ -4,7 +4,7 @@ #include "qcopy.h" #include "rnc/math/fast_math.h" #include "rnc/math/asm_helpers.h" -#include "rnc/overlay/shared/audio/voices/set_requested_state_and_mark_changes.h" +#include "rnc/overlay/shared/audio/voices.h" /* reverb box sound update: starts or stops the sound as the listener enters or leaves the box */ /* Ported from rac1-decomp (src/overlays/shared/vendor_0031AD00.c: func_L01_0031B2F0), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/shared/camera/aim_volume_camera.c b/src/overlays/shared/camera/aim_volume_camera.c index 60348763b0..8dadc54790 100644 --- a/src/overlays/shared/camera/aim_volume_camera.c +++ b/src/overlays/shared/camera/aim_volume_camera.c @@ -9,7 +9,7 @@ #include "rnc/camera/follow_cam.h" #include "rnc/input/pad_state.h" #include "rnc/overlay/shared/camera/swing_volume_camera.h" -#include "rnc/overlay/shared/camera/follow_camera_set_distance.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/camera/follow_camera_set_up_spring.h" #include "rnc/overlay/shared/rendering/culling/test_point_in_transformed_unit_cylinder.h" #include "rnc/rendering/clip_volume.h" diff --git a/src/overlays/shared/camera/clip_volume_camera.c b/src/overlays/shared/camera/clip_volume_camera.c index 2d28513671..505c1d8c1a 100644 --- a/src/overlays/shared/camera/clip_volume_camera.c +++ b/src/overlays/shared/camera/clip_volume_camera.c @@ -8,7 +8,7 @@ #include "rnc/overlay/shared/camera/init_camera_system.h" #include "qcopy.h" #include "rnc/math/fast_math.h" -#include "rnc/overlay/shared/math/rotations/rotate_vector_by_scaled_angle_between_vectors.h" +#include "rnc/overlay/shared/math/rotations.h" typedef struct { char pad0[0x40]; diff --git a/src/overlays/shared/camera/follow_camera_offset_effect.c b/src/overlays/shared/camera/follow_camera_offset_effect.c index ded5fee571..e24f1fd268 100644 --- a/src/overlays/shared/camera/follow_camera_offset_effect.c +++ b/src/overlays/shared/camera/follow_camera_offset_effect.c @@ -6,7 +6,7 @@ #include "rnc/math/fast_math.h" #include "rnc/math/asm_helpers.h" #include "rnc/camera/follow_cam.h" -#include "rnc/overlay/shared/camera/register_camera_update_callback.h" +#include "rnc/overlay/shared/camera.h" typedef struct { int a; diff --git a/src/overlays/shared/camera/follow_camera_turn_and_pitch.c b/src/overlays/shared/camera/follow_camera_turn_and_pitch.c index d4f40207a1..5aff84a313 100644 --- a/src/overlays/shared/camera/follow_camera_turn_and_pitch.c +++ b/src/overlays/shared/camera/follow_camera_turn_and_pitch.c @@ -52,8 +52,10 @@ void follow_camera_read_stick(char *camera_object, float *turn_input_out, float if (usage_stats_state->stat[8].count <= 0xFFFE) { usage_stats_state->stat[8].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats_state->stat[8].unk2) { - usage_stats_state->stat[8].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats_state->stat[8].latest_time_bucket) { + usage_stats_state->stat[8].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } D_L00_00161D90 = 1; usage_stats_state->stat[8].level_mask = diff --git a/src/overlays/shared/camera/follow_camera_update.c b/src/overlays/shared/camera/follow_camera_update.c index 148c270161..ad67ee07b7 100644 --- a/src/overlays/shared/camera/follow_camera_update.c +++ b/src/overlays/shared/camera/follow_camera_update.c @@ -5,7 +5,7 @@ #include "sda.h" #include "rnc/math/asm_helpers.h" #include "rnc/math/fast_math.h" -#include "rnc/overlay/shared/camera/follow_camera_turn_and_pitch.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/rendering/view/build_look_at_matrix.h" typedef struct { diff --git a/src/overlays/shared/camera/hero_aligned_camera.c b/src/overlays/shared/camera/hero_aligned_camera.c index 5fc55c3ed2..7b3f9dde32 100644 --- a/src/overlays/shared/camera/hero_aligned_camera.c +++ b/src/overlays/shared/camera/hero_aligned_camera.c @@ -11,7 +11,7 @@ #include "qcopy.h" #include "rnc/overlay/shared/math/quad.h" #include "rnc/overlay/shared/camera/level_camera.h" -#include "rnc/camera/cam_interp_values.h" +#include "rnc/camera.h" #include "rnc/overlay/shared/camera/init_camera_system.h" #include "rnc/rendering/view/build_look_at_matrix.h" diff --git a/src/overlays/shared/camera/moby_controlled_camera.c b/src/overlays/shared/camera/moby_controlled_camera.c index 0842be0da9..b48e50b6a3 100644 --- a/src/overlays/shared/camera/moby_controlled_camera.c +++ b/src/overlays/shared/camera/moby_controlled_camera.c @@ -11,7 +11,7 @@ #include "rnc/overlay/shared/camera/set_nonzero_follow_camera_parameters.h" #include "rnc/mobys/moby.h" #include "qcopy.h" -#include "rnc/overlay/shared/camera/follow_camera_set_distance.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/rendering/culling/test_point_in_transformed_unit_cylinder.h" #include "rnc/rendering/clip_volume.h" diff --git a/src/overlays/shared/camera/swing_volume_camera.c b/src/overlays/shared/camera/swing_volume_camera.c index 347e6534df..421442e431 100644 --- a/src/overlays/shared/camera/swing_volume_camera.c +++ b/src/overlays/shared/camera/swing_volume_camera.c @@ -10,7 +10,7 @@ #include "rnc/input/pad_state.h" #include "rnc/input/pad_globals.h" #include "rnc/overlay/shared/camera/swing_volume_camera.h" -#include "rnc/overlay/shared/camera/follow_camera_set_distance.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/overlay/shared/camera/follow_camera_set_up_spring.h" #include "rnc/overlay/shared/rendering/culling/test_point_in_transformed_unit_cylinder.h" #include "rnc/rendering/clip_volume.h" diff --git a/src/overlays/shared/cutscenes/update_cutscene_playback.c b/src/overlays/shared/cutscenes/update_cutscene_playback.c index 44424d6b71..94e4b83b75 100644 --- a/src/overlays/shared/cutscenes/update_cutscene_playback.c +++ b/src/overlays/shared/cutscenes/update_cutscene_playback.c @@ -288,8 +288,8 @@ void handle_pause_input(void) { struct UsageStats *usage_stats_ptr = &usage_stats; if (usage_stats_ptr->stat[9].count < 0xFFFF) usage_stats_ptr->stat[9].count++; - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats_ptr->stat[9].unk2) - usage_stats_ptr->stat[9].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > usage_stats_ptr->stat[9].latest_time_bucket) + usage_stats_ptr->stat[9].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; usage_stats_ptr->stat[9].level_mask = usage_stats_ptr->stat[9].level_mask | (1 << current_level_index) | 0x80000000; } diff --git a/src/overlays/shared/cutscenes/update_npc_dialogue.c b/src/overlays/shared/cutscenes/update_npc_dialogue.c index 239f8da627..47e82d7951 100644 --- a/src/overlays/shared/cutscenes/update_npc_dialogue.c +++ b/src/overlays/shared/cutscenes/update_npc_dialogue.c @@ -13,10 +13,10 @@ #include "rnc/math/asm_helpers.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" #include "rnc/overlay/shared/ui/hud/draw_hud_item_selector_panel.h" -#include "rnc/mobys/animation/queue_animation_update.h" +#include "rnc/mobys/animation.h" #include "rnc/overlay/shared/ui/hud/initialize_numeric_hud_element.h" #include "rnc/ui/hud/remove_hud_item.h" -#include "rnc/ui/menus/system/process_menu_entry.h" +#include "rnc/ui/menus/system.h" /* * Scene trigger attached to a moby: when the hero comes close enough (and, diff --git a/src/overlays/shared/enemies/blarg_helicopter_spark.c b/src/overlays/shared/enemies/blarg_helicopter_spark.c index bc5f8e0a7d..98e5b1c748 100644 --- a/src/overlays/shared/enemies/blarg_helicopter_spark.c +++ b/src/overlays/shared/enemies/blarg_helicopter_spark.c @@ -14,7 +14,7 @@ #include "rnc/mobys/moby_spawn.h" #include "rnc/overlay/shared/audio/voices/voice_is_playing.h" #include "rnc/overlay/shared/math/random/random_int_between.h" -#include "rnc/overlay/shared/rendering/effects/create_type_31_part.h" +#include "rnc/overlay/shared/rendering/effects.h" #include "rnc/overlay/shared/rendering/effects/update_three_phase_effect_particle.h" typedef struct { diff --git a/src/overlays/shared/enemies/blarg_trooper_projectile.c b/src/overlays/shared/enemies/blarg_trooper_projectile.c index 1dc76b1c27..7d460fde7f 100644 --- a/src/overlays/shared/enemies/blarg_trooper_projectile.c +++ b/src/overlays/shared/enemies/blarg_trooper_projectile.c @@ -17,7 +17,7 @@ #include "rnc/overlay/shared/math/vu0_vector_ops.h" #include "rnc/overlay/shared/mobys/evaluate_moby_animation_pose.h" #include "rnc/world/collision/collision_line.h" -#include "rnc/overlay/l04/spawn_smoke_puff_trail_with_endpoint_bursts.h" +#include "rnc/overlay/l04.h" /* Builds two direction vectors from a table and relative to a moby, then hands them to the L04 effect spawner. */ /* Ported from rac1-decomp (src/overlays/shared/vendor_002B0068.c: func_L04_002C5938), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/shared/enemies/gadgebot_spawn_container.c b/src/overlays/shared/enemies/gadgebot_spawn_container.c index d7782074de..6ab438f20a 100644 --- a/src/overlays/shared/enemies/gadgebot_spawn_container.c +++ b/src/overlays/shared/enemies/gadgebot_spawn_container.c @@ -11,7 +11,7 @@ #include "rnc/audio/voice_alloc.h" #include "rnc/overlay/shared/camera/level_camera.h" #include "rnc/overlay/shared/math/random/random_int_between.h" -#include "rnc/overlay/shared/props/spinning_fragment.h" +#include "rnc/overlay/shared/props.h" typedef struct { float corner[4][4]; diff --git a/src/overlays/shared/enemies/ground_melee_enemy.c b/src/overlays/shared/enemies/ground_melee_enemy.c index 172a2681c1..27a97ea414 100644 --- a/src/overlays/shared/enemies/ground_melee_enemy.c +++ b/src/overlays/shared/enemies/ground_melee_enemy.c @@ -19,7 +19,7 @@ #include "qcopy.h" #include "rnc/overlay/shared/world/level_path.h" #include "rnc/overlay/shared/mobys/count_active_moby_group_members.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/sdk/libc/stdlib.h" /* Ground enemy update: damage reaction, leash and wake checks, then its chase / attack / return state machine. */ /* Ported from rac1-decomp (src/overlays/shared/vendor_002C6B30.c: func_L09_002E39E0), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/shared/enemies/plasmabot.c b/src/overlays/shared/enemies/plasmabot.c index 9873809251..ff549d47eb 100644 --- a/src/overlays/shared/enemies/plasmabot.c +++ b/src/overlays/shared/enemies/plasmabot.c @@ -29,7 +29,7 @@ #include "rnc/overlay/shared/enemies/plasmabot_death_debris.h" #include "rnc/overlay/shared/enemies/path_or_ballistic_debris.h" #include "rnc/overlay/shared/rendering/effects/spawn_explosion.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/sdk/debug.h" /* Ported from rac1-decomp (src/overlays/shared/vendor_002B2A28.c: func_L14_002B44B8), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/shared/enemies/sentrybot_alarm.c b/src/overlays/shared/enemies/sentrybot_alarm.c index c289df07ff..66fe1f1aaa 100644 --- a/src/overlays/shared/enemies/sentrybot_alarm.c +++ b/src/overlays/shared/enemies/sentrybot_alarm.c @@ -11,8 +11,8 @@ #include "rnc/mobys/animation/blend_moby_animation.h" #include "rnc/world/collision/collision_line.h" #include "rnc/overlay/shared/audio/voices/voice_is_playing.h" -#include "rnc/overlay/shared/enemies/sentrybot.h" -#include "rnc/overlay/shared/rendering/emit_sine_modulated_rgba_draw_packet.h" +#include "rnc/overlay/shared/enemies.h" +#include "rnc/overlay/shared/rendering.h" typedef struct { int w[20]; diff --git a/src/overlays/shared/enemies/spawner.c b/src/overlays/shared/enemies/spawner.c index 0c0e02357c..b59d5d89b3 100644 --- a/src/overlays/shared/enemies/spawner.c +++ b/src/overlays/shared/enemies/spawner.c @@ -17,7 +17,7 @@ #include "rnc/overlay/shared/math/interpolation/spring_turn.h" #include "rnc/overlay/shared/world/level_path.h" #include "rnc/overlay/shared/enemies/spawner_egg.h" -#include "rnc/overlay/shared/math/random/generate_random_scaled_vector2.h" +#include "rnc/overlay/shared/math/random.h" typedef struct SpawnerVars { u8 pad0[0x20]; diff --git a/src/overlays/shared/enemies/spiderbot.c b/src/overlays/shared/enemies/spiderbot.c index de64e8fa69..6b89e566ce 100644 --- a/src/overlays/shared/enemies/spiderbot.c +++ b/src/overlays/shared/enemies/spiderbot.c @@ -14,7 +14,7 @@ #include "rnc/rendering/effect_texture.h" #include "rnc/rendering/view/build_look_at_matrix.h" #include "rnc/runtime/callbacks/add_draw_callback.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/sdk/libc/stdlib.h" typedef struct SpiderbotVars { u8 pad0[0x10]; diff --git a/src/overlays/shared/enemies/trooper_play_sound.c b/src/overlays/shared/enemies/trooper_play_sound.c index 1f7804d1c4..ff34e08e10 100644 --- a/src/overlays/shared/enemies/trooper_play_sound.c +++ b/src/overlays/shared/enemies/trooper_play_sound.c @@ -3,7 +3,7 @@ #include "asm.h" #include "rnc/data_labels.h" #include "rnc/overlay/shared/world/level_labels.h" -#include "rnc/audio/voices/allocate_voice_slot.h" +#include "rnc/audio/voices.h" /* Ported from rac1-decomp (src/overlays/shared/sound_0028EB98.c: func_L00_0028EF68), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/shared/enemies/walker_update_gait.c b/src/overlays/shared/enemies/walker_update_gait.c index 0984dc1b63..acd6d5c52f 100644 --- a/src/overlays/shared/enemies/walker_update_gait.c +++ b/src/overlays/shared/enemies/walker_update_gait.c @@ -8,7 +8,7 @@ #include "rnc/game/interpolated_record.h" #include "rnc/mobys/animation/blend_moby_animation.h" #include "rnc/mobys/moby.h" -#include "rnc/overlay/shared/mobys/find_nearest_animation_sequence_entry.h" +#include "rnc/overlay/shared/mobys.h" int walker_gait_mask(float *a, float v) __asm__("FUN_L00_002a13f0"); diff --git a/src/overlays/shared/game/init_level_runtime_state.c b/src/overlays/shared/game/init_level_runtime_state.c index b6025fa2b8..0cb40cf567 100644 --- a/src/overlays/shared/game/init_level_runtime_state.c +++ b/src/overlays/shared/game/init_level_runtime_state.c @@ -12,7 +12,7 @@ #include "rnc/rendering/vu1/vu1_init_chain.h" #include "rnc/runtime/memory/init_mem_slots.h" #include "rnc/rendering/vu1/dmac_vif1_enable.h" -#include "rnc/overlay/shared/rendering/effects/register_part_types.h" +#include "rnc/overlay/shared/rendering/effects.h" extern u8 D_L00_00197BC0_lui[] __asm__("D_L00_00197BC0") NOT_SDA; extern char D_L00_001C5B00_lui[] __asm__("D_L00_001C5B00") NOT_SDA; diff --git a/src/overlays/shared/game/initialize_level_transition_with_audio.c b/src/overlays/shared/game/initialize_level_transition_with_audio.c index 7be1277e21..5fb8f1f457 100644 --- a/src/overlays/shared/game/initialize_level_transition_with_audio.c +++ b/src/overlays/shared/game/initialize_level_transition_with_audio.c @@ -14,8 +14,8 @@ #include "rnc/world/loaders/parse_space_scene_chunk.h" #include "rnc/audio/voices/sound_update.h" #include "rnc/overlay/shared/hero/set_hero_animation.h" -#include "rnc/overlay/shared/mobys/update_moby_proximity_interaction.h" -#include "rnc/overlay/shared/streaming/load_scene_chunks_with_fade.h" +#include "rnc/overlay/shared/mobys.h" +#include "rnc/overlay/shared/streaming.h" #include "rnc/overlay/shared/ui/help/help_request.h" #include "rnc/rendering/effect_texture.h" diff --git a/src/overlays/shared/game/run_level_main_loop.c b/src/overlays/shared/game/run_level_main_loop.c index 206267f687..c8dd3b2e2e 100644 --- a/src/overlays/shared/game/run_level_main_loop.c +++ b/src/overlays/shared/game/run_level_main_loop.c @@ -37,28 +37,24 @@ #include "rnc/game/transitions/tick_space_transition.h" #include "rnc/streaming/stash/init_stash.h" #include "rnc/ui/hud/init_hud.h" -#include "rnc/audio/music/music_start_track.h" +#include "rnc/audio/music.h" #include "rnc/audio/streaming/read_disc_sectors_and_wait.h" -#include "rnc/game/dispatch_game_state_update.h" -#include "rnc/game/update_mode_freeze.h" -#include "rnc/game/update_resident_gameplay_state.h" +#include "rnc/game.h" #include "rnc/overlay/shared/cutscenes/update_cutscene_playback.h" -#include "rnc/overlay/shared/game/init_level_runtime_state.h" -#include "rnc/overlay/shared/game/initialize_level_transition_with_audio.h" -#include "rnc/overlay/shared/rendering/debug/draw_debug_profiler_if_enabled.h" -#include "rnc/overlay/shared/rendering/debug/update_debug_menu.h" +#include "rnc/overlay/shared/game.h" +#include "rnc/overlay/shared/rendering/debug.h" #include "rnc/overlay/shared/rendering/effects/particles.h" -#include "rnc/overlay/shared/rendering/frame/frame_roll_counter.h" +#include "rnc/overlay/shared/rendering/frame.h" #include "rnc/overlay/shared/ui/menus/initialize_pause_menu.h" -#include "rnc/overlay/shared/ui/text/draw_dialog_background_and_text.h" -#include "rnc/overlay/shared/vendor/draw_vendor_inset_quads.h" +#include "rnc/overlay/shared/ui/text.h" +#include "rnc/overlay/shared/vendor.h" #include "rnc/overlay/shared/vendor/vendor_menu.h" #include "rnc/overlay/shared/world/load_level_gameplay.h" -#include "rnc/rendering/debug/prepare_debug_profiler_render.h" -#include "rnc/rendering/frame/reset_gs_registers_pr.h" -#include "rnc/rendering/packets/put_disp_buffer.h" -#include "rnc/streaming/stash/stash_send_data.h" -#include "rnc/ui/map/update_map_icons.h" +#include "rnc/rendering/debug.h" +#include "rnc/rendering/frame.h" +#include "rnc/rendering/packets.h" +#include "rnc/streaming/stash.h" +#include "rnc/ui/map.h" /* Level main loop (shared by every level): clears the level's work area, sets up the level and counts the visit and play time of the planet, then runs one frame per pass, dispatching on the game mode, until the level asks to @@ -153,8 +149,8 @@ void run_level_main_loop(void) { item_usage[current_level_index].count++; } per = 600; - if (scale_game_frames(D_0015EEA4) / per > item_usage[current_level_index].unk2) { - item_usage[current_level_index].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / per > item_usage[current_level_index].latest_time_bucket) { + item_usage[current_level_index].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } item_usage[current_level_index].level_mask = item_usage[current_level_index].level_mask | (1 << current_level_index) | 0x80000000; @@ -312,8 +308,10 @@ void run_level_main_loop(void) { init_hud(); } per = 600; - if (scale_game_frames(D_0015EEA4) / per > item_usage[current_level_index].unk2) { - item_usage[current_level_index].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / per > + item_usage[current_level_index].latest_time_bucket) { + item_usage[current_level_index].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } } do_space_transition(); diff --git a/src/overlays/shared/hero/handle_hero_hit.c b/src/overlays/shared/hero/handle_hero_hit.c index 8503f31eee..298ed0b8d7 100644 --- a/src/overlays/shared/hero/handle_hero_hit.c +++ b/src/overlays/shared/hero/handle_hero_hit.c @@ -6,7 +6,7 @@ #include "asm.h" #include "qcopy.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/math/quad.h" #include "rnc/overlay/shared/mobys/entities.h" #include "rnc/data_labels.h" diff --git a/src/overlays/shared/hero/hero_frame_update.c b/src/overlays/shared/hero/hero_frame_update.c index 00842e9305..4dcdbab0ad 100644 --- a/src/overlays/shared/hero/hero_frame_update.c +++ b/src/overlays/shared/hero/hero_frame_update.c @@ -4,7 +4,7 @@ #include "rnc/hero/hero.h" #include "rnc/globals.h" #include "asm.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/math/quad.h" #include "rnc/overlay/shared/world/collision.h" #include "rnc/overlay/shared/mobys/entities.h" diff --git a/src/overlays/shared/hero/hero_set_state.c b/src/overlays/shared/hero/hero_set_state.c index 00a65d8eab..7778f53819 100644 --- a/src/overlays/shared/hero/hero_set_state.c +++ b/src/overlays/shared/hero/hero_set_state.c @@ -1018,8 +1018,8 @@ int hero_set_state(int a, int b) { } { struct UsageStat *h = usage_stats.stat; - if (scale_game_frames(D_0015EEA4) / 600 > h[12].unk2) { - h[12].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[12].latest_time_bucket) { + h[12].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } { struct Hero *q = &hero; @@ -1033,8 +1033,8 @@ int hero_set_state(int a, int b) { } { struct UsageStat *h = usage_stats.stat; - if (scale_game_frames(D_0015EEA4) / 600 > h[29].unk2) { - h[29].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[29].latest_time_bucket) { + h[29].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[29].level_mask = h[29].level_mask | (1 << current_level_index) | 0x80000000; } @@ -2212,8 +2212,8 @@ int hero_set_state(int a, int b) { if (h[0].count <= 0xFFFE) { h[0].count = h[0].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[0].unk2) { - h[0].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[0].latest_time_bucket) { + h[0].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[0].level_mask = h[0].level_mask | (1 << current_level_index) | 0x80000000; q = &hero; @@ -2242,8 +2242,8 @@ int hero_set_state(int a, int b) { if (h[1].count <= 0xFFFE) { h[1].count = h[1].count + 1; } - if (scale_game_frames(D_0015EEA4) / 600 > h[1].unk2) { - h[1].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > h[1].latest_time_bucket) { + h[1].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; } h[1].level_mask = h[1].level_mask | (1 << current_level_index) | 0x80000000; item_usage_stats_base = item_usage; diff --git a/src/overlays/shared/hero/hero_switch_item.c b/src/overlays/shared/hero/hero_switch_item.c index 29ef254d84..44b6ed3814 100644 --- a/src/overlays/shared/hero/hero_switch_item.c +++ b/src/overlays/shared/hero/hero_switch_item.c @@ -223,7 +223,7 @@ int FUN_L00_0020cd08(Vec4 *from, return 0; } -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/math/quad.h" typedef struct { diff --git a/src/overlays/shared/hero/hero_update_movement.c b/src/overlays/shared/hero/hero_update_movement.c index 2fd2712e0a..5f44df66f2 100644 --- a/src/overlays/shared/hero/hero_update_movement.c +++ b/src/overlays/shared/hero/hero_update_movement.c @@ -299,8 +299,9 @@ void hero_update_movement(void) { usage_stats.stat[18].count++; } t = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[18].unk2 < t) { - usage_stats.stat[18].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[18].latest_time_bucket < t) { + usage_stats.stat[18].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } D_L00_0015F688 = -1; usage_stats.stat[18].level_mask = @@ -569,8 +570,9 @@ void hero_update_movement(void) { usage_stats.stat[11].count++; } t2 = scale_game_frames(D_0015EEA4) / 600; - if (usage_stats.stat[11].unk2 < t2) { - usage_stats.stat[11].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (usage_stats.stat[11].latest_time_bucket < t2) { + usage_stats.stat[11].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[11].level_mask = usage_stats.stat[11].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/shared/hero/hero_update_transitions.c b/src/overlays/shared/hero/hero_update_transitions.c index 1144c8d596..84e1b8daad 100644 --- a/src/overlays/shared/hero/hero_update_transitions.c +++ b/src/overlays/shared/hero/hero_update_transitions.c @@ -6,7 +6,7 @@ #include "asm.h" #include "qcopy.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/math/quad.h" #include "rnc/input/pad_state.h" #include "rnc/hero/hero.h" @@ -266,8 +266,10 @@ void hero_update_transitions(void) { if (usage_stats.stat[31].count < 0xFFFF) { usage_stats.stat[31].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[31].unk2) { - usage_stats.stat[31].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > + usage_stats.stat[31].latest_time_bucket) { + usage_stats.stat[31].latest_time_bucket = + scale_game_frames(D_0015EEA4) / 600; } usage_stats.stat[31].level_mask = usage_stats.stat[31].level_mask | (1 << current_level_index) | 0x80000000; diff --git a/src/overlays/shared/hero/process_hero_primary_item_input.c b/src/overlays/shared/hero/process_hero_primary_item_input.c index 45d8859350..4c774cbffd 100644 --- a/src/overlays/shared/hero/process_hero_primary_item_input.c +++ b/src/overlays/shared/hero/process_hero_primary_item_input.c @@ -1097,8 +1097,8 @@ int process_hero_primary_item_input(void) { } play_time = scale_game_frames(D_0015EEA4_macro); unit = 600; - if (play_time / unit > stats->stat[27].unk2) { - stats->stat[27].unk2 = scale_game_frames(D_0015EEA4_macro) / 600; + if (play_time / unit > stats->stat[27].latest_time_bucket) { + stats->stat[27].latest_time_bucket = scale_game_frames(D_0015EEA4_macro) / 600; } stats->stat[27].level_mask = stats->stat[27].level_mask | (1 << D_0015ED84_gp) | 0x80000000; allocate_voice_for_target_entry(0, 0, (int)item); @@ -1376,8 +1376,8 @@ void update_hero_hoverboard_trick_score(void) { struct UsageStats *stats = &usage_stats; if (stats->stat[30].count < 0xFFFF) stats->stat[30].count++; - if (scale_game_frames(D_0015EEA4) / 600 > stats->stat[30].unk2) - stats->stat[30].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > stats->stat[30].latest_time_bucket) + stats->stat[30].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; stats->stat[30].level_mask = stats->stat[30].level_mask | (1 << D_0015ED84) | 0x80000000; } for (i = 0; i < 3; i++) { diff --git a/src/overlays/shared/hero/update_hero_ground_contact.c b/src/overlays/shared/hero/update_hero_ground_contact.c index 9c8eb1e290..5e49217a53 100644 --- a/src/overlays/shared/hero/update_hero_ground_contact.c +++ b/src/overlays/shared/hero/update_hero_ground_contact.c @@ -4,7 +4,7 @@ #include "rnc/hero/hero.h" #include "rnc/globals.h" #include "asm.h" -#include "rnc/overlay/shared/hero/hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/world/collision.h" #include "sda.h" #include "rnc/mobys/get_moby_target_info.h" @@ -14,7 +14,7 @@ #include "rnc/overlay/shared/camera/find_camera_collision_volume_for_point.h" #include "rnc/sdk/library/sceVu0Normalize.h" #include "rnc/world/collision/collision_line.h" -#include "rnc/camera/resolve_camera_surface_height.h" +#include "rnc/camera.h" typedef struct { char pad[0x24]; diff --git a/src/overlays/shared/math/random/generate_random_scaled_vector2.c b/src/overlays/shared/math/random/generate_random_scaled_vector2.c index b76ba50e49..0edaad91fa 100644 --- a/src/overlays/shared/math/random/generate_random_scaled_vector2.c +++ b/src/overlays/shared/math/random/generate_random_scaled_vector2.c @@ -4,7 +4,7 @@ #include "rnc/math/fast_math.h" #include "rnc/math/asm_helpers.h" #include "rnc/math/random.h" -#include "rnc/overlay/shared/math/random/scale_by_one_minus_random_squared.h" +#include "rnc/overlay/shared/math/random.h" /* Ported from rac1-decomp (src/overlays/shared/mobyutil_002785C0.c: func_L09_00278690), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/shared/math/random/random_int_between.c b/src/overlays/shared/math/random/random_int_between.c index c8bb4fe4a7..9f2613120a 100644 --- a/src/overlays/shared/math/random/random_int_between.c +++ b/src/overlays/shared/math/random/random_int_between.c @@ -1,7 +1,7 @@ /* Random: an int between two bounds, and a symmetric random float. */ #include "types.h" #include "asm.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/sdk/libc/stdlib.h" /* Ported from rac1-decomp (src/overlays/shared/mobyutil_00258BC8.c: func_L00_00258BC8), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/shared/math/random/scale_by_one_minus_random_squared.c b/src/overlays/shared/math/random/scale_by_one_minus_random_squared.c index 54fffda48f..7f5538410d 100644 --- a/src/overlays/shared/math/random/scale_by_one_minus_random_squared.c +++ b/src/overlays/shared/math/random/scale_by_one_minus_random_squared.c @@ -1,7 +1,7 @@ /* Random: scales a value by one minus a squared random value. */ #include "types.h" #include "asm.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/sdk/libc/stdlib.h" /* Ported from rac1-decomp (src/overlays/shared/mobyutil_002785C0.c: func_L09_002785C0), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/shared/mobys/apply_nearest_environment_sample.c b/src/overlays/shared/mobys/apply_nearest_environment_sample.c index db99b26492..e8d8787e79 100644 --- a/src/overlays/shared/mobys/apply_nearest_environment_sample.c +++ b/src/overlays/shared/mobys/apply_nearest_environment_sample.c @@ -6,7 +6,7 @@ #include "rnc/game/game_globals.h" #include "rnc/overlay/shared/world/level_labels.h" #include "rnc/math/fast_math.h" -#include "rnc/rendering/packets/pack_render_command_fields.h" +#include "rnc/rendering/packets.h" /* Finds the table entry nearest the object's position (within 8 units) and applies its fields to the object and globals. */ /* Ported from rac1-decomp (src/overlays/shared/mobyfunc_0024FD50.c: func_L00_002510F0), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/shared/mobys/draw_only_moby_update.c b/src/overlays/shared/mobys/draw_only_moby_update.c index f9c8fb5eb4..76d17cc3d5 100644 --- a/src/overlays/shared/mobys/draw_only_moby_update.c +++ b/src/overlays/shared/mobys/draw_only_moby_update.c @@ -3,7 +3,7 @@ #include "rnc/mobys/moby.h" #include "qcopy.h" #include "rnc/runtime/callbacks/add_draw_callback.h" -#include "rnc/overlay/l16/mobys/reflection_mesh_pair.h" +#include "rnc/overlay/l16/mobys.h" void draw_only_moby_update(struct Moby *moby) __asm__("FUN_L16_002e9df0"); diff --git a/src/overlays/shared/mobys/update_moby_proximity_interaction.c b/src/overlays/shared/mobys/update_moby_proximity_interaction.c index 1a663e6e4d..4028b0daf9 100644 --- a/src/overlays/shared/mobys/update_moby_proximity_interaction.c +++ b/src/overlays/shared/mobys/update_moby_proximity_interaction.c @@ -13,7 +13,7 @@ #include "rnc/ui/help/try_set_help_message.h" #include "rnc/overlay/shared/ui/help/remove_help_message_for_selector.h" #include "rnc/mobys/moby.h" -#include "rnc/rendering/mobys/render_environment_mapped_object.h" +#include "rnc/rendering/mobys.h" /* Per-frame update of a pickup-like moby: pulses its colour, tracks the player's range and collects items. */ extern int D_L00_0015F5C4; diff --git a/src/overlays/shared/pickups/codebot.c b/src/overlays/shared/pickups/codebot.c index c85718f037..240629c3ea 100644 --- a/src/overlays/shared/pickups/codebot.c +++ b/src/overlays/shared/pickups/codebot.c @@ -12,7 +12,7 @@ #include "rnc/overlay/shared/mobys/select_auto_aim_target_moby.h" #include "rnc/save/memcard_save_data.h" #include "rnc/game/item_state.h" -#include "rnc/overlay/shared/pickups/gadget_pickup.h" +#include "rnc/overlay/shared/pickups.h" typedef struct { char pad0[0x10]; diff --git a/src/overlays/shared/props/energy_sphere_holder.c b/src/overlays/shared/props/energy_sphere_holder.c index cee8271102..d3b9438243 100644 --- a/src/overlays/shared/props/energy_sphere_holder.c +++ b/src/overlays/shared/props/energy_sphere_holder.c @@ -10,7 +10,7 @@ #include "rnc/game/game_globals.h" #include "rnc/game/item_state.h" #include "rnc/overlay/shared/props/energy_sphere_holder_data/update_energy_sphere_holder_beam_effects.h" -#include "rnc/overlay/shared/props/initialize_energy_sphere_holder_vars.h" +#include "rnc/overlay/shared/props.h" #include "rnc/overlay/shared/rendering/effects/particles.h" typedef struct { diff --git a/src/overlays/shared/props/linked_spark_emitter.c b/src/overlays/shared/props/linked_spark_emitter.c index 50e754ce87..7fbc7aa6f8 100644 --- a/src/overlays/shared/props/linked_spark_emitter.c +++ b/src/overlays/shared/props/linked_spark_emitter.c @@ -11,8 +11,8 @@ #include "rnc/audio/voice_pool.h" #include "qzero.h" #include "rnc/overlay/shared/props/linked_spark_emitter_data/draw_spark_emitter_effect_quads.h" -#include "rnc/overlay/shared/enemies/sentrybot.h" -#include "rnc/overlay/shared/rendering/effects/spawn_owner_target_particle.h" +#include "rnc/overlay/shared/enemies.h" +#include "rnc/overlay/shared/rendering/effects.h" #include "rnc/rendering/effect_texture.h" #include "rnc/runtime/callbacks/add_draw_callback.h" diff --git a/src/overlays/shared/props/ripple_strips.c b/src/overlays/shared/props/ripple_strips.c index 65765dc87b..76a677899e 100644 --- a/src/overlays/shared/props/ripple_strips.c +++ b/src/overlays/shared/props/ripple_strips.c @@ -4,7 +4,7 @@ #include "rnc/mobys/moby.h" #include "rnc/runtime/callbacks/add_draw_callback.h" #include "rnc/overlay/shared/rendering/set_moby_color.h" -#include "rnc/overlay/l15/mobys/radial_ripple_mesh.h" +#include "rnc/overlay/l15/mobys.h" /* Ported from rac1-decomp (src/overlays/shared/vendor_002D7C00.c: func_L15_002EC490), where it is exact; names translated to the US level program. */ void ripple_strips_moby_update(struct Moby *moby) __asm__("FUN_L15_002eb0a0"); diff --git a/src/overlays/shared/props/swingshot_versatarget.c b/src/overlays/shared/props/swingshot_versatarget.c index 32e95dad99..44eec1bdc6 100644 --- a/src/overlays/shared/props/swingshot_versatarget.c +++ b/src/overlays/shared/props/swingshot_versatarget.c @@ -9,7 +9,7 @@ #include "rnc/math/random.h" #include "rnc/overlay/shared/rendering/set_moby_color.h" #include "qcopy.h" -#include "rnc/overlay/shared/camera/follow_camera_offset_effect.h" +#include "rnc/overlay/shared/camera.h" typedef struct Hero Hero; diff --git a/src/overlays/shared/rendering/build_interpolated_dma_packet.c b/src/overlays/shared/rendering/build_interpolated_dma_packet.c index b8845de92b..dbeaaf55ed 100644 --- a/src/overlays/shared/rendering/build_interpolated_dma_packet.c +++ b/src/overlays/shared/rendering/build_interpolated_dma_packet.c @@ -12,7 +12,7 @@ #include "qcopy.h" #include "rnc/rendering/dma_tag.h" #include "sda.h" -#include "rnc/rendering/vu1/vu1_add_vif_code.h" +#include "rnc/rendering/vu1.h" typedef struct QuadDrawArgs { char pad0[0x1C]; diff --git a/src/overlays/shared/rendering/debug/update_debug_menu.c b/src/overlays/shared/rendering/debug/update_debug_menu.c index 717fa715c5..5cdbc2b879 100644 --- a/src/overlays/shared/rendering/debug/update_debug_menu.c +++ b/src/overlays/shared/rendering/debug/update_debug_menu.c @@ -13,15 +13,12 @@ #include "rnc/rendering/effects/update_fog.h" #include "rnc/rendering/debug/print_debug_text.h" #include "rnc/rendering/debug/print_debug_text_centered.h" -#include "rnc/camera/update_all_cameras.h" -#include "rnc/overlay/shared/camera/follow_camera_setup.h" +#include "rnc/camera.h" +#include "rnc/overlay/shared/camera.h" #include "rnc/rendering/vu1_registers.h" -#include "rnc/sdk/libc/stdio/sprintf.h" -#include "rnc/sdk/storage/fileio/sceClose.h" -#include "rnc/sdk/storage/fileio/sceRead.h" -#include "rnc/sdk/storage/fileio/sce_lseek.h" +#include "rnc/sdk/libc/stdio.h" +#include "rnc/sdk/storage/fileio.h" #include "rnc/sdk/storage/fileio/sceopen.h" -#include "rnc/sdk/storage/fileio/scewrite.h" typedef struct { s32 a, b, c, d; diff --git a/src/overlays/shared/rendering/effects/ground_particle_scatter.c b/src/overlays/shared/rendering/effects/ground_particle_scatter.c index ce80a90c3a..7bacc1f1db 100644 --- a/src/overlays/shared/rendering/effects/ground_particle_scatter.c +++ b/src/overlays/shared/rendering/effects/ground_particle_scatter.c @@ -11,7 +11,7 @@ #include "rnc/overlay/shared/rendering/effects/ground_particle_scatter_globals.h" #include "rnc/overlay/shared/rendering/effects/ground_particle_scatter.h" #include "rnc/overlay/shared/game/queue_planet_unlock_message.h" -#include "rnc/overlay/shared/rendering/effects/create_type_49_particle.h" +#include "rnc/overlay/shared/rendering/effects.h" typedef struct Moby Moby; diff --git a/src/overlays/shared/rendering/effects/spawn_projectile_expiry_particle.c b/src/overlays/shared/rendering/effects/spawn_projectile_expiry_particle.c index afc81120b0..9eca6d26c3 100644 --- a/src/overlays/shared/rendering/effects/spawn_projectile_expiry_particle.c +++ b/src/overlays/shared/rendering/effects/spawn_projectile_expiry_particle.c @@ -11,7 +11,7 @@ #include "rnc/math/random.h" #include "rnc/overlay/shared/mobys/moby_point_position.h" #include "rnc/overlay/shared/rendering/effects/create_part.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/sdk/libc/stdlib.h" /* Ported from rac1-decomp (src/overlays/shared/partupd_0029B070.c: func_L07_0029B070), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/shared/rendering/effects/spawn_type_10_particle.c b/src/overlays/shared/rendering/effects/spawn_type_10_particle.c index 584aeda16e..2f0c73ff43 100644 --- a/src/overlays/shared/rendering/effects/spawn_type_10_particle.c +++ b/src/overlays/shared/rendering/effects/spawn_type_10_particle.c @@ -10,7 +10,7 @@ #include "rnc/math/random.h" #include "rnc/overlay/shared/math/random/random_int_between.h" #include "rnc/overlay/shared/rendering/effects/create_part.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/sdk/libc/stdlib.h" /* Spawns a type-10 particle at a position and sets its colour, size, life and velocity. */ /* Ported from rac1-decomp (src/overlays/shared/partupd_00280428.c: func_L01_00280428), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/shared/rendering/frame/capture_draw_buffer.c b/src/overlays/shared/rendering/frame/capture_draw_buffer.c index 10b25b5ccd..3cf6b36423 100644 --- a/src/overlays/shared/rendering/frame/capture_draw_buffer.c +++ b/src/overlays/shared/rendering/frame/capture_draw_buffer.c @@ -6,7 +6,7 @@ #include "rnc/overlay/shared/rendering/buffers/vu1_send_chain_render_buffer.h" #include "rnc/rendering/vu1/vu1_init_chain.h" #include "rnc/overlay/shared/rendering/buffers/transfer_draw_buffer_chunks.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" +#include "rnc/sdk/graph.h" /* Ported from rac1-decomp (src/overlays/shared/draw_001F3A78.c: func_L00_001F9D40), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/shared/ui/hud/draw_hud_item_selector_panel.c b/src/overlays/shared/ui/hud/draw_hud_item_selector_panel.c index eeb27d400e..b5570f168f 100644 --- a/src/overlays/shared/ui/hud/draw_hud_item_selector_panel.c +++ b/src/overlays/shared/ui/hud/draw_hud_item_selector_panel.c @@ -20,7 +20,7 @@ #include "rnc/overlay/shared/ui/hud/draw_weapon_ammo_hud_panel.h" #include "rnc/ui/help/get_help_message_text.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" -#include "rnc/sdk/libc/stdio/sprintf.h" +#include "rnc/sdk/libc/stdio.h" extern unsigned char D_0013E529[]; void hud_update_counter(char *) __asm__("FUN_L00_00235ea0"); @@ -365,8 +365,8 @@ void update_hud_item_selector_selection_and_visibility(Obj *hud_element) { if (usage_stats.stat[20].count < 0xFFFF) usage_stats.stat[20].count++; } - if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[20].unk2) - usage_stats.stat[20].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (scale_game_frames(D_0015EEA4) / 600 > usage_stats.stat[20].latest_time_bucket) + usage_stats.stat[20].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; usage_stats.stat[20].level_mask = usage_stats.stat[20].level_mask | (1 << current_level_index) | 0x80000000; if (id == 0x18) diff --git a/src/overlays/shared/ui/hud/draw_hud_segment_meter.c b/src/overlays/shared/ui/hud/draw_hud_segment_meter.c index a5ffe7ace2..817d9b3755 100644 --- a/src/overlays/shared/ui/hud/draw_hud_segment_meter.c +++ b/src/overlays/shared/ui/hud/draw_hud_segment_meter.c @@ -8,7 +8,7 @@ #include "rnc/ui/hud/get_icon_frame.h" #include "rnc/ui/hud/sprites/draw_hud_sprite.h" #include "rnc/ui/hud/sprites/draw_hud_sprite_flipped.h" -#include "rnc/ui/hud/append_screen_rect_packet.h" +#include "rnc/ui/hud.h" extern s32 frame_size __asm__("D_0013E504") NOT_SDA; extern s32 D_L06_0015F8E8 __attribute__((sda)); diff --git a/src/overlays/shared/ui/hud/draw_weapon_ammo_hud_panel.c b/src/overlays/shared/ui/hud/draw_weapon_ammo_hud_panel.c index 80cd39ea8e..4630645fee 100644 --- a/src/overlays/shared/ui/hud/draw_weapon_ammo_hud_panel.c +++ b/src/overlays/shared/ui/hud/draw_weapon_ammo_hud_panel.c @@ -16,7 +16,7 @@ #include "rnc/ui/hud/sprites/draw_hud_sprite_flipped.h" #include "rnc/mobys/animation/apply_pending_animation.h" #include "rnc/overlay/shared/ui/hud/hud_frame.h" -#include "rnc/mobys/animation/queue_animation_update.h" +#include "rnc/mobys/animation.h" #include "rnc/overlay/shared/ui/hud/draw_hud_item_selector_panel.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" diff --git a/src/overlays/shared/ui/hud/hud_keep_visible.c b/src/overlays/shared/ui/hud/hud_keep_visible.c index f93d47f995..c6b947cf7e 100644 --- a/src/overlays/shared/ui/hud/hud_keep_visible.c +++ b/src/overlays/shared/ui/hud/hud_keep_visible.c @@ -13,10 +13,10 @@ #include "rnc/mobys/animation/apply_pending_animation.h" #include "rnc/overlay/shared/ui/hud/hud_frame.h" #include "rnc/ui/frames/draw_framed_text.h" -#include "rnc/mobys/animation/queue_animation_update.h" -#include "rnc/ui/hud/append_screen_rect_packet.h" -#include "rnc/ui/hud/sprites/draw_hud_sprite_subpixel.h" -#include "rnc/ui/text/font/font_print_center.h" +#include "rnc/mobys/animation.h" +#include "rnc/ui/hud.h" +#include "rnc/ui/hud/sprites.h" +#include "rnc/ui/text/font.h" /* The level's HUD bank reset, a shorter func_001FF6B8 (src/game/hud.c): for each of the 13 bank records at D_L00_0017DD50, func_001FFB38(i, diff --git a/src/overlays/shared/ui/map/reveal_map_around_position.c b/src/overlays/shared/ui/map/reveal_map_around_position.c index 6b7f722126..687ebca56c 100644 --- a/src/overlays/shared/ui/map/reveal_map_around_position.c +++ b/src/overlays/shared/ui/map/reveal_map_around_position.c @@ -7,7 +7,7 @@ #include "rnc/hero/hero.h" #include "sda.h" #include "rnc/overlay/shared/ui/menus/ensure_menu_cache_entry.h" -#include "rnc/ui/map/world_to_map_coords.h" +#include "rnc/ui/map.h" typedef struct { f32 lower; diff --git a/src/overlays/shared/ui/text/draw_dialog_background_and_text.c b/src/overlays/shared/ui/text/draw_dialog_background_and_text.c index 2b6c0f4678..c9d7d21a0c 100644 --- a/src/overlays/shared/ui/text/draw_dialog_background_and_text.c +++ b/src/overlays/shared/ui/text/draw_dialog_background_and_text.c @@ -10,10 +10,9 @@ #include "rnc/rendering/packets/emit_rgba_draw_packet.h" #include "rnc/rendering/frame/reset_gs_registers.h" #include "rnc/overlay/shared/ui/menus/initialize_pause_menu.h" -#include "rnc/overlay/shared/rendering/frame/queue_framebuffer_upload.h" -#include "rnc/overlay/shared/ui/menus/get_pause_menu_mode.h" -#include "rnc/overlay/shared/ui/text/draw_timed_text.h" -#include "rnc/overlay/shared/ui/text/level_draw_dialog_text.h" +#include "rnc/overlay/shared/rendering/frame.h" +#include "rnc/overlay/shared/ui/menus.h" +#include "rnc/overlay/shared/ui/text.h" extern int D_L00_0015F5D8; /* The level overlay's own copy of draw_dialog_text: same code, own data. */ diff --git a/src/overlays/shared/vehicles/taxi_path.c b/src/overlays/shared/vehicles/taxi_path.c index 1de8372896..a1a5aea2dc 100644 --- a/src/overlays/shared/vehicles/taxi_path.c +++ b/src/overlays/shared/vehicles/taxi_path.c @@ -9,7 +9,7 @@ #include "rnc/ui/help/try_set_help_message.h" #include "rnc/overlay/shared/world/level_path.h" #include "rnc/overlay/shared/world/cuboid.h" -#include "rnc/overlay/l05/mobys/taxi.h" +#include "rnc/overlay/l05/mobys.h" typedef struct TaxiVars { u8 pad0[0x60]; diff --git a/src/overlays/shared/vendor/draw_vendor_inset_quads.c b/src/overlays/shared/vendor/draw_vendor_inset_quads.c index a92789b00f..1dac901871 100644 --- a/src/overlays/shared/vendor/draw_vendor_inset_quads.c +++ b/src/overlays/shared/vendor/draw_vendor_inset_quads.c @@ -20,20 +20,19 @@ #include "rnc/mobys/restore_moby_class_dists.h" #include "rnc/mobys/stash_moby_class_dists.h" #include "rnc/overlay/shared/rendering/buffers/vu1_send_chain_render_buffer.h" -#include "rnc/overlay/shared/vendor/draw_vendor_purchase_text.h" +#include "rnc/overlay/shared/vendor.h" #include "rnc/rendering/debug/draw_debug_profiler.h" #include "rnc/rendering/frame/begin_draw_frame.h" #include "rnc/rendering/frame/reset_gs_registers.h" #include "rnc/rendering/frame/swap_render_buffer_chain.h" #include "rnc/rendering/mobys/draw_mobys_clean_up.h" #include "rnc/rendering/mobys/draw_mobys_setup.h" -#include "rnc/rendering/mobys/patch_moby_gifs.h" +#include "rnc/rendering/mobys.h" #include "rnc/rendering/packets/append_gif_transfer_packet.h" #include "rnc/rendering/view/update_camera_view_matrices.h" -#include "rnc/ui/hud/update_hud.h" +#include "rnc/ui/hud.h" #include "rnc/ui/vendor/configure_capture_target.h" -#include "rnc/ui/vendor/draw_centered_capture_background.h" -#include "rnc/ui/vendor/render_vendor_capture_texture_overlays_pass.h" +#include "rnc/ui/vendor.h" /* Ported from rac1-decomp (src/overlays/shared/vendor_0029FD68.c: func_L00_002A0C20), where it is exact; names translated to the US level program. */ diff --git a/src/overlays/shared/vendor/initialize_vendor_screen.c b/src/overlays/shared/vendor/initialize_vendor_screen.c index e7ce41c74c..972260a799 100644 --- a/src/overlays/shared/vendor/initialize_vendor_screen.c +++ b/src/overlays/shared/vendor/initialize_vendor_screen.c @@ -13,12 +13,12 @@ #include "rnc/world/select_world_object_resource_tables.h" #include "rnc/world/loaders/parse_space_scene_chunk.h" #include "rnc/overlay/shared/ui/hud/draw_weapon_ammo_hud_panel.h" -#include "rnc/audio/music/music_pause.h" +#include "rnc/audio/music.h" #include "rnc/audio/rpc/snd_flush_sound_commands.h" #include "rnc/audio/voices/sound_update.h" #include "rnc/overlay/shared/hero/hero_switch_item.h" #include "rnc/overlay/shared/hero/set_hero_animation.h" -#include "rnc/overlay/shared/streaming/load_scene_chunks_with_fade.h" +#include "rnc/overlay/shared/streaming.h" #include "rnc/overlay/shared/ui/help/help_request.h" /* Opens the vendor screen for moby m in level lvl: sets up its camera, resets the screen state and runs it until it closes. */ diff --git a/src/overlays/shared/weapons/decoy_glove.c b/src/overlays/shared/weapons/decoy_glove.c index 8aadd81611..fb7c14ba4c 100644 --- a/src/overlays/shared/weapons/decoy_glove.c +++ b/src/overlays/shared/weapons/decoy_glove.c @@ -15,7 +15,7 @@ #include "qzero.h" #include "rnc/game/game_globals.h" #include "rnc/overlay/shared/hero/set_hero_animation.h" -#include "rnc/overlay/shared/weapons/decoy.h" +#include "rnc/overlay/shared/weapons.h" typedef struct DecoyGloveVars { u8 pad0[0x40]; diff --git a/src/overlays/shared/weapons/glove_of_doom_bomb.c b/src/overlays/shared/weapons/glove_of_doom_bomb.c index 10d29f3b19..d02f665d06 100644 --- a/src/overlays/shared/weapons/glove_of_doom_bomb.c +++ b/src/overlays/shared/weapons/glove_of_doom_bomb.c @@ -11,10 +11,9 @@ #include "rnc/runtime/callbacks/add_draw_callback.h" #include "rnc/math/fast_math.h" #include "rnc/overlay/shared/game/unlock_planet.h" -#include "rnc/overlay/shared/mobys/get_moby_pvars_link.h" +#include "rnc/overlay/shared/mobys.h" #include "rnc/overlay/shared/rendering/effects/update_three_phase_effect_particle.h" -#include "rnc/overlay/shared/weapons/doom_bot.h" -#include "rnc/overlay/shared/weapons/glove_of_doom.h" +#include "rnc/overlay/shared/weapons.h" /* Vars of a thrown moby, as ThrowVars in trespasser.c without its first 0x10 bytes. */ typedef struct { diff --git a/src/overlays/shared/weapons/morphoray.c b/src/overlays/shared/weapons/morphoray.c index b1c421dbd3..670f04bb5b 100644 --- a/src/overlays/shared/weapons/morphoray.c +++ b/src/overlays/shared/weapons/morphoray.c @@ -37,13 +37,13 @@ #include "rnc/game/game_globals.h" #include "rnc/input/pad_globals.h" #include "rnc/rendering/debug/debug_menu.h" -#include "rnc/mobys/animation/queue_animation_update.h" +#include "rnc/mobys/animation.h" #include "rnc/mobys/get_moby_target_info.h" #include "rnc/overlay/shared/hero/hero_set_state.h" #include "rnc/overlay/shared/rendering/effects/particles.h" #include "rnc/overlay/shared/rendering/effects/spawn_explosion.h" #include "rnc/overlay/shared/ui/hud/hud_keep_visible.h" -#include "rnc/overlay/shared/weapons/morphoray_chicken.h" +#include "rnc/overlay/shared/weapons.h" #include "rnc/rendering/effect_texture.h" #include "rnc/rendering/view/build_look_at_matrix.h" diff --git a/src/overlays/shared/weapons/pyrocitor.c b/src/overlays/shared/weapons/pyrocitor.c index bb5d1a9938..ed457d431e 100644 --- a/src/overlays/shared/weapons/pyrocitor.c +++ b/src/overlays/shared/weapons/pyrocitor.c @@ -780,8 +780,8 @@ void update_pyrocitor_usage_and_cleanup(struct Moby *pyrocitor_moby) { if (P->stat[10].count <= 0xFFFE) (P->stat[10].count)++; voice_slot_or_time_stat = scale_game_frames(D_0015EEA4) / 600; - if (P->stat[10].unk2 < voice_slot_or_time_stat) - P->stat[10].unk2 = scale_game_frames(D_0015EEA4) / 600; + if (P->stat[10].latest_time_bucket < voice_slot_or_time_stat) + P->stat[10].latest_time_bucket = scale_game_frames(D_0015EEA4) / 600; P->stat[10].level_mask = P->stat[10].level_mask | (1 << current_level_index) | 0x80000000; } else if (*(short *)(pyrocitor_vars + 0x50) < scale_game_frames(0x1E)) { hero.unk20B4++; diff --git a/src/overlays/shared/weapons/ryno.c b/src/overlays/shared/weapons/ryno.c index 094304948e..b7e5f9790a 100644 --- a/src/overlays/shared/weapons/ryno.c +++ b/src/overlays/shared/weapons/ryno.c @@ -307,8 +307,8 @@ void ryno_update(struct Moby *ryno_moby) { if (s->stat[23].count <= 0xFFFE) s->stat[23].count++; per = 600; - if (scale_game_frames(D_0015EEA4_macro) / per > s->stat[23].unk2) - s->stat[23].unk2 = scale_game_frames(D_0015EEA4_macro) / 600; + if (scale_game_frames(D_0015EEA4_macro) / per > s->stat[23].latest_time_bucket) + s->stat[23].latest_time_bucket = scale_game_frames(D_0015EEA4_macro) / 600; s->stat[23].level_mask = s->stat[23].level_mask | (1 << D_0015ED84) | 0x80000000; } hero.items[0].switch_lock = 2; @@ -342,8 +342,8 @@ void ryno_update(struct Moby *ryno_moby) { if (s->stat[23].count <= 0xFFFE) s->stat[23].count++; per = 600; - if (scale_game_frames(D_0015EEA4_macro) / per > s->stat[23].unk2) - s->stat[23].unk2 = scale_game_frames(D_0015EEA4_macro) / 600; + if (scale_game_frames(D_0015EEA4_macro) / per > s->stat[23].latest_time_bucket) + s->stat[23].latest_time_bucket = scale_game_frames(D_0015EEA4_macro) / 600; s->stat[23].level_mask = s->stat[23].level_mask | (1 << D_0015ED84) | 0x80000000; } hero.items[0].switch_lock = 2; diff --git a/src/overlays/shared/weapons/ryno_rocket.c b/src/overlays/shared/weapons/ryno_rocket.c index 0327bff01b..13a94a6c4c 100644 --- a/src/overlays/shared/weapons/ryno_rocket.c +++ b/src/overlays/shared/weapons/ryno_rocket.c @@ -10,7 +10,7 @@ #include "rnc/math/fast_math.h" #include "rnc/game/item_state.h" #include "rnc/overlay/shared/camera/level_camera.h" -#include "rnc/sdk/libc/stdlib/rand.h" +#include "rnc/sdk/libc/stdlib.h" typedef struct RynoRocketVars { u8 pad0[0x10]; diff --git a/src/overlays/shared/weapons/trailing_flame.c b/src/overlays/shared/weapons/trailing_flame.c index 81346e0429..097f4bc9aa 100644 --- a/src/overlays/shared/weapons/trailing_flame.c +++ b/src/overlays/shared/weapons/trailing_flame.c @@ -8,7 +8,7 @@ #include "rnc/mobys/moby_spawn.h" #include "rnc/mobys/refresh_moby_spatial_bounds_from_basis.h" #include "rnc/overlay/shared/mobys/evaluate_moby_animation_pose.h" -#include "rnc/overlay/shared/mobys/allocate_moby_animation_slot.h" +#include "rnc/overlay/shared/mobys.h" #include "rnc/overlay/shared/rendering/effects/spawn_explosion.h" typedef struct { diff --git a/src/overlays/shared/weapons/visibomb.c b/src/overlays/shared/weapons/visibomb.c index 242bbd4c08..d3e517eefd 100644 --- a/src/overlays/shared/weapons/visibomb.c +++ b/src/overlays/shared/weapons/visibomb.c @@ -14,7 +14,7 @@ #include "rnc/mobys/animation/blend_moby_animation.h" #include "rnc/overlay/shared/hero/hero_idle_sequence.h" #include "rnc/overlay/shared/hero/set_hero_animation.h" -#include "rnc/overlay/shared/weapons/visibomb_missile.h" +#include "rnc/overlay/shared/weapons.h" typedef struct { u8 pad0[0x1A4]; diff --git a/src/overlays/shared/weapons/visibomb_zone_timer.c b/src/overlays/shared/weapons/visibomb_zone_timer.c index 08fe267d37..58489d573b 100644 --- a/src/overlays/shared/weapons/visibomb_zone_timer.c +++ b/src/overlays/shared/weapons/visibomb_zone_timer.c @@ -11,8 +11,8 @@ #include "rnc/rendering/effect_texture.h" #include "rnc/runtime/callbacks/add_draw_callback.h" #include "rnc/rendering/screen.h" -#include "rnc/overlay/shared/weapons/visibomb_missile.h" -#include "rnc/rendering/texture/draw_textured_quad.h" +#include "rnc/overlay/shared/weapons.h" +#include "rnc/rendering/texture.h" /* pvars of the moby run by FUN_L01_00302648: 20 trigger zones and a hold counter */ typedef struct { diff --git a/src/overlays/shared/world/load_level_gameplay.c b/src/overlays/shared/world/load_level_gameplay.c index 8d3ef89519..bb05a788b6 100644 --- a/src/overlays/shared/world/load_level_gameplay.c +++ b/src/overlays/shared/world/load_level_gameplay.c @@ -29,17 +29,17 @@ #include "rnc/world/loaders/relocate_sky_definition.h" #include "rnc/world/loaders/unpack_point_records.h" #include "rnc/world/loaders/upload_texture_images.h" -#include "rnc/input/reset_pad_history.h" +#include "rnc/input.h" #include "rnc/overlay/shared/audio/voices/play_voice.h" #include "rnc/overlay/shared/camera/init_camera_system.h" -#include "rnc/overlay/shared/game/initialize_level_transition_with_audio.h" +#include "rnc/overlay/shared/game.h" #include "rnc/overlay/shared/game/restore_or_clear_level_state.h" #include "rnc/overlay/shared/hero/hero_idle_sequence.h" -#include "rnc/overlay/shared/hero/initialize_hero.h" +#include "rnc/overlay/shared/hero.h" #include "rnc/overlay/shared/ui/menus/ensure_menu_cache_entry.h" -#include "rnc/overlay/shared/ui/menus/find_or_assign_bolt_source_slot.h" +#include "rnc/overlay/shared/ui/menus.h" #include "rnc/rendering/frame/reset_draw_globals.h" -#include "rnc/sdk/libc/stdlib/srand.h" +#include "rnc/sdk/libc/stdlib.h" #include "rnc/ui/text/font/enable_font_color_codes.h" typedef struct { diff --git a/src/rendering/debug/draw_debug_profiler.c b/src/rendering/debug/draw_debug_profiler.c index 1ddff500ca..c41b964f40 100644 --- a/src/rendering/debug/draw_debug_profiler.c +++ b/src/rendering/debug/draw_debug_profiler.c @@ -6,13 +6,13 @@ #include "rnc/rendering/texture/patch_tie_texture_fields.h" #include "rnc/rendering/tfrags/light_tfrags.h" #include "rnc/math/asm_helpers.h" -#include "rnc/rendering/effects/append_billboard_batch.h" +#include "rnc/rendering/effects.h" #include "rnc/rendering/effects/render_queued_rotated_sprites.h" -#include "rnc/rendering/frame/callbacks/noop_graphics_callback.h" -#include "rnc/rendering/frame/copy_render_buffer_pair.h" -#include "rnc/rendering/mobys/register_entity_render_resources.h" -#include "rnc/rendering/occlusion/update_occlusion.h" -#include "rnc/rendering/packets/append_dma_tag.h" +#include "rnc/rendering/frame/callbacks.h" +#include "rnc/rendering/frame.h" +#include "rnc/rendering/mobys.h" +#include "rnc/rendering/occlusion.h" +#include "rnc/rendering/packets.h" typedef struct { u8 pad_0[4]; diff --git a/src/rendering/debug/print_debug_text.c b/src/rendering/debug/print_debug_text.c index a5e1ee68e1..dc4b0153cf 100644 --- a/src/rendering/debug/print_debug_text.c +++ b/src/rendering/debug/print_debug_text.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/libc/stdio/sprintf.h" +#include "rnc/sdk/libc/stdio.h" struct DebugText { s32 x; diff --git a/src/rendering/effects/draw_lens_flare.c b/src/rendering/effects/draw_lens_flare.c index 9d31716c7b..a54eb9242c 100644 --- a/src/rendering/effects/draw_lens_flare.c +++ b/src/rendering/effects/draw_lens_flare.c @@ -5,7 +5,7 @@ #include "rnc/rendering/view/project_to_screen.h" #include "rnc/math/fast_math.h" #include "rnc/rendering/effect_texture.h" -#include "rnc/rendering/texture/draw_textured_quad.h" +#include "rnc/rendering/texture.h" /* Lens flare: 16 sprites along the line from the flare source's screen position through the screen centre, faded by distance and by how far diff --git a/src/rendering/effects/fade_to_black.c b/src/rendering/effects/fade_to_black.c index 968e1b01a6..5e44315408 100644 --- a/src/rendering/effects/fade_to_black.c +++ b/src/rendering/effects/fade_to_black.c @@ -4,7 +4,7 @@ #include "rnc/rendering/fs_aa_packets.h" #include "rnc/data_labels.h" #include "rnc/game/game_globals.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" +#include "rnc/sdk/graph.h" extern void put_draw_buffer_large(void) __asm__("func_001FB2D0"); extern void append_gif_transfer_packet(void) __asm__("func_001FB368"); diff --git a/src/rendering/effects/render_level_effects_and_screen_sprites.c b/src/rendering/effects/render_level_effects_and_screen_sprites.c index cf88256ec4..321c6c2b6b 100644 --- a/src/rendering/effects/render_level_effects_and_screen_sprites.c +++ b/src/rendering/effects/render_level_effects_and_screen_sprites.c @@ -20,10 +20,10 @@ #include "rnc/rendering/view/reset_active_camera_position_and_basis.h" #include "rnc/rendering/view/configure_graphics_render_target_and_projection.h" #include "rnc/ui/menus/widgets/draw_menu_flashing_panel.h" -#include "rnc/rendering/texture/draw_textured_quad.h" -#include "rnc/rendering/view/project_graphics_bounds.h" -#include "rnc/ui/hud/append_screen_rect_packet.h" -#include "rnc/ui/hud/sprites/draw_hud_rect_depth.h" +#include "rnc/rendering/texture.h" +#include "rnc/rendering/view.h" +#include "rnc/ui/hud.h" +#include "rnc/ui/hud/sprites.h" /* Retail 0x002196b8..0x00219d77: draws the level-effect moby lists, then projects each enabled menu panel slot to the screen, renders panel diff --git a/src/rendering/frame/configure_graphics_render_target_and_projection.c b/src/rendering/frame/configure_graphics_render_target_and_projection.c index 6bfdfdc387..fec9c60554 100644 --- a/src/rendering/frame/configure_graphics_render_target_and_projection.c +++ b/src/rendering/frame/configure_graphics_render_target_and_projection.c @@ -3,7 +3,7 @@ #include "rnc/rendering/render_globals.h" #include "rnc/rendering/vu1_registers.h" #include "rnc/rendering/frame/setup_render_target.h" -#include "rnc/rendering/view/configure_graphics_projection.h" +#include "rnc/rendering/view.h" /* Ported from rac1-decomp (src/game/draw.c:func_001F7A50), which matched our retail at the instruction level before the address space was translated. */ diff --git a/src/rendering/frame/initialize_level_render_state.c b/src/rendering/frame/initialize_level_render_state.c index 68ffefcfd1..1c11581255 100644 --- a/src/rendering/frame/initialize_level_render_state.c +++ b/src/rendering/frame/initialize_level_render_state.c @@ -20,9 +20,9 @@ #include "rnc/rendering/ties/light_ties.h" #include "rnc/rendering/tfrags/light_tfrags.h" #include "rnc/ui/text/font/enable_font_color_codes.h" -#include "rnc/input/reset_pad_history.h" -#include "rnc/rendering/frame/set_background_color.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/input.h" +#include "rnc/rendering/frame.h" +#include "rnc/sdk/debug.h" typedef struct FRow { f32 v[3]; diff --git a/src/rendering/frame/render_level_frame.c b/src/rendering/frame/render_level_frame.c index f2ed466bdd..be852bfbcf 100644 --- a/src/rendering/frame/render_level_frame.c +++ b/src/rendering/frame/render_level_frame.c @@ -9,8 +9,8 @@ #include "rnc/game/game_globals.h" #include "rnc/rendering/vu1_registers.h" #include "rnc/mobys/prune_moby_references.h" -#include "rnc/rendering/effects/draw_resident_textured_banner.h" -#include "rnc/rendering/packets/append_dma_tag.h" +#include "rnc/rendering/effects.h" +#include "rnc/rendering/packets.h" struct LevelProjectionState { u8 pad_0[0xB0]; diff --git a/src/rendering/frame/reset_graphics.c b/src/rendering/frame/reset_graphics.c index d697a88bca..e3bddbfbcb 100644 --- a/src/rendering/frame/reset_graphics.c +++ b/src/rendering/frame/reset_graphics.c @@ -1,8 +1,8 @@ #include "types.h" #include "sda.h" #include "rnc/rendering/dma_tag.h" -#include "rnc/sdk/dma/sce_dma_reset.h" -#include "rnc/sdk/graph/sce_gs_reset_graph.h" +#include "rnc/sdk/dma.h" +#include "rnc/sdk/graph.h" extern s32 pal_mode_macro[] __asm__("D_0015ED80") MACRO_ADDR; extern s32 D_0015EE78[] MACRO_ADDR; diff --git a/src/rendering/frame/setup_fs_aa_buffer.c b/src/rendering/frame/setup_fs_aa_buffer.c index 84d5811983..b6766c9cde 100644 --- a/src/rendering/frame/setup_fs_aa_buffer.c +++ b/src/rendering/frame/setup_fs_aa_buffer.c @@ -6,8 +6,7 @@ #include "rnc/sdk/eetypes.h" #include "rnc/rendering/fs_aa_buffer.h" #include "rnc/rendering/fs_aa_packets.h" -#include "rnc/sdk/graph/sce_gs_set_def_disp_env.h" -#include "rnc/sdk/graph/sce_gs_set_def_draw_env.h" +#include "rnc/sdk/graph.h" extern struct FsAaBuf *active_fs_aa_buffer __asm__("D_0015EEB8") MACRO_ADDR; extern s32 display_buffer_address_macro __asm__("D_0015EE80") MACRO_ADDR; diff --git a/src/rendering/frame/setup_render_target.c b/src/rendering/frame/setup_render_target.c index b42d6622c7..bc5955fd09 100644 --- a/src/rendering/frame/setup_render_target.c +++ b/src/rendering/frame/setup_render_target.c @@ -1,4 +1,4 @@ -#include "rnc/sdk/graph/sce_gs_set_def_draw_env.h" +#include "rnc/sdk/graph.h" /* Ported from rac1-decomp (src/game/framebuf.c, func_001FB608). */ #include "sda.h" diff --git a/src/rendering/lights/detach_point_light.c b/src/rendering/lights/detach_point_light.c index 69f16a6f5e..2d5b107f36 100644 --- a/src/rendering/lights/detach_point_light.c +++ b/src/rendering/lights/detach_point_light.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/rendering/render_globals.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/sdk/debug.h" struct ShrubLightLink { u8 pad_0[0x1B]; diff --git a/src/rendering/mobys/draw_mobys.c b/src/rendering/mobys/draw_mobys.c index caf0833fca..0e02631f0f 100644 --- a/src/rendering/mobys/draw_mobys.c +++ b/src/rendering/mobys/draw_mobys.c @@ -3,7 +3,7 @@ #include "rnc/game/game_globals.h" #include "rnc/mobys/init_moby_class_dists.h" #include "rnc/rendering/mobys/draw_mobys_clean_up.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/sdk/debug.h" extern u8 vu_chain_overflow_message[] __asm__("D_001E8400"); extern s32 D_0018A2D8[]; diff --git a/src/rendering/mobys/prepare_resident_class_render_data.c b/src/rendering/mobys/prepare_resident_class_render_data.c index d75f785baa..28301e0bfc 100644 --- a/src/rendering/mobys/prepare_resident_class_render_data.c +++ b/src/rendering/mobys/prepare_resident_class_render_data.c @@ -6,7 +6,7 @@ #include "types.h" #include "qcopy.h" #include "rnc/sdk/eetypes.h" -#include "rnc/rendering/packets/set_up_vis_gif_viewer.h" +#include "rnc/rendering/packets.h" typedef struct { s32 draw_high; diff --git a/src/rendering/occlusion/update_occlusion.c b/src/rendering/occlusion/update_occlusion.c index 23551f4fa2..955a029dd2 100644 --- a/src/rendering/occlusion/update_occlusion.c +++ b/src/rendering/occlusion/update_occlusion.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/rendering/render_globals.h" -#include "rnc/rendering/occlusion/build_occlusion_visibility.h" +#include "rnc/rendering/occlusion.h" extern u32 occl_update[] __asm__("D_0018C334"); extern s32 fill_transfer_words() __asm__("FUN_001f97e8"); diff --git a/src/rendering/packets/put_disp_buffer.c b/src/rendering/packets/put_disp_buffer.c index 0f43324b8e..4ee280b59c 100644 --- a/src/rendering/packets/put_disp_buffer.c +++ b/src/rendering/packets/put_disp_buffer.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/graph/sce_gs_put_disp_env.h" +#include "rnc/sdk/graph.h" struct sceGsDispEnv; extern struct sceGsDispEnv *D_0015EEB8; diff --git a/src/rendering/packets/put_draw_buffer_large.c b/src/rendering/packets/put_draw_buffer_large.c index 81c41a444e..2f0144d5f9 100644 --- a/src/rendering/packets/put_draw_buffer_large.c +++ b/src/rendering/packets/put_draw_buffer_large.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/rendering/dma_tag.h" #include "rnc/data_labels.h" -#include "rnc/sdk/graph/sce_gs_put_draw_env.h" +#include "rnc/sdk/graph.h" void put_draw_buffer_large(void) __asm__("FUN_001fb2d0"); diff --git a/src/rendering/sky/update_sky_effects.c b/src/rendering/sky/update_sky_effects.c index 719b2f410c..da37422d17 100644 --- a/src/rendering/sky/update_sky_effects.c +++ b/src/rendering/sky/update_sky_effects.c @@ -2,7 +2,7 @@ #include "rnc/rendering/sky_shell.h" #include "rnc/math/random.h" #include "rnc/math/fast_math.h" -#include "rnc/sdk/libc/stdlib/srand.h" +#include "rnc/sdk/libc/stdlib.h" struct LevelSkyEffectData { u8 pad_0[4]; diff --git a/src/rendering/texture/dma_shrub_textures.c b/src/rendering/texture/dma_shrub_textures.c index 5d81cf39f4..b5731e18e6 100644 --- a/src/rendering/texture/dma_shrub_textures.c +++ b/src/rendering/texture/dma_shrub_textures.c @@ -2,7 +2,7 @@ #include "rnc/rendering/draw_config.h" #include "rnc/rendering/dma_tag.h" #include "rnc/globals.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/sdk/debug.h" extern struct TagPtr D_001603F0; diff --git a/src/rendering/texture/dma_tfrag_textures.c b/src/rendering/texture/dma_tfrag_textures.c index bf1fc94726..1c18df6e7c 100644 --- a/src/rendering/texture/dma_tfrag_textures.c +++ b/src/rendering/texture/dma_tfrag_textures.c @@ -2,7 +2,7 @@ #include "rnc/rendering/draw_config.h" #include "rnc/rendering/dma_tag.h" #include "rnc/globals.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/sdk/debug.h" extern struct TagPtr D_00160EBC; diff --git a/src/rendering/texture/dma_tie_textures.c b/src/rendering/texture/dma_tie_textures.c index 7da8a2e287..99f4f1c423 100644 --- a/src/rendering/texture/dma_tie_textures.c +++ b/src/rendering/texture/dma_tie_textures.c @@ -2,7 +2,7 @@ #include "rnc/rendering/draw_config.h" #include "rnc/rendering/dma_tag.h" #include "rnc/globals.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/sdk/debug.h" extern struct TagPtr D_00160F68; diff --git a/src/rendering/texture/load_pif_as_psmt8_h.c b/src/rendering/texture/load_pif_as_psmt8_h.c index 880910c574..4bbe2ffd86 100644 --- a/src/rendering/texture/load_pif_as_psmt8_h.c +++ b/src/rendering/texture/load_pif_as_psmt8_h.c @@ -1,6 +1,5 @@ #include "types.h" -#include "rnc/sdk/graph/sce_gs_exec_load_image.h" -#include "rnc/sdk/graph/sce_gs_set_def_load_image.h" +#include "rnc/sdk/graph.h" /* EE layouts: PIF header 0x20 bytes, scratch descriptor 0x54 bytes, sceGsLoadImage packet 0x60 bytes (16-byte aligned), output 0x18 bytes. diff --git a/src/rendering/texture/upload_mip_texture.c b/src/rendering/texture/upload_mip_texture.c index ac5fd1a076..692a210e45 100644 --- a/src/rendering/texture/upload_mip_texture.c +++ b/src/rendering/texture/upload_mip_texture.c @@ -4,8 +4,7 @@ #include "rnc/sdk/eetypes.h" #include "sda.h" #include "rnc/globals.h" -#include "rnc/sdk/graph/sce_gs_exec_load_image.h" -#include "rnc/sdk/graph/sce_gs_set_def_load_image.h" +#include "rnc/sdk/graph.h" typedef struct { u8 pad0[8]; diff --git a/src/rendering/tfrags/draw_tfrag.c b/src/rendering/tfrags/draw_tfrag.c index 2f9c3d2d38..a1c6df6a85 100644 --- a/src/rendering/tfrags/draw_tfrag.c +++ b/src/rendering/tfrags/draw_tfrag.c @@ -6,7 +6,7 @@ #include "rnc/camera/camera_globals.h" #include "rnc/math/fast_math.h" #include "rnc/math/asm_helpers.h" -#include "rnc/rendering/packets/write_vif_unpack_packet.h" +#include "rnc/rendering/packets.h" struct Locals { u8 pad0[0x30]; diff --git a/src/rendering/view/build_look_at_matrix.c b/src/rendering/view/build_look_at_matrix.c index 9488cf305d..828efcd756 100644 --- a/src/rendering/view/build_look_at_matrix.c +++ b/src/rendering/view/build_look_at_matrix.c @@ -1,7 +1,7 @@ /* Ported from rac1-decomp (src/game/mobyutil.c, func_002156E0). */ #include "qcopy.h" #include "rnc/math/fast_math.h" -#include "rnc/math/rotations/build_quaternion_from_axis_angle.h" +#include "rnc/math/rotations.h" extern void rotate_vector_by_quaternion(void *out, void *source_vector, void *quat) __asm__("func_00214800"); diff --git a/src/rendering/vu1/dmac_vif1_enable.c b/src/rendering/vu1/dmac_vif1_enable.c index 52f4fa5c65..18577f5652 100644 --- a/src/rendering/vu1/dmac_vif1_enable.c +++ b/src/rendering/vu1/dmac_vif1_enable.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/data_labels.h" -#include "rnc/rendering/vu1/vif1_dma_interrupt_handler.h" +#include "rnc/rendering/vu1.h" extern s32 AddDmacHandler(); extern s32 enable_dmac() __asm__("func_00119160"); diff --git a/src/rendering/vu1/vu1_chain.c b/src/rendering/vu1/vu1_chain.c index bb7bd7b62b..8695dd019b 100644 --- a/src/rendering/vu1/vu1_chain.c +++ b/src/rendering/vu1/vu1_chain.c @@ -3,9 +3,8 @@ #include "rnc/data_labels.h" #include "rnc/rendering/render_globals.h" #include "rnc/rendering/frame/reset_graphics.h" -#include "rnc/sdk/debug/debug_print.h" -#include "rnc/sdk/dma/sce_dma_get_chan.h" -#include "rnc/sdk/dma/sce_dma_send.h" +#include "rnc/sdk/debug.h" +#include "rnc/sdk/dma.h" /* The SDK DMA channel registers; only CHCR (offset 0) is touched here. */ struct DmaChannel { diff --git a/src/runtime/debug/print_register_values_and_halt.c b/src/runtime/debug/print_register_values_and_halt.c index 822ad00880..66d14df03e 100644 --- a/src/runtime/debug/print_register_values_and_halt.c +++ b/src/runtime/debug/print_register_values_and_halt.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/sdk/debug.h" extern u8 dmac_bus_error_message[] __asm__("D_001E8A08"); extern u8 dma1_register_values_format[] __asm__("D_001E8A20"); diff --git a/src/runtime/iop/initialize_sif_rpc.c b/src/runtime/iop/initialize_sif_rpc.c index fd8f9b0842..902e2f09ab 100644 --- a/src/runtime/iop/initialize_sif_rpc.c +++ b/src/runtime/iop/initialize_sif_rpc.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/rpc/rpc/sce_sif_init_rpc.h" +#include "rnc/sdk/rpc/rpc.h" void initialize_sif_rpc(void) __asm__("FUN_00232ce0"); diff --git a/src/runtime/startup/init_once.c b/src/runtime/startup/init_once.c index 0494a743bb..ac585e485c 100644 --- a/src/runtime/startup/init_once.c +++ b/src/runtime/startup/init_once.c @@ -5,29 +5,22 @@ #include "rnc/data_labels.h" #include "rnc/ui/menus/menu_globals.h" #include "rnc/rendering/render_globals.h" -#include "rnc/audio/sound/initialize_gameplay_sound_system.h" +#include "rnc/audio/sound.h" #include "rnc/rendering/view/update_view_context.h" #include "rnc/runtime/callbacks/count_vsync.h" #include "rnc/runtime/iop/initialize_sif_rpc.h" -#include "rnc/sdk/debug/debug_print.h" -#include "rnc/sdk/dma/sce_dma_reset.h" -#include "rnc/sdk/graph/sce_gs_exec_load_image.h" -#include "rnc/sdk/graph/sce_gs_reset_graph.h" -#include "rnc/sdk/graph/sce_gs_set_def_load_image.h" +#include "rnc/sdk/debug.h" +#include "rnc/sdk/dma.h" +#include "rnc/sdk/graph.h" #include "rnc/sdk/graph/sce_gs_sync_path.h" -#include "rnc/sdk/graph/sce_gs_sync_v_callback.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" -#include "rnc/sdk/rpc/iop/sce_sif_init_iop_heap.h" -#include "rnc/sdk/rpc/iop/sce_sif_reboot_iop.h" -#include "rnc/sdk/rpc/iop/sce_sif_sync_iop.h" -#include "rnc/sdk/rpc/rpc/sce_sif_init_rpc.h" -#include "rnc/sdk/scf/sce_scf_get_language.h" -#include "rnc/sdk/storage/cdvd/sceCdDiskReady.h" -#include "rnc/sdk/storage/cdvd/sceCdInit.h" -#include "rnc/sdk/storage/cdvd/scecdmmode.h" -#include "rnc/sdk/storage/fileio/sceFsReset.h" -#include "rnc/streaming/wad_get_sectors.h" -#include "rnc/ui/text/font/load_debug_font.h" +#include "rnc/sdk/interrupts.h" +#include "rnc/sdk/rpc/iop.h" +#include "rnc/sdk/rpc/rpc.h" +#include "rnc/sdk/scf.h" +#include "rnc/sdk/storage/cdvd.h" +#include "rnc/sdk/storage/fileio.h" +#include "rnc/streaming.h" +#include "rnc/ui/text/font.h" extern u8 vu0_micro_program[] __asm__("D_0010E4C0"); extern u8 rebooted_iop_message[] __asm__("D_0015FA88"); diff --git a/src/save/check_memory_card.c b/src/save/check_memory_card.c index 7d4af0048c..37a0a1432e 100644 --- a/src/save/check_memory_card.c +++ b/src/save/check_memory_card.c @@ -1,8 +1,6 @@ #include "types.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" -#include "rnc/sdk/storage/memory_card/sce_mc_get_dir.h" -#include "rnc/sdk/storage/memory_card/sce_mc_get_info.h" -#include "rnc/sdk/storage/memory_card/sce_mc_sync.h" +#include "rnc/sdk/graph.h" +#include "rnc/sdk/storage/memory_card.h" struct McDirBlk { u8 pad_0[0x4]; diff --git a/src/save/memcard_initialize.c b/src/save/memcard_initialize.c index 9e87e9a517..b6232d039d 100644 --- a/src/save/memcard_initialize.c +++ b/src/save/memcard_initialize.c @@ -1,6 +1,6 @@ #include "types.h" -#include "rnc/sdk/debug/debug_print.h" -#include "rnc/sdk/storage/memory_card/sce_mc_init.h" +#include "rnc/sdk/debug.h" +#include "rnc/sdk/storage/memory_card.h" extern u8 memcard_error_message[] __asm__("D_001E8360"); void memcard_initialize(void) __asm__("FUN_0020ac58"); diff --git a/src/save/memcard_restore_game.c b/src/save/memcard_restore_game.c index 1e0ddff169..471b154a45 100644 --- a/src/save/memcard_restore_game.c +++ b/src/save/memcard_restore_game.c @@ -3,7 +3,7 @@ #include "rnc/save/mc_data.h" #include "rnc/save/memcard_get_data_size.h" #include "rnc/save/memory_card_state.h" -#include "rnc/sdk/debug/debug_print.h" +#include "rnc/sdk/debug.h" extern char out_of_date_save_message[] __asm__("D_001E81D0"); extern void memcard_restore_data(u8 *, s32, void *) __asm__("func_0020AF20"); diff --git a/src/save/memcard_save_data.c b/src/save/memcard_save_data.c index 38fc9e63c9..10d2b571db 100644 --- a/src/save/memcard_save_data.c +++ b/src/save/memcard_save_data.c @@ -2,8 +2,8 @@ #include "sda.h" #include "types.h" #include "rnc/ui/map/copy_level_object_positions.h" -#include "rnc/sdk/scf/sce_scf_get_local_timefrom_rtc.h" -#include "rnc/sdk/storage/cdvd/scecdreadclock.h" +#include "rnc/sdk/scf.h" +#include "rnc/sdk/storage/cdvd.h" extern int memcard_prepare_data(void *dst, int i, int *table) __asm__("func_0020AD78"); extern void save_map_coverage(void *) __asm__("func_00207B08"); diff --git a/src/save/memcard_update_state.c b/src/save/memcard_update_state.c index 29ef3f28a7..f87f452ce3 100644 --- a/src/save/memcard_update_state.c +++ b/src/save/memcard_update_state.c @@ -3,21 +3,9 @@ #include "rnc/streaming/disc_table.h" #include "rnc/audio/streaming/start_audio_stream_read.h" #include "rnc/save/memcard_get_data_size.h" -#include "rnc/sdk/debug/debug_print.h" -#include "rnc/sdk/libc/stdio/sprintf.h" -#include "rnc/sdk/storage/memory_card/sce_mc_chdir.h" -#include "rnc/sdk/storage/memory_card/sce_mc_close.h" -#include "rnc/sdk/storage/memory_card/sce_mc_delete.h" -#include "rnc/sdk/storage/memory_card/sce_mc_format.h" -#include "rnc/sdk/storage/memory_card/sce_mc_get_dir.h" -#include "rnc/sdk/storage/memory_card/sce_mc_get_info.h" -#include "rnc/sdk/storage/memory_card/sce_mc_mkdir.h" -#include "rnc/sdk/storage/memory_card/sce_mc_open.h" -#include "rnc/sdk/storage/memory_card/sce_mc_read.h" -#include "rnc/sdk/storage/memory_card/sce_mc_seek.h" -#include "rnc/sdk/storage/memory_card/sce_mc_sync.h" -#include "rnc/sdk/storage/memory_card/sce_mc_unformat.h" -#include "rnc/sdk/storage/memory_card/sce_mc_write.h" +#include "rnc/sdk/debug.h" +#include "rnc/sdk/libc/stdio.h" +#include "rnc/sdk/storage/memory_card.h" typedef struct { s32 x0; diff --git a/src/sdk/callbacks/handle_sif_rpc_call.c b/src/sdk/callbacks/handle_sif_rpc_call.c index f5d1b65bbc..d0d6b5d40e 100644 --- a/src/sdk/callbacks/handle_sif_rpc_call.c +++ b/src/sdk/callbacks/handle_sif_rpc_call.c @@ -2,7 +2,7 @@ #include "asm.h" #include "types.h" -#include "rnc/sdk/kernel/i_wakeup_thread.h" +#include "rnc/sdk/kernel.h" /* Packet, server, and queue are handled as words to preserve the retail * copy order. The indices below are byte offsets divided by four. */ diff --git a/src/sdk/callbacks/wake_thread_alarm.c b/src/sdk/callbacks/wake_thread_alarm.c index 9421c99e51..ce3bfd7d0e 100644 --- a/src/sdk/callbacks/wake_thread_alarm.c +++ b/src/sdk/callbacks/wake_thread_alarm.c @@ -1,6 +1,5 @@ #include "types.h" #include "rnc/sdk/kernel.h" -#include "rnc/sdk/kernel/i_wakeup_thread.h" /* Alarm handler: wakes the waiting thread, then re-enables interrupts. */ void wake_thread_alarm(s32 alarm_id, u32 scheduled_time, s32 thread_id) __asm__("FUN_00123bc0"); diff --git a/src/sdk/deci2/deci2_putchar.c b/src/sdk/deci2/deci2_putchar.c index 04607a2923..63bc17835a 100644 --- a/src/sdk/deci2/deci2_putchar.c +++ b/src/sdk/deci2/deci2_putchar.c @@ -1,7 +1,7 @@ /* deci2Putchar: buffered deci2 character output. */ #include "types.h" -#include "rnc/sdk/deci2/kputs.h" +#include "rnc/sdk/deci2.h" extern s32 deci2_buffered_byte_count[] __asm__("D_0012FBFC"); extern s8 deci2_output_buffer[] __asm__("D_00154D00"); diff --git a/src/sdk/deci2/printf_impl.c b/src/sdk/deci2/printf_impl.c index fb4ffb4f00..c62a1912b7 100644 --- a/src/sdk/deci2/printf_impl.c +++ b/src/sdk/deci2/printf_impl.c @@ -1,6 +1,6 @@ #include "types.h" -#include "rnc/sdk/deci2/printfloat.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/interrupts.h" extern s32 DIntr(void); extern void (*D_0012FC00[])(s32); diff --git a/src/sdk/deci2/printfloat.c b/src/sdk/deci2/printfloat.c index e1921366b9..21a04d058d 100644 --- a/src/sdk/deci2/printfloat.c +++ b/src/sdk/deci2/printfloat.c @@ -1,8 +1,6 @@ #include "types.h" #include "rnc/data_labels.h" -#include "rnc/sdk/soft_float/__fixunsdfdi.h" -#include "rnc/sdk/soft_float/dpcmp.h" -#include "rnc/sdk/soft_float/dpmul.h" +#include "rnc/sdk/soft_float.h" extern char significand_format[] __asm__("D_00152780"); extern char nonnegative_exponent_format[] __asm__("D_00152788"); diff --git a/src/sdk/deci2/sce_printf.c b/src/sdk/deci2/sce_printf.c index 9f4bc2742f..4b8e1a21f4 100644 --- a/src/sdk/deci2/sce_printf.c +++ b/src/sdk/deci2/sce_printf.c @@ -1,5 +1,5 @@ #include "sda.h" -#include "rnc/sdk/deci2/deci2_putchar.h" +#include "rnc/sdk/deci2.h" typedef char *va_list; diff --git a/src/sdk/deci2/sce_tty_handler.c b/src/sdk/deci2/sce_tty_handler.c index 7f9c3d0252..9c8085ac6f 100644 --- a/src/sdk/deci2/sce_tty_handler.c +++ b/src/sdk/deci2/sce_tty_handler.c @@ -1,7 +1,5 @@ #include "types.h" -#include "rnc/sdk/deci2/kprintf.h" -#include "rnc/sdk/deci2/sce_deci2_ex_recv.h" -#include "rnc/sdk/deci2/sce_deci2_ex_send.h" +#include "rnc/sdk/deci2.h" typedef struct { u8 pad0[0xC]; diff --git a/src/sdk/deci2/sce_tty_init.c b/src/sdk/deci2/sce_tty_init.c index b40fc50c54..78b328b706 100644 --- a/src/sdk/deci2/sce_tty_init.c +++ b/src/sdk/deci2/sce_tty_init.c @@ -1,8 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" -#include "rnc/runtime/memory/init_ring_buffer.h" -#include "rnc/sdk/deci2/sce_deci2_open.h" -#include "rnc/sdk/deci2/sce_tty_handler.h" +#include "rnc/runtime/memory.h" +#include "rnc/sdk/deci2.h" struct TtyState { s32 unk0; diff --git a/src/sdk/deci2/sce_tty_read.c b/src/sdk/deci2/sce_tty_read.c index 54dbe180e7..24945687c1 100644 --- a/src/sdk/deci2/sce_tty_read.c +++ b/src/sdk/deci2/sce_tty_read.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/rpc/rpc/queue_peek_read_done.h" +#include "rnc/sdk/rpc/rpc.h" typedef struct { u8 pad_0[4]; diff --git a/src/sdk/deci2/sce_tty_write.c b/src/sdk/deci2/sce_tty_write.c index 350133f5b1..b720726a75 100644 --- a/src/sdk/deci2/sce_tty_write.c +++ b/src/sdk/deci2/sce_tty_write.c @@ -3,9 +3,8 @@ #include "types.h" #include "rnc/data_labels.h" -#include "rnc/sdk/deci2/call_debug_character.h" -#include "rnc/sdk/deci2/sce_deci2_poll.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/interrupts.h" struct TtyState { volatile s32 unk0; /* deci2 handle from sceDeci2Open */ diff --git a/src/sdk/deci2/serial_putchar.c b/src/sdk/deci2/serial_putchar.c index b101c24005..3d043fcd49 100644 --- a/src/sdk/deci2/serial_putchar.c +++ b/src/sdk/deci2/serial_putchar.c @@ -1,4 +1,4 @@ -#include "rnc/sdk/deci2/kputchar.h" +#include "rnc/sdk/deci2.h" void serialPutchar(int character) { if (character == 10) { diff --git a/src/sdk/dma/sce_dma_reset.c b/src/sdk/dma/sce_dma_reset.c index 326809a86d..ce28c0f2a9 100644 --- a/src/sdk/dma/sce_dma_reset.c +++ b/src/sdk/dma/sce_dma_reset.c @@ -22,8 +22,8 @@ #include "types.h" #include "rnc/sdk/sce_dma_chan.h" -#include "rnc/sdk/dma/sce_dma_put_env.h" -#include "rnc/sdk/graph/memclr.h" +#include "rnc/sdk/dma.h" +#include "rnc/sdk/graph.h" extern s32 DmaChannelsUsed[] __asm__("D_001533F8"); diff --git a/src/sdk/dma/sce_dma_send.c b/src/sdk/dma/sce_dma_send.c index 718579a107..359048d702 100644 --- a/src/sdk/dma/sce_dma_send.c +++ b/src/sdk/dma/sce_dma_send.c @@ -1,6 +1,6 @@ #include "types.h" -#include "rnc/sdk/dma/wait_dma.h" -#include "rnc/sdk/system/check_address.h" +#include "rnc/sdk/dma.h" +#include "rnc/sdk/system.h" struct DmaChannelRegs { s32 unk0; diff --git a/src/sdk/dma/set_d3_chcr.c b/src/sdk/dma/set_d3_chcr.c index 7c1c3855ce..a5e6cab21c 100644 --- a/src/sdk/dma/set_d3_chcr.c +++ b/src/sdk/dma/set_d3_chcr.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" extern s32 DIntr(); diff --git a/src/sdk/dma/set_d4_chcr.c b/src/sdk/dma/set_d4_chcr.c index e29276b139..ae82a8ae79 100644 --- a/src/sdk/dma/set_d4_chcr.c +++ b/src/sdk/dma/set_d4_chcr.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" extern s32 DIntr(); diff --git a/src/sdk/dma/set_d4_chcr_variant.c b/src/sdk/dma/set_d4_chcr_variant.c index 5103cb96d6..aee9ee4626 100644 --- a/src/sdk/dma/set_d4_chcr_variant.c +++ b/src/sdk/dma/set_d4_chcr_variant.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" extern s32 DIntr(); diff --git a/src/sdk/dma/wait_dma.c b/src/sdk/dma/wait_dma.c index d5ad7ad0e3..18640695f8 100644 --- a/src/sdk/dma/wait_dma.c +++ b/src/sdk/dma/wait_dma.c @@ -1,6 +1,6 @@ #include "types.h" -#include "rnc/sdk/deci2/sce_printf.h" -#include "rnc/sdk/dma/sce_dma_pause.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/dma.h" const u8 D_001533E0[] = "libdma: sync timeout\n"; diff --git a/src/sdk/graph/sce_gs_exec_load_image.c b/src/sdk/graph/sce_gs_exec_load_image.c index 4a249ad04f..a04fc77285 100644 --- a/src/sdk/graph/sce_gs_exec_load_image.c +++ b/src/sdk/graph/sce_gs_exec_load_image.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/deci2/sce_printf.h" +#include "rnc/sdk/deci2.h" extern u8 gs_load_image_dma_timeout_message[] __asm__("D_001531D0"); diff --git a/src/sdk/graph/sce_gs_put_draw_env.c b/src/sdk/graph/sce_gs_put_draw_env.c index be611a7fda..56bf655c30 100644 --- a/src/sdk/graph/sce_gs_put_draw_env.c +++ b/src/sdk/graph/sce_gs_put_draw_env.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/deci2/sce_printf.h" +#include "rnc/sdk/deci2.h" extern u8 gs_draw_env_dma_timeout_message[] __asm__("D_00153078"); diff --git a/src/sdk/graph/sce_gs_set_def_disp_env.c b/src/sdk/graph/sce_gs_set_def_disp_env.c index 9f7cb6a657..30ecabd07b 100644 --- a/src/sdk/graph/sce_gs_set_def_disp_env.c +++ b/src/sdk/graph/sce_gs_set_def_disp_env.c @@ -1,8 +1,8 @@ #include "types.h" #include "rnc/sdk/libgraph.h" #include "rnc/sdk/graph/sce_gs_get_gparam.h" -#include "rnc/sdk/deci2/sce_printf.h" -#include "rnc/sdk/storage/cdvd/checkModelVersion.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/storage/cdvd.h" typedef struct { s16 nSInterlace; diff --git a/src/sdk/graph/sce_gs_set_def_load_image.c b/src/sdk/graph/sce_gs_set_def_load_image.c index efa6b26264..a0b04c4c8f 100644 --- a/src/sdk/graph/sce_gs_set_def_load_image.c +++ b/src/sdk/graph/sce_gs_set_def_load_image.c @@ -3,7 +3,7 @@ #include "rnc/sdk/libgraph.h" #include "rnc/sdk/eetypes.h" #include "rnc/sdk/kernel.h" -#include "rnc/sdk/deci2/sce_printf.h" +#include "rnc/sdk/deci2.h" s32 sceGsSetDefLoadImage(sceGsLoadImage *image, s16 destination_base, diff --git a/src/sdk/graph/sce_gs_sync_v.c b/src/sdk/graph/sce_gs_sync_v.c index d023a2393d..21082ebd9a 100644 --- a/src/sdk/graph/sce_gs_sync_v.c +++ b/src/sdk/graph/sce_gs_sync_v.c @@ -1,8 +1,7 @@ #include "types.h" #include "rnc/sdk/sce_gs_gparam.h" #include "rnc/sdk/graph/sce_gs_get_gparam.h" -#include "rnc/sdk/kernel/VSync2.h" -#include "rnc/sdk/kernel/v_sync.h" +#include "rnc/sdk/kernel.h" s32 sceGsSyncV(s32 mode) { sceGsGParam *gp; diff --git a/src/sdk/input/dbc/sceDbcCreateSocket.c b/src/sdk/input/dbc/sceDbcCreateSocket.c index 750f021cdb..5f9fca03c5 100644 --- a/src/sdk/input/dbc/sceDbcCreateSocket.c +++ b/src/sdk/input/dbc/sceDbcCreateSocket.c @@ -1,7 +1,7 @@ /* Ported from rac1-decomp (src/core/001236F0.c, func_00124858). */ #include "types.h" #include "rnc/sdk/library/sdk_globals.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" extern s32 D_0015B080[]; extern u8 socket_create_rpc_error_message[] __asm__("D_00153578"); diff --git a/src/sdk/input/dbc/sceDbcGetDepNumber.c b/src/sdk/input/dbc/sceDbcGetDepNumber.c index 6a58fe7a31..210bcd6672 100644 --- a/src/sdk/input/dbc/sceDbcGetDepNumber.c +++ b/src/sdk/input/dbc/sceDbcGetDepNumber.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/library/sdk_globals.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/interrupts.h" +#include "rnc/sdk/rpc/rpc.h" struct DbCBlob { u8 data[0x40]; diff --git a/src/sdk/input/dbc/sceDbcInit.c b/src/sdk/input/dbc/sceDbcInit.c index 93be5644cd..d5848bfebd 100644 --- a/src/sdk/input/dbc/sceDbcInit.c +++ b/src/sdk/input/dbc/sceDbcInit.c @@ -1,11 +1,9 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/sdk/library/sdk_globals.h" -#include "rnc/sdk/deci2/sce_printf.h" -#include "rnc/sdk/input/dbc/sceDbcSetWorkAddr.h" -#include "rnc/sdk/input/dbc/sce_dbc_get_mod_version.h" -#include "rnc/sdk/rpc/rpc/sce_sif_bind_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_init_rpc.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/input/dbc.h" +#include "rnc/sdk/rpc/rpc.h" extern struct sceSifClientData dbc_transfer_rpc_client __asm__("D_0015B030"); extern char dbc_rpc_bind_failure_message[] __asm__("D_001534D8"); diff --git a/src/sdk/input/dbc/sceDbcSetWorkAddr.c b/src/sdk/input/dbc/sceDbcSetWorkAddr.c index 190c7482ab..622ec24704 100644 --- a/src/sdk/input/dbc/sceDbcSetWorkAddr.c +++ b/src/sdk/input/dbc/sceDbcSetWorkAddr.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/sdk/library/sdk_globals.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" struct DbCState { s32 unk0; diff --git a/src/sdk/input/dbc/sce_dbc_get_mod_version.c b/src/sdk/input/dbc/sce_dbc_get_mod_version.c index 1b068580f1..5448f663e8 100644 --- a/src/sdk/input/dbc/sce_dbc_get_mod_version.c +++ b/src/sdk/input/dbc/sce_dbc_get_mod_version.c @@ -1,6 +1,6 @@ #include "rnc/sdk/library/sdk_globals.h" #include "sda.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" /* Query the Deci2 module and return the version written to its work buffer. */ extern unsigned char RpcReceiveData[1] __asm__("D_0015B080") NOT_SDA; diff --git a/src/sdk/input/dbc/scedbcreceivedata.c b/src/sdk/input/dbc/scedbcreceivedata.c index 5e8f6dd01f..65cade3867 100644 --- a/src/sdk/input/dbc/scedbcreceivedata.c +++ b/src/sdk/input/dbc/scedbcreceivedata.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/sdk/library/sdk_globals.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" struct DbCState { s32 unk0; diff --git a/src/sdk/input/sce_pad2_create_socket.c b/src/sdk/input/sce_pad2_create_socket.c index ee24a29f89..842683dcca 100644 --- a/src/sdk/input/sce_pad2_create_socket.c +++ b/src/sdk/input/sce_pad2_create_socket.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/input/dbc/sceDbcCreateSocket.h" +#include "rnc/sdk/input/dbc.h" typedef struct { s32 option; diff --git a/src/sdk/input/sce_pad2_get_button_profile.c b/src/sdk/input/sce_pad2_get_button_profile.c index fdbee413bf..281fea990b 100644 --- a/src/sdk/input/sce_pad2_get_button_profile.c +++ b/src/sdk/input/sce_pad2_get_button_profile.c @@ -1,8 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" -#include "rnc/sdk/input/dbc/scedbcreceivedata.h" -#include "rnc/sdk/input/sce_pad2_link_driver.h" -#include "rnc/sdk/input/sce_pad2_set_button_order.h" +#include "rnc/sdk/input/dbc.h" +#include "rnc/sdk/input.h" typedef struct { u64 size : 14; diff --git a/src/sdk/input/sce_pad2_get_state.c b/src/sdk/input/sce_pad2_get_state.c index 45f611b248..c1a6c5dcbe 100644 --- a/src/sdk/input/sce_pad2_get_state.c +++ b/src/sdk/input/sce_pad2_get_state.c @@ -1,8 +1,6 @@ #include "types.h" -#include "rnc/sdk/input/dbc/scedbcreceivedata.h" -#include "rnc/sdk/input/sce_pad2_check_dma.h" -#include "rnc/sdk/input/sce_pad2_get_side.h" -#include "rnc/sdk/input/sce_pad2_link_driver.h" +#include "rnc/sdk/input/dbc.h" +#include "rnc/sdk/input.h" typedef struct { u64 size : 14; diff --git a/src/sdk/input/sce_pad2_read.c b/src/sdk/input/sce_pad2_read.c index 3847d4d8cf..2daf64d867 100644 --- a/src/sdk/input/sce_pad2_read.c +++ b/src/sdk/input/sce_pad2_read.c @@ -1,8 +1,6 @@ #include "types.h" #include "rnc/data_labels.h" -#include "rnc/sdk/input/sce_pad2_get_side.h" -#include "rnc/sdk/input/sce_pad2_link_driver.h" -#include "rnc/sdk/input/sce_pad2_set_button_order.h" +#include "rnc/sdk/input.h" struct Pad2Data { u8 pad_0[0x2]; diff --git a/src/sdk/ipu/ipu_vdec.c b/src/sdk/ipu/ipu_vdec.c index 749d004c9a..23e4c6960d 100644 --- a/src/sdk/ipu/ipu_vdec.c +++ b/src/sdk/ipu/ipu_vdec.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/ipu_command_table.h" -#include "rnc/sdk/mpeg/api/dispatch_mpeg_cb_nodata.h" +#include "rnc/sdk/mpeg/api.h" typedef struct { u8 pad0[0x11C]; diff --git a/src/sdk/ipu/sce_ipu_init.c b/src/sdk/ipu/sce_ipu_init.c index 991482d4cc..ec5ce0eb71 100644 --- a/src/sdk/ipu/sce_ipu_init.c +++ b/src/sdk/ipu/sce_ipu_init.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/eetypes.h" -#include "rnc/sdk/dma/set_d4_chcr_variant.h" +#include "rnc/sdk/dma.h" extern volatile u128 ipu_default_quantization_matrices[] __asm__("D_00133050"); extern u128 ipu_default_vq_table[] __asm__("D_001330A0"); diff --git a/src/sdk/ipu/sce_ipu_restart_dma.c b/src/sdk/ipu/sce_ipu_restart_dma.c index 6169d15bdb..4a39b7a437 100644 --- a/src/sdk/ipu/sce_ipu_restart_dma.c +++ b/src/sdk/ipu/sce_ipu_restart_dma.c @@ -1,6 +1,5 @@ #include "types.h" -#include "rnc/sdk/dma/set_d3_chcr.h" -#include "rnc/sdk/dma/set_d4_chcr.h" +#include "rnc/sdk/dma.h" struct IpuContext { s32 unk0; diff --git a/src/sdk/ipu/suspend_ipu_dma_state.c b/src/sdk/ipu/suspend_ipu_dma_state.c index 6824b3d4e8..f5f440909f 100644 --- a/src/sdk/ipu/suspend_ipu_dma_state.c +++ b/src/sdk/ipu/suspend_ipu_dma_state.c @@ -2,8 +2,7 @@ #include "asm.h" #include "types.h" -#include "rnc/sdk/dma/set_d3_chcr.h" -#include "rnc/sdk/dma/set_d4_chcr.h" +#include "rnc/sdk/dma.h" void suspend_ipu_dma_state(u32 *pSnapshot) __asm__("FUN_0012cc20"); diff --git a/src/sdk/ipu/wait_bdec_out.c b/src/sdk/ipu/wait_bdec_out.c index e7c1a7b249..b92ecf5afb 100644 --- a/src/sdk/ipu/wait_bdec_out.c +++ b/src/sdk/ipu/wait_bdec_out.c @@ -1,8 +1,8 @@ #include "types.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" -#include "rnc/sdk/ipu/wait_ipu_idle.h" -#include "rnc/sdk/mpeg/api/dispatch_mpeg_callback.h" -#include "rnc/sdk/mpeg/errors/_Error.h" +#include "rnc/sdk/interrupts.h" +#include "rnc/sdk/ipu.h" +#include "rnc/sdk/mpeg/api.h" +#include "rnc/sdk/mpeg/errors.h" typedef struct { u8 pad0[0x838]; diff --git a/src/sdk/ipu/wait_ipu_idle.c b/src/sdk/ipu/wait_ipu_idle.c index da02c294af..2cc8a52499 100644 --- a/src/sdk/ipu/wait_ipu_idle.c +++ b/src/sdk/ipu/wait_ipu_idle.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/mpeg/api/dispatch_mpeg_cb_nodata.h" +#include "rnc/sdk/mpeg/api.h" void _waitIpuIdle(s32 *ctx) { long new_var; diff --git a/src/sdk/ipu/wait_ipu_idle64.c b/src/sdk/ipu/wait_ipu_idle64.c index 6cd66cb8c5..b7c25d2ddd 100644 --- a/src/sdk/ipu/wait_ipu_idle64.c +++ b/src/sdk/ipu/wait_ipu_idle64.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/mpeg/api/dispatch_mpeg_cb_nodata.h" +#include "rnc/sdk/mpeg/api.h" s64 _waitIpuIdle64(s32 *ctx) { long new_var; diff --git a/src/sdk/kernel/InitExecPS2.c b/src/sdk/kernel/InitExecPS2.c index 43b7790fb8..3fef0f71a0 100644 --- a/src/sdk/kernel/InitExecPS2.c +++ b/src/sdk/kernel/InitExecPS2.c @@ -3,7 +3,7 @@ * for the loop-test sltiu (retail v0; i5 ties at v1). */ #include "types.h" -#include "rnc/sdk/kernel/PatchIsNeeded.h" +#include "rnc/sdk/kernel.h" extern void Rfu116SetSyscallLate(); extern s32 Rfu091Mid(); diff --git a/src/sdk/kernel/InitThread.c b/src/sdk/kernel/InitThread.c index 042aff3f56..9a88047666 100644 --- a/src/sdk/kernel/InitThread.c +++ b/src/sdk/kernel/InitThread.c @@ -3,7 +3,6 @@ #include "types.h" #include "rnc/sdk/kernel.h" #include "rnc/sdk/top_thread.h" -#include "rnc/sdk/kernel/topThread.h" struct ThreadParam { u8 pad0[4]; diff --git a/src/sdk/kernel/SyncDCache.c b/src/sdk/kernel/SyncDCache.c index c9d2e56fad..ac3028c599 100644 --- a/src/sdk/kernel/SyncDCache.c +++ b/src/sdk/kernel/SyncDCache.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/kernel.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" extern s32 _sceSDC(); extern s32 DIntr(); diff --git a/src/sdk/kernel/VSync2.c b/src/sdk/kernel/VSync2.c index 1c629aec69..fe1508cc05 100644 --- a/src/sdk/kernel/VSync2.c +++ b/src/sdk/kernel/VSync2.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/kernel.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" extern s32 DIntr(); extern void SetVSyncFlag(s32 *flag, s64 *result); diff --git a/src/sdk/kernel/_InitSys.c b/src/sdk/kernel/_InitSys.c index f9f3ccdc99..8fefbb33ac 100644 --- a/src/sdk/kernel/_InitSys.c +++ b/src/sdk/kernel/_InitSys.c @@ -1,9 +1,4 @@ -#include "rnc/sdk/kernel/InitExecPS2.h" -#include "rnc/sdk/kernel/InitSystemCallTableAddress.h" -#include "rnc/sdk/kernel/InitThread.h" -#include "rnc/sdk/kernel/init_alarm.h" -#include "rnc/sdk/kernel/init_tlb_functions.h" -#include "rnc/sdk/kernel/supplement_crt0.h" +#include "rnc/sdk/kernel.h" void _InitSys(void) __asm__("_InitSys"); diff --git a/src/sdk/kernel/disable_dmac.c b/src/sdk/kernel/disable_dmac.c index 4a4b7418fc..e517b4272c 100644 --- a/src/sdk/kernel/disable_dmac.c +++ b/src/sdk/kernel/disable_dmac.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/kernel.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" extern s32 _DisableDmac(); extern s32 DIntr(); diff --git a/src/sdk/kernel/disable_intc.c b/src/sdk/kernel/disable_intc.c index d23f01c029..9daaec49cf 100644 --- a/src/sdk/kernel/disable_intc.c +++ b/src/sdk/kernel/disable_intc.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/kernel.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" extern s32 _DisableIntc(); extern s32 DIntr(); diff --git a/src/sdk/kernel/enable_dmac.c b/src/sdk/kernel/enable_dmac.c index d4ef4efc22..16e9d29f71 100644 --- a/src/sdk/kernel/enable_dmac.c +++ b/src/sdk/kernel/enable_dmac.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/kernel.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" extern s32 _EnableDmac(); extern s32 DIntr(); diff --git a/src/sdk/kernel/enable_intc.c b/src/sdk/kernel/enable_intc.c index 5880e5677e..c96e8c1d79 100644 --- a/src/sdk/kernel/enable_intc.c +++ b/src/sdk/kernel/enable_intc.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/kernel.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" extern s32 _EnableIntc(); extern s32 DIntr(); diff --git a/src/sdk/kernel/read.c b/src/sdk/kernel/read.c index 633607bfde..26104c03af 100644 --- a/src/sdk/kernel/read.c +++ b/src/sdk/kernel/read.c @@ -7,8 +7,7 @@ #include "types.h" #include "rnc/runtime/core_state.h" -#include "rnc/sdk/deci2/sce_tty_init.h" -#include "rnc/sdk/deci2/sce_tty_read.h" +#include "rnc/sdk/deci2.h" s32 read(s32 file_descriptor, s32 destination_buffer, s32 max_bytes) { if (file_descriptor == 0) { diff --git a/src/sdk/kernel/sbrk.c b/src/sdk/kernel/sbrk.c index 71421e6c24..67ad063c3e 100644 --- a/src/sdk/kernel/sbrk.c +++ b/src/sdk/kernel/sbrk.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/kernel.h" #include "sda.h" -#include "rnc/sdk/libc/stdlib/__errno.h" +#include "rnc/sdk/libc/stdlib.h" extern void *EndOfHeap(void); /* Current program break, raised by sbrk. */ diff --git a/src/sdk/kernel/topThread.c b/src/sdk/kernel/topThread.c index 351d2d20ae..0c494d9015 100644 --- a/src/sdk/kernel/topThread.c +++ b/src/sdk/kernel/topThread.c @@ -2,7 +2,7 @@ #include "types.h" #include "rnc/sdk/top_thread.h" -#include "rnc/sdk/deci2/kprintf.h" +#include "rnc/sdk/deci2.h" extern u8 thread_command_error_message[] __asm__("D_001526E8"); diff --git a/src/sdk/kernel/v_sync.c b/src/sdk/kernel/v_sync.c index e2cebdfbb1..c8db54e6dc 100644 --- a/src/sdk/kernel/v_sync.c +++ b/src/sdk/kernel/v_sync.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/kernel.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" extern s32 DIntr(); diff --git a/src/sdk/kernel/write.c b/src/sdk/kernel/write.c index 8fddf891b3..4389716d34 100644 --- a/src/sdk/kernel/write.c +++ b/src/sdk/kernel/write.c @@ -7,8 +7,7 @@ #include "types.h" #include "rnc/runtime/core_state.h" -#include "rnc/sdk/deci2/sce_tty_init.h" -#include "rnc/sdk/deci2/sce_tty_write.h" +#include "rnc/sdk/deci2.h" s32 write(s32 fd, s32 source_buffer, s32 byte_count) { register s32 tty_arg = source_buffer; diff --git a/src/sdk/libc/locale/localeconv.c b/src/sdk/libc/locale/localeconv.c index ea69bc87b4..3dcc47afd4 100644 --- a/src/sdk/libc/locale/localeconv.c +++ b/src/sdk/libc/locale/localeconv.c @@ -1,5 +1,5 @@ #include "rnc/sdk/library/stdio.h" -#include "rnc/sdk/libc/locale/_localeconv_r.h" +#include "rnc/sdk/libc/locale.h" int *localeconv(void) __asm__("GetStateResourceWrapper"); diff --git a/src/sdk/libc/malloc/_calloc_r.c b/src/sdk/libc/malloc/_calloc_r.c index 297b6013fe..d99933eeef 100644 --- a/src/sdk/libc/malloc/_calloc_r.c +++ b/src/sdk/libc/malloc/_calloc_r.c @@ -9,7 +9,7 @@ /* _calloc_r q5: exact mallocr.c else-form with p/csz locals. */ #include "types.h" -#include "rnc/sdk/libc/malloc/malloc_r.h" +#include "rnc/sdk/libc/malloc.h" struct _reent; extern void *memset(void *dst, s32 value, u32 size); diff --git a/src/sdk/libc/malloc/_sbrk_r.c b/src/sdk/libc/malloc/_sbrk_r.c index cc0196605f..17b712cc7f 100644 --- a/src/sdk/libc/malloc/_sbrk_r.c +++ b/src/sdk/libc/malloc/_sbrk_r.c @@ -1,5 +1,5 @@ #include "sda.h" -#include "rnc/sdk/kernel/sbrk.h" +#include "rnc/sdk/kernel.h" /* * Derived from newlib, which is distributed under permissive BSD-style * terms. See THIRD_PARTY_NOTICES.md and licenses/COPYING.NEWLIB.txt. diff --git a/src/sdk/libc/malloc/free_r.c b/src/sdk/libc/malloc/free_r.c index 6bb7e11f4d..f962aebb2d 100644 --- a/src/sdk/libc/malloc/free_r.c +++ b/src/sdk/libc/malloc/free_r.c @@ -11,7 +11,7 @@ #include "types.h" #include "rnc/sdk/library/malloc_chunk.h" #include "rnc/data_labels.h" -#include "rnc/sdk/libc/malloc/malloc_trim_r.h" +#include "rnc/sdk/libc/malloc.h" struct _reent; diff --git a/src/sdk/libc/malloc/malloc_extend_top.c b/src/sdk/libc/malloc/malloc_extend_top.c index 623e75ea52..e9b768f3c5 100644 --- a/src/sdk/libc/malloc/malloc_extend_top.c +++ b/src/sdk/libc/malloc/malloc_extend_top.c @@ -13,8 +13,7 @@ #include "rnc/data_labels.h" #include "rnc/sdk/libc/malloc/__malloc_lock.h" #include "rnc/sdk/libc/malloc/__malloc_unlock.h" -#include "rnc/sdk/libc/malloc/_sbrk_r.h" -#include "rnc/sdk/libc/malloc/free_r.h" +#include "rnc/sdk/libc/malloc.h" struct _reent; diff --git a/src/sdk/libc/malloc/malloc_r.c b/src/sdk/libc/malloc/malloc_r.c index 6c41aa0f18..86796812eb 100644 --- a/src/sdk/libc/malloc/malloc_r.c +++ b/src/sdk/libc/malloc/malloc_r.c @@ -1,4 +1,4 @@ -#include "rnc/sdk/libc/malloc/malloc_extend_top.h" +#include "rnc/sdk/libc/malloc.h" /* _malloc_r exact recovery: the smallbin branch expresses bck/bin_at(0) from the unsorted-bin head (u8*)&D_0012F790 - 8 so the compiler keeps &D_0012F790 in a1 and derives the bins base with `addiu a1,a1,-8`, matching retail's register reuse and store order. */ diff --git a/src/sdk/libc/mprec/_dtoa_r.c b/src/sdk/libc/mprec/_dtoa_r.c index 9242d17efd..7c24d436fa 100644 --- a/src/sdk/libc/mprec/_dtoa_r.c +++ b/src/sdk/libc/mprec/_dtoa_r.c @@ -1,5 +1,4 @@ -#include "rnc/sdk/libc/mprec/hi0bits.h" -#include "rnc/sdk/libc/mprec/lshift.h" +#include "rnc/sdk/libc/mprec.h" /**************************************************************** * * The author of this software is David M. Gay. diff --git a/src/sdk/libc/mprec/balloc.c b/src/sdk/libc/mprec/balloc.c index cafe223888..07227c85a7 100644 --- a/src/sdk/libc/mprec/balloc.c +++ b/src/sdk/libc/mprec/balloc.c @@ -1,4 +1,4 @@ -#include "rnc/sdk/libc/malloc/_calloc_r.h" +#include "rnc/sdk/libc/malloc.h" /**************************************************************** * * The author of this software is David M. Gay. diff --git a/src/sdk/libc/mprec/d2b.c b/src/sdk/libc/mprec/d2b.c index 19fdf8e485..08d4b901f1 100644 --- a/src/sdk/libc/mprec/d2b.c +++ b/src/sdk/libc/mprec/d2b.c @@ -1,5 +1,4 @@ -#include "rnc/sdk/libc/mprec/hi0bits.h" -#include "rnc/sdk/libc/mprec/lo0bits.h" +#include "rnc/sdk/libc/mprec.h" /**************************************************************** * * The author of this software is David M. Gay. diff --git a/src/sdk/libc/reent/_fstat_r.c b/src/sdk/libc/reent/_fstat_r.c index 396357e3ee..e2d1a8cf23 100644 --- a/src/sdk/libc/reent/_fstat_r.c +++ b/src/sdk/libc/reent/_fstat_r.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/sdk/library/sdk_globals.h" -#include "rnc/sdk/libc/reent/_fstat.h" +#include "rnc/sdk/libc/reent.h" struct _reent { s32 _errno; diff --git a/src/sdk/libc/reent/_read_r.c b/src/sdk/libc/reent/_read_r.c index a4969e59a6..3366b59abb 100644 --- a/src/sdk/libc/reent/_read_r.c +++ b/src/sdk/libc/reent/_read_r.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/sdk/library/sdk_globals.h" -#include "rnc/sdk/kernel/read.h" +#include "rnc/sdk/kernel.h" struct _reent { s32 _errno; diff --git a/src/sdk/libc/reent/_write_r.c b/src/sdk/libc/reent/_write_r.c index 0636e93a91..8b0dc41d3b 100644 --- a/src/sdk/libc/reent/_write_r.c +++ b/src/sdk/libc/reent/_write_r.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/sdk/library/sdk_globals.h" -#include "rnc/sdk/kernel/write.h" +#include "rnc/sdk/kernel.h" struct _reent { s32 _errno; diff --git a/src/sdk/libc/stdio/__sprint.c b/src/sdk/libc/stdio/__sprint.c index ae7c99cb41..fada17a280 100644 --- a/src/sdk/libc/stdio/__sprint.c +++ b/src/sdk/libc/stdio/__sprint.c @@ -18,7 +18,7 @@ /* Source: newlib (UC Berkeley). */ #include "types.h" -#include "rnc/sdk/libc/stdio/sfvwrite.h" +#include "rnc/sdk/libc/stdio.h" struct PrintIoVector { u8 reserved_00[4]; diff --git a/src/sdk/libc/stdio/_vfprintf_r.c b/src/sdk/libc/stdio/_vfprintf_r.c index c554a106a0..a20f43e9b1 100644 --- a/src/sdk/libc/stdio/_vfprintf_r.c +++ b/src/sdk/libc/stdio/_vfprintf_r.c @@ -1,9 +1,8 @@ /* Derived from newlib (1999 vfprintf.c); see licenses/COPYING.NEWLIB.txt. */ #include "types.h" #include "rnc/sdk/library/stdio.h" -#include "rnc/sdk/libc/stdio/exponent.h" -#include "rnc/sdk/libc/stdlib/isinf.h" -#include "rnc/sdk/libc/stdlib/isnan.h" +#include "rnc/sdk/libc/stdio.h" +#include "rnc/sdk/libc/stdlib.h" typedef char *va_list; #define _REENT _impure_ptr diff --git a/src/sdk/libc/stdio/cvt.c b/src/sdk/libc/stdio/cvt.c index c127a8f23b..16b46ea3e9 100644 --- a/src/sdk/libc/stdio/cvt.c +++ b/src/sdk/libc/stdio/cvt.c @@ -20,7 +20,7 @@ /* cvt: newlib-2000-02-17 vfprintf.c floating-point conversion helper. */ #include "types.h" -#include "rnc/sdk/libc/mprec/_dtoa_r.h" +#include "rnc/sdk/libc/mprec.h" struct _reent; diff --git a/src/sdk/libc/stdio/fflush.c b/src/sdk/libc/stdio/fflush.c index d69f806271..2083523dce 100644 --- a/src/sdk/libc/stdio/fflush.c +++ b/src/sdk/libc/stdio/fflush.c @@ -1,6 +1,5 @@ #include "sda.h" -#include "rnc/sdk/libc/stdio/fwalk.h" -#include "rnc/sdk/libc/stdio/sinit.h" +#include "rnc/sdk/libc/stdio.h" /* * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. diff --git a/src/sdk/libc/stdio/sbprintf.c b/src/sdk/libc/stdio/sbprintf.c index dc20afed29..84d7167eb1 100644 --- a/src/sdk/libc/stdio/sbprintf.c +++ b/src/sdk/libc/stdio/sbprintf.c @@ -9,7 +9,7 @@ #include "types.h" #include "rnc/sdk/library/stdio.h" -#include "rnc/sdk/libc/stdio/fflush.h" +#include "rnc/sdk/libc/stdio.h" typedef char *va_list; diff --git a/src/sdk/libc/stdio/sfvwrite.c b/src/sdk/libc/stdio/sfvwrite.c index ad7685f3bc..a8a0d14af4 100644 --- a/src/sdk/libc/stdio/sfvwrite.c +++ b/src/sdk/libc/stdio/sfvwrite.c @@ -18,7 +18,7 @@ */ #include "rnc/sdk/library/stdio.h" -#include "rnc/sdk/libc/stdio/fflush.h" +#include "rnc/sdk/libc/stdio.h" #include "rnc/sdk/libc/stdio/swsetup.h" typedef u32 size_t; diff --git a/src/sdk/libc/stdio/sinit.c b/src/sdk/libc/stdio/sinit.c index 7f4ced495f..26c9270c34 100644 --- a/src/sdk/libc/stdio/sinit.c +++ b/src/sdk/libc/stdio/sinit.c @@ -19,7 +19,7 @@ #include "types.h" #include "rnc/data_labels.h" -#include "rnc/sdk/libc/stdio/std.h" +#include "rnc/sdk/libc/stdio.h" struct Reent { u8 pad_0[0x38]; diff --git a/src/sdk/libc/stdio/swsetup.c b/src/sdk/libc/stdio/swsetup.c index 88dcc0a902..fd2c5ec98f 100644 --- a/src/sdk/libc/stdio/swsetup.c +++ b/src/sdk/libc/stdio/swsetup.c @@ -17,9 +17,8 @@ #include "types.h" #include "rnc/sdk/library/stdio.h" -#include "rnc/sdk/libc/malloc/free_r.h" -#include "rnc/sdk/libc/stdio/sinit.h" -#include "rnc/sdk/libc/stdio/smakebuf.h" +#include "rnc/sdk/libc/malloc.h" +#include "rnc/sdk/libc/stdio.h" /* FILE with the SDK's signed flags word. */ struct SwFile { diff --git a/src/sdk/libc/stdio/vfprintf.c b/src/sdk/libc/stdio/vfprintf.c index 3799195a7a..f5c860e3ed 100644 --- a/src/sdk/libc/stdio/vfprintf.c +++ b/src/sdk/libc/stdio/vfprintf.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/library/stdio.h" #include "rnc/sdk/libc/stdio/_vfprintf_r.h" -#include "rnc/sdk/libc/stdio/sinit.h" +#include "rnc/sdk/libc/stdio.h" #define FILE RncFile /* newlib local.h */ #define CHECK_INIT(fp) \ diff --git a/src/sdk/libc/stdlib/_strtol_r.c b/src/sdk/libc/stdlib/_strtol_r.c index 0440d87449..daa8fc5567 100644 --- a/src/sdk/libc/stdlib/_strtol_r.c +++ b/src/sdk/libc/stdlib/_strtol_r.c @@ -21,9 +21,7 @@ * ctype table D_00152201 (= _ctype_ + 1). */ #include "types.h" -#include "rnc/sdk/soft_float/__muldi3.h" -#include "rnc/sdk/soft_float/udivdi3.h" -#include "rnc/sdk/soft_float/umoddi3.h" +#include "rnc/sdk/soft_float.h" typedef struct _reent { s32 _errno; diff --git a/src/sdk/mpeg/api/alloc_work_area.c b/src/sdk/mpeg/api/alloc_work_area.c index 71eef95402..e312324cb5 100644 --- a/src/sdk/mpeg/api/alloc_work_area.c +++ b/src/sdk/mpeg/api/alloc_work_area.c @@ -1,5 +1,5 @@ #include "rnc/sdk/mpeg_work_area.h" -#include "rnc/sdk/mpeg/errors/_Error.h" +#include "rnc/sdk/mpeg/errors.h" extern u8 work_area_too_small_message[] __asm__("D_00153A38"); diff --git a/src/sdk/mpeg/api/dispatch_mpeg_cb_nodata.c b/src/sdk/mpeg/api/dispatch_mpeg_cb_nodata.c index a40ed28ae1..4398a91774 100644 --- a/src/sdk/mpeg/api/dispatch_mpeg_cb_nodata.c +++ b/src/sdk/mpeg/api/dispatch_mpeg_cb_nodata.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/mpeg/api/dispatch_mpeg_callback.h" +#include "rnc/sdk/mpeg/api.h" void DispatchMpegCallbackNoData(void *callback) __asm__("_dispatchMpegCbNodata"); diff --git a/src/sdk/mpeg/api/sce_mpeg_add_str_callback.c b/src/sdk/mpeg/api/sce_mpeg_add_str_callback.c index 72a381c4b9..0356a748b1 100644 --- a/src/sdk/mpeg/api/sce_mpeg_add_str_callback.c +++ b/src/sdk/mpeg/api/sce_mpeg_add_str_callback.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/mpeg/demux/type2id.h" +#include "rnc/sdk/mpeg/demux.h" typedef struct { u64 id; diff --git a/src/sdk/mpeg/api/sce_mpeg_demux_pss_ring.c b/src/sdk/mpeg/api/sce_mpeg_demux_pss_ring.c index 5c1f1c701c..6a9a2b53d0 100644 --- a/src/sdk/mpeg/api/sce_mpeg_demux_pss_ring.c +++ b/src/sdk/mpeg/api/sce_mpeg_demux_pss_ring.c @@ -2,9 +2,8 @@ #include "asm.h" #include "types.h" -#include "rnc/sdk/mpeg/bitstream/peek_bits.h" -#include "rnc/sdk/mpeg/demux/_PES_packet.h" -#include "rnc/sdk/mpeg/demux/_pack_header.h" +#include "rnc/sdk/mpeg/bitstream.h" +#include "rnc/sdk/mpeg/demux.h" /* libmpeg: demultiplex the PSS (MPEG-2 program stream) data of a ring buffer and hand each PES packet to the callback registered for its diff --git a/src/sdk/mpeg/api/sce_mpeg_flush.c b/src/sdk/mpeg/api/sce_mpeg_flush.c index 22e1fb6e80..cae2cb96b2 100644 --- a/src/sdk/mpeg/api/sce_mpeg_flush.c +++ b/src/sdk/mpeg/api/sce_mpeg_flush.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/mpeg/picture/_lastFrame.h" +#include "rnc/sdk/mpeg/picture.h" typedef struct MpegDecoder MpegDecoder; diff --git a/src/sdk/mpeg/api/sce_mpeg_get_picture.c b/src/sdk/mpeg/api/sce_mpeg_get_picture.c index 6bf69c8234..7ccf77f9b2 100644 --- a/src/sdk/mpeg/api/sce_mpeg_get_picture.c +++ b/src/sdk/mpeg/api/sce_mpeg_get_picture.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/mpeg/picture/_getpic.h" +#include "rnc/sdk/mpeg/picture.h" typedef struct MpegPictureDecoder MpegPictureDecoder; diff --git a/src/sdk/mpeg/api/sce_mpeg_init.c b/src/sdk/mpeg/api/sce_mpeg_init.c index cf7a0f5962..14651b78ec 100644 --- a/src/sdk/mpeg/api/sce_mpeg_init.c +++ b/src/sdk/mpeg/api/sce_mpeg_init.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" extern s32 DIntr(); diff --git a/src/sdk/mpeg/api/sce_mpeg_reset.c b/src/sdk/mpeg/api/sce_mpeg_reset.c index 053e8a775c..fec602424f 100644 --- a/src/sdk/mpeg/api/sce_mpeg_reset.c +++ b/src/sdk/mpeg/api/sce_mpeg_reset.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/mpeg/picture/_clearEach.h" +#include "rnc/sdk/mpeg/picture.h" typedef struct MpegDecoder MpegDecoder; extern void set_mpeg1_mode(MpegDecoder *decoder) __asm__("SetImageBufferFlag"); diff --git a/src/sdk/mpeg/api/set_mpeg1_mode.c b/src/sdk/mpeg/api/set_mpeg1_mode.c index 92b594fff3..45792be691 100644 --- a/src/sdk/mpeg/api/set_mpeg1_mode.c +++ b/src/sdk/mpeg/api/set_mpeg1_mode.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/ipu/ipu_set_mpeg1.h" +#include "rnc/sdk/ipu.h" typedef struct ImageBufferState { u8 reserved[0x848]; diff --git a/src/sdk/mpeg/bitstream/_peepBit.c b/src/sdk/mpeg/bitstream/_peepBit.c index 2372ff4e2e..823c5f825c 100644 --- a/src/sdk/mpeg/bitstream/_peepBit.c +++ b/src/sdk/mpeg/bitstream/_peepBit.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/ipu_command_table.h" -#include "rnc/sdk/ipu/wait_ipu_idle64.h" -#include "rnc/sdk/mpeg/api/dispatch_mpeg_cb_nodata.h" +#include "rnc/sdk/ipu.h" +#include "rnc/sdk/mpeg/api.h" typedef struct PeepBitContext { u8 pad_0[0x818]; diff --git a/src/sdk/mpeg/bitstream/nextbit.c b/src/sdk/mpeg/bitstream/nextbit.c index 632bddea24..db3e49630a 100644 --- a/src/sdk/mpeg/bitstream/nextbit.c +++ b/src/sdk/mpeg/bitstream/nextbit.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/ipu_command_table.h" -#include "rnc/sdk/ipu/wait_ipu_idle64.h" -#include "rnc/sdk/mpeg/api/dispatch_mpeg_cb_nodata.h" +#include "rnc/sdk/ipu.h" +#include "rnc/sdk/mpeg/api.h" typedef struct NextBitContext { u8 pad_0[0x818]; diff --git a/src/sdk/mpeg/bitstream/nextstartcode.c b/src/sdk/mpeg/bitstream/nextstartcode.c index db39b9bbaa..959d85459f 100644 --- a/src/sdk/mpeg/bitstream/nextstartcode.c +++ b/src/sdk/mpeg/bitstream/nextstartcode.c @@ -1,7 +1,6 @@ #include "types.h" -#include "rnc/sdk/ipu/wait_ipu_idle.h" -#include "rnc/sdk/mpeg/bitstream/_flushBuf.h" -#include "rnc/sdk/mpeg/bitstream/_peepBit.h" +#include "rnc/sdk/ipu.h" +#include "rnc/sdk/mpeg/bitstream.h" void _nextStartCode(s32 *decoder_state) { s32 raw; diff --git a/src/sdk/mpeg/demux/_getPtsDtsFlags.c b/src/sdk/mpeg/demux/_getPtsDtsFlags.c index ba0d17fe85..31f7c23cc5 100644 --- a/src/sdk/mpeg/demux/_getPtsDtsFlags.c +++ b/src/sdk/mpeg/demux/_getPtsDtsFlags.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/soft_float/__muldi3.h" +#include "rnc/sdk/soft_float.h" struct MpegTimestampState { u8 pad_0[0x70]; diff --git a/src/sdk/mpeg/demux/system_header.c b/src/sdk/mpeg/demux/system_header.c index 2ebaef5213..9f7a056840 100644 --- a/src/sdk/mpeg/demux/system_header.c +++ b/src/sdk/mpeg/demux/system_header.c @@ -1,6 +1,6 @@ #include "types.h" -#include "rnc/sdk/mpeg/bitstream/peek_bits.h" -#include "rnc/sdk/system/sysbit_get.h" +#include "rnc/sdk/mpeg/bitstream.h" +#include "rnc/sdk/system.h" s32 ParseSystemHeader(void *state) __asm__("_system_header"); diff --git a/src/sdk/mpeg/errors/error1.c b/src/sdk/mpeg/errors/error1.c index deab5e5cac..e3f0d118a2 100644 --- a/src/sdk/mpeg/errors/error1.c +++ b/src/sdk/mpeg/errors/error1.c @@ -1,5 +1,5 @@ -#include "rnc/sdk/libc/stdio/sprintf.h" -#include "rnc/sdk/mpeg/errors/_Error.h" +#include "rnc/sdk/libc/stdio.h" +#include "rnc/sdk/mpeg/errors.h" void ErrorWithMessage(void *error_state, const char *format) __asm__("_Error1"); diff --git a/src/sdk/mpeg/errors/print_mpeg_error.c b/src/sdk/mpeg/errors/print_mpeg_error.c index e5cbbdcea0..8e53646bfe 100644 --- a/src/sdk/mpeg/errors/print_mpeg_error.c +++ b/src/sdk/mpeg/errors/print_mpeg_error.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/deci2/sce_printf.h" +#include "rnc/sdk/deci2.h" void print_mpeg_error(void *image) __asm__("JumpToImageSetup"); diff --git a/src/sdk/mpeg/errors/report_mpeg_picture_spatial_scalable_unsupported.c b/src/sdk/mpeg/errors/report_mpeg_picture_spatial_scalable_unsupported.c index c8bff59064..7119c5db59 100644 --- a/src/sdk/mpeg/errors/report_mpeg_picture_spatial_scalable_unsupported.c +++ b/src/sdk/mpeg/errors/report_mpeg_picture_spatial_scalable_unsupported.c @@ -1,6 +1,6 @@ #include "types.h" #include "asm.h" -#include "rnc/sdk/mpeg/errors/_Error.h" +#include "rnc/sdk/mpeg/errors.h" const char D_00153B90[] = "_pictureSpatialScalableExtension is not supported"; diff --git a/src/sdk/mpeg/errors/report_mpeg_picture_temporal_scalable_unsupported.c b/src/sdk/mpeg/errors/report_mpeg_picture_temporal_scalable_unsupported.c index efdf0e1a7d..3f45f708fa 100644 --- a/src/sdk/mpeg/errors/report_mpeg_picture_temporal_scalable_unsupported.c +++ b/src/sdk/mpeg/errors/report_mpeg_picture_temporal_scalable_unsupported.c @@ -1,6 +1,6 @@ #include "types.h" #include "asm.h" -#include "rnc/sdk/mpeg/errors/_Error.h" +#include "rnc/sdk/mpeg/errors.h" const char D_00153BC8[] = "_pictureTemporalScalableExtension is not supported"; diff --git a/src/sdk/mpeg/errors/report_mpeg_sequence_scalable_unsupported.c b/src/sdk/mpeg/errors/report_mpeg_sequence_scalable_unsupported.c index 40a1a36dc6..6d19380ab3 100644 --- a/src/sdk/mpeg/errors/report_mpeg_sequence_scalable_unsupported.c +++ b/src/sdk/mpeg/errors/report_mpeg_sequence_scalable_unsupported.c @@ -2,7 +2,7 @@ #include "asm.h" #include "types.h" -#include "rnc/sdk/mpeg/errors/_Error.h" +#include "rnc/sdk/mpeg/errors.h" const u8 D_00153B48[] = "_sequenceScalableExtension() is not implemented"; diff --git a/src/sdk/mpeg/errors/report_unknown_mpeg_extension.c b/src/sdk/mpeg/errors/report_unknown_mpeg_extension.c index 8842a21d2e..b33ff3afd6 100644 --- a/src/sdk/mpeg/errors/report_unknown_mpeg_extension.c +++ b/src/sdk/mpeg/errors/report_unknown_mpeg_extension.c @@ -1,6 +1,6 @@ #include "types.h" #include "asm.h" -#include "rnc/sdk/mpeg/errors/_Error.h" +#include "rnc/sdk/mpeg/errors.h" typedef struct MpegVideoDecoderState MpegVideoDecoderState; diff --git a/src/sdk/mpeg/headers/_copyrightExtension.c b/src/sdk/mpeg/headers/_copyrightExtension.c index ea11e95137..804d909074 100644 --- a/src/sdk/mpeg/headers/_copyrightExtension.c +++ b/src/sdk/mpeg/headers/_copyrightExtension.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/mpeg/bitstream/nextbit.h" +#include "rnc/sdk/mpeg/bitstream.h" void _copyrightExtension(s32 decoder) { _nextBit(decoder, 1); diff --git a/src/sdk/mpeg/headers/_extensionAndUserData.c b/src/sdk/mpeg/headers/_extensionAndUserData.c index d0b4b83986..e30bd8f360 100644 --- a/src/sdk/mpeg/headers/_extensionAndUserData.c +++ b/src/sdk/mpeg/headers/_extensionAndUserData.c @@ -1,8 +1,5 @@ #include "types.h" -#include "rnc/sdk/mpeg/bitstream/_flushBuf.h" -#include "rnc/sdk/mpeg/bitstream/_peepBit.h" -#include "rnc/sdk/mpeg/bitstream/nextbit.h" -#include "rnc/sdk/mpeg/bitstream/nextstartcode.h" +#include "rnc/sdk/mpeg/bitstream.h" typedef void (*ExtFunc)(void *); diff --git a/src/sdk/mpeg/headers/_groupOfPicturesHeader.c b/src/sdk/mpeg/headers/_groupOfPicturesHeader.c index 47c1a0edce..cd3ab51f2e 100644 --- a/src/sdk/mpeg/headers/_groupOfPicturesHeader.c +++ b/src/sdk/mpeg/headers/_groupOfPicturesHeader.c @@ -1,5 +1,5 @@ -#include "rnc/sdk/mpeg/bitstream/nextbit.h" -#include "rnc/sdk/mpeg/headers/_extensionAndUserData.h" +#include "rnc/sdk/mpeg/bitstream.h" +#include "rnc/sdk/mpeg/headers.h" typedef struct GroupOfPicturesContext GroupOfPicturesContext; diff --git a/src/sdk/mpeg/headers/_quantMatrixExtension.c b/src/sdk/mpeg/headers/_quantMatrixExtension.c index ff48de6afd..3e1dc245d1 100644 --- a/src/sdk/mpeg/headers/_quantMatrixExtension.c +++ b/src/sdk/mpeg/headers/_quantMatrixExtension.c @@ -1,9 +1,8 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/ipu/send_ipu_command.h" -#include "rnc/sdk/ipu/wait_ipu_idle.h" -#include "rnc/sdk/mpeg/bitstream/nextbit.h" -#include "rnc/sdk/mpeg/errors/_Error.h" +#include "rnc/sdk/ipu.h" +#include "rnc/sdk/mpeg/bitstream.h" +#include "rnc/sdk/mpeg/errors.h" extern u8 chroma_intra_matrix_error_message[] __asm__("D_001538E8"); const u8 D_00153910[] = "load_chroma_non_intra_quantizer_matrix == 1"; diff --git a/src/sdk/mpeg/headers/_sequenceDisplayExtension.c b/src/sdk/mpeg/headers/_sequenceDisplayExtension.c index a4a0f1cc19..c88d22c117 100644 --- a/src/sdk/mpeg/headers/_sequenceDisplayExtension.c +++ b/src/sdk/mpeg/headers/_sequenceDisplayExtension.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/mpeg/bitstream/nextbit.h" +#include "rnc/sdk/mpeg/bitstream.h" void _sequenceDisplayExtension(struct MpegDecoder *mpeg) { _nextBit(mpeg, 3); diff --git a/src/sdk/mpeg/headers/extrainfo.c b/src/sdk/mpeg/headers/extrainfo.c index 7e367b03cf..3d5e22fa67 100644 --- a/src/sdk/mpeg/headers/extrainfo.c +++ b/src/sdk/mpeg/headers/extrainfo.c @@ -1,5 +1,4 @@ -#include "rnc/sdk/mpeg/bitstream/_flushBuf.h" -#include "rnc/sdk/mpeg/bitstream/nextbit.h" +#include "rnc/sdk/mpeg/bitstream.h" void ExtraInfo(void *bitstream) __asm__("_extrainfo"); diff --git a/src/sdk/mpeg/headers/picture_display_extension.c b/src/sdk/mpeg/headers/picture_display_extension.c index f8dd3cc0b9..67abfb73eb 100644 --- a/src/sdk/mpeg/headers/picture_display_extension.c +++ b/src/sdk/mpeg/headers/picture_display_extension.c @@ -1,7 +1,7 @@ /* _pictureDisplayExtension p5: MPEG2 picture display extension offsets. */ #include "types.h" -#include "rnc/sdk/mpeg/bitstream/nextbit.h" +#include "rnc/sdk/mpeg/bitstream.h" typedef struct PdeContext { u8 pad_0[0x124]; diff --git a/src/sdk/mpeg/headers/picture_header.c b/src/sdk/mpeg/headers/picture_header.c index bfad2f6d89..b8abe6aa9a 100644 --- a/src/sdk/mpeg/headers/picture_header.c +++ b/src/sdk/mpeg/headers/picture_header.c @@ -1,7 +1,6 @@ -#include "rnc/sdk/mpeg/bitstream/nextbit.h" -#include "rnc/sdk/mpeg/headers/_extensionAndUserData.h" -#include "rnc/sdk/mpeg/headers/extrainfo.h" -#include "rnc/sdk/mpeg/picture/update_temp_track_data.h" +#include "rnc/sdk/mpeg/bitstream.h" +#include "rnc/sdk/mpeg/headers.h" +#include "rnc/sdk/mpeg/picture.h" typedef struct PictureHeaderContext PictureHeaderContext; diff --git a/src/sdk/mpeg/headers/picturecodingextension.c b/src/sdk/mpeg/headers/picturecodingextension.c index 6e02831259..a59cb7efcb 100644 --- a/src/sdk/mpeg/headers/picturecodingextension.c +++ b/src/sdk/mpeg/headers/picturecodingextension.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/mpeg/bitstream/nextbit.h" +#include "rnc/sdk/mpeg/bitstream.h" void _pictureCodingExtension(struct MpegDecoder *mpeg) { s32 structure; diff --git a/src/sdk/mpeg/headers/sequenceheader.c b/src/sdk/mpeg/headers/sequenceheader.c index 3d0d7212dc..7ef316ecac 100644 --- a/src/sdk/mpeg/headers/sequenceheader.c +++ b/src/sdk/mpeg/headers/sequenceheader.c @@ -1,12 +1,9 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/ipu/send_ipu_command.h" -#include "rnc/sdk/ipu/wait_ipu_idle.h" -#include "rnc/sdk/mpeg/bitstream/nextbit.h" -#include "rnc/sdk/mpeg/errors/_Error.h" -#include "rnc/sdk/mpeg/headers/_extensionAndUserData.h" -#include "rnc/sdk/mpeg/headers/setdefaultqm.h" -#include "rnc/sdk/mpeg/headers/update_mpeg_frame_size.h" +#include "rnc/sdk/ipu.h" +#include "rnc/sdk/mpeg/bitstream.h" +#include "rnc/sdk/mpeg/errors.h" +#include "rnc/sdk/mpeg/headers.h" extern u8 default_intra_quantiser_matrix[] __asm__("D_00132FC0"); extern u8 default_non_intra_quantiser_matrix[] __asm__("D_00133000"); diff --git a/src/sdk/mpeg/headers/setdefaultqm.c b/src/sdk/mpeg/headers/setdefaultqm.c index 2fd7e46769..4394728de5 100644 --- a/src/sdk/mpeg/headers/setdefaultqm.c +++ b/src/sdk/mpeg/headers/setdefaultqm.c @@ -1,10 +1,9 @@ #include "types.h" #include "rnc/sdk/eeregs.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" -#include "rnc/sdk/ipu/send_ipu_command.h" -#include "rnc/sdk/ipu/wait_ipu_idle.h" -#include "rnc/sdk/mpeg/api/dispatch_mpeg_callback.h" +#include "rnc/sdk/interrupts.h" +#include "rnc/sdk/ipu.h" +#include "rnc/sdk/mpeg/api.h" extern s32 DIntr(void); diff --git a/src/sdk/mpeg/headers/update_mpeg_frame_size.c b/src/sdk/mpeg/headers/update_mpeg_frame_size.c index 5b49385fe5..ecb4ade95a 100644 --- a/src/sdk/mpeg/headers/update_mpeg_frame_size.c +++ b/src/sdk/mpeg/headers/update_mpeg_frame_size.c @@ -1,8 +1,7 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/mpeg/api/reset_work_area.h" -#include "rnc/sdk/mpeg/ref_images/init_ref_images.h" -#include "rnc/sdk/mpeg/ref_images/initialize_reference_image.h" +#include "rnc/sdk/mpeg/api.h" +#include "rnc/sdk/mpeg/ref_images.h" extern s32 alloc_work_area() __asm__("func_0012BC20"); diff --git a/src/sdk/mpeg/macroblock/_decMB0.c b/src/sdk/mpeg/macroblock/_decMB0.c index 97618e6298..d65335e343 100644 --- a/src/sdk/mpeg/macroblock/_decMB0.c +++ b/src/sdk/mpeg/macroblock/_decMB0.c @@ -1,14 +1,9 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/ipu/ipu_vdec.h" -#include "rnc/sdk/ipu/receive_data_from_ipu.h" -#include "rnc/sdk/ipu/send_ipu_command.h" -#include "rnc/sdk/ipu/wait_ipu_idle.h" -#include "rnc/sdk/mpeg/bitstream/_flushBuf.h" -#include "rnc/sdk/mpeg/bitstream/nextbit.h" -#include "rnc/sdk/mpeg/errors/_Error.h" -#include "rnc/sdk/mpeg/macroblock/motion_vector.h" -#include "rnc/sdk/mpeg/macroblock/motion_vectors.h" +#include "rnc/sdk/ipu.h" +#include "rnc/sdk/mpeg/bitstream.h" +#include "rnc/sdk/mpeg/errors.h" +#include "rnc/sdk/mpeg/macroblock.h" struct MpegMbState { int unk0; diff --git a/src/sdk/mpeg/macroblock/_slice0.c b/src/sdk/mpeg/macroblock/_slice0.c index 9cb437c8b6..6bb002ff6c 100644 --- a/src/sdk/mpeg/macroblock/_slice0.c +++ b/src/sdk/mpeg/macroblock/_slice0.c @@ -1,13 +1,9 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/ipu/wait_bdec_out.h" -#include "rnc/sdk/mpeg/bitstream/_peepBit.h" -#include "rnc/sdk/mpeg/errors/_Error.h" -#include "rnc/sdk/mpeg/macroblock/_decMB0.h" -#include "rnc/sdk/mpeg/macroblock/domc.h" -#include "rnc/sdk/mpeg/macroblock/mb_address_increment.h" -#include "rnc/sdk/mpeg/macroblock/skip_mb0.h" -#include "rnc/sdk/mpeg/macroblock/slicea0.h" +#include "rnc/sdk/ipu.h" +#include "rnc/sdk/mpeg/bitstream.h" +#include "rnc/sdk/mpeg/errors.h" +#include "rnc/sdk/mpeg/macroblock.h" extern u8 too_many_macroblocks_error_message[] __asm__("D_00153848"); extern s32 _motionComp0(); diff --git a/src/sdk/mpeg/macroblock/_sliceB.c b/src/sdk/mpeg/macroblock/_sliceB.c index cf551908c9..0d0fd4477e 100644 --- a/src/sdk/mpeg/macroblock/_sliceB.c +++ b/src/sdk/mpeg/macroblock/_sliceB.c @@ -1,8 +1,7 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/mpeg/bitstream/_flushBuf.h" -#include "rnc/sdk/mpeg/bitstream/nextbit.h" -#include "rnc/sdk/mpeg/headers/extrainfo.h" +#include "rnc/sdk/mpeg/bitstream.h" +#include "rnc/sdk/mpeg/headers.h" s32 _sliceB(struct MpegDecoder *mpeg) { mpeg->quantiser_scale_code = _nextBit(mpeg, 5); diff --git a/src/sdk/mpeg/macroblock/cpr8.c b/src/sdk/mpeg/macroblock/cpr8.c index 6457ca3a93..94b219def2 100644 --- a/src/sdk/mpeg/macroblock/cpr8.c +++ b/src/sdk/mpeg/macroblock/cpr8.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" struct MpegCopyParams { s32 unk0; diff --git a/src/sdk/mpeg/macroblock/decode_dmvector.c b/src/sdk/mpeg/macroblock/decode_dmvector.c index 1129f7ecc4..8b0e73528b 100644 --- a/src/sdk/mpeg/macroblock/decode_dmvector.c +++ b/src/sdk/mpeg/macroblock/decode_dmvector.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/ipu/ipu_vdec.h" +#include "rnc/sdk/ipu.h" s32 decode_dmvector(s32 command, s32 requested_mode) __asm__("InitializeMemoryCardDirectory"); diff --git a/src/sdk/mpeg/macroblock/domc.c b/src/sdk/mpeg/macroblock/domc.c index f92ffb6660..59c15f0003 100644 --- a/src/sdk/mpeg/macroblock/domc.c +++ b/src/sdk/mpeg/macroblock/domc.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/mpeg/errors/_Error.h" +#include "rnc/sdk/mpeg/errors.h" extern u8 intra_skip_mb_error_message[] __asm__("D_00153770"); extern void func_001271D8(); diff --git a/src/sdk/mpeg/macroblock/motion_vectors.c b/src/sdk/mpeg/macroblock/motion_vectors.c index 3eb0fabd0d..eca0f0a6b7 100644 --- a/src/sdk/mpeg/macroblock/motion_vectors.c +++ b/src/sdk/mpeg/macroblock/motion_vectors.c @@ -1,6 +1,6 @@ #include "types.h" -#include "rnc/sdk/mpeg/bitstream/nextbit.h" -#include "rnc/sdk/mpeg/macroblock/motion_vector.h" +#include "rnc/sdk/mpeg/bitstream.h" +#include "rnc/sdk/mpeg/macroblock.h" typedef struct MpegDec MpegDec; diff --git a/src/sdk/mpeg/macroblock/skip_mb0.c b/src/sdk/mpeg/macroblock/skip_mb0.c index 32b94fc57e..7cbfae8315 100644 --- a/src/sdk/mpeg/macroblock/skip_mb0.c +++ b/src/sdk/mpeg/macroblock/skip_mb0.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/mpeg/errors/_Error.h" +#include "rnc/sdk/mpeg/errors.h" struct MpegSkipState { s32 unk0; diff --git a/src/sdk/mpeg/picture/_decodeOrSkip.c b/src/sdk/mpeg/picture/_decodeOrSkip.c index c16e65bc74..95a7a0e513 100644 --- a/src/sdk/mpeg/picture/_decodeOrSkip.c +++ b/src/sdk/mpeg/picture/_decodeOrSkip.c @@ -1,6 +1,5 @@ #include "types.h" -#include "rnc/sdk/mpeg/picture/_decodeOrSkipField.h" -#include "rnc/sdk/mpeg/picture/_decodeOrSkipFrame.h" +#include "rnc/sdk/mpeg/picture.h" s32 _decodeOrSkip(s32 mp, s32 skip_comparison_value, s32 skip_threshold) { if ((*(s32 **)(mp + 0x40))[0x5D] != 3) { diff --git a/src/sdk/mpeg/picture/_decodeOrSkipField.c b/src/sdk/mpeg/picture/_decodeOrSkipField.c index 30a3b944e1..fc9add94ab 100644 --- a/src/sdk/mpeg/picture/_decodeOrSkipField.c +++ b/src/sdk/mpeg/picture/_decodeOrSkipField.c @@ -1,11 +1,9 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/mpeg/api/dispatch_mpeg_cb_nodata.h" -#include "rnc/sdk/mpeg/api/sce_mpeg_flush.h" -#include "rnc/sdk/mpeg/headers/next_header.h" -#include "rnc/sdk/mpeg/picture/decpicture.h" -#include "rnc/sdk/mpeg/ref_images/_updateRefImage.h" -#include "rnc/sdk/mpeg/ref_images/outputframe.h" +#include "rnc/sdk/mpeg/api.h" +#include "rnc/sdk/mpeg/headers.h" +#include "rnc/sdk/mpeg/picture.h" +#include "rnc/sdk/mpeg/ref_images.h" s32 _decodeOrSkipField(struct sceMpeg *decoder, s32 skip_comparison_value, s32 skip_threshold) { struct MpegDecoder *mpeg_decoder; diff --git a/src/sdk/mpeg/picture/_decodeOrSkipFrame.c b/src/sdk/mpeg/picture/_decodeOrSkipFrame.c index 0823d4a05d..c30830d85b 100644 --- a/src/sdk/mpeg/picture/_decodeOrSkipFrame.c +++ b/src/sdk/mpeg/picture/_decodeOrSkipFrame.c @@ -1,9 +1,8 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/mpeg/api/dispatch_mpeg_cb_nodata.h" -#include "rnc/sdk/mpeg/picture/decpicture.h" -#include "rnc/sdk/mpeg/ref_images/_updateRefImage.h" -#include "rnc/sdk/mpeg/ref_images/outputframe.h" +#include "rnc/sdk/mpeg/api.h" +#include "rnc/sdk/mpeg/picture.h" +#include "rnc/sdk/mpeg/ref_images.h" s32 _decodeOrSkipFrame(struct sceMpeg *decoder, s32 skip_comparison_value, s32 skip_threshold) { s32 decode_or_skip_result; diff --git a/src/sdk/mpeg/picture/_pictureData0.c b/src/sdk/mpeg/picture/_pictureData0.c index a9110701ea..ff7601a18a 100644 --- a/src/sdk/mpeg/picture/_pictureData0.c +++ b/src/sdk/mpeg/picture/_pictureData0.c @@ -1,9 +1,7 @@ #include "types.h" -#include "rnc/sdk/ipu/wait_bdec_out.h" -#include "rnc/sdk/ipu/wait_ipu_idle.h" -#include "rnc/sdk/mpeg/errors/_Error.h" -#include "rnc/sdk/mpeg/macroblock/_slice0.h" -#include "rnc/sdk/mpeg/macroblock/domc.h" +#include "rnc/sdk/ipu.h" +#include "rnc/sdk/mpeg/errors.h" +#include "rnc/sdk/mpeg/macroblock.h" typedef struct { u8 pad0[0x12C]; diff --git a/src/sdk/mpeg/picture/decpicture.c b/src/sdk/mpeg/picture/decpicture.c index 1db06e29f7..884ef0035d 100644 --- a/src/sdk/mpeg/picture/decpicture.c +++ b/src/sdk/mpeg/picture/decpicture.c @@ -1,6 +1,6 @@ #include "types.h" -#include "rnc/sdk/mpeg/errors/_Error.h" -#include "rnc/sdk/mpeg/picture/_pictureData0.h" +#include "rnc/sdk/mpeg/errors.h" +#include "rnc/sdk/mpeg/picture.h" struct MpegReferenceImage; diff --git a/src/sdk/mpeg/picture/resume_mpeg_decoder_ipu_dma.c b/src/sdk/mpeg/picture/resume_mpeg_decoder_ipu_dma.c index 319b89a4ab..1d4ff08b7f 100644 --- a/src/sdk/mpeg/picture/resume_mpeg_decoder_ipu_dma.c +++ b/src/sdk/mpeg/picture/resume_mpeg_decoder_ipu_dma.c @@ -2,7 +2,7 @@ #include "asm.h" #include "types.h" -#include "rnc/sdk/ipu/sce_ipu_restart_dma.h" +#include "rnc/sdk/ipu.h" typedef struct MpegVideoLibraryContext { u8 reserved[0x40]; diff --git a/src/sdk/mpeg/picture/suspend_mpeg_decoder_ipu_dma.c b/src/sdk/mpeg/picture/suspend_mpeg_decoder_ipu_dma.c index f6577d233a..2dc7979760 100644 --- a/src/sdk/mpeg/picture/suspend_mpeg_decoder_ipu_dma.c +++ b/src/sdk/mpeg/picture/suspend_mpeg_decoder_ipu_dma.c @@ -1,7 +1,7 @@ #include "types.h" #include "asm.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/ipu/suspend_ipu_dma_state.h" +#include "rnc/sdk/ipu.h" /* The callback loads the decoder at +0x40, then passes its +0x4c DMA state. */ typedef struct MpegDecoder MpegDecoder; diff --git a/src/sdk/mpeg/ref_images/_dispRefImage.c b/src/sdk/mpeg/ref_images/_dispRefImage.c index 05f082f82d..cfe65c0120 100644 --- a/src/sdk/mpeg/ref_images/_dispRefImage.c +++ b/src/sdk/mpeg/ref_images/_dispRefImage.c @@ -1,9 +1,8 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/mpeg/demux/_getPtsDtsFlags.h" -#include "rnc/sdk/mpeg/macroblock/cpr8.h" -#include "rnc/sdk/mpeg/ref_images/csc_store_ref_image.h" -#include "rnc/sdk/mpeg/ref_images/is_out_size_ok.h" +#include "rnc/sdk/mpeg/demux.h" +#include "rnc/sdk/mpeg/macroblock.h" +#include "rnc/sdk/mpeg/ref_images.h" /* s32 view of the owning sceMpeg (pts low word at 0x10, flags at 0x20). */ struct MpegDisplayState { diff --git a/src/sdk/mpeg/ref_images/_getAllRefs.c b/src/sdk/mpeg/ref_images/_getAllRefs.c index f1e840ee41..1e4044d5db 100644 --- a/src/sdk/mpeg/ref_images/_getAllRefs.c +++ b/src/sdk/mpeg/ref_images/_getAllRefs.c @@ -3,7 +3,7 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/mpeg/ref_images/_getRef0.h" +#include "rnc/sdk/mpeg/ref_images.h" /* libmpeg motion compensation: builds the forward and backward predictions of one macroblock (the MPEG-2 reference decoder's diff --git a/src/sdk/mpeg/ref_images/csc_store_ref_image.c b/src/sdk/mpeg/ref_images/csc_store_ref_image.c index a3cc497f45..e1177189f3 100644 --- a/src/sdk/mpeg/ref_images/csc_store_ref_image.c +++ b/src/sdk/mpeg/ref_images/csc_store_ref_image.c @@ -1,8 +1,8 @@ #include "types.h" #include "rnc/sdk/eeregs.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" -#include "rnc/sdk/ipu/send_ipu_command.h" -#include "rnc/sdk/mpeg/api/dispatch_mpeg_callback.h" +#include "rnc/sdk/interrupts.h" +#include "rnc/sdk/ipu.h" +#include "rnc/sdk/mpeg/api.h" typedef struct { u32 qwc; diff --git a/src/sdk/mpeg/ref_images/disprefimagefield.c b/src/sdk/mpeg/ref_images/disprefimagefield.c index ac6bec1279..63982dc4b9 100644 --- a/src/sdk/mpeg/ref_images/disprefimagefield.c +++ b/src/sdk/mpeg/ref_images/disprefimagefield.c @@ -1,8 +1,7 @@ #include "types.h" -#include "rnc/sdk/mpeg/demux/_getPtsDtsFlags.h" -#include "rnc/sdk/mpeg/macroblock/cpr8.h" -#include "rnc/sdk/mpeg/ref_images/csc_store_ref_image.h" -#include "rnc/sdk/mpeg/ref_images/is_out_size_ok.h" +#include "rnc/sdk/mpeg/demux.h" +#include "rnc/sdk/mpeg/macroblock.h" +#include "rnc/sdk/mpeg/ref_images.h" struct MpegPictureBuffer { u8 pad0[0x10]; diff --git a/src/sdk/mpeg/ref_images/dma_ref_image.c b/src/sdk/mpeg/ref_images/dma_ref_image.c index 938b5581e1..ac032f0997 100644 --- a/src/sdk/mpeg/ref_images/dma_ref_image.c +++ b/src/sdk/mpeg/ref_images/dma_ref_image.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/eetypes.h" #include "rnc/sdk/kernel.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" /* One of the two image buffers of the Sony libmpeg decoder state. */ typedef struct MpegRefImageBuffer { diff --git a/src/sdk/mpeg/ref_images/do_csc.c b/src/sdk/mpeg/ref_images/do_csc.c index 64d9acff9b..c036fff414 100644 --- a/src/sdk/mpeg/ref_images/do_csc.c +++ b/src/sdk/mpeg/ref_images/do_csc.c @@ -1,7 +1,7 @@ #include "types.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" -#include "rnc/sdk/ipu/send_ipu_command.h" -#include "rnc/sdk/mpeg/api/dispatch_mpeg_callback.h" +#include "rnc/sdk/interrupts.h" +#include "rnc/sdk/ipu.h" +#include "rnc/sdk/mpeg/api.h" typedef struct { u8 pad0[0x858]; diff --git a/src/sdk/mpeg/ref_images/is_out_size_ok.c b/src/sdk/mpeg/ref_images/is_out_size_ok.c index c97c6f5214..1fca762e50 100644 --- a/src/sdk/mpeg/ref_images/is_out_size_ok.c +++ b/src/sdk/mpeg/ref_images/is_out_size_ok.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/libmpeg.h" -#include "rnc/sdk/libc/stdio/sprintf.h" -#include "rnc/sdk/mpeg/errors/_Error.h" +#include "rnc/sdk/libc/stdio.h" +#include "rnc/sdk/mpeg/errors.h" const u8 D_00153980[] = "Too small buffer size for %dx%d picture\n"; diff --git a/src/sdk/rpc/cmd/isce_sif_send_cmd.c b/src/sdk/rpc/cmd/isce_sif_send_cmd.c index 53b823ea34..e666f73aa6 100644 --- a/src/sdk/rpc/cmd/isce_sif_send_cmd.c +++ b/src/sdk/rpc/cmd/isce_sif_send_cmd.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/rpc/cmd/sce_sif_send_cmd.h" +#include "rnc/sdk/rpc/cmd.h" s32 IsceSifSendCmd(void *packet, void *command, diff --git a/src/sdk/rpc/cmd/sce_sif_cmd_intr_hdlr.c b/src/sdk/rpc/cmd/sce_sif_cmd_intr_hdlr.c index c6ef9d1a54..6b9fee583b 100644 --- a/src/sdk/rpc/cmd/sce_sif_cmd_intr_hdlr.c +++ b/src/sdk/rpc/cmd/sce_sif_cmd_intr_hdlr.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/eetypes.h" #include "rnc/sdk/kernel.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" typedef void (*SifCmdHandler)(void *packet, void *argument); diff --git a/src/sdk/rpc/cmd/sce_sif_init_cmd.c b/src/sdk/rpc/cmd/sce_sif_init_cmd.c index cd6e820456..117d6f5cbf 100644 --- a/src/sdk/rpc/cmd/sce_sif_init_cmd.c +++ b/src/sdk/rpc/cmd/sce_sif_init_cmd.c @@ -1,9 +1,8 @@ /* Ported from rac1-decomp (src/core/00119D88.c: func_0011A780). */ #include "types.h" #include "rnc/sdk/eeregs.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" -#include "rnc/sdk/rpc/cmd/sce_sif_cmd_intr_hdlr.h" -#include "rnc/sdk/rpc/cmd/sce_sif_send_cmd_public.h" +#include "rnc/sdk/interrupts.h" +#include "rnc/sdk/rpc/cmd.h" typedef void (*SifCmdHandler)(void *packet, void *argument); diff --git a/src/sdk/rpc/cmd/sce_sif_send_cmd_public.c b/src/sdk/rpc/cmd/sce_sif_send_cmd_public.c index 7f07f399f1..01e458f350 100644 --- a/src/sdk/rpc/cmd/sce_sif_send_cmd_public.c +++ b/src/sdk/rpc/cmd/sce_sif_send_cmd_public.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/rpc/cmd/sce_sif_send_cmd.h" +#include "rnc/sdk/rpc/cmd.h" s32 sceSifSendCmd(void *packet, void *command, diff --git a/src/sdk/rpc/iop/free_sif_system_memory.c b/src/sdk/rpc/iop/free_sif_system_memory.c index 4c26a0e4f9..0b281adddf 100644 --- a/src/sdk/rpc/iop/free_sif_system_memory.c +++ b/src/sdk/rpc/iop/free_sif_system_memory.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/data_labels.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" s32 free_sif_system_memory(void *addr) __asm__("FUN_0011c938"); diff --git a/src/sdk/rpc/iop/sce_sif_alloc_iop_heap.c b/src/sdk/rpc/iop/sce_sif_alloc_iop_heap.c index e14314a8db..7b5b3b9af9 100644 --- a/src/sdk/rpc/iop/sce_sif_alloc_iop_heap.c +++ b/src/sdk/rpc/iop/sce_sif_alloc_iop_heap.c @@ -1,6 +1,6 @@ #include "types.h" #include "sda.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" extern s32 D_0012FCAC NOT_SDA; extern u8 D_00158040[]; diff --git a/src/sdk/rpc/iop/sce_sif_init_iop_heap.c b/src/sdk/rpc/iop/sce_sif_init_iop_heap.c index 3fc2915c6e..25530a74a0 100644 --- a/src/sdk/rpc/iop/sce_sif_init_iop_heap.c +++ b/src/sdk/rpc/iop/sce_sif_init_iop_heap.c @@ -3,7 +3,7 @@ #include "types.h" #include "rnc/sdk/sifrpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_bind_rpc.h" +#include "rnc/sdk/rpc/rpc.h" extern u8 D_0012FCAC[]; extern struct sceSifClientData D_00158040; diff --git a/src/sdk/rpc/iop/sce_sif_load_module_buffer.c b/src/sdk/rpc/iop/sce_sif_load_module_buffer.c index 3d1ccc6bd9..348f45a93f 100644 --- a/src/sdk/rpc/iop/sce_sif_load_module_buffer.c +++ b/src/sdk/rpc/iop/sce_sif_load_module_buffer.c @@ -1,7 +1,6 @@ #include "types.h" #include "rnc/data_labels.h" -#include "rnc/sdk/rpc/rpc/lf_bind.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" struct SifLoadModuleArgs { s32 unk0; diff --git a/src/sdk/rpc/iop/sce_sif_load_module_buffer_public.c b/src/sdk/rpc/iop/sce_sif_load_module_buffer_public.c index f9b4fb6516..7f6a41ff08 100644 --- a/src/sdk/rpc/iop/sce_sif_load_module_buffer_public.c +++ b/src/sdk/rpc/iop/sce_sif_load_module_buffer_public.c @@ -1,4 +1,4 @@ -#include "rnc/sdk/rpc/iop/sce_sif_load_module_buffer.h" +#include "rnc/sdk/rpc/iop.h" /* sceSifLoadModuleBuffer: load an IRX image already in IOP memory and return its module id (_sceSifLoadModuleBuffer also reports the start result). */ diff --git a/src/sdk/rpc/iop/sce_sif_reboot_iop.c b/src/sdk/rpc/iop/sce_sif_reboot_iop.c index 4a05b300a4..0758513d71 100644 --- a/src/sdk/rpc/iop/sce_sif_reboot_iop.c +++ b/src/sdk/rpc/iop/sce_sif_reboot_iop.c @@ -1,8 +1,7 @@ #include "types.h" -#include "rnc/sdk/deci2/sce_printf.h" -#include "rnc/sdk/rpc/iop/sce_sif_reset_iop.h" -#include "rnc/sdk/rpc/rpc/sce_sif_exit_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_init_rpc.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/rpc/iop.h" +#include "rnc/sdk/rpc/rpc.h" const char D_00152960[] = "rom0:UDNL "; extern char iop_reboot_parameter_too_long_format[] __asm__("D_00152970"); diff --git a/src/sdk/rpc/iop/sce_sif_sync_iop.c b/src/sdk/rpc/iop/sce_sif_sync_iop.c index 78cc8d6336..20f94b4c51 100644 --- a/src/sdk/rpc/iop/sce_sif_sync_iop.c +++ b/src/sdk/rpc/iop/sce_sif_sync_iop.c @@ -1,4 +1,4 @@ -#include "rnc/sdk/kernel/clear_tty_initialized.h" +#include "rnc/sdk/kernel.h" int sceSifGetReg(int register_number) __asm__("sceSifGetReg"); diff --git a/src/sdk/rpc/rpc/get_available_rpc_packet.c b/src/sdk/rpc/rpc/get_available_rpc_packet.c index a80148f58b..3b37ff41bd 100644 --- a/src/sdk/rpc/rpc/get_available_rpc_packet.c +++ b/src/sdk/rpc/rpc/get_available_rpc_packet.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" +#include "rnc/sdk/interrupts.h" typedef struct { s32 pid; diff --git a/src/sdk/rpc/rpc/lf_bind.c b/src/sdk/rpc/rpc/lf_bind.c index 9d0bb070f4..88888c599b 100644 --- a/src/sdk/rpc/rpc/lf_bind.c +++ b/src/sdk/rpc/rpc/lf_bind.c @@ -1,8 +1,7 @@ #include "types.h" #include "rnc/sdk/sifrpc.h" #include "rnc/data_labels.h" -#include "rnc/sdk/rpc/rpc/sce_sif_bind_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" extern s32 sif_load_module_bind_status[] __asm__("D_0012FCB0"); extern struct sceSifClientData D_00158400; diff --git a/src/sdk/rpc/rpc/sce_sif_bind_rpc.c b/src/sdk/rpc/rpc/sce_sif_bind_rpc.c index 24cc0cf3ff..0f2b580f7e 100644 --- a/src/sdk/rpc/rpc/sce_sif_bind_rpc.c +++ b/src/sdk/rpc/rpc/sce_sif_bind_rpc.c @@ -1,8 +1,8 @@ #include "types.h" #include "rnc/sdk/sifrpc.h" #include "rnc/data_labels.h" -#include "rnc/sdk/rpc/cmd/sce_sif_send_cmd_public.h" -#include "rnc/sdk/rpc/rpc/free_rpc_packet.h" +#include "rnc/sdk/rpc/cmd.h" +#include "rnc/sdk/rpc/rpc.h" struct SifRpcPacket { u8 pad_0[0x14]; diff --git a/src/sdk/rpc/rpc/sce_sif_exit_rpc.c b/src/sdk/rpc/rpc/sce_sif_exit_rpc.c index d272a39404..05323bc104 100644 --- a/src/sdk/rpc/rpc/sce_sif_exit_rpc.c +++ b/src/sdk/rpc/rpc/sce_sif_exit_rpc.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/runtime/core_state.h" -#include "rnc/sdk/rpc/cmd/sce_sif_exit_cmd.h" +#include "rnc/sdk/rpc/cmd.h" void sceSifExitRpc(void) __asm__("InitializeRpcCommand"); diff --git a/src/sdk/rpc/rpc/sce_sif_init_rpc.c b/src/sdk/rpc/rpc/sce_sif_init_rpc.c index 474af80fd5..5cfea995ff 100644 --- a/src/sdk/rpc/rpc/sce_sif_init_rpc.c +++ b/src/sdk/rpc/rpc/sce_sif_init_rpc.c @@ -1,13 +1,8 @@ #include "types.h" #include "rnc/runtime/core_state.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" -#include "rnc/sdk/rpc/cmd/sce_sif_add_cmd_handler.h" -#include "rnc/sdk/rpc/cmd/sce_sif_get_sreg.h" -#include "rnc/sdk/rpc/cmd/sce_sif_init_cmd.h" -#include "rnc/sdk/rpc/cmd/sce_sif_send_cmd_public.h" -#include "rnc/sdk/rpc/rpc/request_bind.h" -#include "rnc/sdk/rpc/rpc/request_end.h" -#include "rnc/sdk/rpc/rpc/request_rdata.h" +#include "rnc/sdk/interrupts.h" +#include "rnc/sdk/rpc/cmd.h" +#include "rnc/sdk/rpc/rpc.h" typedef struct { s32 pid; diff --git a/src/sdk/scf/GetRomName.c b/src/sdk/scf/GetRomName.c index f50d910cba..7322a77b2f 100644 --- a/src/sdk/scf/GetRomName.c +++ b/src/sdk/scf/GetRomName.c @@ -1,8 +1,7 @@ #include "types.h" #include "rnc/sdk/library/sdk_state.h" -#include "rnc/sdk/deci2/sce_printf.h" -#include "rnc/sdk/storage/fileio/sceClose.h" -#include "rnc/sdk/storage/fileio/sceRead.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/storage/fileio.h" #include "rnc/sdk/storage/fileio/sceopen.h" const u8 D_00153C00[] = "rom0:ROMVER"; diff --git a/src/sdk/scf/is_t10_k.c b/src/sdk/scf/is_t10_k.c index 27835c53e2..bf4b8c8812 100644 --- a/src/sdk/scf/is_t10_k.c +++ b/src/sdk/scf/is_t10_k.c @@ -1,5 +1,5 @@ #include "rnc/sdk/library/sdk_state.h" -#include "rnc/sdk/scf/GetRomName.h" +#include "rnc/sdk/scf.h" int IsT10K(void) __asm__("IsT10K"); diff --git a/src/sdk/scf/sce_scf_get_language.c b/src/sdk/scf/sce_scf_get_language.c index 7716349e8e..0785fe937b 100644 --- a/src/sdk/scf/sce_scf_get_language.c +++ b/src/sdk/scf/sce_scf_get_language.c @@ -1,7 +1,7 @@ #include "rnc/sdk/library/sdk_state.h" #include "sda.h" #include "types.h" -#include "rnc/sdk/scf/is_t10_k.h" +#include "rnc/sdk/scf.h" extern void GetOsdConfigParam(int *config); diff --git a/src/sdk/scf/sce_scf_get_local_timefrom_rtc.c b/src/sdk/scf/sce_scf_get_local_timefrom_rtc.c index 353263deb1..15d0d1b523 100644 --- a/src/sdk/scf/sce_scf_get_local_timefrom_rtc.c +++ b/src/sdk/scf/sce_scf_get_local_timefrom_rtc.c @@ -1,6 +1,5 @@ #include "types.h" -#include "rnc/sdk/scf/sce_scf_get_summer_time.h" -#include "rnc/sdk/scf/sce_scf_get_time_zone.h" +#include "rnc/sdk/scf.h" void sceScfGetLocalTimefromRTC(s32 rtc_time) { register s32 rtc_time_s0; diff --git a/src/sdk/scf/sce_scf_get_summer_time.c b/src/sdk/scf/sce_scf_get_summer_time.c index be7a6032ad..d321e7660d 100644 --- a/src/sdk/scf/sce_scf_get_summer_time.c +++ b/src/sdk/scf/sce_scf_get_summer_time.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/scf/is_t10_k.h" +#include "rnc/sdk/scf.h" extern u8 t10k_summer_time_setting[] __asm__("D_001330D6"); extern void GetOsdConfigParam(); diff --git a/src/sdk/scf/sce_scf_get_time_zone.c b/src/sdk/scf/sce_scf_get_time_zone.c index c9d473f21c..fb0a3091a3 100644 --- a/src/sdk/scf/sce_scf_get_time_zone.c +++ b/src/sdk/scf/sce_scf_get_time_zone.c @@ -1,5 +1,5 @@ #include "sda.h" -#include "rnc/sdk/scf/is_t10_k.h" +#include "rnc/sdk/scf.h" extern void GetOsdConfigParam(int *config); extern short D_001330D0[] NOT_SDA; diff --git a/src/sdk/soft_float/dpmul.c b/src/sdk/soft_float/dpmul.c index dbf6f32d43..fa1cffc6e0 100644 --- a/src/sdk/soft_float/dpmul.c +++ b/src/sdk/soft_float/dpmul.c @@ -1,4 +1,4 @@ -#include "rnc/sdk/soft_float/__pack_d.h" +#include "rnc/sdk/soft_float.h" #define US_SOFTWARE_GOFAST 1 #define FINE_GRAINED_LIBRARIES 1 #define L_mul_df 1 diff --git a/src/sdk/soft_float/dpsub.c b/src/sdk/soft_float/dpsub.c index bcf96ab02c..5fc4c834b7 100644 --- a/src/sdk/soft_float/dpsub.c +++ b/src/sdk/soft_float/dpsub.c @@ -1,5 +1,4 @@ -#include "rnc/sdk/soft_float/__pack_d.h" -#include "rnc/sdk/soft_float/fpadd_parts.h" +#include "rnc/sdk/soft_float.h" #include "rnc/sdk/soft_float/unpack_d.h" /* This is a software floating point library which can be used instead of the floating point routines in libgcc1.c for targets without hardware diff --git a/src/sdk/soft_float/fptodp.c b/src/sdk/soft_float/fptodp.c index e81a31e490..cfdf36e7fa 100644 --- a/src/sdk/soft_float/fptodp.c +++ b/src/sdk/soft_float/fptodp.c @@ -1,4 +1,4 @@ -#include "rnc/sdk/soft_float/__make_dp.h" +#include "rnc/sdk/soft_float.h" /* This is a software floating point library which can be used instead of the floating point routines in libgcc1.c for targets without hardware floating point. diff --git a/src/sdk/storage/cdvd/PowerOffCB.c b/src/sdk/storage/cdvd/PowerOffCB.c index ec5ba2b89b..00abc2a214 100644 --- a/src/sdk/storage/cdvd/PowerOffCB.c +++ b/src/sdk/storage/cdvd/PowerOffCB.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" -#include "rnc/sdk/rpc/cmd/sce_sif_add_cmd_handler.h" +#include "rnc/sdk/interrupts.h" +#include "rnc/sdk/rpc/cmd.h" extern u8 D_00120960[]; extern s32 D_001312FC[]; diff --git a/src/sdk/storage/cdvd/cd_check_ncmd.c b/src/sdk/storage/cdvd/cd_check_ncmd.c index d1097e25b5..09fede2fce 100644 --- a/src/sdk/storage/cdvd/cd_check_ncmd.c +++ b/src/sdk/storage/cdvd/cd_check_ncmd.c @@ -1,11 +1,9 @@ #include "types.h" #include "rnc/sdk/sifrpc.h" #include "rnc/sdk/libcdvd.h" -#include "rnc/sdk/deci2/sce_printf.h" -#include "rnc/sdk/rpc/rpc/sce_sif_bind_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_init_rpc.h" -#include "rnc/sdk/storage/cdvd/cmd_sem_init.h" -#include "rnc/sdk/storage/cdvd/scecdsync.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/rpc/rpc.h" +#include "rnc/sdk/storage/cdvd.h" extern s32 D_001312F8[]; const u8 D_00152EB0[] = "Ncmd fail sema cur_cmd:%d keep_cmd:%d\n"; diff --git a/src/sdk/storage/cdvd/cd_check_scmd.c b/src/sdk/storage/cdvd/cd_check_scmd.c index ad6923f4e1..576fb80a01 100644 --- a/src/sdk/storage/cdvd/cd_check_scmd.c +++ b/src/sdk/storage/cdvd/cd_check_scmd.c @@ -1,11 +1,9 @@ #include "types.h" #include "rnc/sdk/sifrpc.h" #include "rnc/sdk/libcdvd.h" -#include "rnc/sdk/deci2/sce_printf.h" -#include "rnc/sdk/rpc/rpc/sce_sif_bind_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_init_rpc.h" -#include "rnc/sdk/storage/cdvd/cmd_sem_init.h" -#include "rnc/sdk/storage/cdvd/sceCdSyncS.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/rpc/rpc.h" +#include "rnc/sdk/storage/cdvd.h" extern s32 D_00131308[]; const u8 D_00152F10[] = "Scmd fail sema cur_cmd:%d keep_cmd:%d\n"; diff --git a/src/sdk/storage/cdvd/cdvd_exit.c b/src/sdk/storage/cdvd/cdvd_exit.c index acd44d8247..d66a1fbf6d 100644 --- a/src/sdk/storage/cdvd/cdvd_exit.c +++ b/src/sdk/storage/cdvd/cdvd_exit.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/libcdvd.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" -#include "rnc/sdk/rpc/cmd/sce_sif_remove_cmd_handler.h" +#include "rnc/sdk/interrupts.h" +#include "rnc/sdk/rpc/cmd.h" extern s32 D_001312D4[]; extern s32 D_00131314[]; diff --git a/src/sdk/storage/cdvd/checkModelVersion.c b/src/sdk/storage/cdvd/checkModelVersion.c index baf7b7ef64..00dbd45b1f 100644 --- a/src/sdk/storage/cdvd/checkModelVersion.c +++ b/src/sdk/storage/cdvd/checkModelVersion.c @@ -1,8 +1,7 @@ /* checkModelVersion c2: read the model-version string and validate its range. */ #include "types.h" -#include "rnc/sdk/storage/fileio/sceClose.h" -#include "rnc/sdk/storage/fileio/sceRead.h" +#include "rnc/sdk/storage/fileio.h" extern s32 sceOpen(const char *path, s32 flags); extern s32 atoi(const char *str) __asm__("CheckStateRange"); diff --git a/src/sdk/storage/cdvd/process_native_cd_read_completion.c b/src/sdk/storage/cdvd/process_native_cd_read_completion.c index 1e8c62233c..d5665fd32c 100644 --- a/src/sdk/storage/cdvd/process_native_cd_read_completion.c +++ b/src/sdk/storage/cdvd/process_native_cd_read_completion.c @@ -3,7 +3,7 @@ #include "types.h" #include "rnc/data_labels.h" -#include "rnc/sdk/storage/cdvd/handle_cd_read_callback.h" +#include "rnc/sdk/storage/cdvd.h" void process_native_cd_read_completion(void *descriptor) __asm__("FUN_00120788"); diff --git a/src/sdk/storage/cdvd/sceCdCallback.c b/src/sdk/storage/cdvd/sceCdCallback.c index 18e5a90972..ee828b80e3 100644 --- a/src/sdk/storage/cdvd/sceCdCallback.c +++ b/src/sdk/storage/cdvd/sceCdCallback.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" -#include "rnc/sdk/storage/cdvd/scecdsync.h" +#include "rnc/sdk/interrupts.h" +#include "rnc/sdk/storage/cdvd.h" extern s32 DIntr(); diff --git a/src/sdk/storage/cdvd/sceCdDelayThread.c b/src/sdk/storage/cdvd/sceCdDelayThread.c index df7aba109c..d5e2db2c3b 100644 --- a/src/sdk/storage/cdvd/sceCdDelayThread.c +++ b/src/sdk/storage/cdvd/sceCdDelayThread.c @@ -1,4 +1,4 @@ -#include "rnc/sdk/storage/cdvd/signal_native_cd_delay_alarm.h" +#include "rnc/sdk/storage/cdvd.h" extern int CreateSema(int *parameters) __asm__("CreateSema"); extern void SetAlarm(int delay, void *callback, int semaphore) __asm__("SetAlarm"); diff --git a/src/sdk/storage/cdvd/sceCdDiskReady.c b/src/sdk/storage/cdvd/sceCdDiskReady.c index 5b5d84fa68..98f9aee75d 100644 --- a/src/sdk/storage/cdvd/sceCdDiskReady.c +++ b/src/sdk/storage/cdvd/sceCdDiskReady.c @@ -1,12 +1,9 @@ #include "types.h" #include "rnc/sdk/sifrpc.h" #include "rnc/sdk/libcdvd.h" -#include "rnc/sdk/deci2/sce_printf.h" -#include "rnc/sdk/rpc/rpc/sce_sif_bind_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_init_rpc.h" -#include "rnc/sdk/storage/cdvd/cmd_sem_init.h" -#include "rnc/sdk/storage/cdvd/sceCdSyncS.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/rpc/rpc.h" +#include "rnc/sdk/storage/cdvd.h" extern s32 D_00131304[]; extern struct sceSifClientData cd_disk_ready_rpc_client __asm__("D_00159990"); diff --git a/src/sdk/storage/cdvd/sceCdGetError.c b/src/sdk/storage/cdvd/sceCdGetError.c index 07e0f0cca7..edf003ea69 100644 --- a/src/sdk/storage/cdvd/sceCdGetError.c +++ b/src/sdk/storage/cdvd/sceCdGetError.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/sdk/libcdvd.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" extern s32 SignalSema(); extern s32 cd_check_scmd() __asm__("func_00120D40"); diff --git a/src/sdk/storage/cdvd/sceCdInit.c b/src/sdk/storage/cdvd/sceCdInit.c index 5c3e31290f..1b33eef810 100644 --- a/src/sdk/storage/cdvd/sceCdInit.c +++ b/src/sdk/storage/cdvd/sceCdInit.c @@ -2,14 +2,9 @@ #include "types.h" #include "rnc/sdk/libcdvd.h" -#include "rnc/sdk/deci2/sce_printf.h" -#include "rnc/sdk/rpc/rpc/sce_sif_bind_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_init_rpc.h" -#include "rnc/sdk/storage/cdvd/PowerOffCB.h" -#include "rnc/sdk/storage/cdvd/cdvd_exit.h" -#include "rnc/sdk/storage/cdvd/cmd_sem_init.h" -#include "rnc/sdk/storage/cdvd/sceCdSyncS.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/rpc/rpc.h" +#include "rnc/sdk/storage/cdvd.h" /* libcdvd: bind the CD/DVD init RPC server, send the init mode and read back the drive state. */ diff --git a/src/sdk/storage/cdvd/sceCdNcmdDiskReady.c b/src/sdk/storage/cdvd/sceCdNcmdDiskReady.c index af61ee8544..6b4f654072 100644 --- a/src/sdk/storage/cdvd/sceCdNcmdDiskReady.c +++ b/src/sdk/storage/cdvd/sceCdNcmdDiskReady.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/libcdvd.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" extern u8 native_cd_drive_state_response[] __asm__("D_00131340"); extern s32 SignalSema(); diff --git a/src/sdk/storage/cdvd/sceCdRead.c b/src/sdk/storage/cdvd/sceCdRead.c index ebfe655b23..e7d021b8a6 100644 --- a/src/sdk/storage/cdvd/sceCdRead.c +++ b/src/sdk/storage/cdvd/sceCdRead.c @@ -1,8 +1,8 @@ #include "types.h" #include "rnc/sdk/libcdvd.h" -#include "rnc/sdk/deci2/sce_printf.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" -#include "rnc/sdk/storage/cdvd/sceCdNcmdDiskReady.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/rpc/rpc.h" +#include "rnc/sdk/storage/cdvd.h" struct CdReadCommand { u32 sector; diff --git a/src/sdk/storage/cdvd/sceCdSyncS.c b/src/sdk/storage/cdvd/sceCdSyncS.c index 022f5b45ba..b17a75d36d 100644 --- a/src/sdk/storage/cdvd/sceCdSyncS.c +++ b/src/sdk/storage/cdvd/sceCdSyncS.c @@ -1,9 +1,9 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/sdk/libcdvd.h" -#include "rnc/sdk/deci2/sce_printf.h" -#include "rnc/sdk/rpc/rpc/sce_sif_check_stat_rpc.h" -#include "rnc/sdk/storage/cdvd/sceCdDelayThread.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/rpc/rpc.h" +#include "rnc/sdk/storage/cdvd.h" extern u8 cd_s_command_wait_message[] __asm__("D_00152F00"); diff --git a/src/sdk/storage/cdvd/scecdbreak.c b/src/sdk/storage/cdvd/scecdbreak.c index 7d5c65bb3d..539e1952e8 100644 --- a/src/sdk/storage/cdvd/scecdbreak.c +++ b/src/sdk/storage/cdvd/scecdbreak.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/sdk/libcdvd.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" extern volatile u32 D_00131314[]; extern s32 SignalSema(s32 semaId); diff --git a/src/sdk/storage/cdvd/scecdmmode.c b/src/sdk/storage/cdvd/scecdmmode.c index 32fb49f3d2..888616edf3 100644 --- a/src/sdk/storage/cdvd/scecdmmode.c +++ b/src/sdk/storage/cdvd/scecdmmode.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/sdk/libcdvd.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" extern u8 cd_media_mode_request[] __asm__("D_00132900"); extern s32 SignalSema(); diff --git a/src/sdk/storage/cdvd/scecdreadclock.c b/src/sdk/storage/cdvd/scecdreadclock.c index f56ccfbcf5..e907843608 100644 --- a/src/sdk/storage/cdvd/scecdreadclock.c +++ b/src/sdk/storage/cdvd/scecdreadclock.c @@ -1,8 +1,8 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/sdk/libcdvd.h" -#include "rnc/sdk/deci2/sce_printf.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/rpc/rpc.h" struct unaligned64 { u64 v; diff --git a/src/sdk/storage/cdvd/scecdsync.c b/src/sdk/storage/cdvd/scecdsync.c index db5f906862..fb725b1362 100644 --- a/src/sdk/storage/cdvd/scecdsync.c +++ b/src/sdk/storage/cdvd/scecdsync.c @@ -1,8 +1,8 @@ #include "types.h" #include "rnc/sdk/libcdvd.h" -#include "rnc/sdk/deci2/sce_printf.h" -#include "rnc/sdk/rpc/rpc/sce_sif_check_stat_rpc.h" -#include "rnc/sdk/storage/cdvd/sceCdDelayThread.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/rpc/rpc.h" +#include "rnc/sdk/storage/cdvd.h" extern u8 cd_sync_wait_debug_message[] __asm__("D_00152EF0"); diff --git a/src/sdk/storage/fileio/_sceFsWaitS.c b/src/sdk/storage/fileio/_sceFsWaitS.c index bde5d38c48..ae4e41b4ae 100644 --- a/src/sdk/storage/fileio/_sceFsWaitS.c +++ b/src/sdk/storage/fileio/_sceFsWaitS.c @@ -1,5 +1,5 @@ #include "rnc/sdk/library/sif_file_slot.h" -#include "rnc/sdk/storage/fileio/scefsseminit.h" +#include "rnc/sdk/storage/fileio.h" extern s32 WaitSema(); diff --git a/src/sdk/storage/fileio/get_iob.c b/src/sdk/storage/fileio/get_iob.c index 6a6b312bc7..fa44a4dcff 100644 --- a/src/sdk/storage/fileio/get_iob.c +++ b/src/sdk/storage/fileio/get_iob.c @@ -20,7 +20,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/sdk/library/sif_file_slot.h" -#include "rnc/sdk/storage/fileio/sce_fs_iob_sema_mk.h" +#include "rnc/sdk/storage/fileio.h" extern s32 WaitSema(); extern s32 SignalSema(); diff --git a/src/sdk/storage/fileio/new_iob.c b/src/sdk/storage/fileio/new_iob.c index c3a08fa1b5..3fc1ff7c34 100644 --- a/src/sdk/storage/fileio/new_iob.c +++ b/src/sdk/storage/fileio/new_iob.c @@ -22,7 +22,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/sdk/library/sif_file_slot.h" -#include "rnc/sdk/storage/fileio/sce_fs_iob_sema_mk.h" +#include "rnc/sdk/storage/fileio.h" extern s32 WaitSema(); extern s32 SignalSema(); diff --git a/src/sdk/storage/fileio/sceFsInit.c b/src/sdk/storage/fileio/sceFsInit.c index 8ac659fa86..97ca9f338c 100644 --- a/src/sdk/storage/fileio/sceFsInit.c +++ b/src/sdk/storage/fileio/sceFsInit.c @@ -5,13 +5,10 @@ #include "rnc/data_labels.h" #include "rnc/sdk/library/sdk_state.h" #include "rnc/sdk/library/sif_file_slot.h" -#include "rnc/sdk/interrupts/enable_interrupts.h" -#include "rnc/sdk/rpc/cmd/sce_sif_add_cmd_handler.h" -#include "rnc/sdk/rpc/rpc/sce_sif_bind_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_init_rpc.h" -#include "rnc/sdk/storage/fileio/_sceFs_Rcv_Intr.h" -#include "rnc/sdk/storage/fileio/sce_fs_iob_sema_mk.h" +#include "rnc/sdk/interrupts.h" +#include "rnc/sdk/rpc/cmd.h" +#include "rnc/sdk/rpc/rpc.h" +#include "rnc/sdk/storage/fileio.h" typedef struct SifFileCommandCallbackRecord { void (*callback)(void *); diff --git a/src/sdk/storage/fileio/sceopen.c b/src/sdk/storage/fileio/sceopen.c index 79fee2eabe..735d0c9558 100644 --- a/src/sdk/storage/fileio/sceopen.c +++ b/src/sdk/storage/fileio/sceopen.c @@ -3,7 +3,7 @@ #include "rnc/sdk/library/sif_file_slot.h" #include "rnc/sdk/library/sdk_state.h" #include "rnc/data_labels.h" -#include "rnc/sdk/storage/fileio/sceFsInit.h" +#include "rnc/sdk/storage/fileio.h" typedef char *va_list; diff --git a/src/sdk/storage/memory_card/mc_delay_thread.c b/src/sdk/storage/memory_card/mc_delay_thread.c index 882bf5b2c7..ba8b31ce23 100644 --- a/src/sdk/storage/memory_card/mc_delay_thread.c +++ b/src/sdk/storage/memory_card/mc_delay_thread.c @@ -1,4 +1,4 @@ -#include "rnc/sdk/callbacks/wake_thread_alarm.h" +#include "rnc/sdk/callbacks.h" extern int GetThreadId(void); extern int SetAlarm(int delay, void *callback, int thread_id); diff --git a/src/sdk/storage/memory_card/sce_mc_chdir.c b/src/sdk/storage/memory_card/sce_mc_chdir.c index 2c03fbc2d7..b8889f53c3 100644 --- a/src/sdk/storage/memory_card/sce_mc_chdir.c +++ b/src/sdk/storage/memory_card/sce_mc_chdir.c @@ -2,8 +2,8 @@ #include "rnc/sdk/sifrpc.h" #include "rnc/data_labels.h" #include "rnc/sdk/libmc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" -#include "rnc/sdk/storage/memory_card/mce_store_pwd.h" +#include "rnc/sdk/rpc/rpc.h" +#include "rnc/sdk/storage/memory_card.h" struct McChdirRequest { s32 unk0; diff --git a/src/sdk/storage/memory_card/sce_mc_close.c b/src/sdk/storage/memory_card/sce_mc_close.c index 59ce958fca..1af67e17e0 100644 --- a/src/sdk/storage/memory_card/sce_mc_close.c +++ b/src/sdk/storage/memory_card/sce_mc_close.c @@ -2,7 +2,7 @@ #include "rnc/sdk/sifrpc.h" #include "rnc/data_labels.h" #include "rnc/sdk/libmc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" extern s32 PollSema(); extern s32 SignalSema(); diff --git a/src/sdk/storage/memory_card/sce_mc_delete.c b/src/sdk/storage/memory_card/sce_mc_delete.c index 9d9f5d0d2c..848d846b42 100644 --- a/src/sdk/storage/memory_card/sce_mc_delete.c +++ b/src/sdk/storage/memory_card/sce_mc_delete.c @@ -2,7 +2,7 @@ #include "rnc/sdk/sifrpc.h" #include "rnc/data_labels.h" #include "rnc/sdk/libmc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" struct MemoryCardNameParam { s32 port; diff --git a/src/sdk/storage/memory_card/sce_mc_format.c b/src/sdk/storage/memory_card/sce_mc_format.c index b02f5ee94f..e16df7ed26 100644 --- a/src/sdk/storage/memory_card/sce_mc_format.c +++ b/src/sdk/storage/memory_card/sce_mc_format.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/sifrpc.h" #include "rnc/sdk/libmc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" struct MemoryCardFormatRequest { u8 reserved_00[0x4]; diff --git a/src/sdk/storage/memory_card/sce_mc_get_dir.c b/src/sdk/storage/memory_card/sce_mc_get_dir.c index 04d2bce34f..be8a478c60 100644 --- a/src/sdk/storage/memory_card/sce_mc_get_dir.c +++ b/src/sdk/storage/memory_card/sce_mc_get_dir.c @@ -2,7 +2,7 @@ #include "rnc/sdk/sifrpc.h" #include "rnc/data_labels.h" #include "rnc/sdk/libmc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" struct McGetDirRequest { s32 unk0; diff --git a/src/sdk/storage/memory_card/sce_mc_get_info.c b/src/sdk/storage/memory_card/sce_mc_get_info.c index 3a7de14139..cf283fa8c3 100644 --- a/src/sdk/storage/memory_card/sce_mc_get_info.c +++ b/src/sdk/storage/memory_card/sce_mc_get_info.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/sifrpc.h" #include "rnc/sdk/libmc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" struct McGetInfoRequest { u8 pad_0[0x4]; diff --git a/src/sdk/storage/memory_card/sce_mc_init.c b/src/sdk/storage/memory_card/sce_mc_init.c index 0e7ed55637..ddaa93969c 100644 --- a/src/sdk/storage/memory_card/sce_mc_init.c +++ b/src/sdk/storage/memory_card/sce_mc_init.c @@ -1,11 +1,9 @@ #include "types.h" #include "rnc/sdk/kernel.h" #include "rnc/sdk/libmc.h" -#include "rnc/sdk/deci2/sce_printf.h" -#include "rnc/sdk/rpc/rpc/sce_sif_bind_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_init_rpc.h" -#include "rnc/sdk/storage/memory_card/sce_mc_sync.h" +#include "rnc/sdk/deci2.h" +#include "rnc/sdk/rpc/rpc.h" +#include "rnc/sdk/storage/memory_card.h" extern char mc_rpc_bind_error_message[] __asm__("D_00153450"); extern char mcserv_old_release_message[] __asm__("D_00153468"); diff --git a/src/sdk/storage/memory_card/sce_mc_mkdir.c b/src/sdk/storage/memory_card/sce_mc_mkdir.c index 14f2aaff23..064b218d49 100644 --- a/src/sdk/storage/memory_card/sce_mc_mkdir.c +++ b/src/sdk/storage/memory_card/sce_mc_mkdir.c @@ -1,6 +1,6 @@ #include "sda.h" #include "rnc/sdk/libmc.h" -#include "rnc/sdk/storage/memory_card/sce_mc_open.h" +#include "rnc/sdk/storage/memory_card.h" s32 sceMcMkdir(s32 port, s32 slot, const char *name) { s32 mkdir_request_status = sceMcOpen(port, slot, name, 0x40); diff --git a/src/sdk/storage/memory_card/sce_mc_open.c b/src/sdk/storage/memory_card/sce_mc_open.c index 954ccf3e15..8fed75e4b9 100644 --- a/src/sdk/storage/memory_card/sce_mc_open.c +++ b/src/sdk/storage/memory_card/sce_mc_open.c @@ -2,7 +2,7 @@ #include "rnc/sdk/sifrpc.h" #include "rnc/data_labels.h" #include "rnc/sdk/libmc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" struct MemoryCardNameParam { s32 port; diff --git a/src/sdk/storage/memory_card/sce_mc_read.c b/src/sdk/storage/memory_card/sce_mc_read.c index f16444aad5..48ece35395 100644 --- a/src/sdk/storage/memory_card/sce_mc_read.c +++ b/src/sdk/storage/memory_card/sce_mc_read.c @@ -1,8 +1,8 @@ #include "types.h" #include "rnc/sdk/sifrpc.h" #include "rnc/sdk/libmc.h" -#include "rnc/runtime/memory/unpack_spr_descriptor.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/runtime/memory.h" +#include "rnc/sdk/rpc/rpc.h" struct MemoryCardReadRequest { s32 file_descriptor; diff --git a/src/sdk/storage/memory_card/sce_mc_seek.c b/src/sdk/storage/memory_card/sce_mc_seek.c index 8706f78d86..5340434e03 100644 --- a/src/sdk/storage/memory_card/sce_mc_seek.c +++ b/src/sdk/storage/memory_card/sce_mc_seek.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/sifrpc.h" #include "rnc/sdk/libmc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" struct MemoryCardSeekRequest { s32 file_descriptor; diff --git a/src/sdk/storage/memory_card/sce_mc_sync.c b/src/sdk/storage/memory_card/sce_mc_sync.c index bb49c237a9..482a5d71be 100644 --- a/src/sdk/storage/memory_card/sce_mc_sync.c +++ b/src/sdk/storage/memory_card/sce_mc_sync.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/libmc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_check_stat_rpc.h" -#include "rnc/sdk/storage/memory_card/mc_delay_thread.h" +#include "rnc/sdk/rpc/rpc.h" +#include "rnc/sdk/storage/memory_card.h" extern s32 SignalSema(); diff --git a/src/sdk/storage/memory_card/sce_mc_unformat.c b/src/sdk/storage/memory_card/sce_mc_unformat.c index fe2cfb1c30..2e40e05882 100644 --- a/src/sdk/storage/memory_card/sce_mc_unformat.c +++ b/src/sdk/storage/memory_card/sce_mc_unformat.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/sifrpc.h" #include "rnc/sdk/libmc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" struct MemoryCardUnformatRequest { u8 reserved_00[0x4]; diff --git a/src/sdk/storage/memory_card/sce_mc_write.c b/src/sdk/storage/memory_card/sce_mc_write.c index 532ff899ec..b711e961b8 100644 --- a/src/sdk/storage/memory_card/sce_mc_write.c +++ b/src/sdk/storage/memory_card/sce_mc_write.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/sdk/sifrpc.h" #include "rnc/sdk/libmc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" struct MemoryCardWriteRequest { s32 file_descriptor; diff --git a/src/sdk/syscalls/jump_to_rfu_dispatch.c b/src/sdk/syscalls/jump_to_rfu_dispatch.c index cae0e9f728..ea6dd0ee1f 100644 --- a/src/sdk/syscalls/jump_to_rfu_dispatch.c +++ b/src/sdk/syscalls/jump_to_rfu_dispatch.c @@ -1,5 +1,5 @@ -#include "rnc/sdk/kernel/init_tlb.h" -#include "rnc/sdk/syscalls/rfu_dispatch_entry.h" +#include "rnc/sdk/kernel.h" +#include "rnc/sdk/syscalls.h" extern void JumpToRfuDispatch(void); extern void _Exit(int status); diff --git a/src/sdk/syscalls/jump_to_rfu_status.c b/src/sdk/syscalls/jump_to_rfu_status.c index 08ab4bfdcd..65c07fd4ee 100644 --- a/src/sdk/syscalls/jump_to_rfu_status.c +++ b/src/sdk/syscalls/jump_to_rfu_status.c @@ -1,6 +1,5 @@ -#include "rnc/sdk/kernel/init_tlb.h" -#include "rnc/sdk/syscalls/jump_to_rfu_dispatch.h" -#include "rnc/sdk/syscalls/rfu_dispatch_entry.h" +#include "rnc/sdk/kernel.h" +#include "rnc/sdk/syscalls.h" extern void _Exit(int status); diff --git a/src/sdk/syscalls/rfu_dispatch_entry.c b/src/sdk/syscalls/rfu_dispatch_entry.c index 8aa823445a..332ae76720 100644 --- a/src/sdk/syscalls/rfu_dispatch_entry.c +++ b/src/sdk/syscalls/rfu_dispatch_entry.c @@ -1,5 +1,5 @@ -#include "rnc/sdk/kernel/init_tlb.h" -#include "rnc/sdk/syscalls/jump_to_rfu_dispatch.h" +#include "rnc/sdk/kernel.h" +#include "rnc/sdk/syscalls.h" extern void RfuDispatchEntry(int status); extern void _Exit(int status); diff --git a/src/sdk/system/sysbit_get.c b/src/sdk/system/sysbit_get.c index 04d3834664..2a1c4db83f 100644 --- a/src/sdk/system/sysbit_get.c +++ b/src/sdk/system/sysbit_get.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/system/sysbit_flush.h" +#include "rnc/sdk/system.h" extern s32 peek_bits() __asm__("SignExtendPackedValue"); diff --git a/src/sdk/system/sysbit_init.c b/src/sdk/system/sysbit_init.c index 543529db38..52cc122c33 100644 --- a/src/sdk/system/sysbit_init.c +++ b/src/sdk/system/sysbit_init.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/system/sysbit_flush.h" +#include "rnc/sdk/system.h" typedef struct SysbitState { s64 bits; diff --git a/src/sdk/system/sysbit_jump.c b/src/sdk/system/sysbit_jump.c index 929f0bc029..1af758c8ec 100644 --- a/src/sdk/system/sysbit_jump.c +++ b/src/sdk/system/sysbit_jump.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/system/sysbit_flush.h" +#include "rnc/sdk/system.h" typedef struct SysbitState { s64 bits; diff --git a/src/sdk/system/sysbit_marker.c b/src/sdk/system/sysbit_marker.c index fb12aab728..e98c9a955f 100644 --- a/src/sdk/system/sysbit_marker.c +++ b/src/sdk/system/sysbit_marker.c @@ -1,5 +1,5 @@ -#include "rnc/sdk/mpeg/bitstream/peek_bits.h" -#include "rnc/sdk/system/sysbit_flush.h" +#include "rnc/sdk/mpeg/bitstream.h" +#include "rnc/sdk/system.h" int SysbitMarker(void *value) __asm__("_sysbitMarker"); diff --git a/src/sdk/time/adjust_time.c b/src/sdk/time/adjust_time.c index fc9bc32659..facd608e58 100644 --- a/src/sdk/time/adjust_time.c +++ b/src/sdk/time/adjust_time.c @@ -1,8 +1,7 @@ /* adjust_time: deci clock adjust; v0-pinned hour with void AddClockHour(). */ #include "types.h" -#include "rnc/sdk/time/addhour.h" -#include "rnc/sdk/time/subhour.h" +#include "rnc/sdk/time.h" struct AdjustTimeArg { u8 pad_0[2]; diff --git a/src/sdk/time/decode_bcd_time_fields.c b/src/sdk/time/decode_bcd_time_fields.c index 3fa97fb952..3530b76c20 100644 --- a/src/sdk/time/decode_bcd_time_fields.c +++ b/src/sdk/time/decode_bcd_time_fields.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/time/bcd_to_time.h" +#include "rnc/sdk/time.h" struct BcdClockTime { u8 pad_0; diff --git a/src/sdk/time/encode_bcd_time_fields.c b/src/sdk/time/encode_bcd_time_fields.c index 58ec7b98a6..be0111833a 100644 --- a/src/sdk/time/encode_bcd_time_fields.c +++ b/src/sdk/time/encode_bcd_time_fields.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/time/time_to_bcd.h" +#include "rnc/sdk/time.h" struct BcdClockTime { u8 pad_0; diff --git a/src/streaming/load_disc_sectors_into_global_buffer.c b/src/streaming/load_disc_sectors_into_global_buffer.c index 83044ef5e6..9f1701eab5 100644 --- a/src/streaming/load_disc_sectors_into_global_buffer.c +++ b/src/streaming/load_disc_sectors_into_global_buffer.c @@ -1,10 +1,8 @@ #include "types.h" #include "rnc/streaming/disc_table.h" #include "rnc/data_labels.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" -#include "rnc/sdk/storage/cdvd/sceCdGetError.h" -#include "rnc/sdk/storage/cdvd/sceCdRead.h" -#include "rnc/sdk/storage/cdvd/scecdsync.h" +#include "rnc/sdk/graph.h" +#include "rnc/sdk/storage/cdvd.h" s32 load_disc_sectors_into_global_buffer(void) __asm__("FUN_0012f2b8"); diff --git a/src/streaming/read_file_entry_with_retry.c b/src/streaming/read_file_entry_with_retry.c index 8dd5ab96bb..cdc67cccdf 100644 --- a/src/streaming/read_file_entry_with_retry.c +++ b/src/streaming/read_file_entry_with_retry.c @@ -1,10 +1,8 @@ #include "types.h" #include "rnc/sdk/libcdvd.h" #include "rnc/data_labels.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" -#include "rnc/sdk/storage/cdvd/sceCdGetError.h" -#include "rnc/sdk/storage/cdvd/sceCdRead.h" -#include "rnc/sdk/storage/cdvd/scecdsync.h" +#include "rnc/sdk/graph.h" +#include "rnc/sdk/storage/cdvd.h" struct FileEntry { u32 lsn; diff --git a/src/streaming/stash/init_stash.c b/src/streaming/stash/init_stash.c index 216fe94831..927a609512 100644 --- a/src/streaming/stash/init_stash.c +++ b/src/streaming/stash/init_stash.c @@ -1,9 +1,7 @@ #include "types.h" #include "rnc/streaming/stash/stash.h" #include "rnc/sdk/sifrpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_bind_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" -#include "rnc/sdk/rpc/rpc/sce_sif_check_stat_rpc.h" +#include "rnc/sdk/rpc/rpc.h" void init_stash(void) __asm__("FUN_00232d00"); diff --git a/src/streaming/stash/stash_receive_data.c b/src/streaming/stash/stash_receive_data.c index 5862bb1859..2e643eae20 100644 --- a/src/streaming/stash/stash_receive_data.c +++ b/src/streaming/stash/stash_receive_data.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/streaming/stash/stash.h" -#include "rnc/sdk/rpc/rpc/sce_sif_call_rpc.h" +#include "rnc/sdk/rpc/rpc.h" s32 stash_receive_data(u8 *dst, u32 slot, s32 offset_qwords, s32 qword_count, u32 rpc_mode) __asm__("FUN_00232f20"); diff --git a/src/streaming/wad_get_sectors.c b/src/streaming/wad_get_sectors.c index 486a84a22f..49d655554c 100644 --- a/src/streaming/wad_get_sectors.c +++ b/src/streaming/wad_get_sectors.c @@ -1,9 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" -#include "rnc/sdk/storage/cdvd/sceCdGetError.h" -#include "rnc/sdk/storage/cdvd/sceCdRead.h" -#include "rnc/sdk/storage/cdvd/scecdsync.h" +#include "rnc/sdk/graph.h" +#include "rnc/sdk/storage/cdvd.h" s32 wad_get_sectors(s32 lsn, s32 sector_count, s32 dst) __asm__("FUN_0012f208"); diff --git a/src/ui/help/draw_help.c b/src/ui/help/draw_help.c index d9f2f4ef52..2cb8792295 100644 --- a/src/ui/help/draw_help.c +++ b/src/ui/help/draw_help.c @@ -1,20 +1,15 @@ /* Ported from rac1-decomp (src/game/help.c, func_001FF1B0). */ #include "sda.h" -#include "rnc/ui/help/help_draw_prompt.h" -#include "rnc/ui/text/font/font_set_window.h" +#include "rnc/ui/help.h" +#include "rnc/ui/text/font.h" #include "rnc/ui/help/help_state.h" -typedef struct { - char *text; /* 0x0 */ - int id; /* 0x4 */ - int unk_08; - int unk_0C; -} HelpEntry; +#include "rnc/ui/help/message_entry.h" -extern HelpEntry *help_msgs __asm__("D_0015F6A0") MACRO_ADDR; -extern int D_0015EE1D MACRO_ADDR; -extern int D_0015EE1C MACRO_ADDR; +extern HelpMessageEntry *help_msgs __asm__("D_0015F6A0") MACRO_ADDR; +extern int D_0015EE1D MACRO_ADDR; +extern int D_0015EE1C MACRO_ADDR; #define D_0015EF1D_b (*(unsigned char *)&D_0015EE1D) #define D_0015EF1C_b (*(unsigned char *)&D_0015EE1C) extern void font_print_window_small(void *a, long b, void *c, int d) __asm__("func_001F75F0"); diff --git a/src/ui/help/find_help_message_index.c b/src/ui/help/find_help_message_index.c index 2d06185012..f8c706a4ff 100644 --- a/src/ui/help/find_help_message_index.c +++ b/src/ui/help/find_help_message_index.c @@ -1,16 +1,11 @@ #include "types.h" -typedef struct HelpMsg { - s32 unk0; - s32 id; - s32 unk8; - s32 unkC; -} HelpMsg; +#include "rnc/ui/help/message_entry.h" #include "rnc/ui/help/help_state.h" -extern HelpMsg *help_msgs __asm__("D_0015F6A0"); -s32 find_help_message_index(s32 message_id) __asm__("FUN_001fdca0"); +extern HelpMessageEntry *help_msgs __asm__("D_0015F6A0"); +s32 find_help_message_index(s32 message_id) __asm__("FUN_001fdca0"); s32 find_help_message_index(s32 message_id) { s32 i; @@ -18,13 +13,13 @@ s32 find_help_message_index(s32 message_id) { i = 0; if (help_state.count > 0) { - if (help_msgs[0].id == message_id) { + if (help_msgs[0].message_id == message_id) { found = 0; } else { next: i++; if (i < help_state.count) { - if (help_msgs[i].id == message_id) { + if (help_msgs[i].message_id == message_id) { found = i; } else { goto next; diff --git a/src/ui/help/update_help_state.c b/src/ui/help/update_help_state.c index cf5264454b..306395bb7c 100644 --- a/src/ui/help/update_help_state.c +++ b/src/ui/help/update_help_state.c @@ -7,41 +7,36 @@ #include "rnc/ui/help/force_help_message.h" #include "rnc/ui/help/find_help_message_index.h" #include "rnc/audio/streaming/continue_audio_stream_if_ready.h" -#include "rnc/ui/text/link_localized_display_text.h" +#include "rnc/ui/text.h" #include "rnc/ui/help/help_state.h" -typedef struct { - void *text; - s32 pad04; - s32 id; - s32 pad0C; -} TextEntry; +#include "rnc/ui/help/message_entry.h" #include "rnc/ui/help/help_record.h" #include "rnc/math/fast_math.h" -extern TextEntry *help_msgs __asm__("D_0015F6A0"); +extern HelpMessageEntry *help_msgs __asm__("D_0015F6A0"); extern s32 fast_dec_timer(void *) __asm__("func_001F9740"); void update_help_state(void) __asm__("FUN_001fde90"); -#define PLAY_TIME (scale_game_frames(D_0015EEA4) / 600) +#define PLAY_TIME_BUCKET (scale_game_frames(D_0015EEA4) / 600) #define RECORD_COUNT() \ if (D_00141968[help_state.entry].count < 0xFFFF) { \ D_00141968[help_state.entry].count++; \ } -#define RECORD_BEST() \ - if (PLAY_TIME > D_00141968[help_state.entry].best) { \ - D_00141968[help_state.entry].best = PLAY_TIME; \ +#define RECORD_LATEST_TIME() \ + if (PLAY_TIME_BUCKET > D_00141968[help_state.entry].latest_time_bucket) { \ + D_00141968[help_state.entry].latest_time_bucket = PLAY_TIME_BUCKET; \ } -#define RECORD_FLAGS() \ - D_00141968[help_state.entry].flags = \ - D_00141968[help_state.entry].flags | (1 << current_level_index) | 0x80000000 +#define RECORD_FLAGS() \ + D_00141968[help_state.entry].level_flags = \ + D_00141968[help_state.entry].level_flags | (1 << current_level_index) | 0x80000000 void update_help_state(void) { enum { @@ -91,7 +86,7 @@ void update_help_state(void) { } RECORD_COUNT(); } - RECORD_BEST(); + RECORD_LATEST_TIME(); RECORD_FLAGS(); help_state.msg = -1; help_state.state = 0; @@ -112,14 +107,14 @@ void update_help_state(void) { s32 id; force_help_message(5, 0); - id = help_msgs[help_state.msg].id; + id = help_msgs[help_state.msg].audio_track_offset; if (id >= 0 && music_stream_state.secondary.handle == 0 && music_stream_state.queued_secondary_track == -1) { music_stream_state.queued_secondary_track = id + 0x7530; } if (controller_state.pressed & PAD_TRIANGLE) { RECORD_COUNT(); - RECORD_BEST(); + RECORD_LATEST_TIME(); RECORD_FLAGS(); help_state.timer = 8 - help_state.timer; help_state.state = 7; @@ -136,13 +131,13 @@ void update_help_state(void) { force_help_message(5, 0); if (controller_state.pressed & PAD_TRIANGLE) { RECORD_COUNT(); - RECORD_BEST(); + RECORD_LATEST_TIME(); help_state.state = 7; help_state.timer = 0; RECORD_FLAGS(); } else if (help_state.timer >= scale_game_frames(0x18)) { if (music_stream_state.secondary.state == 3 || - (id = help_msgs[help_state.msg].id) == -1 || + (id = help_msgs[help_state.msg].audio_track_offset) == -1 || id != music_stream_state.secondary.track - 0x7530) { help_state.state = 3; help_state.timer = 0; @@ -155,7 +150,7 @@ void update_help_state(void) { force_help_message(5, 0); if (controller_state.pressed & PAD_TRIANGLE) { RECORD_COUNT(); - RECORD_BEST(); + RECORD_LATEST_TIME(); help_state.state = 7; help_state.timer = 0; RECORD_FLAGS(); @@ -171,12 +166,12 @@ void update_help_state(void) { force_help_message(5, 0); if (controller_state.pressed & PAD_TRIANGLE) { RECORD_COUNT(); - RECORD_BEST(); + RECORD_LATEST_TIME(); help_state.state = 6; RECORD_FLAGS(); help_state.timer = 4 - help_state.timer; } else if (help_state.timer >= 4) { - id = help_msgs[help_state.msg].id; + id = help_msgs[help_state.msg].audio_track_offset; if (id != -1 && id == music_stream_state.secondary.track - 0x7530 && music_stream_state.secondary.state == 3) { continue_audio_stream_if_ready(); @@ -192,13 +187,13 @@ void update_help_state(void) { force_help_message(5, 0); if ((help_state.timer >= scale_game_frames(0x1A4) && - ((id = help_msgs[help_state.msg].id) == -1 || + ((id = help_msgs[help_state.msg].audio_track_offset) == -1 || id != music_stream_state.secondary.track - 0x7530 || (music_stream_state.secondary.handle == 0 && music_stream_state.queued_secondary_track == -1))) || (controller_state.pressed & PAD_TRIANGLE)) { RECORD_COUNT(); - RECORD_BEST(); + RECORD_LATEST_TIME(); help_state.state = 6; help_state.timer = 0; RECORD_FLAGS(); @@ -217,7 +212,7 @@ void update_help_state(void) { s32 id; force_help_message(5, 0); - id = help_msgs[help_state.msg].id; + id = help_msgs[help_state.msg].audio_track_offset; if (id != -1 && id == music_stream_state.secondary.track - 0x7530 && (u16)music_stream_state.secondary.state - 6U >= 2) { music_stream_state.secondary.state = 5; diff --git a/src/ui/hud/banks/hud_send_resident_bank.c b/src/ui/hud/banks/hud_send_resident_bank.c index df5e9c11f6..6ed5d2db7e 100644 --- a/src/ui/hud/banks/hud_send_resident_bank.c +++ b/src/ui/hud/banks/hud_send_resident_bank.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/globals.h" #include "rnc/ui/hud/hud_state.h" -#include "rnc/ui/hud/banks/hud_send_texture.h" +#include "rnc/ui/hud/banks.h" #include "rnc/ui/hud/banks/link_hud_bank.h" void hud_send_resident_bank(s32 bank, s32 base, s32 immediate) __asm__("FUN_001ff128"); diff --git a/src/ui/hud/banks/hud_send_texture.c b/src/ui/hud/banks/hud_send_texture.c index 3a7933b344..0ef4614077 100644 --- a/src/ui/hud/banks/hud_send_texture.c +++ b/src/ui/hud/banks/hud_send_texture.c @@ -2,8 +2,7 @@ #include "rnc/sdk/libgraph.h" #include "rnc/sdk/eetypes.h" #include "rnc/rendering/dma_tag.h" -#include "rnc/sdk/graph/sce_gs_exec_load_image.h" -#include "rnc/sdk/graph/sce_gs_set_def_load_image.h" +#include "rnc/sdk/graph.h" extern void FlushCache(s32); void hud_send_texture(u32 data, s32 dbp, s32 psm, s32 wlog, s32 hlog, s32 immediate) __asm__("FUN_00200b10"); diff --git a/src/ui/hud/banks/load_hud_banks.c b/src/ui/hud/banks/load_hud_banks.c index 50eebae7fa..94459c43e3 100644 --- a/src/ui/hud/banks/load_hud_banks.c +++ b/src/ui/hud/banks/load_hud_banks.c @@ -2,7 +2,7 @@ #include "rnc/ui/hud/hud_state.h" #include "rnc/game/game_globals.h" #include "rnc/math/asm_helpers.h" -#include "rnc/ui/hud/banks/load_compressed_hud_bank.h" +#include "rnc/ui/hud/banks.h" #define ALIGN64(x) (((x) + 0x3F) & ~0x3FU) diff --git a/src/ui/loading/play_level_loading_slides.c b/src/ui/loading/play_level_loading_slides.c index 0dd6fce0f1..e50d3fbea9 100644 --- a/src/ui/loading/play_level_loading_slides.c +++ b/src/ui/loading/play_level_loading_slides.c @@ -8,7 +8,7 @@ #include "rnc/rendering/dma_tag.h" #include "rnc/rendering/screen.h" #include "rnc/globals.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" +#include "rnc/sdk/graph.h" extern s16 D_0015EE48 MACRO_ADDR; extern s16 D_0015EE4A MACRO_ADDR; diff --git a/src/ui/loading/prepare_loading_slide_textures.c b/src/ui/loading/prepare_loading_slide_textures.c index 57d0d4e131..1376c7ff2a 100644 --- a/src/ui/loading/prepare_loading_slide_textures.c +++ b/src/ui/loading/prepare_loading_slide_textures.c @@ -7,9 +7,8 @@ #include "rnc/sdk/libgraph.h" #include "rnc/streaming/disc_table.h" #include "rnc/rendering/render_globals.h" -#include "rnc/sdk/graph/sce_gs_exec_load_image.h" -#include "rnc/sdk/graph/sce_gs_set_def_load_image.h" -#include "rnc/sdk/storage/cdvd/scecdsync.h" +#include "rnc/sdk/graph.h" +#include "rnc/sdk/storage/cdvd.h" struct CommonArchiveMemory { u8 pad_0[0x14]; diff --git a/src/ui/map/coverage/decode_map_mask.c b/src/ui/map/coverage/decode_map_mask.c index 08a777c249..5c9b02413e 100644 --- a/src/ui/map/coverage/decode_map_mask.c +++ b/src/ui/map/coverage/decode_map_mask.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/ui/map/coverage/decode_map_rle_row.h" +#include "rnc/ui/map/coverage.h" void decode_map_mask(u8 *mask_dst, s32 compressed_data_base, diff --git a/src/ui/map/coverage/save_map_coverage.c b/src/ui/map/coverage/save_map_coverage.c index e8d46d535b..51ac414836 100644 --- a/src/ui/map/coverage/save_map_coverage.c +++ b/src/ui/map/coverage/save_map_coverage.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/globals.h" #include "rnc/ui/map/map_state.h" -#include "rnc/runtime/callbacks/noop_memory_callback.h" +#include "rnc/runtime/callbacks.h" extern s32 max_coverage_save_result_by_level[] __asm__("D_0013D560"); extern void fill_transfer_words() __asm__("func_001F97E8"); diff --git a/src/ui/map/draw_map_screen_layers.c b/src/ui/map/draw_map_screen_layers.c index 5aaf818f62..ff91a3fc40 100644 --- a/src/ui/map/draw_map_screen_layers.c +++ b/src/ui/map/draw_map_screen_layers.c @@ -3,7 +3,7 @@ #include "rnc/rendering/fs_aa_buffer.h" #include "rnc/game/game_globals.h" -#include "rnc/rendering/packets/append_power_of_two_textured_screen_sprite.h" +#include "rnc/rendering/packets.h" extern s32 map_layer_screen_insets[] __asm__("D_001DDF68"); extern void vu1_add_g_sregister(s32, u64) __asm__("func_00233980"); diff --git a/src/ui/map/draw_map_screen_overlay.c b/src/ui/map/draw_map_screen_overlay.c index c4e64e0ed1..7451aab313 100644 --- a/src/ui/map/draw_map_screen_overlay.c +++ b/src/ui/map/draw_map_screen_overlay.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/rendering/vu1_registers.h" -#include "rnc/ui/map/draw_map_overlay.h" +#include "rnc/ui/map.h" s32 draw_map_screen_overlay(void) __asm__("FUN_0021f330"); diff --git a/src/ui/map/level_selection/draw_level_selection_map_screen.c b/src/ui/map/level_selection/draw_level_selection_map_screen.c index e762d5fd34..64661540cc 100644 --- a/src/ui/map/level_selection/draw_level_selection_map_screen.c +++ b/src/ui/map/level_selection/draw_level_selection_map_screen.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/ui/menus/menu_screen.h" -#include "rnc/ui/map/level_selection/draw_level_selection_map.h" +#include "rnc/ui/map/level_selection.h" s32 draw_level_selection_map_screen(struct MenuScreen *menu) __asm__("FUN_00221930"); diff --git a/src/ui/map/map_filters.c b/src/ui/map/map_filters.c index a192dbaa44..446a51709b 100644 --- a/src/ui/map/map_filters.c +++ b/src/ui/map/map_filters.c @@ -1,4 +1,4 @@ -#include "rnc/math/point_is_clockwise.h" +#include "rnc/math.h" /* Map reveal filters: the callbacks in the level-indexed table D_L00_00183F90[19][8] (map_filter_lNN_S is level NN, slot S). The map update calls the ones its filter flags select and reveals a pixel only diff --git a/src/ui/map/slots/load_map_chunk.c b/src/ui/map/slots/load_map_chunk.c index 9147392530..f4cbb80f80 100644 --- a/src/ui/map/slots/load_map_chunk.c +++ b/src/ui/map/slots/load_map_chunk.c @@ -1,6 +1,6 @@ #include "types.h" #include "sda.h" -#include "rnc/runtime/callbacks/noop_memory_callback.h" +#include "rnc/runtime/callbacks.h" extern s32 D_001A0118 NOT_SDA; extern s32 decode_compressed_occlusion_map() __asm__("func_00207C28"); diff --git a/src/ui/map/update_map_zoom_and_pan.c b/src/ui/map/update_map_zoom_and_pan.c index 12ffa5e1ee..4b99baa9b6 100644 --- a/src/ui/map/update_map_zoom_and_pan.c +++ b/src/ui/map/update_map_zoom_and_pan.c @@ -2,7 +2,7 @@ #include "rnc/input/pad_state.h" #include "rnc/ui/map/map_state.h" -#include "rnc/runtime/callbacks/noop_memory_callback.h" +#include "rnc/runtime/callbacks.h" int update_map_zoom_and_pan(void) __asm__("FUN_00205440"); diff --git a/src/ui/menus/initialize_menu_preview_scene.c b/src/ui/menus/initialize_menu_preview_scene.c index 488d30408a..d2da0524c1 100644 --- a/src/ui/menus/initialize_menu_preview_scene.c +++ b/src/ui/menus/initialize_menu_preview_scene.c @@ -7,85 +7,26 @@ #include "rnc/data_labels.h" #include "rnc/game/game_globals.h" #include "rnc/rendering/render_globals.h" -#include "rnc/game/process_global_state_flags.h" -#include "rnc/mobys/quad_moby_update.h" -#include "rnc/rendering/effects/draw_transition_overlay.h" -#include "rnc/rendering/mobys/draw_moby_entries_from_object.h" -#include "rnc/sdk/graph/sce_gs_sync_v.h" -#include "rnc/ui/map/draw_map_screen.h" -#include "rnc/ui/map/draw_map_screen_layers.h" -#include "rnc/ui/map/leave_map_screen.h" -#include "rnc/ui/map/level_selection/draw_level_selection_map_screen.h" -#include "rnc/ui/map/level_selection/update_level_selection_map_screen.h" -#include "rnc/ui/menus/item_preview/clear_menu_preview_pair.h" -#include "rnc/ui/menus/item_preview/create_rotating_preview_moby.h" -#include "rnc/ui/menus/item_preview/draw_available_item_preview_mobys.h" -#include "rnc/ui/menus/item_preview/enter_item_preview.h" -#include "rnc/ui/menus/item_preview/release_item_preview_moby.h" -#include "rnc/ui/menus/item_preview/update_item_preview_binding.h" -#include "rnc/ui/menus/missions/draw_mission_menu_labels.h" -#include "rnc/ui/menus/missions/draw_missions_menu2.h" -#include "rnc/ui/menus/missions/enter_menu_mission_list.h" -#include "rnc/ui/menus/missions/update_menu_mission_list.h" -#include "rnc/ui/menus/options/draw_cheats_menu.h" -#include "rnc/ui/menus/options/draw_sound_menu.h" -#include "rnc/ui/menus/options/set_pause_sound_volume.h" -#include "rnc/ui/menus/options/sound_options_menu.h" -#include "rnc/ui/menus/pause/assign_heli_pack_label_text_table.h" -#include "rnc/ui/menus/pause/assign_pause_level_sprite_list.h" -#include "rnc/ui/menus/pause/build_pause_item_list.h" -#include "rnc/ui/menus/pause/draw_quit_game_menu.h" -#include "rnc/ui/menus/pause/pause_page_enter_noop.h" -#include "rnc/ui/menus/pause/set_pause_action_list.h" -#include "rnc/ui/menus/save_data/draw_checking_memory_card_data_menu.h" -#include "rnc/ui/menus/save_data/draw_save_slot_list.h" -#include "rnc/ui/menus/save_data/enter_save_slot_screen.h" -#include "rnc/ui/menus/save_data/leave_save_slot_screen.h" -#include "rnc/ui/menus/save_data/loading_data_menu.h" -#include "rnc/ui/menus/save_data/reset_pause_memory_card_state.h" -#include "rnc/ui/menus/save_data/saving_data_menu.h" -#include "rnc/ui/menus/save_data/saving_data_menu2.h" -#include "rnc/ui/menus/selection/build_filtered_menu_item_list.h" -#include "rnc/ui/menus/selection/handle_cyclic_menu_selection_input.h" -#include "rnc/ui/menus/selection/update_menu_cycle_selection.h" -#include "rnc/ui/menus/selection/update_menu_grid_selection.h" -#include "rnc/ui/menus/selection/update_menu_icon_list.h" -#include "rnc/ui/menus/selection/update_menu_option_list.h" +#include "rnc/game.h" +#include "rnc/mobys.h" +#include "rnc/rendering/effects.h" +#include "rnc/rendering/mobys.h" +#include "rnc/sdk/graph.h" +#include "rnc/ui/map.h" +#include "rnc/ui/map/level_selection.h" +#include "rnc/ui/menus/item_preview.h" +#include "rnc/ui/menus/missions.h" +#include "rnc/ui/menus/options.h" +#include "rnc/ui/menus/pause.h" +#include "rnc/ui/menus/save_data.h" +#include "rnc/ui/menus/selection.h" #include "rnc/ui/menus/stream_buffers/initialize_menu_stream_buffers.h" -#include "rnc/ui/menus/stream_image/enter_menu_stream_image.h" -#include "rnc/ui/menus/stream_image/leave_menu_stream_image.h" -#include "rnc/ui/menus/stream_image/update_menu_stream_image.h" -#include "rnc/ui/menus/streamed_moby/enter_streamed_moby_screen.h" -#include "rnc/ui/menus/streamed_moby/leave_streamed_moby_screen.h" -#include "rnc/ui/menus/streamed_moby/update_streamed_moby_animation.h" -#include "rnc/ui/menus/system/clear_menu_selected_index.h" -#include "rnc/ui/menus/system/enter_timed_menu_sequence.h" -#include "rnc/ui/menus/system/handle_menu_action_buttons.h" -#include "rnc/ui/menus/system/reset_menu_graphics_buffers.h" -#include "rnc/ui/menus/system/setup_menu_display_text.h" -#include "rnc/ui/menus/system/update_menu_entry_actions.h" -#include "rnc/ui/menus/system/update_menu_resource_stream.h" -#include "rnc/ui/menus/system/update_timed_menu_sequence.h" -#include "rnc/ui/menus/weapons/draw_items_menu.h" -#include "rnc/ui/menus/weapons/obtain_all_gold_weapons_menu.h" -#include "rnc/ui/menus/widgets/draw_localized_three_option_menu.h" -#include "rnc/ui/menus/widgets/draw_menu_choice_list.h" -#include "rnc/ui/menus/widgets/draw_menu_icon_list.h" -#include "rnc/ui/menus/widgets/draw_menu_item_grid.h" -#include "rnc/ui/menus/widgets/draw_menu_selection_text.h" -#include "rnc/ui/menus/widgets/draw_menu_side_indicator.h" -#include "rnc/ui/menus/widgets/draw_menu_text_box.h" -#include "rnc/ui/menus/widgets/draw_menu_text_list.h" -#include "rnc/ui/menus/widgets/draw_prompt_box.h" -#include "rnc/ui/menus/widgets/draw_selected_menu_item_text.h" -#include "rnc/ui/menus/widgets/enter_menu_choice_list.h" -#include "rnc/ui/menus/widgets/enter_menu_prompt.h" -#include "rnc/ui/menus/widgets/leave_menu_choice_list.h" -#include "rnc/ui/menus/widgets/leave_menu_prompt.h" -#include "rnc/ui/menus/widgets/render_configured_text_label.h" -#include "rnc/ui/menus/widgets/update_menu_choice_list.h" -#include "rnc/ui/text/rebuild_configured_text_label_list.h" -#include "rnc/ui/text/render_localized_ui_entry_list.h" +#include "rnc/ui/menus/stream_image.h" +#include "rnc/ui/menus/streamed_moby.h" +#include "rnc/ui/menus/system.h" +#include "rnc/ui/menus/weapons.h" +#include "rnc/ui/menus/widgets.h" +#include "rnc/ui/text.h" #include "rnc/mobys/moby.h" #include "rnc/mobys/animation/moby_anim.h" diff --git a/src/ui/menus/item_preview/create_rotating_preview_moby.c b/src/ui/menus/item_preview/create_rotating_preview_moby.c index 504fe72913..ad5a603f08 100644 --- a/src/ui/menus/item_preview/create_rotating_preview_moby.c +++ b/src/ui/menus/item_preview/create_rotating_preview_moby.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/ui/menus/item_preview/rotate_preview_moby_x.h" +#include "rnc/ui/menus/item_preview.h" struct RotatingPreviewMoby; diff --git a/src/ui/menus/item_preview/draw_item_preview_screen.c b/src/ui/menus/item_preview/draw_item_preview_screen.c index 9663011f0f..2946a9d12f 100644 --- a/src/ui/menus/item_preview/draw_item_preview_screen.c +++ b/src/ui/menus/item_preview/draw_item_preview_screen.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/ui/menus/menu_system.h" #include "rnc/ui/menus/menu_screen.h" -#include "rnc/rendering/texture/pack_image_descriptor.h" +#include "rnc/rendering/texture.h" struct Descriptor { u8 pad0[0x10]; diff --git a/src/ui/menus/item_preview/update_item_preview_moby.c b/src/ui/menus/item_preview/update_item_preview_moby.c index c7d3c69bc8..07305e0d1e 100644 --- a/src/ui/menus/item_preview/update_item_preview_moby.c +++ b/src/ui/menus/item_preview/update_item_preview_moby.c @@ -7,7 +7,7 @@ #include "rnc/mobys/moby.h" #include "rnc/ui/menus/menu_globals.h" #include "rnc/mobys/delete_moby.h" -#include "rnc/ui/menus/item_preview/rotate_item_preview_moby.h" +#include "rnc/ui/menus/item_preview.h" extern struct Moby *create_menu_preview_moby(int) __asm__("func_00225490"); /* Keeps the item preview moby in step with the highlighted entry: drop it diff --git a/src/ui/menus/item_preview/update_preview_animation_and_attachments.c b/src/ui/menus/item_preview/update_preview_animation_and_attachments.c index 96120699c5..211bd619be 100644 --- a/src/ui/menus/item_preview/update_preview_animation_and_attachments.c +++ b/src/ui/menus/item_preview/update_preview_animation_and_attachments.c @@ -22,8 +22,7 @@ #include "rnc/ui/menus/stream_buffers/get_menu_stream_buffer_size.h" #include "rnc/ui/menus/item_preview/clear_preview_resource_bindings.h" #include "rnc/ui/menus/stream_buffers/clear_menu_stream_buffer_read_active.h" -#include "rnc/ui/menus/item_preview/advance_preview_animation_queue.h" -#include "rnc/ui/menus/item_preview/load_preview_resource_bindings.h" +#include "rnc/ui/menus/item_preview.h" typedef struct { u8 pad0[0x10]; diff --git a/src/ui/menus/options/draw_sound_menu.c b/src/ui/menus/options/draw_sound_menu.c index b6f1f2ca92..a7d0183a8b 100644 --- a/src/ui/menus/options/draw_sound_menu.c +++ b/src/ui/menus/options/draw_sound_menu.c @@ -5,7 +5,7 @@ #include "rnc/data_labels.h" #include "rnc/game/options.h" #include "rnc/ui/text/font/font_print_right.h" -#include "rnc/ui/hud/sprites/draw_hud_sprite_rect.h" +#include "rnc/ui/hud/sprites.h" typedef struct { u8 pad0[0x20]; diff --git a/src/ui/menus/save_data/draw_checking_memory_card_data_menu.c b/src/ui/menus/save_data/draw_checking_memory_card_data_menu.c index 72905f9a4b..287137f743 100644 --- a/src/ui/menus/save_data/draw_checking_memory_card_data_menu.c +++ b/src/ui/menus/save_data/draw_checking_memory_card_data_menu.c @@ -2,7 +2,7 @@ #include "rnc/ui/menus/menu_system.h" #include "rnc/ui/menus/menu_screen.h" #include "rnc/ui/text/text_region.h" -#include "rnc/rendering/texture/draw_textured_quad.h" +#include "rnc/rendering/texture.h" typedef struct TextRegion FontWindow; diff --git a/src/ui/menus/save_data/draw_save_slot_list.c b/src/ui/menus/save_data/draw_save_slot_list.c index 370137f2a0..b7edff0c1d 100644 --- a/src/ui/menus/save_data/draw_save_slot_list.c +++ b/src/ui/menus/save_data/draw_save_slot_list.c @@ -5,7 +5,7 @@ #include "rnc/ui/menus/menu_globals.h" #include "rnc/globals.h" #include "rnc/ui/hud/get_icon_frame.h" -#include "rnc/sdk/libc/stdio/sprintf.h" +#include "rnc/sdk/libc/stdio.h" typedef struct { u8 pad_0[0x20]; diff --git a/src/ui/menus/save_data/leave_save_slot_screen.c b/src/ui/menus/save_data/leave_save_slot_screen.c index 4d9cf2befc..c6e0f5ca36 100644 --- a/src/ui/menus/save_data/leave_save_slot_screen.c +++ b/src/ui/menus/save_data/leave_save_slot_screen.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/ui/menus/menu_screen.h" -#include "rnc/ui/menus/stream_buffers/release_menu_stream_buffer.h" +#include "rnc/ui/menus/stream_buffers.h" s32 leave_save_slot_screen(struct MenuScreen *screen) __asm__("FUN_00222f58"); diff --git a/src/ui/menus/save_data/loading_data_menu.c b/src/ui/menus/save_data/loading_data_menu.c index 5e0527463e..10781bc4c9 100644 --- a/src/ui/menus/save_data/loading_data_menu.c +++ b/src/ui/menus/save_data/loading_data_menu.c @@ -5,7 +5,7 @@ #include "types.h" #include "rnc/globals.h" #include "rnc/game/options.h" -#include "rnc/game/transitions/request_space_load.h" +#include "rnc/game/transitions.h" struct LoadMenuControllerState { u8 pad_0[0x1B4]; diff --git a/src/ui/menus/save_data/prepare_save_game.c b/src/ui/menus/save_data/prepare_save_game.c index 70e401f762..bfd2ab3092 100644 --- a/src/ui/menus/save_data/prepare_save_game.c +++ b/src/ui/menus/save_data/prepare_save_game.c @@ -7,8 +7,8 @@ #include "rnc/save/memory_card_state.h" #include "rnc/globals.h" #include "rnc/ui/map/copy_level_object_positions.h" -#include "rnc/sdk/scf/sce_scf_get_local_timefrom_rtc.h" -#include "rnc/sdk/storage/cdvd/scecdreadclock.h" +#include "rnc/sdk/scf.h" +#include "rnc/sdk/storage/cdvd.h" extern void memcard_make_whole_save(char *out) __asm__("func_0020ABB0"); extern void prepare_save_game(int, int) __asm__("FUN_002269c0"); diff --git a/src/ui/menus/save_data/run_state_handler.c b/src/ui/menus/save_data/run_state_handler.c index 646f957c48..ad3e0cda8c 100644 --- a/src/ui/menus/save_data/run_state_handler.c +++ b/src/ui/menus/save_data/run_state_handler.c @@ -1,31 +1,7 @@ #include "types.h" #include "rnc/globals.h" #include "rnc/data_labels.h" -#include "rnc/ui/menus/save_data/save_card_state_check_save.h" -#include "rnc/ui/menus/save_data/save_card_state_checking_save.h" -#include "rnc/ui/menus/save_data/save_card_state_create_failed.h" -#include "rnc/ui/menus/save_data/save_card_state_create_save_pending.h" -#include "rnc/ui/menus/save_data/save_card_state_creating_save.h" -#include "rnc/ui/menus/save_data/save_card_state_format_failed.h" -#include "rnc/ui/menus/save_data/save_card_state_format_pending.h" -#include "rnc/ui/menus/save_data/save_card_state_formatted.h" -#include "rnc/ui/menus/save_data/save_card_state_formatting.h" -#include "rnc/ui/menus/save_data/save_card_state_good_save.h" -#include "rnc/ui/menus/save_data/save_card_state_init.h" -#include "rnc/ui/menus/save_data/save_card_state_load_failed.h" -#include "rnc/ui/menus/save_data/save_card_state_new_card.h" -#include "rnc/ui/menus/save_data/save_card_state_no_card.h" -#include "rnc/ui/menus/save_data/save_card_state_no_room.h" -#include "rnc/ui/menus/save_data/save_card_state_no_save.h" -#include "rnc/ui/menus/save_data/save_card_state_prompt_begin_no_save.h" -#include "rnc/ui/menus/save_data/save_card_state_prompt_begin_unformatted.h" -#include "rnc/ui/menus/save_data/save_card_state_prompt_create_save.h" -#include "rnc/ui/menus/save_data/save_card_state_prompt_format.h" -#include "rnc/ui/menus/save_data/save_card_state_save_failed.h" -#include "rnc/ui/menus/save_data/save_card_state_saving.h" -#include "rnc/ui/menus/save_data/save_card_state_unformatted.h" -#include "rnc/ui/menus/save_data/save_card_state_wait_for_card.h" -#include "rnc/ui/menus/save_data/save_card_state_warning.h" +#include "rnc/ui/menus/save_data.h" /* One handler per memory card state; mode_freeze_state (0..0x18) picks it. */ extern void (*save_card_state_handlers[25])(void) __asm__("D_001A0438"); diff --git a/src/ui/menus/save_data/saving_data_menu.c b/src/ui/menus/save_data/saving_data_menu.c index b0331610ca..54405993e2 100644 --- a/src/ui/menus/save_data/saving_data_menu.c +++ b/src/ui/menus/save_data/saving_data_menu.c @@ -2,7 +2,7 @@ #include "rnc/globals.h" #include "rnc/data_labels.h" #include "rnc/game/options.h" -#include "rnc/ui/menus/save_data/prepare_save_game.h" +#include "rnc/ui/menus/save_data.h" typedef struct __attribute__((packed)) { s64 v; diff --git a/src/ui/menus/save_data/saving_data_menu2.c b/src/ui/menus/save_data/saving_data_menu2.c index c861577ecc..8ab90105fb 100644 --- a/src/ui/menus/save_data/saving_data_menu2.c +++ b/src/ui/menus/save_data/saving_data_menu2.c @@ -1,8 +1,8 @@ #include "types.h" #include "rnc/globals.h" -#include "rnc/game/load_level_zero_preserving_progress.h" -#include "rnc/game/transitions/request_space_load.h" -#include "rnc/ui/menus/save_data/start_memory_card_save.h" +#include "rnc/game.h" +#include "rnc/game/transitions.h" +#include "rnc/ui/menus/save_data.h" typedef struct __attribute__((packed)) { s64 v; diff --git a/src/ui/menus/save_data/start_memory_card_save.c b/src/ui/menus/save_data/start_memory_card_save.c index 08141011ea..4c8826c287 100644 --- a/src/ui/menus/save_data/start_memory_card_save.c +++ b/src/ui/menus/save_data/start_memory_card_save.c @@ -2,8 +2,8 @@ #include "sda.h" #include "rnc/save/memory_card_state.h" -#include "rnc/sdk/scf/sce_scf_get_local_timefrom_rtc.h" -#include "rnc/sdk/storage/cdvd/scecdreadclock.h" +#include "rnc/sdk/scf.h" +#include "rnc/sdk/storage/cdvd.h" extern u8 D_0015EE98[] MACRO_ADDR; extern s32 load_and_initialize_level_chunk() __asm__("func_00209370"); diff --git a/src/ui/menus/selection/update_menu_item_slots.c b/src/ui/menus/selection/update_menu_item_slots.c index 9c3e7c7258..d32ccb0566 100644 --- a/src/ui/menus/selection/update_menu_item_slots.c +++ b/src/ui/menus/selection/update_menu_item_slots.c @@ -45,8 +45,9 @@ s32 update_menu_item_slots(struct MenuScreen *menu) { usage_stats.stat[21].count = (u16)(usage_stats.stat[21].count + 1); } cursor_or_scaled_frame_quotient = scale_game_frames(D_0015EEA4) / 600; - if ((s32)usage_stats.stat[21].unk2 < cursor_or_scaled_frame_quotient) { - usage_stats.stat[21].unk2 = (u16)(scale_game_frames(D_0015EEA4) / 600); + if ((s32)usage_stats.stat[21].latest_time_bucket < cursor_or_scaled_frame_quotient) { + usage_stats.stat[21].latest_time_bucket = + (u16)(scale_game_frames(D_0015EEA4) / 600); } slots = menu->data.slots.items; usage_stats.stat[21].level_mask = diff --git a/src/ui/menus/system/process_menu_entry.c b/src/ui/menus/system/process_menu_entry.c index 507fd77f32..89fea862f6 100644 --- a/src/ui/menus/system/process_menu_entry.c +++ b/src/ui/menus/system/process_menu_entry.c @@ -3,7 +3,7 @@ #include "rnc/globals.h" #include "rnc/ui/hud/remove_hud_item.h" #include "rnc/ui/menus/weapons/count_unspent_gold_bolts.h" -#include "rnc/sdk/libc/string/find_substring.h" +#include "rnc/sdk/libc/string.h" typedef struct { s32 unk0; diff --git a/src/ui/menus/system/setup_menu_display_text.c b/src/ui/menus/system/setup_menu_display_text.c index 777a1ad987..424a5e16a5 100644 --- a/src/ui/menus/system/setup_menu_display_text.c +++ b/src/ui/menus/system/setup_menu_display_text.c @@ -3,7 +3,7 @@ #include "rnc/ui/map/map_state.h" #include "rnc/data_labels.h" #include "rnc/ui/menus/menu_globals.h" -#include "rnc/sdk/libc/stdio/sprintf.h" +#include "rnc/sdk/libc/stdio.h" #include "rnc/mobys/moby.h" #include "rnc/ui/menus/menu_screen.h" diff --git a/src/ui/menus/system/update_menu_system.c b/src/ui/menus/system/update_menu_system.c index d3913e41c6..8e70e922ef 100644 --- a/src/ui/menus/system/update_menu_system.c +++ b/src/ui/menus/system/update_menu_system.c @@ -11,8 +11,8 @@ #include "rnc/rendering/effects/update_fog.h" #include "rnc/rendering/vu1/select_level_vu_chain.h" #include "rnc/mobys/update_visible_mobys.h" -#include "rnc/ui/menus/initialize_menu_preview_scene.h" -#include "rnc/ui/menus/system/close_menu_system.h" +#include "rnc/ui/menus.h" +#include "rnc/ui/menus/system.h" struct Ent3 { u8 pad0[0x10]; diff --git a/src/ui/menus/weapons/count_unspent_gold_bolts.c b/src/ui/menus/weapons/count_unspent_gold_bolts.c index 767c016ec2..bf321eb629 100644 --- a/src/ui/menus/weapons/count_unspent_gold_bolts.c +++ b/src/ui/menus/weapons/count_unspent_gold_bolts.c @@ -1,6 +1,5 @@ #include "types.h" -#include "rnc/ui/menus/weapons/count_gold_bolts.h" -#include "rnc/ui/menus/weapons/count_gold_weapons.h" +#include "rnc/ui/menus/weapons.h" s32 count_unspent_gold_bolts(void) __asm__("FUN_00215248"); diff --git a/src/ui/menus/weapons/draw_selected_item_ammo.c b/src/ui/menus/weapons/draw_selected_item_ammo.c index 0a2e826544..143a71feef 100644 --- a/src/ui/menus/weapons/draw_selected_item_ammo.c +++ b/src/ui/menus/weapons/draw_selected_item_ammo.c @@ -3,8 +3,8 @@ #include "rnc/ui/menus/menu_screen.h" #include "rnc/game/item_state.h" -#include "rnc/rendering/texture/pack_image_descriptor.h" -#include "rnc/sdk/libc/stdio/sprintf.h" +#include "rnc/rendering/texture.h" +#include "rnc/sdk/libc/stdio.h" #include "rnc/ui/text/text_region.h" extern char D_001602A0[]; diff --git a/src/ui/menus/widgets/draw_localized_three_option_menu.c b/src/ui/menus/widgets/draw_localized_three_option_menu.c index 1dfa3d3e34..483b79d85e 100644 --- a/src/ui/menus/widgets/draw_localized_three_option_menu.c +++ b/src/ui/menus/widgets/draw_localized_three_option_menu.c @@ -3,7 +3,7 @@ #include "rnc/rendering/effect_texture.h" #include "rnc/ui/text/font/disable_font_color_codes.h" #include "rnc/ui/text/font/enable_font_color_codes.h" -#include "rnc/sdk/libc/stdio/sprintf.h" +#include "rnc/sdk/libc/stdio.h" struct ThreeOptionMenu { u8 pad0[0x20]; diff --git a/src/ui/menus/widgets/draw_menu_text_box.c b/src/ui/menus/widgets/draw_menu_text_box.c index 60381de050..3a650923df 100644 --- a/src/ui/menus/widgets/draw_menu_text_box.c +++ b/src/ui/menus/widgets/draw_menu_text_box.c @@ -1,5 +1,5 @@ #include "rnc/rendering/vu1_registers.h" -#include "rnc/rendering/texture/pack_image_descriptor.h" +#include "rnc/rendering/texture.h" #include "rnc/ui/menus/menu_screen.h" /* Ported from rac1-decomp (src/game/pause.c, func_00223810). */ diff --git a/src/ui/menus/widgets/format_menu_item_text.c b/src/ui/menus/widgets/format_menu_item_text.c index a146934f76..cfbef75770 100644 --- a/src/ui/menus/widgets/format_menu_item_text.c +++ b/src/ui/menus/widgets/format_menu_item_text.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/ui/map/map_state.h" #include "rnc/ui/map/map_icon.h" -#include "rnc/sdk/libc/stdio/sprintf.h" +#include "rnc/sdk/libc/stdio.h" struct Weapon { s32 name; diff --git a/src/ui/menus/widgets/format_scaled_display_value.c b/src/ui/menus/widgets/format_scaled_display_value.c index c2a7a62359..6d77b7156f 100644 --- a/src/ui/menus/widgets/format_scaled_display_value.c +++ b/src/ui/menus/widgets/format_scaled_display_value.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/libc/stdio/sprintf.h" +#include "rnc/sdk/libc/stdio.h" extern u8 thousands_grouped_integer_format[] __asm__("D_00161078"); extern u8 plain_integer_format[] __asm__("D_00161080"); diff --git a/src/ui/menus/widgets/leave_menu_prompt.c b/src/ui/menus/widgets/leave_menu_prompt.c index c9ce6a337a..7829a3de09 100644 --- a/src/ui/menus/widgets/leave_menu_prompt.c +++ b/src/ui/menus/widgets/leave_menu_prompt.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/ui/menus/menu_screen.h" -#include "rnc/ui/menus/stream_buffers/release_menu_stream_buffer.h" +#include "rnc/ui/menus/stream_buffers.h" s32 leave_menu_prompt(struct MenuScreen *menu_screen) __asm__("FUN_00221a88"); diff --git a/src/ui/menus/widgets/render_configured_text_label.c b/src/ui/menus/widgets/render_configured_text_label.c index 9c7c1c108d..26898f893e 100644 --- a/src/ui/menus/widgets/render_configured_text_label.c +++ b/src/ui/menus/widgets/render_configured_text_label.c @@ -14,7 +14,7 @@ #include "rnc/rendering/vu1_registers.h" #include "rnc/ui/text/font/disable_font_color_codes.h" #include "rnc/ui/text/font/enable_font_color_codes.h" -#include "rnc/sdk/libc/stdio/sprintf.h" +#include "rnc/sdk/libc/stdio.h" extern int panel_clear_color_gp __asm__("D_001601B0") __attribute__((sda)); extern int text_shadow_x_gp __asm__("D_001601B8") __attribute__((sda)); diff --git a/src/ui/text/draw_subtitles.c b/src/ui/text/draw_subtitles.c index fa0e5659ef..8d517f3fdb 100644 --- a/src/ui/text/draw_subtitles.c +++ b/src/ui/text/draw_subtitles.c @@ -1,7 +1,7 @@ /* Ported from rac1-decomp (src/game/draw.c, func_001F4F90). */ #include "sda.h" #include "types.h" -#include "rnc/ui/text/font/font_set_window.h" +#include "rnc/ui/text/font.h" typedef struct { short start; /* 0x0 */ diff --git a/src/ui/text/font/font_print_window.c b/src/ui/text/font/font_print_window.c index f8c2100f5a..9ccc113f21 100644 --- a/src/ui/text/font/font_print_window.c +++ b/src/ui/text/font/font_print_window.c @@ -1,6 +1,6 @@ #include "types.h" #include "rnc/ui/text/text_region.h" -#include "rnc/ui/text/font/font_print.h" +#include "rnc/ui/text/font.h" typedef struct TextRegion FontWindow; diff --git a/src/ui/text/font/font_print_wrapped.c b/src/ui/text/font/font_print_wrapped.c index 64f08285cf..7db2da6242 100644 --- a/src/ui/text/font/font_print_wrapped.c +++ b/src/ui/text/font/font_print_wrapped.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/data_labels.h" #include "rnc/game/game_globals.h" -#include "rnc/rendering/texture/draw_textured_quad.h" +#include "rnc/rendering/texture.h" struct Glyph { u8 u; diff --git a/src/ui/text/font/font_print_wrapped_small.c b/src/ui/text/font/font_print_wrapped_small.c index 9f7ccd0bb5..def81eb655 100644 --- a/src/ui/text/font/font_print_wrapped_small.c +++ b/src/ui/text/font/font_print_wrapped_small.c @@ -1,7 +1,7 @@ #include "types.h" #include "rnc/ui/text/font_metrics.h" #include "rnc/rendering/effect_texture.h" -#include "rnc/ui/text/font/font_print_wrapped.h" +#include "rnc/ui/text/font.h" void font_print_wrapped_small(s32 start_x, s32 start_y, diff --git a/src/ui/text/link_localized_display_text.c b/src/ui/text/link_localized_display_text.c index d0168cb921..63bbe1c487 100644 --- a/src/ui/text/link_localized_display_text.c +++ b/src/ui/text/link_localized_display_text.c @@ -1,15 +1,12 @@ #include "types.h" #include "rnc/data_labels.h" -#include "rnc/ui/text/font/font_set_window.h" +#include "rnc/ui/text/font.h" #include "rnc/ui/help/help_state.h" -typedef struct { - void *text; - s32 pad[3]; -} TextEntry; +#include "rnc/ui/help/message_entry.h" -extern TextEntry *help_msgs __asm__("D_0015F6A0"); +extern HelpMessageEntry *help_msgs __asm__("D_0015F6A0"); #include "rnc/rendering/screen.h" diff --git a/src/ui/text/set_scrolling_status_message.c b/src/ui/text/set_scrolling_status_message.c index ec949c94c8..80653ed580 100644 --- a/src/ui/text/set_scrolling_status_message.c +++ b/src/ui/text/set_scrolling_status_message.c @@ -1,5 +1,5 @@ #include "types.h" -#include "rnc/sdk/libc/stdio/sprintf.h" +#include "rnc/sdk/libc/stdio.h" struct ScrollingStatus { u8 pad_0[0x2C]; diff --git a/src/ui/vendor/render_vendor_capture_pass_sequence.c b/src/ui/vendor/render_vendor_capture_pass_sequence.c index e6abf893ca..780d23fcca 100644 --- a/src/ui/vendor/render_vendor_capture_pass_sequence.c +++ b/src/ui/vendor/render_vendor_capture_pass_sequence.c @@ -7,7 +7,7 @@ #include "rnc/rendering/vu1_registers.h" #include "rnc/ui/vendor/configure_capture_target.h" #include "rnc/math/asm_helpers.h" -#include "rnc/rendering/view/setup_view_context.h" +#include "rnc/rendering/view.h" typedef u128 CaptureVector; extern int capture_primary_transition __asm__("D_00161298") MACRO_ADDR; diff --git a/src/world/loaders/register_moby_class.c b/src/world/loaders/register_moby_class.c index 429878fc18..8bb7f6b3dc 100644 --- a/src/world/loaders/register_moby_class.c +++ b/src/world/loaders/register_moby_class.c @@ -1,7 +1,7 @@ #include "rnc/mobys/moby_class_tables.h" #include "types.h" #include "rnc/data_labels.h" -#include "rnc/mobys/assign_moby_class_data.h" +#include "rnc/mobys.h" /* Class data block of a moby class in the level file (not a Moby instance). */ typedef struct MobyClassData {