diff --git a/include/effect_shims.h b/include/effect_shims.h new file mode 100644 index 0000000000..5a2d68ee81 --- /dev/null +++ b/include/effect_shims.h @@ -0,0 +1,74 @@ +#ifndef _EFFECT_SHIMS_H_ +#define _EFFECT_SHIMS_H_ + +void shim_guRotateF(float mf[4][4], float a, float x, float y, float z); +void shim_guTranslateF(float mf[4][4], float x, float y, float z); +void shim_guTranslate(Mtx *m, float x, float y, float z); +void shim_guScaleF(float mf[4][4], float x, float y, float z); +void shim_guMtxCatF(float m[4][4], float n[4][4], float r[4][4]); +void shim_guMtxF2L(float mf[4][4], Mtx *m); +RenderTask* shim_queue_render_task(RenderTask* task); +EffectInstance* shim_create_effect_instance(EffectBlueprint* effectBp); +void shim_remove_effect(EffectInstance*); +void* shim_general_heap_malloc(s32 size); +void shim_mem_clear(void* data, s32 numBytes); +s32 shim_rand_int(s32); +f32 shim_clamp_angle(f32 theta); +f32 shim_sin_deg(f32 x); +f32 shim_cos_deg(f32 x); +f32 shim_atan2(f32 startX, f32 startZ, f32 endX, f32 endZ); +s32 shim_npc_raycast_down_sides(s32, f32*, f32*, f32*, f32*); +s32 shim_load_effect(s32 effectIndex); +float shim_sqrtf(float value); +void shim_mdl_draw_hidden_panel_surface(Gfx**, u16 treeIndex); +s32 shim_is_point_visible(f32, f32, f32, s32, f32*, f32*); +void shim_guPerspectiveF(f32 mf[4][4], u16* perspNorm, f32 fovy, f32 aspect, f32 near, f32 far, f32 scale); +void shim_transform_point(Matrix4f mtx, f32 inX, f32 inY, f32 inZ, f32 inS, f32* outX, f32* outY, f32* outZ, f32* outW); +void shim_guPositionF(float mf[4][4], float r, float p, float h, float s, float x, float y, float z); +void shim_guOrthoF(float mf[4][4], float l, float r, float b, float t, float n, float f, float scale); +void shim_guFrustumF(float mf[4][4], float l, float r, float b, float t, float n, float f, float scale); +void shim_draw_prev_frame_buffer_at_screen_pos(s32, s32, s32, s32, f32); +void shim_draw_box( + s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s32 width, s32 height, u8 opacity, + u8 darkening, f32 scaleX, f32 scaleY, f32 rotX, f32 rotY, f32 rotZ, void (*fpDrawContents)(void*), + void* drawContentsArg0, Matrix4f rotScaleMtx, s32 translateX, s32 translateY, f32 (*outMtx)[4] +); +void shim_draw_msg(s32, s32, s32, s32, s32, s32); +s32 shim_get_msg_width(s32, u16); +void shim_get_background_color_blend(u8* r, u8* g, u8* b, u8* a); +void shim_sfx_play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ); + +#define guRotateF shim_guRotateF +#define guTranslateF shim_guTranslateF +#define guTranslate shim_guTranslate +#define guScaleF shim_guScaleF +#define guMtxCatF shim_guMtxCatF +#define guMtxF2L shim_guMtxF2L +#define queue_render_task shim_queue_render_task +#define create_effect_instance shim_create_effect_instance +#define remove_effect shim_remove_effect +#define general_heap_malloc shim_general_heap_malloc +#define mem_clear shim_mem_clear +#define rand_int shim_rand_int +#define clamp_angle shim_clamp_angle +#define sin_deg shim_sin_deg +#define cos_deg shim_cos_deg +#define atan2 shim_atan2 +#define npc_raycast_down_sides shim_npc_raycast_down_sides +#define load_effect shim_load_effect +#define sqrtf shim_sqrtf +#define mdl_draw_hidden_panel_surface shim_mdl_draw_hidden_panel_surface +#define is_point_visible shim_is_point_visible +#define guPerspectiveF shim_guPerspectiveF +#define transform_point shim_transform_point +#define guPositionF shim_guPositionF +#define guOrthoF shim_guOrthoF +#define guFrustumF shim_guFrustumF +#define draw_prev_frame_buffer_at_screen_pos shim_draw_prev_frame_buffer_at_screen_pos +#define draw_box shim_draw_box +#define draw_msg shim_draw_msg +#define get_msg_width shim_get_msg_width +#define get_background_color_blend shim_get_background_color_blend +#define sfx_play_sound_at_position shim_sfx_play_sound_at_position + +#endif diff --git a/include/effects.h b/include/effects.h index 575a4100b9..b9575b6897 100644 --- a/include/effects.h +++ b/include/effects.h @@ -2951,4 +2951,132 @@ EffectInstance* fx_86(s32, f32, f32, f32, f32, s32); void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); +void big_smoke_puff_main(f32 x, f32 y, f32 z); +void landing_dust_main(s32 type, f32 x, f32 y, f32 z, f32); +void walking_dust_main(s32, f32, f32, f32, f32, f32); +void flower_splash_main(f32, f32, f32, f32); +void flower_trail_main(s32, f32, f32, f32, f32, f32); +void cloud_puff_main(f32, f32, f32, f32); +void cloud_trail_main(s32, f32, f32, f32); +void footprint_main(f32, f32, f32, f32, f32, f32, f32, f32); +void floating_flower_main(s32, f32, f32, f32, s32); +void snowflake_main(f32, f32, f32, s32, s32); +EffectInstance* star_main(s32, f32, f32, f32, f32, f32, f32, f32); +void emote_main(s32, Npc*, f32, f32, f32, f32, f32, s32, EffectInstance**); +void sparkles_main(s32, f32, f32, f32, f32); +EffectInstance* shape_spell_main(s32, f32, f32, f32, f32, f32, f32, s32); +void gather_energy_pink_main(s32, f32, f32, f32, f32, s32); +void drop_leaves_main(s32, f32, f32, f32, s32); +EffectInstance* dust_main(s32, f32, f32, f32, s32); +void shattering_stones_main(s32, f32, f32, f32, f32); +void smoke_ring_main(s32, f32, f32, f32); +void damage_stars_main(s32, f32, f32, f32, f32, f32, f32, s32); +void explosion_main(s32, f32, f32, f32); +void lens_flare_main(s32, f32, f32, f32, s32); +void got_item_outline_main(s32, f32, f32, f32, f32, EffectInstance**); +void spiky_white_aura_main(s32, f32, f32, f32, s32); +void smoke_impact_main(s32, f32, f32, f32, f32, s32, f32, s32); +void damage_indicator_main(s32, f32, f32, f32, f32, f32, s32, EffectInstance**); +EffectInstance* purple_ring_main(s32, f32, f32, f32, f32, f32, f32, f32); +void flame_main(s32, f32, f32, f32, f32, EffectInstance**); +void stars_burst_main(s32, f32, f32, f32, f32, f32, s32); +void stars_shimmer_main(s32, f32 x, f32 y, f32 z, f32, f32, s32, s32); +void rising_bubble_main(s32, f32, f32, f32, f32); +void ring_blast_main(s32, f32, f32, f32, f32, s32); +void shockwave_main(s32, f32, f32, f32); +void music_note_main(s32, f32, f32, f32); +void smoke_burst_main(s32, f32, f32, f32, f32, s32); +void sweat_main(s32, f32, f32, f32, f32, f32, s32); +void sleep_bubble_main(s32, f32, f32, f32, f32, f32, EffectInstance**); +void windy_leaves_main(s32, f32, f32, f32); +void falling_leaves_main(s32, f32, f32, f32); +void stars_spread_main(s32, f32, f32, f32, s32, s32); +void steam_burst_main(s32, f32, f32, f32, f32, s32); +void stars_orbiting_main(s32, f32, f32, f32, f32, s32, EffectInstance**); +void big_snowflakes_main(s32, f32, f32, f32); +EffectInstance* debuff_main(s32, f32, f32, f32); +EffectInstance* green_impact_main(s32, f32, f32, f32, f32); +EffectInstance* radial_shimmer_main(s32, f32, f32, f32, f32, s32); +void ending_decals_main(s32, f32, f32, f32, f32, EffectInstance**); +void light_rays_main(s32, f32, f32, f32, f32, EffectInstance**); +EffectInstance* lightning_main(s32, f32, f32, f32, f32, f32); +EffectInstance* fire_breath_main(s32, f32, f32, f32, f32, f32, f32, s32, s32, s32); +EffectInstance* shimmer_burst_main(s32, f32, f32, f32, f32, s32); +void energy_shockwave_main(s32, f32, f32, f32, f32, s32); +EffectInstance* shimmer_wave_main(s32, f32, f32, f32, f32, f32, s32, s32); +void aura_main(s32, f32, f32, f32, f32, EffectInstance**); +void bulb_glow_main(s32, f32, f32, f32, f32, EffectInstance**); +void effect_3D_main(s32, f32, f32, f32, f32, f32, f32, s32, EffectInstance**); +void blast_main(s32, f32, f32, f32, f32, s32); +EffectInstance* fire_flower_main(s32, f32, f32, f32, s32); +EffectInstance* recover_main(s32, f32, f32, f32, s32); +EffectInstance* disable_x_main(s32, f32, f32, f32, s32); +EffectInstance* bombette_breaking_main(s32, s32, s32, f32, s32, s32); +EffectInstance* firework_main(s32, f32, f32, f32, f32, s32); +EffectInstance* confetti_main(s32, f32, f32, f32, f32, s32); +EffectInstance* snowfall_main(s32, s32); +EffectInstance* effect_46_main(s32, PlayerStatus*, f32, s32); +EffectInstance* gather_magic_main(s32, f32, f32, f32, f32, s32); +EffectInstance* attack_result_text_main(s32, f32, f32, f32, f32, s32); +EffectInstance* small_gold_sparkle_main(s32, f32, f32, f32, f32); +EffectInstance* flashing_box_shockwave_main(s32, f32, f32, f32, f32, f32); +EffectInstance* balloon_main(s32, f32, f32, f32, f32, s32); +EffectInstance* floating_rock_main(s32, f32, f32, f32, f32, f32, f32, f32, s32); +EffectInstance* chomp_drop_main(s32, f32, f32, f32, f32, s32, f32, s32, f32, s32); +EffectInstance* quizmo_stage_main(s32, f32, f32, f32); +EffectInstance* radiating_energy_orb_main(s32, f32, f32, f32, f32, s32); +EffectInstance* quizmo_answer_main(s32, f32, f32, f32); +EffectInstance* motion_blur_flame_main(s32, f32, f32, f32, f32, s32); +EffectInstance* energy_orb_wave_main(s32, f32, f32, f32, f32, s32); +EffectInstance* merlin_house_stars_main(s32, f32, f32, f32); +EffectInstance* quizmo_audience_main(s32, f32, f32, f32); +EffectInstance* butterflies_main(s32, f32, f32, f32); +EffectInstance* stat_change_main(s32, f32, f32, f32, f32, s32); +EffectInstance* snaking_static_main(s32, f32, f32, f32, f32, s32); +EffectInstance* thunderbolt_ring_main(s32, f32, f32, f32, f32, s32); +EffectInstance* squirt_main(s32, f32, f32, f32, f32, f32, f32, f32, s32); +EffectInstance* water_block_main(s32, f32, f32, f32, f32, s32); +EffectInstance* waterfall_main(s32, f32, f32, f32, f32, s32); +EffectInstance* water_fountain_main(s32, f32, f32, f32, f32, s32); +EffectInstance* underwater_main(s32, f32, f32, f32, f32, s32); +EffectInstance* lightning_bolt_main(s32, f32, f32, f32, f32, f32, f32, f32, s32); +EffectInstance* water_splash_main(s32, f32, f32, f32, f32, s32); +EffectInstance* snowman_doll_main(s32, f32, f32, f32, f32, s32); +EffectInstance* fright_jar_main(s32, f32, f32, f32, f32, s32); +EffectInstance* stop_watch_main(s32, f32, f32, f32, f32, s32); +EffectInstance* effect_63_main(s32, f32, f32, f32, f32, f32, f32, f32, s32, s32); +EffectInstance* throw_spiny_main(s32, f32, f32, f32, f32, f32, f32, f32, s32); +EffectInstance* effect_65_main(s32, f32, f32, f32, f32, s32); +EffectInstance* tubba_heart_attack_main(s32, f32, f32, f32, f32, s32); +EffectInstance* whirlwind_main(s32, f32, f32, f32, f32, s32); +EffectInstance* red_impact_main(s32, f32, f32, f32, f32); +EffectInstance* floating_cloud_puff_main(s32, f32, f32, f32, f32, s32); +EffectInstance* energy_in_out_main(s32, f32, f32, f32, f32, s32); +EffectInstance* tattle_window_main(s32, f32, f32, f32, f32, s32); +EffectInstance* shiny_flare_main(s32, f32, f32, f32, f32); +EffectInstance* huff_puff_breath_main(s32, f32, f32, f32, f32, f32, f32, s32); +EffectInstance* cold_breath_main(s32, f32, f32, f32, f32, s32); +EffectInstance* embers_main(s32, f32, f32, f32, f32, f32, f32, s32, s32, f32, f32); +EffectInstance* hieroglyphs_main(s32, f32, f32, f32, f32, s32); +EffectInstance *misc_particles_main(s32, f32, f32, f32, f32, f32, f32, s32, s32); +EffectInstance* static_status_main(s32, f32, f32, f32, f32, s32, s32); +EffectInstance* moving_cloud_main(s32, f32, f32, f32, f32, f32, f32, f32, f32); +EffectInstance* effect_75_main(s32, f32, f32, f32, f32, s32); +EffectInstance* firework_rocket_main(s32, f32, f32, f32, f32, f32, f32, f32, s32); +EffectInstance* peach_star_beam_main(s32, f32, f32, f32, f32, s32); +EffectInstance* chapter_change_main(s32, f32, f32, f32, f32, s32); +EffectInstance* ice_shard_main(s32, f32, f32, f32, f32, s32); +EffectInstance* spirit_card_main(s32, f32, f32, f32, f32, s32); +EffectInstance* lil_oink_main(void); +EffectInstance* something_rotating_main(s32, f32, f32, f32, f32, s32); +EffectInstance* breaking_junk_main(s32, f32, f32, f32, f32, s32); +EffectInstance* partner_buff_main(s32, f32, f32, f32, f32, s32); +EffectInstance* quizmo_assistant_main(s32, f32, f32, f32, f32, s32); +EffectInstance* ice_pillar_main(s32 arg0, f32 x, f32 y, f32 z, f32 arg4, s32 arg5); +EffectInstance* sun_main(s32, f32, f32, f32, f32, s32); +EffectInstance* star_spirits_energy_main(s32, f32, f32, f32, f32, s32); +EffectInstance* pink_sparkles_main(s32, f32, f32, f32, f32, f32); +EffectInstance* star_outline_main(s32, f32, f32, f32, f32, s32); +EffectInstance* effect_86_main(s32, f32, f32, f32, f32, s32); + #endif diff --git a/include/effects_internal.h b/include/effects_internal.h index 48734eaaed..b2264b81b5 100644 --- a/include/effects_internal.h +++ b/include/effects_internal.h @@ -6,168 +6,6 @@ s32 effect_rand_int(s32); s32 func_E0200044(s32, s32); -EffectInstance* shim_create_effect_instance(EffectBlueprint* effectBp); -s32 shim_load_effect(s32 effectIndex); -void shim_remove_effect(EffectInstance*); -s32 shim_rand_int(s32); -void* shim_general_heap_malloc(s32 size); -RenderTask* shim_queue_render_task(RenderTask* task); -float shim_sqrtf(float value); -f32 shim_atan2(f32 startX, f32 startZ, f32 endX, f32 endZ); -f32 shim_sin_deg(f32 x); -f32 shim_cos_deg(f32 x); -f32 shim_clamp_angle(f32 theta); -void shim_get_background_color_blend(u8* r, u8* g, u8* b, u8* a); -void shim_guMtxF2L(float mf[4][4], Mtx *m); -void shim_guMtxCatF(float m[4][4], float n[4][4], float r[4][4]); -void shim_guScaleF(float mf[4][4], float x, float y, float z); -void shim_guRotateF(float mf[4][4], float a, float x, float y, float z); -void shim_guTranslate(Mtx *m, float x, float y, float z); -void shim_guTranslateF(float mf[4][4], float x, float y, float z); -void shim_guPerspectiveF(f32 mf[4][4], u16* perspNorm, f32 fovy, f32 aspect, f32 near, f32 far, f32 scale); -void shim_guPositionF(float mf[4][4], float r, float p, float h, float s, float x, float y, float z); -void shim_guOrthoF(float mf[4][4], float l, float r, float b, float t, float n, float f, float scale); -void shim_guFrustumF(float mf[4][4], float l, float r, float b, float t, float n, float f, float scale); -void shim_mem_clear(void* data, s32 numBytes); -void shim_transform_point(Matrix4f mtx, f32 inX, f32 inY, f32 inZ, f32 inS, f32* outX, f32* outY, f32* outZ, f32* outW); -s32 shim_npc_raycast_down_sides(s32, f32*, f32*, f32*, f32*); -void shim_sfx_play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ); -void shim_mdl_draw_hidden_panel_surface(Gfx**, u16 treeIndex); -s32 shim_is_point_visible(f32, f32, f32, s32, f32*, f32*); -void shim_draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s32 width, s32 height, u8 opacity, - u8 darkening, f32 scaleX, f32 scaleY, f32 rotX, f32 rotY, f32 rotZ, void (*fpDrawContents)(void*), - void* drawContentsArg0, Matrix4f rotScaleMtx, s32 translateX, s32 translateY, f32 (*outMtx)[4]); - -// the actual signature is going to be wrong, but it doesn't matter -// TODO remove when every effect's main is sorted out -#define FX_MAIN(name) void name(void); - -void big_smoke_puff_main(f32 x, f32 y, f32 z); -void landing_dust_main(s32 type, f32 x, f32 y, f32 z, f32); -void walking_dust_main(s32, f32, f32, f32, f32, f32); -void flower_splash_main(f32, f32, f32, f32); -void flower_trail_main(s32, f32, f32, f32, f32, f32); -void cloud_puff_main(f32, f32, f32, f32); -void cloud_trail_main(s32, f32, f32, f32); -void footprint_main(f32, f32, f32, f32, f32, f32, f32, f32); -void floating_flower_main(s32, f32, f32, f32, s32); -void snowflake_main(f32, f32, f32, s32, s32); -EffectInstance* star_main(s32, f32, f32, f32, f32, f32, f32, f32); -void emote_main(s32, Npc*, f32, f32, f32, f32, f32, s32, EffectInstance**); -void sparkles_main(s32, f32, f32, f32, f32); -EffectInstance* shape_spell_main(s32, f32, f32, f32, f32, f32, f32, s32); -void gather_energy_pink_main(s32, f32, f32, f32, f32, s32); -void drop_leaves_main(s32, f32, f32, f32, s32); -EffectInstance* dust_main(s32, f32, f32, f32, s32); -void shattering_stones_main(s32, f32, f32, f32, f32); -void smoke_ring_main(s32, f32, f32, f32); -void damage_stars_main(s32, f32, f32, f32, f32, f32, f32, s32); -void explosion_main(s32, f32, f32, f32); -void lens_flare_main(s32, f32, f32, f32, s32); -void got_item_outline_main(s32, f32, f32, f32, f32, EffectInstance**); -void spiky_white_aura_main(s32, f32, f32, f32, s32); -void smoke_impact_main(s32, f32, f32, f32, f32, s32, f32, s32); -void damage_indicator_main(s32, f32, f32, f32, f32, f32, s32, EffectInstance**); -EffectInstance* purple_ring_main(s32, f32, f32, f32, f32, f32, f32, f32); -void flame_main(s32, f32, f32, f32, f32, EffectInstance**); -void stars_burst_main(s32, f32, f32, f32, f32, f32, s32); -void stars_shimmer_main(s32, f32 x, f32 y, f32 z, f32, f32, s32, s32); -void rising_bubble_main(s32, f32, f32, f32, f32); -void ring_blast_main(s32, f32, f32, f32, f32, s32); -void shockwave_main(s32, f32, f32, f32); -void music_note_main(s32, f32, f32, f32); -void smoke_burst_main(s32, f32, f32, f32, f32, s32); -void sweat_main(s32, f32, f32, f32, f32, f32, s32); -void sleep_bubble_main(s32, f32, f32, f32, f32, f32, EffectInstance**); -void windy_leaves_main(s32, f32, f32, f32); -void falling_leaves_main(s32, f32, f32, f32); -void stars_spread_main(s32, f32, f32, f32, s32, s32); -void steam_burst_main(s32, f32, f32, f32, f32, s32); -void stars_orbiting_main(s32, f32, f32, f32, f32, s32, EffectInstance**); -void big_snowflakes_main(s32, f32, f32, f32); -EffectInstance* debuff_main(s32, f32, f32, f32); -EffectInstance* green_impact_main(s32, f32, f32, f32, f32); -EffectInstance* radial_shimmer_main(s32, f32, f32, f32, f32, s32); -void ending_decals_main(s32, f32, f32, f32, f32, EffectInstance**); -void light_rays_main(s32, f32, f32, f32, f32, EffectInstance**); -EffectInstance* lightning_main(s32, f32, f32, f32, f32, f32); -EffectInstance* fire_breath_main(s32, f32, f32, f32, f32, f32, f32, s32, s32, s32); -EffectInstance* shimmer_burst_main(s32, f32, f32, f32, f32, s32); -void energy_shockwave_main(s32, f32, f32, f32, f32, s32); -EffectInstance* shimmer_wave_main(s32, f32, f32, f32, f32, f32, s32, s32); -void aura_main(s32, f32, f32, f32, f32, EffectInstance**); -void bulb_glow_main(s32, f32, f32, f32, f32, EffectInstance**); -void effect_3D_main(s32, f32, f32, f32, f32, f32, f32, s32, EffectInstance**); -void blast_main(s32, f32, f32, f32, f32, s32); -EffectInstance* fire_flower_main(s32, f32, f32, f32, s32); -EffectInstance* recover_main(s32, f32, f32, f32, s32); -EffectInstance* disable_x_main(s32, f32, f32, f32, s32); -EffectInstance* bombette_breaking_main(s32, s32, s32, f32, s32, s32); -EffectInstance* firework_main(s32, f32, f32, f32, f32, s32); -EffectInstance* confetti_main(s32, f32, f32, f32, f32, s32); -EffectInstance* snowfall_main(s32, s32); -EffectInstance* effect_46_main(s32, PlayerStatus*, f32, s32); -EffectInstance* gather_magic_main(s32, f32, f32, f32, f32, s32); -EffectInstance* attack_result_text_main(s32, f32, f32, f32, f32, s32); -EffectInstance* small_gold_sparkle_main(s32, f32, f32, f32, f32); -EffectInstance* flashing_box_shockwave_main(s32, f32, f32, f32, f32, f32); -EffectInstance* balloon_main(s32, f32, f32, f32, f32, s32); -EffectInstance* floating_rock_main(s32, f32, f32, f32, f32, f32, f32, f32, s32); -EffectInstance* chomp_drop_main(s32, f32, f32, f32, f32, s32, f32, s32, f32, s32); -EffectInstance* quizmo_stage_main(s32, f32, f32, f32); -EffectInstance* radiating_energy_orb_main(s32, f32, f32, f32, f32, s32); -EffectInstance* quizmo_answer_main(s32, f32, f32, f32); -EffectInstance* motion_blur_flame_main(s32, f32, f32, f32, f32, s32); -EffectInstance* energy_orb_wave_main(s32, f32, f32, f32, f32, s32); -EffectInstance* merlin_house_stars_main(s32, f32, f32, f32); -EffectInstance* quizmo_audience_main(s32, f32, f32, f32); -EffectInstance* butterflies_main(s32, f32, f32, f32); -EffectInstance* stat_change_main(s32, f32, f32, f32, f32, s32); -EffectInstance* snaking_static_main(s32, f32, f32, f32, f32, s32); -EffectInstance* thunderbolt_ring_main(s32, f32, f32, f32, f32, s32); -EffectInstance* squirt_main(s32, f32, f32, f32, f32, f32, f32, f32, s32); -EffectInstance* water_block_main(s32, f32, f32, f32, f32, s32); -EffectInstance* waterfall_main(s32, f32, f32, f32, f32, s32); -EffectInstance* water_fountain_main(s32, f32, f32, f32, f32, s32); -EffectInstance* underwater_main(s32, f32, f32, f32, f32, s32); -EffectInstance* lightning_bolt_main(s32, f32, f32, f32, f32, f32, f32, f32, s32); -EffectInstance* water_splash_main(s32, f32, f32, f32, f32, s32); -EffectInstance* snowman_doll_main(s32, f32, f32, f32, f32, s32); -EffectInstance* fright_jar_main(s32, f32, f32, f32, f32, s32); -EffectInstance* stop_watch_main(s32, f32, f32, f32, f32, s32); -EffectInstance* effect_63_main(s32, f32, f32, f32, f32, f32, f32, f32, s32, s32); -EffectInstance* throw_spiny_main(s32, f32, f32, f32, f32, f32, f32, f32, s32); -EffectInstance* effect_65_main(s32, f32, f32, f32, f32, s32); -EffectInstance* tubba_heart_attack_main(s32, f32, f32, f32, f32, s32); -EffectInstance* whirlwind_main(s32, f32, f32, f32, f32, s32); -EffectInstance* red_impact_main(s32, f32, f32, f32, f32); -EffectInstance* floating_cloud_puff_main(s32, f32, f32, f32, f32, s32); -EffectInstance* energy_in_out_main(s32, f32, f32, f32, f32, s32); -EffectInstance* tattle_window_main(s32, f32, f32, f32, f32, s32); -EffectInstance* shiny_flare_main(s32, f32, f32, f32, f32); -EffectInstance* huff_puff_breath_main(s32, f32, f32, f32, f32, f32, f32, s32); -EffectInstance* cold_breath_main(s32, f32, f32, f32, f32, s32); -EffectInstance* embers_main(s32, f32, f32, f32, f32, f32, f32, s32, s32, f32, f32); -EffectInstance* hieroglyphs_main(s32, f32, f32, f32, f32, s32); -EffectInstance *misc_particles_main(s32, f32, f32, f32, f32, f32, f32, s32, s32); -EffectInstance* static_status_main(s32, f32, f32, f32, f32, s32, s32); -EffectInstance* moving_cloud_main(s32, f32, f32, f32, f32, f32, f32, f32, f32); -EffectInstance* effect_75_main(s32, f32, f32, f32, f32, s32); -EffectInstance* firework_rocket_main(s32, f32, f32, f32, f32, f32, f32, f32, s32); -EffectInstance* peach_star_beam_main(s32, f32, f32, f32, f32, s32); -EffectInstance* chapter_change_main(s32, f32, f32, f32, f32, s32); -EffectInstance* ice_shard_main(s32, f32, f32, f32, f32, s32); -EffectInstance* spirit_card_main(s32, f32, f32, f32, f32, s32); -EffectInstance* lil_oink_main(void); -EffectInstance* something_rotating_main(s32, f32, f32, f32, f32, s32); -EffectInstance* breaking_junk_main(s32, f32, f32, f32, f32, s32); -EffectInstance* partner_buff_main(s32, f32, f32, f32, f32, s32); -EffectInstance* quizmo_assistant_main(s32, f32, f32, f32, f32, s32); -EffectInstance* ice_pillar_main(s32 arg0, f32 x, f32 y, f32 z, f32 arg4, s32 arg5); -EffectInstance* sun_main(s32, f32, f32, f32, f32, s32); -EffectInstance* star_spirits_energy_main(s32, f32, f32, f32, f32, s32); -EffectInstance* pink_sparkles_main(s32, f32, f32, f32, f32, f32); -EffectInstance* star_outline_main(s32, f32, f32, f32, f32, s32); -EffectInstance* effect_86_main(s32, f32, f32, f32, f32, s32); +#include "effect_shims.h" #endif diff --git a/src/effects.c b/src/effects.c index dc8e4de443..5f0c8ff4c8 100644 --- a/src/effects.c +++ b/src/effects.c @@ -1,6 +1,5 @@ #include "common.h" #include "effects.h" -#include "effects_internal.h" #include "ld_addrs.h" typedef s32 TlbEntry[0x1000 / 4]; diff --git a/src/effects/attack_result_text.c b/src/effects/attack_result_text.c index 4970f87977..54193f57df 100644 --- a/src/effects/attack_result_text.c +++ b/src/effects/attack_result_text.c @@ -47,10 +47,10 @@ EffectInstance* attack_result_text_main(s32 type, f32 posX, f32 posY, f32 posZ, bp.renderUI = func_E0090428; bp.effectID = EFFECT_ATTACK_RESULT_TEXT; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.attackResultText = shim_general_heap_malloc(effect->numParts * sizeof(*data)); + data = effect->data.attackResultText = general_heap_malloc(effect->numParts * sizeof(*data)); ASSERT(data != NULL); @@ -72,8 +72,8 @@ EffectInstance* attack_result_text_main(s32 type, f32 posX, f32 posY, f32 posZ, data->pos.x = posX; data->pos.y = posY; data->pos.z = posZ; - data->vel.x = 2.0f * (-shim_sin_deg(30.0f) * appearVel); - data->vel.y = 2.0f * (shim_cos_deg(30.0f) * appearVel); + data->vel.x = 2.0f * (-sin_deg(30.0f) * appearVel); + data->vel.y = 2.0f * (cos_deg(30.0f) * appearVel); } else { data->pos.x = -100.0f; data->pos.y = 40.0f; @@ -107,7 +107,7 @@ void attack_result_text_update(EffectInstance* effect) { if (data->timeLeft < 0) { data->isVisible = FALSE; data->timeLeft = -1; - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -192,12 +192,12 @@ void func_E0090444(EffectInstance* effect) { gDPSetPrimDepth(gMainGfxPos++, z, 0); if (type < 5) { - shim_guTranslateF(mtxA, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(mtxB, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(mtxB, mtxA, mtxA); - shim_guScaleF(mtxB, scale, scale, 1.0f); - shim_guMtxCatF(mtxB, mtxA, mtxA); - shim_guMtxF2L(mtxA, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtxA, data->pos.x, data->pos.y, data->pos.z); + guRotateF(mtxB, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxB, mtxA, mtxA); + guScaleF(mtxB, scale, scale, 1.0f); + guMtxCatF(mtxB, mtxA, mtxA); + guMtxF2L(mtxA, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, data->alpha); diff --git a/src/effects/aura.c b/src/effects/aura.c index f960b56233..a961f93386 100644 --- a/src/effects/aura.c +++ b/src/effects/aura.c @@ -39,10 +39,10 @@ void aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, EffectInstance* bp.renderUI = NULL; bp.effectID = EFFECT_AURA; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.aura = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.aura = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.aura != NULL); @@ -177,7 +177,7 @@ void aura_update(EffectInstance* effect) { } if (data->fadeTime < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -253,7 +253,7 @@ void aura_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -274,39 +274,39 @@ void aura_appendGfx(void* argEffect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); gSPDisplayList(gMainGfxPos++, D_E0076ED0[type]); - shim_guTranslateF(translateMtx, data->posB.x, data->posB.y, data->posB.z); + guTranslateF(translateMtx, data->posB.x, data->posB.y, data->posB.z); if (type == 2) { - shim_guRotateF(tempMtx, data->renderYaw, 0.0f, 1.0f, 0.0f); + guRotateF(tempMtx, data->renderYaw, 0.0f, 1.0f, 0.0f); } else { - shim_guRotateF(tempMtx, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guRotateF(tempMtx, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); } - shim_guMtxCatF(tempMtx, translateMtx, transformMtx); - shim_guScaleF(tempMtx, data->scale.x, data->scale.y, 1.0f); - shim_guMtxCatF(tempMtx, transformMtx, transformMtx); + guMtxCatF(tempMtx, translateMtx, transformMtx); + guScaleF(tempMtx, data->scale.x, data->scale.y, 1.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); if (type == 0) { - shim_guTranslateF(tempMtx, (-(data->scale.x - data->unk_24) / data->unk_24) * 10.0f, 0.0f, 0.0f); - shim_guMtxCatF(tempMtx, transformMtx, transformMtx); + guTranslateF(tempMtx, (-(data->scale.x - data->unk_24) / data->unk_24) * 10.0f, 0.0f, 0.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); } - shim_guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E0076EC0[type]); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); - shim_guTranslateF(translateMtx, data->posA.x, data->posA.y, data->posA.z); + guTranslateF(translateMtx, data->posA.x, data->posA.y, data->posA.z); if (type == 2) { - shim_guRotateF(tempMtx, data->renderYaw, 0.0f, 1.0f, 0.0f); + guRotateF(tempMtx, data->renderYaw, 0.0f, 1.0f, 0.0f); } else { - shim_guRotateF(tempMtx, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guRotateF(tempMtx, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); } - shim_guMtxCatF(tempMtx, translateMtx, transformMtx); - shim_guScaleF(tempMtx, data->scale.x, data->scale.y, 1.0f); - shim_guMtxCatF(tempMtx, transformMtx, transformMtx); + guMtxCatF(tempMtx, translateMtx, transformMtx); + guScaleF(tempMtx, data->scale.x, data->scale.y, 1.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); if (type == 0) { - shim_guTranslateF(tempMtx, (-(data->scale.x - data->unk_24) / data->unk_24) * 10.0f, 0.0f, 0.0f); - shim_guMtxCatF(tempMtx, transformMtx, transformMtx); + guTranslateF(tempMtx, (-(data->scale.x - data->unk_24) / data->unk_24) * 10.0f, 0.0f, 0.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); } - shim_guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E0076EB0[type]); diff --git a/src/effects/balloon.c b/src/effects/balloon.c index dac4782c86..6409abc5e3 100644 --- a/src/effects/balloon.c +++ b/src/effects/balloon.c @@ -27,10 +27,10 @@ EffectInstance* balloon_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s bp.renderUI = NULL; bp.effectID = EFFECT_BALLOON; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = shim_general_heap_malloc(numParts * sizeof(*data)); + data = general_heap_malloc(numParts * sizeof(*data)); effect->data.balloon = data; part = data; @@ -59,7 +59,7 @@ void balloon_update(EffectInstance* effect) { part->unk_20++; if (part->unk_1C < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -79,7 +79,7 @@ void balloon_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_SURFACE_OPA; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -92,12 +92,12 @@ void balloon_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, data->unk_18, data->unk_18, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, data->unk_18, data->unk_18, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/big_smoke_puff.c b/src/effects/big_smoke_puff.c index 412f13bc3d..8706f8cca8 100644 --- a/src/effects/big_smoke_puff.c +++ b/src/effects/big_smoke_puff.c @@ -42,10 +42,10 @@ void big_smoke_puff_main(f32 x, f32 y, f32 z) { bp.renderUI = NULL; bp.effectID = EFFECT_BIG_SMOKE_PUFF; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = shim_general_heap_malloc(effect->numParts * sizeof(*data)); + data = general_heap_malloc(effect->numParts * sizeof(*data)); effect->data.bigSmokePuff = data; ASSERT(data != NULL); @@ -63,8 +63,8 @@ void big_smoke_puff_main(f32 x, f32 y, f32 z) { theta = D_E0002760[i] + 90.0f; temp_f20 = 2.0 * D_E0002788[i]; - sinTheta = shim_sin_deg(theta); - cosTheta = shim_cos_deg(theta); + sinTheta = sin_deg(theta); + cosTheta = cos_deg(theta); data->unk_20 = temp_f20 * sinTheta; data->unk_24 = -temp_f20 * cosTheta; @@ -102,7 +102,7 @@ void big_smoke_puff_update(EffectInstance* effect) { } if (!cond) { - shim_remove_effect(effect); + remove_effect(effect); } } @@ -115,7 +115,7 @@ void big_smoke_puff_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -128,8 +128,8 @@ void big_smoke_puff_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guPositionF(mtx, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, data->x, data->y, data->z); - shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(mtx, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, data->x, data->y, data->z); + guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -145,9 +145,9 @@ void big_smoke_puff_appendGfx(void* effect) { primAlpha = 16; } - shim_guPositionF(mtx, 0.0f, 0.0f, sPartYaws[i], sPartScales[i], data->partX, + guPositionF(mtx, 0.0f, 0.0f, sPartYaws[i], sPartScales[i], data->partX, data->partY, 0.0f); - shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -158,7 +158,7 @@ void big_smoke_puff_appendGfx(void* effect) { envAlpha = 255; dlist = sDlists[ARRAY_COUNT(sDlists) - 1]; } else { - f32 temp = shim_sin_deg((((temp_f12 * 7.0f) / data->unk_04) * 90.0f) / 7.0f) * 7.0f; + f32 temp = sin_deg((((temp_f12 * 7.0f) / data->unk_04) * 90.0f) / 7.0f) * 7.0f; envAlpha = (s32)(temp * 255.0f) % 256; dlist = sDlists[(s32)temp]; @@ -176,5 +176,5 @@ void big_smoke_puff_appendGfx(void* effect) { } void func_E0002738(EffectInstance* effect) { - shim_remove_effect(effect); + remove_effect(effect); } diff --git a/src/effects/big_snowflakes.c b/src/effects/big_snowflakes.c index e41e05a99a..ef6219a512 100644 --- a/src/effects/big_snowflakes.c +++ b/src/effects/big_snowflakes.c @@ -27,15 +27,15 @@ void big_snowflakes_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.renderUI = NULL; bp.effectID = EFFECT_BIG_SNOWFLAKES; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = shim_general_heap_malloc(effect->numParts * sizeof(*data)); + data = general_heap_malloc(effect->numParts * sizeof(*data)); effect->data.bigSnowflakes = data; ASSERT(data != NULL); - shim_mem_clear(data, numParts * sizeof(*data)); + mem_clear(data, numParts * sizeof(*data)); data->unk_00 = arg0; data->unk_04 = arg1; data->unk_08 = arg2; @@ -68,7 +68,7 @@ void big_snowflakes_update(EffectInstance* effect) { data->unk_28--; data->unk_2C++; if (data->unk_28 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -82,13 +82,13 @@ void big_snowflakes_update(EffectInstance* effect) { data++; for (i = 1; i < effect->numParts; i++, data++) { - data->unk_10 += (f32) (shim_sin_deg(2.0f * data->unk_18) * 0.2); + data->unk_10 += (f32) (sin_deg(2.0f * data->unk_18) * 0.2); data->unk_14 += -0.05f; data->unk_10 *= 0.92; data->unk_14 += -0.05f; data->unk_1C += func_E0200044(50, unk_28 + (i * 20)) - 25; - data->unk_18 += shim_sin_deg(data->unk_1C) * 10.0f; - data->unk_20 += shim_cos_deg(data->unk_1C * 0.5f) * 10.0f; + data->unk_18 += sin_deg(data->unk_1C) * 10.0f; + data->unk_20 += cos_deg(data->unk_1C * 0.5f) * 10.0f; data->unk_04 += data->unk_10; data->unk_08 += data->unk_14; } @@ -103,7 +103,7 @@ void big_snowflakes_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -119,24 +119,24 @@ void big_snowflakes_appendGfx(void* effect) { gSPDisplayList(gMainGfxPos++, dlist); gDPSetPrimColor(gMainGfxPos++, 0, 0, 20, 100, 20, data->unk_24); - shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); + guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp98); data++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, data++) { Gfx* dlist2 = D_E0060730[i & 1]; // should be able to be i % 2 (ARRAY_COUNT(D_E0060730)) - shim_guTranslateF(sp58, data->unk_04, data->unk_08, data->unk_0C); - shim_guMtxCatF(sp58, sp98, sp18); + guTranslateF(sp58, data->unk_04, data->unk_08, data->unk_0C); + guMtxCatF(sp58, sp98, sp18); if (!(i & 1)) { - shim_guRotateF(sp58, data->unk_18, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, data->unk_20, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, data->unk_18, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, data->unk_20, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); } - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, dlist2); diff --git a/src/effects/blast.c b/src/effects/blast.c index 26162cf843..52b96bbdec 100644 --- a/src/effects/blast.c +++ b/src/effects/blast.c @@ -39,14 +39,14 @@ void blast_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) { bp.renderUI = NULL; bp.effectID = EFFECT_BLAST; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.blast = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.blast = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.blast != NULL); - shim_mem_clear(part, numParts * sizeof(*part)); + mem_clear(part, numParts * sizeof(*part)); part->timeLeft = arg5; part->unk_18 = 0; @@ -72,7 +72,7 @@ void blast_update(EffectInstance* effect) { part->timeLeft--; if (part->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -88,7 +88,7 @@ void blast_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -107,14 +107,14 @@ void blast_appendGfx(void *effect) { gSPDisplayList(gMainGfxPos++, D_09001300_37ECD0); gSPDisplayList(gMainGfxPos++, D_E007C510[unk_20]); - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); - shim_guScaleF(sp18, data->unk_10, data->unk_10, 1.0f); - shim_guMtxCatF(sp18, sp98, sp98); - shim_guRotateF(sp18, data->unk_24, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp18, sp98, sp98); - shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp98); + guScaleF(sp18, data->unk_10, data->unk_10, 1.0f); + guMtxCatF(sp18, sp98, sp98); + guRotateF(sp18, data->unk_24, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp18, sp98, sp98); + guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/bombette_breaking.c b/src/effects/bombette_breaking.c index b6d9531c92..f3d1bb3ba0 100644 --- a/src/effects/bombette_breaking.c +++ b/src/effects/bombette_breaking.c @@ -70,9 +70,9 @@ EffectInstance* bombette_breaking_main(s32 type, s32 modelID, s32 treeIndex, f32 f40 *= 0.5; numParts = (xParts * yParts * zParts) + 1; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - effect->data.bombetteBreaking = data = shim_general_heap_malloc(numParts * sizeof(*data)); + effect->data.bombetteBreaking = data = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); data->unk_04 = -sizeY * 0.5; @@ -152,7 +152,7 @@ void bombette_breaking_update(EffectInstance* effect) { data->timeLeft--; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -198,7 +198,7 @@ void bombette_breaking_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -218,17 +218,17 @@ void bombette_breaking_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp20, data->center.x, data->center.y, data->center.z); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, data->center.x, data->center.y, data->center.z); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - shim_mdl_draw_hidden_panel_surface(&gMainGfxPos, data->treeIndex); + mdl_draw_hidden_panel_surface(&gMainGfxPos, data->treeIndex); data++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, data++) { - shim_guPositionF(sp20, timeLeft + (130 * i), timeLeft - (40 * i), timeLeft + (80 * i), unk_40, + guPositionF(sp20, timeLeft + (130 * i), timeLeft - (40 * i), timeLeft + (80 * i), unk_40, data->unk_14.x, data->unk_14.y, data->unk_14.z); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E0084E1C[type]); @@ -241,9 +241,9 @@ void bombette_breaking_appendGfx(void* effect) { data++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, data++) { gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, (data->alpha * mainAlpha) / 255); - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, unk_38, + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, unk_38, data->center.x, data->center.y, data->center.z); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, sp60); diff --git a/src/effects/breaking_junk.c b/src/effects/breaking_junk.c index fd582453fb..111b4d2460 100644 --- a/src/effects/breaking_junk.c +++ b/src/effects/breaking_junk.c @@ -32,10 +32,10 @@ EffectInstance* breaking_junk_main(s32 arg0, f32 x, f32 y, f32 z, f32 scale, s32 bp.renderUI = NULL; bp.effectID = EFFECT_BREAKING_JUNK; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - data = effect->data.breakingJunk = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.breakingJunk = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.breakingJunk != NULL); @@ -52,12 +52,12 @@ EffectInstance* breaking_junk_main(s32 arg0, f32 x, f32 y, f32 z, f32 scale, s32 data->pos.x = x; data->pos.y = y; data->pos.z = z; - data->vel.x = (shim_rand_int(10) - 5) * 0.5; - data->vel.y = (shim_rand_int(5) + 1) * 0.8; - data->vel.z = (shim_rand_int(10) - 5) * 0.5; + data->vel.x = (rand_int(10) - 5) * 0.5; + data->vel.y = (rand_int(5) + 1) * 0.8; + data->vel.z = (rand_int(10) - 5) * 0.5; data->scale = scale; - data->primR = data->envR = shim_rand_int(255); - g = shim_rand_int(255 - data->envR); + data->primR = data->envR = rand_int(255); + g = rand_int(255 - data->envR); data->primG = data->envG = g; data->primB = data->envB = (255 - g) - data->envR; data->primR += 168; @@ -75,7 +75,7 @@ EffectInstance* breaking_junk_main(s32 arg0, f32 x, f32 y, f32 z, f32 scale, s32 data->envR = data->envR * 0.6; data->envG = data->envG * 0.6; data->envB = data->envB * 0.6; - data->rot = shim_rand_int(359); + data->rot = rand_int(359); } return effect; } @@ -97,7 +97,7 @@ void breaking_junk_update(EffectInstance* effect) { data->lifeTime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -127,7 +127,7 @@ void breaking_junk_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -142,10 +142,10 @@ void breaking_junk_appendGfx(void* effect) { gSPDisplayList(gMainGfxPos++, D_E01187C0[0]); for (i = 0; i < ((EffectInstance*)effect)->numParts; i++, data++) { - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->scale * 0.5, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(sp60, data->rot, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->scale * 0.5, data->pos.x, data->pos.y, data->pos.z); + guRotateF(sp60, data->rot, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primR, data->primG, data->primB, alpha); gDPSetEnvColor(gMainGfxPos++, data->envR, data->envG, data->envB, data->envA); diff --git a/src/effects/bulb_glow.c b/src/effects/bulb_glow.c index 28d7d4bf8b..f047e12115 100644 --- a/src/effects/bulb_glow.c +++ b/src/effects/bulb_glow.c @@ -60,9 +60,9 @@ void bulb_glow_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, EffectInst bp.renderUI = NULL; bp.effectID = EFFECT_BULB_GLOW; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.bulbGlow = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.bulbGlow = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.bulbGlow != NULL); data->unk_00 = arg0 & 255; @@ -83,7 +83,7 @@ void bulb_glow_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, EffectInst D_E00789A8 = 0; } - data->unk_20 = shim_rand_int(7); + data->unk_20 = rand_int(7); *outEffect = effect; } @@ -105,7 +105,7 @@ void bulb_glow_update(EffectInstance* effect) { data->unk_14--; } if (data->unk_14 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -144,7 +144,7 @@ void bulb_glow_render(EffectInstance* effect) { renderTaskPtr->renderMode = RENDER_MODE_2D; } - retTask = shim_queue_render_task(renderTaskPtr); + retTask = queue_render_task(renderTaskPtr); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -189,7 +189,7 @@ void bulb_glow_appendGfx(void* effect) { glowExtent = temp_s1->unk_10; rectHeight = temp_s1->unk_14; - isPointVisible = shim_is_point_visible(data->pos.x, data->pos.y, data->pos.z, data->unk_1C, ¢erX, ¢erY); + isPointVisible = is_point_visible(data->pos.x, data->pos.y, data->pos.z, data->unk_1C, ¢erX, ¢erY); if (temp_s2 == 5) { isPointVisible = TRUE; diff --git a/src/effects/butterflies.c b/src/effects/butterflies.c index 1a666dfa88..394ddea281 100644 --- a/src/effects/butterflies.c +++ b/src/effects/butterflies.c @@ -43,9 +43,9 @@ EffectInstance* butterflies_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.renderUI = NULL; bp.effectID = EFFECT_BUTTERFLIES; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.butterflies = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.butterflies = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.butterflies != NULL); part->unk_04 = 1000; @@ -93,7 +93,7 @@ void butterflies_update(EffectInstance* effect) { } temp_s0->unk_08 += 1; if (temp_s0->unk_04 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } if (temp_s0->unk_04 < 0x10) { @@ -104,11 +104,11 @@ void butterflies_update(EffectInstance* effect) { if (temp_s0->unk_30 <= 0) { s32 t; - temp_f20 = shim_rand_int(359); - temp_f24 = temp_s0->unk_18 + (temp_s0->unk_34 * shim_sin_deg(temp_f20)); - temp_f22 = temp_s0->unk_1C + shim_rand_int(temp_s0->unk_38); - temp_f20_2 = temp_s0->unk_20 + (temp_s0->unk_34 * shim_cos_deg(temp_f20)); - t = shim_rand_int(100) + 10; + temp_f20 = rand_int(359); + temp_f24 = temp_s0->unk_18 + (temp_s0->unk_34 * sin_deg(temp_f20)); + temp_f22 = temp_s0->unk_1C + rand_int(temp_s0->unk_38); + temp_f20_2 = temp_s0->unk_20 + (temp_s0->unk_34 * cos_deg(temp_f20)); + t = rand_int(100) + 10; temp_f4 = temp_s0->unk_0C; temp_f6 = temp_s0->unk_10; temp_f8 = temp_s0->unk_14; @@ -128,7 +128,7 @@ void butterflies_update(EffectInstance* effect) { } var_f12 = SQ(var_f24) + SQ(var_f22) + SQ(var_f20); if (var_f12 != 0.0f) { - var_f12 = 1.0f / shim_sqrtf(var_f12); + var_f12 = 1.0f / sqrtf(var_f12); } var_f24 *= var_f12; var_f22 *= var_f12; @@ -136,7 +136,7 @@ void butterflies_update(EffectInstance* effect) { temp_s0->unk_3C = var_f24; temp_s0->unk_40 = var_f22; temp_s0->unk_44 = var_f20; - temp_s0->unk_28 = shim_atan2(0.0f, 0.0f, -temp_s0->unk_3C, temp_s0->unk_44); + temp_s0->unk_28 = atan2(0.0f, 0.0f, -temp_s0->unk_3C, temp_s0->unk_44); } temp_s0->unk_2C += 3; if (temp_s0->unk_2C >= 30) { @@ -156,7 +156,7 @@ void butterflies_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -173,12 +173,12 @@ void butterflies_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); - shim_guTranslateF(sp18, data->unk_0C, data->unk_10 + D_E00AA6EC[data->unk_2C] * 0.3f, data->unk_14); - shim_guRotateF(sp58, data->unk_28, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, 0.02f, 0.02f, 0.02f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->unk_0C, data->unk_10 + D_E00AA6EC[data->unk_2C] * 0.3f, data->unk_14); + guRotateF(sp58, data->unk_28, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, 0.02f, 0.02f, 0.02f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, primColor, primColor, primColor, 255); diff --git a/src/effects/chapter_change.c b/src/effects/chapter_change.c index d86740acf5..a99c5b2133 100644 --- a/src/effects/chapter_change.c +++ b/src/effects/chapter_change.c @@ -105,8 +105,6 @@ void chapter_change_init(EffectInstance* effect); void chapter_change_update(EffectInstance* effect); void chapter_change_render(EffectInstance* effect); void chapter_change_appendGfx(void* effect); -void shim_draw_msg(s32, s32, s32, s32, s32, s32); -s32 shim_get_msg_width(s32, u16); void func_E010E000(ChapterChangeFXData* data, s32 arg1, UnkStruct* arg2) { s32 unk_1C = data->lifetime; @@ -154,9 +152,9 @@ EffectInstance* chapter_change_main(s32 arg0, f32 posX, f32 posY, f32 arg3, f32 bp.renderUI = NULL; bp.effectID = EFFECT_CHAPTER_CHANGE; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.chapterChange = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.chapterChange = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.chapterChange != NULL); data->unk_00 = arg0; @@ -186,7 +184,7 @@ EffectInstance* chapter_change_main(s32 arg0, f32 posX, f32 posY, f32 arg3, f32 if (data->unk_54 >= 0) { data->unk_40 = 160; data->unk_44 = 160; - data->unk_48 = shim_get_msg_width(data->unk_54, 0); + data->unk_48 = get_msg_width(data->unk_54, 0); data->unk_4C = 24; } @@ -211,7 +209,7 @@ void chapter_change_update(EffectInstance* effect) { data->lifetime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); } } @@ -224,7 +222,7 @@ void chapter_change_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -287,7 +285,7 @@ void chapter_change_appendGfx(void* effect) { func_E010E000(data, 1, ptr1); if (data->unk_54 >= 0) { - shim_draw_msg(data->unk_54, data->unk_40 - data->unk_48, data->unk_44, 255, 21, 0); + draw_msg(data->unk_54, data->unk_40 - data->unk_48, data->unk_44, 255, 21, 0); } gDPPipeSync(gMainGfxPos++); diff --git a/src/effects/chomp_drop.c b/src/effects/chomp_drop.c index 8ed7982988..7ccbe0dec3 100644 --- a/src/effects/chomp_drop.c +++ b/src/effects/chomp_drop.c @@ -25,9 +25,9 @@ EffectInstance* chomp_drop_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4 bp.renderUI = NULL; bp.effectID = EFFECT_CHOMP_DROP; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.chompDrop = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.chompDrop = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.chompDrop != NULL); data->unk_00 = arg0; @@ -40,7 +40,7 @@ EffectInstance* chomp_drop_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4 data->unk_18 = arg6; data->unk_34 = 1.0f; data->unk_20 = arg7; - data->unk_38 = shim_rand_int(0x168); + data->unk_38 = rand_int(0x168); data->unk_40 = arg9; data->unk_44 = 0; data->unk_3C = arg5; @@ -61,7 +61,7 @@ void chomp_drop_update(EffectInstance* effect) { data->unk_40--; data->unk_44++; if (data->unk_40 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -96,7 +96,7 @@ void chomp_drop_update(EffectInstance* effect) { data->unk_08 += data->unk_10; if (data->unk_08 < 0.0f) { data->unk_08 = 0.0f; - shim_load_effect(EFFECT_DUST); + load_effect(EFFECT_DUST); dust_main(2, data->unk_04 + 5.0f, data->unk_08, data->unk_0C, 30); dust_main(2, data->unk_04 - 5.0f, data->unk_08, data->unk_0C, 30); data->unk_2C = 4; @@ -127,7 +127,7 @@ void chomp_drop_render(EffectInstance* effect) { renderTask.distance = -10; renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -146,17 +146,17 @@ void chomp_drop_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effectTemp)->graphics->data)); - shim_guScaleF(sp20, 0.01f, 0.01f, 0.01f); - shim_guPositionF(sp60, 0.0f, 0.0f, 0.0f, data->unk_24, data->unk_04 * 100.0f, data->unk_08 * 100.0f, data->unk_0C * 100.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(sp20, 0.01f, 0.01f, 0.01f); + guPositionF(sp60, 0.0f, 0.0f, 0.0f, data->unk_24, data->unk_04 * 100.0f, data->unk_08 * 100.0f, data->unk_0C * 100.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor( gMainGfxPos++, 0, 0, - (shim_sin_deg(temp_s6 * 30) * 25.0f) + 225.0f, - (shim_sin_deg(temp_s6 * 30) * 25.0f) + 225.0f, + (sin_deg(temp_s6 * 30) * 25.0f) + 225.0f, + (sin_deg(temp_s6 * 30) * 25.0f) + 225.0f, 255, primA ); @@ -181,8 +181,8 @@ void chomp_drop_appendGfx(void* effect) { for (i = 0; i < 16; i++) { Vtx_t* vtx = &vtxTemp[i * 2]; - s32 temp_s1 = shim_sin_deg(((temp_s6 * 10) + (i * 60)) + temp_s7) * 500.0f * temp_f22; - s32 temp_v0_3 = (i * 400) + (s32) (shim_sin_deg(((temp_s6 * 10) + (i * 6)) + temp_s7) * 200.0f * temp_f22); + s32 temp_s1 = sin_deg(((temp_s6 * 10) + (i * 60)) + temp_s7) * 500.0f * temp_f22; + s32 temp_v0_3 = (i * 400) + (s32) (sin_deg(((temp_s6 * 10) + (i * 6)) + temp_s7) * 200.0f * temp_f22); vtx->ob[0] = temp_s1 - 3200; vtx->ob[1] = temp_v0_3; diff --git a/src/effects/cloud_puff.c b/src/effects/cloud_puff.c index 0e6d8e9a5a..5c4b681782 100644 --- a/src/effects/cloud_puff.c +++ b/src/effects/cloud_puff.c @@ -24,13 +24,13 @@ void cloud_puff_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.renderUI = NULL; bp.effectID = EFFECT_CLOUD_PUFF; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = shim_general_heap_malloc(numParts * sizeof(*part)); + part = general_heap_malloc(numParts * sizeof(*part)); effect->data.cloudPuff = part; ASSERT(effect->data.cloudPuff != NULL); - shim_mem_clear(part, numParts * sizeof(*part)); + mem_clear(part, numParts * sizeof(*part)); for (i = 0; i < numParts; i++, part++) { part->alive = TRUE; @@ -42,17 +42,17 @@ void cloud_puff_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { part->unk_1C = 1.0f; part->unk_20 = 1.0f; part->alpha = 255; - part->unk_24 = (shim_rand_int(10) * 0.03) + 1.0; - part->unk_28 = (shim_rand_int(10) * 0.03) + 1.7; + part->unk_24 = (rand_int(10) * 0.03) + 1.0; + part->unk_28 = (rand_int(10) * 0.03) + 1.7; part->unk_2C = effect_rand_int(60); part->timeLeft = 30; part->unk_34 = 0.5f; part->unk_38 = -0.02f; part->unk_3C = 0.00005f; part->unk_30 = -3.9f; - temp_f20 = shim_clamp_angle(arg3 + i * 45); - part->unk_44 = shim_sin_deg(temp_f20); - part->unk_48 = shim_cos_deg(temp_f20); + temp_f20 = clamp_angle(arg3 + i * 45); + part->unk_44 = sin_deg(temp_f20); + part->unk_48 = cos_deg(temp_f20); } } @@ -71,9 +71,9 @@ void cloud_puff_update(EffectInstance* effect) { part->alive = FALSE; } else { cond = TRUE; - part->unk_2C = shim_clamp_angle(part->unk_2C + 12.0f); - part->unk_18 = part->unk_24 + shim_sin_deg(part->unk_2C) * 0.1; - part->unk_1C = part->unk_28 + shim_cos_deg(part->unk_2C) * 0.1; + part->unk_2C = clamp_angle(part->unk_2C + 12.0f); + part->unk_18 = part->unk_24 + sin_deg(part->unk_2C) * 0.1; + part->unk_1C = part->unk_28 + cos_deg(part->unk_2C) * 0.1; part->unk_30 *= 0.83; part->unk_0C += part->unk_30 * part->unk_44; part->unk_14 += part->unk_30 * part->unk_48; @@ -95,7 +95,7 @@ void cloud_puff_update(EffectInstance* effect) { } if (!cond) { - shim_remove_effect(effect); + remove_effect(effect); } } @@ -108,7 +108,7 @@ void cloud_puff_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -125,11 +125,11 @@ void cloud_puff_appendGfx(void* effect) { for (i = 0; i < effectTemp->numParts; i++, part++) { if (part->alive) { - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, part->unk_0C, part->unk_10, part->unk_14); - shim_guScaleF(sp60, part->unk_18, part->unk_1C, part->unk_20); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(sp60, part->unk_18, part->unk_1C, part->unk_20); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gDPSetPrimColor(gMainGfxPos++, 0, 0, 112, 96, 24, part->alpha); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], diff --git a/src/effects/cloud_trail.c b/src/effects/cloud_trail.c index 0954163808..ab349343e3 100644 --- a/src/effects/cloud_trail.c +++ b/src/effects/cloud_trail.c @@ -23,14 +23,14 @@ void cloud_trail_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.renderUI = NULL; bp.effectID = EFFECT_CLOUD_TRAIL; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = 1; - part = shim_general_heap_malloc(numParts * sizeof(*part)); + part = general_heap_malloc(numParts * sizeof(*part)); effect->data.cloudTrail = part; ASSERT(effect->data.cloudTrail != NULL); - shim_mem_clear(part, numParts * sizeof(*part)); + mem_clear(part, numParts * sizeof(*part)); for (i = 0; i < numParts; i++, part++) { part->alive = 1; @@ -44,8 +44,8 @@ void cloud_trail_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { part->unk_20 = 1.0f; part->unk_24 = 1.0f; part->alpha = -1; - part->unk_28 = (shim_rand_int(10) * 0.03) + 1.4; - part->unk_2C = (shim_rand_int(10) * 0.03) + 1.5; + part->unk_28 = (rand_int(10) * 0.03) + 1.4; + part->unk_2C = (rand_int(10) * 0.03) + 1.5; part->unk_30 = effect_rand_int(60); part->unk_04 = arg0; part->lifetime = 15; @@ -71,9 +71,9 @@ void cloud_trail_update(EffectInstance* effect) { part->alive = FALSE; } else { cond = TRUE; - part->unk_30 = shim_clamp_angle(part->unk_30 + 12.0f); - part->unk_1C = part->unk_28 + shim_sin_deg(part->unk_30) * 0.1; - part->unk_20 = part->unk_2C + shim_cos_deg(part->unk_30) * 0.1; + part->unk_30 = clamp_angle(part->unk_30 + 12.0f); + part->unk_1C = part->unk_28 + sin_deg(part->unk_30) * 0.1; + part->unk_20 = part->unk_2C + cos_deg(part->unk_30) * 0.1; if (part->unk_04 == 0 && (part->lifetime == 5 && gPlayerStatus.actionState == ACTION_STATE_IDLE)) { part->lifetime++; @@ -96,7 +96,7 @@ void cloud_trail_update(EffectInstance* effect) { } if (!cond) { - shim_remove_effect(effect); + remove_effect(effect); } } @@ -109,7 +109,7 @@ void cloud_trail_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -126,13 +126,13 @@ void cloud_trail_appendGfx(void* effect) { for (i = 0; i < effectTemp->numParts; i++, part++) { if (part->alive) { - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, part->unk_0C, part->unk_10, part->unk_14); - shim_guScaleF(sp60, part->unk_1C, part->unk_20, part->unk_24); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guRotateF(sp60, part->unk_18, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(sp60, part->unk_1C, part->unk_20, part->unk_24); + guMtxCatF(sp60, sp20, sp20); + guRotateF(sp60, part->unk_18, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gDPSetPrimColor(gMainGfxPos++, 0, 0, 112, 96, 24, part->alpha); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], diff --git a/src/effects/cold_breath.c b/src/effects/cold_breath.c index 997d2eb13f..5b9ae7632b 100644 --- a/src/effects/cold_breath.c +++ b/src/effects/cold_breath.c @@ -89,9 +89,9 @@ EffectInstance* cold_breath_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg bp.renderUI = NULL; bp.effectID = EFFECT_COLD_BREATH; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.coldBreath = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.coldBreath = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.coldBreath != NULL); data->unk_00 = arg0; @@ -138,7 +138,7 @@ void cold_breath_update(EffectInstance* effect) { data->unk_14++; if (data->unk_10 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } if (data->unk_10 < 16) { @@ -172,7 +172,7 @@ void cold_breath_render(EffectInstance* effect) { renderTask.distance = 6; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -196,10 +196,10 @@ void cold_breath_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp20, data->unk_04, data->unk_08, data->unk_0C); - shim_guScaleF(sp60, data->unk_40, data->unk_40, data->unk_40); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, data->unk_04, data->unk_08, data->unk_0C); + guScaleF(sp60, data->unk_40, data->unk_40, data->unk_40); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -212,8 +212,8 @@ void cold_breath_appendGfx(void* effect) { temp2 = D_E00DE8B4[unkIndex]; temp3 = D_E00DE858[unkIndex]; - shim_guPositionF(sp20, 0.0f, 0.0f, -temp1, temp2 * 0.01f, temp3, 0.0f, 0.0f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, 0.0f, -temp1, temp2 * 0.01f, temp3, 0.0f, 0.0f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); temp_f32 = D_E00DE910[unkIndex] * 5.0f / 256.0f; diff --git a/src/effects/confetti.c b/src/effects/confetti.c index 38421d73ab..50da8aaaa5 100644 --- a/src/effects/confetti.c +++ b/src/effects/confetti.c @@ -35,12 +35,12 @@ u8 D_E0088D00[] = { 0, 1, 2, 3, 2, 1, 0, 0 }; u8 D_E0088D08[] = { 0, 45, 0, 60 }; void func_E0088000(ConfettiFXData* part) { - part->unk_04 = shim_rand_int(700) * 0.1f - 35.0f; + part->unk_04 = rand_int(700) * 0.1f - 35.0f; part->unk_08 = 0; - part->unk_0C = shim_rand_int(300) * 0.1f - 15.0f; - part->unk_10 = (part->unk_04 + shim_rand_int(100) * 0.1f - 5.0f) * 0.03; - part->unk_14 = -1.7 - shim_rand_int(800) * 0.1f * 0.01; - part->unk_18 = (shim_rand_int(200) * 0.1f - 10.0f) * 0.05; + part->unk_0C = rand_int(300) * 0.1f - 15.0f; + part->unk_10 = (part->unk_04 + rand_int(100) * 0.1f - 5.0f) * 0.03; + part->unk_14 = -1.7 - rand_int(800) * 0.1f * 0.01; + part->unk_18 = (rand_int(200) * 0.1f - 10.0f) * 0.05; part->unk_20 = 120; } @@ -108,9 +108,9 @@ EffectInstance* confetti_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_CONFETTI; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - data = effect->data.confetti = (ConfettiFXData*)shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.confetti = (ConfettiFXData*)general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.confetti != NULL); data->unk_04 = arg1; @@ -123,7 +123,7 @@ EffectInstance* confetti_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, data->unk_28 = 255; data++; - temp_fp = shim_rand_int(360); + temp_fp = rand_int(360); for (i = 0; i < np; i++, data++) { temp_f30 = sp28 * (effect_rand_int(100) * 0.01f); @@ -147,10 +147,10 @@ EffectInstance* confetti_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, data->unk_00 = arg0; - sinTheta = shim_sin_deg(theta); - cosTheta = shim_cos_deg(theta); - sinTheta2 = shim_sin_deg(theta2); - cosTheta2 = shim_cos_deg(theta2); + sinTheta = sin_deg(theta); + cosTheta = cos_deg(theta); + sinTheta2 = sin_deg(theta2); + cosTheta2 = cos_deg(theta2); if (arg0 == 3) { func_E0088000(data); data->unk_30 = i * 3; @@ -184,7 +184,7 @@ void confetti_update(EffectInstance* effect) { part->unk_20--; if (part->unk_20 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -241,7 +241,7 @@ void confetti_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void confetti_appendGfx(void* effect) { @@ -270,10 +270,10 @@ void confetti_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, D_09000940_38C4E0); - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); savedGfxPos = gMainGfxPos++; @@ -283,8 +283,8 @@ void confetti_appendGfx(void* effect) { color = &D_E0088CDC[i % 12]; if (part->unk_30 <= 0) { - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gDPSetPrimColor(gMainGfxPos++, 0, 0, color->r, color->g, color->b, unk_28); diff --git a/src/effects/damage_indicator.c b/src/effects/damage_indicator.c index 6b59c3e6ea..b4f19d74ff 100644 --- a/src/effects/damage_indicator.c +++ b/src/effects/damage_indicator.c @@ -94,10 +94,10 @@ void damage_indicator_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 starsRadi bp.unk_00 = 0; bp.effectID = EFFECT_DAMAGE_INDICATOR; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = damageAmt; - effect->data.damageIndicator = part = shim_general_heap_malloc(damageAmt * sizeof(*part)); + effect->data.damageIndicator = part = general_heap_malloc(damageAmt * sizeof(*part)); ASSERT(effect->data.damageIndicator != NULL); part->unk_00 = arg0; @@ -119,8 +119,8 @@ void damage_indicator_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 starsRadi part->curPos.z = part->basePos.z; angle = starsAngle + (((s32) ((((i % 2) * 2) - 1) * i) / 2) * (30.0f - damageAmt)); part->scale = 0.2f; - part->relPos.x = -shim_sin_deg(angle) * starsRadius * 1.5; - part->relPos.y = shim_cos_deg(angle) * starsRadius * 1.5; + part->relPos.x = -sin_deg(angle) * starsRadius * 1.5; + part->relPos.y = cos_deg(angle) * starsRadius * 1.5; part->relPos.z = 0; part->alpha = 255; } @@ -147,7 +147,7 @@ void damage_indicator_update(EffectInstance* effect) { timeLeft = part->timeLeft; if (timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -204,10 +204,10 @@ void damage_indicator_render_impl(EffectInstance* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); - shim_guTranslateF(mtxTransform, part->basePos.x, part->basePos.y, part->basePos.z); - shim_guRotateF(mtxTemp, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtxTransform, part->basePos.x, part->basePos.y, part->basePos.z); + guRotateF(mtxTemp, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -230,18 +230,18 @@ void damage_indicator_render_impl(EffectInstance* effect) { gSPDisplayList(gMainGfxPos++, D_09001D40_351F60); if (i == lastPartIdx) { - shim_guPositionF(mtxTransform, 0.0f, 0.0f, 0.0f, part->scale, part->curPos.x, part->curPos.y, part->curPos.z); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(mtxTransform, 0.0f, 0.0f, 0.0f, part->scale, part->curPos.x, part->curPos.y, part->curPos.z); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09002150_352370); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); - shim_guPositionF(mtxTransform, 0.0f, 0.0f, 0.0f, part->scale, + guPositionF(mtxTransform, 0.0f, 0.0f, 0.0f, part->scale, (part->curPos.x + part->basePos.x) * 0.5, (part->curPos.y + part->basePos.y) * 0.5, (part->curPos.z + part->basePos.z) * 0.5); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09002160_352380); @@ -250,13 +250,13 @@ void damage_indicator_render_impl(EffectInstance* effect) { gSPDisplayList(gMainGfxPos++, D_09001D40_351F60); - shim_guTranslateF(mtxTransform, part->basePos.x, part->basePos.y, part->basePos.z); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtxTransform, part->basePos.x, part->basePos.y, part->basePos.z); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - shim_guScaleF(mtxTransform, part->scale, part->scale, 1.0f); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(mtxTransform, part->scale, part->scale, 1.0f); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/damage_stars.c b/src/effects/damage_stars.c index 9af223b5e2..9269412e1e 100644 --- a/src/effects/damage_stars.c +++ b/src/effects/damage_stars.c @@ -52,7 +52,7 @@ void damage_stars_main( if (arg7 != 0) { temp_f12 = SQ(arg4) + SQ(arg5) + SQ(arg6); if (temp_f12 != 0.0f) { - temp_f12 = -1.0f / shim_sqrtf(temp_f12); + temp_f12 = -1.0f / sqrtf(temp_f12); arg4 *= temp_f12; arg5 *= temp_f12; @@ -74,7 +74,7 @@ void damage_stars_main( temp_f12 = SQ(var_f30) + SQ(sp70) + SQ(var_f28); if (temp_f12 != 0) { - temp_f12 = 1.0f / shim_sqrtf(temp_f12); + temp_f12 = 1.0f / sqrtf(temp_f12); var_f30 *= temp_f12; sp70 *= temp_f12; @@ -94,9 +94,9 @@ void damage_stars_main( bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_DAMAGE_STARS; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = arg7; - part = effect->data.damageStars = shim_general_heap_malloc(arg7 * sizeof(*part)); + part = effect->data.damageStars = general_heap_malloc(arg7 * sizeof(*part)); ASSERT(effect->data.damageStars != NULL); for (i = 0; i < arg7; i++, part++) { @@ -109,15 +109,15 @@ void damage_stars_main( case 0: case 1: case 2: - shim_guRotateF(sp30, (i * 360) / (arg7 - 1), arg4, arg5, arg6); + guRotateF(sp30, (i * 360) / (arg7 - 1), arg4, arg5, arg6); part->unk_10 = arg4 + sp30[0][0] * var_f30 + sp30[1][0] * sp70 + sp30[2][0] * var_f28; part->unk_14 = arg5 + sp30[0][1] * var_f30 + sp30[1][1] * sp70 + sp30[2][1] * var_f28; part->unk_18 = arg6 + sp30[0][2] * var_f30 + sp30[1][2] * sp70 + sp30[2][2] * var_f28; break; case 3: - rotateX = shim_sin_deg(gCameras[gCurrentCameraID].currentYaw); - rotateZ = -shim_cos_deg(gCameras[gCurrentCameraID].currentYaw); - shim_guRotateF(sp30, + rotateX = sin_deg(gCameras[gCurrentCameraID].currentYaw); + rotateZ = -cos_deg(gCameras[gCurrentCameraID].currentYaw); + guRotateF(sp30, (arg7 != 1) ? (i * 100) / (arg7 - 1) - 50 : 0.0f, rotateX, 0.0f, rotateZ); part->unk_10 = sp30[0][0] * arg4 + sp30[1][0] * arg5 + sp30[2][0] * arg6; @@ -125,9 +125,9 @@ void damage_stars_main( part->unk_18 = sp30[0][2] * arg4 + sp30[1][2] * arg5 + sp30[2][2] * arg6; break; case 4: - rotateX = shim_sin_deg(gCameras[gCurrentCameraID].currentYaw); - rotateZ = -shim_cos_deg(gCameras[gCurrentCameraID].currentYaw); - shim_guRotateF(sp30, (i * 360.0f) / (arg7 - 1), rotateX, 0.0f, rotateZ); + rotateX = sin_deg(gCameras[gCurrentCameraID].currentYaw); + rotateZ = -cos_deg(gCameras[gCurrentCameraID].currentYaw); + guRotateF(sp30, (i * 360.0f) / (arg7 - 1), rotateX, 0.0f, rotateZ); part->unk_10 = sp30[0][0] * arg4 + sp30[1][0] * arg5 + sp30[2][0] * arg6; part->unk_14 = sp30[0][1] * arg4 + sp30[1][1] * arg5 + sp30[2][1] * arg6; part->unk_18 = sp30[0][2] * arg4 + sp30[1][2] * arg5 + sp30[2][2] * arg6; @@ -184,7 +184,7 @@ void damage_stars_update(EffectInstance* effect) { part->unk_2C++; if (part->unk_28 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -193,7 +193,7 @@ void damage_stars_update(EffectInstance* effect) { for (i = 0; i < effect->numParts; i++, part++) { if (part->unk_00 == 2) { - part->unk_14 = shim_cos_deg(unk_2C * 6) * 4.0f; + part->unk_14 = cos_deg(unk_2C * 6) * 4.0f; part->unk_10 *= 0.94; part->unk_18 *= 0.94; if (part->unk_14 < 0.0f) { @@ -235,7 +235,7 @@ void damage_stars_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -259,15 +259,15 @@ void damage_stars_appendGfx(void* effect) { s32 bIdx = baseIdx + 2 + i * 3; gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E0030E90[rIdx % 36], D_E0030E90[gIdx % 36], D_E0030E90[bIdx % 36], part->unk_24); - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - shim_guRotateF(sp18, part->unk_1C, 0.0f, 0.0f, 1.0f); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, part->unk_1C, 0.0f, 0.0f, 1.0f); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_090005E0_343620); diff --git a/src/effects/debuff.c b/src/effects/debuff.c index 1f73ace4f6..35341bca66 100644 --- a/src/effects/debuff.c +++ b/src/effects/debuff.c @@ -26,14 +26,14 @@ EffectInstance* debuff_main(s32 type, f32 x, f32 y, f32 z) { bp.renderUI = NULL; bp.effectID = EFFECT_DEBUFF; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - effect->data.debuff = data = shim_general_heap_malloc(numParts * sizeof(*data)); + effect->data.debuff = data = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); - shim_mem_clear(data, numParts * sizeof(*data)); + mem_clear(data, numParts * sizeof(*data)); data->timeLeft = 30; data->lifetime = 0; @@ -64,8 +64,8 @@ EffectInstance* debuff_main(s32 type, f32 x, f32 y, f32 z) { s32 angle = ((i - 1) * 360) / (numParts - 1); f32 temp2 = 1.0f; - data->pos.x = shim_cos_deg(angle + 90.0f); - data->pos.y = shim_sin_deg(angle + 90.0f); + data->pos.x = cos_deg(angle + 90.0f); + data->pos.y = sin_deg(angle + 90.0f); data->pos.z = 0.0f; data->unk_10 = 0.0f; data->unk_14 = 0.0f; @@ -90,7 +90,7 @@ void debuff_update(EffectInstance* effect) { data->lifetime++; data->timeLeft--; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -112,8 +112,8 @@ void debuff_update(EffectInstance* effect) { data->scaleX += (1.0f - data->scaleX) * 0.1; data->unk_30 += ((10.0f - data->unk_30) * 0.05) * 0.6; } - data->pos.x = shim_cos_deg(data->rotZ + 90.0f) * data->unk_30; - data->pos.y = shim_sin_deg(data->rotZ + 90.0f) * data->unk_30; + data->pos.x = cos_deg(data->rotZ + 90.0f) * data->unk_30; + data->pos.y = sin_deg(data->rotZ + 90.0f) * data->unk_30; } } @@ -126,7 +126,7 @@ void debuff_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -144,10 +144,10 @@ void debuff_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(eff->graphics->data)); gSPDisplayList(gMainGfxPos++, dlist2); - shim_guTranslateF(mtxTranslate, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(mtxRotate, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(mtxRotate, mtxTranslate, mtxTransform); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtxTranslate, data->pos.x, data->pos.y, data->pos.z); + guRotateF(mtxRotate, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxRotate, mtxTranslate, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -156,12 +156,12 @@ void debuff_appendGfx(void* effect) { data++; for (i = 1; i < eff->numParts; i++, data++) { - shim_guTranslateF(mtxTranslate, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(mtxRotate, data->rotZ, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(mtxRotate, mtxTranslate, mtxTranslate); - shim_guScaleF(mtxRotate, data->scaleX, data->scaleY, 1.0f); - shim_guMtxCatF(mtxRotate, mtxTranslate, mtxTranslate); - shim_guMtxF2L(mtxTranslate, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtxTranslate, data->pos.x, data->pos.y, data->pos.z); + guRotateF(mtxRotate, data->rotZ, 0.0f, 0.0f, 1.0f); + guMtxCatF(mtxRotate, mtxTranslate, mtxTranslate); + guScaleF(mtxRotate, data->scaleX, data->scaleY, 1.0f); + guMtxCatF(mtxRotate, mtxTranslate, mtxTranslate); + guMtxF2L(mtxTranslate, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/disable_x.c b/src/effects/disable_x.c index fce0a2b090..b92c9332f0 100644 --- a/src/effects/disable_x.c +++ b/src/effects/disable_x.c @@ -47,9 +47,9 @@ EffectInstance* disable_x_main(s32 type, f32 x, f32 y, f32 z, s32 arg4) { bp.renderUI = func_E0082528; bp.effectID = EFFECT_DISABLE_X; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = shim_general_heap_malloc(numParts * sizeof(*data)); + data = general_heap_malloc(numParts * sizeof(*data)); effect->data.disableX = data; ASSERT(effect->data.disableX != NULL); @@ -121,7 +121,7 @@ void disable_x_update(EffectInstance* effect) { } if (data->unk_28 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -151,10 +151,10 @@ void disable_x_update(EffectInstance* effect) { data[1].unk_28 = 0; data->unk_38++; if (data->pos.y > -500.0f) { - shim_sfx_play_sound_at_position(SOUND_2107, SOUND_SPACE_MODE_0, data->pos.x, data->pos.y, data->pos.z); + sfx_play_sound_at_position(SOUND_2107, SOUND_SPACE_MODE_0, data->pos.x, data->pos.y, data->pos.z); } } else if (unk_3C < unk_38) { - shim_load_effect(EFFECT_DISABLE_X); + load_effect(EFFECT_DISABLE_X); disable_x_main(10, data->pos.x, data->pos.y + data[1].unk_20, data->pos.z, 0); data->unk_38--; } @@ -173,7 +173,7 @@ void disable_x_update(EffectInstance* effect) { data->unk_30 *= unk_34; if (type < 2) { - data->unk_20 = shim_cos_deg(unk_2C * 12) * 4.0f; + data->unk_20 = cos_deg(unk_2C * 12) * 4.0f; } else { data->unk_20 = 0.0f; } @@ -215,11 +215,11 @@ void func_E0082528(EffectInstance* effect) { void func_E0082580(DisableXFXData* data) { Matrix4f sp18, sp58; - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guScaleF(sp58, data->scale, data->scale, 1.0f); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guScaleF(sp58, data->scale, data->scale, 1.0f); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); } @@ -227,14 +227,14 @@ void func_E0082580(DisableXFXData* data) { void func_E00826C4(DisableXFXData* data) { Matrix4f sp18, sp58; - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guScaleF(sp58, data->unk_30, data->unk_30, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, data->unk_40, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guTranslateF(sp58, 0.0f, data->unk_20, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guScaleF(sp58, data->unk_30, data->unk_30, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, data->unk_40, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guTranslateF(sp58, 0.0f, data->unk_20, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/drop_leaves.c b/src/effects/drop_leaves.c index c4cfb8743d..9ee19e6859 100644 --- a/src/effects/drop_leaves.c +++ b/src/effects/drop_leaves.c @@ -23,9 +23,9 @@ void drop_leaves_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { bp.renderUI = NULL; bp.effectID = EFFECT_DROP_LEAVES; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.dropLeaves = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.dropLeaves = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.dropLeaves != NULL); part->unk_00 = arg0; @@ -75,7 +75,7 @@ void drop_leaves_update(EffectInstance *effect) { part->unk_2C++; if (part->unk_28 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -92,22 +92,22 @@ void drop_leaves_update(EffectInstance *effect) { part++; for (i = 1; i < effect->numParts; i++, part++) { - temp = shim_sin_deg(2.0f * part->unk_18) * 0.2; + temp = sin_deg(2.0f * part->unk_18) * 0.2; part->unk_14 += -0.05f; part->unk_10 += temp; if (unk_00 == 0) { part->unk_10 *= 0.94; - part->unk_14 *= shim_sin_deg(part->unk_18) * 0.05 + 0.95; + part->unk_14 *= sin_deg(part->unk_18) * 0.05 + 0.95; } else { part->unk_14 += -0.05f; part->unk_10 *= 0.92; } part->unk_1C += func_E0200044(50, unk_2C + i * 20) - 25; - part->unk_18 += shim_sin_deg(part->unk_1C) * 10.0f; - part->unk_20 += shim_cos_deg(part->unk_1C * 0.5f) * 10.0f; + part->unk_18 += sin_deg(part->unk_1C) * 10.0f; + part->unk_20 += cos_deg(part->unk_1C * 0.5f) * 10.0f; part->unk_04 += part->unk_10; part->unk_08 += part->unk_14; } @@ -122,7 +122,7 @@ void drop_leaves_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -137,19 +137,19 @@ void drop_leaves_appendGfx(void* effect) { gSPDisplayList(gMainGfxPos++, D_09001180_33E790); gDPSetPrimColor(gMainGfxPos++, 0, 0, 20, 100, 20, part->unk_24); - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp98); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { - shim_guTranslateF(sp58, part->unk_04, part->unk_08, part->unk_0C); - shim_guMtxCatF(sp58, sp98, sp18); - shim_guRotateF(sp58, part->unk_18, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, part->unk_20, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp58, part->unk_04, part->unk_08, part->unk_0C); + guMtxCatF(sp58, sp98, sp18); + guRotateF(sp58, part->unk_18, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, part->unk_20, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09001230_33E840); diff --git a/src/effects/dust.c b/src/effects/dust.c index cded1c78d9..451d951c25 100644 --- a/src/effects/dust.c +++ b/src/effects/dust.c @@ -33,9 +33,9 @@ EffectInstance* dust_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { bp.renderUI = NULL; bp.effectID = EFFECT_DUST; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.dust = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.dust = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.dust != NULL); part->unk_00 = arg0; @@ -53,14 +53,14 @@ EffectInstance* dust_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { part++; for (i = 1; i < numParts; i++, part++) { - part->unk_04 = shim_rand_int(200) - 100; - part->unk_08 = shim_rand_int(50); + part->unk_04 = rand_int(200) - 100; + part->unk_08 = rand_int(50); part->unk_0C = 0; part->unk_14 = 0; part->unk_1C = 1.0f; part->unk_20 = 1.0f; part->unk_10 = -1.0f; - part->unk_24 = shim_rand_int(10) / 200; + part->unk_24 = rand_int(10) / 200; switch (arg0) { case 0: part->unk_28 = part->unk_24 * 0.1; @@ -72,8 +72,8 @@ EffectInstance* dust_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { part->unk_24 = 0.4f; part->unk_28 = 0.4f; part->unk_10 = 0; - part->unk_04 = (shim_rand_int(40) - 20) * 0.1; - part->unk_08 = (shim_rand_int(40) - 20) * 0.1; + part->unk_04 = (rand_int(40) - 20) * 0.1; + part->unk_08 = (rand_int(40) - 20) * 0.1; break; } } @@ -91,7 +91,7 @@ void dust_update(EffectInstance* effect) { part->unk_2C--; if (part->unk_2C < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -121,7 +121,7 @@ void dust_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -139,20 +139,20 @@ void dust_appendGfx(void* effect) { gDPSetPrimColor(gMainGfxPos++, 0, 0, part->unk_30, part->unk_34, part->unk_38, part->unk_18); gDPSetEnvColor(gMainGfxPos++, part->unk_3C, part->unk_40, part->unk_44, 0); - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp98); unk_00 = part->unk_00; part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { matrix = &gDisplayContext->matrixStack[gMatrixListPos++]; - shim_guScaleF(sp18, part->unk_20, part->unk_1C, part->unk_20); - shim_guMtxF2L(sp18, matrix); - shim_guTranslateF(sp58, part->unk_04, part->unk_08, part->unk_0C); - shim_guMtxCatF(sp58, sp98, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(sp18, part->unk_20, part->unk_1C, part->unk_20); + guMtxF2L(sp18, matrix); + guTranslateF(sp58, part->unk_04, part->unk_08, part->unk_0C); + guMtxCatF(sp58, sp98, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, matrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/effect_3D.c b/src/effects/effect_3D.c index c1048e6159..1191c6c294 100644 --- a/src/effects/effect_3D.c +++ b/src/effects/effect_3D.c @@ -26,7 +26,7 @@ void effect_3D_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, temp_f12 = SQ(arg4) + SQ(arg5) + SQ(arg6); if (temp_f12 != 0.0f) { - temp_f12 = -1.0f / shim_sqrtf(temp_f12); + temp_f12 = -1.0f / sqrtf(temp_f12); arg4 *= temp_f12; arg5 *= temp_f12; @@ -48,7 +48,7 @@ void effect_3D_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, temp_f12 = SQ(temp_f30) + SQ(sp70) + SQ(temp_f28); if (temp_f12 != 0.0f) { - temp_f12 = 1.0f / shim_sqrtf(temp_f12); + temp_f12 = 1.0f / sqrtf(temp_f12); temp_f30 *= temp_f12; sp70 *= temp_f12; @@ -68,9 +68,9 @@ void effect_3D_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_3D; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = arg7; - part = effect->data.unk_3D = shim_general_heap_malloc(arg7 * sizeof(*part)); + part = effect->data.unk_3D = general_heap_malloc(arg7 * sizeof(*part)); ASSERT(effect->data.unk_3D != NULL); part->unk_04 = 0; @@ -86,7 +86,7 @@ void effect_3D_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, part->pos.x = 0; part->pos.y = 0; part->pos.z = 0; - shim_guRotateF(sp30, i * 72, arg4, arg5, arg6); + guRotateF(sp30, i * 72, arg4, arg5, arg6); part->unk_14 = part->unk_20 = 2.0f * arg4; part->unk_18 = part->unk_24 = 2.0f * arg5; part->unk_1C = part->unk_28 = 2.0f * arg6; @@ -124,7 +124,7 @@ void effect_3D_update(EffectInstance* effect) { part->unk_5C--; part->unk_60++; if (part->unk_5C < 0 && unk_04 == 2) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -207,7 +207,7 @@ void effect_3D_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -224,8 +224,8 @@ void effect_3D_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, D_09000240_37D3C0); - shim_guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -233,14 +233,14 @@ void effect_3D_appendGfx(void* effect) { for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { gDPSetPrimColor(gMainGfxPos++, 0, 0, 200, 255, 255, part->unk_58); - shim_guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, part->unk_44, part->unk_48, part->unk_44); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, part->unk_4C, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, part->unk_44, part->unk_48, part->unk_44); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, part->unk_4C, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_090002E8_37D468); diff --git a/src/effects/effect_46.c b/src/effects/effect_46.c index 6eac2181eb..c468996bb4 100644 --- a/src/effects/effect_46.c +++ b/src/effects/effect_46.c @@ -35,9 +35,9 @@ EffectInstance* effect_46_main(s32 type, PlayerStatus* player, f32 scale, s32 du bp.renderUI = NULL; bp.effectID = EFFECT_46; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.spin = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.spin = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.spin != NULL); part->type = type; @@ -138,7 +138,7 @@ void effect_46_update(EffectInstance* effect) { part->lifetime++; if (part->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -195,7 +195,7 @@ void effect_46_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -215,30 +215,30 @@ void effect_46_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, D_09000420_38EDB0); - shim_guTranslateF(mtxTransform, part->pos.x, part->pos.y, part->pos.z); - shim_guRotateF(mtxTemp, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtxTransform, part->pos.x, part->pos.y, part->pos.z); + guRotateF(mtxTemp, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { - shim_guPositionF(mtxTransform, part->rot.x, 0.0f, part->rot.z, curScale * part->scale, part->pos.x, part->pos.y, part->pos.z); - shim_guRotateF(mtxTemp, part->rot.y, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guPositionF(mtxTransform, part->rot.x, 0.0f, part->rot.z, curScale * part->scale, part->pos.x, part->pos.y, part->pos.z); + guRotateF(mtxTemp, part->rot.y, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); if (type < 8) { - shim_guTranslateF(mtxTemp, 3.0f - (curScale - initialScale) * 3.0f / initialScale, 0.0f, 0.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guTranslateF(mtxTemp, 3.0f - (curScale - initialScale) * 3.0f / initialScale, 0.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); } else { - shim_guTranslateF(mtxTemp, 2.0f, 0.0f, 0.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guTranslateF(mtxTemp, 2.0f, 0.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); } gDPSetPrimColor(gMainGfxPos++, 0, 0, part->color.r, part->color.g, part->color.b, alpha); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_090003A0_38ED30); diff --git a/src/effects/effect_63.c b/src/effects/effect_63.c index 59ae981d7a..4d09fdd118 100644 --- a/src/effects/effect_63.c +++ b/src/effects/effect_63.c @@ -50,9 +50,9 @@ EffectInstance* effect_63_main( bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_63; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.unk_63 = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.unk_63 = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.unk_63 != NULL); if (arg9 <= 0) { @@ -85,8 +85,8 @@ EffectInstance* effect_63_main( part->unk_3C = 51; part->unk_40 = 123; part->unk_44 = 255; - part->unk_4C = shim_rand_int(64); - part->unk_50 = shim_rand_int(64); + part->unk_4C = rand_int(64); + part->unk_50 = rand_int(64); part->unk_54 = 0; part->unk_58 = 0; part->unk_74 = 0; @@ -102,16 +102,16 @@ EffectInstance* effect_63_main( part->unk_3C = 51; part->unk_40 = 123; part->unk_44 = 255; - randInt = shim_rand_int(360); + randInt = rand_int(360); for (i = 0; i < numParts; i++, part++) { part->unk_04 = arg1; part->unk_08 = arg2; part->unk_0C = arg3; - part->unk_60 = shim_sin_deg(i * 45 + randInt) * 5.0f; - part->unk_64 = shim_cos_deg(i * 45 + randInt) * 2.0f + 3.0f; - part->unk_4C = shim_rand_int(64); - part->unk_50 = shim_rand_int(64); + part->unk_60 = sin_deg(i * 45 + randInt) * 5.0f; + part->unk_64 = cos_deg(i * 45 + randInt) * 2.0f + 3.0f; + part->unk_4C = rand_int(64); + part->unk_50 = rand_int(64); part->unk_70 = 1.0f; part->unk_6C = 1.0f; part->unk_54 = 0; @@ -145,12 +145,12 @@ void effect_63_update(EffectInstance* effect) { part->unk_24++; if (part->unk_20 == 1 && unk_00 == 1) { - shim_load_effect(EFFECT_63); + load_effect(EFFECT_63); effect_63_main(2, part->unk_04, part->unk_08, part->unk_0C, part->unk_10, part->unk_14, part->unk_18, 1.0f, 32, 32); } if (part->unk_20 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -159,7 +159,7 @@ void effect_63_update(EffectInstance* effect) { switch (unk_00) { case 0: if (!(unk_24 & (1 | 2))) { - shim_load_effect(EFFECT_63); + load_effect(EFFECT_63); effect_63_main(1, part->unk_04, part->unk_08, part->unk_0C, part->unk_10, part->unk_14, part->unk_18, 1.0f, part->unk_1C, part->unk_1C); } break; @@ -203,7 +203,7 @@ void effect_63_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -231,9 +231,9 @@ void effect_63_appendGfx(void* effect) { part->unk_4C += part->unk_54; part->unk_50 += part->unk_58; - angle = -shim_atan2(0.0f, 0.0f, part->unk_60, part->unk_64) + part->unk_74; - part->unk_54 = shim_sin_deg(angle); - part->unk_58 = shim_cos_deg(angle); + angle = -atan2(0.0f, 0.0f, part->unk_60, part->unk_64) + part->unk_74; + part->unk_54 = sin_deg(angle); + part->unk_58 = cos_deg(angle); if (part->unk_4C < 0.0f) { part->unk_4C += 128.0f; @@ -246,18 +246,18 @@ void effect_63_appendGfx(void* effect) { tempX = part->unk_4C * 4.0f; tempY = part->unk_50 * 4.0f; - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guScaleF(sp58, unk_48, unk_48, unk_48); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guScaleF(sp58, unk_48, unk_48, unk_48); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - shim_guScaleF(sp18, part->unk_70, part->unk_6C, 1.0f); - shim_guRotateF(sp58, part->unk_74, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(sp18, part->unk_70, part->unk_6C, 1.0f); + guRotateF(sp58, part->unk_74, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetTileSize(gMainGfxPos++, 1, tempX, tempY, (tempX + 0x3F) * 4, (tempY + 0xF) * 4); diff --git a/src/effects/effect_65.c b/src/effects/effect_65.c index d3f724ea59..d4ef369924 100644 --- a/src/effects/effect_65.c +++ b/src/effects/effect_65.c @@ -33,9 +33,9 @@ EffectInstance* effect_65_main( bp.renderUI = NULL; bp.effectID = EFFECT_65; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.unk_65 = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.unk_65 = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.unk_65 != NULL); data->variation = variation; @@ -104,7 +104,7 @@ EffectInstance* effect_65_main( data->pathPointEnabled[0] = TRUE; data->pathTimestamp[0] = 0; data->pathLength[0] = 0; - data->pathJitterX = shim_rand_int(30) + 10; + data->pathJitterX = rand_int(30) + 10; data->pathJitterY = 0; data->pathJitterZ = 0; @@ -139,7 +139,7 @@ void effect_65_update(EffectInstance* effect) { data->lifeTime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -150,8 +150,8 @@ void effect_65_update(EffectInstance* effect) { } if (variation == 3) { - data->pathJitterX += shim_rand_int(10) - 5; - data->pathJitterY += shim_rand_int(10) - 5; + data->pathJitterX += rand_int(10) - 5; + data->pathJitterY += rand_int(10) - 5; data->pos.x += data->pathJitterX; data->pos.y += data->pathJitterY; data->pos.z += data->pathJitterZ; @@ -186,7 +186,7 @@ void effect_65_update(EffectInstance* effect) { dist = SQ(posX - lastPointX) + SQ(posY - lastPointY) + SQ(posZ - lastPointZ); if (dist != 0.0f) { - dist = shim_sqrtf(dist); + dist = sqrtf(dist); } data->pathLength[idx] = pathLength + dist; @@ -202,7 +202,7 @@ void effect_65_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -249,8 +249,8 @@ void effect_65_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(mtx, 0.0f, 0.0f, 0.0f); - shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtx, 0.0f, 0.0f, 0.0f); + guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E00CACB0[variation]); @@ -286,7 +286,7 @@ void effect_65_appendGfx(void* effect) { fadeOutPhase = phase / numPoints; idx = (data->lastPointIndex + a1) % MAX_POINTS; - a = shim_sin_deg(fadeOutPhase) * 255.0f; + a = sin_deg(fadeOutPhase) * 255.0f; if (a > 200) { a = 200; } @@ -301,7 +301,7 @@ void effect_65_appendGfx(void* effect) { next = 0; } firstPointIdx = i; - angle = -shim_atan2(data->pathY[next], -data->pathX[next], data->pathY[idx], -data->pathX[idx]); + angle = -atan2(data->pathY[next], -data->pathX[next], data->pathY[idx], -data->pathX[idx]); } else { if (i != MAX_POINTS - 1) { next = idx + 1; @@ -312,8 +312,8 @@ void effect_65_appendGfx(void* effect) { if (prev < 0) { prev = MAX_POINTS - 1; } - nextAngle = -shim_atan2(data->pathY[next], -data->pathX[next], data->pathY[idx], -data->pathX[idx]); - prevAngle = -shim_atan2(data->pathY[idx], -data->pathX[idx], data->pathY[prev], -data->pathX[prev]); + nextAngle = -atan2(data->pathY[next], -data->pathX[next], data->pathY[idx], -data->pathX[idx]); + prevAngle = -atan2(data->pathY[idx], -data->pathX[idx], data->pathY[prev], -data->pathX[prev]); deltaAngle = prevAngle - nextAngle; if (deltaAngle > 180.0f) { nextAngle += 360.0f; @@ -328,7 +328,7 @@ void effect_65_appendGfx(void* effect) { pathPointY = data->pathY[idx]; pathPointZ = data->pathZ[idx]; pathPointLifetime = lifeTime - data->pathTimestamp[idx]; - width = shim_sin_deg((lifeTime - data->pathTimestamp[idx] * 80) * 4) * 3.0f + 16.0f + pathPointLifetime; + width = sin_deg((lifeTime - data->pathTimestamp[idx] * 80) * 4) * 3.0f + 16.0f + pathPointLifetime; width *= scale; if (variation >= 0) { @@ -352,8 +352,8 @@ void effect_65_appendGfx(void* effect) { } } - deltaX = width * shim_sin_deg(angle); - deltaY = width * shim_cos_deg(angle); + deltaX = width * sin_deg(angle); + deltaY = width * cos_deg(angle); deltaZ = 0.0f; vtx->ob[0] = pathPointX + deltaX; diff --git a/src/effects/effect_75.c b/src/effects/effect_75.c index b1708e49f7..58911f3b10 100644 --- a/src/effects/effect_75.c +++ b/src/effects/effect_75.c @@ -27,9 +27,9 @@ EffectInstance* effect_75_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 scale bp.renderUI = NULL; bp.effectID = EFFECT_75; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.unk_75 = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.unk_75 = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.unk_75 != NULL); data->type = arg0; @@ -94,7 +94,7 @@ void effect_75_update(EffectInstance* effect) { } if (data->unk_10 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -147,7 +147,7 @@ void effect_75_update(EffectInstance* effect) { } data->unk_34 = data->unk_60 - + (shim_sin_deg(unk_14 * 20) * (data->unk_64 - data->unk_60) + + (sin_deg(unk_14 * 20) * (data->unk_64 - data->unk_60) + (data->unk_64 - data->unk_60)) * 0.5; } @@ -162,7 +162,7 @@ void effect_75_render(EffectInstance* effect) { f32 outZ; f32 outS; - shim_transform_point(&gCameras[gCurrentCameraID].perspectiveMatrix[0], + transform_point(&gCameras[gCurrentCameraID].perspectiveMatrix[0], data->pos.x, data->pos.y, data->pos.z, 1.0f, &outX, &outY, &outZ, &outS); @@ -182,7 +182,7 @@ void effect_75_render(EffectInstance* effect) { renderTaskPtr->appendGfxArg = effect; renderTaskPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - retTask = shim_queue_render_task(renderTaskPtr); + retTask = queue_render_task(renderTaskPtr); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -203,14 +203,14 @@ void effect_75_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(mtxTransfrom, data->pos.x, data->pos.y, data->pos.z); - shim_guScaleF(mtxTemp, data->scale, data->scale, data->scale); - shim_guMtxCatF(mtxTemp, mtxTransfrom, mtxTransfrom); + guTranslateF(mtxTransfrom, data->pos.x, data->pos.y, data->pos.z); + guScaleF(mtxTemp, data->scale, data->scale, data->scale); + guMtxCatF(mtxTemp, mtxTransfrom, mtxTransfrom); if (type == 1) { - shim_guRotateF(mtxTemp, 180.0f, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(mtxTemp, mtxTransfrom, mtxTransfrom); + guRotateF(mtxTemp, 180.0f, 0.0f, 0.0f, 1.0f); + guMtxCatF(mtxTemp, mtxTransfrom, mtxTransfrom); } - shim_guMtxF2L(mtxTransfrom, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(mtxTransfrom, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/effect_86.c b/src/effects/effect_86.c index 7290ead8af..e7a9d8a278 100644 --- a/src/effects/effect_86.c +++ b/src/effects/effect_86.c @@ -42,10 +42,10 @@ EffectInstance* effect_86_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, bp.renderUI = NULL; bp.effectID = EFFECT_86; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = shim_general_heap_malloc(numParts * sizeof(*data)); + data = general_heap_malloc(numParts * sizeof(*data)); effect->data.unk_86 = data; part = data; @@ -90,7 +90,7 @@ void effect_86_update(EffectInstance* effect) { data->unk_14++; if (data->unk_10 < 0) { - shim_remove_effect(effect); + remove_effect(effect); } } @@ -103,7 +103,7 @@ void effect_86_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -118,10 +118,10 @@ void effect_86_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp10, part->unk_04, part->unk_08, part->unk_0C); - shim_guScaleF(sp50, part->unk_34, part->unk_34, part->unk_34); - shim_guMtxCatF(sp50, sp10, sp10); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp10, part->unk_04, part->unk_08, part->unk_0C); + guScaleF(sp50, part->unk_34, part->unk_34, part->unk_34); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/embers.c b/src/effects/embers.c index d595f067b4..d371f29c4a 100644 --- a/src/effects/embers.c +++ b/src/effects/embers.c @@ -48,9 +48,9 @@ EffectInstance* embers_main( bp.renderUI = NULL; bp.effectID = EFFECT_EMBERS; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = arg7; - part = effect->data.embers = shim_general_heap_malloc(arg7 * sizeof(*part)); + part = effect->data.embers = general_heap_malloc(arg7 * sizeof(*part)); ASSERT(effect->data.embers != NULL); part->unk_00 = arg0; @@ -116,7 +116,7 @@ void embers_update(EffectInstance* effect) { } if (part->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -144,17 +144,17 @@ void embers_update(EffectInstance* effect) { if (part->unk_64 >= 0) { if (part->unk_64 == 0) { - part->unk_04 = shim_rand_int(unk_10) - unk_10 * 0.5; - part->unk_08 = shim_rand_int(unk_14); + part->unk_04 = rand_int(unk_10) - unk_10 * 0.5; + part->unk_08 = rand_int(unk_14); part->unk_0C = 0.0f; - part->unk_44 = (f32) (shim_rand_int(20) - 10) * 0.05; - part->unk_48 = (shim_rand_int(40) - 1) * unk_68 * 0.05; + part->unk_44 = (f32) (rand_int(20) - 10) * 0.05; + part->unk_48 = (rand_int(40) - 1) * unk_68 * 0.05; part->unk_4C = 0.0f; - part->unk_50 = (f32) (shim_rand_int(20) - 10) * 0.05; - part->unk_54 = (shim_rand_int(30) - 1) * unk_6C * 0.05; + part->unk_50 = (f32) (rand_int(20) - 10) * 0.05; + part->unk_54 = (rand_int(30) - 1) * unk_6C * 0.05; part->unk_58 = 0.0f; - part->unk_5C = shim_rand_int(15); - part->unk_60 = shim_rand_int(15); + part->unk_5C = rand_int(15); + part->unk_60 = rand_int(15); } part->unk_40 = D_E00E0A48[part->unk_64]; part->unk_04 += part->unk_44; @@ -178,7 +178,7 @@ void embers_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -196,10 +196,10 @@ void embers_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp10, part->unk_04, part->unk_08, part->unk_0C); - shim_guScaleF(sp50, part->unk_40, part->unk_40, part->unk_40); - shim_guMtxCatF(sp50, sp10, sp10); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp10, part->unk_04, part->unk_08, part->unk_0C); + guScaleF(sp50, part->unk_40, part->unk_40, part->unk_40); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -210,8 +210,8 @@ void embers_appendGfx(void* effect) { part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { if (part->unk_64 >= 0) { - shim_guTranslateF(sp10, part->unk_04, part->unk_08, part->unk_0C); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp10, part->unk_04, part->unk_08, part->unk_0C); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0, (i % 4) * 16 * 4, 15 * 4, ((i % 4) * 16 + 15) * 4); diff --git a/src/effects/emote.c b/src/effects/emote.c index 807ed79909..c7db3b7d14 100644 --- a/src/effects/emote.c +++ b/src/effects/emote.c @@ -63,9 +63,9 @@ void func_E0020000(EmoteFXData* part, s32 arg1) { f32 sin; f32 cos; - sin = shim_sin_deg(gCameras[gCurrentCameraID].currentYaw); - cos = shim_cos_deg(gCameras[gCurrentCameraID].currentYaw); - shim_guRotateF(sp18, -(unk_1C - 20.0f + arg1 * 20), sin, 0.0f, -cos); + sin = sin_deg(gCameras[gCurrentCameraID].currentYaw); + cos = cos_deg(gCameras[gCurrentCameraID].currentYaw); + guRotateF(sp18, -(unk_1C - 20.0f + arg1 * 20), sin, 0.0f, -cos); if (npc == PTR_LIST_END) { part->unk_04 = gPlayerStatus.position.x + part->unk_10 + sp18[1][0] * (unk_20 + 16.0f); @@ -105,9 +105,9 @@ void emote_main(s32 arg0, Npc* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 bp.renderUI = NULL; bp.effectID = EFFECT_EMOTE; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - data = effect->data.emote = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.emote = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.emote != NULL); data->unk_3C = arg1; @@ -161,7 +161,7 @@ void emote_update(EffectInstance* effect) { part->unk_38 = D_E0020D80[part->unk_30][0]; part->unk_34 = 1; } else { - shim_remove_effect(effect); + remove_effect(effect); return; } } @@ -171,7 +171,7 @@ void emote_update(EffectInstance* effect) { } if (part->unk_2C < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -197,7 +197,7 @@ void emote_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -221,18 +221,18 @@ void emote_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); if (type != 1) { - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); matrix = &gDisplayContext->matrixStack[gMatrixListPos]; - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos++]); - shim_guScaleF(sp58, 1.0f, 0.8f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, part->unk_24, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos++]); + guScaleF(sp58, 1.0f, 0.8f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, part->unk_24, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09002170_336DE0); @@ -240,14 +240,14 @@ void emote_appendGfx(void* effect) { } else { if (part->unk_38 == 0) { for (i = 0; i < 3; i++, part++) { - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, part->unk_24, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, part->unk_28, part->unk_28, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, part->unk_24, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, part->unk_28, part->unk_28, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gDPSetPrimColor(gMainGfxPos++, 0, 0, 235, 28, 0, 255); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/effects/ending_decals.c b/src/effects/ending_decals.c index 7099005cd5..e5a5f7bc01 100644 --- a/src/effects/ending_decals.c +++ b/src/effects/ending_decals.c @@ -41,9 +41,9 @@ void ending_decals_main(s32 type, f32 posX, f32 posY, f32 posZ, f32 arg4, Effect bp.renderUI = NULL; bp.effectID = EFFECT_ENDING_DECALS; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.endingDecals = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.endingDecals = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.endingDecals != NULL); data->type = type; @@ -98,7 +98,7 @@ void ending_decals_update(EffectInstance* effect) { data->unk_20++; if (data->unk_1C < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -125,7 +125,7 @@ void ending_decals_render(EffectInstance* effect) { renderTaskPtr->renderMode = RENDER_MODE_2D; } - retTask = shim_queue_render_task(renderTaskPtr); + retTask = queue_render_task(renderTaskPtr); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -145,8 +145,8 @@ void ending_decals_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->scale, data->pos.x, data->pos.y, data->pos.z); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->scale, data->pos.x, data->pos.y, data->pos.z); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/energy_in_out.c b/src/effects/energy_in_out.c index 18a1020f7e..a0c2c2bde5 100644 --- a/src/effects/energy_in_out.c +++ b/src/effects/energy_in_out.c @@ -48,9 +48,9 @@ EffectInstance* energy_in_out_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 a bp.renderUI = NULL; bp.effectID = EFFECT_ENERGY_IN_OUT; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - firstPart = part = effect->data.energyInOut = shim_general_heap_malloc(numParts * sizeof(*part)); + firstPart = part = effect->data.energyInOut = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.energyInOut != NULL); part->unk_00 = arg0; @@ -74,7 +74,7 @@ EffectInstance* energy_in_out_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 a part->unk_44 = 1.0f; part->unk_38 = D_E00D6E84[arg0]; - randAngle = shim_rand_int(360); + randAngle = rand_int(360); part++; for (i = 1; i < effect->numParts; i++, part++) { @@ -84,38 +84,38 @@ EffectInstance* energy_in_out_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 a case 0: case 1: case 2: - part->unk_38 = -(shim_rand_int(10) * 0.2 + 0.2); + part->unk_38 = -(rand_int(10) * 0.2 + 0.2); part->unk_10 = 20; part->unk_40 = 0; part->scale = 1.0 - (i % 3) * 0.1; break; case 3: case 5: - part->unk_38 = shim_rand_int(10) * 0.2 + 0.2; + part->unk_38 = rand_int(10) * 0.2 + 0.2; part->unk_10 = 20; part->unk_40 = 0; part->scale = 1.0 - (i % 3) * 0.1; break; case 6: - part->unk_38 = -(shim_rand_int(10) + 4); + part->unk_38 = -(rand_int(10) + 4); part->unk_10 = 10; part->unk_40 = 0; part->scale = 1.0 - (i % 3) * 0.3; break; case 7: - part->unk_38 = -(shim_rand_int(10) + 4); + part->unk_38 = -(rand_int(10) + 4); part->unk_10 = 10; part->unk_40 = 0; part->scale = 1.0 - (i % 3) * 0.3; break; case 8: - part->unk_38 = shim_rand_int(10) * 0.2 + 0.6; + part->unk_38 = rand_int(10) * 0.2 + 0.6; part->unk_10 = 20; part->unk_40 = -1.0f; part->scale = 1.0 - (i % 3) * 0.3; break; case 9: - part->unk_38 = -(shim_rand_int(10) * 0.2 + 0.6); + part->unk_38 = -(rand_int(10) * 0.2 + 0.6); part->unk_10 = 20; part->unk_40 = -2.0f; part->scale = 1.0 - (i % 3) * 0.3; @@ -127,27 +127,27 @@ EffectInstance* energy_in_out_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 a firstPart->unk_30 = 10; break; case 10: - part->unk_38 = shim_rand_int(10) * 0.1 + 2.0; + part->unk_38 = rand_int(10) * 0.1 + 2.0; part->unk_10 = 10; part->unk_40 = 0; part->scale = (1.0 - (i % 3) * 0.3) * 0.5; break; case 11: - part->unk_38 = shim_rand_int(10) * 0.05 + 0.2; + part->unk_38 = rand_int(10) * 0.05 + 0.2; part->unk_40 = -1.0f; part->unk_10 = 30; part->scale = 1.0 - (i % 3) * 0.3; break; case 4: case 12: - part->unk_38 = shim_rand_int(10) * 0.2 + 0.6; + part->unk_38 = rand_int(10) * 0.2 + 0.6; part->unk_10 = 20; part->unk_40 = -2.0f; part->scale = 1.0 - (i % 3) * 0.3; break; } - part->unk_14 = -shim_rand_int(part->unk_10); + part->unk_14 = -rand_int(part->unk_10); if (part->unk_38 < 0.0f) { part->pos.x = (part->unk_10 - part->unk_14) * (-part->unk_38); @@ -184,7 +184,7 @@ void energy_in_out_update(EffectInstance* effect) { part->unk_14++; if (part->unk_10 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -209,7 +209,7 @@ void energy_in_out_update(EffectInstance* effect) { } else { part->pos.x = 0.0f; } - part->unk_3C = shim_rand_int(359); + part->unk_3C = rand_int(359); } part->pos.x += part->unk_38; @@ -219,7 +219,7 @@ void energy_in_out_update(EffectInstance* effect) { if (angle < 0.0f || angle > 180.0f) { part->unk_24 = 0; } else { - part->unk_24 = shim_sin_deg(angle) * 255.0f; + part->unk_24 = sin_deg(angle) * 255.0f; } } } @@ -233,7 +233,7 @@ void energy_in_out_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void func_E00D6978(void) { @@ -255,8 +255,8 @@ void energy_in_out_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, scale, part->pos.x, part->pos.y, part->pos.z); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, scale, part->pos.x, part->pos.y, part->pos.z); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, part->unk_18, part->unk_1C, part->unk_20, unk_24); @@ -269,16 +269,16 @@ void energy_in_out_appendGfx(void* effect) { gDPSetPrimColor(gMainGfxPos++, 0, 0, unk_18, unk_1C, unk_20, (unk_24 * part->unk_24) / 255); - shim_guRotateF(sp20, part->unk_3C, 0.0f, 0.0f, 1.0f); - shim_guTranslateF(sp60, part->pos.x + unk_38, 0.0f, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); + guRotateF(sp20, part->unk_3C, 0.0f, 0.0f, 1.0f); + guTranslateF(sp60, part->pos.x + unk_38, 0.0f, 0.0f); + guMtxCatF(sp60, sp20, sp20); if (D_E00D6E40[unk_00] == D_09000688_3D65B8 || D_E00D6E40[unk_00] == D_09000808_3D6738) { - shim_guScaleF(sp60, scale, 1.0f, 1.0f); + guScaleF(sp60, scale, 1.0f, 1.0f); } else { - shim_guScaleF(sp60, scale, scale, 1.0f); + guScaleF(sp60, scale, scale, 1.0f); } - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E00D6E40[unk_00]); diff --git a/src/effects/energy_orb_wave.c b/src/effects/energy_orb_wave.c index 401059b49b..31478761ec 100644 --- a/src/effects/energy_orb_wave.c +++ b/src/effects/energy_orb_wave.c @@ -25,9 +25,9 @@ EffectInstance* energy_orb_wave_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 bp.renderUI = NULL; bp.effectID = EFFECT_ENERGY_ORB_WAVE; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.energyOrbWave = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.energyOrbWave = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.energyOrbWave != NULL); data->unk_00 = arg0; @@ -99,7 +99,7 @@ void energy_orb_wave_update(EffectInstance* effect) { data->unk_14++; if (data->unk_10 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -121,7 +121,7 @@ void energy_orb_wave_update(EffectInstance* effect) { data->unk_20 = 70; data->unk_24 = 180; data->unk_28 = 120; - var_float = shim_sin_deg(unk_14 * 2) * 10.0f + 190.0f; + var_float = sin_deg(unk_14 * 2) * 10.0f + 190.0f; data->unk_2C = ((s32) var_float * var_1) / 255; break; case 1: @@ -135,7 +135,7 @@ void energy_orb_wave_update(EffectInstance* effect) { data->unk_20 = 170; data->unk_24 = 40; data->unk_28 = 110; - var_float = shim_sin_deg(unk_14 * 2) * 10.0f + 190.0f; + var_float = sin_deg(unk_14 * 2) * 10.0f + 190.0f; data->unk_2C = ((s32) var_float * var_1) / 255; break; case 3: @@ -149,7 +149,7 @@ void energy_orb_wave_update(EffectInstance* effect) { data->unk_20 = 235; data->unk_24 = 235; data->unk_28 = 200; - var_float = shim_sin_deg(unk_14 * 2) * 15.0f + 215.0f; + var_float = sin_deg(unk_14 * 2) * 15.0f + 215.0f; data->unk_2C = ((s32) var_float * var_1) / 255; break; case 5: @@ -213,11 +213,11 @@ void energy_orb_wave_render(EffectInstance* effect) { renderTask.appendGfxArg = effect; renderTask.renderMode = RENDER_MODE_2D; if (effect82->unk_00 >= 3) { - shim_queue_render_task(renderTaskPointer); + queue_render_task(renderTaskPointer); return; } - retTask = shim_queue_render_task(renderTaskPointer); + retTask = queue_render_task(renderTaskPointer); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -236,10 +236,10 @@ void energy_orb_wave_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guScaleF(sp58, data->scale, data->scale, data->scale); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guScaleF(sp58, data->scale, data->scale, data->scale); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -250,16 +250,16 @@ void energy_orb_wave_appendGfx(void* effect) { if (unk_00 < 3) { gSPDisplayList(gMainGfxPos++, D_09001000_3A5320); - shim_guRotateF(sp18, unk_14, 0.0f, 0.0f, 1.0f); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, unk_14, 0.0f, 0.0f, 1.0f); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_090011D0_3A54F0); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); gDPSetColorDither(gMainGfxPos++, G_CD_MAGICSQ); - shim_guRotateF(sp18, -unk_14 * 8, 0.0f, 0.0f, 1.0f); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, -unk_14 * 8, 0.0f, 0.0f, 1.0f); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_090011F0_3A5510); diff --git a/src/effects/energy_shockwave.c b/src/effects/energy_shockwave.c index a3ba8e680b..9dba91c7f3 100644 --- a/src/effects/energy_shockwave.c +++ b/src/effects/energy_shockwave.c @@ -29,9 +29,9 @@ void energy_shockwave_main( bp.renderUI = NULL; bp.effectID = EFFECT_ENERGY_SHOCKWAVE; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.energyShockwave = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.energyShockwave = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.energyShockwave != NULL); data->unk_00 = arg0; @@ -72,15 +72,15 @@ void energy_shockwave_update(EffectInstance* effect) { unk_2C = data->unk_2C; if (unk_28 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } if (unk_2C % 2) { angle = func_E0200044(360, unk_2C); - shim_sin_deg(angle); - shim_cos_deg(angle); - shim_load_effect(EFFECT_SHIMMER_WAVE); + sin_deg(angle); + cos_deg(angle); + load_effect(EFFECT_SHIMMER_WAVE); shimmer_wave_main(0, data->unk_04, data->unk_08, data->unk_0C, unk_2C * 8, 10.0f, 10, 20); } @@ -131,7 +131,7 @@ void energy_shockwave_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -158,10 +158,10 @@ void energy_shockwave_appendGfx(void* effect) { gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, uls, ult, uls + 252, ult + 252); gDPSetTileSize(gMainGfxPos++, 1, uls2, ult2, uls2 + 124, ult2 + 124); - shim_guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); - shim_guScaleF(sp50, data->unk_1C, data->unk_1C, data->unk_1C); - shim_guMtxCatF(sp50, sp10, sp10); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); + guScaleF(sp50, data->unk_1C, data->unk_1C, data->unk_1C); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000DC0_3762D0); diff --git a/src/effects/explosion.c b/src/effects/explosion.c index 8fe46237f3..5c2d11fe28 100644 --- a/src/effects/explosion.c +++ b/src/effects/explosion.c @@ -40,9 +40,9 @@ void explosion_main(s32 type, f32 x, f32 y, f32 z) { bpPtr->effectID = EFFECT_EXPLOSION; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - effect->data.explosion = data = shim_general_heap_malloc(effect->numParts * sizeof(*data)); + effect->data.explosion = data = general_heap_malloc(effect->numParts * sizeof(*data)); ASSERT(effect->data.explosion != NULL); data->pos.x = x; @@ -100,7 +100,7 @@ void explosion_update(EffectInstance* effect) { part->unk_30--; if (part->unk_30 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -110,10 +110,10 @@ void explosion_update(EffectInstance* effect) { unk_34 = part->unk_34; if (unk_34 == 7) { - shim_load_effect(EFFECT_SMOKE_RING); + load_effect(EFFECT_SMOKE_RING); smoke_ring_main(unk_00, part->pos.x, part->pos.y, part->pos.z); } else if (unk_34 == 1) { - shim_load_effect(EFFECT_CONFETTI); + load_effect(EFFECT_CONFETTI); confetti_main(unk_00 + 4, part->pos.x, part->pos.y, part->pos.z, 1.0f, 50); } @@ -156,7 +156,7 @@ void explosion_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void explosion_appendGfx(void* effect) { @@ -171,10 +171,10 @@ void explosion_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); part++; @@ -183,8 +183,8 @@ void explosion_appendGfx(void* effect) { if (part->unk_00 != -1) { gSPDisplayList(gMainGfxPos++, D_09000840_3447B0); - shim_guScaleF(sp18, part->unk_20, part->unk_20, 1.0f); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(sp18, part->unk_20, part->unk_20, 1.0f); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 240, part->unk_38); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -196,10 +196,10 @@ void explosion_appendGfx(void* effect) { gSPDisplayList(gMainGfxPos++, D_09000910_344880); - shim_guScaleF(sp18, part->unk_20, part->unk_20, part->unk_20); - shim_guRotateF(sp58, part->unk_28, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(sp18, part->unk_20, part->unk_20, part->unk_20); + guRotateF(sp58, part->unk_28, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); switch (unk_34) { default: diff --git a/src/effects/falling_leaves.c b/src/effects/falling_leaves.c index ab29a6a90f..8654a627bb 100644 --- a/src/effects/falling_leaves.c +++ b/src/effects/falling_leaves.c @@ -23,9 +23,9 @@ void falling_leaves_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.renderUI = NULL; bp.effectID = EFFECT_FALLING_LEAVES; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.fallingLeaves = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.fallingLeaves = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.fallingLeaves != NULL); part->unk_00 = arg0; @@ -38,12 +38,12 @@ void falling_leaves_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { part++; for (i = 1; i < numParts; i++, part++) { - part->unk_04 = shim_rand_int(30) - 15; + part->unk_04 = rand_int(30) - 15; part->unk_08 = 0; - part->unk_0C = shim_rand_int(30) - 15; - part->unk_18 = shim_rand_int(360); - part->unk_20 = shim_rand_int(360); - part->unk_1C = shim_rand_int(100) / 10; + part->unk_0C = rand_int(30) - 15; + part->unk_18 = rand_int(360); + part->unk_20 = rand_int(360); + part->unk_1C = rand_int(100) / 10; part->unk_10 = 0; part->unk_14 = 0; } @@ -73,7 +73,7 @@ void falling_leaves_update(EffectInstance* effect) { unk_28 = part->unk_28; if (unk_28 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -87,22 +87,22 @@ void falling_leaves_update(EffectInstance* effect) { part++; for (i = 1; i < effect->numParts; i++, part++) { - temp = shim_sin_deg(2.0f * part->unk_18) * 0.2; + temp = sin_deg(2.0f * part->unk_18) * 0.2; part->unk_14 += -0.05f; part->unk_10 += temp; if (unk_00 == 0) { part->unk_10 *= 0.94; - part->unk_14 *= shim_sin_deg(part->unk_18) * 0.05 + 0.95; + part->unk_14 *= sin_deg(part->unk_18) * 0.05 + 0.95; } else { part->unk_14 += -0.05f; part->unk_10 *= 0.92; } - part->unk_1C += shim_rand_int(50) - 25.0f; - part->unk_18 += shim_sin_deg(part->unk_1C) * 10.0f; - part->unk_20 += shim_cos_deg(part->unk_1C * 0.5f) * 10.0f; + part->unk_1C += rand_int(50) - 25.0f; + part->unk_18 += sin_deg(part->unk_1C) * 10.0f; + part->unk_20 += cos_deg(part->unk_1C * 0.5f) * 10.0f; part->unk_04 += part->unk_10; part->unk_08 += part->unk_14; } @@ -117,7 +117,7 @@ void falling_leaves_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -132,19 +132,19 @@ void falling_leaves_appendGfx(void* effect) { gSPDisplayList(gMainGfxPos++, D_09001100_3601E0); gDPSetPrimColor(gMainGfxPos++, 0, 0, 20, 100, 20, part->unk_24); - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp98); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { - shim_guTranslateF(sp58, part->unk_04, part->unk_08, part->unk_0C); - shim_guMtxCatF(sp58, sp98, sp18); - shim_guRotateF(sp58, part->unk_18, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, part->unk_20, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp58, part->unk_04, part->unk_08, part->unk_0C); + guMtxCatF(sp58, sp98, sp18); + guRotateF(sp58, part->unk_18, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, part->unk_20, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_090011B0_360290); diff --git a/src/effects/fire_breath.c b/src/effects/fire_breath.c index 045963be56..d8e3f2e172 100644 --- a/src/effects/fire_breath.c +++ b/src/effects/fire_breath.c @@ -34,9 +34,9 @@ EffectInstance* fire_breath_main( bp.renderUI = NULL; bp.effectID = EFFECT_FIRE_BREATH; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.fireBreath = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.fireBreath = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.fireBreath != NULL); data->type = type; @@ -102,7 +102,7 @@ void fire_breath_update(EffectInstance* effect) { data->spawnTimer++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -126,7 +126,7 @@ void fire_breath_update(EffectInstance* effect) { if (spawnTimer == data->spawnDelay + 1 && data->numChildren > 0) { EffectInstance* spawned; - shim_load_effect(EFFECT_FIRE_BREATH); + load_effect(EFFECT_FIRE_BREATH); spawned = fire_breath_main( data->type, data->initPos.x, data->initPos.y, data->initPos.z, data->endPos.x, data->endPos.y, data->endPos.z, data->numChildren - 1, data->spawnDelay, lifeTime @@ -174,7 +174,7 @@ void fire_breath_render(EffectInstance* effect) { } renderTaskPointer->renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(renderTaskPointer); + retTask = queue_render_task(renderTaskPointer); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -192,10 +192,10 @@ void fire_breath_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); if (type == FIRE_BREATH_SMALL) { - shim_guTranslateF(sp18, data->initPos.x, data->initPos.y, data->initPos.z); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->initPos.x, data->initPos.y, data->initPos.z); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -210,12 +210,12 @@ void fire_breath_appendGfx(void* effect) { gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, ((unk_5C * 32) + 0) * 4, 0, ((unk_5C * 32) + 32) * 4, 128); gDPSetTileSize(gMainGfxPos++, 1, ((unk_5C * 32) + 32) * 4, 0, ((unk_5C * 32) + 64) * 4, 128); - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, data->scale, data->scale, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, data->scale, data->scale, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/fire_flower.c b/src/effects/fire_flower.c index 02d41650da..57a2ea668e 100644 --- a/src/effects/fire_flower.c +++ b/src/effects/fire_flower.c @@ -31,9 +31,9 @@ EffectInstance* fire_flower_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg bp.renderUI = NULL; bp.effectID = EFFECT_FIRE_FLOWER; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = shim_general_heap_malloc(numParts * sizeof(*part)); + part = general_heap_malloc(numParts * sizeof(*part)); effect->data.fireFlower = part; ASSERT(effect->data.fireFlower != NULL); @@ -90,13 +90,13 @@ void fire_flower_update(EffectInstance* effect) { unk_40X = part->unk_40.x; if (unk_04 == 7) { - shim_remove_effect(effect); + remove_effect(effect); return; } switch (unk_04) { case 0: - shim_load_effect(EFFECT_STARS_SPREAD); + load_effect(EFFECT_STARS_SPREAD); stars_spread_main(0, part->pos.x - 10.0f, part->pos.y, part->pos.z, 7, 20); part->unk_34 = 0; part->unk_38 = 0; @@ -194,7 +194,7 @@ void fire_flower_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -212,18 +212,18 @@ void fire_flower_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 0, 0, part->unk_3C); gDPSetEnvColor(gMainGfxPos++, 255, 0, 0, part->unk_38); if ((u32) (unk_04 - 4) < 3U) { - shim_guTranslateF(sp18, 0.0f, 16.0f, 0.0f); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, 0.0f, 16.0f, 0.0f); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000DE0_381180); @@ -231,10 +231,10 @@ void fire_flower_appendGfx(void* effect) { part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { if (part->unk_40.z == 0) { - shim_guRotateF(sp18, part->unk_24, 0.0f, 0.0f, 1.0f); - shim_guTranslateF(sp58, part->pos.x, part->pos.y, part->pos.z); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, part->unk_24, 0.0f, 0.0f, 1.0f); + guTranslateF(sp58, part->pos.x, part->pos.y, part->pos.z); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, part->unk_00 != 0 ? D_09000ED8_381278 : D_09000EB8_381258); @@ -257,12 +257,12 @@ void fire_flower_appendGfx(void* effect) { G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); - shim_guTranslateF(sp18, unk_2C, 0.0f, 0.0f); - shim_guScaleF(sp58, unk_30, unk_30, unk_30); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, unk_28, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, unk_2C, 0.0f, 0.0f); + guScaleF(sp58, unk_30, unk_30, unk_30); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, unk_28, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000EF8_381298); diff --git a/src/effects/firework.c b/src/effects/firework.c index 2d5ea059a4..d1f85e2874 100644 --- a/src/effects/firework.c +++ b/src/effects/firework.c @@ -61,9 +61,9 @@ EffectInstance* firework_main( bp.renderUI = func_E0086398; bp.effectID = EFFECT_FIREWORK; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.firework = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.firework = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.firework != NULL); part->unk_00 = arg0; @@ -105,7 +105,7 @@ EffectInstance* firework_main( part++; for (i = 1; i < numParts; i++, part++) { f32 unk_1C = (i * 360) / (numParts - 1); - s32 unk_24 = shim_rand_int(359); + s32 unk_24 = rand_int(359); part->unk_04 = 0; part->unk_08 = 0; @@ -137,7 +137,7 @@ void firework_update(EffectInstance* effect) { part->unk_34++; if (part->unk_30 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -198,8 +198,8 @@ void func_E00863B4(EffectInstance* effect) { unk_28 = part->unk_28; - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, unk_28, part->unk_04, part->unk_08, part->unk_0C); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, unk_28, part->unk_04, part->unk_08, part->unk_0C); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -261,12 +261,12 @@ void func_E00863B4(EffectInstance* effect) { for (i = 1; i < effect->numParts; i++, part++) { gSPDisplayList(gMainGfxPos++, D_E0086AB4[part->unk_00]); - shim_guRotateF(sp20, part->unk_1C, 0.0f, 0.0f, 1.0f); - shim_guRotateF(sp60, part->unk_24, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guTranslateF(sp60, part->unk_04, part->unk_08, part->unk_0C); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp20, part->unk_1C, 0.0f, 0.0f, 1.0f); + guRotateF(sp60, part->unk_24, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp60, sp20, sp20); + guTranslateF(sp60, part->unk_04, part->unk_08, part->unk_0C); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E0086AA0[temp_s32]); @@ -280,8 +280,8 @@ void func_E00863B4(EffectInstance* effect) { gDPSetEnvColor(gMainGfxPos++, envR, envG, engB, envA); gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); - shim_guRotateF(sp20, 120.0f, 1.0f, 1.0f, 1.0f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp20, 120.0f, 1.0f, 1.0f, 1.0f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); diff --git a/src/effects/firework_rocket.c b/src/effects/firework_rocket.c index b21186d537..38ea02f4f9 100644 --- a/src/effects/firework_rocket.c +++ b/src/effects/firework_rocket.c @@ -1,8 +1,6 @@ #include "common.h" #include "effects_internal.h" -void shim_draw_prev_frame_buffer_at_screen_pos(s32, s32, s32, s32, f32); - void firework_rocket_init(EffectInstance* effect); void firework_rocket_render(EffectInstance* effect); void firework_rocket_update(EffectInstance* effect); @@ -96,9 +94,9 @@ EffectInstance* firework_rocket_main(s32 variation, f32 centerX, f32 centerY, f3 bp.renderUI = NULL; bp.effectID = EFFECT_FIREWORK_ROCKET; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.fireworkRocket = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.fireworkRocket = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.fireworkRocket != NULL); data->variation = variation; @@ -159,7 +157,7 @@ void firework_rocket_update(EffectInstance* effect) { data->lifeTime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -185,11 +183,11 @@ void firework_rocket_update(EffectInstance* effect) { i = lifeTime & 3; data->rocketX[i] = data->pos.x - data->velocity.x * (32 - lifeTime); data->rocketY[i] = data->pos.y - data->velocity.y * (32 - lifeTime) - - (80.0f - shim_sin_deg((s32)(lifeTime * 90) >> 5) * 80.0f); + - (80.0f - sin_deg((s32)(lifeTime * 90) >> 5) * 80.0f); data->rocketZ[i] = data->pos.z - data->velocity.z * (32 - lifeTime); - data->rocketVelocityX[i] = (shim_rand_int(10) - 5) * 0.1f; - data->rocketVelocityY[i] = (shim_rand_int(10) - 5) * 0.1f; - data->rocketVelocityZ[i] = (shim_rand_int(10) - 5) * 0.1f; + data->rocketVelocityX[i] = (rand_int(10) - 5) * 0.1f; + data->rocketVelocityY[i] = (rand_int(10) - 5) * 0.1f; + data->rocketVelocityZ[i] = (rand_int(10) - 5) * 0.1f; for (i = 0; i < 4; i++) { data->rocketX[i] += data->rocketVelocityX[i]; @@ -216,7 +214,7 @@ void firework_rocket_render(EffectInstance* effect) { renderTask.distance = 700; renderTask.renderMode = RENDER_MODE_SURFACE_OPA; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -241,12 +239,12 @@ void firework_rocket_appendGfx(void* effect) { s32 i; negYaw = -camera->currentYaw; - sinTheta = shim_sin_deg(negYaw); - cosTheta = shim_cos_deg(negYaw); + sinTheta = sin_deg(negYaw); + cosTheta = cos_deg(negYaw); isExploded = data->isExploded; if (firework_rocket_frame_counter != gGameStatusPtr->frameCounter) { // draw previous frame to create motion blur effect - shim_draw_prev_frame_buffer_at_screen_pos(10, 10, SCREEN_WIDTH - 10, SCREEN_HEIGHT - 10, firework_rocket_blur_alpha * 0.8); + draw_prev_frame_buffer_at_screen_pos(10, 10, SCREEN_WIDTH - 10, SCREEN_HEIGHT - 10, firework_rocket_blur_alpha * 0.8); firework_rocket_frame_counter = gGameStatusPtr->frameCounter; firework_rocket_blur_alpha = 0; } @@ -293,7 +291,7 @@ void firework_rocket_appendGfx(void* effect) { for (i = 0; i < numSparks; i++, sparkDir++) { if (isExploded == TRUE) { // create blinking effect - if (shim_rand_int(16) < 6) { + if (rand_int(16) < 6) { continue; } x = (sparkDir->x * cosTheta + sparkDir->z * sinTheta) * radius + centerX; diff --git a/src/effects/flame.c b/src/effects/flame.c index 5817b2b316..5f68e61b4a 100644 --- a/src/effects/flame.c +++ b/src/effects/flame.c @@ -60,9 +60,9 @@ void flame_main( bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_FLAME; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - data = effect->data.flame = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.flame = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.flame != NULL); data->unk_00 = arg0; @@ -120,7 +120,7 @@ void flame_render(EffectInstance* effect) { f32 outZ; f32 outW; - shim_transform_point(gCameras[gCurrentCameraID].perspectiveMatrix, data->pos.x, data->pos.y, data->pos.z, 1.0f, + transform_point(gCameras[gCurrentCameraID].perspectiveMatrix, data->pos.x, data->pos.y, data->pos.z, 1.0f, &outX, &outY, &outZ, &outW); outDist = outZ + 5000; @@ -139,7 +139,7 @@ void flame_render(EffectInstance* effect) { renderTaskPtr->appendGfxArg = effect; renderTaskPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - shim_queue_render_task(renderTaskPtr); + queue_render_task(renderTaskPtr); } void flame_appendGfx(void* effect) { @@ -177,12 +177,12 @@ void flame_appendGfx(void* effect) { gDPSetPrimColor(gMainGfxPos++, 0, 0, unkStruct->unk_07, unkStruct->unk_07, unkStruct->unk_07, 0); gDPSetEnvColor(gMainGfxPos++, unkStruct->unk_04, unkStruct->unk_05, unkStruct->unk_06, 0); - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); - shim_guScaleF(sp58, data->unk_10 * data->unk_30, data->unk_10 * data->unk_2C, data->unk_10); - shim_guMtxCatF(sp58, sp98, sp98); - shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp98); + guScaleF(sp58, data->unk_10 * data->unk_30, data->unk_10 * data->unk_2C, data->unk_10); + guMtxCatF(sp58, sp98, sp98); + guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/flashing_box_shockwave.c b/src/effects/flashing_box_shockwave.c index cb4c530d6d..ae20db3cb8 100644 --- a/src/effects/flashing_box_shockwave.c +++ b/src/effects/flashing_box_shockwave.c @@ -31,9 +31,9 @@ EffectInstance* flashing_box_shockwave_main( bp.renderUI = NULL; bp.effectID = EFFECT_FLASHING_BOX_SHOCKWAVE; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.flashingBoxShockwave = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.flashingBoxShockwave = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.flashingBoxShockwave != NULL); data->unk_1C = 30; @@ -93,7 +93,7 @@ void flashing_box_shockwave_update(EffectInstance* effect) { data->unk_20++; if (data->unk_1C < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -131,7 +131,7 @@ void flashing_box_shockwave_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void flashing_box_shockwave_appendGfx(void* effect) { @@ -142,22 +142,22 @@ void flashing_box_shockwave_appendGfx(void* effect) { Matrix4f sp58; Matrix4f sp98; - shim_guRotateF(sp98, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guRotateF(sp98, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guMtxCatF(sp98, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guMtxCatF(sp98, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_30, data->unk_34, data->unk_38, data->unk_18); gDPSetEnvColor(gMainGfxPos++, data->unk_3C, data->unk_40, data->unk_44, 0); if ((unk_00 == 0 || unk_00 == 1) && unk_20 % 2) { - shim_guScaleF(sp18, data->unk_28, data->unk_2C, 15.0f / 14); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(sp18, data->unk_28, data->unk_2C, 15.0f / 14); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000600_3936A0); @@ -171,10 +171,10 @@ void flashing_box_shockwave_appendGfx(void* effect) { gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 0, data->unk_14); } - shim_guTranslateF(sp18, 0.0f, data->unk_2C, 0.0f); - shim_guScaleF(sp58, data->unk_24 * 0.25, data->unk_24 * 0.25, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, 0.0f, data->unk_2C, 0.0f); + guScaleF(sp58, data->unk_24 * 0.25, data->unk_24 * 0.25, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000950_3939F0); diff --git a/src/effects/floating_cloud_puff.c b/src/effects/floating_cloud_puff.c index 504c8ced75..d88a0ca67d 100644 --- a/src/effects/floating_cloud_puff.c +++ b/src/effects/floating_cloud_puff.c @@ -32,9 +32,9 @@ EffectInstance* floating_cloud_puff_main( bp.renderUI = NULL; bp.effectID = EFFECT_FLOATING_CLOUD_PUFF; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.floatingCloudPuff = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.floatingCloudPuff = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.floatingCloudPuff != NULL); data->unk_00 = arg0; @@ -78,7 +78,7 @@ void floating_cloud_puff_update(EffectInstance* effect) { data->unk_14++; if (data->unk_10 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -106,7 +106,7 @@ void floating_cloud_puff_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -124,10 +124,10 @@ void floating_cloud_puff_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); - shim_guScaleF(sp50, scale, scale, scale); - shim_guMtxCatF(sp50, sp10, sp10); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); + guScaleF(sp50, scale, scale, scale); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/floating_flower.c b/src/effects/floating_flower.c index 1ca473ef91..cebd73d9d2 100644 --- a/src/effects/floating_flower.c +++ b/src/effects/floating_flower.c @@ -24,9 +24,9 @@ void floating_flower_main(s32 type, f32 posX, f32 posY, f32 posZ, s32 duration) bp.renderUI = NULL; bp.effectID = EFFECT_FLOATING_FLOWER; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = 1; - part = effect->data.floatingFlower = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.floatingFlower = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.floatingFlower != NULL); @@ -55,15 +55,15 @@ void floating_flower_main(s32 type, f32 posX, f32 posY, f32 posZ, s32 duration) } else { part->accelY = 0.12f; part->jerkY = -0.0152f; - part->rot.x = (shim_rand_int(1) * 30) - 15; - part->rot.y = shim_rand_int(360); + part->rot.x = (rand_int(1) * 30) - 15; + part->rot.y = rand_int(360); part->angularVel.x = 0; - part->angularVel.y = (shim_rand_int(1) * 8) - 4; + part->angularVel.y = (rand_int(1) * 8) - 4; part->timeLeft = duration; part->lifetime = 0; - part->unk_44 = shim_rand_int(10); - part->unk_40 = shim_rand_int(20); - part->unk_3C = (shim_rand_int(1) * 2) - 1; + part->unk_44 = rand_int(10); + part->unk_40 = rand_int(20); + part->unk_3C = (rand_int(1) * 2) - 1; } D_E001A610++; @@ -123,7 +123,7 @@ void floating_flower_update(EffectInstance* effect) { data->timeLeft--; data->lifetime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); } } @@ -136,7 +136,7 @@ void floating_flower_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -150,15 +150,15 @@ void floating_flower_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); - shim_guPositionF(mtxTransform, part->rot.x, part->rot.y, 0.0f, 1.0f, part->pos.x, part->pos.y, part->pos.z); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(mtxTransform, part->rot.x, part->rot.y, 0.0f, 1.0f, part->pos.x, part->pos.y, part->pos.z); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); a = alpha = 255; gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (*gBackgroundFogModePtr == FOG_MODE_1) { - shim_get_background_color_blend(&rgb, &rgb, &rgb, &a); + get_background_color_blend(&rgb, &rgb, &rgb, &a); alpha -= a; } diff --git a/src/effects/floating_rock.c b/src/effects/floating_rock.c index a9e9b5e2a6..dba55221e4 100644 --- a/src/effects/floating_rock.c +++ b/src/effects/floating_rock.c @@ -29,9 +29,9 @@ EffectInstance* floating_rock_main(s32 type, f32 posX, f32 posY, f32 posZ, f32 f bp.renderUI = NULL; bp.effectID = EFFECT_FLOATING_ROCK; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.floatingRock = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.floatingRock = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.floatingRock != NULL); data->type = type; @@ -46,8 +46,8 @@ EffectInstance* floating_rock_main(s32 type, f32 posX, f32 posY, f32 posZ, f32 f data->vel.x = 0; data->vel.z = 0; data->rot.x = 0; - data->rot.y = shim_rand_int(360); - data->rot.z = shim_rand_int(360); + data->rot.y = rand_int(360); + data->rot.z = rand_int(360); data->rotVel.x = 0.0f; data->rotVel.z = 20.0f; data->rotVel.y = -20.0f; @@ -69,7 +69,7 @@ void floating_rock_update(EffectInstance* effect) { data->timeLeft--; data->lifetime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -82,7 +82,7 @@ void floating_rock_update(EffectInstance* effect) { data->rot.y += data->rotVel.y; if (data->pos.y <= data->floorY) { data->pos.y = data->floorY; - shim_load_effect(EFFECT_DUST); + load_effect(EFFECT_DUST); dust_main(2, data->pos.x, data->pos.y, data->pos.z, 20); data->timeLeft = 30; } @@ -103,7 +103,7 @@ void floating_rock_render(EffectInstance *effect) { renderTask.distance = effect76->pos.z; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -115,8 +115,8 @@ void floating_rock_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guPositionF(mtxTransform, data->rot.x, data->rot.z, data->rot.y, data->scale, data->pos.x, data->pos.y, data->pos.z); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(mtxTransform, data->rot.x, data->rot.z, data->rot.y, data->scale, data->pos.x, data->pos.y, data->pos.z); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 215, 215, 110, alpha); diff --git a/src/effects/flower_splash.c b/src/effects/flower_splash.c index b1e28f97b6..6639c1bd53 100644 --- a/src/effects/flower_splash.c +++ b/src/effects/flower_splash.c @@ -12,16 +12,16 @@ void flower_splash_update_part_transform(FlowerFXData* effect) { Matrix4f transformMtx; Matrix4f tempMtx; - shim_guRotateF(transformMtx, effect->rot.x, 1.0f, 0.0f, 0.0f); - shim_guRotateF(tempMtx, effect->rot.z, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(tempMtx, transformMtx, transformMtx); - shim_guRotateF(tempMtx, effect->rot.y, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(transformMtx, tempMtx, transformMtx); - shim_guScaleF(tempMtx, effect->scale.x, effect->scale.y, effect->scale.z); - shim_guMtxCatF(tempMtx, transformMtx, transformMtx); - shim_guTranslateF(tempMtx, effect->pos.x, effect->pos.y, effect->pos.z); - shim_guMtxCatF(transformMtx, tempMtx, transformMtx); - shim_guMtxF2L(transformMtx, &effect->transformMtx); + guRotateF(transformMtx, effect->rot.x, 1.0f, 0.0f, 0.0f); + guRotateF(tempMtx, effect->rot.z, 0.0f, 0.0f, 1.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guRotateF(tempMtx, effect->rot.y, 0.0f, 1.0f, 0.0f); + guMtxCatF(transformMtx, tempMtx, transformMtx); + guScaleF(tempMtx, effect->scale.x, effect->scale.y, effect->scale.z); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guTranslateF(tempMtx, effect->pos.x, effect->pos.y, effect->pos.z); + guMtxCatF(transformMtx, tempMtx, transformMtx); + guMtxF2L(transformMtx, &effect->transformMtx); } void flower_splash_update_part(FlowerFXData* effect) { @@ -58,13 +58,13 @@ void flower_splash_main(f32 posX, f32 posY, f32 posZ, f32 angle) { bp.renderUI = NULL; bp.effectID = EFFECT_FLOWER_SPLASH; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.flowerSplash = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.flowerSplash = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.flowerSplash != NULL); - shim_mem_clear(part, numParts * sizeof(*part)); + mem_clear(part, numParts * sizeof(*part)); for (i = 0; i < numParts; i++, part++) { part->alive = TRUE; @@ -93,9 +93,9 @@ void flower_splash_main(f32 posX, f32 posY, f32 posZ, f32 angle) { part->integrator[3] = 0.0f; part->velocityScaleA = -3.9f; - partAngle = shim_clamp_angle(part->rot.y); - part->velocity.x = shim_sin_deg(partAngle); - part->velocity.z = shim_cos_deg(partAngle); + partAngle = clamp_angle(part->rot.y); + part->velocity.x = sin_deg(partAngle); + part->velocity.z = cos_deg(partAngle); } } @@ -121,7 +121,7 @@ void flower_splash_update(EffectInstance* effect) { } if (!anyAlive) { - shim_remove_effect(effect); + remove_effect(effect); } } @@ -134,12 +134,12 @@ void flower_splash_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void flower_splash_dispose(EffectInstance* effect) { - shim_remove_effect(effect); + remove_effect(effect); } void flower_splash_appendGfx(void* effect) { diff --git a/src/effects/flower_trail.c b/src/effects/flower_trail.c index fd958b2b92..3da947c51f 100644 --- a/src/effects/flower_trail.c +++ b/src/effects/flower_trail.c @@ -13,16 +13,16 @@ void flower_trail_update_part_transform(FlowerFXData* effect) { Matrix4f transformMtx; Matrix4f tempMtx; - shim_guRotateF(transformMtx, effect->rot.x, 1.0f, 0.0f, 0.0f); - shim_guRotateF(tempMtx, effect->rot.z, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(tempMtx, transformMtx, transformMtx); - shim_guRotateF(tempMtx, effect->rot.y, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(transformMtx, tempMtx, transformMtx); - shim_guScaleF(tempMtx, effect->scale.x, effect->scale.y, effect->scale.z); - shim_guMtxCatF(tempMtx, transformMtx, transformMtx); - shim_guTranslateF(tempMtx, effect->pos.x, effect->pos.y, effect->pos.z); - shim_guMtxCatF(transformMtx, tempMtx, transformMtx); - shim_guMtxF2L(transformMtx, &effect->transformMtx); + guRotateF(transformMtx, effect->rot.x, 1.0f, 0.0f, 0.0f); + guRotateF(tempMtx, effect->rot.z, 0.0f, 0.0f, 1.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guRotateF(tempMtx, effect->rot.y, 0.0f, 1.0f, 0.0f); + guMtxCatF(transformMtx, tempMtx, transformMtx); + guScaleF(tempMtx, effect->scale.x, effect->scale.y, effect->scale.z); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guTranslateF(tempMtx, effect->pos.x, effect->pos.y, effect->pos.z); + guMtxCatF(transformMtx, tempMtx, transformMtx); + guMtxF2L(transformMtx, &effect->transformMtx); } void flower_trail_update_part(FlowerFXData* effect) { @@ -60,13 +60,13 @@ void flower_trail_main(s32 triggeredByNpc, f32 posX, f32 posY, f32 posZ, f32 ang bp.renderUI = NULL; bp.effectID = EFFECT_FLOWER_TRAIL; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.flowerTrail = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.flowerTrail = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.flowerTrail != NULL); - shim_mem_clear(part, numParts * sizeof(*part)); + mem_clear(part, numParts * sizeof(*part)); for (i = 0; i < numParts; i++, part++) { part->alive = TRUE; @@ -100,18 +100,18 @@ void flower_trail_main(s32 triggeredByNpc, f32 posX, f32 posY, f32 posZ, f32 ang part->rot.y = angle; part->rot.x = 0.0f; part->rot.z = 0.0f; - part->useAltColor = (shim_rand_int(100) >> 4) & 1; + part->useAltColor = (rand_int(100) >> 4) & 1; if (direction != 0.0f) { angleOffset = -90.0f; - partAngle = shim_clamp_angle(angle + angleOffset); + partAngle = clamp_angle(angle + angleOffset); } else { angleOffset = 90.0f; - partAngle = shim_clamp_angle(angle + angleOffset); + partAngle = clamp_angle(angle + angleOffset); } - part->velocity.x = shim_sin_deg(partAngle); - part->velocity.z = shim_cos_deg(partAngle); + part->velocity.x = sin_deg(partAngle); + part->velocity.z = cos_deg(partAngle); } } @@ -137,7 +137,7 @@ void flower_trail_update(EffectInstance* effect) { } if (!anyAlive) { - shim_remove_effect(effect); + remove_effect(effect); } } @@ -150,12 +150,12 @@ void flower_trail_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - queuedTaskPtr = shim_queue_render_task(&renderTask); + queuedTaskPtr = queue_render_task(&renderTask); queuedTaskPtr->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void flower_trail_dispose(EffectInstance* effect) { - shim_remove_effect(effect); + remove_effect(effect); } void flower_trail_appendGfx(void* argEffect) { diff --git a/src/effects/footprint.c b/src/effects/footprint.c index 072a5292ba..380a18f6ce 100644 --- a/src/effects/footprint.c +++ b/src/effects/footprint.c @@ -13,10 +13,10 @@ void func_E0018000(FootprintFXData* part) { Matrix4f sp18; Matrix4f sp58; - shim_guTranslateF(sp18, part->unk_0C, part->unk_10, part->unk_14); - shim_guRotateF(sp58, part->unk_28, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &part->mtx); + guTranslateF(sp18, part->unk_0C, part->unk_10, part->unk_14); + guRotateF(sp58, part->unk_28, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &part->mtx); } void footprint_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { @@ -35,14 +35,14 @@ void footprint_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, bp.renderUI = NULL; bp.effectID = EFFECT_FOOTPRINT; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = 1; - part = shim_general_heap_malloc(numParts * sizeof(*part)); + part = general_heap_malloc(numParts * sizeof(*part)); effect->data.footprint = part; ASSERT(effect->data.footprint != NULL); - shim_mem_clear(part, numParts * sizeof(*part)); + mem_clear(part, numParts * sizeof(*part)); for (i = 0; i < numParts; i++, part++) { part->alive = TRUE; @@ -61,12 +61,12 @@ void footprint_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, part->unk_24 = 0.0f; part->unk_28 = (arg3 + (arg4 * 30.0f)) - 15.0f; part->unk_2C = 0.0f; - temp_f20 = shim_clamp_angle(arg3); - part->unk_90 = shim_sin_deg(temp_f20); - part->unk_94 = shim_cos_deg(temp_f20); + temp_f20 = clamp_angle(arg3); + part->unk_90 = sin_deg(temp_f20); + part->unk_94 = cos_deg(temp_f20); temp_f20_2 = (temp_f20 + 45.0f) - (arg4 * 180.0f); - part->unk_0C += shim_sin_deg(temp_f20_2) * 5.0f; - part->unk_14 += shim_cos_deg(temp_f20_2) * 5.0f; + part->unk_0C += sin_deg(temp_f20_2) * 5.0f; + part->unk_14 += cos_deg(temp_f20_2) * 5.0f; part->alpha = 200; } } @@ -93,7 +93,7 @@ void footprint_update(EffectInstance* effect) { } if (!cond) { - shim_remove_effect(effect); + remove_effect(effect); } } @@ -106,12 +106,12 @@ void footprint_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00183BC(EffectInstance* effect) { - shim_remove_effect(effect); + remove_effect(effect); } void footprint_appendGfx(void* effect) { diff --git a/src/effects/fright_jar.c b/src/effects/fright_jar.c index c45efe5408..c447ed686a 100644 --- a/src/effects/fright_jar.c +++ b/src/effects/fright_jar.c @@ -36,9 +36,9 @@ EffectInstance* fright_jar_main( bp.renderUI = NULL; bp.effectID = EFFECT_FRIGHT_JAR; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.frightJar = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.frightJar = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.frightJar != NULL); data->unk_00 = arg0; @@ -79,7 +79,7 @@ void fright_jar_update(EffectInstance* effect) { data->unk_14++; if (data->unk_10 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -105,7 +105,7 @@ void fright_jar_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -126,10 +126,10 @@ void fright_jar_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); - shim_guScaleF(sp50, -data->unk_28, data->unk_28, data->unk_28); - shim_guMtxCatF(sp50, sp10, sp10); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); + guScaleF(sp50, -data->unk_28, data->unk_28, data->unk_28); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/gather_energy_pink.c b/src/effects/gather_energy_pink.c index a02d6b744e..b72ac6c337 100644 --- a/src/effects/gather_energy_pink.c +++ b/src/effects/gather_energy_pink.c @@ -32,9 +32,9 @@ void gather_energy_pink_main(s32 type, f32 posX, f32 posY, f32 posZ, f32 scale, bp.renderUI = NULL; bp.effectID = EFFECT_GATHER_ENERGY_PINK; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.gatherEnergyPink = shim_general_heap_malloc(sizeof(*data)); + data = effect->data.gatherEnergyPink = general_heap_malloc(sizeof(*data)); ASSERT (data != NULL); data->unk_00 = type; @@ -92,7 +92,7 @@ void gather_energy_pink_update(EffectInstance* effect) { part->unk_2C++; if (part->unk_28 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -112,12 +112,12 @@ void gather_energy_pink_update(EffectInstance* effect) { } if (part->unk_00 == 1) { - part->unk_1C += (part->unk_20 + shim_sin_deg(unk_28 * 10) * 0.1 * part->unk_20 - part->unk_1C) * 0.4; + part->unk_1C += (part->unk_20 + sin_deg(unk_28 * 10) * 0.1 * part->unk_20 - part->unk_1C) * 0.4; } else { - part->unk_1C += (part->unk_20 + shim_sin_deg(unk_28 * 10) * 0.1 * part->unk_20 - part->unk_1C) * 0.3; + part->unk_1C += (part->unk_20 + sin_deg(unk_28 * 10) * 0.1 * part->unk_20 - part->unk_1C) * 0.3; } - shim_transform_point(&gCameras[gCurrentCameraID].perspectiveMatrix[0], part->posA.x, part->posA.y, part->posA.z, 1.0f, &sp28, &sp2C, &sp30, &sp34); + transform_point(&gCameras[gCurrentCameraID].perspectiveMatrix[0], part->posA.x, part->posA.y, part->posA.z, 1.0f, &sp28, &sp2C, &sp30, &sp34); sp34 = 1.0f / sp34; sp28 *= sp34; @@ -153,7 +153,7 @@ void gather_energy_pink_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -175,25 +175,25 @@ void gather_energy_pink_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, dlist); - shim_guTranslateF(sp20, part->posB.x, part->posB.y, part->posB.z); - shim_guScaleF(sp60, part->unk_1C, part->unk_1C, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guPerspectiveF(sp60, &perspNorm, unk_00 == 1 ? 130.0f : 30.0f, (f32) camera->viewportW / camera->viewportH, 4.0f, 16384.0f, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, part->posB.x, part->posB.y, part->posB.z); + guScaleF(sp60, part->unk_1C, part->unk_1C, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guPerspectiveF(sp60, &perspNorm, unk_00 == 1 ? 130.0f : 30.0f, (f32) camera->viewportW / camera->viewportH, 4.0f, 16384.0f, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); switch (unk_00) { case 1: - shim_guTranslateF(sp20, 0.0f, 0.0f, -70.0f); + guTranslateF(sp20, 0.0f, 0.0f, -70.0f); break; case 0: - shim_guTranslateF(sp20, 0.0f, 0.0f, -80.0f); + guTranslateF(sp20, 0.0f, 0.0f, -80.0f); break; } - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/effects/gather_magic.c b/src/effects/gather_magic.c index 87bd962824..510299ba18 100644 --- a/src/effects/gather_magic.c +++ b/src/effects/gather_magic.c @@ -26,9 +26,9 @@ EffectInstance* gather_magic_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 ar bp.renderUI = NULL; bp.effectID = EFFECT_GATHER_MAGIC; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = shim_general_heap_malloc(numParts * sizeof(*data)); + data = general_heap_malloc(numParts * sizeof(*data)); effect->data.gatherMagic = data; ASSERT(effect->data.gatherMagic != NULL); @@ -88,7 +88,7 @@ void gather_magic_update(EffectInstance* effect) { part->unk_1C++; if (part->unk_18 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -111,10 +111,10 @@ void gather_magic_update(EffectInstance* effect) { f32 unk_20 = part->unk_20; f32 unk_2C = part->unk_2C; f32 unk_24 = part->unk_24; - f32 sin_20 = shim_sin_deg(unk_20); - f32 cos_20 = shim_cos_deg(unk_20); - f32 sin_24 = shim_sin_deg(unk_24); - f32 cos_24 = shim_cos_deg(unk_24); + f32 sin_20 = sin_deg(unk_20); + f32 cos_20 = cos_deg(unk_20); + f32 sin_24 = sin_deg(unk_24); + f32 cos_24 = cos_deg(unk_24); part->unk_08 = unk_2C * sin_20 * cos_24; part->unk_0C = unk_2C * cos_20 * cos_24; @@ -147,7 +147,7 @@ void gather_magic_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -164,10 +164,10 @@ void gather_magic_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10); - shim_guRotateF(sp98, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp98, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10); + guRotateF(sp98, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp98, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000080_38F790); @@ -180,10 +180,10 @@ void gather_magic_appendGfx(void* effect) { if (scale != 0.0f) { gDPSetPrimColor(gMainGfxPos++, 0, 0, unk_30, unk_34, unk_38, part->unk_14); - shim_guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10); - shim_guScaleF(sp58, scale, scale, scale); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10); + guScaleF(sp58, scale, scale, scale); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E008E890[i & 1]); diff --git a/src/effects/got_item_outline.c b/src/effects/got_item_outline.c index c9101c9dda..8d055031a1 100644 --- a/src/effects/got_item_outline.c +++ b/src/effects/got_item_outline.c @@ -41,9 +41,9 @@ void got_item_outline_main( bp.renderUI = NULL; bp.effectID = EFFECT_GOT_ITEM_OUTLINE; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.gotItemOutline = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.gotItemOutline = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.gotItemOutline != NULL); data->timeLeft = 100; @@ -67,7 +67,7 @@ void got_item_outline_update(EffectInstance* effect) { if (data->timeLeft < 100) { data->timeLeft--; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } } @@ -100,7 +100,7 @@ void got_item_outline_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -128,17 +128,17 @@ void got_item_outline_appendGfx(void* effect) { gDPSetEnvColor(gMainGfxPos++, 255, 255, 0, 255); } - shim_guTranslateF(mtxTransform, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(mtxTemp, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); - shim_guTranslateF(mtxTemp, 0.0f, 0.0f, -2.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guTranslateF(mtxTransform, data->pos.x, data->pos.y, data->pos.z); + guRotateF(mtxTemp, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guTranslateF(mtxTemp, 0.0f, 0.0f, -2.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); scale *= 0.6; - shim_guScaleF(mtxTemp, scale, scale, 1.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(mtxTemp, scale, scale, 1.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/effects/green_impact.c b/src/effects/green_impact.c index 1bf4128de5..0098e7c7e3 100644 --- a/src/effects/green_impact.c +++ b/src/effects/green_impact.c @@ -35,12 +35,12 @@ EffectInstance* green_impact_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 ar bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_GREEN_IMPACT; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.greenImpact = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.greenImpact = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.greenImpact != NULL); - shim_mem_clear(part, numParts * sizeof(*part)); + mem_clear(part, numParts * sizeof(*part)); part->unk_2C = 0; part->unk_00 = arg0; @@ -77,7 +77,7 @@ void green_impact_update(EffectInstance* effect) { part->unk_28--; if (part->unk_28 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -93,8 +93,8 @@ void green_impact_update(EffectInstance* effect) { part->unk_04 = 0; part->unk_08 = 0; part->unk_0C = 0; - part->unk_10 = -shim_sin_deg(part->unk_34) * 0.5; - part->unk_14 = shim_cos_deg(part->unk_34) * 0.5; + part->unk_10 = -sin_deg(part->unk_34) * 0.5; + part->unk_14 = cos_deg(part->unk_34) * 0.5; part->unk_18 = 0; part->unk_20 = 10.0f; part->unk_3C = 32.0f; @@ -126,7 +126,7 @@ void green_impact_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void green_impact_appendGfx(void* effect) { @@ -163,8 +163,8 @@ void green_impact_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, dlist); - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, part->unk_04, part->unk_08, part->unk_0C); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, part->unk_04, part->unk_08, part->unk_0C); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -183,14 +183,14 @@ void green_impact_appendGfx(void* effect) { part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { if (part->unk_4C >= 0) { - shim_guTranslateF(sp20, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp60, part->unk_34, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guScaleF(sp60, part->unk_1C * 0.3, part->unk_20 * 0.3, part->unk_24 * 0.3); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guRotateF(sp60, part->unk_30, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp60, part->unk_34, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guScaleF(sp60, part->unk_1C * 0.3, part->unk_20 * 0.3, part->unk_24 * 0.3); + guMtxCatF(sp60, sp20, sp20); + guRotateF(sp60, part->unk_30, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); dlist2 = D_09000540_365EF0; diff --git a/src/effects/hieroglyphs.c b/src/effects/hieroglyphs.c index f79bb66b56..14ff080eec 100644 --- a/src/effects/hieroglyphs.c +++ b/src/effects/hieroglyphs.c @@ -39,10 +39,10 @@ EffectInstance* hieroglyphs_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 arg effectBp.renderUI = NULL; effectBp.effectID = EFFECT_HIEROGLYPHS; - effect = shim_create_effect_instance(&effectBp); + effect = create_effect_instance(&effectBp); effect->numParts = numParts; - data = effect->data.hieroglyphs = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.hieroglyphs = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); data->unk_00 = arg0; @@ -85,7 +85,7 @@ void hieroglyphs_update(EffectInstance* effect) { } temp_a2 = ++data->lifeTime; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } if (data->timeLeft < 16) { @@ -105,7 +105,7 @@ void hieroglyphs_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -125,10 +125,10 @@ void hieroglyphs_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp20, data->pos.x, data->pos.y, data->pos.z); - shim_guScaleF(sp60, data->unk_38, data->unk_38, data->unk_38); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, data->pos.x, data->pos.y, data->pos.z); + guScaleF(sp60, data->unk_38, data->unk_38, data->unk_38); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -144,18 +144,18 @@ void hieroglyphs_appendGfx(void* effect) { (lifeTime * 2 + 127) * 4, 31 * 4); gMainGfxPos += 2; - shim_guRotateF(sp20, 20.0f, 1.0f, 0.0f, 0.0f); - shim_guPositionF(sp60, 0.0f, shim_sin_deg(lifeTime * 8 + 78.75) * -30.0f, 0.0f, 1.0f, 6.0f, 0.0f, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp20, 20.0f, 1.0f, 0.0f, 0.0f); + guPositionF(sp60, 0.0f, sin_deg(lifeTime * 8 + 78.75) * -30.0f, 0.0f, 1.0f, 6.0f, 0.0f, 0.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); for (i = 0; i < 16; i++) { f32 angle = i * 48 + lifeTime * 8; - shim_guPositionF(sp20, 0.0f, shim_sin_deg(angle) * 30.0f, 6.0f, (f32) i * 0.01 + 1.0, 8.0f, 0.0f, 0.0f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, sin_deg(angle) * 30.0f, 6.0f, (f32) i * 0.01 + 1.0, 8.0f, 0.0f, 0.0f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPVertex(gMainGfxPos++, &D_090010A8_3DDDF8[i * 2], 2, i * 2); @@ -174,8 +174,8 @@ void hieroglyphs_appendGfx(void* effect) { for (i = 0; i < 2; i++) { s32 idx = (lifeTime + i * 4) % 17; - shim_guPositionF(sp20, 0.0f, 0.0f, -0x11A + i * 0x24, 1.0f, 0.0f, 0.0f, 0.0f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, 0.0f, -0x11A + i * 0x24, 1.0f, 0.0f, 0.0f, 0.0f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E00E29F4[idx], D_E00E2A08[idx], D_E00E2A1C[idx], data->unk_24); diff --git a/src/effects/huff_puff_breath.c b/src/effects/huff_puff_breath.c index c0beebb512..25fd9f341f 100644 --- a/src/effects/huff_puff_breath.c +++ b/src/effects/huff_puff_breath.c @@ -26,10 +26,10 @@ EffectInstance* huff_puff_breath_main(s32 type, f32 posX, f32 posY, f32 posZ, f3 effectBp.renderUI = NULL; effectBp.effectID = EFFECT_HUFF_PUFF_BREATH; - effect = shim_create_effect_instance(&effectBp); + effect = create_effect_instance(&effectBp); effect->numParts = numParts; - data = effect->data.huffPuffBreath = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.huffPuffBreath = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); data->type = type; @@ -55,8 +55,8 @@ EffectInstance* huff_puff_breath_main(s32 type, f32 posX, f32 posY, f32 posZ, f3 data->angle = angle; data->speedY = 0; data->speedX = speed; - data->texOffsetX = shim_rand_int(32); - data->texOffsetY = shim_rand_int(16); + data->texOffsetX = rand_int(32); + data->texOffsetY = rand_int(16); data->primB = 150; data->envR = 215; data->envG = 210; @@ -84,7 +84,7 @@ void huff_puff_breath_update(EffectInstance* effect) { temp_a2 = ++data->lifeTime; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } if (data->timeLeft < 16) { @@ -118,7 +118,7 @@ void huff_puff_breath_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void func_E00DC2FC(void) { @@ -137,12 +137,12 @@ void huff_puff_breath_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(sp58, data->angle, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, data->scale, data->scale, data->scale); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guRotateF(sp58, data->angle, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, data->scale, data->scale, data->scale); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/ice_pillar.c b/src/effects/ice_pillar.c index 4d7745fcda..42b1d9158c 100644 --- a/src/effects/ice_pillar.c +++ b/src/effects/ice_pillar.c @@ -28,10 +28,10 @@ EffectInstance* ice_pillar_main(s32 arg0, f32 x, f32 y, f32 z, f32 scale, s32 ar effectBp.renderUI = NULL; effectBp.effectID = EFFECT_ICE_PILLAR; - effect = shim_create_effect_instance(&effectBp); + effect = create_effect_instance(&effectBp); effect->numParts = numParts; - data = effect->data.icePillar = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.icePillar = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); data->unk_00 = arg0; @@ -56,10 +56,10 @@ EffectInstance* ice_pillar_main(s32 arg0, f32 x, f32 y, f32 z, f32 scale, s32 ar data->env.a = 255; data->unk_24 = data->unk_25 = 0; - shim_load_effect(EFFECT_MISC_PARTICLES); + load_effect(EFFECT_MISC_PARTICLES); data->miscParticles = misc_particles_main(1, x, y + 10.0f, z, 32.0f, 30.0f, scale, 4, 0); - shim_load_effect(EFFECT_COLD_BREATH); + load_effect(EFFECT_COLD_BREATH); return effect; } @@ -84,30 +84,30 @@ void ice_pillar_update(EffectInstance* effect) { data->lifeTime++; if (data->timeLeft < 0) { - shim_load_effect(EFFECT_ICE_SHARD); + load_effect(EFFECT_ICE_SHARD); for (i = 0; i < 20; i++) { EffectInstance* iceShard; iceShard = ice_shard_main( (i % 2) + 2, - (data->pos.x + shim_rand_int(20)) - 10.0f, - data->pos.y + (shim_rand_int(40) * data->scale), + (data->pos.x + rand_int(20)) - 10.0f, + data->pos.y + (rand_int(40) * data->scale), data->pos.z + 3.0f, - (data->scale * ((shim_rand_int(10) * 0.7 * 0.1) + 0.3)), + (data->scale * ((rand_int(10) * 0.7 * 0.1) + 0.3)), i + 30 ); - iceShard->data.iceShard->animFrame = shim_rand_int(10) * 0.1; - iceShard->data.iceShard->animRate = (shim_rand_int(30) * 0.01) + 0.1; - iceShard->data.iceShard->rotation = shim_rand_int(359); - iceShard->data.iceShard->angularVel = shim_rand_int(20); - iceShard->data.iceShard->vel.x = shim_rand_int(10) - 5; - iceShard->data.iceShard->vel.y = shim_rand_int(10) - 5; + iceShard->data.iceShard->animFrame = rand_int(10) * 0.1; + iceShard->data.iceShard->animRate = (rand_int(30) * 0.01) + 0.1; + iceShard->data.iceShard->rotation = rand_int(359); + iceShard->data.iceShard->angularVel = rand_int(20); + iceShard->data.iceShard->vel.x = rand_int(10) - 5; + iceShard->data.iceShard->vel.y = rand_int(10) - 5; iceShard->data.iceShard->vel.z = 0; iceShard->data.iceShard->gravAccel = -0.1f; } - shim_remove_effect(data->miscParticles); - shim_remove_effect(effect); + remove_effect(data->miscParticles); + remove_effect(effect); return; } @@ -116,7 +116,7 @@ void ice_pillar_update(EffectInstance* effect) { data->unk_25--; if (data->unk_25 < 0) { - data->unk_25 = shim_rand_int(60) + 8; + data->unk_25 = rand_int(60) + 8; } if (data->unk_25 < 8) { @@ -126,7 +126,7 @@ void ice_pillar_update(EffectInstance* effect) { } if (timeLeft > 16 && (lifeTime % 16) == 0) { - shim_load_effect(EFFECT_COLD_BREATH); + load_effect(EFFECT_COLD_BREATH); cold_breath_main(2, data->pos.x, data->pos.y + (data->scale * 40.0f), data->pos.z, data->scale, 30); } data->miscParticles->data.miscParticles->pos.x = data->pos.x; @@ -143,7 +143,7 @@ void ice_pillar_render(EffectInstance* effect) { renderTask.distance = 5; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -157,10 +157,10 @@ void ice_pillar_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); camera = &gCameras[gCurrentCameraID]; - shim_guTranslateF(sp10, data->pos.x, data->pos.y, data->pos.z); - shim_guScaleF(sp50, data->scale, data->scale, data->scale); - shim_guMtxCatF(sp50, sp10, sp10); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp10, data->pos.x, data->pos.y, data->pos.z); + guScaleF(sp50, data->scale, data->scale, data->scale); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/effects/ice_shard.c b/src/effects/ice_shard.c index f8116bf45e..ad6bf8976d 100644 --- a/src/effects/ice_shard.c +++ b/src/effects/ice_shard.c @@ -33,9 +33,9 @@ EffectInstance* ice_shard_main( bp.renderUI = NULL; bp.effectID = EFFECT_ICE_SHARD; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.iceShard = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.iceShard = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.iceShard != NULL); data->type = arg0; @@ -58,12 +58,12 @@ EffectInstance* ice_shard_main( data->envCol.b = 255; data->envCol.a = 255; data->animFrame = 0; - data->animRate = (shim_rand_int(1) * 2 - 1) * 0.25 * (shim_rand_int(4) * 0.1 + 0.1); - data->rotation = shim_rand_int(359); - data->vel.x = shim_rand_int(10) - 5; - data->vel.y = shim_rand_int(10) - 5; - data->vel.z = shim_rand_int(10) - 5; - data->angularVel = shim_rand_int(40) - 20; + data->animRate = (rand_int(1) * 2 - 1) * 0.25 * (rand_int(4) * 0.1 + 0.1); + data->rotation = rand_int(359); + data->vel.x = rand_int(10) - 5; + data->vel.y = rand_int(10) - 5; + data->vel.z = rand_int(10) - 5; + data->angularVel = rand_int(40) - 20; data->gravAccel = -0.1f; return effect; @@ -88,7 +88,7 @@ void ice_shard_update(EffectInstance* effect) { data->lifetime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -126,7 +126,7 @@ void ice_shard_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -143,13 +143,13 @@ void ice_shard_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->scale, data->pos.x, data->pos.y, data->pos.z); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->scale, data->pos.x, data->pos.y, data->pos.z); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - shim_guRotateF(sp20, data->rotation, 0.0f, 0.0f, 1.0f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp20, data->rotation, 0.0f, 0.0f, 1.0f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E01108B4[0]); diff --git a/src/effects/landing_dust.c b/src/effects/landing_dust.c index a1aeb90b8d..a265602896 100644 --- a/src/effects/landing_dust.c +++ b/src/effects/landing_dust.c @@ -101,14 +101,14 @@ void landing_dust_main(s32 type, f32 x, f32 y, f32 z, f32 arg4) { bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_LANDING_DUST; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - data = shim_general_heap_malloc(numParts * sizeof(*data)); + data = general_heap_malloc(numParts * sizeof(*data)); effect->data.landingDust = data; ASSERT(effect->data.landingDust != NULL); - shim_mem_clear(data, numParts * sizeof(*data)); + mem_clear(data, numParts * sizeof(*data)); switch (type) { case 0: @@ -147,9 +147,9 @@ void landing_dust_main(s32 type, f32 x, f32 y, f32 z, f32 arg4) { data->x = 0.0f; data->y = 0.0f; data->z = 4.0f; - theta = shim_clamp_angle(90 + (180 * (i - 1))); - data->unk_30 = shim_sin_deg(theta); - data->unk_34 = shim_cos_deg(theta); + theta = clamp_angle(90 + (180 * (i - 1))); + data->unk_30 = sin_deg(theta); + data->unk_34 = cos_deg(theta); } break; case 2: @@ -159,27 +159,27 @@ void landing_dust_main(s32 type, f32 x, f32 y, f32 z, f32 arg4) { switch (i - 1) { case 0: theta = 135.0f; - data->x = -shim_sin_deg(theta) * 25.0f; + data->x = -sin_deg(theta) * 25.0f; data->y = 0.0f; - data->z = -shim_cos_deg(theta) * 25.0f; + data->z = -cos_deg(theta) * 25.0f; data->unk_24 = -0.04f; data->unk_28 = 0.94f; data->unk_20 = 0.95f; break; case 1: theta = -135.0f; - data->x = -shim_sin_deg(theta) * 25.0f; + data->x = -sin_deg(theta) * 25.0f; data->y = 4.0f; - data->z = -shim_cos_deg(theta) * 25.0f; + data->z = -cos_deg(theta) * 25.0f; data->unk_24 = -0.04f; data->unk_28 = 0.94f; data->unk_20 = 0.84999996f; break; case 2: theta = 20.0f; - data->x = -shim_sin_deg(theta) * 25.0f; + data->x = -sin_deg(theta) * 25.0f; data->y = 10.0f; - data->z = -shim_cos_deg(theta) * 25.0f; + data->z = -cos_deg(theta) * 25.0f; data->unk_24 = -0.04f; data->unk_28 = 0.94f; data->unk_20 = 0.75f; @@ -199,11 +199,11 @@ void landing_dust_main(s32 type, f32 x, f32 y, f32 z, f32 arg4) { data->unk_28 = 0.94f; data->unk_2C = 0.94f; theta = arg4 + ((i - 1) * 360 / (numParts - 1)); - data->x = -shim_sin_deg(theta) * 10.0f; + data->x = -sin_deg(theta) * 10.0f; data->y = 0.0f; - data->z = -shim_cos_deg(theta) * 10.0f; - data->unk_30 = shim_sin_deg(theta); - data->unk_34 = shim_cos_deg(theta); + data->z = -cos_deg(theta) * 10.0f; + data->unk_30 = sin_deg(theta); + data->unk_34 = cos_deg(theta); } break; } @@ -218,7 +218,7 @@ void landing_dust_update(EffectInstance* effect) { data->unk_40 = D_E000CD24[data->unk_38][data->unk_3C++]; if (data->unk_40 < 0) { - shim_remove_effect(effect); + remove_effect(effect); } else { s32 type = data->type; s32 i; @@ -253,7 +253,7 @@ void landing_dust_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -286,10 +286,10 @@ void landing_dust_appendGfx(void* effect) { spD8 = temp_t0 & 7; spDC = temp_t0 & 0x40; - shim_guTranslateF(mtx1, part->x, part->y, part->z); - shim_guRotateF(mtx2, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(mtx2, mtx1, mtx3); - shim_guMtxF2L(mtx3, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtx1, part->x, part->y, part->z); + guRotateF(mtx2, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtx2, mtx1, mtx3); + guMtxF2L(mtx3, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -332,8 +332,8 @@ void landing_dust_appendGfx(void* effect) { part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { - shim_guTranslateF(mtx1, part->x, part->y, part->z); - shim_guMtxF2L(mtx1, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtx1, part->x, part->y, part->z); + guMtxF2L(mtx1, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, dlist1); diff --git a/src/effects/lens_flare.c b/src/effects/lens_flare.c index 07a05b3f5a..3497010e89 100644 --- a/src/effects/lens_flare.c +++ b/src/effects/lens_flare.c @@ -36,9 +36,9 @@ void lens_flare_main(s32 type, f32 posX, f32 posY, f32 posZ, s32 duration) { bp.renderUI = NULL; bp.effectID = EFFECT_LENS_FLARE; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.lensFlare = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.lensFlare = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.lensFlare != NULL); data->type = type; @@ -73,7 +73,7 @@ void lens_flare_update(EffectInstance* effect) { data->lifetime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -89,8 +89,8 @@ void lens_flare_update(EffectInstance* effect) { data->largeFlareScaleVel += 0.29; data->largeFlareRot += data->largeFlareRotVel; data->largeFlareRotVel *= 0.93; - data->smallFlareScale = shim_sin_deg(time * 50) * 0.5 + 0.9; - data->smallFlareAlpha = shim_sin_deg(time * 40) * 64.0f + 144.0f; + data->smallFlareScale = sin_deg(time * 50) * 0.5 + 0.9; + data->smallFlareAlpha = sin_deg(time * 40) * 64.0f + 144.0f; } void lens_flare_render(EffectInstance* effect) { @@ -102,7 +102,7 @@ void lens_flare_render(EffectInstance* effect) { renderTask.distance = 20; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -119,18 +119,18 @@ void lens_flare_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, D_E0034788[type]); - shim_guTranslateF(mtxTransform, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(mtxTemp, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxShared); + guTranslateF(mtxTransform, data->pos.x, data->pos.y, data->pos.z); + guRotateF(mtxTemp, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxShared); alpha = data->smallFlareAlpha; idx = data->lifetime * 3; // small twinkling shine which changes color if (type == 0) { - shim_guScaleF(mtxTemp, data->smallFlareScale, data->smallFlareScale, data->smallFlareScale); - shim_guMtxCatF(mtxTemp, mtxShared, mtxTransform); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(mtxTemp, data->smallFlareScale, data->smallFlareScale, data->smallFlareScale); + guMtxCatF(mtxTemp, mtxShared, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); idx %= ARRAY_COUNT(D_E0034790); @@ -147,11 +147,11 @@ void lens_flare_appendGfx(void* effect) { // large growing white shine if (alpha > 0) { - shim_guScaleF(mtxTemp, data->largeFlareScale, data->largeFlareScale, data->largeFlareScale); - shim_guMtxCatF(mtxTemp, mtxShared, mtxTransform); - shim_guRotateF(mtxTemp, data->largeFlareRot, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(mtxTemp, data->largeFlareScale, data->largeFlareScale, data->largeFlareScale); + guMtxCatF(mtxTemp, mtxShared, mtxTransform); + guRotateF(mtxTemp, data->largeFlareRot, 0.0f, 0.0f, 1.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E0034790[idx], D_E0034790[idx + 1], D_E0034790[idx + 2], alpha); gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, alpha); diff --git a/src/effects/light_rays.c b/src/effects/light_rays.c index df2549f31b..fb0d0c2094 100644 --- a/src/effects/light_rays.c +++ b/src/effects/light_rays.c @@ -107,9 +107,9 @@ void light_rays_main( bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_LIGHT_RAYS; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.lightRays = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.lightRays = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.lightRays != NULL); part->type = type; @@ -201,7 +201,7 @@ void light_rays_update(EffectInstance* effect) { } if (part->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -263,7 +263,7 @@ void light_rays_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -291,7 +291,7 @@ void light_rays_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, dlist2); - shim_guTranslateF(mtxTranslate, part->pos.x, part->pos.y, part->pos.z); + guTranslateF(mtxTranslate, part->pos.x, part->pos.y, part->pos.z); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { @@ -306,8 +306,8 @@ void light_rays_appendGfx(void* effect) { func_E006A85C(part); } - shim_guRotateF(mtxTemp, part->rotation.x, 1.0f, 0.0f, 0.0f); - shim_guMtxCatF(mtxTemp, mtxTranslate, mtxTransform); + guRotateF(mtxTemp, part->rotation.x, 1.0f, 0.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTranslate, mtxTransform); if (type >= 2) { unk_64 = part->rotation.z; @@ -317,12 +317,12 @@ void light_rays_appendGfx(void* effect) { angleZ = unk_64 + 0.0f; } - shim_guRotateF(mtxTemp, angleZ, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); - shim_guRotateF(mtxTemp, part->rotation.y, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); - shim_guTranslateF(mtxTemp, part->unk_58, 0.0f, 0.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guRotateF(mtxTemp, angleZ, 0.0f, 0.0f, 1.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guRotateF(mtxTemp, part->rotation.y, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guTranslateF(mtxTemp, part->unk_58, 0.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); scaleX = scaleZ = (temp + 3.0f) * 0.25; switch (i & 3) { @@ -341,22 +341,22 @@ void light_rays_appendGfx(void* effect) { break; } - shim_guScaleF(mtxTemp, scaleX, scaleY, scaleZ); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guScaleF(mtxTemp, scaleX, scaleY, scaleZ); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 240, part->alpha); } else { - shim_guRotateF(mtxTemp, part->rotation.y, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); - shim_guRotateF(mtxTemp, part->rotation.z, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); - shim_guTranslateF(mtxTemp, part->unk_58, 0.0f, 0.0f); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guRotateF(mtxTemp, part->rotation.y, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guRotateF(mtxTemp, part->rotation.z, 0.0f, 0.0f, 1.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guTranslateF(mtxTemp, part->unk_58, 0.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 181, part->alpha); } - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, dlist); diff --git a/src/effects/lightning.c b/src/effects/lightning.c index d3ebbae5cc..2dbb180837 100644 --- a/src/effects/lightning.c +++ b/src/effects/lightning.c @@ -45,9 +45,9 @@ EffectInstance* lightning_main( bp.renderUI = NULL; bp.effectID = EFFECT_LIGHTNING; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.lightning = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.lightning = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.lightning != NULL); data->unk_00 = arg0; @@ -74,13 +74,13 @@ EffectInstance* lightning_main( if (arg0 == 1 || arg0 == 2) { if (arg0 == 1) { - shim_load_effect(EFFECT_GATHER_MAGIC); + load_effect(EFFECT_GATHER_MAGIC); data->unk_44 = gather_magic_main(0, -118.0f, 184.0f, 79.0f, 1.0f, -1); - shim_load_effect(EFFECT_BULB_GLOW); + load_effect(EFFECT_BULB_GLOW); bulb_glow_main(0, -120.0f, 189.0f, 77.0f, 1.0f, &data->unk_48); } else { - shim_load_effect(EFFECT_SNAKING_STATIC); + load_effect(EFFECT_SNAKING_STATIC); data->unk_48 = snaking_static_main(0, -120.0f, 189.0f, 72.0f, 1.0f, 0); data->unk_48->data.snakingStatic->unk_28 = 255; @@ -95,7 +95,7 @@ EffectInstance* lightning_main( if (arg0 >= 3) { s32 effectArg0; - shim_load_effect(EFFECT_FLASHING_BOX_SHOCKWAVE); + load_effect(EFFECT_FLASHING_BOX_SHOCKWAVE); if (gGameStatusPtr->isBattle == TRUE) { effectArg0 = 3; } else { @@ -128,15 +128,15 @@ void lightning_update(EffectInstance* effect) { data->unk_18++; if (data->unk_14 < 0) { - shim_remove_effect(effect); + remove_effect(effect); if (data->unk_48 != NULL) { - shim_remove_effect(data->unk_48); + remove_effect(data->unk_48); data->unk_48 = NULL; } if (data->unk_44 != NULL) { - shim_remove_effect(data->unk_44); + remove_effect(data->unk_44); data->unk_44 = NULL; } } else { @@ -144,7 +144,7 @@ void lightning_update(EffectInstance* effect) { s32 unk_18 = data->unk_18; if (data->unk_44 != NULL && unk_18 >= 18) { - shim_remove_effect(data->unk_44); + remove_effect(data->unk_44); data->unk_44 = NULL; } @@ -208,7 +208,7 @@ void lightning_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -245,24 +245,24 @@ void lightning_appendGfx(void* effect) { case 0: case 1: case 2: - shim_guPerspectiveF(sp20, &perspNorm, 30.0f, (f32) camera->viewportW / (f32) camera->viewportH, 4.0f, 16384.0f, 1.0f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPerspectiveF(sp20, &perspNorm, 30.0f, (f32) camera->viewportW / (f32) camera->viewportH, 4.0f, 16384.0f, 1.0f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - shim_guTranslateF(sp20, data->unk_04, data->unk_08, -500.0f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, data->unk_04, data->unk_08, -500.0f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 47, 198, 255); break; default: - shim_guTranslateF(sp20, data->unk_04, data->unk_08, data->unk_0C); - shim_guRotateF(sp60, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guTranslateF(sp60, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, data->unk_04, data->unk_08, data->unk_0C); + guRotateF(sp60, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp60, sp20, sp20); + guTranslateF(sp60, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 0, data->unk_10); diff --git a/src/effects/lightning_bolt.c b/src/effects/lightning_bolt.c index ffe28234b2..6d623829ce 100644 --- a/src/effects/lightning_bolt.c +++ b/src/effects/lightning_bolt.c @@ -67,9 +67,9 @@ EffectInstance* lightning_bolt_main( bp.renderUI = NULL; bp.effectID = EFFECT_LIGHTNING_BOLT; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.lightningBolt = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.lightningBolt = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.lightningBolt != NULL); data->type = type; @@ -94,14 +94,14 @@ EffectInstance* lightning_bolt_main( temp = SQ(startX - endX) + SQ(startY - endY) + SQ(startZ - endZ); if (temp != 0.0f) { - data->unk_114 = shim_sqrtf(temp) * 0.005; + data->unk_114 = sqrtf(temp) * 0.005; data->outerColor.r = 255; data->outerColor.g = 220; data->outerColor.b = 20; data->innerColor.r = 255; data->innerColor.g = 255; data->innerColor.b = 255; - data->unk_110 = shim_rand_int(359); + data->unk_110 = rand_int(359); return effect; } else { @@ -113,7 +113,7 @@ void lightning_bolt_init(EffectInstance* effect) { } f32 lightning_bolt_get_rand_symmetric(f32 interval) { - return (f32)shim_rand_int(interval) - interval * 0.5; + return (f32)rand_int(interval) - interval * 0.5; } void lightning_bolt_update(EffectInstance* effect) { @@ -132,7 +132,7 @@ void lightning_bolt_update(EffectInstance* effect) { data->lifetime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -162,7 +162,7 @@ void lightning_bolt_render(EffectInstance *effect) { } renderTaskPointer->renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(renderTaskPointer); + retTask = queue_render_task(renderTaskPointer); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -208,8 +208,8 @@ void lightning_bolt_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guScaleF(sp10, 0.1f, 0.1f, 0.1f); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(sp10, 0.1f, 0.1f, 0.1f); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->outerColor.r, data->outerColor.g, data->outerColor.b, alpha); @@ -237,8 +237,8 @@ void lightning_bolt_appendGfx(void* effect) { theta = (data->unk_110 + (i - lifetime) * 10) % 120 - 60; deltaPos = preset->offset[i]; - sinAngle = shim_sin_deg(theta) * deltaPos * 0.04; - cosAngle = shim_cos_deg(theta) * deltaPos * 0.04; + sinAngle = sin_deg(theta) * deltaPos * 0.04; + cosAngle = cos_deg(theta) * deltaPos * 0.04; deltaX = avgDeltaX * cosAngle - avgDeltaY * sinAngle; deltaY = avgDeltaX * sinAngle + avgDeltaY * cosAngle; @@ -258,14 +258,14 @@ void lightning_bolt_appendGfx(void* effect) { for (i = 0; i < ARRAY_COUNT(data->boltVertexPosX); i++) { if (i == 0) { edgeLength = 8.0f; - edgeAngle = -shim_atan2(data->boltVertexPosY[1], -data->boltVertexPosX[1], data->boltVertexPosY[0], -data->boltVertexPosX[0]); + edgeAngle = -atan2(data->boltVertexPosY[1], -data->boltVertexPosX[1], data->boltVertexPosY[0], -data->boltVertexPosX[0]); } else { edgeLength = 8.0f; if (i == ARRAY_COUNT(data->boltVertexPosX) - 1) { edgeAngle = -90.0f; } else { - nextAngle = -shim_atan2(data->boltVertexPosY[i + 1], -data->boltVertexPosX[i + 1], data->boltVertexPosY[i], -data->boltVertexPosX[i]); - prevAngle = -shim_atan2(data->boltVertexPosY[i], -data->boltVertexPosX[i], data->boltVertexPosY[i - 1], -data->boltVertexPosX[i - 1]); + nextAngle = -atan2(data->boltVertexPosY[i + 1], -data->boltVertexPosX[i + 1], data->boltVertexPosY[i], -data->boltVertexPosX[i]); + prevAngle = -atan2(data->boltVertexPosY[i], -data->boltVertexPosX[i], data->boltVertexPosY[i - 1], -data->boltVertexPosX[i - 1]); if (prevAngle - nextAngle > 180.0f) { nextAngle += 360.0f; } else if (prevAngle - nextAngle < -180.0f) { @@ -283,8 +283,8 @@ void lightning_bolt_appendGfx(void* effect) { edgeLength *= (widthScale * data->edgeLength[i]); texOffsetX = (128 - i * 12) * 32; - edgeDeltaX = edgeLength * shim_sin_deg(edgeAngle); - edgeDeltaY = edgeLength * shim_cos_deg(edgeAngle); + edgeDeltaX = edgeLength * sin_deg(edgeAngle); + edgeDeltaY = edgeLength * cos_deg(edgeAngle); edgeDeltaZ = 0.0f; vtx->ob[0] = (data->boltVertexPosX[i] + edgeDeltaX) * 10.0f; diff --git a/src/effects/lil_oink.c b/src/effects/lil_oink.c index 66a3f7bfe7..ec98b923c1 100644 --- a/src/effects/lil_oink.c +++ b/src/effects/lil_oink.c @@ -63,9 +63,9 @@ EffectInstance* lil_oink_main(void) { bp.renderUI = NULL; bp.effectID = EFFECT_LIL_OINK; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.lilOink = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.lilOink = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); data->lifetime = 0; @@ -109,7 +109,7 @@ void lil_oink_update(EffectInstance* effect) { break; case LIL_OINK_ANIM_3: data->gfxFrame[i] = lil_oink_AnimateGfxSelect[time % ARRAY_COUNT(lil_oink_AnimateGfxSelect)]; - data->rot[i] = data->rot[i] + shim_sin_deg(time * 10); + data->rot[i] = data->rot[i] + sin_deg(time * 10); if (time >= 36) { animDone = TRUE; data->animTime[i] = 0; @@ -117,7 +117,7 @@ void lil_oink_update(EffectInstance* effect) { break; case LIL_OINK_ANIM_2: data->gfxFrame[i] = lil_oink_AnimateGfxSelect[time % ARRAY_COUNT(lil_oink_AnimateGfxSelect)]; - data->jumpOffset[i] = shim_sin_deg(time * 20) * 2.0f; + data->jumpOffset[i] = sin_deg(time * 20) * 2.0f; animDone = TRUE; if (time >= 9) { data->jumpOffset[i] = 0.0f; @@ -126,7 +126,7 @@ void lil_oink_update(EffectInstance* effect) { break; case LIL_OINK_ANIM_4: data->gfxFrame[i] = lil_oink_AnimateGfxSelect[time % ARRAY_COUNT(lil_oink_AnimateGfxSelect)]; - data->jumpOffset[i] = shim_sin_deg(time * 20) * 4.0f; + data->jumpOffset[i] = sin_deg(time * 20) * 4.0f; if (!(time < 9)) { animDone = TRUE; data->jumpOffset[i] = 0.0f; @@ -136,7 +136,7 @@ void lil_oink_update(EffectInstance* effect) { case LIL_OINK_ANIM_5: default: data->gfxFrame[i] = lil_oink_AnimateGfxSelect[time % ARRAY_COUNT(lil_oink_AnimateGfxSelect)]; - data->jumpOffset[i] = shim_sin_deg(time * 5) * 12.0f; + data->jumpOffset[i] = sin_deg(time * 5) * 12.0f; if (!(time < 36)) { animDone = TRUE; data->jumpOffset[i] = 0.0f; @@ -164,7 +164,7 @@ void lil_oink_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -183,15 +183,15 @@ void lil_oink_appendGfx(void* effect) { for (i = 0; i < MAX_LIL_OINKS; i++) { if (data->flags[i] & LIL_OINK_FLAG_VISIBLE) { - shim_guPositionF(mtxTransform, 0.0f, 180.0f - data->rot[i], 0.0f, 1.0f, + guPositionF(mtxTransform, 0.0f, 180.0f - data->rot[i], 0.0f, 1.0f, data->x[i], data->y[i] + data->jumpOffset[i], data->z[i]); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E0114718[data->type[i]]); if (data->type[i] == LIL_OINK_TYPE_SILVER || data->type[i] == LIL_OINK_TYPE_GOLD) { - f32 shineVariation = shim_sin_deg(angle) * 63.0f; + f32 shineVariation = sin_deg(angle) * 63.0f; s8 primColor = shineVariation + 63.0f; gDPSetPrimColor(gMainGfxPos++, 0, 0, primColor, primColor, primColor, 0); diff --git a/src/effects/merlin_house_stars.c b/src/effects/merlin_house_stars.c index e7dc284aa1..6a96602fc1 100644 --- a/src/effects/merlin_house_stars.c +++ b/src/effects/merlin_house_stars.c @@ -22,9 +22,9 @@ EffectInstance* merlin_house_stars_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) bp.renderUI = NULL; bp.effectID = EFFECT_MERLIN_HOUSE_STARS; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.merlinHouseStars = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.merlinHouseStars = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.merlinHouseStars != NULL); data->unk_04 = 100; @@ -63,7 +63,7 @@ void merlin_house_stars_update(EffectInstance* effect) { data->unk_08++; if (data->unk_04 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -119,7 +119,7 @@ void merlin_house_stars_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -137,10 +137,10 @@ void merlin_house_stars_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp10, data->unk_0C, data->unk_10, data->unk_14); - shim_guScaleF(sp50, 0.96f, 0.96f, 0.96f); - shim_guMtxCatF(sp50, sp10, sp10); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp10, data->unk_0C, data->unk_10, data->unk_14); + guScaleF(sp50, 0.96f, 0.96f, 0.96f); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, 127); diff --git a/src/effects/misc_particles.c b/src/effects/misc_particles.c index bfe5c97c19..21d39e99b6 100644 --- a/src/effects/misc_particles.c +++ b/src/effects/misc_particles.c @@ -69,9 +69,9 @@ EffectInstance* misc_particles_main( bp.renderUI = NULL; bp.effectID = EFFECT_MISC_PARTICLES; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParticles; - part = effect->data.miscParticles = shim_general_heap_malloc(numParticles * sizeof(*part)); + part = effect->data.miscParticles = general_heap_malloc(numParticles * sizeof(*part)); ASSERT(effect->data.miscParticles != NULL); part->variation = variation; @@ -113,9 +113,9 @@ EffectInstance* misc_particles_main( part->glowColor.a = 255; break; default: - part->innerColor.r = shim_rand_int(127) + 128; - part->innerColor.g = shim_rand_int(255 - part->innerColor.r) + 128; - part->innerColor.b = shim_rand_int(383 - part->innerColor.r - part->innerColor.g) + 128; + part->innerColor.r = rand_int(127) + 128; + part->innerColor.g = rand_int(255 - part->innerColor.r) + 128; + part->innerColor.b = rand_int(383 - part->innerColor.r - part->innerColor.g) + 128; part->glowColor.r = 127; part->glowColor.g = 127; part->glowColor.b = 127; @@ -172,7 +172,7 @@ void misc_particles_update(EffectInstance* effect) { particle->lifetime++; if (particle->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -187,8 +187,8 @@ void misc_particles_update(EffectInstance* effect) { posX = particle->pos.x; posY = particle->pos.y; posZ = particle->pos.z; - temp_cos = shim_cos_deg(gCameras[gCurrentCameraID].currentYaw); - temp_sin = shim_sin_deg(gCameras[gCurrentCameraID].currentYaw); + temp_cos = cos_deg(gCameras[gCurrentCameraID].currentYaw); + temp_sin = sin_deg(gCameras[gCurrentCameraID].currentYaw); innerColorR = particle->innerColor.r; innerColorG = particle->innerColor.g; innerColorB = particle->innerColor.b; @@ -208,9 +208,9 @@ void misc_particles_update(EffectInstance* effect) { if (particle->animTime >= 0) { if (particle->animTime == 0) { - f32 randMag = shim_rand_int(scaleX) - scaleX * 0.5; + f32 randMag = rand_int(scaleX) - scaleX * 0.5; particle->pos.x = posX + randMag * temp_cos - temp_sin; - particle->pos.y = posY + shim_rand_int(scaleY); + particle->pos.y = posY + rand_int(scaleY); particle->pos.z = posZ + randMag * temp_sin + temp_cos; particle->innerColor.r = innerColorR; particle->innerColor.g = innerColorG; @@ -224,10 +224,10 @@ void misc_particles_update(EffectInstance* effect) { particle->unk_18 = 0.0f; particle->unk_1C = 0.0f; particle->unk_24 = 0.0f; - particle->unk_28 = (f32) (-shim_rand_int(10) - 2) * 0.05; + particle->unk_28 = (f32) (-rand_int(10) - 2) * 0.05; particle->unk_5C = 0.0f; particle->unk_60 = 0.0f; - particle->scale = (f32) shim_rand_int(10) * 0.05 + 0.5; + particle->scale = (f32) rand_int(10) * 0.05 + 0.5; } particle->innerColor.a = D_E00E4E00[particle->animTime]; particle->pos.x += particle->unk_18; @@ -241,16 +241,16 @@ void misc_particles_update(EffectInstance* effect) { case 3: if (particle->animTime == 0) { if (variation == 2) { - particle->unk_18 = (f32) (shim_rand_int(20) - 10) * 0.05; - particle->unk_1C = (f32) (shim_rand_int(20) - 10) * 0.05; + particle->unk_18 = (f32) (rand_int(20) - 10) * 0.05; + particle->unk_1C = (f32) (rand_int(20) - 10) * 0.05; } else { particle->unk_18 = 0.0f; particle->unk_1C = 0.0f; } particle->unk_24 = 0.0f; particle->unk_28 = 0.0f; - particle->unk_5C = shim_rand_int(15); - particle->unk_60 = shim_rand_int(15); + particle->unk_5C = rand_int(15); + particle->unk_60 = rand_int(15); particle->innerColor.a = 255; } particle->scale = (f32) D_E00E4DC0[particle->animTime] * 0.1; @@ -267,9 +267,9 @@ void misc_particles_update(EffectInstance* effect) { particle->unk_60 = 0.0f; particle->innerColor.a = 255; particle->scale = 1.0f; - particle->innerColor.r = shim_rand_int(127) + 128; - particle->innerColor.g = shim_rand_int(255 - particle->innerColor.r) + 128; - particle->innerColor.b = shim_rand_int(383 - particle->innerColor.r - particle->innerColor.g) + 128; + particle->innerColor.r = rand_int(127) + 128; + particle->innerColor.g = rand_int(255 - particle->innerColor.r) + 128; + particle->innerColor.b = rand_int(383 - particle->innerColor.r - particle->innerColor.g) + 128; } if (variation == 4) { particle->scale = (f32) D_E00E4DE0[particle->animTime] * 0.01; @@ -291,7 +291,7 @@ void misc_particles_render(EffectInstance* effect) { renderTask.distance = 7; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -314,8 +314,8 @@ void misc_particles_appendGfx(void* effect) { particle++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, particle++) { if (particle->animTime >= 0) { - shim_guPositionF(mtxTransform, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, particle->scale * alphaScale, particle->pos.x, particle->pos.y, particle->pos.z); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(mtxTransform, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, particle->scale * alphaScale, particle->pos.x, particle->pos.y, particle->pos.z); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 80 - particle->animTime, particle->innerColor.r, particle->innerColor.g, particle->innerColor.b, alphaScale * particle->innerColor.a); diff --git a/src/effects/motion_blur_flame.c b/src/effects/motion_blur_flame.c index 9732d30492..68684a4d16 100644 --- a/src/effects/motion_blur_flame.c +++ b/src/effects/motion_blur_flame.c @@ -44,9 +44,9 @@ EffectInstance* motion_blur_flame_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f bp.renderUI = NULL; bp.effectID = EFFECT_MOTION_BLUR_FLAME; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.motionBlurFlame = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.motionBlurFlame = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.motionBlurFlame != NULL); data->unk_00 = arg0; @@ -90,7 +90,7 @@ void motion_blur_flame_update(EffectInstance* effect) { } if (data->unk_50 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } temp = data->unk_50; @@ -116,7 +116,7 @@ void motion_blur_flame_render(EffectInstance* effect) { renderTask.distance = 100; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -165,7 +165,7 @@ void motion_blur_flame_appendGfx(void* effect) { s32 height = temp_s1->unk_14; if (i == 0) { - var_a2 = shim_is_point_visible(temp_f12, temp_f14, temp_f0, -1, &sp48, &sp4C); + var_a2 = is_point_visible(temp_f12, temp_f14, temp_f0, -1, &sp48, &sp4C); } else { var_a2 = temp_f0; sp48 = temp_f12; diff --git a/src/effects/moving_cloud.c b/src/effects/moving_cloud.c index 3f16c75f39..fd20cdce68 100644 --- a/src/effects/moving_cloud.c +++ b/src/effects/moving_cloud.c @@ -40,9 +40,9 @@ EffectInstance* moving_cloud_main( bp.renderUI = NULL; bp.effectID = EFFECT_MOVING_CLOUD; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.movingCloud = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.movingCloud = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.movingCloud != NULL); data->unk_00 = arg0; @@ -54,7 +54,7 @@ EffectInstance* moving_cloud_main( var_f12 = SQ(temp_f24) + SQ(temp_f22) + SQ(temp_f20); if (var_f12 != 0.0f) { - var_f12 = shim_sqrtf(var_f12); + var_f12 = sqrtf(var_f12); } if (arg7 > 0.0f) { @@ -132,7 +132,7 @@ void moving_cloud_update(EffectInstance* effect) { data->unk_20++; if (data->unk_1C < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -172,7 +172,7 @@ void moving_cloud_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -186,10 +186,10 @@ void moving_cloud_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); - shim_guScaleF(sp50, data->unk_44, data->unk_44, data->unk_44); - shim_guMtxCatF(sp50, sp10, sp10); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); + guScaleF(sp50, data->unk_44, data->unk_44, data->unk_44); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/music_note.c b/src/effects/music_note.c index 92829bf236..e70390aa3a 100644 --- a/src/effects/music_note.c +++ b/src/effects/music_note.c @@ -48,10 +48,10 @@ void music_note_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.renderUI = NULL; bp.effectID = EFFECT_MUSIC_NOTE; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.musicNote = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.musicNote = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.musicNote != NULL); @@ -63,7 +63,7 @@ void music_note_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { part->timeLeft = 0x40; part->unk_14 = 0; part->unk_1C = 0; - part->unk_20 = shim_rand_int(6); + part->unk_20 = rand_int(6); switch (arg0) { case 0: part->unk_24 = 0.0f; @@ -72,16 +72,16 @@ void music_note_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { part->unk_30 = 1.0f; break; case 1: - randInt = shim_rand_int(10); + randInt = rand_int(10); part->unk_24 = (randInt * 0.1) + -5.0; - part->unk_28 = (shim_rand_int(10) * 0.1) + 0.5; + part->unk_28 = (rand_int(10) * 0.1) + 0.5; part->unk_2C = 0; part->unk_30 = 0.0f; break; default: - randInt = shim_rand_int(10); + randInt = rand_int(10); part->unk_24 = 5.0 - (randInt * 0.1); - part->unk_28 = (shim_rand_int(10) * 0.1) + 1.0; + part->unk_28 = (rand_int(10) * 0.1) + 1.0; part->unk_2C = 0; part->unk_30 = 0.0f; break; @@ -99,7 +99,7 @@ void music_note_update(EffectInstance* effect) { part->unk_1C++; timeLeft = part->timeLeft; if (timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } if (timeLeft >= 6) { @@ -124,7 +124,7 @@ void music_note_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -146,12 +146,12 @@ void music_note_appendGfx(void* data) { gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E004C67C[rgbOffset], D_E004C67C[rgbOffset + 1], D_E004C67C[rgbOffset + 2], fxData->unk_14 ); - shim_guTranslateF(sp18, fxData->pos.x, fxData->pos.y, fxData->pos.z); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, fxData->unk_10, fxData->unk_10, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, fxData->pos.x, fxData->pos.y, fxData->pos.z); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, fxData->unk_10, fxData->unk_10, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E004C660[dlistIdx]); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); diff --git a/src/effects/partner_buff.c b/src/effects/partner_buff.c index 3fa2f27e75..6caadfcc41 100644 --- a/src/effects/partner_buff.c +++ b/src/effects/partner_buff.c @@ -49,9 +49,9 @@ EffectInstance* partner_buff_main(s32 useRandomValues, f32 arg1, f32 arg2, f32 a bp.renderUI = func_E011A3A0; bp.effectID = EFFECT_PARTNER_BUFF; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.partnerBuff = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.partnerBuff = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.partnerBuff != NULL); part->useRandomValues = useRandomValues; @@ -97,7 +97,7 @@ void partner_buff_update(EffectInstance* effect) { data->lifeTime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -111,7 +111,7 @@ void partner_buff_update(EffectInstance* effect) { } // possibly a leftover debug option if (useRandomValues == 1 && time % 30 == 0) { - buff->turnsLeft = shim_rand_int(4); + buff->turnsLeft = rand_int(4); } switch (buff->state) { diff --git a/src/effects/peach_star_beam.c b/src/effects/peach_star_beam.c index 7e4bcd42f5..3e4d5fa879 100644 --- a/src/effects/peach_star_beam.c +++ b/src/effects/peach_star_beam.c @@ -48,9 +48,9 @@ EffectInstance* peach_star_beam_main(s32 type, f32 x, f32 y, f32 z, f32 arg4, s3 bp.renderUI = NULL; bp.effectID = EFFECT_PEACH_STAR_BEAM; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.peachStarBeam = shim_general_heap_malloc(sizeof(*data)); + data = effect->data.peachStarBeam = general_heap_malloc(sizeof(*data)); ASSERT(effect->data.peachStarBeam != NULL); data->type = type; @@ -117,7 +117,7 @@ void peach_star_beam_update(EffectInstance* effect) { data->lifetime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -137,9 +137,9 @@ void peach_star_beam_update(EffectInstance* effect) { part->pos.z = centerZ; } else { spiritAngle = rotationAngle + ((-360 + (360 * i)) / 7); - part->pos.x = centerX + radius * shim_sin_deg(spiritAngle); + part->pos.x = centerX + radius * sin_deg(spiritAngle); part->pos.y = centerY; - part->pos.z = centerZ + radius * shim_cos_deg(spiritAngle); + part->pos.z = centerZ + radius * cos_deg(spiritAngle); } if (!(part->flags & 2)) { part->lockedPos.x = part->pos.x; @@ -158,7 +158,7 @@ void peach_star_beam_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -189,8 +189,8 @@ void peach_star_beam_appendGfx(void* effect) { } if (!(data->pos.z < partZ)) { - shim_guPositionF(sp20, 0.0f, 0.0f, 0.0f, SPRITE_WORLD_SCALE_F, partX, partY, partZ); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, 0.0f, 0.0f, SPRITE_WORLD_SCALE_F, partX, partY, partZ); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -203,10 +203,10 @@ void peach_star_beam_appendGfx(void* effect) { } } - shim_guTranslateF(sp20, data->pos.x, data->pos.y - (((f32) (255 - data->unk_3C) * 400.0) / 255.0), data->pos.z); - shim_guScaleF(sp60, data->beamScale * 0.4, data->beamScale * 0.4, data->beamScale * 0.4); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, data->pos.x, data->pos.y - (((f32) (255 - data->unk_3C) * 400.0) / 255.0), data->pos.z); + guScaleF(sp60, data->beamScale * 0.4, data->beamScale * 0.4, data->beamScale * 0.4); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -233,8 +233,8 @@ void peach_star_beam_appendGfx(void* effect) { } if (!(partZ <= data->pos.z)) { - shim_guPositionF(sp20, 0.0f, 0.0f, 0.0f, 0.67f, partX, partY, partZ); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, 0.0f, 0.0f, 0.67f, partX, partY, partZ); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/effects/pink_sparkles.c b/src/effects/pink_sparkles.c index d8c05bc3bb..288520938b 100644 --- a/src/effects/pink_sparkles.c +++ b/src/effects/pink_sparkles.c @@ -113,9 +113,9 @@ EffectInstance* pink_sparkles_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 a bp.renderUI = NULL; bp.effectID = EFFECT_PINK_SPARKLES; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.pinkSparkles = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.pinkSparkles = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.pinkSparkles != NULL); part->unk_04 = arg1; @@ -132,15 +132,15 @@ EffectInstance* pink_sparkles_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 a for (i = 0; i < 16; i++) { for (j = 0; j < 16; j++) { if (D_E01248C0[j + (15 - i) * 16 + arg0 * 256] != 46) { - f32 temp_f20 = j * 2 - 16 + (shim_rand_int(20) - 10) * 0.1; + f32 temp_f20 = j * 2 - 16 + (rand_int(20) - 10) * 0.1; - part->unk_04 = temp_f20 * shim_cos_deg(angle); - part->unk_08 = i * 2 + (shim_rand_int(20) - 10) * 0.1; - part->unk_0C = temp_f20 * shim_sin_deg(angle); + part->unk_04 = temp_f20 * cos_deg(angle); + part->unk_08 = i * 2 + (rand_int(20) - 10) * 0.1; + part->unk_0C = temp_f20 * sin_deg(angle); part->unk_10 = part->unk_04 * 0.04; part->unk_14 = part->unk_08 * 0.04; - part->unk_18 = shim_rand_int(10) * 0.001; - part->unk_1C = shim_rand_int(7) + 30; + part->unk_18 = rand_int(10) * 0.001; + part->unk_1C = rand_int(7) + 30; part->unk_20 = 0; count++; @@ -210,7 +210,7 @@ void pink_sparkles_update(EffectInstance* effect) { } if (count >= effect->numParts - 1) { - shim_remove_effect(effect); + remove_effect(effect); } } @@ -223,7 +223,7 @@ void pink_sparkles_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void pink_sparkles_appendGfx(void* effect) { @@ -246,21 +246,21 @@ void pink_sparkles_appendGfx(void* effect) { colorIdx = (part->unk_20 - 1) * 3; - shim_guTranslateF(sp98, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp98, sp98); + guTranslateF(sp98, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp98, sp98); part++; for (i = 0; i < ((EffectInstance*)effect)->numParts - 1; i++, part++) { s32 unk_28 = part->unk_28; if (unk_28 >= 0) { - shim_guTranslateF(sp58, part->unk_04, part->unk_08, part->unk_0C); + guTranslateF(sp58, part->unk_04, part->unk_08, part->unk_0C); sp58[0][0] = sp58[1][1] = sp58[2][2] = part->unk_24; - shim_guMtxCatF(sp58, sp98, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxCatF(sp58, sp98, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); if (colorIdx >= ARRAY_COUNT(D_E0124BC0)) { colorIdx = 0; diff --git a/src/effects/purple_ring.c b/src/effects/purple_ring.c index ee7a23b34d..e837d13a80 100644 --- a/src/effects/purple_ring.c +++ b/src/effects/purple_ring.c @@ -42,7 +42,7 @@ EffectInstance* purple_ring_main( return NULL; } - temp_f12 = 1.0f / shim_sqrtf(temp_f12); + temp_f12 = 1.0f / sqrtf(temp_f12); arg4 *= temp_f12; arg5 *= temp_f12; arg6 *= temp_f12; @@ -66,7 +66,7 @@ EffectInstance* purple_ring_main( return NULL; } - temp_f12 = 1.0f / shim_sqrtf(temp_f12); + temp_f12 = 1.0f / sqrtf(temp_f12); var_f22 *= temp_f12; var_f24 *= temp_f12; var_f20 *= temp_f12; @@ -80,7 +80,7 @@ EffectInstance* purple_ring_main( return NULL; } - temp_f12 = 1.0f / shim_sqrtf(temp_f12); + temp_f12 = 1.0f / sqrtf(temp_f12); sp68 *= temp_f12; sp6C *= temp_f12; sp70 *= temp_f12; @@ -92,9 +92,9 @@ EffectInstance* purple_ring_main( bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_PURPLE_RING; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - data = effect->data.purpleRing = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.purpleRing = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.purpleRing != NULL); data->unk_00 = arg0; @@ -148,7 +148,7 @@ void purple_ring_update(EffectInstance* effect) { part->unk_70++; if (part->unk_6C < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -184,7 +184,7 @@ void purple_ring_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -200,11 +200,11 @@ void purple_ring_appendGfx(void* effect) { gSPDisplayList(gMainGfxPos++, D_09000200_352EE0); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_74, data->unk_75, data->unk_76, data->unk_68); - shim_guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); - shim_guMtxCatF(data->unk_1C, sp10, sp10); - shim_guScaleF(sp50, data->unk_64, data->unk_64, data->unk_64); - shim_guMtxCatF(sp50, sp10, sp10); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); + guMtxCatF(data->unk_1C, sp10, sp10); + guScaleF(sp50, data->unk_64, data->unk_64, data->unk_64); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0, unk_5C, temp * 4, unk_5C + temp); diff --git a/src/effects/quizmo_answer.c b/src/effects/quizmo_answer.c index 8249a99fa8..b8bfedca8a 100644 --- a/src/effects/quizmo_answer.c +++ b/src/effects/quizmo_answer.c @@ -15,7 +15,7 @@ EffectInstance* quizmo_answer_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.renderUI = NULL; bp.effectID = EFFECT_QUIZMO_ANSWER; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->data.quizmoAnswer = NULL; gDPPipeSync(gMainGfxPos++); @@ -34,6 +34,6 @@ EffectInstance* quizmo_answer_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x00, NULL); - shim_remove_effect(effect); + remove_effect(effect); return NULL; } diff --git a/src/effects/quizmo_assistant.c b/src/effects/quizmo_assistant.c index 578718fcb4..9a98e995ad 100644 --- a/src/effects/quizmo_assistant.c +++ b/src/effects/quizmo_assistant.c @@ -36,9 +36,9 @@ EffectInstance* quizmo_assistant_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f3 bp.renderUI = NULL; bp.effectID = EFFECT_QUIZMO_ASSISTANT; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.quizmoAssistant = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.quizmoAssistant = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.quizmoAssistant != NULL); data->unk_00 = arg0; @@ -75,7 +75,7 @@ void quizmo_assistant_update(EffectInstance* effect) { data->lifetime++; if (data->vanishTimer < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -93,7 +93,7 @@ void quizmo_assistant_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -108,14 +108,14 @@ void quizmo_assistant_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, data->position.x, data->position.y, data->position.z); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guTranslateF(sp58, 89.5f, 0.0f, 2.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, 5.0f / 7, 5.0f / 7, 5.0f / 7); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->position.x, data->position.y, data->position.z); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guTranslateF(sp58, 89.5f, 0.0f, 2.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, 5.0f / 7, 5.0f / 7, 5.0f / 7); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, fadeInAmt, fadeInAmt, fadeInAmt, 255); diff --git a/src/effects/quizmo_audience.c b/src/effects/quizmo_audience.c index 45e6e964bb..2e101e82a4 100644 --- a/src/effects/quizmo_audience.c +++ b/src/effects/quizmo_audience.c @@ -89,10 +89,10 @@ EffectInstance* quizmo_audience_main(s32 arg0, f32 posX, f32 posY, f32 posZ) { effectBp.renderUI = NULL; effectBp.effectID = EFFECT_QUIZMO_AUDIENCE; - effect = shim_create_effect_instance(&effectBp); + effect = create_effect_instance(&effectBp); effect->numParts = numParts; - data = effect->data.quizmoAudience = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.quizmoAudience = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); data->timeLeft = 100; @@ -131,7 +131,7 @@ void quizmo_audience_update(EffectInstance* effect) { data->lifeTime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -142,11 +142,11 @@ void quizmo_audience_update(EffectInstance* effect) { for (i = 0; i < MAX_QUIZMO_AUDIENCE; i++) { switch (data->compState[i]) { case 0: - if (shim_rand_int(10) == 10) { + if (rand_int(10) == 10) { data->compState[i] = 1; - data->compType[i] = shim_rand_int(1); + data->compType[i] = rand_int(1); data->compPosIdx[i] = 0; - data->compMoveMagnitude[i] = (shim_rand_int(50) * 0.01) + 0.5; + data->compMoveMagnitude[i] = (rand_int(50) * 0.01) + 0.5; } break; case 1: @@ -173,7 +173,7 @@ void quizmo_audience_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -190,10 +190,10 @@ void quizmo_audience_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -201,8 +201,8 @@ void quizmo_audience_appendGfx(void* effect) { gSPDisplayList(gMainGfxPos++, D_09003110_3AA8B0); for (i = 0; i < MAX_QUIZMO_AUDIENCE; i++) { - shim_guTranslateF(sp18, data->compX[i], data->compY[i], 0.0f); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->compX[i], data->compY[i], 0.0f); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/quizmo_stage.c b/src/effects/quizmo_stage.c index 73535b105f..ac6869cc16 100644 --- a/src/effects/quizmo_stage.c +++ b/src/effects/quizmo_stage.c @@ -33,10 +33,10 @@ EffectInstance* quizmo_stage_main(s32 arg0, f32 posX, f32 posY, f32 posZ) { effectBp.renderUI = NULL; effectBp.effectID = EFFECT_QUIZMO_STAGE; - effect = shim_create_effect_instance(&effectBp); + effect = create_effect_instance(&effectBp); effect->numParts = numParts; - data = effect->data.quizmoStage = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.quizmoStage = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); data->vanishTimer = 100; @@ -78,7 +78,7 @@ void quizmo_stage_update(EffectInstance *effect) { lifeTime = data->lifetime; if (data->vanishTimer < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } if (data->vanishTimer < 16) { @@ -101,7 +101,7 @@ void quizmo_stage_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_SURFACE_OPA; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -114,10 +114,10 @@ void quizmo_stage_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, data->origin.x, data->origin.y, data->origin.z); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->origin.x, data->origin.y, data->origin.z); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, microphoneRaiseAmt, microphoneRaiseAmt, microphoneRaiseAmt, 255); @@ -127,8 +127,8 @@ void quizmo_stage_appendGfx(void* effect) { if (data->unk_3C != 255) { gSPMatrix(gMainGfxPos++, &D_09004148_39CD08[2], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - shim_guRotateF(sp18, (data->rearWallRaiseAmt * 180) / 255 - 180, 1.0f, 0.0f, 0.0f); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, (data->rearWallRaiseAmt * 180) / 255 - 180, 1.0f, 0.0f, 0.0f); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09006E28_39F9E8); @@ -138,16 +138,16 @@ void quizmo_stage_appendGfx(void* effect) { gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, &D_09004148_39CD08[0], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - shim_guRotateF(sp18, 90 - (data->leftWallRaiseAmt * 90) / 255, 0.0f, 0.0f, 1.0f); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, 90 - (data->leftWallRaiseAmt * 90) / 255, 0.0f, 0.0f, 1.0f); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09006FB0_39FB70); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, &D_09004148_39CD08[1], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - shim_guRotateF(sp18, (data->rightWallRaiseAmt * 90) / 255 - 90, 0.0f, 0.0f, 1.0f); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, (data->rightWallRaiseAmt * 90) / 255 - 90, 0.0f, 0.0f, 1.0f); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09006F20_39FAE0); @@ -159,8 +159,8 @@ void quizmo_stage_appendGfx(void* effect) { gSPDisplayList(gMainGfxPos++, D_09006FD8_39FB98); gSPMatrix(gMainGfxPos++, &D_09004148_39CD08[3], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - shim_guRotateF(sp18, 90 - (data->podiumRaiseAmt * 90) / 255, 1.0f, 0.0f, 0.0f); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, 90 - (data->podiumRaiseAmt * 90) / 255, 1.0f, 0.0f, 0.0f); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09006D48_39F908); diff --git a/src/effects/radial_shimmer.c b/src/effects/radial_shimmer.c index ec66a6ca60..1f1293cc01 100644 --- a/src/effects/radial_shimmer.c +++ b/src/effects/radial_shimmer.c @@ -46,9 +46,9 @@ EffectInstance* radial_shimmer_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 bp.renderUI = NULL; bp.effectID = EFFECT_RADIAL_SHIMMER; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.radialShimmer = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.radialShimmer = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.radialShimmer != NULL); data->unk_00 = arg0; @@ -221,7 +221,7 @@ void radial_shimmer_update(EffectInstance* effect) { } if (part->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -241,7 +241,7 @@ void radial_shimmer_update(EffectInstance* effect) { part->unk_1C = part->unk_20; - shim_transform_point(&gCameras[gCurrentCameraID].perspectiveMatrix[0], part->unk_04, part->unk_08, part->unk_0C, + transform_point(&gCameras[gCurrentCameraID].perspectiveMatrix[0], part->unk_04, part->unk_08, part->unk_0C, 1.0f, &outX, &outY, &outZ, &outS); outS = 1.0f / outS; @@ -280,7 +280,7 @@ void radial_shimmer_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -313,18 +313,18 @@ void radial_shimmer_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp20, data->unk_10, data->unk_14, data->unk_18); - shim_guScaleF(sp60, data->unk_1C, data->unk_1C, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guPerspectiveF(sp60, &spA0, data->unk_60, (f32) camera->viewportW / camera->viewportH, 4.0f, 16384.0f, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, data->unk_10, data->unk_14, data->unk_18); + guScaleF(sp60, data->unk_1C, data->unk_1C, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guPerspectiveF(sp60, &spA0, data->unk_60, (f32) camera->viewportW / camera->viewportH, 4.0f, 16384.0f, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - shim_guTranslateF(sp20, 0.0f, 0.0f, data->unk_64); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, 0.0f, 0.0f, data->unk_64); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/effects/radiating_energy_orb.c b/src/effects/radiating_energy_orb.c index 310697bc97..4f088a4323 100644 --- a/src/effects/radiating_energy_orb.c +++ b/src/effects/radiating_energy_orb.c @@ -40,9 +40,9 @@ EffectInstance* radiating_energy_orb_main( bp.renderUI = NULL; bp.effectID = EFFECT_RADIATING_ENERGY_ORB; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.radiatingEnergyOrb = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.radiatingEnergyOrb = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.radiatingEnergyOrb != NULL); part->unk_04 = arg0; @@ -59,10 +59,10 @@ EffectInstance* radiating_energy_orb_main( part++; for (i = 1; i < numParts; i++, part++) { - part->unk_20 = shim_rand_int(360); + part->unk_20 = rand_int(360); part->unk_2C = (i * 2) % 20 + 60; - part->unk_28 = shim_rand_int(15) * 0.1 + 0.4; - part->unk_30 = shim_rand_int(10) * 0.1 + 0.1; + part->unk_28 = rand_int(15) * 0.1 + 0.4; + part->unk_30 = rand_int(10) * 0.1 + 0.1; } return effect; @@ -89,7 +89,7 @@ void radiating_energy_orb_update(EffectInstance* effect) { part->unk_1C++; if (part->unk_18 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -104,13 +104,13 @@ void radiating_energy_orb_update(EffectInstance* effect) { part++; for (i = 1; i < effect->numParts; i++, part++) { - part->unk_14 = shim_cos_deg((part->unk_2C - 70.0f) * 90.0f / 10.0f) * 255.0f; + part->unk_14 = cos_deg((part->unk_2C - 70.0f) * 90.0f / 10.0f) * 255.0f; part->unk_2C += part->unk_30; if (part->unk_2C > 80.0f) { part->unk_2C = 60.0f; - part->unk_28 = shim_rand_int(15) * 0.1 + 0.4; - part->unk_30 = shim_rand_int(10) * 0.1 + 0.1; - part->unk_20 = shim_rand_int(360); + part->unk_28 = rand_int(15) * 0.1 + 0.4; + part->unk_30 = rand_int(10) * 0.1 + 0.1; + part->unk_20 = rand_int(360); } } } @@ -124,7 +124,7 @@ void radiating_energy_orb_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -146,15 +146,15 @@ void radiating_energy_orb_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 64, 64, unk_14); - shim_guRotateF(sp18, temp_s2 * 2 + unk_1C, 0.0f, 0.0f, 1.0f); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, temp_s2 * 2 + unk_1C, 0.0f, 0.0f, 1.0f); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_090012A8_3A2008); @@ -170,23 +170,23 @@ void radiating_energy_orb_appendGfx(void* effect) { gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, (part->unk_14 * unk_14) >> 8); gDPSetCombineMode(gMainGfxPos++, PM_CC_07, PM_CC_07); - shim_guRotateF(sp18, part->unk_20, 0.0f, 0.0f, 1.0f); - shim_guTranslateF(sp58, part->unk_2C, 0.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, scale, scale, scale); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, part->unk_20, 0.0f, 0.0f, 1.0f); + guTranslateF(sp58, part->unk_2C, 0.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, scale, scale, scale); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E009EDFC[0]); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); - shim_guRotateF(sp18, part->unk_20, 0.0f, 0.0f, 1.0f); - shim_guTranslateF(sp58, part->unk_2C + 5.0f, 0.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, 2.3 - scale, 2.3 - scale, 2.3 - scale); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, part->unk_20, 0.0f, 0.0f, 1.0f); + guTranslateF(sp58, part->unk_2C + 5.0f, 0.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, 2.3 - scale, 2.3 - scale, 2.3 - scale); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E009EDF8[0]); @@ -195,28 +195,28 @@ void radiating_energy_orb_appendGfx(void* effect) { gDPSetEnvColor(gMainGfxPos++, 255, 128, 255, 0); gDPSetCombineLERP(gMainGfxPos++, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); - shim_guRotateF(sp18, part->unk_20 + 14.0f, 0.0f, 0.0f, 1.0f); - shim_guRotateF(sp58, (i * 10) % 45 + unk_1C, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guTranslateF(sp58, 20.0f, 0.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, (part->unk_2C - 60.0f) * 0.05 + 1.0, 2.0 - (part->unk_2C - 60.0f) * 0.05, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, part->unk_20 + 14.0f, 0.0f, 0.0f, 1.0f); + guRotateF(sp58, (i * 10) % 45 + unk_1C, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guTranslateF(sp58, 20.0f, 0.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, (part->unk_2C - 60.0f) * 0.05 + 1.0, 2.0 - (part->unk_2C - 60.0f) * 0.05, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E009EDF4[0]); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 64, 64, (part->unk_14 * unk_14) >> 8); - shim_guRotateF(sp18, part->unk_20 + 34.0f + unk_1C, 0.0f, 0.0f, 1.0f); - shim_guRotateF(sp58, i * 35, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guTranslateF(sp58, 15.0f, 0.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, (part->unk_2C - 60.0f) * 0.1 + 2.0, 1.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, part->unk_20 + 34.0f + unk_1C, 0.0f, 0.0f, 1.0f); + guRotateF(sp58, i * 35, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guTranslateF(sp58, 15.0f, 0.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, (part->unk_2C - 60.0f) * 0.1 + 2.0, 1.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E009EDF0[0]); diff --git a/src/effects/recover.c b/src/effects/recover.c index 74dc30330c..0382a4ef21 100644 --- a/src/effects/recover.c +++ b/src/effects/recover.c @@ -55,9 +55,9 @@ EffectInstance* recover_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { bp.unk_00 = 0; bp.effectID = EFFECT_RECOVER; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.recover = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.recover = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.recover != NULL); part->unk_00 = arg0; @@ -116,7 +116,7 @@ void recover_update(EffectInstance* effect) { part->unk_30++; if (part->unk_2C < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -138,8 +138,8 @@ void recover_update(EffectInstance* effect) { part->unk_04 += part->unk_10; part->unk_08 += part->unk_14; part->unk_0C += part->unk_18; - part->unk_1C = shim_sin_deg(i * 38 + unk_2C * 12) * -30.0f; - part->unk_24 = shim_cos_deg(i * 38 + unk_2C * 12) * 8.0f; + part->unk_1C = sin_deg(i * 38 + unk_2C * 12) * -30.0f; + part->unk_24 = cos_deg(i * 38 + unk_2C * 12) * 8.0f; if (unk_2C < 20) { part->unk_24 *= (f32) unk_2C * 0.05; @@ -176,10 +176,10 @@ void func_E0080448(EffectInstance* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); - shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp98); + guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -203,15 +203,15 @@ void func_E0080448(EffectInstance* effect) { (unk_44 == 0 ? D_09003200_385000 : D_09003298_385098) : D_09003330_385130); - shim_guTranslateF(sp18, part->unk_04 + part->unk_24, part->unk_08, part->unk_0C); - shim_guScaleF(sp58, part->unk_38, part->unk_3C, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04 + part->unk_24, part->unk_08, part->unk_0C); + guScaleF(sp58, part->unk_38, part->unk_3C, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - shim_guRotateF(sp18, part->unk_1C, 0.0f, 0.0f, 1.0f); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, part->unk_1C, 0.0f, 0.0f, 1.0f); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/red_impact.c b/src/effects/red_impact.c index 3dc799e8fe..8006a2731a 100644 --- a/src/effects/red_impact.c +++ b/src/effects/red_impact.c @@ -36,9 +36,9 @@ EffectInstance* red_impact_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4 bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_RED_IMPACT; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.redImpact = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.redImpact = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.redImpact != NULL); part->unk_2C = 0; @@ -80,7 +80,7 @@ void red_impact_update(EffectInstance* effect) { part->unk_28--; if (part->unk_28 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -98,8 +98,8 @@ void red_impact_update(EffectInstance* effect) { part->unk_04 = 0; part->unk_08 = 0; part->unk_0C = 0; - part->unk_10 = -shim_sin_deg(part->unk_34) * 0.5; - part->unk_14 = shim_cos_deg(part->unk_34) * 0.5; + part->unk_10 = -sin_deg(part->unk_34) * 0.5; + part->unk_14 = cos_deg(part->unk_34) * 0.5; part->unk_18 = 0; part->unk_3C = 32.0f; part->unk_40 = 32.0f; @@ -136,7 +136,7 @@ void red_impact_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -170,8 +170,8 @@ void red_impact_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, dlist); - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, part->unk_04, part->unk_08, part->unk_0C); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, part->unk_04, part->unk_08, part->unk_0C); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -190,14 +190,14 @@ void red_impact_appendGfx(void* effect) { part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { if (part->unk_4C >= 0) { - shim_guTranslateF(sp20, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp60, part->unk_34, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guScaleF(sp60, part->unk_1C * temp_1C, part->unk_20 * temp_20, part->unk_24 * temp_24); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guRotateF(sp60, part->unk_30, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp60, part->unk_34, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guScaleF(sp60, part->unk_1C * temp_1C, part->unk_20 * temp_20, part->unk_24 * temp_24); + guMtxCatF(sp60, sp20, sp20); + guRotateF(sp60, part->unk_30, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); dlist2 = D_09000940_359CF0; diff --git a/src/effects/ring_blast.c b/src/effects/ring_blast.c index 5ef377de0c..0b7243639f 100644 --- a/src/effects/ring_blast.c +++ b/src/effects/ring_blast.c @@ -25,12 +25,12 @@ void ring_blast_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 arg4, s32 arg5) effectBp.renderUI = NULL; effectBp.effectID = EFFECT_RING_BLAST; - effect = shim_create_effect_instance(&effectBp); + effect = create_effect_instance(&effectBp); effect->numParts = numParts; - data = effect->data.ringBlast = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.ringBlast = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); - shim_mem_clear(data, numParts * sizeof(*data)); + mem_clear(data, numParts * sizeof(*data)); data->timeLeft = arg5; data->lifeTime = 0; @@ -61,7 +61,7 @@ void ring_blast_update(EffectInstance* effect) { data->timeLeft--; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } data->unk_24 += data->unk_28; @@ -79,7 +79,7 @@ void ring_blast_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -98,10 +98,10 @@ void ring_blast_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, dlist2); - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_10, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(sp60, data->unk_24, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_10, data->pos.x, data->pos.y, data->pos.z); + guRotateF(sp60, data->unk_24, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/rising_bubble.c b/src/effects/rising_bubble.c index 6ff16ae30d..0e83fa016f 100644 --- a/src/effects/rising_bubble.c +++ b/src/effects/rising_bubble.c @@ -35,9 +35,9 @@ void rising_bubble_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 arg4) { effectBp.renderUI = NULL; effectBp.effectID = EFFECT_RISING_BUBBLE; - effect = shim_create_effect_instance(&effectBp); + effect = create_effect_instance(&effectBp); effect->numParts = numParts; - data = effect->data.risingBubble = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.risingBubble = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); data->unk_00 = arg0; @@ -47,12 +47,12 @@ void rising_bubble_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 arg4) { data->unk_14 = 0; data->lifeTime = 0; if (arg4 != 0.0f) { - data->unk_10 = ((shim_rand_int(3) * 0.1) + 0.7) * 0.4; + data->unk_10 = ((rand_int(3) * 0.1) + 0.7) * 0.4; } else { data->unk_10 = 1.0f; } data->timeLeft = 32; - data->unk_20 = shim_rand_int(31); + data->unk_20 = rand_int(31); data->unk_24 = posY + arg4; } @@ -68,7 +68,7 @@ void rising_bubble_update(EffectInstance* effect) { data->lifeTime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -101,7 +101,7 @@ void rising_bubble_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -128,18 +128,18 @@ void rising_bubble_appendGfx(void* effect) { (uls ) * 4, (ult ) * 4, (uls + 32) * 4, (ult + 32) * 4); - shim_guTranslateF(sp20, data->pos.x, data->pos.y, data->pos.z); - shim_guScaleF(sp60, data->unk_10, 1.0f, data->unk_10); - shim_guMtxCatF(sp60, sp20, sp20); + guTranslateF(sp20, data->pos.x, data->pos.y, data->pos.z); + guScaleF(sp60, data->unk_10, 1.0f, data->unk_10); + guMtxCatF(sp60, sp20, sp20); } else { gSPDisplayList(gMainGfxPos++, D_E0046618[0]); gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, data->unk_14); gDPSetEnvColor(gMainGfxPos++, 128, 128, 255, data->unk_14); - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_10, data->pos.x, data->pos.y, data->pos.z); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_10, data->pos.x, data->pos.y, data->pos.z); } - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (data->pos.y >= data->unk_24) { diff --git a/src/effects/shape_spell.c b/src/effects/shape_spell.c index bb6f3b1818..8e2588aa3c 100644 --- a/src/effects/shape_spell.c +++ b/src/effects/shape_spell.c @@ -43,9 +43,9 @@ EffectInstance* shape_spell_main(s32 isChild, f32 x, f32 y, f32 z, f32 arg4, f32 bp.renderUI = NULL; bp.effectID = EFFECT_SHAPE_SPELL; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.shapeSpell = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.shapeSpell = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.shapeSpell != NULL); @@ -94,7 +94,7 @@ void shape_spell_update(EffectInstance* effect) { part->unk_2C++; if (part->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -129,14 +129,14 @@ void shape_spell_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } s32 func_E0024324(s32 arg0, s32 arg1) { s32 frameCounter = gGameStatusPtr->frameCounter * 32; - return (f32)((shim_sin_deg(frameCounter + arg1) * (255 - arg0) + (255 - arg0)) * 0.5 + arg0); + return (f32)((sin_deg(frameCounter + arg1) * (255 - arg0) + (255 - arg0)) * 0.5 + arg0); } s32 func_E00243BC(s32 arg0, s32 arg1) { @@ -144,7 +144,7 @@ s32 func_E00243BC(s32 arg0, s32 arg1) { arg1 += 180; - return (f32)((shim_sin_deg(frameCounter + arg1) * -arg0 + -arg0) * 0.5 + arg0); + return (f32)((sin_deg(frameCounter + arg1) * -arg0 + -arg0) * 0.5 + arg0); } void shape_spell_appendGfx(void* effect) { @@ -205,34 +205,34 @@ void shape_spell_appendGfx(void* effect) { primA = data->unk_34 * 100 / 255; } - shim_guPositionF(sp20, 0.0f, var_f30, 0.0f, unk_28, unk_10, unk_14, unk_18); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, var_f30, 0.0f, unk_28, unk_10, unk_14, unk_18); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - shim_guTranslateF(sp20, - shim_sin_deg(angle) * factor, - shim_cos_deg(angle) * factor, 0.0f); + guTranslateF(sp20, + sin_deg(angle) * factor, + cos_deg(angle) * factor, 0.0f); angle += 120.0f; sp60[0] = &gDisplayContext->matrixStack[gMatrixListPos++]; - shim_guMtxF2L(sp20, sp60[0]); - shim_guTranslateF(sp20, - shim_sin_deg(angle) * factor, - shim_cos_deg(angle) * factor, 0.0f); + guMtxF2L(sp20, sp60[0]); + guTranslateF(sp20, + sin_deg(angle) * factor, + cos_deg(angle) * factor, 0.0f); angle += 120.0f; sp60[1] = &gDisplayContext->matrixStack[gMatrixListPos++]; - shim_guMtxF2L(sp20, sp60[1]); - shim_guTranslateF(sp20, - shim_sin_deg(angle) * factor, - shim_cos_deg(angle) * factor, 0.0f); + guMtxF2L(sp20, sp60[1]); + guTranslateF(sp20, + sin_deg(angle) * factor, + cos_deg(angle) * factor, 0.0f); sp60[2] = &gDisplayContext->matrixStack[gMatrixListPos++]; - shim_guMtxF2L(sp20, sp60[2]); + guMtxF2L(sp20, sp60[2]); for (j = 0; j < 3; j++) { gSPMatrix(gMainGfxPos++, sp60[j], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -263,18 +263,18 @@ void shape_spell_appendGfx(void* effect) { var_f30 = -gCameras[gCurrentCameraID].currentYaw; } - shim_guPositionF(sp20, 0.0f, var_f30, 0.0f, 1.0f, data->pos.x, data->pos.y, data->pos.z); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, var_f30, 0.0f, 1.0f, data->pos.x, data->pos.y, data->pos.z); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (!isChild) { gSPDisplayList(gMainGfxPos++, savedGfxPos2); } else { - shim_guRotateF(sp20, 30.0f, 0.0f, 0.0f, 1.0f); + guRotateF(sp20, 30.0f, 0.0f, 0.0f, 1.0f); mtx = &gDisplayContext->matrixStack[gMatrixListPos++]; - shim_guMtxF2L(sp20, mtx); + guMtxF2L(sp20, mtx); for (i = 0; i < 12; i++) { gSPMatrix(gMainGfxPos++, mtx, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/shattering_stones.c b/src/effects/shattering_stones.c index 02ef16c4a1..0c3278bd20 100644 --- a/src/effects/shattering_stones.c +++ b/src/effects/shattering_stones.c @@ -52,9 +52,9 @@ void shattering_stones_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { bp.renderUI = NULL; bp.effectID = EFFECT_SHATTERING_STONES; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.shatteringStones = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.shatteringStones = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.shatteringStones != NULL); part->unk_24 = 0; @@ -65,9 +65,9 @@ void shattering_stones_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { part->unk_2C = 0; part->unk_30 = 0; part->unk_14 = -2.0f; - part->unk_34 = shim_rand_int(60) - 30; + part->unk_34 = rand_int(60) - 30; part->unk_28 = 255; - part->unk_38 = shim_rand_int(60) - 30; + part->unk_38 = rand_int(60) - 30; part->unk_3C = part->unk_38 * 0.25; part->unk_20 = 20; @@ -79,7 +79,7 @@ void shattering_stones_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { part->unk_04 = 0; part->unk_08 = 0; part->unk_10 = D_E002C964[i - 1] * 2.0f; - part->unk_14 = (f32) shim_rand_int(10) * 0.1 * 2.0 + 1.0; + part->unk_14 = (f32) rand_int(10) * 0.1 * 2.0 + 1.0; part->unk_2C = 0; part->unk_34 = 0; } @@ -105,7 +105,7 @@ void shattering_stones_update(EffectInstance* effect) { if (part->unk_24 == 1) { part->unk_20--; if (part->unk_20 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -134,7 +134,7 @@ void shattering_stones_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -150,18 +150,18 @@ void shattering_stones_appendGfx(void* effect) { gSPDisplayList(gMainGfxPos++, D_09000C00_341480); if (part->unk_24 == 0) { - shim_guTranslateF(sp20, part->unk_00, part->unk_04, part->unk_08); - shim_guScaleF(sp60, 1.5f, 1.5f, 1.5f); - shim_guMtxCatF(sp60, sp20, spA0); - shim_guRotateF(sp60, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp60, spA0, spA0); - shim_guRotateF(sp60, part->unk_34, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp60, spA0, spA0); - shim_guRotateF(sp60, part->unk_2C, 1.0f, 0.0f, 0.0f); - shim_guMtxCatF(sp60, spA0, spA0); - shim_guRotateF(sp60, part->unk_30, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp60, spA0, spA0); - shim_guMtxF2L(spA0, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, part->unk_00, part->unk_04, part->unk_08); + guScaleF(sp60, 1.5f, 1.5f, 1.5f); + guMtxCatF(sp60, sp20, spA0); + guRotateF(sp60, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp60, spA0, spA0); + guRotateF(sp60, part->unk_34, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp60, spA0, spA0); + guRotateF(sp60, part->unk_2C, 1.0f, 0.0f, 0.0f); + guMtxCatF(sp60, spA0, spA0); + guRotateF(sp60, part->unk_30, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp60, spA0, spA0); + guMtxF2L(spA0, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 102, 109, 123, part->unk_28); @@ -170,23 +170,23 @@ void shattering_stones_appendGfx(void* effect) { } else { s32 unk_28 = part->unk_28; - shim_guTranslateF(sp20, part->unk_00, part->unk_04, part->unk_08); - shim_guScaleF(sp60, 1.5f, 1.5f, 1.5f); - shim_guMtxCatF(sp60, sp20, spA0); - shim_guRotateF(sp60, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp60, spA0, spA0); - shim_guRotateF(spE0, part->unk_2C, 1.0f, 0.0f, 0.0f); + guTranslateF(sp20, part->unk_00, part->unk_04, part->unk_08); + guScaleF(sp60, 1.5f, 1.5f, 1.5f); + guMtxCatF(sp60, sp20, spA0); + guRotateF(sp60, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp60, spA0, spA0); + guRotateF(spE0, part->unk_2C, 1.0f, 0.0f, 0.0f); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { Gfx* dlist = D_E002C940[i]; - shim_guTranslateF(sp60, part->unk_00, part->unk_04, part->unk_08); - shim_guMtxCatF(sp60, spA0, sp20); - shim_guMtxCatF(spE0, sp20, sp20); - shim_guPositionF(sp60, part->unk_2C, 0.0f, part->unk_34, 1.0f, part->unk_18, part->unk_1C, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp60, part->unk_00, part->unk_04, part->unk_08); + guMtxCatF(sp60, spA0, sp20); + guMtxCatF(spE0, sp20, sp20); + guPositionF(sp60, part->unk_2C, 0.0f, part->unk_34, 1.0f, part->unk_18, part->unk_1C, 0.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 150, 150, 200, unk_28); diff --git a/src/effects/shimmer_burst.c b/src/effects/shimmer_burst.c index 45b49c4f05..4d2caef43b 100644 --- a/src/effects/shimmer_burst.c +++ b/src/effects/shimmer_burst.c @@ -46,9 +46,9 @@ EffectInstance* shimmer_burst_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 a bp.renderUI = NULL; bp.effectID = EFFECT_SHIMMER_BURST; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.shimmerBurst = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.shimmerBurst = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.shimmerBurst != NULL); part->unk_00 = arg0; @@ -118,7 +118,7 @@ void shimmer_burst_update(EffectInstance* effect) { part->unk_3C++; if (part->unk_38 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -138,13 +138,13 @@ void shimmer_burst_update(EffectInstance* effect) { if (part->unk_30 >= 0) { if (part->unk_30 == 0) { - f32 rand1 = shim_rand_int(359); - f32 rand2 = shim_rand_int(359); + f32 rand1 = rand_int(359); + f32 rand2 = rand_int(359); if (unk_00 == 0) { - part->unk_04 = unk_10 * shim_sin_deg(rand1) * shim_cos_deg(rand2); - part->unk_08 = unk_14 * shim_cos_deg(rand1) * shim_cos_deg(rand2); - part->unk_0C = unk_10 * shim_sin_deg(rand2); + part->unk_04 = unk_10 * sin_deg(rand1) * cos_deg(rand2); + part->unk_08 = unk_14 * cos_deg(rand1) * cos_deg(rand2); + part->unk_0C = unk_10 * sin_deg(rand2); part->unk_18 = part->unk_04 * 0.4; part->unk_1C = part->unk_08 * 0.4; part->unk_20 = part->unk_0C * 0.4; @@ -152,9 +152,9 @@ void shimmer_burst_update(EffectInstance* effect) { part->unk_28 = part->unk_1C * 0.1; part->unk_2C = part->unk_20 * 0.1; } else { - part->unk_04 = shim_rand_int(unk_10) - unk_10 * 0.5; - part->unk_08 = shim_rand_int(unk_14) - unk_14 * 0.5; - part->unk_0C = shim_rand_int(unk_10) - unk_10 * 0.5; + part->unk_04 = rand_int(unk_10) - unk_10 * 0.5; + part->unk_08 = rand_int(unk_14) - unk_14 * 0.5; + part->unk_0C = rand_int(unk_10) - unk_10 * 0.5; part->unk_18 = part->unk_04 * 0.3; part->unk_1C = part->unk_08 * 0.3; part->unk_20 = part->unk_0C * 0.3; @@ -163,8 +163,8 @@ void shimmer_burst_update(EffectInstance* effect) { part->unk_2C = part->unk_20 * 0.02; } - part->unk_64 = shim_rand_int(15); - part->unk_68 = shim_rand_int(15); + part->unk_64 = rand_int(15); + part->unk_68 = rand_int(15); part->unk_34 = 0.0f; part->unk_4C = 255; } @@ -192,7 +192,7 @@ void shimmer_burst_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -213,10 +213,10 @@ void shimmer_burst_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp20, part->unk_04, part->unk_08, part->unk_0C); - shim_guScaleF(sp60, part->unk_60, part->unk_60, part->unk_60); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, part->unk_04, part->unk_08, part->unk_0C); + guScaleF(sp60, part->unk_60, part->unk_60, part->unk_60); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetEnvColor(gMainGfxPos++, part->unk_40, part->unk_44, part->unk_48, part->unk_5C); @@ -228,8 +228,8 @@ void shimmer_burst_appendGfx(void* effect) { part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { if (part->unk_30 >= 0) { - shim_guPositionF(sp20, 0.0f, 0.0f, part->unk_34, part->unk_60 * temp_f20, part->unk_04, part->unk_08, part->unk_0C); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, 0.0f, part->unk_34, part->unk_60 * temp_f20, part->unk_04, part->unk_08, part->unk_0C); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, unk_50, unk_54, unk_58, part->unk_4C * temp_f20); @@ -242,15 +242,15 @@ void shimmer_burst_appendGfx(void* effect) { gSPBranchList(savedGfxPos, gMainGfxPos); gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); - shim_guRotateF(sp20, 120.0f, 0.4f, 0.0f, 0.8f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp20, 120.0f, 0.4f, 0.0f, 0.8f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); - shim_guRotateF(sp20, -120.0f, 0.4f, 0.0f, 0.8f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp20, -120.0f, 0.4f, 0.0f, 0.8f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); diff --git a/src/effects/shimmer_wave.c b/src/effects/shimmer_wave.c index 41ad158d44..ba87257ac6 100644 --- a/src/effects/shimmer_wave.c +++ b/src/effects/shimmer_wave.c @@ -56,9 +56,9 @@ EffectInstance* shimmer_wave_main( bp.renderUI = NULL; bp.effectID = EFFECT_SHIMMER_WAVE; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = arg6; - part = effect->data.shimmerWave = shim_general_heap_malloc(arg6 * sizeof(*part)); + part = effect->data.shimmerWave = general_heap_malloc(arg6 * sizeof(*part)); ASSERT(effect->data.shimmerWave != NULL); part->unk_00 = arg0; @@ -119,7 +119,7 @@ void shimmer_wave_update(EffectInstance* effect) { part->unk_3C++; if (part->unk_38 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -139,20 +139,20 @@ void shimmer_wave_update(EffectInstance* effect) { if (part->unk_30 >= 0) { if (part->unk_30 == 0) { - f32 rand = shim_rand_int(359); - shim_rand_int(359); + f32 rand = rand_int(359); + rand_int(359); - part->unk_04 = unk_10 * shim_sin_deg(rand); - part->unk_08 = shim_rand_int(unk_14) - unk_14 * 0.5; - part->unk_0C = unk_10 * shim_cos_deg(rand); - part->unk_18 = shim_sin_deg(rand) * 15.0f; + part->unk_04 = unk_10 * sin_deg(rand); + part->unk_08 = rand_int(unk_14) - unk_14 * 0.5; + part->unk_0C = unk_10 * cos_deg(rand); + part->unk_18 = sin_deg(rand) * 15.0f; part->unk_1C = part->unk_08 * 0.4; - part->unk_20 = shim_cos_deg(rand) * 15.0f; + part->unk_20 = cos_deg(rand) * 15.0f; part->unk_24 = part->unk_18 * 0.5; part->unk_28 = part->unk_1C * 0.5; part->unk_2C = part->unk_20 * 0.5; - part->unk_64 = shim_rand_int(15); - part->unk_68 = shim_rand_int(15); + part->unk_64 = rand_int(15); + part->unk_68 = rand_int(15); part->unk_34 = 0.0f; part->unk_4C = 255; } @@ -180,7 +180,7 @@ void shimmer_wave_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -198,10 +198,10 @@ void shimmer_wave_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp20, part->unk_04, part->unk_08, part->unk_0C); - shim_guScaleF(sp60, part->unk_60, part->unk_60, part->unk_60); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, part->unk_04, part->unk_08, part->unk_0C); + guScaleF(sp60, part->unk_60, part->unk_60, part->unk_60); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetEnvColor(gMainGfxPos++, part->unk_40, part->unk_44, part->unk_48, part->unk_5C); @@ -213,8 +213,8 @@ void shimmer_wave_appendGfx(void* effect) { part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { if (part->unk_30 >= 0) { - shim_guPositionF(sp20, 0.0f, 0.0f, part->unk_34, part->unk_60 * temp_4C, part->unk_04, part->unk_08, part->unk_0C); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, 0.0f, part->unk_34, part->unk_60 * temp_4C, part->unk_04, part->unk_08, part->unk_0C); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, unk_50, unk_54, unk_58, part->unk_4C * temp_4C); @@ -227,15 +227,15 @@ void shimmer_wave_appendGfx(void* effect) { gSPBranchList(savedGfxPos, gMainGfxPos); gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); - shim_guRotateF(sp20, 120.0f, 0.0f, 1.0f, 0.0f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp20, 120.0f, 0.0f, 1.0f, 0.0f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); - shim_guRotateF(sp20, -120.0f, 0.0f, 1.0f, 0.0f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp20, -120.0f, 0.0f, 1.0f, 0.0f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, savedGfxPos + 1); diff --git a/src/effects/shiny_flare.c b/src/effects/shiny_flare.c index d11a47e15f..e0e9a58111 100644 --- a/src/effects/shiny_flare.c +++ b/src/effects/shiny_flare.c @@ -32,10 +32,10 @@ EffectInstance* shiny_flare_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg effectBp.unk_00 = 0; effectBp.renderUI = NULL; effectBp.effectID = EFFECT_SHINY_FLARE; - effect = shim_create_effect_instance(&effectBp); + effect = create_effect_instance(&effectBp); effect->numParts = numParts; - data = effect->data.shinyFlare = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.shinyFlare = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); data->unk_00 = arg0; @@ -70,7 +70,7 @@ void shiny_flare_update(EffectInstance *effect) { data->lifeTime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } if (data->timeLeft < 4) { @@ -90,7 +90,7 @@ void shiny_flare_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -109,10 +109,10 @@ void shiny_flare_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp10, data->pos.x, data->pos.y, data->pos.z); - shim_guScaleF(sp50, scale, scale, scale); - shim_guMtxCatF(sp50, sp10, sp10); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp10, data->pos.x, data->pos.y, data->pos.z); + guScaleF(sp50, scale, scale, scale); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/shockwave.c b/src/effects/shockwave.c index 239dda67fa..6c0cf94095 100644 --- a/src/effects/shockwave.c +++ b/src/effects/shockwave.c @@ -62,12 +62,12 @@ void shockwave_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_SHOCKWAVE; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.shockwave = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.shockwave = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.shockwave != NULL); - shim_mem_clear(part, numParts * sizeof(*part)); + mem_clear(part, numParts * sizeof(*part)); if (arg0 >= 2) { part->unk_28 = 60; @@ -155,7 +155,7 @@ void shockwave_update(EffectInstance* effect) { part->unk_28--; if (part->unk_28 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -184,8 +184,8 @@ void shockwave_update(EffectInstance* effect) { part->pos.x = 0.0f; part->pos.y = 0.0f; part->pos.z = 0.0f; - part->unk_10 = -shim_sin_deg(part->unk_34) * 0.5; - part->unk_14 = shim_cos_deg(part->unk_34) * 0.5; + part->unk_10 = -sin_deg(part->unk_34) * 0.5; + part->unk_14 = cos_deg(part->unk_34) * 0.5; part->unk_18 = 0; part->unk_3C = 32.0f; part->unk_40 = 32.0f; @@ -261,7 +261,7 @@ void shockwave_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -309,9 +309,9 @@ void shockwave_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, dlist2); - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, data->pos.x, data->pos.y, data->pos.z); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -324,14 +324,14 @@ void shockwave_appendGfx(void* effect) { data++; for (i = 1; i < ((EffectInstance*) effect)->numParts; i++, data++) { if (data->unk_4C >= 0) { - shim_guTranslateF(sp20, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(sp60, data->unk_34, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guScaleF(sp60, data->unk_1C * 0.3, data->unk_20 * 0.3, data->unk_24 * 0.3); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guRotateF(sp60, data->unk_30, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, data->pos.x, data->pos.y, data->pos.z); + guRotateF(sp60, data->unk_34, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guScaleF(sp60, data->unk_1C * 0.3, data->unk_20 * 0.3, data->unk_24 * 0.3); + guMtxCatF(sp60, sp20, sp20); + guRotateF(sp60, data->unk_30, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, 0, (s32) data->unk_3C, 0x00FC, (s32) data->unk_3C + 0x7C); gDPSetTileSize(gMainGfxPos++, 1, 0, (s32) data->unk_44, 0x007C, (s32) data->unk_44 + 0x7C); diff --git a/src/effects/sleep_bubble.c b/src/effects/sleep_bubble.c index 808abf19de..da2b8e7a0a 100644 --- a/src/effects/sleep_bubble.c +++ b/src/effects/sleep_bubble.c @@ -32,9 +32,9 @@ void sleep_bubble_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg bp.renderUI = NULL; bp.effectID = EFFECT_SLEEP_BUBBLE; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.sleepBubble = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.sleepBubble = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.sleepBubble != NULL); @@ -72,7 +72,7 @@ void sleep_bubble_update(EffectInstance* effect) { } if (part->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -81,7 +81,7 @@ void sleep_bubble_update(EffectInstance* effect) { temp1 = part->unk_18 + (part->unk_14 - part->unk_18) * 0.1f; part->unk_18 = temp1; - temp2 = temp1 + (temp1 * shim_sin_deg(unk_20 * 3)) * 0.1; + temp2 = temp1 + (temp1 * sin_deg(unk_20 * 3)) * 0.1; i = 0; yPtr = &part->points->y; @@ -90,11 +90,11 @@ void sleep_bubble_update(EffectInstance* effect) { for (i = 0; i < ARRAY_COUNT(part->points); i++) { angle = i * 360.0f / 21.0f + 17.0f; - *xPtr = temp2 * shim_sin_deg(angle); - *yPtr = -temp2 * shim_cos_deg(angle); + *xPtr = temp2 * sin_deg(angle); + *yPtr = -temp2 * cos_deg(angle); - *xPtr += shim_sin_deg((f32)unk_20 * (shim_sin_deg(xAngle) * 0.1 + 2.0) + (i + 5.0f) * 30.0f) * 1.5; - *yPtr += shim_cos_deg((f32)unk_20 * (shim_cos_deg(yAngle) * 0.1 + 2.0) + (i + 5.0f) * 50.0f) * 1.5; + *xPtr += sin_deg((f32)unk_20 * (sin_deg(xAngle) * 0.1 + 2.0) + (i + 5.0f) * 30.0f) * 1.5; + *yPtr += cos_deg((f32)unk_20 * (cos_deg(yAngle) * 0.1 + 2.0) + (i + 5.0f) * 50.0f) * 1.5; xAngle += 53; yAngle += 36; @@ -120,7 +120,7 @@ void sleep_bubble_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -142,29 +142,29 @@ void sleep_bubble_appendGfx(void* effect) { gSPDisplayList(gMainGfxPos++, D_090002E0_35D7F0); } - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPVertex(gMainGfxPos++, &D_09000180_35D690[1], 1, 0); - shim_guRotateF(sp18, data->unk_10, 0.0f, 0.0f, 1.0f); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, data->unk_10, 0.0f, 0.0f, 1.0f); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - shim_guRotateF(sp18, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guTranslateF(sp58, data->unk_C4, data->unk_C8, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guTranslateF(sp58, data->unk_C4, data->unk_C8, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPVertex(gMainGfxPos++, &D_09000180_35D690[0], 1, 1); for (i = 0; i < ARRAY_COUNT(data->points); i++) { - shim_guTranslateF(sp18, data->points[i].x, data->points[i].y, 0.0f); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->points[i].x, data->points[i].y, 0.0f); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPVertex(gMainGfxPos++, &D_09000180_35D690[i + 2], 1, i + 2); diff --git a/src/effects/small_gold_sparkle.c b/src/effects/small_gold_sparkle.c index 035e6fbd18..590b73373e 100644 --- a/src/effects/small_gold_sparkle.c +++ b/src/effects/small_gold_sparkle.c @@ -38,10 +38,10 @@ EffectInstance* small_gold_sparkle_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, bp.renderUI = NULL; bp.effectID = EFFECT_SMALL_GOLD_SPARKLE; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = shim_general_heap_malloc(numParts * sizeof(*data)); + data = general_heap_malloc(numParts * sizeof(*data)); effect->data.smallGoldSparkle = data; part = data; @@ -77,7 +77,7 @@ void small_gold_sparkle_update(EffectInstance* effect) { part->unk_18++; if (part->unk_14 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -105,7 +105,7 @@ void small_gold_sparkle_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -117,13 +117,13 @@ void small_gold_sparkle_appendGfx(void* effect) { Mtx* spD8; s32 i; - shim_guRotateF(sp98, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp98, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); spD8 = &gDisplayContext->matrixStack[gMatrixListPos++]; gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_090002C0_392700); @@ -134,12 +134,12 @@ void small_gold_sparkle_appendGfx(void* effect) { if (part->unk_20 == 0) { f32 temp_f20 = part->unk_1C; - shim_guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10); + guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10); if (temp_f20 != 1.0f) { - shim_guScaleF(sp58, temp_f20, temp_f20, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, temp_f20, temp_f20, 1.0f); + guMtxCatF(sp58, sp18, sp18); } - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, spD8, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/smoke_burst.c b/src/effects/smoke_burst.c index fd1df2e71c..6e40cf7189 100644 --- a/src/effects/smoke_burst.c +++ b/src/effects/smoke_burst.c @@ -31,13 +31,13 @@ void smoke_burst_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 arg4, s32 time effectBp.renderUI = NULL; effectBp.effectID = EFFECT_SMOKE_BURST; - effect = shim_create_effect_instance(&effectBp); + effect = create_effect_instance(&effectBp); effect->numParts = numParts; - data = effect->data.smokeBurst = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.smokeBurst = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); - shim_mem_clear(data, numParts * sizeof(*data)); + mem_clear(data, numParts * sizeof(*data)); data->timeLeft = timeLeft; data->lifeTime = 0; data->unk_1C = timeLeft; @@ -81,7 +81,7 @@ void smoke_burst_update(EffectInstance *effect) { data->timeLeft--; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); } } @@ -94,7 +94,7 @@ void smoke_burst_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -113,10 +113,10 @@ void smoke_burst_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, dlist2); - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_10, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(sp60, 20.0f, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_10, data->pos.x, data->pos.y, data->pos.z); + guRotateF(sp60, 20.0f, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->rgba.r, data->rgba.g, data->rgba.b, data->rgba.a); diff --git a/src/effects/smoke_impact.c b/src/effects/smoke_impact.c index 6bc1be8a4b..fc8d969af2 100644 --- a/src/effects/smoke_impact.c +++ b/src/effects/smoke_impact.c @@ -42,12 +42,12 @@ void smoke_impact_main( bp.renderUI = NULL; bp.effectID = EFFECT_SMOKE_IMPACT; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = arg5; - part = effect->data.smokeImpact = shim_general_heap_malloc(arg5 * sizeof(*part)); + part = effect->data.smokeImpact = general_heap_malloc(arg5 * sizeof(*part)); ASSERT(effect->data.smokeImpact != NULL); - shim_mem_clear(part, arg5 * sizeof(*part)); + mem_clear(part, arg5 * sizeof(*part)); part->unk_24 = arg7; part->unk_28 = 0; @@ -67,9 +67,9 @@ void smoke_impact_main( part->unk_04 = 0; part->unk_08 = 0; part->unk_0C = 0; - part->unk_10 = shim_sin_deg(angle); + part->unk_10 = sin_deg(angle); part->unk_14 = 0; - part->unk_18 = shim_cos_deg(angle); + part->unk_18 = cos_deg(angle); } } @@ -86,7 +86,7 @@ void smoke_impact_update(EffectInstance* effect) { part->unk_24--; if (part->unk_24 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -112,7 +112,7 @@ void smoke_impact_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -134,10 +134,10 @@ void smoke_impact_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, dlist2); - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); - shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp98); + guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -165,8 +165,8 @@ void smoke_impact_appendGfx(void* effect) { part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, dlist); diff --git a/src/effects/smoke_ring.c b/src/effects/smoke_ring.c index 264d9ff419..522d316452 100644 --- a/src/effects/smoke_ring.c +++ b/src/effects/smoke_ring.c @@ -48,12 +48,12 @@ void smoke_ring_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_SMOKE_RING; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.smokeRing = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.smokeRing = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.smokeRing != NULL); - shim_mem_clear(part, numParts * sizeof(*part)); + mem_clear(part, numParts * sizeof(*part)); part->unk_38 = 0; part->unk_3C = 0; @@ -74,11 +74,11 @@ void smoke_ring_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { part->unk_24 = -0.16f; part->unk_28 = 0; part->unk_2C = 0; - part->unk_04 = -shim_sin_deg(angle) * factor; - part->unk_08 = -shim_cos_deg(angle) * factor; + part->unk_04 = -sin_deg(angle) * factor; + part->unk_08 = -cos_deg(angle) * factor; part->unk_0C = 0; - part->unk_30 = shim_sin_deg(angle); - part->unk_34 = shim_cos_deg(angle); + part->unk_30 = sin_deg(angle); + part->unk_34 = cos_deg(angle); } } @@ -92,7 +92,7 @@ void smoke_ring_update(EffectInstance* effect) { part->unk_40 = D_E002E754[part->unk_38][part->unk_3C++]; if (part->unk_40 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -115,7 +115,7 @@ void smoke_ring_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void smoke_ring_appendGfx(void* effect) { @@ -140,10 +140,10 @@ void smoke_ring_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, D_09002950_32B7F0); - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); - shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp98); + guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 238, 220, 215, 160); @@ -166,8 +166,8 @@ void smoke_ring_appendGfx(void* effect) { part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, dlist); diff --git a/src/effects/snaking_static.c b/src/effects/snaking_static.c index 8dcd8069f3..e259c8b6dc 100644 --- a/src/effects/snaking_static.c +++ b/src/effects/snaking_static.c @@ -23,10 +23,10 @@ EffectInstance* snaking_static_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 effectBp.renderUI = NULL; effectBp.effectID = EFFECT_SNAKING_STATIC; - effect = shim_create_effect_instance(&effectBp); + effect = create_effect_instance(&effectBp); effect->numParts = numParts; - data = effect->data.snakingStatic = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.snakingStatic = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); data->unk_00 = arg0; @@ -94,7 +94,7 @@ void snaking_static_update(EffectInstance* effect) { lifeTime = data->lifeTime; if (timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } if (timeLeft < 16) { @@ -107,29 +107,29 @@ void snaking_static_update(EffectInstance* effect) { data++; for (i = 1; i < effect->numParts; i += 3, data += 3) { if (data->lifeTime >= data->timeLeft) { - data->timeLeft = shim_rand_int(50) + 20; + data->timeLeft = rand_int(50) + 20; data->lifeTime = 0; - data->unk_3C = shim_rand_int(360); + data->unk_3C = rand_int(360); data->pos.x = 0.0f; data->pos.y = 0.0f; } - if (shim_rand_int(100) < 51) { + if (rand_int(100) < 51) { tempPosX = data->pos.x; tempPosY = data->pos.y; - tempOffsetX = shim_rand_int(16) - 8; - tempOffsetY = shim_rand_int(16) - 8; + tempOffsetX = rand_int(16) - 8; + tempOffsetY = rand_int(16) - 8; data[2] = data[1]; data[1] = data[0]; data->pos.x = tempPosX + tempOffsetX; data->pos.y = tempPosY + tempOffsetY; - data->unk_3C = shim_atan2(0.0f, 0.0f, tempOffsetX, tempOffsetY); + data->unk_3C = atan2(0.0f, 0.0f, tempOffsetX, tempOffsetY); if (tempOffsetX != 0.0f || tempOffsetY != 0.0f) { - data->unk_34 = shim_sqrtf((tempOffsetX * tempOffsetX) + (tempOffsetY * tempOffsetY)); + data->unk_34 = sqrtf((tempOffsetX * tempOffsetX) + (tempOffsetY * tempOffsetY)); } else { data->unk_34 = 0.0f; } } - data->unk_24 = (shim_sin_deg(((data->lifeTime * 180) / data->timeLeft)) * 1024.0f); + data->unk_24 = (sin_deg(((data->lifeTime * 180) / data->timeLeft)) * 1024.0f); if (data->unk_24 >= 256) { data->unk_24 = 255; } @@ -138,7 +138,7 @@ void snaking_static_update(EffectInstance* effect) { data = effect->data.snakingStatic; data++; for (i = 1; i < effect->numParts; i++, data++) { - data->unk_40 = shim_rand_int(15); + data->unk_40 = rand_int(15); } } @@ -151,7 +151,7 @@ void snaking_static_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -173,10 +173,10 @@ void snaking_static_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guScaleF(sp58, data->unk_38, data->unk_38, data->unk_38); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guScaleF(sp58, data->unk_38, data->unk_38, data->unk_38); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -187,12 +187,12 @@ void snaking_static_appendGfx(void* effect) { data++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, data++) { gDPSetPrimColor(gMainGfxPos++, 0, 0, primR, primG, primB, (data->unk_24 * unk_24) / 255); - shim_guTranslateF(sp18, data->pos.x, data->pos.y, 0.0f); - shim_guRotateF(sp58, data->unk_3C, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, data->unk_34 * 0.0625f, data->unk_34 * 0.0625f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, 0.0f); + guRotateF(sp58, data->unk_3C, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, data->unk_34 * 0.0625f, data->unk_34 * 0.0625f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/snowfall.c b/src/effects/snowfall.c index 8e14ad65eb..9561f15be1 100644 --- a/src/effects/snowfall.c +++ b/src/effects/snowfall.c @@ -37,10 +37,10 @@ EffectInstance* snowfall_main(s32 arg0, s32 arg1) { effectBp.renderUI = NULL; effectBp.effectID = EFFECT_SNOWFALL; - effect = shim_create_effect_instance(&effectBp); + effect = create_effect_instance(&effectBp); effect->numParts = numParts; - data = effect->data.snowfall = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.snowfall = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); data->timeLeft = 100; @@ -123,7 +123,7 @@ void snowfall_update(EffectInstance* effect) { data->timeLeft--; } if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -156,7 +156,7 @@ void snowfall_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -178,7 +178,7 @@ void snowfall_appendGfx(void* effect) { unk_2C = data->unk_2C; dlist = D_E008AA50[data->unk_04]; if (*gBackgroundFogModePtr == 1) { - shim_get_background_color_blend(&bgRGB, &bgRGB, &bgRGB, &bgAlpha); + get_background_color_blend(&bgRGB, &bgRGB, &bgRGB, &bgAlpha); unk_28 = 255 - bgAlpha; } @@ -189,16 +189,16 @@ void snowfall_appendGfx(void* effect) { gSPDisplayList(gMainGfxPos++, D_09000C00_38DC70); gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, unk_28); - shim_guRotateF(sp18, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); mtx = &gDisplayContext->matrixStack[gMatrixListPos++]; data++; for (i = 0; i < unk_2C; i++, data++) { if (data->unk_30 <= 0 && data->unk_28 != 0) { - shim_guTranslateF(sp18, data->unk_08, data->unk_0C, data->unk_10); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->unk_08, data->unk_0C, data->unk_10); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/effects/snowflake.c b/src/effects/snowflake.c index 9978515cac..18a355e140 100644 --- a/src/effects/snowflake.c +++ b/src/effects/snowflake.c @@ -25,9 +25,9 @@ void snowflake_main(f32 x, f32 y, f32 z, s32 arg3, s32 arg4) { bp.renderUI = NULL; bp.effectID = EFFECT_SNOWFLAKE; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = 1; - part = effect->data.snowflake = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.snowflake = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.snowflake != NULL); @@ -62,7 +62,7 @@ void snowflake_update(EffectInstance* effect) { data->unk_28--; if (data->unk_28 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -113,7 +113,7 @@ void snowflake_render(EffectInstance* effect) { renderTaskPtr->distance = 0; renderTaskPtr->renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(renderTaskPtr); + retTask = queue_render_task(renderTaskPtr); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -126,18 +126,18 @@ void snowflake_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); gSPDisplayList(gMainGfxPos++, D_09000900_331800); - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(spD8, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(spD8, sp18, sp118); - shim_guMtxF2L(sp118, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guRotateF(spD8, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(spD8, sp18, sp118); + guMtxF2L(sp118, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, 255); - shim_guRotateF(sp58, data->unk_18, 1.0f, 0.0f, 0.0f); - shim_guRotateF(sp98, data->unk_1C, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp98, sp118); - shim_guMtxF2L(sp118, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp58, data->unk_18, 1.0f, 0.0f, 0.0f); + guRotateF(sp98, data->unk_1C, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp98, sp118); + guMtxF2L(sp118, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_090009E8_3318E8); diff --git a/src/effects/snowman_doll.c b/src/effects/snowman_doll.c index 0992e99c7d..f49c56dff1 100644 --- a/src/effects/snowman_doll.c +++ b/src/effects/snowman_doll.c @@ -81,9 +81,9 @@ EffectInstance* snowman_doll_main( bp.renderUI = NULL; bp.effectID = EFFECT_SNOWMAN_DOLL; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.snowmanDoll = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.snowmanDoll = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.snowmanDoll != NULL); data->unk_00 = arg0; @@ -137,7 +137,7 @@ void snowman_doll_update(EffectInstance* effect) { data->unk_14++; if (data->unk_10 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -255,13 +255,13 @@ void snowman_doll_update(EffectInstance* effect) { } if ((unk_14 & 7) == 1) { - shim_load_effect(EFFECT_COLD_BREATH); + load_effect(EFFECT_COLD_BREATH); cold_breath_main(2, - data->unk_04 + data->unk_30 + shim_rand_int(60) - 30.0f, - data->unk_08 + data->unk_34 + shim_rand_int(100) + 50.0f, + data->unk_04 + data->unk_30 + rand_int(60) - 30.0f, + data->unk_08 + data->unk_34 + rand_int(100) + 50.0f, data->unk_0C + data->unk_38, 4.0f, 40); - shim_load_effect(EFFECT_MISC_PARTICLES); + load_effect(EFFECT_MISC_PARTICLES); misc_particles_main(1, data->unk_04 + data->unk_30, data->unk_08 + data->unk_34 + 10.0f, @@ -279,7 +279,7 @@ void snowman_doll_render(EffectInstance* effect) { renderTask.distance = -10; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -295,19 +295,19 @@ void snowman_doll_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); - shim_guScaleF(sp58, data->unk_28, data->unk_28, data->unk_28); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); + guScaleF(sp58, data->unk_28, data->unk_28, data->unk_28); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - shim_guTranslateF(sp18, data->unk_30, data->unk_34, data->unk_38); - shim_guScaleF(sp58, data->unk_48, data->unk_4C, data->unk_48); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, data->unk_2C, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->unk_30, data->unk_34, data->unk_38); + guScaleF(sp58, data->unk_48, data->unk_4C, data->unk_48); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, data->unk_2C, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); diff --git a/src/effects/something_rotating.c b/src/effects/something_rotating.c index 039351766a..e67f2d0c9c 100644 --- a/src/effects/something_rotating.c +++ b/src/effects/something_rotating.c @@ -94,9 +94,9 @@ EffectInstance* something_rotating_main( bp.renderUI = NULL; bp.effectID = EFFECT_SOMETHING_ROTATING; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.somethingRotating = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.somethingRotating = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.somethingRotating != NULL); part->unk_00 = arg0; @@ -156,7 +156,7 @@ void something_rotating_update(EffectInstance* effect) { part->unk_14++; if (part->unk_10 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -167,12 +167,12 @@ void something_rotating_update(EffectInstance* effect) { part++; for (i = 1; i < effect->numParts; i++, part++) { f32 angle2 = unk_14 * 4.0f + (f32) i * 51.43; - f32 temp_f24 = shim_sin_deg(angle2); + f32 temp_f24 = sin_deg(angle2); f32 temp_f22 = part->unk_2C; - part->pos.x = x + temp_f22 * shim_sin_deg(angle1) * temp_f24; - part->pos.y = y + temp_f22 * shim_cos_deg(angle2); - part->pos.z = z + temp_f22 * shim_cos_deg(angle1) * temp_f24; + part->pos.x = x + temp_f22 * sin_deg(angle1) * temp_f24; + part->pos.y = y + temp_f22 * cos_deg(angle2); + part->pos.z = z + temp_f22 * cos_deg(angle1) * temp_f24; switch (part->state) { case 1: @@ -224,7 +224,7 @@ void something_rotating_update(EffectInstance* effect) { unk_14_2 = part->unk_14; if (unk_14_2 < 18) { - part->unk_2C = (shim_sin_deg(90 - unk_14_2 * 10) + 1.0f) * 50.0f * 0.5; + part->unk_2C = (sin_deg(90 - unk_14_2 * 10) + 1.0f) * 50.0f * 0.5; } else { part->unk_2C = 0.0f; part->state++; @@ -248,7 +248,7 @@ void something_rotating_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -263,16 +263,16 @@ void func_E01166E8(s32 arg0, SomethingRotatingFXData* part) { temp = 0.0f; } - shim_guPositionF(sp20, 0.0f, part->unk_20 - temp, 0.0f, part->unk_18, + guPositionF(sp20, 0.0f, part->unk_20 - temp, 0.0f, part->unk_18, part->pos.x + 2.0f, part->pos.y, part->pos.z + 2.0f ); - shim_guRotateF(sp60, part->unk_1C, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guTranslateF(sp60, 0.0f, 0.0f, -2.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp60, part->unk_1C, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guTranslateF(sp60, 0.0f, 0.0f, -2.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/effects/sparkles.c b/src/effects/sparkles.c index 8f2c115fc5..2699a1d8cb 100644 --- a/src/effects/sparkles.c +++ b/src/effects/sparkles.c @@ -83,9 +83,9 @@ void sparkles_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_SPARKLES; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.sparkles = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.sparkles = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.sparkles != NULL); part->unk_04 = arg1; @@ -97,31 +97,31 @@ void sparkles_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { part++; for (i = 1; i < numParts; i++, part++) { - f32 rand1 = shim_rand_int(arg4 * 1000.0f) / 1000.0f; - f32 rand2 = shim_rand_int(var_f30 * 1000.0f) / 1000.0f; + f32 rand1 = rand_int(arg4 * 1000.0f) / 1000.0f; + f32 rand2 = rand_int(var_f30 * 1000.0f) / 1000.0f; switch (arg0) { case 0: angle = (360.0f / (numParts - 1)) * i; angle2 = (1800.0f / (numParts - 1)) * i - 90.0f; part->unk_18 = 0.0f; - part->unk_10 = (shim_sin_deg(angle) * (85.0f - shim_sin_deg(angle2) * 15.0f - (i & 1) * 5) / 100.0f) * arg4; - part->unk_14 = (shim_cos_deg(angle) * (85.0f - shim_sin_deg(angle2) * 15.0f - (i & 1) * 5) / 100.0f) * arg4; + part->unk_10 = (sin_deg(angle) * (85.0f - sin_deg(angle2) * 15.0f - (i & 1) * 5) / 100.0f) * arg4; + part->unk_14 = (cos_deg(angle) * (85.0f - sin_deg(angle2) * 15.0f - (i & 1) * 5) / 100.0f) * arg4; part->unk_0C = 0; part->unk_28 = 0; break; case 1: case 2: - angle = (360.0f / (numParts - 1)) * i + shim_rand_int(359); + angle = (360.0f / (numParts - 1)) * i + rand_int(359); if (i & 1) { - part->unk_18 = -(shim_rand_int(50) / 1000 + 0.05); + part->unk_18 = -(rand_int(50) / 1000 + 0.05); } else { part->unk_18 = 0; } part->unk_10 = 0; part->unk_14 = 0; - part->unk_04 = rand1 * shim_sin_deg(angle); - part->unk_08 = rand2 * shim_cos_deg(angle); + part->unk_04 = rand1 * sin_deg(angle); + part->unk_08 = rand2 * cos_deg(angle); part->unk_0C = 0; part->unk_1C = 1.0f; part->unk_24 = i * 2 + 30; @@ -131,12 +131,12 @@ void sparkles_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { case 3: case 4: default: - angle = (360.0f / (numParts - 1)) * i + shim_rand_int(359); - part->unk_18 = -(shim_rand_int(50) / 1000 + 0.05); + angle = (360.0f / (numParts - 1)) * i + rand_int(359); + part->unk_18 = -(rand_int(50) / 1000 + 0.05); part->unk_10 = 0.0f; part->unk_14 = 0.0f; - part->unk_04 = rand1 * shim_sin_deg(angle); - part->unk_08 = rand2 * shim_cos_deg(angle); + part->unk_04 = rand1 * sin_deg(angle); + part->unk_08 = rand2 * cos_deg(angle); part->unk_0C = 0; part->unk_1C = 1.0f; part->unk_24 = i * 2 + 18; @@ -168,7 +168,7 @@ void sparkles_update(EffectInstance *effect) { unk_20 = part->unk_20; if ((unk_00 == 0 || unk_00 == 10) && part->unk_24 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -186,8 +186,8 @@ void sparkles_update(EffectInstance *effect) { angle = func_E0200044(360, i + 177); temp_f20 = (i & 3) * 0.5f + 1.0f; firstPart->unk_00 = 10; - part->unk_10 = temp_f20 * shim_sin_deg(angle); - part->unk_14 = temp_f20 * shim_cos_deg(angle); + part->unk_10 = temp_f20 * sin_deg(angle); + part->unk_14 = temp_f20 * cos_deg(angle); part->unk_18 = -0.05f; } break; @@ -226,7 +226,7 @@ void sparkles_update(EffectInstance *effect) { } if (unk_00 != 0 && unk_00 != 10 && count >= effect->numParts - 1) { - shim_remove_effect(effect); + remove_effect(effect); } } @@ -239,7 +239,7 @@ void sparkles_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void sparkles_appendGfx(void* effect) { @@ -256,24 +256,24 @@ void sparkles_appendGfx(void* effect) { colorIdx = (part->unk_20 - 1) * 3; - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp98); part++; for (i = 0; i < ((EffectInstance*)effect)->numParts - 1; i++, part++) { s32 unk_2C = part->unk_2C; if (unk_2C >= 0) { - shim_guTranslateF(sp58, part->unk_04, part->unk_08, part->unk_0C); + guTranslateF(sp58, part->unk_04, part->unk_08, part->unk_0C); sp58[0][0] = part->unk_1C; sp58[1][1] = part->unk_1C; sp58[2][2] = part->unk_1C; colorIdx += 3; - shim_guMtxCatF(sp58, sp98, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxCatF(sp58, sp98, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); colorIdx %= ARRAY_COUNT(D_E0022CF0); diff --git a/src/effects/spiky_white_aura.c b/src/effects/spiky_white_aura.c index 01d9c88658..6c2d467c5f 100644 --- a/src/effects/spiky_white_aura.c +++ b/src/effects/spiky_white_aura.c @@ -46,7 +46,7 @@ void spiky_white_aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { temp_f12 = SQ(fs3) + SQ(fs2) + SQ(fs1); if (temp_f12 != 0.0f) { - temp_f12 = -1.0f / shim_sqrtf(temp_f12); + temp_f12 = -1.0f / sqrtf(temp_f12); fs3 *= temp_f12; fs2 *= temp_f12; @@ -68,7 +68,7 @@ void spiky_white_aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { temp_f12 = SQ(var_f0) + SQ(var_f2) + SQ(var_f4); if (temp_f12 != 0.0f) { - temp_f12 = 1.0 / shim_sqrtf(temp_f12); + temp_f12 = 1.0 / sqrtf(temp_f12); fs3 *= 18.0f; fs2 *= 18.0f; @@ -81,9 +81,9 @@ void spiky_white_aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_SPIKY_WHITE_AURA; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.spikyWhiteAura = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.spikyWhiteAura = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.spikyWhiteAura != NULL); for (i = 0; i < numParts; i++, part++) { @@ -95,8 +95,8 @@ void spiky_white_aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { part->unk_08 = arg2; part->unk_0C = arg3; - sinYaw = shim_sin_deg(gCameras[gCurrentCameraID].currentYaw); - cosYaw = -shim_cos_deg(gCameras[gCurrentCameraID].currentYaw); + sinYaw = sin_deg(gCameras[gCurrentCameraID].currentYaw); + cosYaw = -cos_deg(gCameras[gCurrentCameraID].currentYaw); if (numParts != 1) { rotateA = (i * 100) / (numParts - 1) - 50; @@ -104,7 +104,7 @@ void spiky_white_aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { rotateA = 0.0f; } - shim_guRotateF(matrix, rotateA, sinYaw, 0.0f, cosYaw); + guRotateF(matrix, rotateA, sinYaw, 0.0f, cosYaw); part->unk_10 = (sp30[0][0] * fs3 + sp30[1][0] * fs2 + sp30[2][0] * fs1) * 0.6; part->unk_14 = sp30[0][1] * fs3 + sp30[1][1] * fs2 + sp30[2][1] * fs1; @@ -132,7 +132,7 @@ void spiky_white_aura_update(EffectInstance* effect) { part->unk_2C++; if (part->unk_28 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -145,7 +145,7 @@ void spiky_white_aura_update(EffectInstance* effect) { part->unk_14 *= 0.8; part->unk_18 *= 0.8; part->unk_24 += (255 - part->unk_24) * 0.4; - part->unk_20 = shim_sin_deg(part->unk_24 / 2) * 3.0f + shim_sin_deg(unk_2C * 30.0f); + part->unk_20 = sin_deg(part->unk_24 / 2) * 3.0f + sin_deg(unk_2C * 30.0f); } if (unk_28 < 5) { @@ -153,7 +153,7 @@ void spiky_white_aura_update(EffectInstance* effect) { part->unk_10 *= 0.7; part->unk_14 *= 0.7; part->unk_18 *= 0.7; - part->unk_20 = shim_sin_deg(part->unk_24 / 2) * 3.0f + shim_sin_deg(unk_2C * 30.0f) + (255 - part->unk_24) / 30.0f; + part->unk_20 = sin_deg(part->unk_24 / 2) * 3.0f + sin_deg(unk_2C * 30.0f) + (255 - part->unk_24) / 30.0f; } part->unk_04 += part->unk_10; @@ -171,7 +171,7 @@ void spiky_white_aura_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -186,14 +186,14 @@ void spiky_white_aura_appendGfx(void* effect) { gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, part->unk_24); for (i = 0; i < ((EffectInstance*)effect)->numParts; i++, part++) { - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, part->unk_1C, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, part->unk_20, part->unk_20, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, part->unk_1C, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, part->unk_20, part->unk_20, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gDPPipeSync(gMainGfxPos++); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/spirit_card.c b/src/effects/spirit_card.c index cef673d934..0742eda094 100644 --- a/src/effects/spirit_card.c +++ b/src/effects/spirit_card.c @@ -46,9 +46,9 @@ EffectInstance* spirit_card_main( bp.renderUI = NULL; bp.effectID = EFFECT_SPIRIT_CARD; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.spiritCard = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.spiritCard = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.spiritCard != NULL); data->unk_00 = arg0; @@ -67,12 +67,12 @@ EffectInstance* spirit_card_main( data->unk_20 = 30.0f; if (arg0 == 0) { - shim_load_effect(EFFECT_RING_BLAST); + load_effect(EFFECT_RING_BLAST); ring_blast_main(1, data->pos.x, data->pos.y, data->pos.z, 3.0f, 30); } if (arg0 < 2) { - shim_load_effect(EFFECT_MISC_PARTICLES); + load_effect(EFFECT_MISC_PARTICLES); data->child = misc_particles_main(3, arg1, arg2 - arg4 * 30.0f, arg3, arg4 * 30.0f, arg4 * 50.0f, 1.0f, 16, 0); } else { data->child = NULL; @@ -99,7 +99,7 @@ void spirit_card_update(EffectInstance* effect) { data->unk_14++; if (data->unk_10 < 0) { - shim_remove_effect(effect); + remove_effect(effect); if (data->child != NULL) { data->child->flags |= FX_INSTANCE_FLAG_DISMISS; } @@ -121,7 +121,7 @@ void spirit_card_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -136,12 +136,12 @@ void func_E0112330(s32 arg0, SpiritCardFXData* data) { temp = 0.0f; } - shim_guPositionF(sp20, 0.0f, data->yaw - temp, 0.0f, data->unk_18, data->pos.x + 2.0f, data->pos.y, data->pos.z + 2.0f); - shim_guRotateF(sp60, data->unk_20, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guTranslateF(sp60, 0.0f, 0.0f, -2.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, data->yaw - temp, 0.0f, data->unk_18, data->pos.x + 2.0f, data->pos.y, data->pos.z + 2.0f); + guRotateF(sp60, data->unk_20, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guTranslateF(sp60, 0.0f, 0.0f, -2.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } diff --git a/src/effects/squirt.c b/src/effects/squirt.c index dbc9d9883d..5a5110ec50 100644 --- a/src/effects/squirt.c +++ b/src/effects/squirt.c @@ -25,9 +25,9 @@ EffectInstance* squirt_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f3 bp.renderUI = NULL; bp.effectID = EFFECT_SQUIRT; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.squirt = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.squirt = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.squirt != NULL); data->unk_00 = arg0; @@ -104,7 +104,7 @@ void squirt_update(EffectInstance* effect) { data->unk_30++; if (data->unk_2C < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -132,7 +132,7 @@ void squirt_update(EffectInstance* effect) { data->unk_148[i] = data->unk_18 + (data->unk_24 - data->unk_18) * factor; } else { data->unk_E8[i] = data->unk_10 + (data->unk_1C - data->unk_10) * factor; - data->unk_118[i] = data->unk_14 + (data->unk_20 - data->unk_14) * factor + shim_sin_deg(factor * 180.0f) * 120.0f; + data->unk_118[i] = data->unk_14 + (data->unk_20 - data->unk_14) * factor + sin_deg(factor * 180.0f) * 120.0f; data->unk_148[i] = data->unk_18 + (data->unk_24 - data->unk_18) * factor; data->unk_1D8[i] = 255.0f - factor * 255.0f; } @@ -149,7 +149,7 @@ void squirt_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -175,10 +175,10 @@ void squirt_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp10, 0.0f, 0.0f, 0.0f); - shim_guScaleF(sp50, 0.05f, 0.05f, 0.05f); - shim_guMtxCatF(sp50, sp10, sp10); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp10, 0.0f, 0.0f, 0.0f); + guScaleF(sp50, 0.05f, 0.05f, 0.05f); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_34, data->unk_38, data->unk_3C, data->unk_40); @@ -197,7 +197,7 @@ void squirt_appendGfx(void* effect) { if (i == 0 || zero == i || (i != 11 && data->unk_178[i] == 0)) { theta = data->unk_118[inc]; - theta = -shim_atan2(theta, -data->unk_E8[i + 1], data->unk_118[i], -data->unk_E8[i]); + theta = -atan2(theta, -data->unk_E8[i + 1], data->unk_118[i], -data->unk_E8[i]); } if (data->unk_00 == 0) { @@ -218,8 +218,8 @@ void squirt_appendGfx(void* effect) { tc0 *= 64; var_f22 *= unk_50; - sinComp = var_f22 * shim_sin_deg(theta); - cosComp = var_f22 * shim_cos_deg(theta); + sinComp = var_f22 * sin_deg(theta); + cosComp = var_f22 * cos_deg(theta); vtx->ob[0] = (data->unk_E8[i] + sinComp) * 20.0f; vtx->ob[1] = (data->unk_118[i] + cosComp) * 20.0f; diff --git a/src/effects/star.c b/src/effects/star.c index d2a58da1b8..24c0dcd9fb 100644 --- a/src/effects/star.c +++ b/src/effects/star.c @@ -39,9 +39,9 @@ EffectInstance* star_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 bp.renderUI = NULL; bp.effectID = EFFECT_STAR; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = 1; - part = effect->data.star = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.star = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.star != NULL); part->unk_00 = 1; @@ -55,8 +55,8 @@ EffectInstance* star_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 if (arg0 == 3) { part->unk_240 = 0.2f; - part->unk_244 = shim_rand_int(255); - part->unk_248 = shim_rand_int(255 - part->unk_244); + part->unk_244 = rand_int(255); + part->unk_248 = rand_int(255 - part->unk_244); temp_s0 = 255 - part->unk_248; part->unk_24C = temp_s0 - part->unk_244; } else { @@ -73,7 +73,7 @@ EffectInstance* star_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 temp_f26 = SQ(temp_f24) + SQ(temp_f22) + SQ(temp_f20); phi_f26 = temp_f26; if (temp_f26 != 0.0f) { - phi_f26 = shim_sqrtf(temp_f26); + phi_f26 = sqrtf(temp_f26); temp_f26 = arg7 / phi_f26; } @@ -82,15 +82,15 @@ EffectInstance* star_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 part->unk_18 = temp_f20 * temp_f26; currentYaw = gCameras[gCurrentCameraID].currentYaw; - cosYaw = -shim_cos_deg(currentYaw); - sinYaw = -shim_sin_deg(currentYaw); + cosYaw = -cos_deg(currentYaw); + sinYaw = -sin_deg(currentYaw); temp_f4 = cosYaw * part->unk_10; temp_f2 = sinYaw * part->unk_18; temp_f12 = SQ(temp_f4) + SQ(temp_f2); if (temp_f12 != 0.0f) { - temp_f12 = shim_sqrtf(temp_f12); + temp_f12 = sqrtf(temp_f12); } if ((cosYaw * part->unk_10) + (sinYaw * part->unk_18) < 0.0f) { @@ -100,10 +100,10 @@ EffectInstance* star_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 part->unk_2C = 20.0f; } - part->unk_20 = part->unk_24 = shim_atan2(0.0f, 0.0f, -part->unk_14, -temp_f12); + part->unk_20 = part->unk_24 = atan2(0.0f, 0.0f, -part->unk_14, -temp_f12); part->unk_30 = phi_f26 / arg7; part->unk_34 = -temp_f12; - shim_guTranslate(part->unk_40, part->unk_04, part->unk_08, part->unk_0C); + guTranslate(part->unk_40, part->unk_04, part->unk_08, part->unk_0C); for (i = 1; i < ARRAY_COUNT(part->unk_40); i++) { part->unk_40[i] = part->unk_40[0]; @@ -125,7 +125,7 @@ void star_update(EffectInstance* effect) { if (data->unk_38 >= 2) { length = SQ(data->unk_10) + SQ(data->unk_14) + SQ(data->unk_18); if (length > 0.01f) { - length = 1.0f / shim_sqrtf(length); + length = 1.0f / sqrtf(length); } xTemp = data->unk_10 * length * 32.0f; @@ -138,7 +138,7 @@ void star_update(EffectInstance* effect) { if (data->unk_00 != 0 && data->unk_14 < 0.0f && - shim_npc_raycast_down_sides(0, &x, &y, &z, &length) != 0 && + npc_raycast_down_sides(0, &x, &y, &z, &length) != 0 && length < 42.0f) { data->unk_1C = data->unk_1C + 1.0f; @@ -146,11 +146,11 @@ void star_update(EffectInstance* effect) { data->unk_10 = data->unk_10 * 0.7; data->unk_34 = data->unk_34 * 0.7; data->unk_2C = data->unk_2C * 0.7; - shim_load_effect(EFFECT_LANDING_DUST); + load_effect(EFFECT_LANDING_DUST); landing_dust_main(0, data->unk_04, data->unk_08 - 5.0f, data->unk_0C, 0.0f); if (!gGameStatusPtr->isBattle) { - shim_sfx_play_sound_at_position(SOUND_B0000016, SOUND_SPACE_MODE_0, data->unk_04, data->unk_08, data->unk_0C); + sfx_play_sound_at_position(SOUND_B0000016, SOUND_SPACE_MODE_0, data->unk_04, data->unk_08, data->unk_0C); } data->unk_00 = 0; @@ -162,7 +162,7 @@ void star_update(EffectInstance* effect) { if (data->unk_1C != 0.0f) { data->unk_14 += -0.5; data->unk_24 += data->unk_2C; - data->unk_20 = shim_atan2(0.0f, 0.0f, -data->unk_14, data->unk_34); + data->unk_20 = atan2(0.0f, 0.0f, -data->unk_14, data->unk_34); } } @@ -175,7 +175,7 @@ void star_update(EffectInstance* effect) { data->unk_0C += data->unk_18; if (data->unk_30 < 0) { - shim_remove_effect(effect); + remove_effect(effect); } } @@ -196,7 +196,7 @@ void star_render(EffectInstance* effect) { } renderTaskPtr->renderMode = renderModeTemp; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void star_appendGfx(void* effect) { @@ -214,10 +214,10 @@ void star_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, unk_240, data->unk_04, data->unk_08, data->unk_0C); - shim_guRotateF(sp60, data->unk_24, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, unk_240, data->unk_04, data->unk_08, data->unk_0C); + guRotateF(sp60, data->unk_24, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 80, unk_244, unk_248, unk_24C, 255); @@ -241,10 +241,10 @@ void star_appendGfx(void* effect) { if (data->unk_1C <= 1.0f) { s32 baseIdx = (data->unk_3C + 5) % 8; - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, unk_240, data->unk_04, data->unk_08, data->unk_0C); - shim_guRotateF(sp60, data->unk_20, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &data->unk_40[data->unk_3C]); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, unk_240, data->unk_04, data->unk_08, data->unk_0C); + guRotateF(sp60, data->unk_20, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &data->unk_40[data->unk_3C]); for (i = 0; i < 5; i++) { idx = (baseIdx - i + 8) % 8; diff --git a/src/effects/star_outline.c b/src/effects/star_outline.c index 5fa3f57bec..3205405364 100644 --- a/src/effects/star_outline.c +++ b/src/effects/star_outline.c @@ -27,10 +27,10 @@ EffectInstance* star_outline_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 ar effectBp.renderUI = NULL; effectBp.effectID = EFFECT_STAR_OUTLINE; - effect = shim_create_effect_instance(&effectBp); + effect = create_effect_instance(&effectBp); effect->numParts = numParts; - data = effect->data.starOutline = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.starOutline = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); data->unk_00 = 1; @@ -81,7 +81,7 @@ void star_outline_update(EffectInstance* effect) { data->lifeTime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } lifeTime = data->lifeTime; @@ -114,14 +114,14 @@ void star_outline_update(EffectInstance* effect) { data->unk_24 = 255; data->unk_3C.y = (lifeTime * 4.0f * 0.4953); data->unk_3C.z = (lifeTime * 4.0f * 0.2234); - data->unk_34 = ((shim_sin_deg (lifetimeF * 7.12343)) * 127.0f) + 128.0f; - data->unk_18 = ((shim_sin_deg (lifetimeF * 1.231)) * 127.0f) + 215.0f; - data->unk_1C = ((shim_sin_deg (lifetimeF * 0.531)) * 127.0f) + 215.0f; - data->unk_20 = ((shim_sin_deg (lifetimeF * 3.231)) * 127.0f) + 215.0f; - data->unk_28 = ((shim_sin_deg (lifetimeF * 0.298)) * 127.0f) + 188.0f; - data->unk_2C = ((shim_sin_deg (lifetimeF * 0.831)) * 127.0f) + 188.0f; - data->unk_30 = ((shim_sin_deg (lifetimeF * 2.231)) * 127.0f) + 188.0f; - data->unk_38 = ((shim_sin_deg (lifetimeF * 2.044)) * 0.3) + 0.7; + data->unk_34 = ((sin_deg (lifetimeF * 7.12343)) * 127.0f) + 128.0f; + data->unk_18 = ((sin_deg (lifetimeF * 1.231)) * 127.0f) + 215.0f; + data->unk_1C = ((sin_deg (lifetimeF * 0.531)) * 127.0f) + 215.0f; + data->unk_20 = ((sin_deg (lifetimeF * 3.231)) * 127.0f) + 215.0f; + data->unk_28 = ((sin_deg (lifetimeF * 0.298)) * 127.0f) + 188.0f; + data->unk_2C = ((sin_deg (lifetimeF * 0.831)) * 127.0f) + 188.0f; + data->unk_30 = ((sin_deg (lifetimeF * 2.231)) * 127.0f) + 188.0f; + data->unk_38 = ((sin_deg (lifetimeF * 2.044)) * 0.3) + 0.7; } if (lifeTime == 1) { data->unk_48 = data->unk_3C.x; @@ -140,7 +140,7 @@ void star_outline_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -211,10 +211,10 @@ void star_outline_appendGfx(void* effect) { gSPDisplayList(gMainGfxPos++, D_E0126BC8[0]); if (unk_34 != 0) { - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, (f32) ((f64) data->unk_54 * 0.4), data->pos.x, data->pos.y, data->pos.z); - shim_guPositionF(sp60, data->unk_48, data->unk_4C, data->unk_50, 1.0f, 0.0f, 0.0f, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, (f32) ((f64) data->unk_54 * 0.4), data->pos.x, data->pos.y, data->pos.z); + guPositionF(sp60, data->unk_48, data->unk_4C, data->unk_50, 1.0f, 0.0f, 0.0f, 0.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -230,10 +230,10 @@ void star_outline_appendGfx(void* effect) { gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_38 * 0.4, data->pos.x, data->pos.y, data->pos.z); - shim_guPositionF(sp60, data->unk_3C.x, data->unk_3C.y, data->unk_3C.z, 1.0f, 0.0f, 0.0f, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_38 * 0.4, data->pos.x, data->pos.y, data->pos.z); + guPositionF(sp60, data->unk_3C.x, data->unk_3C.y, data->unk_3C.z, 1.0f, 0.0f, 0.0f, 0.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/effects/star_spirits_energy.c b/src/effects/star_spirits_energy.c index b9b0e78867..a1c44540b6 100644 --- a/src/effects/star_spirits_energy.c +++ b/src/effects/star_spirits_energy.c @@ -105,9 +105,9 @@ EffectInstance* star_spirits_energy_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, bp.renderUI = NULL; bp.effectID = EFFECT_STAR_SPIRITS_ENERGY; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.starSpiritsEnergy = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.starSpiritsEnergy = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.starSpiritsEnergy != NULL); data->unk_00 = arg0 & 0xFF00; @@ -180,7 +180,7 @@ void star_spirits_energy_update(EffectInstance* effect) { data->unk_18++; if (data->unk_14 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -194,10 +194,10 @@ void star_spirits_energy_update(EffectInstance* effect) { case 0: data->unk_50[0] = (unk_18 & 3) * 30 + 200; data->unk_74++; - data->unk_40[0] = shim_sin_deg(unk_18 * 20) * 0.04 + 0.5; + data->unk_40[0] = sin_deg(unk_18 * 20) * 0.04 + 0.5; if (data->unk_00 != 0) { - data->unk_08 += shim_sin_deg(unk_18); - data->unk_0C += shim_cos_deg(unk_18 * 1.235631); + data->unk_08 += sin_deg(unk_18); + data->unk_0C += cos_deg(unk_18 * 1.235631); if (data->unk_74 > 50) { data->unk_74 = 0; if (unk_04 == 3) { @@ -331,7 +331,7 @@ void star_spirits_energy_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -345,9 +345,9 @@ void star_spirits_energy_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_3C, data->unk_08, data->unk_0C, data->unk_10); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -357,8 +357,8 @@ void star_spirits_energy_appendGfx(void* effect) { for (i = 0; i < 4; i++) { if (unk_04 != 1 || i != 2) { if (data->unk_40[i] != 0.0f && data->unk_50[i] != 0) { - shim_guPositionF(sp20, 0.0f, 0.0f, 0.0f, data->unk_40[i], 0.0f, 0.0f, 0.0f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, 0.0f, 0.0f, data->unk_40[i], 0.0f, 0.0f, 0.0f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/stars_burst.c b/src/effects/stars_burst.c index 988f2b5bde..6346219064 100644 --- a/src/effects/stars_burst.c +++ b/src/effects/stars_burst.c @@ -52,9 +52,9 @@ void stars_burst_main( bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_STARS_BURST; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.starsBurst = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.starsBurst = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.starsBurst != NULL); part->unk_00 = arg0; @@ -67,15 +67,15 @@ void stars_burst_main( part++; for (i = 1; i < numParts; i++, part++) { - temp = shim_rand_int(10) * 0.25f + 5.0f; + temp = rand_int(10) * 0.25f + 5.0f; part->unk_00 = arg0; part->unk_04 = arg1; part->unk_08 = arg2; part->unk_0C = arg3; - part->unk_10 = shim_cos_deg(arg5 + (i & 2) * (i / 2) * 4) * shim_sin_deg(arg4); - part->unk_14 = shim_sin_deg(arg5 + (i & 2) * (i / 2) * 4); - part->unk_18 = shim_cos_deg(arg5 + (i & 2) * (i / 2) * 4) * shim_cos_deg(arg4); + part->unk_10 = cos_deg(arg5 + (i & 2) * (i / 2) * 4) * sin_deg(arg4); + part->unk_14 = sin_deg(arg5 + (i & 2) * (i / 2) * 4); + part->unk_18 = cos_deg(arg5 + (i & 2) * (i / 2) * 4) * cos_deg(arg4); part->unk_28 = temp; part->unk_24 = temp / 10.0; } @@ -94,7 +94,7 @@ void stars_burst_update(EffectInstance* effect) { part->unk_34++; if (part->unk_30 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -124,7 +124,7 @@ void stars_burst_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -154,12 +154,12 @@ void stars_burst_appendGfx(void* effect) { gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E0042780[rIdx % 36], D_E0042780[gIdx % 36], D_E0042780[bIdx % 36], unk_2C); - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, part->unk_24, part->unk_24, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, part->unk_24, part->unk_24, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, dlist); diff --git a/src/effects/stars_orbiting.c b/src/effects/stars_orbiting.c index 41a12dfc17..9fa5a014f7 100644 --- a/src/effects/stars_orbiting.c +++ b/src/effects/stars_orbiting.c @@ -36,12 +36,12 @@ void stars_orbiting_main( bp.renderUI = func_E005E318; bp.effectID = EFFECT_STARS_ORBITING; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numStars; - part = effect->data.starsOrbiting = shim_general_heap_malloc(numStars * sizeof(*part)); + part = effect->data.starsOrbiting = general_heap_malloc(numStars * sizeof(*part)); ASSERT(effect->data.starsOrbiting != NULL); - shim_mem_clear(part, numStars * sizeof(*part)); + mem_clear(part, numStars * sizeof(*part)); part->type = type; part->pos.x = posX; @@ -81,9 +81,9 @@ void stars_orbiting_update(EffectInstance* effect) { part++; for (i = 1; i < effect->numParts; i++, part++) { - part->pos.x = radius * shim_sin_deg(part->yaw); - part->pos.z = radius * shim_cos_deg(part->yaw) * shim_cos_deg(part->pitch); - part->pos.y = radius * shim_cos_deg(part->yaw) * shim_sin_deg(part->pitch); + part->pos.x = radius * sin_deg(part->yaw); + part->pos.z = radius * cos_deg(part->yaw) * cos_deg(part->pitch); + part->pos.y = radius * cos_deg(part->yaw) * sin_deg(part->pitch); part->roll += part->rollSpinRate; part->pitch = 0.0f; part->yaw += 16; @@ -116,20 +116,20 @@ void func_E005E334(EffectInstance* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, dlist2); - shim_guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); - shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp98); + guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 220, 220, 40, 255); part++; for (i = 1; i < effect->numParts; i++, part++) { - shim_guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); - shim_guRotateF(sp58, part->roll, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); + guRotateF(sp58, part->roll, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, dlist); diff --git a/src/effects/stars_shimmer.c b/src/effects/stars_shimmer.c index bfed3f54ae..973288bdbf 100644 --- a/src/effects/stars_shimmer.c +++ b/src/effects/stars_shimmer.c @@ -69,9 +69,9 @@ void stars_shimmer_main(s32 type, f32 x, f32 y, f32 z, f32 arg4, f32 arg5, s32 n bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_STARS_SHIMMER; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.starsShimmer = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.starsShimmer = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.starsShimmer != NULL); if (type == 6) { @@ -91,14 +91,14 @@ void stars_shimmer_main(s32 type, f32 x, f32 y, f32 z, f32 arg4, f32 arg5, s32 n for (i = 1; i < numParts; i++, part++) { temp_f22 = (360.0f / (numParts - 1)) * i; if (type > 1) { - theta = temp_f22 + shim_rand_int(359); + theta = temp_f22 + rand_int(359); } else { theta = temp_f22 + 0.0f; } t3 = (temp_f22 * 10.0f) - 90.0f; - sinTheta = shim_sin_deg(theta); - cosTheta = shim_cos_deg(theta); - temp_f22 = shim_sin_deg(t3); + sinTheta = sin_deg(theta); + cosTheta = cos_deg(theta); + temp_f22 = sin_deg(t3); temp_f8 = (arg4 * 0.4) - (arg4 * 0.1 * temp_f22); temp_ft = (arg5 * 0.4) - (arg5 * 0.1 * temp_f22); new_var = 1.0f; // TODO dumb temp and cast later required to match @@ -117,8 +117,8 @@ void stars_shimmer_main(s32 type, f32 x, f32 y, f32 z, f32 arg4, f32 arg5, s32 n part->unk_14 = cosTheta * temp_ft; break; case 3: - part->pos.x = (sinTheta * arg4 * shim_rand_int(100)) * 0.005; - part->pos.y = (cosTheta * arg5 * shim_rand_int(100)) * 0.005; + part->pos.x = (sinTheta * arg4 * rand_int(100)) * 0.005; + part->pos.y = (cosTheta * arg5 * rand_int(100)) * 0.005; part->pos.z = 0.0f; part->unk_18 = part->unk_10 = part->unk_14 = 0.0f; @@ -132,8 +132,8 @@ void stars_shimmer_main(s32 type, f32 x, f32 y, f32 z, f32 arg4, f32 arg5, s32 n part->unk_10 = sinTheta * temp_f8; part->pos.y = temp5; part->pos.z = cosTheta * temp_f8; - part->unk_14 = -shim_rand_int(10) * 0.03f; - part->unk_18 = (shim_rand_int(10) * 0.04f) + 0.01; + part->unk_14 = -rand_int(10) * 0.03f; + part->unk_18 = (rand_int(10) * 0.04f) + 0.01; break; } } @@ -155,7 +155,7 @@ void stars_shimmer_update(EffectInstance* effect) { lifeTime = it->lifeTime; if (state == 0 || state == 1 || state == 3 || state >= 10) { if (it->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } } @@ -180,8 +180,8 @@ void stars_shimmer_update(EffectInstance* effect) { var_f20 -= 120.0f; } data->state = 10; - it->unk_10 = shim_sin_deg(var_f20); - it->unk_14 = shim_cos_deg(var_f20); + it->unk_10 = sin_deg(var_f20); + it->unk_14 = cos_deg(var_f20); it->unk_18 = -0.05f; } break; @@ -252,8 +252,8 @@ void stars_shimmer_update(EffectInstance* effect) { it->unk_1C += (0.1 - it->unk_1C) * 0.1; } if (state == 4) { - it->pos.x = (it->unk_10 * shim_sin_deg(lifeTime * 12)); - it->pos.z = (it->unk_10 * shim_cos_deg(lifeTime * 12)); + it->pos.x = (it->unk_10 * sin_deg(lifeTime * 12)); + it->pos.z = (it->unk_10 * cos_deg(lifeTime * 12)); } else { it->pos.x = it->unk_10; } @@ -263,7 +263,7 @@ void stars_shimmer_update(EffectInstance* effect) { } if (state != 0 && state != 1 && state != 3 && state < 10 && deadParts >= effect->numParts - 1) { - shim_remove_effect(effect); + remove_effect(effect); } } @@ -276,7 +276,7 @@ void stars_shimmer_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void stars_shimmer_appendGfx(void* effect) { @@ -296,9 +296,9 @@ void stars_shimmer_appendGfx(void* effect) { gSPDisplayList(gMainGfxPos++, D_09000F20_338EE0); temp_s4 = (data->lifeTime - 1) * 3; - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp98); switch (type) { case 0: @@ -334,10 +334,10 @@ void stars_shimmer_appendGfx(void* effect) { for (i = 0; i < ((EffectInstance*)effect)->numParts - 1; i++, data++) { unk_28 = data->unk_28; if (unk_28 >= 0) { - shim_guTranslateF(sp58, data->pos.x, data->pos.y, data->pos.z); + guTranslateF(sp58, data->pos.x, data->pos.y, data->pos.z); sp58[0][0] = sp58[1][1] = sp58[2][2] = data->unk_1C; - shim_guMtxCatF(sp58, sp98, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxCatF(sp58, sp98, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); if (temp_s4 >= 36) { temp_s4 = 0; } diff --git a/src/effects/stars_spread.c b/src/effects/stars_spread.c index 9578511616..98e09dba3b 100644 --- a/src/effects/stars_spread.c +++ b/src/effects/stars_spread.c @@ -31,12 +31,12 @@ void stars_spread_main( bp.renderUI = NULL; bp.effectID = EFFECT_STARS_SPREAD; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = arg4; - part = effect->data.starsSpread = shim_general_heap_malloc(arg4 * sizeof(*part)); + part = effect->data.starsSpread = general_heap_malloc(arg4 * sizeof(*part)); ASSERT(effect->data.starsSpread != NULL); - shim_mem_clear(part, arg4 * sizeof(*part)); + mem_clear(part, arg4 * sizeof(*part)); part->unk_24 = arg5; part->unk_28 = 0; @@ -51,8 +51,8 @@ void stars_spread_main( part->unk_04 = 0; part->unk_08 = 0; part->unk_0C = 0; - part->unk_10 = shim_sin_deg((i - 1) * 360 / (arg4 - 1)) * 8.0; - part->unk_14 = shim_cos_deg((i - 1) * 360 / (arg4 - 1)) * 8.0; + part->unk_10 = sin_deg((i - 1) * 360 / (arg4 - 1)) * 8.0; + part->unk_14 = cos_deg((i - 1) * 360 / (arg4 - 1)) * 8.0; part->unk_18 = 0; part->unk_1C = 0; part->unk_20 = 20.0f; @@ -73,7 +73,7 @@ void stars_spread_update(EffectInstance* effect) { part->unk_24--; if (part->unk_24 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -115,7 +115,7 @@ void stars_spread_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -130,22 +130,22 @@ void stars_spread_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, D_09000440_360E70); - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 220, 220, 40, 230); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, part->unk_1C, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, part->unk_30, part->unk_30, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, part->unk_1C, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, part->unk_30, part->unk_30, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, dlist); diff --git a/src/effects/stat_change.c b/src/effects/stat_change.c index 6793ed4618..901e03d60d 100644 --- a/src/effects/stat_change.c +++ b/src/effects/stat_change.c @@ -152,9 +152,9 @@ EffectInstance* stat_change_main(s32 arg0, f32 x, f32 y, f32 z, f32 scale, s32 t bp.unk_00 = 0; bp.effectID = EFFECT_STAT_CHANGE; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.statChange = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.statChange = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.statChange != NULL); @@ -190,7 +190,7 @@ void stat_change_update(EffectInstance* effect) { old_unk18 = part->unk_18++; if (part->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -245,8 +245,8 @@ void func_E00AC2A4(EffectInstance* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->scale, data->pos.x, data->pos.y, data->pos.z); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->scale, data->pos.x, data->pos.y, data->pos.z); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -258,10 +258,10 @@ void func_E00AC2A4(EffectInstance* effect) { gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0); } - shim_guTranslateF(sp20, 0.0f, data->unk_40, 0.0f); - shim_guScaleF(sp60, data->scaleX, data->scaleY, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, 0.0f, data->unk_40, 0.0f); + guScaleF(sp60, data->scaleX, data->scaleY, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E00AC7B0[arrowType]); @@ -270,8 +270,8 @@ void func_E00AC2A4(EffectInstance* effect) { gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_090028E0_3B1FE0); - shim_guTranslateF(sp20, 0.0f, data->unk_3C, 0.0f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, 0.0f, data->unk_3C, 0.0f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/static_status.c b/src/effects/static_status.c index 7876a0a9cf..0d07bf1a36 100644 --- a/src/effects/static_status.c +++ b/src/effects/static_status.c @@ -59,9 +59,9 @@ EffectInstance* static_status_main( bp.renderUI = NULL; bp.effectID = EFFECT_STATIC_STATUS; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numBolts; - part = effect->data.staticStatus = shim_general_heap_malloc(numBolts * sizeof(*part)); + part = effect->data.staticStatus = general_heap_malloc(numBolts * sizeof(*part)); ASSERT(effect->data.staticStatus != NULL); part->type = type; @@ -112,7 +112,7 @@ void static_status_update(EffectInstance* effect) { part->lifetime++; if (part->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -140,8 +140,8 @@ void static_status_update(EffectInstance* effect) { if (part->frame >= 0) { if (part->frame == 0) { angle = (i * 360.0f) / (effect->numParts - 1); - part->pos.x = shim_sin_deg(angle) * 16.0f; - part->pos.y = shim_cos_deg(angle) * 16.0f; + part->pos.x = sin_deg(angle) * 16.0f; + part->pos.y = cos_deg(angle) * 16.0f; part->unk_10 = part->pos.x * initialAmt; part->unk_14 = part->pos.y * initialAmt; part->unk_18 = 0.0f; @@ -181,7 +181,7 @@ void static_status_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_SURFACE_OPA; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -200,10 +200,10 @@ void static_status_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(mtxTransform, part->pos.x, part->pos.y, part->pos.z); - shim_guScaleF(mtxTemp, part->scale, part->scale, part->scale); - shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtxTransform, part->pos.x, part->pos.y, part->pos.z); + guScaleF(mtxTemp, part->scale, part->scale, part->scale); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -212,8 +212,8 @@ void static_status_appendGfx(void* effect) { part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { if (part->frame >= 0) { - shim_guPositionF(mtxTransform, 0.0f, 0.0f, part->rotation, part->scale, part->pos.x, part->pos.y, 0.0f); - shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(mtxTransform, 0.0f, 0.0f, part->rotation, part->scale, part->pos.x, part->pos.y, 0.0f); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, (unk_30 * part->alpha) >> 8); diff --git a/src/effects/steam_burst.c b/src/effects/steam_burst.c index a575892697..a2f84df52a 100644 --- a/src/effects/steam_burst.c +++ b/src/effects/steam_burst.c @@ -33,12 +33,12 @@ void steam_burst_main( bp.renderUI = NULL; bp.effectID = EFFECT_STEAM_BURST; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.steamBurst = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.steamBurst = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.steamBurst != NULL); - shim_mem_clear(part, numParts * sizeof(*part)); + mem_clear(part, numParts * sizeof(*part)); part->unk_24 = arg5; part->unk_28 = 0; @@ -58,9 +58,9 @@ void steam_burst_main( part->unk_04 = zero; part->unk_08 = zero; part->unk_0C = zero; - part->unk_10 = shim_sin_deg(0.0f); + part->unk_10 = sin_deg(0.0f); part->unk_14 = 0.0f; - part->unk_18 = shim_cos_deg(0.0f); + part->unk_18 = cos_deg(0.0f); } } @@ -77,7 +77,7 @@ void steam_burst_update(EffectInstance* effect) { part->unk_24--; if (part->unk_24 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -103,7 +103,7 @@ void steam_burst_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -123,10 +123,10 @@ void steam_burst_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, dlist2); - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); - shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp98); + guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 230, 222, 222, 130); @@ -147,8 +147,8 @@ void steam_burst_appendGfx(void* effect) { part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { - shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, dlist); diff --git a/src/effects/stop_watch.c b/src/effects/stop_watch.c index 0d50e0810a..51e75f6576 100644 --- a/src/effects/stop_watch.c +++ b/src/effects/stop_watch.c @@ -65,9 +65,9 @@ EffectInstance* stop_watch_main( bp.renderUI = NULL; bp.effectID = EFFECT_STOP_WATCH; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.stopWatch = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.stopWatch = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.stopWatch != NULL); data->unk_00 = arg0; @@ -123,7 +123,7 @@ void stop_watch_update(EffectInstance* effect) { data->unk_14++; if (data->unk_10 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -171,7 +171,7 @@ void stop_watch_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void func_E00C4300(void) { @@ -191,10 +191,10 @@ void stop_watch_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp20, data->unk_04, data->unk_08, data->unk_0C); - shim_guScaleF(sp60, data->unk_28, data->unk_28, data->unk_28); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, data->unk_04, data->unk_08, data->unk_0C); + guScaleF(sp60, data->unk_28, data->unk_28, data->unk_28); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -208,8 +208,8 @@ void stop_watch_appendGfx(void* effect) { for (i = 0; i < 16; i++) { Vtx_t* vtx = &vtxBuffer[i * 2]; f32 unk_30 = data->unk_30; - s32 temp_s1 = shim_sin_deg(unk_14 * 10 + i * 60) * 500.0f * unk_30; - s32 temp_f0 = shim_sin_deg(unk_14 * 10 + i * 6) * 200.0f * unk_30; + s32 temp_s1 = sin_deg(unk_14 * 10 + i * 60) * 500.0f * unk_30; + s32 temp_f0 = sin_deg(unk_14 * 10 + i * 6) * 200.0f * unk_30; vtx->ob[0] = temp_s1 - 3200; vtx->ob[1] = i * 400 + temp_f0 - 3000; @@ -231,8 +231,8 @@ void stop_watch_appendGfx(void* effect) { gMainGfxPos++; savedGfxPos = gMainGfxPos; - shim_guScaleF(sp20, 0.01f, 0.01f, 0.01f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(sp20, 0.01f, 0.01f, 0.01f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPVertex(gMainGfxPos++, vtxBuffer, 32, 0); @@ -248,8 +248,8 @@ void stop_watch_appendGfx(void* effect) { gSPEndDisplayList(gMainGfxPos++); for (i = 0; i < 10; i++) { - shim_guPositionF(sp20, data->unk_AC[i], data->unk_D4[i], data->unk_FC[i], D_E00C49D0[i % 4] * 0.01, data->unk_34[i], data->unk_5C[i], data->unk_84[i]); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, data->unk_AC[i], data->unk_D4[i], data->unk_FC[i], D_E00C49D0[i % 4] * 0.01, data->unk_34[i], data->unk_5C[i], data->unk_84[i]); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E00C49D4[i], D_E00C49E8[i], D_E00C49FC[i], unk_24 * data->unk_124[i] / 255); diff --git a/src/effects/sun.c b/src/effects/sun.c index c002e7bff8..a28167e73e 100644 --- a/src/effects/sun.c +++ b/src/effects/sun.c @@ -34,10 +34,10 @@ EffectInstance* sun_main(s32 shineFromRight, f32 offsetX, f32 offsetY, f32 offse bp.renderUI = NULL; bp.effectID = EFFECT_SUN; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.sun = shim_general_heap_malloc(sizeof(*data)); + data = effect->data.sun = general_heap_malloc(sizeof(*data)); ASSERT(data != NULL); data->shineFromRight = shineFromRight; @@ -89,7 +89,7 @@ void sun_update(EffectInstance* effect) { data->lifeTime = 256; } if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -120,8 +120,8 @@ void sun_update(EffectInstance* effect) { for (i = 0; i < 5; i++) { data->texScrollAmt[i] -= 4.0 - * ((shim_sin_deg((time * 2 + (20 * i))) * 0.01) + 0.05) - * shim_sin_deg(((f32) time * 0.25) + (SQ(i) * 20)); + * ((sin_deg((time * 2 + (20 * i))) * 0.01) + 0.05) + * sin_deg(((f32) time * 0.25) + (SQ(i) * 20)); if (data->texScrollAmt[i] < 0.0f) { data->texScrollAmt[i] += 256.0f; @@ -141,7 +141,7 @@ void sun_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -164,16 +164,16 @@ void sun_appendGfx(void* argEffect) { gSPSegment(gMainGfxPos++, 0x9, VIRTUAL_TO_PHYSICAL(effect->graphics->data)); if (!fromRight) { - shim_guOrthoF(mtx, -1600.0f, 1600.0f, -1200.0f, 1200.0f, -100.0f, 100.0f, 1.0f); + guOrthoF(mtx, -1600.0f, 1600.0f, -1200.0f, 1200.0f, -100.0f, 100.0f, 1.0f); } else { - shim_guOrthoF(mtx, 1600.0f, -1600.0f, -1200.0f, 1200.0f, -100.0f, 100.0f, 1.0f); + guOrthoF(mtx, 1600.0f, -1600.0f, -1200.0f, 1200.0f, -100.0f, 100.0f, 1.0f); } - shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - shim_guTranslateF(mtx, 0.0f, 0.0f, 0.0f); - shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(mtx, 0.0f, 0.0f, 0.0f); + guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/effects/sweat.c b/src/effects/sweat.c index cf36273173..01bf92a8c9 100644 --- a/src/effects/sweat.c +++ b/src/effects/sweat.c @@ -26,14 +26,14 @@ void sweat_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, s32 effectBp.renderUI = NULL; effectBp.effectID = EFFECT_SWEAT; - effect = shim_create_effect_instance(&effectBp); + effect = create_effect_instance(&effectBp); effect->numParts = numParts; - data = effect->data.sweat = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.sweat = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); data->unk_00 = arg0; - shim_guRotateF(matrix, -arg5, shim_sin_deg(gCameras[gCurrentCameraID].currentYaw), 0.0f, -shim_cos_deg(gCameras[gCurrentCameraID].currentYaw)); + guRotateF(matrix, -arg5, sin_deg(gCameras[gCurrentCameraID].currentYaw), 0.0f, -cos_deg(gCameras[gCurrentCameraID].currentYaw)); temp_f2 = arg4 + 16.0f; data->pos.x = arg1 + (matrix[1][0] * temp_f2); data->pos.y = arg2 + (matrix[1][1] * temp_f2); @@ -54,7 +54,7 @@ void sweat_update(EffectInstance *effect) { data->timeLeft--; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } data->pos.x += data->unk_18; @@ -77,7 +77,7 @@ void sweat_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -89,12 +89,12 @@ void sweat_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, data->unk_10, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, data->unk_10, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/effects/tattle_window.c b/src/effects/tattle_window.c index d0f9e43917..ae4ee9438f 100644 --- a/src/effects/tattle_window.c +++ b/src/effects/tattle_window.c @@ -72,9 +72,9 @@ EffectInstance* tattle_window_main(s32 arg0, f32 x, f32 y, f32 z, f32 arg4, s32 bp.unk_00 = 0; bp.effectID = EFFECT_TATTLE_WINDOW; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.tattleWindow = shim_general_heap_malloc(numParts * sizeof(*part)); + part = effect->data.tattleWindow = general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.tattleWindow != NULL); @@ -121,7 +121,7 @@ void tattle_window_update(EffectInstance* effect) { unk_10 = part->unk_10; if (unk_10 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } unk_10_2 = unk_10; @@ -230,7 +230,7 @@ void func_E00D8630(EffectInstance* effect) { flags = 1; } - shim_draw_box( + draw_box( flags, &D_E00D87E0, (data->pos.x + data->offset.x) - 75.0f, (data->pos.y + data->offset.y) - 53.0f, diff --git a/src/effects/throw_spiny.c b/src/effects/throw_spiny.c index f0363a9766..a9c1b61bfb 100644 --- a/src/effects/throw_spiny.c +++ b/src/effects/throw_spiny.c @@ -33,9 +33,9 @@ EffectInstance* throw_spiny_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg bp.renderUI = NULL; bp.effectID = EFFECT_THROW_SPINY; - effect = (EffectInstance*)shim_create_effect_instance(bpPtr); + effect = (EffectInstance*)create_effect_instance(bpPtr); effect->numParts = numParts; - spinyObject = effect->data.throwSpiny = shim_general_heap_malloc(numParts * sizeof(*spinyObject)); + spinyObject = effect->data.throwSpiny = general_heap_malloc(numParts * sizeof(*spinyObject)); ASSERT(effect->data.throwSpiny != NULL); spinyObject->unk_00 = arg0; spinyObject->lifeDuration = 0; @@ -74,8 +74,8 @@ EffectInstance* throw_spiny_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg spinyObject->unk_30 = 70; spinyObject->unk_34 = 180; spinyObject->unk_38 = 120; - spinyObject->yaw = shim_rand_int(360); - spinyObject->rotationSpeed = shim_rand_int(10) + 5; + spinyObject->yaw = rand_int(360); + spinyObject->rotationSpeed = rand_int(10) + 5; spinyObject->state = -1; spinyObject->xScale = 1.0f; spinyObject->yScale = 1.0f; @@ -103,7 +103,7 @@ void throw_spiny_update(EffectInstance* effectInstance) { spinyObject->lifeDuration++; if (spinyObject->life < 0) { - shim_remove_effect(effectInstance); + remove_effect(effectInstance); return; } @@ -149,7 +149,7 @@ void throw_spiny_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -168,12 +168,12 @@ void throw_spiny_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guScaleF(sp58, scale * data->xScale, scale * data->yScale, scale); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, data->yaw, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guScaleF(sp58, scale * data->xScale, scale * data->yScale, scale); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, data->yaw, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/thunderbolt_ring.c b/src/effects/thunderbolt_ring.c index 4c8dd880de..ed11990298 100644 --- a/src/effects/thunderbolt_ring.c +++ b/src/effects/thunderbolt_ring.c @@ -22,10 +22,10 @@ EffectInstance* thunderbolt_ring_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f3 effectBp.renderUI = NULL; effectBp.effectID = EFFECT_THUNDERBOLT_RING; - effect = shim_create_effect_instance(&effectBp); + effect = create_effect_instance(&effectBp); effect->numParts = numParts; - data = effect->data.thunderboltRing = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.thunderboltRing = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); data->unk_00 = arg0; @@ -70,7 +70,7 @@ void thunderbolt_ring_update(EffectInstance *effect) { lifeTime = data->lifeTime; if (timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } if (timeLeft < 8) { @@ -93,7 +93,7 @@ void thunderbolt_ring_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void thunderbolt_ring_appendGfx(void* effect) { @@ -110,8 +110,8 @@ void thunderbolt_ring_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_28, data->pos.x, data->pos.y, data->pos.z); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->unk_28, data->pos.x, data->pos.y, data->pos.z); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000000_3B46A0); @@ -120,12 +120,12 @@ void thunderbolt_ring_appendGfx(void* effect) { savedGfxPos2 = gMainGfxPos; for (i = 0; i < 5; i++) { - shim_guRotateF(sp20, i * 72 + 90, 0.0f, 0.0f, 1.0f); - shim_guScaleF(sp60, 1.0f, scaleY, 1.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guPositionF(sp60, 0.0f, 0.0f, 0.0f, 1.0f, 30.0f, 0.0f, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp20, i * 72 + 90, 0.0f, 0.0f, 1.0f); + guScaleF(sp60, 1.0f, scaleY, 1.0f); + guMtxCatF(sp60, sp20, sp20); + guPositionF(sp60, 0.0f, 0.0f, 0.0f, 1.0f, 30.0f, 0.0f, 0.0f); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_090000C8_3B4768); @@ -139,10 +139,10 @@ void thunderbolt_ring_appendGfx(void* effect) { for (i = 0; i < data->unk_30 + 1; i++) { f32 angle = lifeTime * 8 + i * 180 / (data->unk_30 + 1); - f32 temp = (f32) (i + 1) + shim_cos_deg(angle) * 0.1; + f32 temp = (f32) (i + 1) + cos_deg(angle) * 0.1; - shim_guPositionF(sp20, 0.0f, 0.0f, i * 36, temp * data->unk_2C, 0.0f, 0.0f, 0.0f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, 0.0f, i * 36, temp * data->unk_2C, 0.0f, 0.0f, 0.0f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, savedGfxPos2); diff --git a/src/effects/tubba_heart_attack.c b/src/effects/tubba_heart_attack.c index ea0b03e877..b2e71f990c 100644 --- a/src/effects/tubba_heart_attack.c +++ b/src/effects/tubba_heart_attack.c @@ -60,9 +60,9 @@ EffectInstance* tubba_heart_attack_main( bp.renderUI = NULL; bp.effectID = EFFECT_TUBBA_HEART_ATTACK; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.tubbaHeartAttack = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.tubbaHeartAttack = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.tubbaHeartAttack != NULL); data->unk_00 = arg0; @@ -82,10 +82,10 @@ EffectInstance* tubba_heart_attack_main( data->unk_20 = 120; for (i = 0; i < 25; i++) { - f32 sin = shim_sin_deg(i * 1080 / 25); - f32 cos = shim_cos_deg(i * 1080 / 25); + f32 sin = sin_deg(i * 1080 / 25); + f32 cos = cos_deg(i * 1080 / 25); - data->unk_478[i] = shim_rand_int(359) - 180; + data->unk_478[i] = rand_int(359) - 180; data->unk_284[i] = sin * 15.0f; data->unk_2E8[i] = D_E00CCE4C[i] + 10; data->unk_34C[i] = cos * 15.0f; @@ -131,7 +131,7 @@ void tubba_heart_attack_update(EffectInstance* effect) { data->unk_14++; if (data->unk_10 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -224,9 +224,9 @@ void tubba_heart_attack_update(EffectInstance* effect) { break; case 4: factor = D_E00CCE04[data->unk_734[i]] * 0.01; - angle = i * 1080 / 25 + (1.0f - factor) * 1080.0f * 0.5 * shim_cos_deg(i * 180 / 25); - sin = shim_sin_deg(angle); - cos = shim_cos_deg(angle); + angle = i * 1080 / 25 + (1.0f - factor) * 1080.0f * 0.5 * cos_deg(i * 180 / 25); + sin = sin_deg(angle); + cos = cos_deg(angle); data->unk_2C[i] = ((15.0f / factor) / factor) * sin; data->unk_90[i] = D_E00CCE4C[i] + 10; @@ -261,10 +261,10 @@ void tubba_heart_attack_update(EffectInstance* effect) { break; case 6: - shim_load_effect(EFFECT_FLOATING_CLOUD_PUFF); - shim_guRotateF(sp18, data->unk_4DC[i], 0.0f, 1.0f, 0.0f); - shim_guTranslateF(sp58, data->unk_2C[i], data->unk_90[i], data->unk_F4[i]); - shim_guMtxCatF(sp58, sp18, sp18); + load_effect(EFFECT_FLOATING_CLOUD_PUFF); + guRotateF(sp18, data->unk_4DC[i], 0.0f, 1.0f, 0.0f); + guTranslateF(sp58, data->unk_2C[i], data->unk_90[i], data->unk_F4[i]); + guMtxCatF(sp58, sp18, sp18); puffEffect = floating_cloud_puff_main(0, data->unk_04 + sp18[3][0], data->unk_08 + sp18[3][1], data->unk_0C + sp18[3][2], 1.0f, 16); puffEffect->data.floatingCloudPuff->unk_28 = 100; @@ -287,7 +287,7 @@ void tubba_heart_attack_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -305,10 +305,10 @@ void tubba_heart_attack_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); - shim_guScaleF(sp58, data->unk_28, data->unk_28, data->unk_28); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); + guScaleF(sp58, data->unk_28, data->unk_28, data->unk_28); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); @@ -317,16 +317,16 @@ void tubba_heart_attack_appendGfx(void* effect) { for (i = 0; i < 25; i++) { if (data->unk_6D0[i] != 0 && data->unk_6D0[i] != 7) { - shim_guRotateF(sp18, data->unk_4DC[i], 0.0f, 1.0f, 0.0f); - shim_guTranslateF(sp58, data->unk_2C[i], data->unk_90[i], data->unk_F4[i]); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, -data->unk_4DC[i], 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, data->unk_478[i], 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guScaleF(sp58, data->unk_3B0[i], data->unk_414[i], 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, data->unk_4DC[i], 0.0f, 1.0f, 0.0f); + guTranslateF(sp58, data->unk_2C[i], data->unk_90[i], data->unk_F4[i]); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, -data->unk_4DC[i], 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, data->unk_478[i], 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, data->unk_3B0[i], data->unk_414[i], 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/underwater.c b/src/effects/underwater.c index e6190fc4ba..373413f8b6 100644 --- a/src/effects/underwater.c +++ b/src/effects/underwater.c @@ -26,9 +26,9 @@ EffectInstance* underwater_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4 bp.renderUI = NULL; bp.effectID = EFFECT_UNDERWATER; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.underwater = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.underwater = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.underwater != NULL); data->unk_00 = arg0; @@ -84,7 +84,7 @@ void underwater_update(EffectInstance* effect) { data->lifeTime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -103,7 +103,7 @@ void underwater_update(EffectInstance* effect) { factor = (f32) alpha / 255.0f; for (i = 1; i < ARRAY_COUNT(data->unk_23) - 1; i++) { - data->unk_23[i][6] = shim_sin_deg(-((lifeTime - i) * 20)) * -64.0f * factor; + data->unk_23[i][6] = sin_deg(-((lifeTime - i) * 20)) * -64.0f * factor; } for (i = 1; i < ARRAY_COUNT(data->unk_23) - 1; i++) { @@ -145,7 +145,7 @@ void underwater_render(EffectInstance* effect) { renderTask.distance = 100; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void func_E00BA618(void) { @@ -193,8 +193,8 @@ void underwater_appendGfx(void* effect) { gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); - shim_guFrustumF(mtx, -80.0f, 80.0f, 60.0f, -60.0f, 160.0f, 640.0f, 1.0f); - shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); + guFrustumF(mtx, -80.0f, 80.0f, 60.0f, -60.0f, 160.0f, 640.0f, 1.0f); + guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); gSPClearGeometryMode(gMainGfxPos++, G_CULL_BOTH | G_LIGHTING); gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); diff --git a/src/effects/walking_dust.c b/src/effects/walking_dust.c index 7b164d0503..0e77be6370 100644 --- a/src/effects/walking_dust.c +++ b/src/effects/walking_dust.c @@ -32,14 +32,14 @@ void walking_dust_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg bp.renderUI = NULL; bp.effectID = EFFECT_WALKING_DUST; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = shim_general_heap_malloc(numParts * sizeof(*data)); + data = general_heap_malloc(numParts * sizeof(*data)); effect->data.walkingDust = data; ASSERT(effect->data.walkingDust != NULL); - shim_mem_clear(data, numParts * sizeof(*data)); + mem_clear(data, numParts * sizeof(*data)); data->unk_6C = arg0 == 2; data->unk_70 = 0; data->unk_04 = arg0; @@ -66,7 +66,7 @@ void walking_dust_update(EffectInstance* effect) { data->unk_74 = D_E000E684[data->unk_6C][data->unk_70++]; if (data->unk_74 < 0) { - shim_remove_effect(effect); + remove_effect(effect); } else { s32 i; @@ -88,7 +88,7 @@ void walking_dust_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_28; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -154,10 +154,10 @@ void walking_dust_appendGfx(void* effect) { } for (i = 0; i < effectTemp->numParts; i++, data++) { - shim_guTranslateF(sp18, data->unk_08, data->unk_0C, data->unk_10); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->unk_08, data->unk_0C, data->unk_10); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, dlist2); diff --git a/src/effects/water_block.c b/src/effects/water_block.c index d18b1addcd..b71e90bbf2 100644 --- a/src/effects/water_block.c +++ b/src/effects/water_block.c @@ -82,9 +82,9 @@ EffectInstance* water_block_main(s32 arg0, f32 x, f32 y, f32 z, f32 arg4, s32 ar bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_WATER_BLOCK; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - data = effect->data.waterBlock = shim_general_heap_malloc(sizeof(*data)); + data = effect->data.waterBlock = general_heap_malloc(sizeof(*data)); ASSERT(data != NULL); data->unk_00 = arg0; @@ -147,11 +147,11 @@ void water_block_update(EffectInstance* effect) { temp_v1_3 = data->unk_10; if (temp_v1_3 < 0) { if (temp_a0 == 1) { - shim_load_effect(EFFECT_WATER_SPLASH); + load_effect(EFFECT_WATER_SPLASH); water_splash_main(0, data->pos.x, data->pos.y + 24.0f, data->pos.z, 2.0f, 0x1E); water_splash_main(1, data->pos.x, data->pos.y + 24.0f, data->pos.z, 2.0f, 0x1E); } - shim_remove_effect(effect); + remove_effect(effect); return; } temp_s0 = data->unk_14; @@ -170,9 +170,9 @@ void water_block_update(EffectInstance* effect) { } - data->unk_1C = shim_sin_deg((temp_s0 * 6) + temp_s0) * 32.0f + 127.0f; + data->unk_1C = sin_deg((temp_s0 * 6) + temp_s0) * 32.0f + 127.0f; temp_f20 = (f32)temp_s0 * 0.01; - data->unk_30 = (shim_sin_deg(temp_f20 * 6.0f) * 32.0f * shim_sin_deg(temp_f20)) + 256.0f + (shim_cos_deg(2.0f * temp_f20) * 32.0f) + (shim_cos_deg(temp_f20) * 32.0f); + data->unk_30 = (sin_deg(temp_f20 * 6.0f) * 32.0f * sin_deg(temp_f20)) + 256.0f + (cos_deg(2.0f * temp_f20) * 32.0f) + (cos_deg(temp_f20) * 32.0f); data->unk_34 += 0.2; if (data->unk_34 >= 128.0f) { data->unk_34 = 0.0f; @@ -184,16 +184,16 @@ void water_block_update(EffectInstance* effect) { if (data->unk_88[i] == 0) { data->unk_38[i] = 0.0f; data->unk_48[i] = 240.0f; - data->unk_58[i] = (shim_rand_int(10) - 5) * 0.2; - data->unk_68[i] = shim_rand_int(10) + 2; - data->unk_78[i] = shim_rand_int(10) + 1; + data->unk_58[i] = (rand_int(10) - 5) * 0.2; + data->unk_68[i] = rand_int(10) + 2; + data->unk_78[i] = rand_int(10) + 1; } data->unk_48[i] += data->unk_68[i]; data->unk_38[i] += data->unk_58[i]; data->unk_58[i] *= 0.97; data->unk_68[i] += (10.0f - data->unk_68[i]) * 0.1; if (data->unk_48[i] > 480.0f) { - data->unk_88[i] = ~shim_rand_int(10); + data->unk_88[i] = ~rand_int(10); } } } @@ -208,7 +208,7 @@ void water_block_render(EffectInstance* effect) { renderTask.distance = 20; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -229,8 +229,8 @@ void water_block_appendGfx(void *effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); - shim_guTranslateF(sp20, data->pos.x, data->pos.y, data->pos.z); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, data->pos.x, data->pos.y, data->pos.z); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -246,9 +246,9 @@ void water_block_appendGfx(void *effect) { f32 z = var_s6->unk_02 * 10; if (y != 0.0f) { - f32 dx = shim_sin_deg(temp_s0 + func_E0200044(1000, (x + (y * 10.0f) + (z * 100.0f)))) * 20.0f; - f32 dy = shim_sin_deg(temp_s0 + func_E0200044(1000, ((x * 10.0f) + (y * 100.0f) + z))) * 20.0f; - f32 dz = shim_sin_deg(temp_s0 + func_E0200044(1000, ((x * 100.0f) + y + (z * 10.0f)))) * 20.0f; + f32 dx = sin_deg(temp_s0 + func_E0200044(1000, (x + (y * 10.0f) + (z * 100.0f)))) * 20.0f; + f32 dy = sin_deg(temp_s0 + func_E0200044(1000, ((x * 10.0f) + (y * 100.0f) + z))) * 20.0f; + f32 dz = sin_deg(temp_s0 + func_E0200044(1000, ((x * 100.0f) + y + (z * 10.0f)))) * 20.0f; x += dx; y += dy; z += dz; @@ -267,8 +267,8 @@ void water_block_appendGfx(void *effect) { var_fp->v.cn[3] = 80; } - shim_guScaleF(sp20, 0.1f, 0.1f, 0.1f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(sp20, 0.1f, 0.1f, 0.1f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetEnvColor(gMainGfxPos++, 0, 0, 255, data->unk_28); @@ -277,8 +277,8 @@ void water_block_appendGfx(void *effect) { for (i = 0; i < NUM_WATER_BLOCK_COMPONENTS; i++) { if (data->unk_88[i] >= 0) { - shim_guPositionF(sp20, 0.0f, 0.0f, 0.0f, data->unk_78[i], data->unk_38[i], data->unk_48[i], 0.0f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guPositionF(sp20, 0.0f, 0.0f, 0.0f, data->unk_78[i], data->unk_38[i], data->unk_48[i], 0.0f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_090004A0_3B7090); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); diff --git a/src/effects/water_fountain.c b/src/effects/water_fountain.c index 35941ed9e4..62aa740806 100644 --- a/src/effects/water_fountain.c +++ b/src/effects/water_fountain.c @@ -134,10 +134,10 @@ EffectInstance* water_fountain_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 effectBp.renderUI = NULL; effectBp.effectID = EFFECT_WATER_FOUNTAIN; - effect = shim_create_effect_instance(&effectBp); + effect = create_effect_instance(&effectBp); effect->numParts = numParts; - data = effect->data.waterFountain = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.waterFountain = general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); data->unk_00 = arg0; @@ -180,7 +180,7 @@ void water_fountain_update(EffectInstance* effect) { } data->lifeTime++; if (data->timeLeft < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } if (data->lifeTime < 8) { @@ -198,7 +198,7 @@ void water_fountain_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -238,19 +238,19 @@ void water_fountain_appendGfx(void *effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); - shim_guScaleF(sp58, data->unk_34, data->unk_34, data->unk_34); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + guScaleF(sp58, data->unk_34, data->unk_34, data->unk_34); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000280_3B8AE0); - shim_guRotateF(sp18, data->unk_38, 0.0f, 0.0f, 1.0f); - shim_guScaleF(sp58, data->unk_3C, data->unk_40, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guRotateF(sp18, data->unk_38, 0.0f, 0.0f, 1.0f); + guScaleF(sp58, data->unk_3C, data->unk_40, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetEnvColor(gMainGfxPos++, data->unk_28, data->unk_2C, data->unk_30, unk_24); @@ -269,12 +269,12 @@ void water_fountain_appendGfx(void *effect) { if (lifeTime * 5 >= idx) { s32 temp2 = idx + 1; if (timeLeft >= var_s6 - temp2) { - shim_guTranslateF(sp18, (f32) ptr[idx].unk_00, (f32) ptr[idx].unk_01 + 10.0f, 0.0f); - shim_guScaleF(sp58, (f32) basePtr[idx].unk_02 * 0.01, (f32) basePtr[idx].unk_04 * 0.01, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, (f32) ptr[idx].unk_06 + D_E00B8CA4[(j + i) & 7], 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp18, (f32) ptr[idx].unk_00, (f32) ptr[idx].unk_01 + 10.0f, 0.0f); + guScaleF(sp58, (f32) basePtr[idx].unk_02 * 0.01, (f32) basePtr[idx].unk_04 * 0.01, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, (f32) ptr[idx].unk_06 + D_E00B8CA4[(j + i) & 7], 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, unk_18, unk_1C, unk_20, (unk_24 * basePtr[idx].unk_08) >> 8); diff --git a/src/effects/water_splash.c b/src/effects/water_splash.c index 2d1dd1ebfd..6ba89ccb9d 100644 --- a/src/effects/water_splash.c +++ b/src/effects/water_splash.c @@ -43,9 +43,9 @@ EffectInstance* water_splash_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 ar bpPtr->unk_00 = 0; bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_WATER_SPLASH; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - effect->data.waterSplash = part = shim_general_heap_malloc(numParts * sizeof(*part)); + effect->data.waterSplash = part = general_heap_malloc(numParts * sizeof(*part)); ASSERT(part != NULL); part->unk_00 = arg0; @@ -72,24 +72,24 @@ EffectInstance* water_splash_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 ar part->unk_34 = 2.0f; switch (arg0) { case 0: - part->unk_10.x = shim_rand_int(10) - 2; - part->unk_10.y = shim_rand_int(10) - 5; - part->unk_10.z = shim_rand_int(10) - 5; + part->unk_10.x = rand_int(10) - 2; + part->unk_10.y = rand_int(10) - 5; + part->unk_10.z = rand_int(10) - 5; break; case 1: - part->unk_10.x = 2 - shim_rand_int(10); - part->unk_10.y = shim_rand_int(10) - 5; - part->unk_10.z = shim_rand_int(10) - 5; + part->unk_10.x = 2 - rand_int(10); + part->unk_10.y = rand_int(10) - 5; + part->unk_10.z = rand_int(10) - 5; break; case 2: - part->unk_10.x = (shim_rand_int(100) - 50) * 0.07f; - part->unk_10.y = (shim_rand_int(100) + 10) * 0.2f; - part->unk_10.z = (shim_rand_int(100) - 50) * 0.07f; + part->unk_10.x = (rand_int(100) - 50) * 0.07f; + part->unk_10.y = (rand_int(100) + 10) * 0.2f; + part->unk_10.z = (rand_int(100) - 50) * 0.07f; break; default: - part->unk_10.x = (shim_rand_int(10) - 5) * 0.5; - part->unk_10.y = (shim_rand_int(10) - 5) * 0.5; - part->unk_10.z = (shim_rand_int(10) - 5) * 0.5; + part->unk_10.x = (rand_int(10) - 5) * 0.5; + part->unk_10.y = (rand_int(10) - 5) * 0.5; + part->unk_10.z = (rand_int(10) - 5) * 0.5; part->unk_1C = i; part->unk_34 = 0.4f; break; @@ -122,7 +122,7 @@ void water_splash_update(EffectInstance *effect) { temp_a1_3 = part->unk_1C; part->unk_20++; if (temp_a1_3 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -160,7 +160,7 @@ void water_splash_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void func_E00BE5B4(void) { @@ -178,10 +178,10 @@ void water_splash_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, OS_K0_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp10, sp94, temp_fp, data->unk_04.z); - shim_guScaleF(sp50, data->unk_34, data->unk_34, data->unk_34); - shim_guMtxCatF(sp50, sp10, sp10); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp10, sp94, temp_fp, data->unk_04.z); + guScaleF(sp50, data->unk_34, data->unk_34, data->unk_34); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, currentCamera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000100_3BCB90); @@ -207,10 +207,10 @@ void water_splash_appendGfx(void* effect) { temp_t2 + 0xA0, temp_t3 + 0x78, temp_t2 + 0xBF, temp_t3 + 0x97, 0, G_TX_WRAP, G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); - shim_guTranslateF(sp10, data->unk_04.x, data->unk_04.y, data->unk_04.z); - shim_guScaleF(sp50, data->unk_34, data->unk_34, data->unk_34); - shim_guMtxCatF(sp50, sp10, sp10); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp10, data->unk_04.x, data->unk_04.y, data->unk_04.z); + guScaleF(sp50, data->unk_34, data->unk_34, data->unk_34); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMainGfxPos++, 0, 0, 200, 255, 255, (sp90 * data->unk_30) / 255); gDPSetEnvColor(gMainGfxPos++, 0, 32, 32, 0); diff --git a/src/effects/waterfall.c b/src/effects/waterfall.c index ac23f336db..be87eb12f3 100644 --- a/src/effects/waterfall.c +++ b/src/effects/waterfall.c @@ -29,9 +29,9 @@ EffectInstance* waterfall_main( bp.renderUI = NULL; bp.effectID = EFFECT_WATERFALL; - effect = shim_create_effect_instance(&bp); + effect = create_effect_instance(&bp); effect->numParts = numParts; - data = effect->data.waterfall = shim_general_heap_malloc(numParts * sizeof(*data)); + data = effect->data.waterfall = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.waterfall != NULL); data->unk_00 = arg0; @@ -52,7 +52,7 @@ EffectInstance* waterfall_main( for (i = 0; i < 12; i++) { data->unk_2C[i] = 0; - data->unk_5C[i] = (f32) shim_rand_int(10) * 0.01 + -1.0; + data->unk_5C[i] = (f32) rand_int(10) * 0.01 + -1.0; } return effect; @@ -78,7 +78,7 @@ void waterfall_update(EffectInstance* effect) { data->unk_14++; if (data->unk_10 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } @@ -110,7 +110,7 @@ void waterfall_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); } void func_E00B62D8(void) { @@ -132,10 +132,10 @@ void waterfall_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - shim_guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); - shim_guScaleF(sp50, scale, scale, scale); - shim_guMtxCatF(sp50, sp10, sp10); - shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp10, data->unk_04, data->unk_08, data->unk_0C); + guScaleF(sp50, scale, scale, scale); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gMainGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/effects/whirlwind.c b/src/effects/whirlwind.c index b03ff7122f..c5b99ca653 100644 --- a/src/effects/whirlwind.c +++ b/src/effects/whirlwind.c @@ -24,9 +24,9 @@ EffectInstance* whirlwind_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, bp.effectID = EFFECT_WHIRLWIND; numParts = 1; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - part = effect->data.whirlwind = shim_general_heap_malloc(effect->numParts * sizeof(*part)); + part = effect->data.whirlwind = general_heap_malloc(effect->numParts * sizeof(*part)); ASSERT(part != NULL); part->unk_00 = arg0; @@ -55,9 +55,9 @@ EffectInstance* whirlwind_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, part->unk_58[i] = arg2; part->unk_78[i] = arg3; part->unk_98[i] = i * 0.2 + 1.0; - part->unk_B8[i] = shim_rand_int(360); - part->unk_D8[i] = shim_rand_int(100) * 0.1 + 2.0; - part->unk_F8[i] = shim_rand_int(30) * 0.1; + part->unk_B8[i] = rand_int(360); + part->unk_D8[i] = rand_int(100) * 0.1 + 2.0; + part->unk_F8[i] = rand_int(30) * 0.1; part->unk_118[i] = 0; } part->unk_138 = 0; @@ -87,7 +87,7 @@ void whirlwind_update(EffectInstance* effect) { } part->unk_14++; if (part->unk_10 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } temp = part->unk_34; @@ -139,7 +139,7 @@ void whirlwind_render(EffectInstance* effect) { renderTask.distance = 10; renderTask.renderMode = RENDER_MODE_2D; - queuedTask = shim_queue_render_task(&renderTask); + queuedTask = queue_render_task(&renderTask); queuedTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -174,8 +174,8 @@ void whirlwind_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, OS_K0_TO_PHYSICAL(eff->graphics->data)); - shim_guTranslateF(sp20, 0.0f, 0.0f, 0.0f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp20, 0.0f, 0.0f, 0.0f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_09000400_3D3D30); @@ -190,16 +190,16 @@ void whirlwind_appendGfx(void* effect) { // fill the vertex buffer; 2 sets of 16 verticies for (i = 0; i <= (360 / 24); i++) { Vtx* vtx = &vertexBuffer[i]; - vtx->v.ob[0] = shim_cos_deg(i * (360 / 15)) * 100.0f; + vtx->v.ob[0] = cos_deg(i * (360 / 15)) * 100.0f; vtx->v.ob[1] = 0; - vtx->v.ob[2] = shim_sin_deg(i * (360 / 15)) * 100.0f; + vtx->v.ob[2] = sin_deg(i * (360 / 15)) * 100.0f; vtx->v.tc[0] = i * 128; vtx->v.tc[1] = 0; vtx = &vertexBuffer[i + (360 / 24 + 1)]; - vtx->v.ob[0] = shim_cos_deg(i * (360 / 15)) * 100.0f; + vtx->v.ob[0] = cos_deg(i * (360 / 15)) * 100.0f; vtx->v.ob[1] = 0; - vtx->v.ob[2] = shim_sin_deg(i * (360 / 15)) * 100.0f; + vtx->v.ob[2] = sin_deg(i * (360 / 15)) * 100.0f; vtx->v.tc[0] = i * 512; vtx->v.tc[1] = 1024; } @@ -218,8 +218,8 @@ void whirlwind_appendGfx(void* effect) { // This marks the end of our dynamically generated display list, return control back to the main display list gSPEndDisplayList(gMainGfxPos++); - shim_guScaleF(sp20, 0.1f, 0.1f, 0.1f); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guScaleF(sp20, 0.1f, 0.1f, 0.1f); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); // Save position to later insert a branch around the commands that follow this @@ -230,33 +230,33 @@ void whirlwind_appendGfx(void* effect) { // Generate main display list for(i = 0; i < (MAX_WHIRLWIND_SEGMENTS - 1); i++) { - shim_guPositionF(sp20, 0.0f, 0.0f, data->unk_118[i], 1.0f, data->unk_38[i] * 10.0f, data->unk_58[i] * 10.0f, data->unk_78[i] * 10.0f); - shim_guRotateF(sp60, data->unk_138 + i * i, -0.03f, 1.0f, 0.1f); - shim_guMtxCatF(sp60, sp20, sp20); + guPositionF(sp20, 0.0f, 0.0f, data->unk_118[i], 1.0f, data->unk_38[i] * 10.0f, data->unk_58[i] * 10.0f, data->unk_78[i] * 10.0f); + guRotateF(sp60, data->unk_138 + i * i, -0.03f, 1.0f, 0.1f); + guMtxCatF(sp60, sp20, sp20); var_f4 = data->unk_98[i] * spB8; if (spA0 < 0x10) { var_f4 += (127 - primAlpha) * 0.02f; } - shim_guScaleF(sp60, var_f4, spB8, var_f4); - shim_guMtxCatF(sp60, sp20, sp20); + guScaleF(sp60, var_f4, spB8, var_f4); + guMtxCatF(sp60, sp20, sp20); temp_f20_2 = data->unk_F8[i] * 10.0f; f22 = data->unk_B8[i]; - shim_guTranslateF(sp60, temp_f20_2 * shim_sin_deg(f22), 0.0f, temp_f20_2 * shim_cos_deg(f22)); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp60, temp_f20_2 * sin_deg(f22), 0.0f, temp_f20_2 * cos_deg(f22)); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPVertex(gMainGfxPos++, vertexBuffer, 16, 0); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); - shim_guPositionF(sp20, 0.0f, 0.0f, data->unk_118[i + 1], 1.0f, data->unk_38[i + 1] * 10.0f, data->unk_58[i + 1] * 10.0f, data->unk_78[i + 1] * 10.0f); - shim_guRotateF(sp60, data->unk_138 + i * i, 0.03f, 1.0f, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guScaleF(sp60, data->unk_98[i + 1] * spB8, spB8, data->unk_98[i + 1] * spB8); - shim_guMtxCatF(sp60, sp20, sp20); + guPositionF(sp20, 0.0f, 0.0f, data->unk_118[i + 1], 1.0f, data->unk_38[i + 1] * 10.0f, data->unk_58[i + 1] * 10.0f, data->unk_78[i + 1] * 10.0f); + guRotateF(sp60, data->unk_138 + i * i, 0.03f, 1.0f, 0.0f); + guMtxCatF(sp60, sp20, sp20); + guScaleF(sp60, data->unk_98[i + 1] * spB8, spB8, data->unk_98[i + 1] * spB8); + guMtxCatF(sp60, sp20, sp20); temp_f20_3 = data->unk_F8[i] * 10.0f; - shim_guTranslateF(sp60, temp_f20_3 * shim_sin_deg(data->unk_B8[i]), 0.0f, temp_f20_3 * shim_cos_deg(data->unk_B8[i])); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp60, temp_f20_3 * sin_deg(data->unk_B8[i]), 0.0f, temp_f20_3 * cos_deg(data->unk_B8[i])); + guMtxCatF(sp60, sp20, sp20); + guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPVertex(gMainGfxPos++, &vertexBuffer[16], 16, 16); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); diff --git a/src/effects/windy_leaves.c b/src/effects/windy_leaves.c index 25922199f8..030076789a 100644 --- a/src/effects/windy_leaves.c +++ b/src/effects/windy_leaves.c @@ -26,9 +26,9 @@ void windy_leaves_main(s32 type, f32 arg1, f32 arg2, f32 arg3) { bp.effectID = EFFECT_WINDY_LEAVES; numParts = 5; - effect = shim_create_effect_instance(bpPtr); + effect = create_effect_instance(bpPtr); effect->numParts = numParts; - effect->data.windyLeaves = part = shim_general_heap_malloc(numParts * sizeof(*part)); + effect->data.windyLeaves = part = general_heap_malloc(numParts * sizeof(*part)); ASSERT(part != NULL); part->type = type; @@ -70,8 +70,8 @@ void windy_leaves_main(s32 type, f32 arg1, f32 arg2, f32 arg3) { break; case 2: part->unk_1C = 2.0 * ((f32)temp_v0_2 * 0.1); - part->unk_10 = -part->unk_04.x * (shim_rand_int(10) * 0.008 + 0.05); - part->unk_14 = -part->unk_04.y * (shim_rand_int(10) * 0.008 + 0.05); + part->unk_10 = -part->unk_04.x * (rand_int(10) * 0.008 + 0.05); + part->unk_14 = -part->unk_04.y * (rand_int(10) * 0.008 + 0.05); break; default: break; @@ -96,7 +96,7 @@ void windy_leaves_update(EffectInstance* effect) { part->unk_28--; part->unk_2C++; if (part->unk_28 < 0) { - shim_remove_effect(effect); + remove_effect(effect); return; } temp_a1 = part->unk_2C; @@ -113,19 +113,19 @@ void windy_leaves_update(EffectInstance* effect) { switch (temp) { case 0: for (i = 1; i < effect->numParts; i++, part++) { - f32 temp3 = (shim_sin_deg(2.0f * part->unk_18) * 0.2); + f32 temp3 = (sin_deg(2.0f * part->unk_18) * 0.2); part->unk_14 += -0.05f; part->unk_10 += temp3; if (temp == 0) { part->unk_10 *= 0.94; - part->unk_14 *= shim_sin_deg(part->unk_18) * 0.05 + 0.95; + part->unk_14 *= sin_deg(part->unk_18) * 0.05 + 0.95; } else { part->unk_14 += -0.05f; part->unk_10 *= 0.92; } part->unk_1C += func_E0200044(50, temp_a1 + i * 20) - 25; - part->unk_18 += shim_sin_deg(part->unk_1C) * 10.0f; - part->unk_20 += shim_cos_deg(part->unk_1C * 0.5) * 10.0f; + part->unk_18 += sin_deg(part->unk_1C) * 10.0f; + part->unk_20 += cos_deg(part->unk_1C * 0.5) * 10.0f; part->unk_04.x += part->unk_10; part->unk_04.y += part->unk_14; if (part->unk_04.y < 30.0f) { @@ -163,13 +163,13 @@ void windy_leaves_update(EffectInstance* effect) { break; case 1: for (i = 1; i < effect->numParts; i++, part++) { - part->unk_10 += (f32)(shim_sin_deg(2.0f * part->unk_18) * 0.2 * 2.0); + part->unk_10 += (f32)(sin_deg(2.0f * part->unk_18) * 0.2 * 2.0); part->unk_14 += -0.05f; part->unk_10 *= 0.8464; part->unk_14 += -0.05f; part->unk_1C += func_E0200044(50, temp_a1 + i * 20) - 25; - part->unk_18 += shim_sin_deg(part->unk_1C) * 10.0f; - part->unk_20 += shim_cos_deg(part->unk_1C * 0.5) * 10.0f; + part->unk_18 += sin_deg(part->unk_1C) * 10.0f; + part->unk_20 += cos_deg(part->unk_1C * 0.5) * 10.0f; part->unk_04.x += part->unk_10; part->unk_04.y += part->unk_14; if (part->unk_04.y < 30.0f) { @@ -208,8 +208,8 @@ void windy_leaves_update(EffectInstance* effect) { case 2: for (i = 1; i < effect->numParts; i++, part++) { part->unk_1C += func_E0200044(50, temp_a1 + i * 20) - 25; - part->unk_18 += shim_sin_deg(part->unk_1C) * 10.0f; - part->unk_20 += shim_cos_deg(part->unk_1C * 0.5) * 10.0f; + part->unk_18 += sin_deg(part->unk_1C) * 10.0f; + part->unk_20 += cos_deg(part->unk_1C * 0.5) * 10.0f; part->unk_04.x += part->unk_10; part->unk_04.y += part->unk_14; } @@ -226,7 +226,7 @@ void windy_leaves_render(EffectInstance* effect) { renderTask.distance = 0; renderTask.renderMode = RENDER_MODE_2D; - retTask = shim_queue_render_task(&renderTask); + retTask = queue_render_task(&renderTask); retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } @@ -244,19 +244,19 @@ void windy_leaves_appendGfx(void* effect) { gSPSegment(gMainGfxPos++, 0x09, OS_K0_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, D_09001180_33E790); gDPSetPrimColor(gMainGfxPos++, 0, 0, 20, 100, 20, part->alpha); - shim_guTranslateF(sp18, part->unk_04.x, part->unk_04.y, part->unk_04.z); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); + guTranslateF(sp18, part->unk_04.x, part->unk_04.y, part->unk_04.z); + guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp98); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { - shim_guTranslateF(sp58, part->unk_04.x, part->unk_04.y, part->unk_04.z); - shim_guMtxCatF(sp58, sp98, sp18); - shim_guRotateF(sp58, part->unk_18, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guRotateF(sp58, part->unk_20, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + guTranslateF(sp58, part->unk_04.x, part->unk_04.y, part->unk_04.z); + guMtxCatF(sp58, sp98, sp18); + guRotateF(sp58, part->unk_18, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, part->unk_20, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, dlist); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); diff --git a/tools/build/configure.py b/tools/build/configure.py index ad9cff68af..4e386a10a0 100755 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -3,7 +3,7 @@ from functools import lru_cache import os import shutil -from typing import List, Dict, Optional, Set, Union +from typing import List, Dict, Set, Union from pathlib import Path import subprocess import sys @@ -596,11 +596,7 @@ class Configure: encoding = "EUC-JP" # Dead cod - if ( - isinstance(seg, segtypes.common.c.CommonSegC) - and isinstance(seg.rom_start, int) - and seg.rom_start >= 0xEA0900 - ): + if isinstance(seg.parent.yaml, dict) and seg.parent.yaml.get("dead_code", False): obj_path = str(entry.object_path) init_obj_path = Path(obj_path + ".dead") build( @@ -659,7 +655,10 @@ class Configure: }, ) - assert seg.vram_start is not None + assert seg.vram_start is not None, ( + "img with vram_start unset: " + seg.name + ) + c_sym = seg.create_symbol( addr=seg.vram_start, in_segment=True, diff --git a/tools/splat/.gitrepo b/tools/splat/.gitrepo index 6ed00eb1d1..29549d2cdb 100644 --- a/tools/splat/.gitrepo +++ b/tools/splat/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/ethteck/splat.git branch = master - commit = 818924683bfb1145129b5e43ff02abe7b4be37a3 - parent = c122fe97362f81b15d8ede79f24b28a62e859a68 + commit = 7869ef2e51a5974fb8e583e45e8b47793d3fecd2 + parent = 03b911bbea92dc1d78522d8de3cc41c2fd45ecbc method = merge cmdver = 0.4.5 diff --git a/tools/splat/CHANGELOG.md b/tools/splat/CHANGELOG.md index 95a106e878..a8ccf40d50 100644 --- a/tools/splat/CHANGELOG.md +++ b/tools/splat/CHANGELOG.md @@ -1,5 +1,8 @@ # splat Release Notes +### 0.15.2 +* Various cleanup and fixes to support more liberal use of `auto` for rom addresses + ### 0.15.1 * Made some modifications such that linker object paths should be simpler in some circumstances diff --git a/tools/splat/segtypes/common/data.py b/tools/splat/segtypes/common/data.py index b4c366fcbc..7a93653169 100644 --- a/tools/splat/segtypes/common/data.py +++ b/tools/splat/segtypes/common/data.py @@ -1,13 +1,12 @@ from pathlib import Path from typing import Optional -import spimdisasm from util import options, symbols, log from segtypes.common.codesubsegment import CommonSegCodeSubsegment from segtypes.common.group import CommonSegGroup -from disassembler_section import DisassemblerSection, make_data_section +from disassembler_section import make_data_section class CommonSegData(CommonSegCodeSubsegment, CommonSegGroup): @@ -26,7 +25,7 @@ class CommonSegData(CommonSegCodeSubsegment, CommonSegGroup): def scan(self, rom_bytes: bytes): CommonSegGroup.scan(self, rom_bytes) - if self.should_scan(): + if self.rom_start is not None and self.rom_end is not None: self.disassemble_data(rom_bytes) def split(self, rom_bytes: bytes): @@ -57,9 +56,7 @@ class CommonSegData(CommonSegCodeSubsegment, CommonSegGroup): return options.opts.is_mode_active("data") def should_scan(self) -> bool: - # Ensure data segments are scanned even if extract is False so subsegments get scanned too - # Check for not None so we avoid scanning "auto" segments - return self.rom_start is not None and self.rom_end is not None + return True def should_split(self) -> bool: return True diff --git a/tools/splat/segtypes/common/group.py b/tools/splat/segtypes/common/group.py index fa263de8ae..5687ab07b3 100644 --- a/tools/splat/segtypes/common/group.py +++ b/tools/splat/segtypes/common/group.py @@ -68,8 +68,12 @@ class CommonSegGroup(CommonSegment): vram = None if start is not None: - assert isinstance(start, int) - vram = self.get_most_parent().rom_to_ram(start) + most_parent = self.get_most_parent() + if ( + most_parent.vram_start is not None + and most_parent.rom_start is not None + ): + vram = most_parent.vram_start + start - most_parent.rom_start if segment_class.is_noload(): # Pretend bss's rom address is after the last actual rom segment diff --git a/tools/splat/segtypes/n64/vtx.py b/tools/splat/segtypes/n64/vtx.py index 8d961b291f..e0d1bc92f0 100644 --- a/tools/splat/segtypes/n64/vtx.py +++ b/tools/splat/segtypes/n64/vtx.py @@ -34,7 +34,7 @@ class N64SegVtx(CommonSegCodeSubsegment): args=args, yaml=yaml, ) - self.file_text = None + self.file_text: Optional[str] = None self.data_only = isinstance(yaml, dict) and yaml.get("data_only", False) def format_sym_name(self, sym) -> str: @@ -49,7 +49,7 @@ class N64SegVtx(CommonSegCodeSubsegment): def scan(self, rom_bytes: bytes): self.file_text = self.disassemble_data(rom_bytes) - def disassemble_data(self, rom_bytes): + def disassemble_data(self, rom_bytes) -> str: assert isinstance(self.rom_start, int) assert isinstance(self.rom_end, int) assert isinstance(self.vram_start, int) @@ -96,11 +96,7 @@ class N64SegVtx(CommonSegCodeSubsegment): f.write(self.file_text) def should_scan(self) -> bool: - return ( - options.opts.is_mode_active("vtx") - and self.rom_start is not None - and self.rom_end is not None - ) + return options.opts.is_mode_active("vtx") def should_split(self) -> bool: return self.extract and options.opts.is_mode_active("vtx") diff --git a/tools/splat/segtypes/segment.py b/tools/splat/segtypes/segment.py index e034ae8017..9944a8463d 100644 --- a/tools/splat/segtypes/segment.py +++ b/tools/splat/segtypes/segment.py @@ -236,7 +236,7 @@ class Segment: # For segments which are not in the usual VRAM segment space, like N64's IPL3 which lives in 0xA4... self.special_vram_segment: bool = False - if isinstance(self.rom_start, int) and isinstance(self.rom_end, int): + if self.rom_start is not None and self.rom_end is not None: if self.rom_start > self.rom_end: log.error( f"Error: segments out of order - ({self.name} starts at 0x{self.rom_start:X}, but next segment starts at 0x{self.rom_end:X})" @@ -343,7 +343,7 @@ class Segment: # For larger symbols, add their ranges to interval trees for faster lookup if symbol.size > 4: self.symbol_ranges_ram.addi(symbol.vram_start, symbol.vram_end, symbol) - if symbol.rom and isinstance(symbol.rom, int): + if symbol.rom is not None: self.symbol_ranges_rom.addi(symbol.rom, symbol.rom_end, symbol) @property @@ -355,7 +355,7 @@ class Segment: @property def size(self) -> Optional[int]: - if isinstance(self.rom_start, int) and isinstance(self.rom_end, int): + if self.rom_start is not None and self.rom_end is not None: return self.rom_end - self.rom_start else: return None @@ -386,16 +386,13 @@ class Segment: return False def contains_rom(self, rom: int) -> bool: - if isinstance(self.rom_start, int) and isinstance(self.rom_end, int): + if self.rom_start is not None and self.rom_end is not None: return rom >= self.rom_start and rom < self.rom_end else: return False def rom_to_ram(self, rom_addr: int) -> Optional[int]: - if not self.contains_rom(rom_addr) and rom_addr != self.rom_end: - return None - - if self.vram_start is not None and isinstance(self.rom_start, int): + if self.vram_start is not None and self.rom_start is not None: return self.vram_start + rom_addr - self.rom_start else: return None @@ -404,7 +401,7 @@ class Segment: if not self.contains_vram(ram_addr) and ram_addr != self.vram_end: return None - if self.vram_start is not None and isinstance(self.rom_start, int): + if self.vram_start is not None and self.rom_start is not None: return self.rom_start + ram_addr - self.vram_start else: return None @@ -461,6 +458,10 @@ class Segment: def max_length(self): return None + @staticmethod + def get_default_name(addr) -> str: + return f"{addr:X}" + def is_name_default(self): return self.name == self.get_default_name(self.rom_start) @@ -472,18 +473,6 @@ class Segment: return s + self.type + "_" + self.name - def status(self): - if len(self.warnings) > 0: - return "warn" - elif self.did_run: - return "ok" - else: - return "skip" - - @staticmethod - def get_default_name(addr) -> str: - return f"{addr:X}" - @staticmethod def visible_ram(seg1: "Segment", seg2: "Segment") -> bool: if seg1.get_most_parent() == seg2.get_most_parent(): diff --git a/tools/splat/split.py b/tools/splat/split.py index cf002997d1..642890a4b6 100755 --- a/tools/splat/split.py +++ b/tools/splat/split.py @@ -19,7 +19,7 @@ from segtypes.linker_entry import ( from segtypes.segment import Segment from util import log, options, palettes, symbols, relocs -VERSION = "0.15.1" +VERSION = "0.15.2" parser = argparse.ArgumentParser( description="Split a rom given a rom, a config, and output directory" diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 4e347d5116..b0356456e8 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -44,258 +44,259 @@ segments: start: 0x1000 vram: 0x80025C00 subsegments: - - [0x1000, hasm, bss] - - [0x1000, hasm, entry_point] - - [0x1060, c, is_debug, -g -fforce-addr] - - [0x1370, c, main_pre] - - [0x1370, c, main] - - [0x1B40, c, main_loop] - - [0x25A0, c, background_gfx] - - [0x3BF0, c, input] - - [0x42E0, c, rumble] - - [0x43F0, c, 43F0] - - [0x6000, c, heap] - - [0x6240, c, fio] - - [0x6E40, c, curtains] - - [0x7340, c, crash_screen] - - [0x7E40, c, os/nusys/nugfxtaskmgr, -fforce-addr] - - [0x8230, c, os/nusys/nusimgr] - - [0x8560, c, load_obfuscation_shims] - - [0x8800, c, 8800] - - [0x9D10, c, 9d10_len_1080] - - [0xAD90, c, ad90_len_2880] - - [0xB0E0, c, B0E0] - - [0xD610, c, camera] - - [0xE8F0, c, game_modes] - - [0xE940, c, state_startup] - - [0xEBD0, c, intro_logos] - - [0xECD0, c, state_battle] - - [0xF270, c, state_logos] - - [0xFD40, c, state_pause] - - [0x10400, c, state_file_select] - - [0x11130, c, state_world] - - [0x111F0, c, 111f0_len_860] # possibly still state_world - - [0x11A50, c, state_intro] - - [0x121F0, c, state_title_screen] - - [0x13480, c, state_demo] - - [0x13870, c, npc] - - [0x1A1F0, c, encounter] - - [0x1F580, c, encounter_api] - - [0x20EC0, c, status_icons] - - [0x23680, c, 23680] - - [0x25AF0, c, 25AF0] - - [0x25F00, c, audio/25f00_len_940] - - [0x26840, c, audio/sfx_player] - - [0x28910, c, audio/28910_len_5090] - - [0x2BF90, c, audio/2BF90] - - [0x2D9A0, c, audio/2d9a0_len_890] - - [0x2E230, c, audio/2e230_len_2190] - - [0x303C0, c, audio/303c0_len_3e10] - - [0x30450, c, audio/30450] - - [0x31650, c, audio/31650] - - [0x33450, c, audio/33450] - - [0x341D0, c, audio/tables] - - [0x341D0, c, audio/reverb] - - [0x341D0, c, 5B320] - - [0x35080, c, effects] - - [0x35AC0, c, world/world] - - [0x362A0, c, collision] - - [0x38F00, c, 38F00] - - [0x39210, c, 39210_len_aa0] - - [0x39cB0, c, os/nusys/nuboot] - - [0x39DB0, c, os/nusys/nusched] - - [0x3A650, c, os/nusys/nugfxfuncset] - - [0x3A690, c, os/nusys/nugfxprenmifuncset] - - [0x3A6D0, c, os/nusys/nugfxtaskallendwait] - - [0x3A6F0, c, os/nusys/nugfxsetcfb] - - [0x3A800, c, os/nusys/nugfxdisplayoff] - - [0x3A830, c, os/nusys/nugfxdisplayon] - - [0x3A850, c, os/nusys/nupiinit] - - [0x3A890, c, os/nusys/nupireadrom] - - [0x3A960, c, os/nusys/nugfxinit] - - [0x3AA10, c, os/nusys/nucontinit] - - [0x3AA50, c, os/nusys/nucontdataget] - - [0x3AAB0, c, os/nusys/nucontpakmgr] - - [0x3AD20, c, os/nusys/nucontrmbmgr] - - [0x3B290, c, os/nusys/nucontrmbstart] - - [0x3B2F0, c, os/nusys/nucontrmbcheck] - - [0x3B390, c, os/nusys/nucontrmbmodeset] - - [0x3B4A0, c, os/nusys/nucontrmbforcestop] - - [0x3B4C0, c, os/nusys/nucontrmbforcestopend] - - [0x3B4E0, c, os/nusys/nupireadromoverlay] - - [0x3B5F0, c, os/nusys/nugfxthread] - - [0x3B710, c, os/nusys/nugfxswapcfbfuncset] - - [0x3B750, c, os/nusys/nugfxswapcfb] - - [0x3B770, c, os/nusys/nugfxretracewait] - - [0x3B7F0, c, os/nusys/nusicallbackadd] - - [0x3B890, c, os/nusys/nusicallbackremove] - - [0x3B910, c, os/nusys/nucontmgr] - - [0x3BCC0, c, os/nusys/nucontdatalock] - - [0x3BD20, c, os/nusys/nucontqueryread] - - [0x3BD40, hasm, os/osSetIntMask] - - [0x3BDE0, c, os/pimgr, gcc_272 -O3] - - [0x3BF70, c, os/epirawdma, gcc_272 -O3] - - [0x3C160, c, os/epiwrite, gcc_272 -O3] - - [0x3C1C0, c, os/epiread, gcc_272 -O3] - - [0x3C220, c, os/epidma, gcc_272 -O3] - - [0x3C2C0, c, os/epilinkhandle, gcc_272 -O3] - - [0x3C310, c, os/cartrominit, gcc_272 -O3] - - [0x3C490, c, os/devmgr, gcc_272 -O3] - - [0x3C850, c, os/piacs, gcc_272 -O3] - - [0x3C940, c, os/aigetlength, gcc_272 -O3] - - [0x3C950, c, os/aigetstatus, gcc_272 -O3] - - [0x3C960, c, os/aisetfrequency, gcc_272 -O3] - - [0x3CA80, c, os/aisetnextbuf, gcc_272 -O3] - - [0x3CB20, hasm, os/osInvalDCache] - - [0x3CBD0, hasm, os/osInvalICache] - - [0x3CC50, hasm, os/osWritebackDCache] - - [0x3CCD0, hasm, os/osWritebackDCacheAll] - - [0x3CD00, c, os/contquery, gcc_272 -O3] - - [0x3CDA0, c, os/contreaddata, gcc_272 -O3] - - [0x3CF80, c, os/controller, gcc_272 -O3] - - [0x3D290, c, os/virtualtophysical, gcc_272 -O3] - - [0x3D2F0, c, os/sqrtf, -ffast-math] - - [0x3D300, c, os/coss, gcc_272 -O3] - - [0x3D330, c, os/frustum, gcc_272 -O3] - - [0x3D5B0, c, os/guLookAt, gcc_272 -O3] - - [0x3DCC0, c, os/lookathil, gcc_272 -O3] - - [0x3E720, c, os/lookatref, gcc_272 -O3] - - [0x3ED10, c, os/guOrtho, gcc_272 -O3] - - [0x3EF90, c, os/perspective, gcc_272 -O3] - - [0x3F310, c, os/position, gcc_272 -O3] - - [0x3F6D0, c, os/rotateRPY, gcc_272 -O3] - - [0x3F9F0, c, os/sins, gcc_272 -O3] - - [0x3FA50, hasm, os/bcopy] - - [0x3FD70, hasm, os/bzero] - - [0x3FE10, c, os/string, gcc_272 -O3] - - [0x3FEA0, c, os/xprintf, gcc_272 -O3] - - [0x408EC, c, os/sprintf, gcc_272 -O3] - - [0x40980, c, os/createmesgqueue] - - [0x409B0, c, os/jammesg, gcc_272 -O3] - - [0x40AF0, c, os/recvmesg, gcc_272 -O3] - - [0x40C20, c, os/sendmesg, gcc_272 -O3] - - [0x40D50, c, os/seteventmesg, gcc_272 -O3] - - [0x40E00, hasm, os/osGetCount] - - [0x40E10, c, os/sptask, gcc_272 -O3] - - [0x41050, c, os/sptaskyield, gcc_272 -O3] - - [0x41070, c, os/sptaskyielded, gcc_272 -O3] - - [0x410C0, c, os/sirawdma, gcc_272 -O3] - - [0x41170, c, os/siacs, gcc_272 -O3] - - [0x41260, c, os/createthread, gcc_272 -O3] - - [0x41330, c, os/getthreadpri, gcc_272 -O3] - - [0x41350, c, os/setthreadpri, gcc_272 -O3] - - [0x41420, c, os/startthread, gcc_272 -O3] - - [0x41540, c, os/stopthread, gcc_272 -O3] - - [0x41600, c, os/thread, gcc_272 -O3] - - [0x41640, c, os/yieldthread, gcc_272 -O3] - - [0x41690, c, os/getactivequeue, gcc_272 -O3] - - [0x416A0, c, os/gettime, gcc_272 -O3] - - [0x41730, c, os/settime, gcc_272 -O3] - - [0x41750, c, os/settimer, gcc_272 -O3] - - [0x41880, c, os/timerintr, gcc_272 -O3] - - [0x41BA0, hasm, os/osMapTLB] - - [0x41C60, hasm, os/__osProbeTLB] - - [0x41D20, hasm, os/osUnmapTLB] - - [0x41D60, hasm, os/osUnmapTLBAll] - - [0x41DB0, c, os/vigetcurrframebuf, gcc_272 -O3] - - [0x41DF0, c, os/vigetnextframebuf, gcc_272 -O3] - - [0x41E30, c, os/vigetmode, gcc_272 -O3] - - [0x41E70, c, os/vimgr, gcc_272 -O3] - - [0x421B0, c, os/vitbl, gcc_272 -O3] - - [0x421B0, c, os/visetevent, gcc_272 -O3] - - [0x42210, c, os/visetmode, gcc_272 -O3] - - [0x42260, c, os/visetspecial, gcc_272 -O3] - - [0x423D0, c, os/visetyscale, gcc_272 -O3] - - [0x42420, c, os/viswapbuf, gcc_272 -O3] - - [0x42470, c, os/viswapcontext, gcc_272 -O3] - - [0x42780, c, os/viblack, gcc_272 -O3] - - [0x427E0, c, os/virepeatline, gcc_272 -O3] - - [0x42840, hasm, os/guMtxIdent] # has padding - - [0x428A0, hasm, os/guMtxIdentF] - - [0x42900, hasm, os/guMtxF2L] - - [0x42980, hasm, os/guMtxL2F] - - [0x42A00, hasm, os/guMtxCatF] - - [0x42B00, hasm, os/guScale] - - [0x42BC0, hasm, os/guScaleF] - - [0x42C20, hasm, os/guTranslate] - - [0x42D00, hasm, os/guTranslateF] - - [0x42D60, c, os/guMtxCat, gcc_272 -O3] - - [0x42DE0, c, os/guMtxXFML, gcc_272 -O3] - - [0x42E70, c, os/guMtxXFMF, gcc_272 -O3] - - [0x42F20, c, os/guRotate, gcc_272 -O3] - - [0x43200, c, os/motor, gcc_272 -O3] - - [0x43590, c, os/pfsallocatefile, gcc_272 -O3] - - [0x439C0, c, os/pfsdeletefile, gcc_272 -O3] - - [0x43BE0, c, os/pfsreadwritefile, gcc_272 -O3] - - [0x44020, c, os/pfsfilestate, gcc_272 -O3] - - [0x441C0, c, os/pfsfindfile, gcc_272 -O3] - - [0x44380, c, os/pfsfreeblocks, gcc_272 -O3] - - [0x44490, c, os/pfsinitpak, gcc_272 -O3] - - [0x44860, c, os/pfsrepairid, gcc_272 -O3] - - [0x448C0, c, os/pfsgetstatus, gcc_272 -O3] - - [0x44AD0, c, os/pfsselectbank, gcc_272 -O3] - - [0x44B40, c, os/contpfs, gcc_272 -O3] - - [0x455D0, c, os/contramread, gcc_272 -O3] - - [0x457C0, c, os/contramwrite, gcc_272 -O3] - - [0x459D0, hasm, os/parameters] - - [0x45A30, c, os/afterprenmi, gcc_272 -O3] - - [0x45A50, c, os/initialize, gcc_272 -O3] - - [0x45DF0, hasm, os/exceptasm] - - [0x46760, hasm, os/__osDisableInt] - - [0x467D0, hasm, os/__osRestoreInt] - - [0x467F0, c, os/setglobalintmask, gcc_272 -O3] - - [0x467F0, c, os/resetglobalintmask, gcc_272 -O3] - - [0x46880, c, os/pirawdma, gcc_272 -O3] - - [0x46950, c, os/pigetcmdq, gcc_272 -O3] - - [0x46970, c, os/epirawread, gcc_272 -O3] - - [0x46AE0, c, os/epirawwrite, gcc_272 -O3] - - [0x46C50, c, os/ai, gcc_272 -O3] - - [0x46C70, hasm, os/bcmp] - - [0x46D80, c, os/xlitob, gcc_272 -O3] - - [0x46FD0, c, os/xldtob, gcc_272 -O3] - - [0x47A60, hasm, os/__osGetCause] - - [0x47A70, hasm, os/__osGetSR] - - [0x47A80, hasm, os/__osSetCompare] - - [0x47A90, hasm, os/setfpccsr] - - [0x47AA0, hasm, os/setsr] - - [0x47AB0, hasm, os/__osSetWatchLo] - - [0x47AC0, c, os/sp, gcc_272 -O3] - - [0x47AE0, c, os/spgetstat, gcc_272 -O3] - - [0x47AF0, c, os/spsetstat, gcc_272 -O3] - - [0x47B00, c, os/spsetpc, gcc_272 -O3] - - [0x47B30, c, os/sprawdma, gcc_272 -O3] - - [0x47BC0, c, os/sirawread, gcc_272 -O3] - - [0x47C10, c, os/sirawwrite, gcc_272 -O3] - - [0x47C60, c, os/crc, gcc_272 -O3] - - [0x47D50, c, os/destroythread, gcc_272 -O3] - - [0x47E30, hasm, os/osMapTLBRdb] - - [0x47E90, c, os/vi, gcc_272 -O3] - - [0x47FA0, c, os/vigetcurrcontext, gcc_272 -O3] - - [0x47FB0, hasm, os/padding] - - [0x47FC0, hasm, os/guNormalize] - - [0x48020, c, os/pfschecker, gcc_272 -O3] - - [0x48740, c, os/pfsisplug, gcc_272 -O3] - - [0x48A20, c, os/ldiv, gcc_272 -O3] - - [0x48BE0, c, os/osSiDeviceBusy] - - [0x48C00, c, gcc/divdi3, -g2] - - [0x491C0, c, gcc/moddi3, -g2] - - [0x491C0, c, gcc/udivdi3, -g2] - - [0x49C70, c, gcc/umoddi3, -g2] - - [0x4A140, c, os/strcpy, gcc_272 -O1] - - [0x4A170, c, os/strcmp, gcc_272 -O1] - - [0x4A1B0, c, os/memset, gcc_272 -O1] - - [0x4A1F0, hasm, os/decode_yay0] - - [0x4A2A0, c, os/osFlash] + - [auto, hasm, bss] + - [auto, hasm, entry_point] + - [auto, c, is_debug, -g -fforce-addr] + - [auto, c, main_pre] + - [auto, c, main] + - [auto, c, main_loop] + - [auto, c, background_gfx] + - [auto, c, input] + - [auto, c, rumble] + - [auto, c, 43F0] + - [auto, c, heap] + - [auto, c, fio] + - [auto, c, curtains] + - [auto, c, crash_screen] + - [auto, c, os/nusys/nugfxtaskmgr, -fforce-addr] + - [auto, c, os/nusys/nusimgr] + - [auto, c, load_obfuscation_shims] + - [auto, c, 8800] + - [auto, c, 9d10_len_1080] + - [auto, c, ad90_len_2880] + - [auto, c, B0E0] + - [auto, c, camera] + - [auto, c, game_modes] + - [auto, c, state_startup] + - [auto, c, intro_logos] + - [auto, c, state_battle] + - [auto, c, state_logos] + - [auto, c, state_pause] + - [auto, c, state_file_select] + - [auto, c, state_world] + - [auto, c, 111f0_len_860] # possibly still state_world + - [auto, c, state_intro] + - [auto, c, state_title_screen] + - [auto, c, state_demo] + - [auto, c, npc] + - [auto, c, encounter] + - [auto, c, encounter_api] + - [auto, c, status_icons] + - [auto, c, 23680] + - [auto, c, 25AF0] + - [auto, c, audio/25f00_len_940] + - [auto, c, audio/sfx_player] + - [auto, c, audio/28910_len_5090] + - [auto, c, audio/2BF90] + - [auto, c, audio/2d9a0_len_890] + - [auto, c, audio/2e230_len_2190] + - [auto, c, audio/303c0_len_3e10] + - [auto, c, audio/30450] + - [auto, c, audio/31650] + - [auto, c, audio/33450] + - [auto, c, audio/tables] + - [auto, c, audio/reverb] + - [auto, c, 5B320] + - [auto, c, effects] + - [auto, c, world/world] + - [auto, c, collision] + - [auto, c, 38F00] + - [auto, c, 39210_len_aa0] + - [auto, c, os/nusys/nuboot] + - [auto, c, os/nusys/nusched] + - [auto, c, os/nusys/nugfxfuncset] + - [auto, c, os/nusys/nugfxprenmifuncset] + - [auto, c, os/nusys/nugfxtaskallendwait] + - [auto, c, os/nusys/nugfxsetcfb] + - [auto, c, os/nusys/nugfxdisplayoff] + - [auto, c, os/nusys/nugfxdisplayon] + - [auto, c, os/nusys/nupiinit] + - [auto, c, os/nusys/nupireadrom] + - [auto, c, os/nusys/nugfxinit] + - [auto, c, os/nusys/nucontinit] + - [auto, c, os/nusys/nucontdataget] + - [auto, c, os/nusys/nucontpakmgr] + - [auto, c, os/nusys/nucontrmbmgr] + - [auto, c, os/nusys/nucontrmbstart] + - [auto, c, os/nusys/nucontrmbcheck] + - [auto, c, os/nusys/nucontrmbmodeset] + - [auto, c, os/nusys/nucontrmbforcestop] + - [auto, c, os/nusys/nucontrmbforcestopend] + - [auto, c, os/nusys/nupireadromoverlay] + - [auto, c, os/nusys/nugfxthread] + - [auto, c, os/nusys/nugfxswapcfbfuncset] + - [auto, c, os/nusys/nugfxswapcfb] + - [auto, c, os/nusys/nugfxretracewait] + - [auto, c, os/nusys/nusicallbackadd] + - [auto, c, os/nusys/nusicallbackremove] + - [auto, c, os/nusys/nucontmgr] + - [auto, c, os/nusys/nucontdatalock] + - [auto, c, os/nusys/nucontqueryread] + - [auto, hasm, os/osSetIntMask] + - [auto, c, os/pimgr, gcc_272 -O3] + - [auto, c, os/epirawdma, gcc_272 -O3] + - [auto, c, os/epiwrite, gcc_272 -O3] + - [auto, c, os/epiread, gcc_272 -O3] + - [auto, c, os/epidma, gcc_272 -O3] + - [auto, c, os/epilinkhandle, gcc_272 -O3] + - [auto, c, os/cartrominit, gcc_272 -O3] + - [auto, c, os/devmgr, gcc_272 -O3] + - [auto, c, os/piacs, gcc_272 -O3] + - [auto, c, os/aigetlength, gcc_272 -O3] + - [auto, c, os/aigetstatus, gcc_272 -O3] + - [auto, c, os/aisetfrequency, gcc_272 -O3] + - [auto, c, os/aisetnextbuf, gcc_272 -O3] + - [auto, hasm, os/osInvalDCache] + - [auto, hasm, os/osInvalICache] + - [auto, hasm, os/osWritebackDCache] + - [auto, hasm, os/osWritebackDCacheAll] + - [auto, c, os/contquery, gcc_272 -O3] + - [auto, c, os/contreaddata, gcc_272 -O3] + - [auto, c, os/controller, gcc_272 -O3] + - [auto, c, os/virtualtophysical, gcc_272 -O3] + - [auto, c, os/sqrtf, -ffast-math] + - [auto, c, os/coss, gcc_272 -O3] + - [auto, c, os/frustum, gcc_272 -O3] + - [auto, c, os/guLookAt, gcc_272 -O3] + - [auto, c, os/lookathil, gcc_272 -O3] + - [auto, c, os/lookatref, gcc_272 -O3] + - [auto, c, os/guOrtho, gcc_272 -O3] + - [auto, c, os/perspective, gcc_272 -O3] + - [auto, c, os/position, gcc_272 -O3] + - [auto, c, os/rotateRPY, gcc_272 -O3] + - [auto, c, os/sins, gcc_272 -O3] + - [auto, hasm, os/bcopy] + - [auto, hasm, os/bzero] + - [auto, c, os/string, gcc_272 -O3] + - [auto, c, os/xprintf, gcc_272 -O3] + - [auto, c, os/sprintf, gcc_272 -O3] + - [auto, c, os/createmesgqueue] + - [auto, c, os/jammesg, gcc_272 -O3] + - [auto, c, os/recvmesg, gcc_272 -O3] + - [auto, c, os/sendmesg, gcc_272 -O3] + - [auto, c, os/seteventmesg, gcc_272 -O3] + - [auto, hasm, os/osGetCount] + - [auto, c, os/sptask, gcc_272 -O3] + - [auto, c, os/sptaskyield, gcc_272 -O3] + - [auto, c, os/sptaskyielded, gcc_272 -O3] + - [auto, c, os/sirawdma, gcc_272 -O3] + - [auto, c, os/siacs, gcc_272 -O3] + - [auto, c, os/createthread, gcc_272 -O3] + - [auto, c, os/getthreadpri, gcc_272 -O3] + - [auto, c, os/setthreadpri, gcc_272 -O3] + - [auto, c, os/startthread, gcc_272 -O3] + - [auto, c, os/stopthread, gcc_272 -O3] + - [auto, c, os/thread, gcc_272 -O3] + - [auto, c, os/yieldthread, gcc_272 -O3] + - [auto, c, os/getactivequeue, gcc_272 -O3] + - [auto, c, os/gettime, gcc_272 -O3] + - [auto, c, os/settime, gcc_272 -O3] + - [auto, c, os/settimer, gcc_272 -O3] + - [auto, c, os/timerintr, gcc_272 -O3] + - [auto, hasm, os/osMapTLB] + - [auto, hasm, os/__osProbeTLB] + - [auto, hasm, os/osUnmapTLB] + - [auto, hasm, os/osUnmapTLBAll] + - [auto, c, os/vigetcurrframebuf, gcc_272 -O3] + - [auto, c, os/vigetnextframebuf, gcc_272 -O3] + - [auto, c, os/vigetmode, gcc_272 -O3] + - [auto, c, os/vimgr, gcc_272 -O3] + - [auto, c, os/vitbl, gcc_272 -O3] + - [auto, c, os/visetevent, gcc_272 -O3] + - [auto, c, os/visetmode, gcc_272 -O3] + - [auto, c, os/visetspecial, gcc_272 -O3] + - [auto, c, os/visetyscale, gcc_272 -O3] + - [auto, c, os/viswapbuf, gcc_272 -O3] + - [auto, c, os/viswapcontext, gcc_272 -O3] + - [auto, c, os/viblack, gcc_272 -O3] + - [auto, c, os/virepeatline, gcc_272 -O3] + - [auto, hasm, os/guMtxIdent] # has padding + - [auto, hasm, os/guMtxIdentF] + - [auto, hasm, os/guMtxF2L] + - [auto, hasm, os/guMtxL2F] + - [auto, hasm, os/guMtxCatF] + - [auto, hasm, os/guScale] + - [auto, hasm, os/guScaleF] + - [auto, hasm, os/guTranslate] + - [auto, hasm, os/guTranslateF] + - [auto, c, os/guMtxCat, gcc_272 -O3] + - [auto, c, os/guMtxXFML, gcc_272 -O3] + - [auto, c, os/guMtxXFMF, gcc_272 -O3] + - [auto, c, os/guRotate, gcc_272 -O3] + - [auto, c, os/motor, gcc_272 -O3] + - [auto, c, os/pfsallocatefile, gcc_272 -O3] + - [auto, c, os/pfsdeletefile, gcc_272 -O3] + - [auto, c, os/pfsreadwritefile, gcc_272 -O3] + - [auto, c, os/pfsfilestate, gcc_272 -O3] + - [auto, c, os/pfsfindfile, gcc_272 -O3] + - [auto, c, os/pfsfreeblocks, gcc_272 -O3] + - [auto, c, os/pfsinitpak, gcc_272 -O3] + - [auto, c, os/pfsrepairid, gcc_272 -O3] + - [auto, c, os/pfsgetstatus, gcc_272 -O3] + - [auto, c, os/pfsselectbank, gcc_272 -O3] + - [auto, c, os/contpfs, gcc_272 -O3] + - [auto, c, os/contramread, gcc_272 -O3] + - [auto, c, os/contramwrite, gcc_272 -O3] + - [auto, hasm, os/parameters] + - [auto, c, os/afterprenmi, gcc_272 -O3] + - [auto, c, os/initialize, gcc_272 -O3] + - [auto, hasm, os/exceptasm] + - [auto, hasm, os/__osDisableInt] + - [auto, hasm, os/__osRestoreInt] + - [auto, c, os/setglobalintmask, gcc_272 -O3] + - [auto, c, os/resetglobalintmask, gcc_272 -O3] + - [auto, c, os/pirawdma, gcc_272 -O3] + - [auto, c, os/pigetcmdq, gcc_272 -O3] + - [auto, c, os/epirawread, gcc_272 -O3] + - [auto, c, os/epirawwrite, gcc_272 -O3] + - [auto, c, os/ai, gcc_272 -O3] + - [auto, hasm, os/bcmp] + - [auto, c, os/xlitob, gcc_272 -O3] + - [auto, c, os/xldtob, gcc_272 -O3] + - [auto, hasm, os/__osGetCause] + - [auto, hasm, os/__osGetSR] + - [auto, hasm, os/__osSetCompare] + - [auto, hasm, os/setfpccsr] + - [auto, hasm, os/setsr] + - [auto, hasm, os/__osSetWatchLo] + - [auto, c, os/sp, gcc_272 -O3] + - [auto, c, os/spgetstat, gcc_272 -O3] + - [auto, c, os/spsetstat, gcc_272 -O3] + - [auto, c, os/spsetpc, gcc_272 -O3] + - [auto, c, os/sprawdma, gcc_272 -O3] + - [auto, c, os/sirawread, gcc_272 -O3] + - [auto, c, os/sirawwrite, gcc_272 -O3] + - [auto, c, os/crc, gcc_272 -O3] + - [auto, c, os/destroythread, gcc_272 -O3] + - [auto, hasm, os/osMapTLBRdb] + - [auto, c, os/vi, gcc_272 -O3] + - [auto, c, os/vigetcurrcontext, gcc_272 -O3] + - [auto, hasm, os/padding] + - [auto, hasm, os/guNormalize] + - [auto, c, os/pfschecker, gcc_272 -O3] + - [auto, c, os/pfsisplug, gcc_272 -O3] + - [auto, c, os/ldiv, gcc_272 -O3] + - [auto, c, os/osSiDeviceBusy] + - [auto, c, gcc/divdi3, -g2] + - [auto, c, gcc/moddi3, -g2] + - [auto, c, gcc/udivdi3, -g2] + - [auto, c, gcc/umoddi3, -g2] + - [auto, c, os/strcpy, gcc_272 -O1] + - [auto, c, os/strcmp, gcc_272 -O1] + - [auto, c, os/memset, gcc_272 -O1] + - [auto, hasm, os/decode_yay0] + - [auto, c, os/osFlash] - [0x4AC90, pm_effect_loads, effect_loads] - - [0x4DF30, c, battle/battle] + - [auto, c, battle/battle] - [0x4E5A0, bin, n_aspMain_text] - - [0x4F200, .data, main_pre] - - [0x4F420, .data, main] - - [0x4F420, .data, main_loop] - - [0x4F600, .data, background_gfx] - - [0x4F660, .data, rumble] - - [0x4F670, .data, 43F0] - - [0x4F9D0, .data, fio] + - [0x4F200] + - [auto, .data, main_pre] + - [auto, .data, main] + - [auto, .data, main_loop] + - [auto, .data, background_gfx] + - [auto, .data, rumble] + - [auto, .data, 43F0] + - [auto, .data, fio] - start: 0x4F9E0 type: .data name: curtains @@ -317,51 +318,51 @@ segments: - [0x51260] - [0x51540, ia8, ui/no_controller, 128, 32] - [0x52540] - - [0x52610, .data, crash_screen] - - [0x527F0, .data, os/nusys/nugfxtaskmgr] - - [0x52800, .data, os/nusys/nusimgr] - - [0x52810, .data, camera] - - [0x52820, .data, game_modes] - - [0x52CA0, .data, state_battle] - - [0x52CC0, .data, state_logos] - - [0x52D50, .data, state_pause] - - [0x52D80, .data, state_file_select] - - [0x52DC0, .data, state_title_screen] - - [0x52EE0, .data, state_demo] - - [0x52FF0, .data, npc] - - [0x53040, .data, encounter] - - [0x53560, .data, status_icons] - - [0x53570, .data, audio/25f00_len_940] - - [0x53590, .data, audio/sfx_player] - - [0x541B0, .data, audio/30450] - - [0x54250, .data, audio/31650] - - [0x54260, .data, audio/33450] - - [0x54360, .data, audio/tables] - - [0x5A3E0, .data, audio/reverb] - - [0x5A610, .data, effects] - - [0x5B320, .data, 5B320] - - [0x6B360, .data, world/world] - - [0x6EAC0, .data, 38F00] - - [0x6EF80, .data, os/nusys/nusched] - - [0x6EFA0, .data, os/nusys/nugfxinit] - - [0x6F0A0, .data, os/nusys/nucontpakmgr] - - [0x6F0E0, .data, os/nusys/nucontrmbmgr] - - [0x6F110, .data, os/nusys/nugfxfuncset] - - [0x6F120, .data, os/nusys/nucontmgr] - - [0x6F120, .data, os/pimgr] - - [0x6F120, .data, os/epirawdma] - - [0x6F180, .data, os/cartrominit] - - [0x6F190, .data, os/piacs] - - [0x6F1A0, .data, os/aisetnextbuf] - - [0x6F1B0, .data, os/controller] - - [0x6F1C0, .data, os/position] - - [0x6F1D0, .data, os/rotateRPY] - - [0x6F1E0, .data, os/sins] - - [0x6F9E0, .data, os/xprintf] - - [0x6FA30, .data, os/seteventmesg] - - [0x6FA40, .data, os/siacs] - - [0x6FA50, .data, os/setthreadpri] - - [0x6FA70, .data, os/timerintr] + - [auto, .data, crash_screen] + - [auto, .data, os/nusys/nugfxtaskmgr] + - [auto, .data, os/nusys/nusimgr] + - [auto, .data, camera] + - [auto, .data, game_modes] + - [auto, .data, state_battle] + - [auto, .data, state_logos] + - [auto, .data, state_pause] + - [auto, .data, state_file_select] + - [auto, .data, state_title_screen] + - [auto, .data, state_demo] + - [auto, .data, npc] + - [auto, .data, encounter] + - [auto, .data, status_icons] + - [auto, .data, audio/25f00_len_940] + - [auto, .data, audio/sfx_player] + - [auto, .data, audio/30450] + - [auto, .data, audio/31650] + - [auto, .data, audio/33450] + - [auto, .data, audio/tables] + - [auto, .data, audio/reverb] + - [auto, .data, effects] + - [auto, .data, 5B320] + - [auto, .data, world/world] + - [auto, .data, 38F00] + - [auto, .data, os/nusys/nusched] + - [auto, .data, os/nusys/nugfxinit] + - [auto, .data, os/nusys/nucontpakmgr] + - [auto, .data, os/nusys/nucontrmbmgr] + - [auto, .data, os/nusys/nugfxfuncset] + - [auto, .data, os/nusys/nucontmgr] + - [auto, .data, os/pimgr] + - [auto, .data, os/epirawdma] + - [auto, .data, os/cartrominit] + - [auto, .data, os/piacs] + - [auto, .data, os/aisetnextbuf] + - [auto, .data, os/controller] + - [auto, .data, os/position] + - [auto, .data, os/rotateRPY] + - [auto, .data, os/sins] + - [auto, .data, os/xprintf] + - [auto, .data, os/seteventmesg] + - [auto, .data, os/siacs] + - [auto, .data, os/setthreadpri] + - [auto, .data, os/timerintr] - [auto, .data, os/vimgr] - [auto, .data, os/vitbl] - [auto, .data, os/vimodempallan1] @@ -371,7 +372,7 @@ segments: - [auto, .data, os/initialize] - [auto, .data, os/xlitob] - [auto, .data, os/vi] - - [0x70E30, .data, battle/battle] + - [auto, .data, battle/battle] - [0x71430, bin, gspF3DEX2kawase_fifo_text] - [0x72A60, bin, gspF3DEX2kawase_fifo_data] - [0x72E80, bin, n_aspMain_data] @@ -383,24 +384,24 @@ segments: vram_of_symbol: overlays_start #follows_vram: main subsegments: - - [0x759B0, hasm, bss2] - - [0x759B0, c, npc_collision] - - [0x77480, c, 77480] - - [0x7B440, c, 7B440] - - [0x7BB60, c, 7bb60_len_41b0] - - [0x7E9D0, c, 7E9D0] - - [0x7FD10, c, 7fd10_len_b40] - - [0x80850, c, 80850_len_3060] - - [0x838B0, c, world/actions] # DUMMY ROM - - [0x838B0, c, world/partners] - - [0x891B0, hasm, bss2_2] - - [0x891B0, c, 891b0_len_fb0] - - [0x8A160, c, 8a160_len_700] - - [0x8A860, c, 8a860_len_3f30] - - [0x8E790, c, draw_box] - - [0x90FE0, .data, npc_collision] - - [0x913B0, .data, world/actions] - - [0x914E0, .data, world/partners] + - [auto, hasm, bss2] + - [auto, c, npc_collision] + - [auto, c, 77480] + - [auto, c, 7B440] + - [auto, c, 7bb60_len_41b0] + - [auto, c, 7E9D0] + - [auto, c, 7fd10_len_b40] + - [auto, c, 80850_len_3060] + - [auto, c, world/actions] # DUMMY ROM + - [auto, c, world/partners] + - [auto, hasm, bss2_2] + - [auto, c, 891b0_len_fb0] + - [auto, c, 8a160_len_700] + - [auto, c, 8a860_len_3f30] + - [auto, c, draw_box] + - [auto, .data, npc_collision] + - [auto, .data, world/actions] + - [auto, .data, world/partners] - start: 0x919B0 type: .data name: global_hud_scripts @@ -784,8 +785,8 @@ segments: - [0x9DA58] - [0x9DA60, rgba32, ui/stat_flower, 16, 16] - [0x9DE60] - - [0xA2930, .data, 891b0_len_fb0] - - [0xA2960, .data, 8a160_len_700] + - [auto, .data, 891b0_len_fb0] + - [auto, .data, 8a160_len_700] - start: 0xA2960 type: .data name: 8a160_len_700 @@ -796,7 +797,7 @@ segments: - [0xA2BC0, gfx, A2BC0] - [0xA2C88, gfx, A2C88] - [0xA2CB0] - - [0xA2D40, .data, 8a860_len_3f30] + - [auto, .data, 8a860_len_3f30] - start: 0xA2D90 type: .data name: draw_box @@ -823,34 +824,34 @@ segments: vram: 0x8010F6D0 follows_vram: engine1 subsegments: - - [0xA5DD0, hasm, bss3] - - [0xA5DD0, c, entity] - - [0xA9290, c, game_states] - - [0xA9790, c, model] - - [0xB4580, c, B4580] - - [0xB72B0, c, entity_model] - - [0xB97B0, c, worker] - - [0xB9D60, c, msg] - - [0xC50A0, c, C50A0] - - [0xCD180, c, cd180_len_38f0] - - [0xCEE40, c, CEE40] - - [0xD0A70, c, imgfx] - - [0xD5A50, c, hud_element] - - [0xDBA20, c, dba20_len_350] - - [0xDBD70, c, trigger] - - [0xDC470, c, background] - - [0xDD930, c, audio/ambience] - - [0xDDAF0, c, windows] - - [0xDE740, c, sprite_shading] - - [0xDF950, c, audio/sfx] - - [0xE0B30, c, audio/e0b30_len_b80] - - [0xE16B0, .data, entity] - - [0xE16C0, .data, game_states] - - [0xE16C0, .data, model] - - [0xE2950, .data, B4580] - - [0xE2960, .data, entity_model] - - [0xE2980, .data, msg] - - [0xE2CA0, .data, C50A0] + - [auto, hasm, bss3] + - [auto, c, entity] + - [auto, c, game_states] + - [auto, c, model] + - [auto, c, B4580] + - [auto, c, entity_model] + - [auto, c, worker] + - [auto, c, msg] + - [auto, c, C50A0] + - [auto, c, cd180_len_38f0] + - [auto, c, CEE40] + - [auto, c, imgfx] + - [auto, c, hud_element] + - [auto, c, dba20_len_350] + - [auto, c, trigger] + - [auto, c, background] + - [auto, c, audio/ambience] + - [auto, c, windows] + - [auto, c, sprite_shading] + - [auto, c, audio/sfx] + - [auto, c, audio/e0b30_len_b80] + - [auto, .data, entity] + - [auto, .data, game_states] + - [auto, .data, model] + - [auto, .data, B4580] + - [auto, .data, entity_model] + - [auto, .data, msg] + - [auto, .data, C50A0] - start: 0xE2DF0 type: .data name: cd180_len_38f0 @@ -864,14 +865,14 @@ segments: - [0xE4CA0] - [0xE4E70, vtx, vtx/stencil2] - [0xE4FF0] - - [0xE5490, .data, CEE40] - - [0xE5510, .data, imgfx] - - [0xE56C0, .data, hud_element] - - [0xE5820, .data, background] - - [0xE5840, .data, audio/ambience] - - [0xE5850, .data, windows] - - [0xE59D0, .data, audio/sfx] - - [0xE5DF0, .data, audio/e0b30_len_b80] + - [auto, .data, CEE40] + - [auto, .data, imgfx] + - [auto, .data, hud_element] + - [auto, .data, background] + - [auto, .data, audio/ambience] + - [auto, .data, windows] + - [auto, .data, audio/sfx] + - [auto, .data, audio/e0b30_len_b80] - [0xE5E40] - name: heaps type: code @@ -880,7 +881,7 @@ segments: subalign: 0x1000 follows_vram: engine2 subsegments: - - [0xE79B0, c, heaps] + - [auto, c, heaps] - name: evt type: code dir: evt @@ -888,50 +889,48 @@ segments: vram: 0x802C3000 follows_vram: world_use_item subsegments: - - [0xE79B0, c, script_list] - - [0xE92D0, c, evt] - - [0xED510, c, map_api] - - [0xEF070, c, cam_api] - - [0xF1470, c, model_api] - - [0xF2470, c, npc_api] - - [0xF4C60, c, msg_api] - - [0xF5750, c, player_api] - - [0xF76E0, c, virtual_entity] - - [0xF8F60, c, f8f60_len_1560] - - [0xFA4C0, c, fa4c0_len_3bf0] - - [0xFBE10, c, fx_api] - - [0xFE0B0, c, demo_api] - - [0xFE650] + - [auto, c, script_list] + - [auto, c, evt] + - [auto, c, map_api] + - [auto, c, cam_api] + - [auto, c, model_api] + - [auto, c, npc_api] + - [auto, c, msg_api] + - [auto, c, player_api] + - [auto, c, virtual_entity] + - [auto, c, f8f60_len_1560] + - [auto, c, fa4c0_len_3bf0] + - [auto, c, fx_api] + - [auto, c, demo_api] - name: engine4 type: code start: 0xFEE30 vram: 0x802DBD40 follows_vram: evt subsegments: - - [0x0FEE30, c, sprite] - - [0x101B90, c, 101b90_len_8f0] - - [0x102480] + - [auto, c, sprite] + - [auto, c, 101b90_len_8f0] - name: entity type: code start: 0x102610 vram: 0x802E0D90 follows_vram: engine4 subsegments: - - [0x102610, c, entity/Shadow] - - [0x102660, c, entity/SaveBlock] - - [0x102C80, c, entity/Switch] - - [0x103CD0, c, entity/ShatteringBlock_common] - - [0x104730, c, entity/ShatteringBlock] - - [0x104940, c, entity/Block] - - [0x105700, c, entity/ItemBlock] - - [0x105F90, c, entity/HeartBlock] - - [0x106EF0, c, entity/SuperBlock] - - [0x107830, c, entity/SimpleSpring] - - [0x107A30, c, entity/HiddenPanel] - - [0x1086A0, c, entity/Chest] - - [0x109660, c, entity/WoodenCrate] - - [0x10A230, c, entity/BlueWarpPipe] - - [0x10A8D0, c, entity/Signpost] + - [auto, c, entity/Shadow] + - [auto, c, entity/SaveBlock] + - [auto, c, entity/Switch] + - [auto, c, entity/ShatteringBlock_common] + - [auto, c, entity/ShatteringBlock] + - [auto, c, entity/Block] + - [auto, c, entity/ItemBlock] + - [auto, c, entity/HeartBlock] + - [auto, c, entity/SuperBlock] + - [auto, c, entity/SimpleSpring] + - [auto, c, entity/HiddenPanel] + - [auto, c, entity/Chest] + - [auto, c, entity/WoodenCrate] + - [auto, c, entity/BlueWarpPipe] + - [auto, c, entity/Signpost] - start: 0x10A9F0 type: .data name: entity/Shadow @@ -943,20 +942,20 @@ segments: - [0x10AB70, i4, entity/shadow/square_big, 32, 32] - [0x10AD70, i4, entity/shadow/circle_big, 32, 32] - [0x10AF70] - - [0x10B1B0, .data, entity/SaveBlock] - - [0x10B2C0, .data, entity/Switch] - - [0x10B4C0, .data, entity/ShatteringBlock_common] - - [0x10B4F0, .data, entity/ShatteringBlock] - - [0x10B610, .data, entity/Block] - - [0x10BB90, .data, entity/ItemBlock] - - [0x10BF10, .data, entity/HeartBlock] - - [0x10C090, .data, entity/SuperBlock] - - [0x10C220, .data, entity/SimpleSpring] - - [0x10C300, .data, entity/HiddenPanel] - - [0x10C3B0, .data, entity/Chest] - - [0x10C6E0, .data, entity/WoodenCrate] - - [0x10C780, .data, entity/BlueWarpPipe] - - [0x10C830, .data, entity/Signpost] + - [auto, .data, entity/SaveBlock] + - [auto, .data, entity/Switch] + - [auto, .data, entity/ShatteringBlock_common] + - [auto, .data, entity/ShatteringBlock] + - [auto, .data, entity/Block] + - [auto, .data, entity/ItemBlock] + - [auto, .data, entity/HeartBlock] + - [auto, .data, entity/SuperBlock] + - [auto, .data, entity/SimpleSpring] + - [auto, .data, entity/HiddenPanel] + - [auto, .data, entity/Chest] + - [auto, .data, entity/WoodenCrate] + - [auto, .data, entity/BlueWarpPipe] + - [auto, .data, entity/Signpost] - [0x10C880] - type: code name: font_width @@ -964,9 +963,9 @@ segments: start: 0x10CC10 vram: 0x802EB3D0 subsegments: - - [0x10CC10, c, msg_data] - - [0x10CC10, c, msg_data_2] - - [0x10CC10, .data, msg_data] + - [auto, c, msg_data] + - [auto, c, msg_data_2] + - [auto, .data, msg_data] - start: 0x10CE00 type: .data name: msg_data_2 @@ -1050,7 +1049,7 @@ segments: vram: 0x802FB800 follows_vram: font_width subsegments: - - [0x10F1B0, c, heaps3] + - [auto, c, heaps3] - type: group dir: charset vram: 0 @@ -1285,23 +1284,23 @@ segments: vram: 0x80242BA0 follows_vram: ui_images subsegments: - - [0x135EE0, c, pause_main] - - [0x137ED0, c, pause_tabs] - - [0x138CC0, c, pause_stats] - - [0x13A320, c, pause_badges] - - [0x13CAF0, c, pause_items] - - [0x13E120, c, pause_partners] - - [0x13FD40, c, pause_spirits] - - [0x140C70, c, pause_map] - - [0x1421C0, c, pause_gfx] - - [0x1422A0, .data, pause_main] - - [0x1424F0, .data, pause_tabs] - - [0x142670, .data, pause_stats] - - [0x142810, .data, pause_badges] - - [0x1428B0, .data, pause_items] - - [0x142940, .data, pause_partners] - - [0x142BF0, .data, pause_spirits] - - [0x142D70, .data, pause_map] + - [auto, c, pause_main] + - [auto, c, pause_tabs] + - [auto, c, pause_stats] + - [auto, c, pause_badges] + - [auto, c, pause_items] + - [auto, c, pause_partners] + - [auto, c, pause_spirits] + - [auto, c, pause_map] + - [auto, c, pause_gfx] + - [auto, .data, pause_main] + - [auto, .data, pause_tabs] + - [auto, .data, pause_stats] + - [auto, .data, pause_badges] + - [auto, .data, pause_items] + - [auto, .data, pause_partners] + - [auto, .data, pause_spirits] + - [auto, .data, pause_map] - start: 0x1439F0 type: .data name: pause_gfx @@ -1344,16 +1343,16 @@ segments: vram: 0x80242BA0 follows_vram: ui_images subsegments: - - [0x163400, c, filemenu_common] - - [0x165490, c, filemenu_main] - - [0x167570, c, filemenu_yesno] - - [0x168590, c, filemenu_info] - - [0x1689D0, c, filemenu_createfile] - - [0x169BE0, c, filemenu_msg] - - [0x16A3E0, .data, filemenu_common] - - [0x16A680, .data, filemenu_main] - - [0x16A920, .data, filemenu_yesno] - - [0x16A990, .data, filemenu_info] + - [auto, c, filemenu_common] + - [auto, c, filemenu_main] + - [auto, c, filemenu_yesno] + - [auto, c, filemenu_info] + - [auto, c, filemenu_createfile] + - [auto, c, filemenu_msg] + - [auto, .data, filemenu_common] + - [auto, .data, filemenu_main] + - [auto, .data, filemenu_yesno] + - [auto, .data, filemenu_info] - [0x16A9E0, .data, filemenu_createfile] - start: 0x16AA60 type: .data @@ -1364,7 +1363,7 @@ segments: - [0x16BC60, ia8, corners_gray, 16, 32] - [0x16BE60, .data, filemenu_gfx] - [0x16BF90, .data, filemenu_msg] - - [0x16C2C0, .data, filemenu_styles] + - [auto, .data, filemenu_styles] - [0x16C7D0] - type: code start: 0x16C8E0 @@ -1372,29 +1371,29 @@ segments: vram: 0x8023E000 vram_of_symbol: battle_code_vram_start subsegments: - - [0x16C8E0, c, 16c8e0] - - [0x16F740, c, 16F740] - - [0x1776B0, c, battle_cam] - - [0x17D6A0, c, 17D6A0] - - [0x17FEB0, c] - - [0x181810, c, 181810] - - [0x182B30, c, 182B30] - - [0x18C790, c, 18C790] - - [0x18F340, c, 18F340] - - [0x190A10, c] - - [0x190B20, c, 190B20] - - [0x1967B0, c, battle/use_items] - - [0x196A10, c, battle/use_moves] - - [0x196AA0, c, battle/action_cmd] - - [0x197F40, c, actor_api] - - [0x19FAF0, c, 19FAF0] - - [0x1A5830, c, 1A5830] - - [0x1AC760, c] - - [0x1AF120, c, battle/btl_evt_library] - - [0x1AF230, c, battle/use_star_powers] - - [0x1AF2D0, .data, 16c8e0] - - [0x1AF5C0, .data, battle_cam] - - [0x1B2050, .data, 17D6A0] + - [auto, c, 16c8e0] + - [auto, c, 16F740] + - [auto, c, battle_cam] + - [auto, c, 17D6A0] + - [auto, c, 17FEB0] + - [auto, c, 181810] + - [auto, c, 182B30] + - [auto, c, 18C790] + - [auto, c, 18F340] + - [auto, c, 190A10] + - [auto, c, 190B20] + - [auto, c, battle/use_items] + - [auto, c, battle/use_moves] + - [auto, c, battle/action_cmd] + - [auto, c, actor_api] + - [auto, c, 19FAF0] + - [auto, c, 1A5830] + - [auto, c, 1AC760] + - [auto, c, battle/btl_evt_library] + - [auto, c, battle/use_star_powers] + - [auto, .data, 16c8e0] + - [auto, .data, battle_cam] + - [auto, .data, 17D6A0] - start: 0x1B2050 type: .data name: 17D6A0 @@ -1403,10 +1402,10 @@ segments: - [0x1B21E0, ci4, ui/battle/cursor_hand, 32, 32] - [0x1B23E0, palette, ui/battle/cursor_hand] - [0x1B2400] - - [0x1B28E0, .data, 181810] - - [0x1B2960, .data, 182B30] - - [0x1B2A30, .data, 18C790] - - [0x1B3300, .data, 18F340] + - [auto, .data, 181810] + - [auto, .data, 182B30] + - [auto, .data, 18C790] + - [auto, .data, 18F340] - start: 0x1B7CE0 type: .data name: battle_ui_gfx @@ -1566,14 +1565,14 @@ segments: - [0x1C0558] - [0x1C0560, ia8, ui/battle/swap_background, 48, 16] - [0x1C0860] - - [0x1C2100, .data, 190B20] - - [0x1C2460, .data, battle/use_items] - - [0x1C2760, .data, battle/use_moves] - - [0x1C2A70, .data, battle/action_cmd] - - [0x1C2EC0, .data, 19FAF0] - - [0x1C2FC0, .data, 1A5830] - - [0x1C3000, .data, battle/btl_evt_library] - - [0x1CB0B0, .data, battle/use_star_powers] + - [auto, .data, 190B20] + - [auto, .data, battle/use_items] + - [auto, .data, battle/use_moves] + - [auto, .data, battle/action_cmd] + - [auto, .data, 19FAF0] + - [auto, .data, 1A5830] + - [auto, .data, battle/btl_evt_library] + - [auto, .data, battle/use_star_powers] - [0x1CB240] - [0x1CC310, ci4, icon/present, 32, 32] - [0x1CC510, palette, icon/present] @@ -2631,32 +2630,32 @@ segments: name: create_audio_system_obfuscated vram: 0x80200000 subsegments: - - [0x3169F0, c, create_audio_system_obfuscated] + - [auto, c, create_audio_system_obfuscated] - type: code start: 0x316A70 vram: 0x80200080 name: load_engine_data_obfuscated follows_vram: create_audio_system_obfuscated subsegments: - - [0x316A70, c, load_engine_data_obfuscated] + - [auto, c, load_engine_data_obfuscated] - type: code start: 0x316C00 name: general_heap_create_obfuscated vram: 0x802AE000 subsegments: - - [0x316C00, c, general_heap_create_obfuscated] + - [auto, c, general_heap_create_obfuscated] - type: code start: 0x316D90 name: battle_heap_create_obfuscated vram: 0x802AE000 subsegments: - - [0x316D90, c, battle_heap_create_obfuscated] + - [auto, c, battle_heap_create_obfuscated] - type: code start: 0x316F30 name: obfuscation_shims vram: 0x802B2000 subsegments: - - [0x316F30, c, obfuscation_shims] + - [auto, c, obfuscation_shims] - type: code dir: world/partner name: world_partner_goombario @@ -2664,8 +2663,7 @@ segments: vram: 0x802BD100 vram_of_symbol: entity_data_vram_end subsegments: - - [0x317020, c, goombario] - - [0x317B60] + - [auto, c, goombario] - type: code dir: world/partner name: world_partner_bombette @@ -2673,8 +2671,7 @@ segments: vram: 0x802BD100 vram_of_symbol: entity_data_vram_end subsegments: - - [0x317E50, c, bombette] - - [0x3195D0] + - [auto, c, bombette] - type: code dir: world/partner name: world_partner_parakarry @@ -2682,8 +2679,7 @@ segments: vram: 0x802BD100 vram_of_symbol: entity_data_vram_end subsegments: - - [0x319670, c, parakarry] - - [0x31B000] + - [auto, c, parakarry] - type: code dir: world/partner name: world_partner_kooper @@ -2691,8 +2687,7 @@ segments: vram: 0x802BD100 vram_of_symbol: entity_data_vram_end subsegments: - - [0x31B120, c, kooper] - - [0x31CB60] + - [auto, c, kooper] - type: code dir: world/partner name: world_partner_watt @@ -2700,8 +2695,7 @@ segments: vram: 0x802BD100 vram_of_symbol: entity_data_vram_end subsegments: - - [0x31CC70, c, watt] - - [0x31DDC0] + - [auto, c, watt] - type: code dir: world/partner name: world_partner_sushie @@ -2709,8 +2703,7 @@ segments: vram: 0x802BD100 vram_of_symbol: entity_data_vram_end subsegments: - - [0x31DE70, c, sushie] - - [0x320B20] + - [auto, c, sushie] - type: code dir: world/partner name: world_partner_lakilester @@ -2718,8 +2711,7 @@ segments: vram: 0x802BD100 vram_of_symbol: entity_data_vram_end subsegments: - - [0x320C50, c, lakilester] - - [0x3239B0] + - [auto, c, lakilester] - type: code dir: world/partner name: world_partner_bow @@ -2727,8 +2719,7 @@ segments: vram: 0x802BD100 vram_of_symbol: entity_data_vram_end subsegments: - - [0x323A50, c, bow] - - [0x324930] + - [auto, c, bow] - type: code dir: world/partner name: world_partner_goompa @@ -2736,8 +2727,7 @@ segments: vram: 0x802BD100 vram_of_symbol: entity_data_vram_end subsegments: - - [0x324A10, c, goompa] - - [0x324E80] + - [auto, c, goompa] - type: code dir: world/partner name: world_partner_goombaria @@ -2745,8 +2735,7 @@ segments: vram: 0x802BD100 vram_of_symbol: entity_data_vram_end subsegments: - - [0x324F10, c, goombaria] - - [0x325000] + - [auto, c, goombaria] - type: code dir: world/partner name: world_partner_twink @@ -2754,16 +2743,14 @@ segments: vram: 0x802BD100 vram_of_symbol: entity_data_vram_end subsegments: - - [0x325070, c, twink] - - [0x325160] + - [auto, c, twink] - type: code start: 0x3251D0 name: world_use_item vram: 0x802C0000 vram_of_symbol: world_partner_vram_end subsegments: - - [0x3251D0, c, world_use_item] - - [0x3255E0] + - [auto, c, world_use_item] ############### ### Effects ### @@ -2772,7 +2759,7 @@ segments: start: 0x325AD0 vram: 0xE0200000 subsegments: - - [0x325AD0, c] + - [auto, c, 325AD0] - [0x325EE0, pm_effect_shims, effect_shims] - [0x326160] - name: effect_gfx_big_smoke_puff @@ -2782,7 +2769,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x326410, c, big_smoke_puff] + - [auto, c, big_smoke_puff] - start: 0x326410 type: .data name: big_smoke_puff @@ -2817,16 +2804,14 @@ segments: start: 0x3278F0 vram: 0xE0002000 subsegments: - - [0x3278F0, c, big_smoke_puff] - - [0x328050] + - [auto, c, big_smoke_puff] - name: effect_landing_dust dir: effects type: code start: 0x328110 vram: 0xE000C000 subsegments: - - [0x328110, c, landing_dust] - - [0x328D20] + - [auto, c, landing_dust] - name: effect_gfx_landing_dust dir: effects/gfx type: code @@ -2834,7 +2819,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x328EA0, c, landing_dust] + - [auto, c, landing_dust] - start: 0x328EA0 type: .data name: landing_dust @@ -2879,16 +2864,14 @@ segments: start: 0x32C110 vram: 0xE000E000 subsegments: - - [0x32C110, c, walking_dust] - - [0x32C770] + - [auto, c, walking_dust] - name: effect_flower_splash dir: effects type: code start: 0x32C7A0 vram: 0xE0010000 subsegments: - - [0x32C7A0, c, flower_splash] - - [0x32CEB0] + - [auto, c, flower_splash] - name: effect_gfx_flower_splash_trail dir: effects/gfx type: code @@ -2896,7 +2879,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x32CEC0, c, flower_splash_trail] + - [auto, c, flower_splash_trail] - start: 0x32CEC0 type: .data name: flower_splash_trail @@ -2926,15 +2909,14 @@ segments: start: 0x32DD10 vram: 0xE0012000 subsegments: - - [0x32DD10, c, flower_trail] + - [auto, c, flower_trail] - name: effect_cloud_puff dir: effects type: code start: 0x32E490 vram: 0xE0014000 subsegments: - - [0x32E490, c, cloud_puff] - - [0x32EC10] + - [auto, c, cloud_puff] - name: effect_gfx_cloud_puff_trail dir: effects/gfx type: code @@ -2942,7 +2924,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x32EC50, c, cloud_puff_trail] + - [auto, c, cloud_puff_trail] - start: 0x32EC50 type: .data name: cloud_puff_trail @@ -2959,15 +2941,14 @@ segments: start: 0x32EE30 vram: 0xE0016000 subsegments: - - [0x32EE30, c, cloud_trail] - - [0x32F550] + - [auto, c, cloud_trail] - name: effect_footprint dir: effects type: code start: 0x32F580 vram: 0xE0018000 subsegments: - - [0x32F580, c, footprint] + - [auto, c, footprint] - name: effect_gfx_footprint dir: effects/gfx type: code @@ -2975,7 +2956,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x32FB50, c, footprint] + - [auto, c, footprint] - start: 0x32FB50 type: .data name: footprint @@ -2990,8 +2971,7 @@ segments: start: 0x32FE30 vram: 0xE001A000 subsegments: - - [0x32FE30, c, floating_flower] - - [0x330440] + - [auto, c, floating_flower] - name: effect_gfx_floating_flower dir: effects/gfx type: code @@ -2999,7 +2979,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x330460, c, floating_flower] + - [auto, c, floating_flower] - start: 0x330460 type: .data name: floating_flower @@ -3018,8 +2998,7 @@ segments: start: 0x330910 vram: 0xE001C000 subsegments: - - [0x330910, c, snowflake] - - [0x330EF0] + - [auto, c, snowflake] - name: effect_gfx_snowflake dir: effects/gfx type: code @@ -3027,7 +3006,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x330F00, c, snowflake] + - [auto, c, snowflake] - start: 0x330F00 type: .data name: snowflake @@ -3046,8 +3025,7 @@ segments: start: 0x331940 vram: 0xE001E000 subsegments: - - [0x331940, c, star] - - [0x332690] + - [auto, c, star] - name: effect_gfx_star dir: effects/gfx type: code @@ -3055,7 +3033,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3326A0, c, star] + - [auto, c, star] - start: 0x3326A0 type: .data name: star @@ -3076,8 +3054,7 @@ segments: start: 0x333EC0 vram: 0xE0020000 subsegments: - - [0x333EC0, c, emote] - - [0x334B50] + - [auto, c, emote] - name: effect_gfx_emote dir: effects/gfx type: code @@ -3085,7 +3062,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x334C70, c, emote] + - [auto, c, emote] - start: 0x334C70 type: .data name: emote @@ -3117,8 +3094,7 @@ segments: start: 0x337240 vram: 0xE0022000 subsegments: - - [0x337240, c, sparkles] - - [0x337F10] + - [auto, c, sparkles] - name: effect_gfx_sparkles dir: effects/gfx type: code @@ -3126,7 +3102,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x337FC0, c, sparkles] + - [auto, c, sparkles] - start: 0x337FC0 type: .data name: sparkles @@ -3156,8 +3132,7 @@ segments: start: 0x339250 vram: 0xE0024000 subsegments: - - [0x339250, c, shape_spell] - - [0x339F10] + - [auto, c, shape_spell] - name: effect_gfx_shape_spell dir: effects/gfx type: code @@ -3165,7 +3140,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x339F60, c, shape_spell] + - [auto, c, shape_spell] - start: 0x339F60 type: .data name: shape_spell @@ -3187,8 +3162,7 @@ segments: start: 0x33B180 vram: 0xE0026000 subsegments: - - [0x33B180, c, gather_energy_pink] - - [0x33BB70] + - [auto, c, gather_energy_pink] - name: effect_gfx_gather_energy_pink dir: effects/gfx type: code @@ -3196,7 +3170,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x33BBD0, c, gather_energy_pink] + - [auto, c, gather_energy_pink] - start: 0x33BBD0 type: .data name: gather_energy_pink @@ -3217,8 +3191,7 @@ segments: start: 0x33CDF0 vram: 0xE0028000 subsegments: - - [0x33CDF0, c, drop_leaves] - - [0x33D5D0] + - [auto, c, drop_leaves] - name: effect_gfx_drop_leaves dir: effects/gfx type: code @@ -3226,7 +3199,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x33D610, c, drop_leaves] + - [auto, c, drop_leaves] - start: 0x33D610 type: .data name: drop_leaves @@ -3246,8 +3219,7 @@ segments: start: 0x33E8C0 vram: 0xE002A000 subsegments: - - [0x33E8C0, c, dust] - - [0x33EFE0] + - [auto, c, dust] - name: effect_gfx_dust dir: effects/gfx type: code @@ -3255,7 +3227,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x33F000, c, dust] + - [auto, c, dust] - start: 0x33F000 type: .data name: dust @@ -3277,8 +3249,7 @@ segments: start: 0x33FE80 vram: 0xE002C000 subsegments: - - [0x33FE80, c, shattering_stones] - - [0x3407C0] + - [auto, c, shattering_stones] - name: effect_gfx_shattering_stones dir: effects/gfx type: code @@ -3286,7 +3257,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x340880, c, shattering_stones] + - [auto, c, shattering_stones] - start: 0x340880 type: .data name: shattering_stones @@ -3318,16 +3289,14 @@ segments: start: 0x3419E0 vram: 0xE002E000 subsegments: - - [0x3419E0, c, smoke_ring] - - [0x342120] + - [auto, c, smoke_ring] - name: effect_damage_stars dir: effects type: code start: 0x342140 vram: 0xE0030000 subsegments: - - [0x342140, c, damage_stars] - - [0x342FD0] + - [auto, c, damage_stars] - name: effect_gfx_damage_stars dir: effects/gfx type: code @@ -3335,7 +3304,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x343040, c, damage_stars] + - [auto, c, damage_stars] - start: 0x343040 type: .data name: damage_stars @@ -3355,8 +3324,7 @@ segments: start: 0x343680 vram: 0xE0032000 subsegments: - - [0x343680, c, explosion] - - [0x343F30] + - [auto, c, explosion] - name: effect_gfx_explosion dir: effects/gfx type: code @@ -3364,7 +3332,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x343F70, c, explosion] + - [auto, c, explosion] - start: 0x343F70 type: .data name: explosion @@ -3387,8 +3355,7 @@ segments: start: 0x344A10 vram: 0xE0034000 subsegments: - - [0x344A10, c, lens_flare] - - [0x345190] + - [auto, c, lens_flare] - name: effect_gfx_lens_flare dir: effects/gfx type: code @@ -3396,7 +3363,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3451E0, c, lens_flare] + - [auto, c, lens_flare] - start: 0x3451E0 type: .data name: lens_flare @@ -3411,8 +3378,7 @@ segments: start: 0x3454E0 vram: 0xE0036000 subsegments: - - [0x3454E0, c, got_item_outline] - - [0x345B10] + - [auto, c, got_item_outline] - name: effect_gfx_got_item_outline dir: effects/gfx type: code @@ -3420,7 +3386,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x345B40, c, got_item_outline] + - [auto, c, got_item_outline] - start: 0x345B40 type: .data name: got_item_outline @@ -3446,8 +3412,7 @@ segments: start: 0x34DD20 vram: 0xE0038000 subsegments: - - [0x34DD20, c, spiky_white_aura] - - [0x34E710] + - [auto, c, spiky_white_aura] - name: effect_gfx_spiky_white_aura dir: effects/gfx type: code @@ -3455,7 +3420,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x34E770, c, spiky_white_aura] + - [auto, c, spiky_white_aura] - start: 0x34E770 type: .data name: spiky_white_aura @@ -3471,16 +3436,14 @@ segments: start: 0x34EC80 vram: 0xE003A000 subsegments: - - [0x34EC80, c, smoke_impact] - - [0x34F480] + - [auto, c, smoke_impact] - name: effect_damage_indicator dir: effects type: code start: 0x34F4C0 vram: 0xE003C000 subsegments: - - [0x34F4C0, c, damage_indicator] - - [0x350160] + - [auto, c, damage_indicator] - name: effect_gfx_damage_indicator dir: effects/gfx type: code @@ -3488,7 +3451,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x350220, c, damage_indicator] + - [auto, c, damage_indicator] - start: 0x350220 type: .data name: damage_indicator @@ -3543,8 +3506,7 @@ segments: start: 0x352440 vram: 0xE003E000 subsegments: - - [0x352440, c, purple_ring] - - [0x352CB0] + - [auto, c, purple_ring] - name: effect_gfx_purple_ring dir: effects/gfx type: code @@ -3552,7 +3514,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x352CE0, c, purple_ring] + - [auto, c, purple_ring] - start: 0x352CE0 type: .data name: purple_ring @@ -3571,8 +3533,7 @@ segments: start: 0x353300 vram: 0xE0040000 subsegments: - - [0x353300, c, flame] - - [0x353B40] + - [auto, c, flame] - name: effect_gfx_flame dir: effects/gfx type: code @@ -3580,7 +3541,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x353BB0, c, flame] + - [auto, c, flame] - start: 0x353BB0 type: .data name: flame @@ -3600,24 +3561,21 @@ segments: start: 0x3547A0 vram: 0xE0042000 subsegments: - - [0x3547A0, c, stars_burst] - - [0x354F20] + - [auto, c, stars_burst] - name: effect_stars_shimmer dir: effects type: code start: 0x354F60 vram: 0xE0044000 subsegments: - - [0x354F60, c, stars_shimmer] - - [0x355D10] + - [auto, c, stars_shimmer] - name: effect_rising_bubble dir: effects type: code start: 0x355EE0 vram: 0xE0046000 subsegments: - - [0x355EE0, c, rising_bubble] - - [0x3564E0] + - [auto, c, rising_bubble] - name: effect_gfx_rising_bubble dir: effects/gfx type: code @@ -3625,7 +3583,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x356530, c, rising_bubble] + - [auto, c, rising_bubble] - start: 0x356530 type: .data name: rising_bubble @@ -3648,8 +3606,7 @@ segments: start: 0x356980 vram: 0xE0048000 subsegments: - - [0x356980, c, ring_blast] - - [0x357380] + - [auto, c, ring_blast] - name: effect_gfx_ring_blast dir: effects/gfx type: code @@ -3657,7 +3614,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3573A0, c, ring_blast] + - [auto, c, ring_blast] - start: 0x3573A0 type: .data name: ring_blast @@ -3673,8 +3630,7 @@ segments: start: 0x3584C0 vram: 0xE004A000 subsegments: - - [0x3584C0, c, shockwave] - - [0x359320] + - [auto, c, shockwave] - name: effect_gfx_shockwave dir: effects/gfx type: code @@ -3682,7 +3638,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3593B0, c, shockwave] + - [auto, c, shockwave] - start: 0x3593B0 type: .data name: shockwave @@ -3701,8 +3657,7 @@ segments: start: 0x359F20 vram: 0xE004C000 subsegments: - - [0x359F20, c, music_note] - - [0x35A580] + - [auto, c, music_note] - name: effect_gfx_music_note dir: effects/gfx type: code @@ -3710,7 +3665,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x35A5E0, c, music_note] + - [auto, c, music_note] - start: 0x35A5E0 type: .data name: music_note @@ -3744,16 +3699,14 @@ segments: start: 0x35B9D0 vram: 0xE004E000 subsegments: - - [0x35B9D0, c, smoke_burst] - - [0x35BFB0] + - [auto, c, smoke_burst] - name: effect_sweat dir: effects type: code start: 0x35BFD0 vram: 0xE0050000 subsegments: - - [0x35BFD0, c, sweat] - - [0x35C530] + - [auto, c, sweat] - name: effect_gfx_sweat dir: effects/gfx type: code @@ -3761,7 +3714,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x35C550, c, sweat] + - [auto, c, sweat] - start: 0x35C550 type: .data name: sweat @@ -3780,8 +3733,7 @@ segments: start: 0x35CA80 vram: 0xE0052000 subsegments: - - [0x35CA80, c, sleep_bubble] - - [0x35D460] + - [auto, c, sleep_bubble] - name: effect_gfx_sleep_bubble dir: effects/gfx type: code @@ -3789,7 +3741,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x35D510, c, sleep_bubble] + - [auto, c, sleep_bubble] - start: 0x35D510 type: .data name: sleep_bubble @@ -3807,16 +3759,14 @@ segments: start: 0x35DA00 vram: 0xE0056000 subsegments: - - [0x35DA00, c, windy_leaves] - - [0x35E8A0, .rodata, windy_leaves] + - [auto, c, windy_leaves] - name: effect_falling_leaves dir: effects type: code start: 0x35E920 vram: 0xE0058000 subsegments: - - [0x35E920, c, falling_leaves] - - [0x35F0A0] + - [auto, c, falling_leaves] - name: effect_gfx_falling_leaves dir: effects/gfx type: code @@ -3824,7 +3774,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x35F0E0, c, falling_leaves] + - [auto, c, falling_leaves] - start: 0x35F0E0 type: .data name: falling_leaves @@ -3840,8 +3790,7 @@ segments: start: 0x3602C0 vram: 0xE005A000 subsegments: - - [0x3602C0, c, stars_spread] - - [0x360A10] + - [auto, c, stars_spread] - name: effect_gfx_stars_spread dir: effects/gfx type: code @@ -3849,7 +3798,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x360A30, c, stars_spread] + - [auto, c, stars_spread] - start: 0x360A30 type: .data name: stars_spread @@ -3864,8 +3813,7 @@ segments: start: 0x360F40 vram: 0xE005C000 subsegments: - - [0x360F40, c, steam_burst] - - [0x361640] + - [auto, c, steam_burst] - name: effect_gfx_steam_burst dir: effects/gfx type: code @@ -3873,7 +3821,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x361670, c, steam_burst] + - [auto, c, steam_burst] - start: 0x361670 type: .data name: steam_burst @@ -3888,8 +3836,7 @@ segments: start: 0x3625C0 vram: 0xE005E000 subsegments: - - [0x3625C0, c, stars_orbiting] - - [0x362C30] + - [auto, c, stars_orbiting] - name: effect_gfx_stars_orbiting dir: effects/gfx type: code @@ -3897,7 +3844,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x362C50, c, stars_orbiting] + - [auto, c, stars_orbiting] - start: 0x362C50 type: .data name: stars_orbiting @@ -3912,8 +3859,7 @@ segments: start: 0x363160 vram: 0xE0060000 subsegments: - - [0x363160, c, big_snowflakes] - - [0x363890] + - [auto, c, big_snowflakes] - name: effect_gfx_big_snowflakes dir: effects/gfx type: code @@ -3921,7 +3867,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3638C0, c, big_snowflakes] + - [auto, c, big_snowflakes] - start: 0x3638C0 type: .data name: big_snowflakes @@ -3940,8 +3886,7 @@ segments: start: 0x364300 vram: 0xE0062000 subsegments: - - [0x364300, c, debuff] - - [0x364BC0] + - [auto, c, debuff] - name: effect_gfx_debuff dir: effects/gfx type: code @@ -3949,7 +3894,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x364C00, c, debuff] + - [auto, c, debuff] - start: 0x364C00 type: .data name: debuff @@ -3965,8 +3910,7 @@ segments: start: 0x364F10 vram: 0xE0064000 subsegments: - - [0x364F10, c, green_impact] - - [0x365970] + - [auto, c, green_impact] - name: effect_gfx_green_impact dir: effects/gfx type: code @@ -3974,7 +3918,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3659B0, c, green_impact] + - [auto, c, green_impact] - start: 0x3659B0 type: .data name: green_impact @@ -3990,8 +3934,7 @@ segments: start: 0x366030 vram: 0xE0066000 subsegments: - - [0x366030, c, radial_shimmer] - - [0x366C80] + - [auto, c, radial_shimmer] - name: effect_gfx_radial_shimmer dir: effects/gfx type: code @@ -3999,7 +3942,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x366D60, c, radial_shimmer] + - [auto, c, radial_shimmer] - start: 0x366D60 type: .data name: radial_shimmer @@ -4032,8 +3975,7 @@ segments: start: 0x36A8D0 vram: 0xE0068000 subsegments: - - [0x36A8D0, c, ending_decals] - - [0x36AE80] + - [auto, c, ending_decals] - name: effect_gfx_ending_decals dir: effects/gfx type: code @@ -4041,7 +3983,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x36AEE0, c, ending_decals] + - [auto, c, ending_decals] - start: 0x36AEE0 type: .data name: ending_decals @@ -4067,8 +4009,7 @@ segments: start: 0x36D020 vram: 0xE006A000 subsegments: - - [0x36D020, c, light_rays] - - [0x36DE10] + - [auto, c, light_rays] - name: effect_gfx_light_rays dir: effects/gfx type: code @@ -4076,7 +4017,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x36DF90, c, light_rays] + - [auto, c, light_rays] - start: 0x36DF90 type: .data name: light_rays @@ -4094,8 +4035,7 @@ segments: start: 0x36E1D0 vram: 0xE006C000 subsegments: - - [0x36E1D0, c, lightning] - - [0x36ED30] + - [auto, c, lightning] - name: effect_gfx_lightning dir: effects/gfx type: code @@ -4103,7 +4043,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x36ED60, c, lightning] + - [auto, c, lightning] - start: 0x36ED60 type: .data name: lightning @@ -4153,8 +4093,7 @@ segments: start: 0x372790 vram: 0xE006E000 subsegments: - - [0x372790, c, fire_breath] - - [0x373390] + - [auto, c, fire_breath] - name: effect_gfx_fire_breath dir: effects/gfx type: code @@ -4162,7 +4101,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3733E0, c, fire_breath] + - [auto, c, fire_breath] - start: 0x3733E0 type: .data name: fire_breath @@ -4184,16 +4123,14 @@ segments: start: 0x3740B0 vram: 0xE0070000 subsegments: - - [0x3740B0, c, shimmer_burst] - - [0x374D80] + - [auto, c, shimmer_burst] - name: effect_energy_shockwave dir: effects type: code start: 0x374E50 vram: 0xE0072000 subsegments: - - [0x374E50, c, energy_shockwave] - - [0x375500] + - [auto, c, energy_shockwave] - name: effect_gfx_energy_shockwave dir: effects/gfx type: code @@ -4201,7 +4138,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x375510, c, energy_shockwave] + - [auto, c, energy_shockwave] - start: 0x375510 type: .data name: energy_shockwave @@ -4219,16 +4156,14 @@ segments: start: 0x376460 vram: 0xE0074000 subsegments: - - [0x376460, c, shimmer_wave] - - [0x376FC0] + - [auto, c, shimmer_wave] - name: effect_aura dir: effects type: code start: 0x377070 vram: 0xE0076000 subsegments: - - [0x377070, c, aura] - - [0x377F00] + - [auto, c, aura] - name: effect_gfx_aura dir: effects/gfx type: code @@ -4236,7 +4171,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x377F80, c, aura] + - [auto, c, aura] - start: 0x377F80 type: .data name: aura @@ -4271,8 +4206,7 @@ segments: start: 0x37A3F0 vram: 0xE0078000 subsegments: - - [0x37A3F0, c, bulb_glow] - - [0x37ACF0] + - [auto, c, bulb_glow] - name: effect_gfx_bulb_glow dir: effects/gfx type: code @@ -4280,7 +4214,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x37ADD0, c, bulb_glow] + - [auto, c, bulb_glow] - start: 0x37ADD0 type: .data name: bulb_glow @@ -4300,8 +4234,7 @@ segments: start: 0x37C540 vram: 0xE007A000 subsegments: - - [0x37C540, c, effect_3D] - - [0x37D140] + - [auto, c, effect_3D] - name: effect_gfx_effect_3D dir: effects/gfx type: code @@ -4309,7 +4242,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x37D180, c, effect_3D] + - [auto, c, effect_3D] - start: 0x37D180 type: .data name: effect_3D @@ -4325,8 +4258,7 @@ segments: start: 0x37D490 vram: 0xE007C000 subsegments: - - [0x37D490, c, blast] - - [0x37D9A0] + - [auto, c, blast] - name: effect_gfx_blast dir: effects/gfx type: code @@ -4334,7 +4266,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x37D9D0, c, blast] + - [auto, c, blast] - start: 0x37D9D0 type: .data name: blast @@ -4377,8 +4309,7 @@ segments: start: 0x37F720 vram: 0xE007E000 subsegments: - - [0x37F720, c, fire_flower] - - [0x380350] + - [auto, c, fire_flower] - name: effect_gfx_fire_flower dir: effects/gfx type: code @@ -4386,7 +4317,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3803A0, c, fire_flower] + - [auto, c, fire_flower] - start: 0x3803A0 type: .data name: fire_flower @@ -4415,8 +4346,7 @@ segments: start: 0x3812C0 vram: 0xE0080000 subsegments: - - [0x3812C0, c, recover] - - [0x381D80] + - [auto, c, recover] - name: effect_gfx_recover dir: effects/gfx type: code @@ -4424,7 +4354,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x381E00, c, recover] + - [auto, c, recover] - start: 0x381E00 type: .data name: recover @@ -4482,8 +4412,7 @@ segments: start: 0x385640 vram: 0xE0082000 subsegments: - - [0x385640, c, disable_x] - - [0x386340] + - [auto, c, disable_x] - name: effect_gfx_disable_x dir: effects/gfx type: code @@ -4491,7 +4420,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3863B0, c, disable_x] + - [auto, c, disable_x] - start: 0x3863B0 type: .data name: disable_x @@ -4538,16 +4467,14 @@ segments: start: 0x3889D0 vram: 0xE0084000 subsegments: - - [0x3889D0, c, bombette_breaking] - - [0x3897E0] + - [auto, c, bombette_breaking] - name: effect_firework dir: effects type: code start: 0x389850 vram: 0xE0086000 subsegments: - - [0x389850, c, firework] - - [0x38A2F0] + - [auto, c, firework] - name: effect_gfx_firework dir: effects/gfx type: code @@ -4555,7 +4482,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x38A350, c, firework] + - [auto, c, firework] - start: 0x38A350 type: .data name: firework @@ -4578,8 +4505,7 @@ segments: start: 0x38ADF0 vram: 0xE0088000 subsegments: - - [0x38ADF0, c, confetti] - - [0x38BAB0] + - [auto, c, confetti] - name: effect_gfx_confetti dir: effects/gfx type: code @@ -4587,7 +4513,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x38BBA0, c, confetti] + - [auto, c, confetti] - start: 0x38BBA0 type: .data name: confetti @@ -4607,8 +4533,7 @@ segments: start: 0x38C5F0 vram: 0xE008A000 subsegments: - - [0x38C5F0, c, snowfall] - - [0x38D040] + - [auto, c, snowfall] - name: effect_gfx_snowfall dir: effects/gfx type: code @@ -4616,7 +4541,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x38D070, c, snowfall] + - [auto, c, snowfall] - start: 0x38D070 type: .data name: snowfall @@ -4637,8 +4562,7 @@ segments: start: 0x38DE00 vram: 0xE008C000 subsegments: - - [0x38DE00, c, effect_46] - - [0x38E8F0] + - [auto, c, effect_46] - name: effect_gfx_effect_46 dir: effects/gfx type: code @@ -4646,7 +4570,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x38E990, c, effect_46] + - [auto, c, effect_46] - start: 0x38E990 type: .data name: effect_46 @@ -4661,8 +4585,7 @@ segments: start: 0x38EE60 vram: 0xE008E000 subsegments: - - [0x38EE60, c, gather_magic] - - [0x38F6F0] + - [auto, c, gather_magic] - name: effect_gfx_gather_magic dir: effects/gfx type: code @@ -4670,7 +4593,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x38F710, c, gather_magic] + - [auto, c, gather_magic] - start: 0x38F710 type: .data name: gather_magic @@ -4688,8 +4611,7 @@ segments: start: 0x38F900 vram: 0xE0090000 subsegments: - - [0x38F900, c, attack_result_text] - - [0x390340] + - [auto, c, attack_result_text] - name: effect_gfx_attack_result_text dir: effects/gfx type: code @@ -4697,7 +4619,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3903D0, c, attack_result_text] + - [auto, c, attack_result_text] - start: 0x3903D0 type: .data name: attack_result_text @@ -4732,8 +4654,7 @@ segments: start: 0x391D30 vram: 0xE0092000 subsegments: - - [0x391D30, c, small_gold_sparkle] - - [0x3923C0] + - [auto, c, small_gold_sparkle] - name: effect_gfx_small_gold_sparkle dir: effects/gfx type: code @@ -4741,7 +4662,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x392440, c, small_gold_sparkle] + - [auto, c, small_gold_sparkle] - start: 0x392440 type: .data name: small_gold_sparkle @@ -4765,8 +4686,7 @@ segments: start: 0x3928D0 vram: 0xE0094000 subsegments: - - [0x3928D0, c, flashing_box_shockwave] - - [0x393080] + - [auto, c, flashing_box_shockwave] - name: effect_gfx_flashing_box_shockwave dir: effects/gfx type: code @@ -4774,7 +4694,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3930A0, c, flashing_box_shockwave] + - [auto, c, flashing_box_shockwave] - start: 0x3930A0 type: .data name: flashing_box_shockwave @@ -4799,8 +4719,7 @@ segments: start: 0x394280 vram: 0xE0096000 subsegments: - - [0x394280, c, balloon] - - [0x394660] + - [auto, c, balloon] - name: effect_gfx_balloon dir: effects/gfx type: code @@ -4808,7 +4727,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x394670, c, balloon] + - [auto, c, balloon] - start: 0x394670 type: .data name: balloon @@ -4836,8 +4755,7 @@ segments: start: 0x395BB0 vram: 0xE0098000 subsegments: - - [0x395BB0, c, floating_rock] - - [0x3960C0] + - [auto, c, floating_rock] - name: effect_gfx_floating_rock dir: effects/gfx type: code @@ -4845,7 +4763,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3960F0, c, floating_rock] + - [auto, c, floating_rock] - start: 0x3960F0 type: .data name: floating_rock @@ -4864,8 +4782,7 @@ segments: start: 0x3965B0 vram: 0xE009A000 subsegments: - - [0x3965B0, c, chomp_drop] - - [0x397010] + - [auto, c, chomp_drop] - name: effect_gfx_chomp_drop dir: effects/gfx type: code @@ -4873,7 +4790,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x397040, c, chomp_drop] + - [auto, c, chomp_drop] - start: 0x397040 type: .data name: chomp_drop @@ -4890,7 +4807,7 @@ segments: start: 0x3981F0 vram: 0xE009C000 subsegments: - - [0x3981F0, c, quizmo_stage] + - [auto, c, quizmo_stage] - name: effect_gfx_quizmo_stage dir: effects/gfx type: code @@ -4898,7 +4815,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x398BC0, c, quizmo_stage] + - [auto, c, quizmo_stage] - start: 0x398BC0 type: .data name: quizmo_stage @@ -4986,8 +4903,7 @@ segments: start: 0x39FF20 vram: 0xE009E000 subsegments: - - [0x39FF20, c, radiating_energy_orb] - - [0x3A0D10] + - [auto, c, radiating_energy_orb] - name: effect_gfx_radiating_energy_orb dir: effects/gfx type: code @@ -4995,7 +4911,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3A0D60, c, radiating_energy_orb] + - [auto, c, radiating_energy_orb] - start: 0x3A0D60 type: .data name: radiating_energy_orb @@ -5020,7 +4936,7 @@ segments: start: 0x3A2290 vram: 0xE00A0000 subsegments: - - [0x3A2290, c, quizmo_answer] + - [auto, c, quizmo_answer] - name: effect_gfx_quizmo_answer dir: effects/gfx type: code @@ -5028,7 +4944,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3A2440, c, quizmo_answer] + - [auto, c, quizmo_answer] - start: 0x3A2440 type: .data name: quizmo_answer @@ -5043,8 +4959,7 @@ segments: start: 0x3A2990 vram: 0xE00A2000 subsegments: - - [0x3A2990, c, motion_blur_flame] - - [0x3A3360] + - [auto, c, motion_blur_flame] - name: effect_gfx_motion_blur_flame dir: effects/gfx type: code @@ -5052,7 +4967,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3A33D0, c, motion_blur_flame] + - [auto, c, motion_blur_flame] - start: 0x3A33D0 type: .data name: motion_blur_flame @@ -5069,8 +4984,7 @@ segments: start: 0x3A37E0 vram: 0xE00A4000 subsegments: - - [0x3A37E0, c, energy_orb_wave] - - [0x3A42B0] + - [auto, c, energy_orb_wave] - name: effect_gfx_energy_orb_wave dir: effects/gfx type: code @@ -5078,7 +4992,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3A4320, c, energy_orb_wave] + - [auto, c, energy_orb_wave] - start: 0x3A4320 type: .data name: energy_orb_wave @@ -5098,7 +5012,7 @@ segments: start: 0x3A5550 vram: 0xE00A6000 subsegments: - - [0x3A5550, c, merlin_house_stars] + - [auto, c, merlin_house_stars] - name: effect_gfx_merlin_house_stars dir: effects/gfx type: code @@ -5106,7 +5020,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3A5BE0, c, merlin_house_stars] + - [auto, c, merlin_house_stars] - start: 0x3A5BE0 type: .data name: merlin_house_stars @@ -5128,8 +5042,7 @@ segments: start: 0x3A70F0 vram: 0xE00A8000 subsegments: - - [0x3A70F0, c, quizmo_audience] - - [0x3A7710] + - [auto, c, quizmo_audience] - name: effect_gfx_quizmo_audience dir: effects/gfx type: code @@ -5137,7 +5050,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3A77A0, c, quizmo_audience] + - [auto, c, quizmo_audience] - start: 0x3A77A0 type: .data name: quizmo_audience @@ -5189,8 +5102,7 @@ segments: start: 0x3AA920 vram: 0xE00AA000 subsegments: - - [0x3AA920, c, butterflies] - - [0x3AAFE0] + - [auto, c, butterflies] - name: effect_gfx_butterflies dir: effects/gfx type: code @@ -5198,7 +5110,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3AB030, c, butterflies] + - [auto, c, butterflies] - start: 0x3AB030 type: .data name: butterflies @@ -5246,8 +5158,7 @@ segments: start: 0x3AEE20 vram: 0xE00AC000 subsegments: - - [0x3AEE20, c, stat_change] - - [0x3AF5D0] + - [auto, c, stat_change] - name: effect_gfx_stat_change dir: effects/gfx type: code @@ -5255,7 +5166,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3AF700, c, stat_change] + - [auto, c, stat_change] - start: 0x3AF700 type: .data name: stat_change @@ -5304,7 +5215,7 @@ segments: start: 0x3B2350 vram: 0xE00AE000 subsegments: - - [0x3B2350, c, snaking_static] + - [auto, c, snaking_static] - name: effect_gfx_snaking_static dir: effects/gfx type: code @@ -5312,7 +5223,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3B2D90, c, snaking_static] + - [auto, c, snaking_static] - start: 0x3B2D90 type: .data name: snaking_static @@ -5328,8 +5239,7 @@ segments: start: 0x3B3EB0 vram: 0xE00B0000 subsegments: - - [0x3B3EB0, c, thunderbolt_ring] - - [0x3B4690] + - [auto, c, thunderbolt_ring] - name: effect_gfx_thunderbolt_ring dir: effects/gfx type: code @@ -5337,7 +5247,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3B46A0, c, thunderbolt_ring] + - [auto, c, thunderbolt_ring] - start: 0x3B46A0 type: .data name: thunderbolt_ring @@ -5351,8 +5261,7 @@ segments: start: 0x3B4790 vram: 0xE00B2000 subsegments: - - [0x3B4790, c, squirt] - - [0x3B5330] + - [auto, c, squirt] - name: effect_gfx_squirt dir: effects/gfx type: code @@ -5360,7 +5269,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3B5340, c, squirt] + - [auto, c, squirt] - start: 0x3B5340 type: .data name: squirt @@ -5377,8 +5286,7 @@ segments: start: 0x3B5CF0 vram: 0xE00B4000 subsegments: - - [0x3B5CF0, c, water_block] - - [0x3B69E0] + - [auto, c, water_block] - name: effect_gfx_water_block dir: effects/gfx type: code @@ -5386,29 +5294,28 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3B6BF0, c, water_block] + - [auto, c, water_block] - start: 0x3B6BF0 type: .data name: water_block subsegments: - - [0x3B6BF0, i4, D_09000000_3B6BF0, 16, 32] - - [0x3B6CF0, ia4, D_09000100_3B6CF0, 32, 32] - - [0x3B6EF0, gfx, D_09000300_3B6EF0] - - [0x3B6FA0, gfx, D_090003B0_3B6FA0] - - [0x3B7050, vtx, D_09000460_3B7050] - - [0x3B7090, gfx, D_090004A0_3B7090] - - [0x3B70B0] # unmapped - - [0x3B70C8, gfx, D_090004D8_3B70C8] - - [0x3B7128, gfx, D_09000538_3B7128] - - [0x3B7158] # padding + - [0x3B6BF0, i4, D_09000000_3B6BF0, 16, 32] + - [0x3B6CF0, ia4, D_09000100_3B6CF0, 32, 32] + - [0x3B6EF0, gfx, D_09000300_3B6EF0] + - [0x3B6FA0, gfx, D_090003B0_3B6FA0] + - [0x3B7050, vtx, D_09000460_3B7050] + - [0x3B7090, gfx, D_090004A0_3B7090] + - [0x3B70B0] # unmapped + - [0x3B70C8, gfx, D_090004D8_3B70C8] + - [0x3B7128, gfx, D_09000538_3B7128] + - [0x3B7158] # padding - name: effect_waterfall dir: effects type: code start: 0x3B7160 vram: 0xE00B6000 subsegments: - - [0x3B7160, c, waterfall] - - [0x3B78B0] + - [auto, c, waterfall] - name: effect_gfx_waterfall dir: effects/gfx type: code @@ -5416,7 +5323,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3B78D0, c, waterfall] + - [auto, c, waterfall] - start: 0x3B78D0 type: .data name: waterfall @@ -5430,8 +5337,7 @@ segments: start: 0x3B7B80 vram: 0xE00B8000 subsegments: - - [0x3B7B80, c, water_fountain] - - [0x3B8470] + - [auto, c, water_fountain] - name: effect_gfx_water_fountain dir: effects/gfx type: code @@ -5439,7 +5345,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3B8860, c, water_fountain] + - [auto, c, water_fountain] - start: 0x3B8860 type: .data name: water_fountain @@ -5457,8 +5363,7 @@ segments: start: 0x3B8BD0 vram: 0xE00BA000 subsegments: - - [0x3B8BD0, c, underwater] - - [0x3B9A50] + - [auto, c, underwater] - name: effect_gfx_underwater dir: effects/gfx type: code @@ -5466,7 +5371,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3B9A70, c, underwater] + - [auto, c, underwater] - start: 0x3B9A70 type: .data name: underwater @@ -5491,8 +5396,7 @@ segments: start: 0x3BA030 vram: 0xE00BC000 subsegments: - - [0x3BA030, c, lightning_bolt] - - [0x3BAC60] + - [auto, c, lightning_bolt] - name: effect_gfx_lightning_bolt dir: effects/gfx type: code @@ -5500,7 +5404,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3BAEA0, c, lightning_bolt] + - [auto, c, lightning_bolt] - start: 0x3BAEA0 type: .data name: lightning_bolt @@ -5514,9 +5418,7 @@ segments: start: 0x3BBF60 vram: 0xE00BE000 subsegments: - - [0x3BBF60, c, water_splash] - - [0x3BCA50, .data, water_splash] - - [0x3BCA60, .rodata, water_splash] + - [auto, c, water_splash] - name: effect_gfx_water_splash dir: effects/gfx type: code @@ -5524,7 +5426,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3BCA90, c, water_splash] + - [auto, c, water_splash] - start: 0x3BCA90 type: .data name: water_splash @@ -5544,8 +5446,7 @@ segments: start: 0x3BCD60 vram: 0xE00C0000 subsegments: - - [0x3BCD60, c, snowman_doll] - - [0x3BD770] + - [auto, c, snowman_doll] - name: effect_gfx_snowman_doll dir: effects/gfx type: code @@ -5553,7 +5454,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3BD9A0, c, snowman_doll] + - [auto, c, snowman_doll] - start: 0x3BD9A0 type: .data name: snowman_doll @@ -5671,8 +5572,7 @@ segments: start: 0x3C11D0 vram: 0xE00C2000 subsegments: - - [0x3C11D0, c, fright_jar] - - [0x3C1B60] + - [auto, c, fright_jar] - name: effect_gfx_fright_jar dir: effects/gfx type: code @@ -5680,7 +5580,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3C1BA0, c, fright_jar] + - [auto, c, fright_jar] - start: 0x3C1BA0 type: .data name: fright_jar @@ -5702,8 +5602,7 @@ segments: start: 0x3CADF0 vram: 0xE00C4000 subsegments: - - [0x3CADF0, c, stop_watch] - - [0x3CB7C0] + - [auto, c, stop_watch] - name: effect_gfx_stop_watch dir: effects/gfx type: code @@ -5711,7 +5610,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3CB890, c, stop_watch] + - [auto, c, stop_watch] - start: 0x3CB890 type: .data name: stop_watch @@ -5728,8 +5627,7 @@ segments: start: 0x3CC9E0 vram: 0xE00C6000 subsegments: - - [0x3CC9E0, c, effect_63] - - [0x3CD670] + - [auto, c, effect_63] - name: effect_gfx_effect_63 dir: effects/gfx type: code @@ -5737,7 +5635,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3CD6E0, c, effect_63] + - [auto, c, effect_63] - start: 0x3CD6E0 type: .data name: effect_63 @@ -5768,8 +5666,7 @@ segments: start: 0x3CF3A0 vram: 0xE00C8000 subsegments: - - [0x3CF3A0, c, throw_spiny] - - [0x3CFAB0] + - [auto, c, throw_spiny] - name: effect_gfx_throw_spiny dir: effects/gfx type: code @@ -5777,7 +5674,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3CFAF0, c, throw_spiny] + - [auto, c, throw_spiny] - start: 0x3CFAF0 type: .data name: throw_spiny @@ -5798,8 +5695,7 @@ segments: start: 0x3D0500 vram: 0xE00CA000 subsegments: - - [0x3D0500, c, effect_65] - - [0x3D11B0] + - [auto, c, effect_65] - name: effect_gfx_effect_65 dir: effects/gfx type: code @@ -5807,7 +5703,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3D11E0, c, effect_65] + - [auto, c, effect_65] - start: 0x3D11E0 type: .data name: effect_65 @@ -5821,8 +5717,7 @@ segments: start: 0x3D1690 vram: 0xE00CC000 subsegments: - - [0x3D1690, c, tubba_heart_attack] - - [0x3D2460] + - [auto, c, tubba_heart_attack] - name: effect_gfx_tubba_heart_attack dir: effects/gfx type: code @@ -5830,7 +5725,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3D2580, c, tubba_heart_attack] + - [auto, c, tubba_heart_attack] - start: 0x3D2580 type: .data name: tubba_heart_attack @@ -5848,9 +5743,7 @@ segments: start: 0x3D2AC0 vram: 0xE00CE000 subsegments: - - [0x3D2AC0, c, whirlwind] - - [0x3D3910, .rodata, whirlwind] - - [0x3D3930] + - [auto, c, whirlwind] - name: effect_gfx_whirlwind dir: effects/gfx type: code @@ -5858,30 +5751,28 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3D3930, c, whirlwind] - - start: 0x3D3930 - type: .data - name: whirlwind - subsegments: - - [0x3D3930, i4, D_09000000_3D3930, 64, 32] - - [0x3D3D30, gfx, D_09000400_3D3D30] - - [0x3D3E20] + - [auto, c, whirlwind] + - start: 0x3D3930 + type: .data + name: whirlwind + subsegments: + - [0x3D3930, i4, D_09000000_3D3930, 64, 32] + - [0x3D3D30, gfx, D_09000400_3D3D30] + - [0x3D3E20] - name: effect_red_impact dir: effects type: code start: 0x3D3E20 vram: 0xE00D0000 subsegments: - - [0x3D3E20, c, red_impact] - - [0x3D4930] + - [auto, c, red_impact] - name: effect_floating_cloud_puff dir: effects type: code start: 0x3D4970 vram: 0xE00D2000 subsegments: - - [0x3D4970, c, floating_cloud_puff] - - [0x3D4E70] + - [auto, c, floating_cloud_puff] - name: effect_gfx_floating_cloud_puff dir: effects/gfx type: code @@ -5889,7 +5780,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3D4E90, c, floating_cloud_puff] + - [auto, c, floating_cloud_puff] - start: 0x3D4E90 type: .data name: floating_cloud_puff @@ -5905,8 +5796,7 @@ segments: start: 0x3D5020 vram: 0xE00D6000 subsegments: - - [0x3D5020, c, energy_in_out] - - [0x3D5E60] + - [auto, c, energy_in_out] - name: effect_gfx_energy_in_out dir: effects/gfx type: code @@ -5914,7 +5804,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3D5F30, c, energy_in_out] + - [auto, c, energy_in_out] - start: 0x3D5F30 type: .data name: energy_in_out @@ -5960,8 +5850,7 @@ segments: start: 0x3D67C0 vram: 0xE00D8000 subsegments: - - [0x3D67C0, c, tattle_window] - - [0x3D6FA0] + - [auto, c, tattle_window] - name: effect_gfx_tattle_window dir: effects/gfx type: code @@ -5969,7 +5858,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3D7040, c, tattle_window] + - [auto, c, tattle_window] - start: 0x3D7040 type: .data name: tattle_window @@ -5981,8 +5870,7 @@ segments: start: 0x3D7240 vram: 0xE00DA000 subsegments: - - [0x3D7240, c, shiny_flare] - - [0x3D7740] + - [auto, c, shiny_flare] - name: effect_gfx_shiny_flare dir: effects/gfx type: code @@ -5990,7 +5878,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3D7770, c, shiny_flare] + - [auto, c, shiny_flare] - start: 0x3D7770 type: .data name: shiny_flare @@ -6005,8 +5893,7 @@ segments: start: 0x3D7A70 vram: 0xE00DC000 subsegments: - - [0x3D7A70, c, huff_puff_breath] - - [0x3D80B0] + - [auto, c, huff_puff_breath] - name: effect_gfx_huff_puff_breath dir: effects/gfx type: code @@ -6014,7 +5901,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3D80C0, c, huff_puff_breath] + - [auto, c, huff_puff_breath] - start: 0x3D80C0 type: .data name: huff_puff_breath @@ -6034,8 +5921,7 @@ segments: start: 0x3D8720 vram: 0xE00DE000 subsegments: - - [0x3D8720, c, cold_breath] - - [0x3D8F30] + - [auto, c, cold_breath] - name: effect_gfx_cold_breath dir: effects/gfx type: code @@ -6043,7 +5929,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3D9100, c, cold_breath] + - [auto, c, cold_breath] - start: 0x3D9100 type: .data name: cold_breath @@ -6068,8 +5954,7 @@ segments: start: 0x3DB460 vram: 0xE00E0000 subsegments: - - [0x3DB460, c, embers] - - [0x3DBEA0] + - [auto, c, embers] - name: effect_gfx_embers dir: effects/gfx type: code @@ -6077,7 +5962,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3DBF40, c, embers] + - [auto, c, embers] - start: 0x3DBF40 type: .data name: embers @@ -6093,8 +5978,7 @@ segments: start: 0x3DC310 vram: 0xE00E2000 subsegments: - - [0x3DC310, c, hieroglyphs] - - [0x3DCD00] + - [auto, c, hieroglyphs] - name: effect_gfx_hieroglyphs dir: effects/gfx type: code @@ -6102,7 +5986,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3DCD50, c, hieroglyphs] + - [auto, c, hieroglyphs] - start: 0x3DCD50 type: .data name: hieroglyphs @@ -6117,8 +6001,7 @@ segments: start: 0x3DE000 vram: 0xE00E4000 subsegments: - - [0x3DE000, c, misc_particles] - - [0x3DED90] + - [auto, c, misc_particles] - name: effect_gfx_misc_particles dir: effects/gfx type: code @@ -6126,7 +6009,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3DEE60, c, misc_particles] + - [auto, c, misc_particles] - start: 0x3DEE60 type: .data name: misc_particles @@ -6155,8 +6038,7 @@ segments: start: 0x3E0930 vram: 0xE00E6000 subsegments: - - [0x3E0930, c, static_status] - - [0x3E11B0] + - [auto, c, static_status] - name: effect_gfx_static_status dir: effects/gfx type: code @@ -6164,7 +6046,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3E12D0, c, static_status] + - [auto, c, static_status] - start: 0x3E12D0 type: .data name: static_status @@ -6181,8 +6063,7 @@ segments: start: 0x3E1690 vram: 0xE00E8000 subsegments: - - [0x3E1690, c, moving_cloud] - - [0x3E1CC0] + - [auto, c, moving_cloud] - name: effect_gfx_moving_cloud dir: effects/gfx type: code @@ -6190,7 +6071,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3E1CD0, c, moving_cloud] + - [auto, c, moving_cloud] - start: 0x3E1CD0 type: .data name: moving_cloud @@ -6206,8 +6087,7 @@ segments: start: 0x3E1EE0 vram: 0xE00EA000 subsegments: - - [0x3E1EE0, c, effect_75] - - [0x3E2930] + - [auto, c, effect_75] - name: effect_gfx_effect_75 dir: effects/gfx type: code @@ -6215,7 +6095,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3E2960, c, effect_75] + - [auto, c, effect_75] - start: 0x3E2960 type: .data name: effect_75 @@ -6242,8 +6122,7 @@ segments: start: 0x3E43A0 vram: 0xE010A000 subsegments: - - [0x3E43A0, c, firework_rocket] - - [0x3E5060] + - [auto, c, firework_rocket] - name: effect_gfx_firework_rocket dir: effects/gfx type: code @@ -6251,7 +6130,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3E5350, c, firework_rocket] + - [auto, c, firework_rocket] - start: 0x3E5350 type: .data name: firework_rocket @@ -6266,8 +6145,7 @@ segments: start: 0x3E54C0 vram: 0xE010C000 subsegments: - - [0x3E54C0, c, peach_star_beam] - - [0x3E5ED0] + - [auto, c, peach_star_beam] - name: effect_gfx_peach_star_beam dir: effects/gfx type: code @@ -6275,7 +6153,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3E5F30, c, peach_star_beam] + - [auto, c, peach_star_beam] - start: 0x3E5F30 type: .data name: peach_star_beam @@ -6341,8 +6219,7 @@ segments: start: 0x3EB4E0 vram: 0xE010E000 subsegments: - - [0x3EB4E0, c, chapter_change] - - [0x3EBC30] + - [auto, c, chapter_change] - name: effect_gfx_chapter_change dir: effects/gfx type: code @@ -6350,7 +6227,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3EBE60, c, chapter_change] + - [auto, c, chapter_change] - start: 0x3EBE60 type: .data name: chapter_change @@ -6396,8 +6273,7 @@ segments: start: 0x3F83F0 vram: 0xE0110000 subsegments: - - [0x3F83F0, c, ice_shard] - - [0x3F8CA0] + - [auto, c, ice_shard] - name: effect_gfx_ice_shard dir: effects/gfx type: code @@ -6405,7 +6281,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3F8CC0, c, ice_shard] + - [auto, c, ice_shard] - start: 0x3F8CC0 type: .data name: ice_shard @@ -6422,8 +6298,7 @@ segments: start: 0x3F9E50 vram: 0xE0112000 subsegments: - - [0x3F9E50, c, spirit_card] - - [0x3FA480] + - [auto, c, spirit_card] - name: effect_gfx_spirit_card # effect spirit_card, something_rotating gfx dir: effects/gfx type: code @@ -6431,7 +6306,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3FA4B0, c, spirit_card] + - [auto, c, spirit_card] - start: 0x3FA4B0 type: .data name: spirit_card @@ -6493,8 +6368,7 @@ segments: start: 0x3FEAE0 vram: 0xE0114000 subsegments: - - [0x3FEAE0, c, lil_oink] - - [0x3FF180] + - [auto, c, lil_oink] - name: effect_gfx_lil_oink dir: effects/gfx type: code @@ -6502,7 +6376,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x3FF250, c, lil_oink] + - [auto, c, lil_oink] - start: 0x3FF250 type: .data name: lil_oink @@ -6618,16 +6492,14 @@ segments: start: 0x402640 vram: 0xE0116000 subsegments: - - [0x402640, c, something_rotating] - - [0x4032A0] + - [auto, c, something_rotating] - name: effect_breaking_junk dir: effects type: code start: 0x403400 vram: 0xE0118000 subsegments: - - [0x403400, c, breaking_junk] - - [0x403BB0] + - [auto, c, breaking_junk] - name: effect_gfx_breaking_junk dir: effects/gfx type: code @@ -6635,7 +6507,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x403BF0, c, breaking_junk] + - [auto, c, breaking_junk] - start: 0x403BF0 type: .data name: breaking_junk @@ -6660,8 +6532,7 @@ segments: start: 0x404220 vram: 0xE011A000 subsegments: - - [0x404220, c, partner_buff] - - [0x404E40] + - [auto, c, partner_buff] - name: effect_gfx_partner_buff dir: effects/gfx type: code @@ -6669,7 +6540,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x404F40, c, partner_buff] + - [auto, c, partner_buff] - start: 0x404F40 type: .data name: partner_buff @@ -6703,8 +6574,7 @@ segments: start: 0x406B40 vram: 0xE011C000 subsegments: - - [0x406B40, c, quizmo_assistant] - - [0x407040] + - [auto, c, quizmo_assistant] - name: effect_gfx_quizmo_assistant dir: effects/gfx type: code @@ -6712,7 +6582,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x407080, c, quizmo_assistant] + - [auto, c, quizmo_assistant] - start: 0x407080 type: .data name: quizmo_assistant @@ -6745,8 +6615,7 @@ segments: start: 0x409990 vram: 0xE011E000 subsegments: - - [0x409990, c, ice_pillar] - - [0x40A180] + - [auto, c, ice_pillar] - name: effect_gfx_ice_pillar dir: effects/gfx type: code @@ -6754,7 +6623,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x40A1C0, c, ice_pillar] + - [auto, c, ice_pillar] - start: 0x40A1C0 type: .data name: ice_pillar @@ -6780,8 +6649,7 @@ segments: start: 0x40B3F0 vram: 0xE0120000 subsegments: - - [0x40B3F0, c, sun] - - [0x40BB70] + - [auto, c, sun] - name: effect_gfx_sun dir: effects/gfx type: code @@ -6789,7 +6657,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x40BBA0, c, sun] + - [auto, c, sun] - start: 0x40BBA0 type: .data name: sun @@ -6822,8 +6690,7 @@ segments: start: 0x40C5A0 vram: 0xE0122000 subsegments: - - [0x40C5A0, c, star_spirits_energy] - - [0x40D130] + - [auto, c, star_spirits_energy] - name: effect_gfx_star_spirits_energy dir: effects/gfx type: code @@ -6831,7 +6698,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x40D290, c, star_spirits_energy] + - [auto, c, star_spirits_energy] - start: 0x40D290 type: .data name: star_spirits_energy @@ -6868,16 +6735,14 @@ segments: start: 0x412730 vram: 0xE0124000 subsegments: - - [0x412730, c, pink_sparkles] - - [0x412FD0] + - [auto, c, pink_sparkles] - name: effect_star_outline dir: effects type: code start: 0x413360 vram: 0xE0126000 subsegments: - - [0x413360, c, star_outline] - - [0x413F20] + - [auto, c, star_outline] - name: effect_gfx_star_outline dir: effects/gfx type: code @@ -6885,7 +6750,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x413FA0, c, star_outline] + - [auto, c, star_outline] - start: 0x413FA0 type: .data name: star_outline @@ -6902,8 +6767,7 @@ segments: start: 0x414BA0 vram: 0xE0128000 subsegments: - - [0x414BA0, c, effect_86] - - [0x415020] + - [auto, c, effect_86] - name: effect_gfx_effect_86 dir: effects/gfx type: code @@ -6911,7 +6775,7 @@ segments: vram: 0x09000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0x415060, c, effect_86] + - [auto, c, effect_86] - start: 0x415060 type: .data name: effect_86 @@ -6953,8 +6817,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x415D90, c, 415D90] - - [0x4200D0] + - [auto, c, 415D90] - type: code start: 0x4219F0 vram: 0x802A9000 @@ -6962,8 +6825,7 @@ segments: dir: battle/action_cmd name: action_cmd_jump subsegments: - - [0x4219F0, c, jump] - - [0x421FC0] + - [auto, c, jump] - type: code start: 0x422000 vram: 0x802A9000 @@ -6971,8 +6833,7 @@ segments: dir: battle/action_cmd name: action_cmd_hammer subsegments: - - [0x422000, c, hammer] - - [0x422A90] + - [auto, c, hammer] - type: code start: 0x422AD0 vram: 0x802A9000 @@ -6980,8 +6841,7 @@ segments: dir: battle/action_cmd name: action_cmd_flee subsegments: - - [0x422AD0, c, flee] - - [0x4233B0] + - [auto, c, flee] - type: code start: 0x4233F0 vram: 0x802A9000 @@ -6989,8 +6849,7 @@ segments: dir: battle/action_cmd name: action_cmd_break_free subsegments: - - [0x4233F0, c, break_free] - - [0x423C30] + - [auto, c, break_free] - type: code start: 0x423C70 vram: 0x802A9000 @@ -6998,7 +6857,7 @@ segments: dir: battle/action_cmd name: action_cmd_whirlwind subsegments: - - [0x423C70, c, whirlwind] + - [auto, c, whirlwind] - start: 0x424550 type: .data name: whirlwind @@ -7028,8 +6887,7 @@ segments: dir: battle/action_cmd name: action_cmd_stop_leech subsegments: - - [0x425590, c, stop_leech] - - [0x425B10] + - [auto, c, stop_leech] - type: code start: 0x425B50 vram: 0x802A9000 @@ -7037,8 +6895,7 @@ segments: dir: battle/action_cmd name: action_cmd_07 subsegments: - - [0x425B50, c, "07"] - - [0x426130] + - [auto, c, "07"] - type: code start: 0x426170 vram: 0x802A9000 @@ -7046,8 +6903,7 @@ segments: dir: battle/action_cmd name: action_cmd_dizzy_shell subsegments: - - [0x426170, c, dizzy_shell] - - [0x426970] + - [auto, c, dizzy_shell] - type: code start: 0x4269D0 vram: 0x802A9000 @@ -7055,8 +6911,7 @@ segments: dir: battle/action_cmd name: action_cmd_fire_shell subsegments: - - [0x4269D0, c, fire_shell] - - [0x427320] + - [auto, c, fire_shell] - type: code start: 0x4273B0 vram: 0x802A9000 @@ -7064,8 +6919,7 @@ segments: dir: battle/action_cmd name: action_cmd_0A subsegments: - - [0x4273B0, c, 0A] - - [0x427A30] + - [auto, c, 0A] - type: code start: 0x427A70 vram: 0x802A9000 @@ -7073,8 +6927,7 @@ segments: dir: battle/action_cmd name: action_cmd_bomb subsegments: - - [0x427A70, c, bomb] - - [0x428280] + - [auto, c, bomb] - type: code start: 0x4282E0 vram: 0x802A9000 @@ -7082,8 +6935,7 @@ segments: dir: battle/action_cmd name: action_cmd_body_slam subsegments: - - [0x4282E0, c, body_slam] - - [0x428A30] + - [auto, c, body_slam] - type: code start: 0x428A70 vram: 0x802A9000 @@ -7091,8 +6943,7 @@ segments: dir: battle/action_cmd name: action_cmd_air_lift subsegments: - - [0x428A70, c, air_lift] - - [0x4292C0] + - [auto, c, air_lift] - type: code start: 0x429320 vram: 0x802A9000 @@ -7100,8 +6951,7 @@ segments: dir: battle/action_cmd name: action_cmd_air_raid subsegments: - - [0x429320, c, air_raid] - - [0x429C90] + - [auto, c, air_raid] - type: code start: 0x429D20 vram: 0x802A9000 @@ -7109,8 +6959,7 @@ segments: dir: battle/action_cmd name: action_cmd_squirt subsegments: - - [0x429D20, c, squirt] - - [0x42A480] + - [auto, c, squirt] - type: code start: 0x42A4F0 vram: 0x802A9000 @@ -7118,7 +6967,7 @@ segments: dir: battle/action_cmd name: action_cmd_water_block subsegments: - - [0x42A4F0, c, water_block] + - [auto, c, water_block] - start: 0x42B650 type: .data name: water_block @@ -7148,8 +6997,7 @@ segments: dir: battle/action_cmd name: action_cmd_tidal_wave subsegments: - - [0x42C6F0, c, tidal_wave] - - [0x42CEB0] + - [auto, c, tidal_wave] - type: code start: 0x42CF10 vram: 0x802A9000 @@ -7157,8 +7005,7 @@ segments: dir: battle/action_cmd name: action_cmd_power_shock subsegments: - - [0x42CF10, c, power_shock] - - [0x42D9B0] + - [auto, c, power_shock] - type: code start: 0x42DA10 vram: 0x802A9000 @@ -7166,8 +7013,7 @@ segments: dir: battle/action_cmd name: action_cmd_mega_shock subsegments: - - [0x42DA10, c, mega_shock] - - [0x42E342] # todo offset ? + - [auto, c, mega_shock] - type: code start: 0x42E3A0 vram: 0x802A9000 @@ -7175,8 +7021,7 @@ segments: dir: battle/action_cmd name: action_cmd_smack subsegments: - - [0x42E3A0, c, smack] - - [0x42ED70] + - [auto, c, smack] - type: code start: 0x42EE20 vram: 0x802A9000 @@ -7184,8 +7029,7 @@ segments: dir: battle/action_cmd name: action_cmd_spiny_surge subsegments: - - [0x42EE20, c, spiny_surge] - - [0x42F680] + - [auto, c, spiny_surge] - type: code start: 0x42F6E0 vram: 0x802A9000 @@ -7193,8 +7037,7 @@ segments: dir: battle/action_cmd name: action_cmd_hurricane subsegments: - - [0x42F6E0, c, hurricane] - - [0x42FFC0] + - [auto, c, hurricane] - type: code start: 0x430020 vram: 0x802A9000 @@ -7202,8 +7045,7 @@ segments: dir: battle/action_cmd name: action_cmd_spook subsegments: - - [0x430020, c, spook] - - [0x430940] + - [auto, c, spook] #################### ### Battle Areas ### @@ -7215,16 +7057,15 @@ segments: follows_vram: heaps subalign: 4 subsegments: - - [0x4309A0, c, area] - - [0x4309A0, c, actor/goomba] - - [0x430C20, c, actor/spiked_goomba] - - [0x430EA0, c, actor/paragoomba] - - [0x431180, c, stage/kmr_02] - - [0x431180, c, stage/kmr_03] - - [0x4313F0, c, stage/kmr_04] - - [0x431660, c, stage/kmr_05] - - [0x4318D0, c, stage/kmr_06] - - [0x431B80] + - [auto, c, area] + - [auto, c, actor/goomba] + - [auto, c, actor/spiked_goomba] + - [auto, c, actor/paragoomba] + - [auto, c, stage/kmr_02] + - [auto, c, stage/kmr_03] + - [auto, c, stage/kmr_04] + - [auto, c, stage/kmr_05] + - [auto, c, stage/kmr_06] - dir: battle/area/kmr_part_2 type: code start: 0x439A90 @@ -7232,19 +7073,18 @@ segments: follows_vram: heaps subalign: 4 subsegments: - - [0x439A90, c, area] - - [0x439A90, c, actor/blue_goomba_1] - - [0x439D10, c, actor/red_goomba_1] - - [0x439F90, c, actor/blue_goomba_2] - - [0x43A210, c, actor/red_goomba_2] - - [0x43A4C0, c, actor/goomba_king] - - [0x43A5A0, c, actor/goomnut_tree] - - [0x43A7E0, c, stage/kmr_02] - - [0x43A7E0, c, stage/kmr_03] - - [0x43AA50, c, stage/kmr_04] - - [0x43ACC0, c, stage/kmr_05] - - [0x43AF30, c, stage/kmr_06] - - [0x43B1E0] + - [auto, c, area] + - [auto, c, actor/blue_goomba_1] + - [auto, c, actor/red_goomba_1] + - [auto, c, actor/blue_goomba_2] + - [auto, c, actor/red_goomba_2] + - [auto, c, actor/goomba_king] + - [auto, c, actor/goomnut_tree] + - [auto, c, stage/kmr_02] + - [auto, c, stage/kmr_03] + - [auto, c, stage/kmr_04] + - [auto, c, stage/kmr_05] + - [auto, c, stage/kmr_06] - dir: battle/area/kmr_part_3 type: code start: 0x447440 @@ -7252,56 +7092,53 @@ segments: follows_vram: heaps subalign: 4 subsegments: - - [0x447440, c, area] - - [0x447440, c, actor/tutorial_spiked_goomba] - - [0x4476C0, c, actor/tutorial_paragoomba] - - [0x4479A0, c, actor/paragoomba] - - [0x447C80, c, actor/jr_troopa] - - [0x447C80, c, actor/egg_jr_troopa] - - [0x447C80, c, actor/para_jr_troopa] - - [0x447D50, c, actor/spiked_para_jr_troopa] - - [0x447F10, c, actor/mage_jr_troopa] - - [0x447F10, c, actor/final_jr_troopa] - - [0x448420, c, stage/kmr_02] - - [0x448420, c, stage/kmr_03] - - [0x448690, c, stage/kmr_04] - - [0x448900, c, stage/kmr_05b] - - [0x448B70, c, stage/kmr_06] - - [0x448E20, c, stage/nok_01] - - [0x448E20, c, stage/mim_01] - - [0x448E80, c, stage/sam_01] - - [0x4491A0, c, stage/mac_01] - - [0x4495F0, c, stage/kpa_13] - - [0x4495F0] + - [auto, c, area] + - [auto, c, actor/tutorial_spiked_goomba] + - [auto, c, actor/tutorial_paragoomba] + - [auto, c, actor/paragoomba] + - [auto, c, actor/jr_troopa] + - [auto, c, actor/egg_jr_troopa] + - [auto, c, actor/para_jr_troopa] + - [auto, c, actor/spiked_para_jr_troopa] + - [auto, c, actor/mage_jr_troopa] + - [auto, c, actor/final_jr_troopa] + - [auto, c, stage/kmr_02] + - [auto, c, stage/kmr_03] + - [auto, c, stage/kmr_04] + - [auto, c, stage/kmr_05b] + - [auto, c, stage/kmr_06] + - [auto, c, stage/nok_01] + - [auto, c, stage/mim_01] + - [auto, c, stage/sam_01] + - [auto, c, stage/mac_01] + - [auto, c, stage/kpa_13] - dir: battle/area/mac type: code start: 0x464490 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x464490, c, actor/chan] - - [0x464560, c, actor/lee] - - [0x465D90, c, actor/master1] - - [0x465D90, c, actor/master2] - - [0x465D90, c, actor/master3] - - [0x465D90, c, stage/mac_01] - - [0x4661E0, c, stage/mac_02] - - [0x4661E0, c, area] - - [0x4661E0] + - [auto, c, actor/chan] + - [auto, c, actor/lee] + - [auto, c, actor/master1] + - [auto, c, actor/master2] + - [auto, c, actor/master3] + - [auto, c, stage/mac_01] + - [auto, c, stage/mac_02] + - [auto, c, area] - dir: battle/area/hos type: code start: 0x47F0B0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x47F0B0, c, actor/goombario_tutor] - - [0x47F0D0, c, actor/ember] - - [0x47F200, c, actor/magikoopa] - - [0x47F570, c, stage/hos_01] - - [0x4800C0, c, stage/hos_00] - - [0x4800C0, c, stage/hos_02] - - [0x4800C0, c, area] - - [0x4800C0] + - [auto, c, actor/goombario_tutor] + - [auto, c, actor/ember] + - [auto, c, actor/magikoopa] + - [auto, c, stage/hos_01] + - [auto, c, stage/hos_00] + - [auto, c, stage/hos_02] + - [auto, c, area] - dir: battle/area/nok type: code start: 0x48D1A0 @@ -7309,46 +7146,44 @@ segments: follows_vram: heaps subalign: 4 subsegments: - - [0x48D1A0, c, area] - - [0x48D1A0, c, actor/goomba] - - [0x48D420, c, actor/paragoomba] - - [0x48D700, c, actor/spiked_goomba] - - [0x48D980, c, actor/koopa_troopa] - - [0x48DA50, c, actor/fuzzy] - - [0x48DBC0, c, actor/paratroopa] - - [0x48DCF0, c, actor/kent_c_koopa] - - [0x48DFC0, c, stage/nok_01] - - [0x48DFC0, c, stage/nok_02] - - [0x48DFC0, c, stage/nok_03] - - [0x48DFC0, c, stage/nok_04] - - [0x48DFC0] + - [auto, c, area] + - [auto, c, actor/goomba] + - [auto, c, actor/paragoomba] + - [auto, c, actor/spiked_goomba] + - [auto, c, actor/koopa_troopa] + - [auto, c, actor/fuzzy] + - [auto, c, actor/paratroopa] + - [auto, c, actor/kent_c_koopa] + - [auto, c, stage/nok_01] + - [auto, c, stage/nok_02] + - [auto, c, stage/nok_03] + - [auto, c, stage/nok_04] - dir: battle/area/trd_part_1 type: code start: 0x4A10A0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x4A10A0, c, area] - - [0x4A10A0, c, actor/bullet_bill] - - [0x4A10A0, c, actor/bill_blaster] - - [0x4A10A0, c, actor/bob_omb] - - [0x4A10C0, c, actor/koopa_troopa] - - [0x4A1190, c, actor/paratroopa] - - [0x4A12C0, c, stage/trd_01] - - [0x4A12C0, c, stage/trd_02] - - [0x4A12C0, c, stage/trd_02b] - - [0x4A12C0, c, stage/trd_03] - - [0x4A1530, c, stage/trd_04] - - [0x4A1530, c, stage/trd_05] - - [0x4A1530, c, stage/trd_00] - - [0x4A1530, c, stage/trd_02c] - - [0x4A1530, c, stage/trd_02d] - - [0x4A1530, c, stage/trd_05b] - - [0x4A1530, c, stage/trd_05c] - - [0x4A1530, c, stage/trd_05d] - - [0x4A1530, c, stage/trd_05e] - - [0x4A1530, c, stage/trd_05f] - - [0x4A1530] + - [auto, c, area] + - [auto, c, actor/bullet_bill] + - [auto, c, actor/bill_blaster] + - [auto, c, actor/bob_omb] + - [auto, c, actor/koopa_troopa] + - [auto, c, actor/paratroopa] + - [auto, c, stage/trd_01] + - [auto, c, stage/trd_02] + - [auto, c, stage/trd_02b] + - [auto, c, stage/trd_03] + - [auto, c, stage/trd_04] + - [auto, c, stage/trd_05] + - [auto, c, stage/trd_00] + - [auto, c, stage/trd_02c] + - [auto, c, stage/trd_02d] + - [auto, c, stage/trd_05b] + - [auto, c, stage/trd_05c] + - [auto, c, stage/trd_05d] + - [auto, c, stage/trd_05e] + - [auto, c, stage/trd_05f] - dir: battle/area/trd_part_2 type: code start: 0x4B11F0 @@ -7356,35 +7191,33 @@ segments: follows_vram: heaps subalign: 4 subsegments: - - [0x4B11F0, c, area] - - [0x4B11F0, c, actor/fake_bowser] - - [0x4B15D0, c, actor/koopa_bros_green] - - [0x4B1D90, c, actor/koopa_bros_red] - - [0x4B2550, c, actor/koopa_bros_black] - - [0x4B2D10, c, actor/koopa_bros_yellow] - - [0x4B34D0, c, stage/trd_00] - - [0x4B34D0, c, stage/trd_01] - - [0x4B34D0, c, stage/trd_02] - - [0x4B34D0, c, stage/trd_02b] - - [0x4B34D0, c, stage/trd_03] - - [0x4B3740, c, stage/trd_04] - - [0x4B3740, c, stage/trd_05] - - [0x4B3740, c, stage/trd_05b] - - [0x4B3740, c, stage/trd_05c] - - [0x4B3740, c, stage/trd_05d] - - [0x4B3740, c, stage/trd_05e] - - [0x4B3740, c, stage/trd_05f] - - [0x4B3740] + - [auto, c, area] + - [auto, c, actor/fake_bowser] + - [auto, c, actor/koopa_bros_green] + - [auto, c, actor/koopa_bros_red] + - [auto, c, actor/koopa_bros_black] + - [auto, c, actor/koopa_bros_yellow] + - [auto, c, stage/trd_00] + - [auto, c, stage/trd_01] + - [auto, c, stage/trd_02] + - [auto, c, stage/trd_02b] + - [auto, c, stage/trd_03] + - [auto, c, stage/trd_04] + - [auto, c, stage/trd_05] + - [auto, c, stage/trd_05b] + - [auto, c, stage/trd_05c] + - [auto, c, stage/trd_05d] + - [auto, c, stage/trd_05e] + - [auto, c, stage/trd_05f] - dir: battle/area/trd_part_3 type: code start: 0x4CF1B0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x4CF1B0, c, area] - - [0x4CF1B0, c, actor/eldstar] - - [0x4CF3D0, c, stage/nok_01] - - [0x4CF3D0] + - [auto, c, area] + - [auto, c, actor/eldstar] + - [auto, c, stage/nok_01] - dir: battle/area/iwa type: code start: 0x4D01F0 @@ -7392,15 +7225,14 @@ segments: follows_vram: heaps subalign: 4 subsegments: - - [0x4D01F0, c, area] - - [0x4D01F0, c, actor/cleft] - - [0x4D02B0, c, actor/monty_mole] - - [0x4D02B0, c, actor/buzzar] - - [0x4D0310, c, actor/whacka] - - [0x4D0360, c, stage/iwa_01] - - [0x4D03B0, c, stage/iwa_01b] - - [0x4D03B0, c, stage/iwa_02] - - [0x4D0400] + - [auto, c, area] + - [auto, c, actor/cleft] + - [auto, c, actor/monty_mole] + - [auto, c, actor/buzzar] + - [auto, c, actor/whacka] + - [auto, c, stage/iwa_01] + - [auto, c, stage/iwa_01b] + - [auto, c, stage/iwa_02] - dir: battle/area/sbk type: code start: 0x4DA5E0 @@ -7408,282 +7240,270 @@ segments: follows_vram: heaps subalign: 16 # BSS alignment hack subsegments: - - [0x4DA5E0, c, actor/pokey] - - [0x4DA6B0, c, actor/bandit] - - [0x4DA6B0, c, stage/sbk_02] - - [0x4DA860, c, area] - - [0x4DA860] + - [auto, c, actor/pokey] + - [auto, c, actor/bandit] + - [auto, c, stage/sbk_02] + - [auto, c, area] - dir: battle/area/isk_part_1 type: code start: 0x4E2740 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x4E2740, c, actor/pokey_mummy] - - [0x4E2810, c, actor/swooper] - - [0x4E28E0, c, actor/buzzy_beetle] - - [0x4E29B0, c, actor/stone_chomp] - - [0x4E2FF0, c, stage/isk_00] - - [0x4E2FF0, c, stage/isk_01] - - [0x4E2FF0, c, stage/isk_02] - - [0x4E2FF0, c, stage/isk_03] - - [0x4E2FF0, c, stage/isk_04] - - [0x4E30C0, c, stage/isk_05] - - [0x4E3190, c, stage/isk_06] - - [0x4E3200, c, stage/isk_07] - - [0x4E3200, c, stage/isk_07] - - [0x4E3270, c, stage/isk_03b] - - [0x4E3270, c, stage/isk_02b] - - [0x4E3270, c, stage/isk_02c] - - [0x4E3270, c, stage/isk_06b] - - [0x4E32E0, c, stage/isk_08] - - [0x4E3350, c, area] - - [0x4E3350] + - [auto, c, actor/pokey_mummy] + - [auto, c, actor/swooper] + - [auto, c, actor/buzzy_beetle] + - [auto, c, actor/stone_chomp] + - [auto, c, stage/isk_00] + - [auto, c, stage/isk_01] + - [auto, c, stage/isk_02] + - [auto, c, stage/isk_03] + - [auto, c, stage/isk_04] + - [auto, c, stage/isk_05] + - [auto, c, stage/isk_06] + - [auto, c, stage/isk_07] + - [auto, c, stage/isk_07] + - [auto, c, stage/isk_03b] + - [auto, c, stage/isk_02b] + - [auto, c, stage/isk_02c] + - [auto, c, stage/isk_06b] + - [auto, c, stage/isk_08] + - [auto, c, area] - dir: battle/area/isk_part_2 type: code start: 0x4EF4A0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x4EF4A0, c, actor/chain_chomp] - - [0x4EFB30, c, actor/tutankoopa] - - [0x4EFCF0, c, stage/isk_00] - - [0x4EFCF0, c, stage/isk_01] - - [0x4EFCF0, c, stage/isk_02] - - [0x4EFCF0, c, stage/isk_02b] - - [0x4EFCF0, c, stage/isk_02c] - - [0x4EFCF0, c, stage/isk_03] - - [0x4EFCF0, c, stage/isk_03b] - - [0x4EFCF0, c, stage/isk_04] - - [0x4EFDC0, c, stage/isk_05] - - [0x4EFE90, c, stage/isk_06] - - [0x4EFF00, c, stage/isk_06b] - - [0x4EFF70, c, stage/isk_07] - - [0x4EFFE0, c, area] - - [0x4EFFE0] + - [auto, c, actor/chain_chomp] + - [auto, c, actor/tutankoopa] + - [auto, c, stage/isk_00] + - [auto, c, stage/isk_01] + - [auto, c, stage/isk_02] + - [auto, c, stage/isk_02b] + - [auto, c, stage/isk_02c] + - [auto, c, stage/isk_03] + - [auto, c, stage/isk_03b] + - [auto, c, stage/isk_04] + - [auto, c, stage/isk_05] + - [auto, c, stage/isk_06] + - [auto, c, stage/isk_06b] + - [auto, c, stage/isk_07] + - [auto, c, area] - dir: battle/area/mim type: code start: 0x4F7BE0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x4F7BE0, c, actor/forest_fuzzy] - - [0x4F7D50, c, actor/bzzap] - - [0x4F7F40, c, actor/piranha_plant] - - [0x4F7F40, c, stage/mim_01] - - [0x4F7FA0, c, area] - - [0x4F7FA0] + - [auto, c, actor/forest_fuzzy] + - [auto, c, actor/bzzap] + - [auto, c, actor/piranha_plant] + - [auto, c, stage/mim_01] + - [auto, c, area] - dir: battle/area/arn type: code start: 0x4FEA50 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x4FEA50, c, actor/hyper_goomba] - - [0x4FED30, c, actor/hyper_paragoomba] - - [0x4FF010, c, actor/hyper_cleft] - - [0x4FF0D0, c, actor/tubbas_heart] - - [0x4FF1C0, c, actor/tubba_blubba] - - [0x4FF1C0, c, stage/arn_01] - - [0x4FF1C0, c, stage/arn_02] - - [0x4FF1C0, c, stage/arn_03] - - [0x4FF1C0, c, stage/arn_04] - - [0x4FF1C0, c, stage/arn_05] - - [0x4FF1C0, c, stage/arn_06] - - [0x4FF1C0, c, area] - - [0x4FF1C0] + - [auto, c, actor/hyper_goomba] + - [auto, c, actor/hyper_paragoomba] + - [auto, c, actor/hyper_cleft] + - [auto, c, actor/tubbas_heart] + - [auto, c, actor/tubba_blubba] + - [auto, c, stage/arn_01] + - [auto, c, stage/arn_02] + - [auto, c, stage/arn_03] + - [auto, c, stage/arn_04] + - [auto, c, stage/arn_05] + - [auto, c, stage/arn_06] + - [auto, c, area] - dir: battle/area/dgb type: code start: 0x50F020 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x50F020, c, actor/clubba] - - [0x50F020, c, actor/tubba_blubba] - - [0x50F020, c, stage/dgb_01] - - [0x50F020, c, stage/dgb_02] - - [0x50F020, c, stage/dgb_03] - - [0x50F020, c, stage/dgb_04] - - [0x50F020, c, stage/dgb_05] - - [0x50F020, c, area] - - [0x50F020] + - [auto, c, actor/clubba] + - [auto, c, actor/tubba_blubba] + - [auto, c, stage/dgb_01] + - [auto, c, stage/dgb_02] + - [auto, c, stage/dgb_03] + - [auto, c, stage/dgb_04] + - [auto, c, stage/dgb_05] + - [auto, c, area] - dir: battle/area/omo type: code start: 0x5125D0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x5125D0, c, actor/red_shy_guy] - - [0x5126A0, c, actor/blue_shy_guy] - - [0x512770, c, actor/yellow_shy_guy] - - [0x512840, c, actor/pink_shy_guy] - - [0x512910, c, actor/green_shy_guy] - - [0x5129E0, c, actor/anti_guy] - - [0x512AB0, c, actor/medi_guy] - - [0x512C90, c, actor/groove_guy] - - [0x512E50, c, actor/spy_guy] - - [0x513380, c, actor/sky_guy] - - [0x5134B0, c, actor/pyro_guy] - - [0x513580, c, stage/omo_01] - - [0x513790, c, stage/omo_02] - - [0x513790, c, stage/omo_03] - - [0x513790, c, stage/omo_03b] - - [0x513790, c, stage/omo_04] - - [0x5137E0, c, stage/omo_05] - - [0x5137E0, c, stage/omo_05b] - - [0x5137E0, c, stage/omo_06] - - [0x5137E0, c, stage/omo_07] - - [0x5137E0, c, area] - - [0x5137E0] + - [auto, c, actor/red_shy_guy] + - [auto, c, actor/blue_shy_guy] + - [auto, c, actor/yellow_shy_guy] + - [auto, c, actor/pink_shy_guy] + - [auto, c, actor/green_shy_guy] + - [auto, c, actor/anti_guy] + - [auto, c, actor/medi_guy] + - [auto, c, actor/groove_guy] + - [auto, c, actor/spy_guy] + - [auto, c, actor/sky_guy] + - [auto, c, actor/pyro_guy] + - [auto, c, stage/omo_01] + - [auto, c, stage/omo_02] + - [auto, c, stage/omo_03] + - [auto, c, stage/omo_03b] + - [auto, c, stage/omo_04] + - [auto, c, stage/omo_05] + - [auto, c, stage/omo_05b] + - [auto, c, stage/omo_06] + - [auto, c, stage/omo_07] + - [auto, c, area] - dir: battle/area/omo2 type: code start: 0x52B6A0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x52B6A0, c, actor/general_guy] - - [0x52B7C0, c, actor/toy_tank] - - [0x52B8F0, c, actor/light_bulb] - - [0x52B9D0, c, stage/omo_07] - - [0x52B9D0, c, area] + - [auto, c, actor/general_guy] + - [auto, c, actor/toy_tank] + - [auto, c, actor/light_bulb] + - [auto, c, stage/omo_07] + - [auto, c, area] - dir: battle/area/omo2_1 type: code start: 0x543570 vram: 0x80231000 vram_of_symbol: Vine1Base subsegments: - - [0x543570, c, actor/shy_squad] + - [auto, c, actor/shy_squad] - dir: battle/area/omo2_2 type: code start: 0x5483E0 vram: 0x80231000 vram_of_symbol: Vine1Base subsegments: - - [0x5483E0, c, actor/stilt_guy] + - [auto, c, actor/stilt_guy] - dir: battle/area/omo2_3 type: code start: 0x54CC70 vram: 0x80231000 vram_of_symbol: Vine1Base subsegments: - - [0x54CC70, c, actor/shy_stack] + - [auto, c, actor/shy_stack] - dir: battle/area/omo2_4 type: code start: 0x552440 vram: 0x80231000 vram_of_symbol: Vine1Base subsegments: - - [0x552440, c, actor/signal_guy] + - [auto, c, actor/signal_guy] - dir: battle/area/omo2_5 type: code start: 0x552BB0 vram: 0x80231000 vram_of_symbol: Vine1Base subsegments: - - [0x552BB0, c, actor/shy_squad_dup] + - [auto, c, actor/shy_squad_dup] - dir: battle/area/omo2_6 type: code start: 0x556C90 vram: 0x80231000 vram_of_symbol: Vine1Base subsegments: - - [0x556C90, c, actor/shy_guy_dup] + - [auto, c, actor/shy_guy_dup] - dir: battle/area/omo3 type: code start: 0x5573E0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x5573E0, c, actor/big_lantern_ghost] - - [0x557870, c, stage/omo_01] - - [0x557A80, c, stage/omo_02] - - [0x557A80, c, stage/omo_03] - - [0x557A80, c, stage/omo_03b] - - [0x557A80, c, stage/omo_04] - - [0x557AD0, c, stage/omo_05] - - [0x557AD0, c, stage/omo_05b] - - [0x557AD0, c, stage/omo_06] - - [0x557AD0, c, stage/omo_07] - - [0x557AD0, c, actor/goomba] - - [0x557D50, c, actor/clubba] - - [0x557D50, c, actor/fuzzy] - - [0x557EC0, c, actor/hammer_bro] - - [0x557EC0, c, actor/pokey] - - [0x557F90, c, actor/koopatrol] - - [0x5580C0, c, actor/red_shy_guy] - - [0x558190, c, area] - - [0x558190] + - [auto, c, actor/big_lantern_ghost] + - [auto, c, stage/omo_01] + - [auto, c, stage/omo_02] + - [auto, c, stage/omo_03] + - [auto, c, stage/omo_03b] + - [auto, c, stage/omo_04] + - [auto, c, stage/omo_05] + - [auto, c, stage/omo_05b] + - [auto, c, stage/omo_06] + - [auto, c, stage/omo_07] + - [auto, c, actor/goomba] + - [auto, c, actor/clubba] + - [auto, c, actor/fuzzy] + - [auto, c, actor/hammer_bro] + - [auto, c, actor/pokey] + - [auto, c, actor/koopatrol] + - [auto, c, actor/red_shy_guy] + - [auto, c, area] - dir: battle/area/kgr type: code start: 0x56E2A0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x56E2A0, c, actor/fuzzipede] - - [0x56E800, c, stage/kgr_01] - - [0x56EC50, c, area] - - [0x56EC50] + - [auto, c, actor/fuzzipede] + - [auto, c, stage/kgr_01] + - [auto, c, area] - dir: battle/area/jan type: code start: 0x573920 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x573920, c, actor/spear_guy] - - [0x5739F0, c, actor/hurt_plant] - - [0x573AC0, c, actor/jungle_fuzzy] - - [0x573C30, c, actor/m_bush] - - [0x573C30, c, actor/medi_guy] - - [0x573E10, c, actor/spike_top] - - [0x573EE0, c, stage/jan_00] - - [0x573EE0, c, stage/jan_01] - - [0x573EE0, c, stage/jan_01b] - - [0x573EE0, c, stage/jan_02] - - [0x573EE0, c, stage/jan_03] - - [0x573EE0, c, stage/jan_03b] - - [0x573EE0, c, stage/jan_04] - - [0x573EE0, c, stage/jan_04b] - - [0x573EE0, c, area] - - [0x573EE0] + - [auto, c, actor/spear_guy] + - [auto, c, actor/hurt_plant] + - [auto, c, actor/jungle_fuzzy] + - [auto, c, actor/m_bush] + - [auto, c, actor/medi_guy] + - [auto, c, actor/spike_top] + - [auto, c, stage/jan_00] + - [auto, c, stage/jan_01] + - [auto, c, stage/jan_01b] + - [auto, c, stage/jan_02] + - [auto, c, stage/jan_03] + - [auto, c, stage/jan_03b] + - [auto, c, stage/jan_04] + - [auto, c, stage/jan_04b] + - [auto, c, area] - dir: battle/area/jan2 type: code start: 0x584940 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x584940, c, actor/putrid_piranha] - - [0x584B90, c, actor/white_magikoopa] - - [0x585000, c, stage/jan_00] - - [0x585000, c, stage/jan_01] - - [0x585000, c, stage/jan_01b] - - [0x585000, c, stage/jan_02] - - [0x585000, c, stage/jan_03] - - [0x585000, c, stage/jan_03b] - - [0x585000, c, stage/jan_04] - - [0x585000, c, stage/jan_04b] - - [0x585000, c, area] - - [0x585000] + - [auto, c, actor/putrid_piranha] + - [auto, c, actor/white_magikoopa] + - [auto, c, stage/jan_00] + - [auto, c, stage/jan_01] + - [auto, c, stage/jan_01b] + - [auto, c, stage/jan_02] + - [auto, c, stage/jan_03] + - [auto, c, stage/jan_03b] + - [auto, c, stage/jan_04] + - [auto, c, stage/jan_04b] + - [auto, c, area] - dir: battle/area/kzn type: code start: 0x58C2F0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x58C2F0, c, actor/lava_bubble] - - [0x58C420, c, actor/putrid_piranha] - - [0x58C670, c, actor/spike_top] - - [0x58C740, c, actor/medi_guy] - - [0x58C920, c, actor/red_magikoopa] - - [0x58CC90, c, actor/white_magikoopa] - - [0x58D100, c, stage/kzn_01] - - [0x58D100, c, stage/kzn_01b] - - [0x58D100, c, stage/kzn_02] - - [0x58D100, c, stage/kzn_04] - - [0x58D100, c, stage/kzn_04b] - - [0x58D100, c, stage/kzn_04c] - - [0x58D100, c, stage/kzn_05] - - [0x58D100, c, area] - - [0x58D100] + - [auto, c, actor/lava_bubble] + - [auto, c, actor/putrid_piranha] + - [auto, c, actor/spike_top] + - [auto, c, actor/medi_guy] + - [auto, c, actor/red_magikoopa] + - [auto, c, actor/white_magikoopa] + - [auto, c, stage/kzn_01] + - [auto, c, stage/kzn_01b] + - [auto, c, stage/kzn_02] + - [auto, c, stage/kzn_04] + - [auto, c, stage/kzn_04b] + - [auto, c, stage/kzn_04c] + - [auto, c, stage/kzn_05] + - [auto, c, area] - dir: battle/area/kzn2 type: code start: 0x59E6E0 @@ -7691,20 +7511,20 @@ segments: follows_vram: heaps symbol_name_format: $VRAM_$ROM subsegments: - - [0x59E6E0, c, anim/unused_gfx] - - [0x59E6E0, c, anim/lava_piranha_anim] - - [0x59E6E0, c, actor/lava_piranha] - - [0x59F420, c, actor/petit_piranha] - - [0x59F4D0, c, actor/lava_bud] - - [0x59F530, c, actor/petit_piranha_bomb] - - [0x59F530, c, stage/kzn_01] - - [0x59F530, c, stage/kzn_01b] - - [0x59F530, c, stage/kzn_02] - - [0x59F530, c, stage/kzn_04] - - [0x59F530, c, stage/kzn_04b] - - [0x59F530, c, stage/kzn_04c] - - [0x59F530, c, stage/kzn_05] - - [0x59F530, c, area] + - [auto, c, anim/unused_gfx] + - [auto, c, anim/lava_piranha_anim] + - [auto, c, actor/lava_piranha] + - [auto, c, actor/petit_piranha] + - [auto, c, actor/lava_bud] + - [auto, c, actor/petit_piranha_bomb] + - [auto, c, stage/kzn_01] + - [auto, c, stage/kzn_01b] + - [auto, c, stage/kzn_02] + - [auto, c, stage/kzn_04] + - [auto, c, stage/kzn_04b] + - [auto, c, stage/kzn_04c] + - [auto, c, stage/kzn_05] + - [auto, c, area] - start: 0x59F530 type: .data name: anim/unused_gfx @@ -7738,7 +7558,8 @@ segments: - [0x5A0720, gfx, gfx9] - [0x5A0770, gfx, gfx10] - [0x5A07B0, gfx, gfx11] - - [0x5A0800, .data, anim/lava_piranha_anim] + - [0x5A0800] + - [auto, .data, anim/lava_piranha_anim] - start: 0x5A2E80 type: .data name: actor/lava_piranha @@ -7748,17 +7569,17 @@ segments: - [0x5A3420, palette, lava_piranha_vine] - [0x5A3620, gfx, lava_piranha_vine] - [0x5A36F8] - - [0x5AA5B0, .data, actor/petit_piranha] - - [0x5AB7A0, .data, actor/lava_bud] - - [0x5AEE00, .data, actor/petit_piranha_bomb] - - [0x5AF060, .data, stage/kzn_01] - - [0x5AF100, .data, stage/kzn_01b] - - [0x5AF190, .data, stage/kzn_02] - - [0x5AF6C0, .data, stage/kzn_04] - - [0x5AFC50, .data, stage/kzn_04b] - - [0x5B01E0, .data, stage/kzn_04c] - - [0x5B0720, .data, stage/kzn_05] - - [0x5B1070, .data, area] + - [auto, .data, actor/petit_piranha] + - [auto, .data, actor/lava_bud] + - [auto, .data, actor/petit_piranha_bomb] + - [auto, .data, stage/kzn_01] + - [auto, .data, stage/kzn_01b] + - [auto, .data, stage/kzn_02] + - [auto, .data, stage/kzn_04] + - [auto, .data, stage/kzn_04b] + - [auto, .data, stage/kzn_04c] + - [auto, .data, stage/kzn_05] + - [auto, .data, area] - [0x5B1240] - dir: battle/area/flo type: code @@ -7766,140 +7587,135 @@ segments: vram: 0x80218000 follows_vram: heaps subsegments: - - [0x5B14B0, c, actor/lakitu] - - [0x5B14B0, c, actor/spiny] - - [0x5B14B0, c, actor/crazee_dayzee] - - [0x5B14B0, c, actor/bzzap] - - [0x5B16A0, c, actor/amazy_dayzee] - - [0x5B16A0, c, actor/ruff_puff] - - [0x5B1830, c, actor/medi_guy] - - [0x5B1A10, c, actor/red_magikoopa] - - [0x5B1D80, c, actor/green_magikoopa] - - [0x5B20F0, c, actor/white_magikoopa] - - [0x5B2560, c, actor/yellow_magikoopa] - - [0x5B28D0, c, stage/flo_01] - - [0x5B2990, c, stage/flo_01b] - - [0x5B2A50, c, stage/flo_01c] - - [0x5B2B10, c, stage/flo_02] - - [0x5B2BD0, c, stage/flo_02b] - - [0x5B2C90, c, stage/flo_02c] - - [0x5B2D50, c, stage/flo_03] - - [0x5B2FA0, c, stage/flo_04] - - [0x5B31F0, c, stage/flo_05] - - [0x5B32B0, c, stage/flo_06] - - [0x5B3370, c, area] - - [0x5B3370] + - [auto, c, actor/lakitu] + - [auto, c, actor/spiny] + - [auto, c, actor/crazee_dayzee] + - [auto, c, actor/bzzap] + - [auto, c, actor/amazy_dayzee] + - [auto, c, actor/ruff_puff] + - [auto, c, actor/medi_guy] + - [auto, c, actor/red_magikoopa] + - [auto, c, actor/green_magikoopa] + - [auto, c, actor/white_magikoopa] + - [auto, c, actor/yellow_magikoopa] + - [auto, c, stage/flo_01] + - [auto, c, stage/flo_01b] + - [auto, c, stage/flo_01c] + - [auto, c, stage/flo_02] + - [auto, c, stage/flo_02b] + - [auto, c, stage/flo_02c] + - [auto, c, stage/flo_03] + - [auto, c, stage/flo_04] + - [auto, c, stage/flo_05] + - [auto, c, stage/flo_06] + - [auto, c, area] - dir: battle/area/flo2 type: code start: 0x5CE690 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x5CE690, c, actor/huff_n_puff] - - [0x5CF2D0, c, actor/tuff_puff] - - [0x5CF460, c, actor/monty_mole_boss] - - [0x5CF460, c, actor/spike] - - [0x5CF460, c, stage/flo_01] - - [0x5CF520, c, stage/flo_01b] - - [0x5CF5E0, c, stage/flo_01c] - - [0x5CF6A0, c, stage/flo_02] - - [0x5CF760, c, stage/flo_02b] - - [0x5CF820, c, stage/flo_02c] - - [0x5CF8E0, c, stage/flo_03] - - [0x5CFB30, c, stage/flo_04] - - [0x5CFD80, c, stage/flo_05] - - [0x5CFE40, c, stage/flo_06] - - [0x5CFF00, c, area] - - [0x5CFF00] + - [auto, c, actor/huff_n_puff] + - [auto, c, actor/tuff_puff] + - [auto, c, actor/monty_mole_boss] + - [auto, c, actor/spike] + - [auto, c, stage/flo_01] + - [auto, c, stage/flo_01b] + - [auto, c, stage/flo_01c] + - [auto, c, stage/flo_02] + - [auto, c, stage/flo_02b] + - [auto, c, stage/flo_02c] + - [auto, c, stage/flo_03] + - [auto, c, stage/flo_04] + - [auto, c, stage/flo_05] + - [auto, c, stage/flo_06] + - [auto, c, area] - dir: battle/area/tik type: code start: 0x5EC490 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x5EC490, c, actor/dark_koopa] - - [0x5EC560, c, actor/dark_paratroopa] - - [0x5EC690, c, actor/gloomba] - - [0x5EC910, c, actor/spiked_gloomba] - - [0x5ECB90, c, actor/paragloomba] - - [0x5ECE70, c, actor/buzzy_beetle] - - [0x5ECF40, c, actor/spike_top] - - [0x5ED010, c, actor/spiny] - - [0x5ED010, c, stage/tik_01] - - [0x5ED4B0, c, stage/tik_02] - - [0x5ED950, c, stage/tik_03] - - [0x5EDDF0, c, stage/tik_04] - - [0x5EE240, c, stage/tik_05] - - [0x5EE550, c, area] - - [0x5EE550] + - [auto, c, actor/dark_koopa] + - [auto, c, actor/dark_paratroopa] + - [auto, c, actor/gloomba] + - [auto, c, actor/spiked_gloomba] + - [auto, c, actor/paragloomba] + - [auto, c, actor/buzzy_beetle] + - [auto, c, actor/spike_top] + - [auto, c, actor/spiny] + - [auto, c, stage/tik_01] + - [auto, c, stage/tik_02] + - [auto, c, stage/tik_03] + - [auto, c, stage/tik_04] + - [auto, c, stage/tik_05] + - [auto, c, area] - dir: battle/area/tik2 type: code start: 0x608AB0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x608AB0, c, actor/blooper] - - [0x608CB0, c, actor/electro_blooper] - - [0x609130, c, actor/super_blooper] - - [0x6094D0, c, actor/blooper_baby] - - [0x609690, c, stage/tik_01] - - [0x609B30, c, stage/tik_02] - - [0x609FD0, c, stage/tik_03] - - [0x60A470, c, stage/tik_04] - - [0x60A8C0, c, stage/tik_05] - - [0x60ABD0, c, area] - - [0x60ABD0] + - [auto, c, actor/blooper] + - [auto, c, actor/electro_blooper] + - [auto, c, actor/super_blooper] + - [auto, c, actor/blooper_baby] + - [auto, c, stage/tik_01] + - [auto, c, stage/tik_02] + - [auto, c, stage/tik_03] + - [auto, c, stage/tik_04] + - [auto, c, stage/tik_05] + - [auto, c, area] - dir: battle/area/tik3 type: code start: 0x6186F0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x6186F0, c, actor/swooper] - - [0x6187C0, c, actor/swoopula] - - [0x618A00, c, stage/tik_01] - - [0x618EA0, c, stage/tik_02] - - [0x619340, c, stage/tik_03] - - [0x6197E0, c, stage/tik_04] - - [0x619C30, c, stage/tik_05] - - [0x619F40, c, area] - - [0x619F40] + - [auto, c, actor/swooper] + - [auto, c, actor/swoopula] + - [auto, c, stage/tik_01] + - [auto, c, stage/tik_02] + - [auto, c, stage/tik_03] + - [auto, c, stage/tik_04] + - [auto, c, stage/tik_05] + - [auto, c, area] - dir: battle/area/sam type: code start: 0x623BA0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x623BA0, c, actor/duplighost] - - [0x625190, c, actor/gulpit] - - [0x625190, c, actor/gulpit_rocks] - - [0x625190, c, actor/white_clubba] - - [0x625190, c, actor/frost_piranha] - - [0x6253E0, c, actor/gray_magikoopa] - - [0x625750, c, stage/sam_01] - - [0x625A70, c, stage/sam_02] - - [0x625D90, c, stage/sam_02b] - - [0x6260B0, c, stage/sam_02c] - - [0x6263D0, c, stage/sam_02d] - - [0x6266F0, c, stage/sam_03] - - [0x626A30, c, area] + - [auto, c, actor/duplighost] + - [auto, c, actor/gulpit] + - [auto, c, actor/gulpit_rocks] + - [auto, c, actor/white_clubba] + - [auto, c, actor/frost_piranha] + - [auto, c, actor/gray_magikoopa] + - [auto, c, stage/sam_01] + - [auto, c, stage/sam_02] + - [auto, c, stage/sam_02b] + - [auto, c, stage/sam_02c] + - [auto, c, stage/sam_02d] + - [auto, c, stage/sam_03] + - [auto, c, area] - dir: battle/area/sam2 type: code start: 0x63D1E0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x63D1E0, c, actor/monstar] - - [0x63D710, c, actor/paragoomba] - - [0x63D9F0, c, actor/gray_magikoopa] - - [0x63DD60, c, stage/sam_01] - - [0x63E080, c, stage/sam_02] - - [0x63E3A0, c, stage/sam_02b] - - [0x63E6C0, c, stage/sam_02c] - - [0x63E9E0, c, stage/sam_02d] - - [0x63ED00, c, stage/sam_03] - - [0x63F040, c, area] - - [0x63F040, c, dlist] + - [auto, c, actor/monstar] + - [auto, c, actor/paragoomba] + - [auto, c, actor/gray_magikoopa] + - [auto, c, stage/sam_01] + - [auto, c, stage/sam_02] + - [auto, c, stage/sam_02b] + - [auto, c, stage/sam_02c] + - [auto, c, stage/sam_02d] + - [auto, c, stage/sam_03] + - [auto, c, area] + - [auto, c, dlist] - start: 0x63F040 type: .data name: actor/monstar @@ -7908,16 +7724,16 @@ segments: - [0x63F278, ci4, actor/img, 32, 32] - [0x63F478, palette, actor/img] - [0x63F498] - - [0x641070, .data, actor/paragoomba] - - [0x644310, .data, actor/gray_magikoopa] - - [0x646FD0, .data, stage/sam_01] - - [0x6473E0, .data, stage/sam_02] - - [0x647820, .data, stage/sam_02b] - - [0x647B70, .data, stage/sam_02c] - - [0x647EE0, .data, stage/sam_02d] - - [0x648260, .data, stage/sam_03] - - [0x648670, .data, area] - - [0x648750, .data, dlist] + - [auto, .data, actor/paragoomba] + - [auto, .data, actor/gray_magikoopa] + - [auto, .data, stage/sam_01] + - [auto, .data, stage/sam_02] + - [auto, .data, stage/sam_02b] + - [auto, .data, stage/sam_02c] + - [auto, .data, stage/sam_02d] + - [auto, .data, stage/sam_03] + - [auto, .data, area] + - [auto, .data, dlist] - start: 0x648860 type: .data name: vtx @@ -7930,21 +7746,21 @@ segments: vram: 0x80218000 follows_vram: heaps subsegments: - - [0x648E10, c, actor/swoopula] - - [0x649050, c, actor/albino_dino] - - [0x649050, c, actor/white_clubba] - - [0x649050, c, actor/red_magikoopa] - - [0x649480, c, actor/green_magikoopa] - - [0x6497F0, c, actor/yellow_magikoopa] - - [0x649B60, c, actor/gray_magikoopa] - - [0x649ED0, c, actor/white_magikoopa] - - [0x64A340, c, stage/pra_01] - - [0x64A340, c, stage/pra_02] - - [0x64A340, c, stage/pra_03] - - [0x64A340, c, stage/pra_03b] - - [0x64A340, c, stage/pra_03c] - - [0x64A340, c, stage/pra_04] - - [0x64A340, c, area] + - [auto, c, actor/swoopula] + - [auto, c, actor/albino_dino] + - [auto, c, actor/white_clubba] + - [auto, c, actor/red_magikoopa] + - [auto, c, actor/green_magikoopa] + - [auto, c, actor/yellow_magikoopa] + - [auto, c, actor/gray_magikoopa] + - [auto, c, actor/white_magikoopa] + - [auto, c, stage/pra_01] + - [auto, c, stage/pra_02] + - [auto, c, stage/pra_03] + - [auto, c, stage/pra_03b] + - [auto, c, stage/pra_03c] + - [auto, c, stage/pra_04] + - [auto, c, area] - dir: battle/area/pra2 type: code start: 0x660750 @@ -7952,144 +7768,139 @@ segments: follows_vram: heaps subalign: 16 # BSS alignment hack subsegments: - - [0x660750, c, actor/crystal_king] - - [0x660D20, c, actor/crystal_bit] - - [0x660E10, c, stage/sam_04] - - [0x661150, c, area] + - [auto, c, actor/crystal_king] + - [auto, c, actor/crystal_bit] + - [auto, c, stage/sam_04] + - [auto, c, area] - dir: battle/area/pra3 type: code start: 0x669D80 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x669D80, c, actor/duplighost] - - [0x66B370, c, actor/swoopula] - - [0x66B5B0, c, actor/white_clubba] - - [0x66B5B0, c, actor/red_magikoopa] - - [0x66B920, c, actor/gray_magikoopa] - - [0x66BC90, c, stage/pra_01] - - [0x66BC90, c, stage/pra_02] - - [0x66BC90, c, stage/pra_03] - - [0x66BC90, c, stage/pra_03b] - - [0x66BC90, c, stage/pra_03c] - - [0x66BC90, c, stage/pra_04] - - [0x66BC90, c, area] + - [auto, c, actor/duplighost] + - [auto, c, actor/swoopula] + - [auto, c, actor/white_clubba] + - [auto, c, actor/red_magikoopa] + - [auto, c, actor/gray_magikoopa] + - [auto, c, stage/pra_01] + - [auto, c, stage/pra_02] + - [auto, c, stage/pra_03] + - [auto, c, stage/pra_03b] + - [auto, c, stage/pra_03c] + - [auto, c, stage/pra_04] + - [auto, c, area] - dir: battle/area/kpa type: code start: 0x684A30 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x684A30, c, actor/bony_beetle] - - [0x684B00, c, actor/dry_bones] - - [0x684B00, c, actor/hammer_bro] - - [0x684B00, c, actor/koopatrol] - - [0x684C30, c, actor/magikoopa] - - [0x685130, c, actor/ember] - - [0x685260, c, stage/kpa_01] - - [0x685260, c, stage/kpa_01b] - - [0x685260, c, stage/kpa_02] - - [0x685260, c, stage/kpa_03] - - [0x685260, c, stage/kpa_04] - - [0x685260, c, stage/kpa_04b] - - [0x685260, c, stage/kpa_04c] - - [0x685260, c, stage/kpa_05] - - [0x685260, c, stage/kpa_07] - - [0x685260, c, stage/kpa_08] - - [0x685260, c, stage/kpa_09] - - [0x685260, c, stage/kpa_11] - - [0x685260, c, stage/kpa_13] - - [0x685260, c, stage/kpa_14] - - [0x685260, c, area] - - [0x685260] + - [auto, c, actor/bony_beetle] + - [auto, c, actor/dry_bones] + - [auto, c, actor/hammer_bro] + - [auto, c, actor/koopatrol] + - [auto, c, actor/magikoopa] + - [auto, c, actor/ember] + - [auto, c, stage/kpa_01] + - [auto, c, stage/kpa_01b] + - [auto, c, stage/kpa_02] + - [auto, c, stage/kpa_03] + - [auto, c, stage/kpa_04] + - [auto, c, stage/kpa_04b] + - [auto, c, stage/kpa_04c] + - [auto, c, stage/kpa_05] + - [auto, c, stage/kpa_07] + - [auto, c, stage/kpa_08] + - [auto, c, stage/kpa_09] + - [auto, c, stage/kpa_11] + - [auto, c, stage/kpa_13] + - [auto, c, stage/kpa_14] + - [auto, c, area] - dir: battle/area/kpa2 type: code start: 0x69F200 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x69F200, c, actor/bowser] - - [0x69F320, c, actor/bowser_intro] - - [0x6A0100, c, actor/bowser_phase_1] - - [0x6A14C0, c, actor/bowser_phase_2] - - [0x6A2B50, c, actor/bowser_phase_3] - - [0x6A4490, c, stage/kpa_01] - - [0x6A4490, c, stage/kkj_01] - - [0x6A4490, c, stage/kkj_02] - - [0x6A44E0, c, area] - - [0x6A44E0] + - [auto, c, actor/bowser] + - [auto, c, actor/bowser_intro] + - [auto, c, actor/bowser_phase_1] + - [auto, c, actor/bowser_phase_2] + - [auto, c, actor/bowser_phase_3] + - [auto, c, stage/kpa_01] + - [auto, c, stage/kkj_01] + - [auto, c, stage/kkj_02] + - [auto, c, area] - dir: battle/area/kpa3 type: code start: 0x6BBB90 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x6BBB90, c, actor/anti_guy] - - [0x6BBC60, c, actor/duplighost] - - [0x6BD250, c, stage/kpa_01] - - [0x6BD250, c, area] - - [0x6BD250] + - [auto, c, actor/anti_guy] + - [auto, c, actor/duplighost] + - [auto, c, stage/kpa_01] + - [auto, c, area] - dir: battle/area/kpa4 type: code start: 0x6CC070 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x6CC070, c, actor/bombshell_bill_blaster] - - [0x6CC090, c, actor/bombshell_bill] - - [0x6CC090, c, actor/koopatrol] - - [0x6CC1C0, c, actor/magikoopa] - - [0x6CC6C0, c, stage/kpa_01] - - [0x6CC6C0, c, stage/kpa_01b] - - [0x6CC6C0, c, stage/kpa_02] - - [0x6CC6C0, c, stage/kpa_03] - - [0x6CC6C0, c, stage/kpa_04] - - [0x6CC6C0, c, stage/kpa_04b] - - [0x6CC6C0, c, stage/kpa_04c] - - [0x6CC6C0, c, stage/kpa_05] - - [0x6CC6C0, c, stage/kpa_07] - - [0x6CC6C0, c, stage/kpa_08] - - [0x6CC6C0, c, stage/kpa_09] - - [0x6CC6C0, c, stage/kpa_11] - - [0x6CC6C0, c, stage/kpa_13] - - [0x6CC6C0, c, stage/kpa_14] - - [0x6CC6C0, c, area] - - [0x6CC6C0] + - [auto, c, actor/bombshell_bill_blaster] + - [auto, c, actor/bombshell_bill] + - [auto, c, actor/koopatrol] + - [auto, c, actor/magikoopa] + - [auto, c, stage/kpa_01] + - [auto, c, stage/kpa_01b] + - [auto, c, stage/kpa_02] + - [auto, c, stage/kpa_03] + - [auto, c, stage/kpa_04] + - [auto, c, stage/kpa_04b] + - [auto, c, stage/kpa_04c] + - [auto, c, stage/kpa_05] + - [auto, c, stage/kpa_07] + - [auto, c, stage/kpa_08] + - [auto, c, stage/kpa_09] + - [auto, c, stage/kpa_11] + - [auto, c, stage/kpa_13] + - [auto, c, stage/kpa_14] + - [auto, c, area] - dir: battle/area/kkj type: code start: 0x6DBDA0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x6DBDA0, c, area] - - [0x6DBDA0, c, actor/kammy_koopa] - - [0x6DC2F0, c, stage/kpa_05] - - [0x6DC340] + - [auto, c, area] + - [auto, c, actor/kammy_koopa] + - [auto, c, stage/kpa_05] - dir: battle/area/dig type: code start: 0x6DDDC0 vram: 0x80218000 follows_vram: heaps subsegments: - - [0x6DDDC0, c, actor/koopa_troopa] - - [0x6DDE90, c, actor/fuzzy] - - [0x6DE000, c, actor/pokey] - - [0x6DE0D0, c, actor/bandit] - - [0x6DE0D0, c, actor/red_shy_guy] - - [0x6DE1A0, c, actor/tubba_blubba] - - [0x6DE1A0, c, actor/monty_mole] - - [0x6DE1A0, c, actor/whacka] - - [0x6DE1F0, c, stage/dig_01] - - [0x6DE1F0, c, stage/dig_02] - - [0x6DE1F0, c, stage/dig_03] - - [0x6DE3A0, c, stage/dig_04] - - [0x6DE3F0, c, stage/dig_05] - - [0x6DE3F0, c, area] - - [0x6DE3F0, c, script/dig_01] - - [0x6DE4A0, c, script/dig_02] - - [0x6DE530, c, script/dig_03] - - [0x6DE5B0, c, script/dig_04] - - [0x6DE650, c, script/dig_05] + - [auto, c, actor/koopa_troopa] + - [auto, c, actor/fuzzy] + - [auto, c, actor/pokey] + - [auto, c, actor/bandit] + - [auto, c, actor/red_shy_guy] + - [auto, c, actor/tubba_blubba] + - [auto, c, actor/monty_mole] + - [auto, c, actor/whacka] + - [auto, c, stage/dig_01] + - [auto, c, stage/dig_02] + - [auto, c, stage/dig_03] + - [auto, c, stage/dig_04] + - [auto, c, stage/dig_05] + - [auto, c, area] + - [auto, c, script/dig_01] + - [auto, c, script/dig_02] + - [auto, c, script/dig_03] + - [auto, c, script/dig_04] + - [auto, c, script/dig_05] ####################### ### Battle Partners ### @@ -8101,8 +7912,7 @@ segments: vram: 0x80238000 vram_of_symbol: battle_partner_vram_start subsegments: - - [0x6F0B30, c, goompa] - - [0x6F0B30] + - [auto, c, goompa] - name: battle_partner_goombario dir: battle/partner type: code @@ -8110,8 +7920,7 @@ segments: vram: 0x80238000 vram_of_symbol: battle_partner_vram_start subsegments: - - [0x6F10E0, c, goombario] - - [0x6F2290] + - [auto, c, goombario] - name: battle_partner_kooper dir: battle/partner type: code @@ -8119,8 +7928,7 @@ segments: vram: 0x80238000 vram_of_symbol: battle_partner_vram_start subsegments: - - [0x6F5E80, c, kooper] - - [0x6F62B0] + - [auto, c, kooper] - name: battle_partner_bombette dir: battle/partner type: code @@ -8128,8 +7936,7 @@ segments: vram: 0x80238000 vram_of_symbol: battle_partner_vram_start subsegments: - - [0x6FAD10, c, bombette] - - [0x6FB350] + - [auto, c, bombette] - name: battle_partner_parakarry dir: battle/partner type: code @@ -8137,8 +7944,7 @@ segments: vram: 0x80238000 vram_of_symbol: battle_partner_vram_start subsegments: - - [0x6FFD80, c, parakarry] - - [0x701590] + - [auto, c, parakarry] - name: battle_partner_watt dir: battle/partner type: code @@ -8146,8 +7952,7 @@ segments: vram: 0x80238000 vram_of_symbol: battle_partner_vram_start subsegments: - - [0x703AF0, c, watt] - - [0x704A80] + - [auto, c, watt] - name: battle_partner_sushie dir: battle/partner type: code @@ -8155,8 +7960,7 @@ segments: vram: 0x80238000 vram_of_symbol: battle_partner_vram_start subsegments: - - [0x707CA0, c, sushie] - - [0x708B70] + - [auto, c, sushie] - name: battle_partner_lakilester dir: battle/partner type: code @@ -8164,8 +7968,7 @@ segments: vram: 0x80238000 vram_of_symbol: battle_partner_vram_start subsegments: - - [0x70BD10, c, lakilester] - - [0x70DEE0] + - [auto, c, lakilester] - name: battle_partner_bow dir: battle/partner type: code @@ -8173,8 +7976,7 @@ segments: vram: 0x80238000 vram_of_symbol: battle_partner_vram_start subsegments: - - [0x710EF0, c, bow] - - [0x7111F0] + - [auto, c, bow] - name: battle_partner_twink dir: battle/partner type: code @@ -8182,8 +7984,7 @@ segments: vram: 0x80238000 vram_of_symbol: battle_partner_vram_start subsegments: - - [0x714CF0, c, twink] - - [0x714DC0] + - [auto, c, twink] #################### ### Battle Items ### @@ -8195,8 +7996,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x715850, c, mushroom] - - [0x715E50] + - [auto, c, mushroom] - name: fire_flower dir: battle/move/item type: code @@ -8204,8 +8004,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x716C60, c, fire_flower] - - [0x717060] + - [auto, c, fire_flower] - name: dusty_hammer dir: battle/move/item type: code @@ -8213,7 +8012,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x7179D0, c, dusty_hammer] + - [auto, c, dusty_hammer] - start: 0x717C10 type: .data name: dusty_hammer @@ -8228,8 +8027,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x718850, c, pow_block] - - [0x718BF0] + - [auto, c, pow_block] - name: pebble dir: battle/move/item type: code @@ -8237,7 +8035,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x719970, c, pebble] + - [auto, c, pebble] - start: 0x719BB0 type: .data name: pebble @@ -8252,8 +8050,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x71A7F0, c, volt_shroom] - - [0x71AA70] + - [auto, c, volt_shroom] - name: thunder_rage dir: battle/move/item type: code @@ -8261,8 +8058,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x71B1A0, c, thunder_rage] - - [0x71B640] + - [auto, c, thunder_rage] - name: snowman_doll dir: battle/move/item type: code @@ -8270,8 +8066,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x71BE30, c, snowman_doll] - - [0x71C270] + - [auto, c, snowman_doll] - name: dried_shroom dir: battle/move/item type: code @@ -8279,8 +8074,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x71CCE0, c, dried_shroom] - - [0x71D010] + - [auto, c, dried_shroom] - name: shooting_star dir: battle/move/item type: code @@ -8288,8 +8082,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x71D770, c, shooting_star] - - [0x71DCC0] + - [auto, c, shooting_star] - name: sleepy_sheep dir: battle/move/item type: code @@ -8297,7 +8090,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x71E650, c, sleepy_sheep] + - [auto, c, sleepy_sheep] - start: 0x71EFC0 type: .data name: sleepy_sheep @@ -8317,8 +8110,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x7215A0, c, stone_cap] - - [0x721970] + - [auto, c, stone_cap] - name: tasty_tonic dir: battle/move/item type: code @@ -8326,8 +8118,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x722000, c, tasty_tonic] - - [0x7222D0] + - [auto, c, tasty_tonic] - name: thunder_bolt dir: battle/move/item type: code @@ -8335,8 +8126,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x722B40, c, thunder_bolt] - - [0x722FE0] + - [auto, c, thunder_bolt] - name: ultra_shroom dir: battle/move/item type: code @@ -8344,8 +8134,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x723780, c, ultra_shroom] - - [0x723AB0] + - [auto, c, ultra_shroom] - name: unknown_item dir: battle/move/item type: code @@ -8353,8 +8142,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x724240, c, unknown_item] - - [0x724570] + - [auto, c, unknown_item] - name: super_soda dir: battle/move/item type: code @@ -8362,8 +8150,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x724CE0, c, super_soda] - - [0x725210] + - [auto, c, super_soda] - name: hustle_drink dir: battle/move/item type: code @@ -8371,8 +8158,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x725F60, c, hustle_drink] - - [0x726240] + - [auto, c, hustle_drink] - name: stop_watch dir: battle/move/item type: code @@ -8380,8 +8166,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x726DD0, c, stop_watch] - - [0x727120] + - [auto, c, stop_watch] - name: dizzy_dial dir: battle/move/item type: code @@ -8389,8 +8174,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x727910, c, dizzy_dial] - - [0x727CE0] + - [auto, c, dizzy_dial] - name: please_come_back dir: battle/move/item type: code @@ -8398,8 +8182,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x7285E0, c, please_come_back] - - [0x728820] + - [auto, c, please_come_back] - name: egg_missile dir: battle/move/item type: code @@ -8407,7 +8190,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x728EC0, c, egg_missile] + - [auto, c, egg_missile] - start: 0x7291D0 type: .data name: egg_missile @@ -8429,7 +8212,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x72A750, c, insecticide_herb] + - [auto, c, insecticide_herb] - start: 0x72AB70 type: .data name: insecticide_herb @@ -8445,8 +8228,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x72B910, c, fright_jar] - - [0x72BC60] + - [auto, c, fright_jar] - name: mystery dir: battle/move/item type: code @@ -8454,7 +8236,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x72C5B0, c, mystery] + - [auto, c, mystery] - start: 0x72CF00 type: .data name: mystery @@ -8470,8 +8252,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x72DB70, c, repel_gel] - - [0x72DE00] + - [auto, c, repel_gel] - name: life_shroom dir: battle/move/item type: code @@ -8479,8 +8260,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x72E530, c, life_shroom] - - [0x72EA20] + - [auto, c, life_shroom] - name: coconut dir: battle/move/item type: code @@ -8488,7 +8268,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x72F720, c, coconut] + - [auto, c, coconut] - start: 0x72F960 type: .data name: coconut @@ -8504,8 +8284,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x7305A0, c, electro_pop] - - [0x730AE0] + - [auto, c, electro_pop] - name: strange_cake dir: battle/move/item type: code @@ -8513,7 +8292,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x731300, c, strange_cake] + - [auto, c, strange_cake] - start: 0x731EA0 type: .data name: strange_cake @@ -8533,8 +8312,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x7330D0, c, food] - - [0x733700] + - [auto, c, food] #################### ### Battle Moves ### @@ -8546,8 +8324,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x7345A0, c, attack] - - [0x734650] + - [auto, c, attack] - name: battle_move_spin_smash dir: battle/move/hammer type: code @@ -8555,8 +8332,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x737890, c, spin_smash] - - [0x737A20] + - [auto, c, spin_smash] - name: battle_move_quake_hammer dir: battle/move/hammer type: code @@ -8564,8 +8340,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x73AED0, c, quake_hammer] - - [0x73AF80] + - [auto, c, quake_hammer] - name: battle_move_jump_attack dir: battle/move/jump type: code @@ -8573,8 +8348,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x73D860, c, attack] - - [0x73D9A0] + - [auto, c, attack] - name: battle_move_multibounce dir: battle/move/jump type: code @@ -8582,8 +8356,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x740CC0, c, multibounce] - - [0x740DB0] + - [auto, c, multibounce] - name: battle_move_power_bounce dir: battle/move/jump type: code @@ -8591,8 +8364,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x743DF0, c, power_bounce] - - [0x743FF0] + - [auto, c, power_bounce] - name: battle_move_sleep_stomp dir: battle/move/jump type: code @@ -8600,8 +8372,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x746E10, c, sleep_stomp] - - [0x746F00] + - [auto, c, sleep_stomp] - name: battle_move_dizzy_stomp dir: battle/move/jump type: code @@ -8609,8 +8380,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x748DD0, c, dizzy_stomp] - - [0x748EC0] + - [auto, c, dizzy_stomp] - name: battle_move_d_down_pound dir: battle/move/hammer type: code @@ -8618,8 +8388,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x74AD90, c, d_down_pound] - - [0x74AF40] + - [auto, c, d_down_pound] - name: battle_move_jump_charge_0 dir: battle/move/jump type: code @@ -8627,8 +8396,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x74D570, c, jump_charge_0] - - [0x74D850] + - [auto, c, jump_charge_0] - name: battle_move_hammer_charge_0 dir: battle/move/hammer type: code @@ -8636,8 +8404,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x74F130, c, hammer_charge_0] - - [0x74F3D0] + - [auto, c, hammer_charge_0] - name: battle_move_hammer_throw dir: battle/move/hammer type: code @@ -8645,7 +8412,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x752450, c, hammer_throw] + - [auto, c, hammer_throw] - start: 0x752500 type: .data name: hammer_throw @@ -8672,8 +8439,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x756780, c, mega_quake] - - [0x756900] + - [auto, c, mega_quake] - name: battle_move_hammer_charge_1 dir: battle/move/hammer type: code @@ -8681,8 +8447,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x7595B0, c, hammer_charge_1] - - [0x7598D0] + - [auto, c, hammer_charge_1] - name: battle_move_jump_charge_1 dir: battle/move/jump type: code @@ -8690,8 +8455,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x75C980, c, jump_charge_1] - - [0x75CCE0] + - [auto, c, jump_charge_1] - name: battle_move_hammer_charge_2 dir: battle/move/hammer type: code @@ -8699,8 +8463,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x75E5D0, c, hammer_charge_2] - - [0x75E8F0] + - [auto, c, hammer_charge_2] - name: battle_move_jump_charge_2 dir: battle/move/jump type: code @@ -8708,8 +8471,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x761920, c, jump_charge_2] - - [0x761C80] + - [auto, c, jump_charge_2] - name: battle_move_auto_smash dir: battle/move/hammer type: code @@ -8717,8 +8479,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x763540, c, auto_smash] - - [0x7635F0] + - [auto, c, auto_smash] - name: battle_move_auto_jump dir: battle/move/jump type: code @@ -8726,8 +8487,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x765C20, c, auto_jump] - - [0x765D10] + - [auto, c, auto_jump] - name: battle_move_power_quake dir: battle/move/hammer type: code @@ -8735,8 +8495,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x767C90, c, power_quake] - - [0x767D40] + - [auto, c, power_quake] - name: battle_move_auto_multibounce dir: battle/move/jump type: code @@ -8744,8 +8503,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x76A830, c, auto_multibounce] - - [0x76A920] + - [auto, c, auto_multibounce] - name: battle_move_power_jump dir: battle/move/jump type: code @@ -8753,8 +8511,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x76D760, c, power_jump] - - [0x76D850] + - [auto, c, power_jump] - name: battle_move_super_jump dir: battle/move/jump type: code @@ -8762,8 +8519,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x76F330, c, super_jump] - - [0x76F420] + - [auto, c, super_jump] - name: battle_move_mega_jump dir: battle/move/jump type: code @@ -8771,8 +8527,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x770F30, c, mega_jump] - - [0x771020] + - [auto, c, mega_jump] - name: battle_move_power_smash dir: battle/move/hammer type: code @@ -8780,8 +8535,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x772BA0, c, power_smash] - - [0x772C50] + - [auto, c, power_smash] - name: battle_move_super_smash dir: battle/move/hammer type: code @@ -8789,8 +8543,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x775100, c, super_smash] - - [0x7751B0] + - [auto, c, super_smash] - name: battle_move_mega_smash dir: battle/move/hammer type: code @@ -8798,8 +8551,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x777690, c, mega_smash] - - [0x777740] + - [auto, c, mega_smash] - name: battle_move_demo_power_bounce dir: battle/move/jump type: code @@ -8807,8 +8559,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x779C90, c, demo_power_bounce] - - [0x779E30] + - [auto, c, demo_power_bounce] - name: battle_move_shrink_smash dir: battle/move/hammer type: code @@ -8816,8 +8567,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x77CB80, c, shrink_smash] - - [0x77CC30] + - [auto, c, shrink_smash] - name: battle_move_shell_crack dir: battle/move/hammer type: code @@ -8825,8 +8575,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x77F240, c, shell_crack] - - [0x77F3D0] + - [auto, c, shell_crack] - name: battle_move_d_down_jump dir: battle/move/jump type: code @@ -8834,8 +8583,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x781920, c, d_down_jump] - - [0x781AF0] + - [auto, c, d_down_jump] - name: battle_move_shrink_stomp dir: battle/move/jump type: code @@ -8843,8 +8591,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x783BA0, c, shrink_stomp] - - [0x783C90] + - [auto, c, shrink_stomp] - name: battle_move_earthquake_jump dir: battle/move/jump type: code @@ -8852,8 +8599,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x785B20, c, earthquake_jump] - - [0x785C20] + - [auto, c, earthquake_jump] - name: battle_move_focus dir: battle/move/star_power type: code @@ -8861,8 +8607,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x789E60, c, focus] - - [0x78A490] + - [auto, c, focus] - name: battle_move_refresh dir: battle/move/star_power type: code @@ -8870,8 +8615,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x78B600, c, refresh] - - [0x78C070] + - [auto, c, refresh] - name: battle_move_lullaby dir: battle/move/star_power type: code @@ -8879,8 +8623,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x78D150, c, lullaby] - - [0x78D770] + - [auto, c, lullaby] - name: battle_move_star_storm dir: battle/move/star_power type: code @@ -8888,8 +8631,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x78E7D0, c, star_storm] - - [0x78EEC0] + - [auto, c, star_storm] - name: battle_move_chill_out dir: battle/move/star_power type: code @@ -8897,8 +8639,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x7900D0, c, chill_out] - - [0x7909C0] + - [auto, c, chill_out] - name: battle_move_smooch dir: battle/move/star_power type: code @@ -8906,8 +8647,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x791D90, c, smooch] - - [0x7923C0] + - [auto, c, smooch] - name: battle_move_time_out dir: battle/move/star_power type: code @@ -8915,8 +8655,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x793D20, c, time_out] - - [0x794240] + - [auto, c, time_out] - name: battle_move_up_and_away dir: battle/move/star_power type: code @@ -8924,8 +8663,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x7952E0, c, up_and_away] - - [0x7959B0] + - [auto, c, up_and_away] - name: battle_move_star_beam dir: battle/move/star_power type: code @@ -8933,8 +8671,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x796FC0, c, star_beam] - - [0x7984B0] + - [auto, c, star_beam] - name: battle_move_peach_beam dir: battle/move/star_power type: code @@ -8942,8 +8679,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x7997B0, c, peach_beam] - - [0x79ACA0] + - [auto, c, peach_beam] - name: battle_move_peach_focus dir: battle/move/star_power type: code @@ -8951,8 +8687,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x79BFA0, c, peach_focus] - - [0x79C4D0] + - [auto, c, peach_focus] - name: battle_move_twink_dash dir: battle/move/star_power type: code @@ -8960,8 +8695,7 @@ segments: vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x79D8A0, c, twink_dash] - - [0x79DE50] + - [auto, c, twink_dash] - type: code name: level_up start: 0x79EF40 @@ -8969,7 +8703,7 @@ segments: follows_vram: battle_code symbol_name_format: $VRAM_$ROM subsegments: - - [0x79EF40, c, level_up] + - [auto, c, level_up] - start: 0x79EF40 type: .data name: level_up @@ -9104,7 +8838,7 @@ segments: follows_vram: battle_code symbol_name_format: $VRAM_$ROM subsegments: - - [0x7A89A0, c, starpoint] + - [auto, c, starpoint] - start: 0x7A89A0 type: .data name: starpoint @@ -9186,7 +8920,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7B5960, c, "01"] + - [auto, c, "01"] - name: world_model_anim_kzn_00 dir: world/model_anim/kzn type: code @@ -9194,7 +8928,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7B6690, c, "00"] + - [auto, c, "00"] - name: world_model_anim_kzn_04 dir: world/model_anim/kzn type: code @@ -9202,7 +8936,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7B70E0, c, "04"] + - [auto, c, "04"] - name: world_model_anim_kzn_05 dir: world/model_anim/kzn type: code @@ -9210,7 +8944,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7B8030, c, "05"] + - [auto, c, "05"] - name: world_model_anim_kzn_06 dir: world/model_anim/kzn type: code @@ -9218,7 +8952,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7B8D30, c, "06"] + - [auto, c, "06"] - name: world_model_anim_kzn_07 dir: world/model_anim/kzn type: code @@ -9226,7 +8960,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7B97E0, c, "07"] + - [auto, c, "07"] - name: world_model_anim_kzn_08 dir: world/model_anim/kzn type: code @@ -9234,7 +8968,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7BA280, c, "08"] + - [auto, c, "08"] - name: world_model_anim_kzn_09 dir: world/model_anim/kzn type: code @@ -9242,7 +8976,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7BB050, c, "09"] + - [auto, c, "09"] - name: world_model_anim_kzn_0A dir: world/model_anim/kzn type: code @@ -9250,7 +8984,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7BBD80, c, "0A"] + - [auto, c, "0A"] - name: world_model_anim_kzn_0B dir: world/model_anim/kzn type: code @@ -9258,7 +8992,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7BEDD0, c, "0B"] + - [auto, c, "0B"] - name: world_model_anim_kzn_0C dir: world/model_anim/kzn type: code @@ -9266,7 +9000,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7C16C0, c, "0C"] + - [auto, c, "0C"] - name: world_model_anim_kzn_0D dir: world/model_anim/kzn type: code @@ -9274,7 +9008,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7C3A00, c, "0D"] + - [auto, c, "0D"] - name: world_model_anim_kzn_0E dir: world/model_anim/kzn type: code @@ -9282,7 +9016,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7C44D0, c, "0E"] + - [auto, c, "0E"] - name: world_model_anim_kzn_02 dir: world/model_anim/kzn type: code @@ -9290,7 +9024,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7C4F50, c, "02"] + - [auto, c, "02"] - name: world_model_anim_kzn_03 dir: world/model_anim/kzn type: code @@ -9298,7 +9032,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7C7410, c, "03"] + - [auto, c, "03"] - name: world_model_anim_kzn_0F dir: world/model_anim/kzn type: code @@ -9306,7 +9040,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7C7E50, c, "0F"] + - [auto, c, "0F"] - name: world_model_anim_kzn_10 dir: world/model_anim/kzn type: code @@ -9314,7 +9048,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7CA850, c, "10"] + - [auto, c, "10"] - name: world_model_anim_kzn_11 dir: world/model_anim/kzn type: code @@ -9322,7 +9056,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7CD5F0, c, "11"] + - [auto, c, "11"] - name: world_model_anim_kzn_12 dir: world/model_anim/kzn type: code @@ -9330,7 +9064,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7CDB30, c, "12"] + - [auto, c, "12"] - name: world_model_anim_kzn_13 dir: world/model_anim/kzn type: code @@ -9338,7 +9072,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7CEFF0, c, "13"] + - [auto, c, "13"] - name: world_model_anim_kzn_14 dir: world/model_anim/kzn type: code @@ -9346,7 +9080,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7CFCC0, c, "14"] + - [auto, c, "14"] - name: world_model_anim_kzn_15 dir: world/model_anim/kzn type: code @@ -9354,7 +9088,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7D0860, c, "15"] + - [auto, c, "15"] - name: world_model_anim_kzn_16 dir: world/model_anim/kzn type: code @@ -9362,7 +9096,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7D14E0, c, "16"] + - [auto, c, "16"] - name: world_model_anim_kzn_17 dir: world/model_anim/kzn type: code @@ -9370,7 +9104,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7D2080, c, "17"] + - [auto, c, "17"] - name: world_model_anim_kzn_18 dir: world/model_anim/kzn type: code @@ -9378,7 +9112,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7D2960, c, "18"] + - [auto, c, "18"] - name: world_model_anim_kzn_19 dir: world/model_anim/kzn type: code @@ -9386,7 +9120,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7D3260, c, "19"] + - [auto, c, "19"] - name: world_model_anim_kzn_1A dir: world/model_anim/kzn type: code @@ -9394,7 +9128,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7D5570, c, "1A"] + - [auto, c, "1A"] - name: world_model_anim_kzn_1B dir: world/model_anim/kzn type: code @@ -9402,7 +9136,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7D6F80, c, "1B"] + - [auto, c, "1B"] - name: world_model_anim_kzn_1C dir: world/model_anim/kzn type: code @@ -9410,7 +9144,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7D76B0, c, "1C"] + - [auto, c, "1C"] - name: world_model_anim_kzn_1D dir: world/model_anim/kzn type: code @@ -9418,7 +9152,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7D8FF0, c, "1D"] + - [auto, c, "1D"] - name: world_model_anim_kzn_1E dir: world/model_anim/kzn type: code @@ -9426,7 +9160,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7D96E0, c, "1E"] + - [auto, c, "1E"] - name: world_model_anim_kzn_1F dir: world/model_anim/kzn type: code @@ -9434,7 +9168,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7D98E0, c, "1F"] + - [auto, c, "1F"] - name: world_model_anim_kzn_20 dir: world/model_anim/kzn type: code @@ -9442,7 +9176,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7DA140, c, "20"] + - [auto, c, "20"] - name: world_model_anim_kzn_21 dir: world/model_anim/kzn type: code @@ -9450,7 +9184,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7DC180, c, "21"] + - [auto, c, "21"] - name: world_model_anim_kzn_22 dir: world/model_anim/kzn type: code @@ -9458,7 +9192,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7DE970, c, "22"] + - [auto, c, "22"] - name: world_model_anim_kzn_23 dir: world/model_anim/kzn type: code @@ -9466,7 +9200,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7DF2B0, c, "23"] + - [auto, c, "23"] - name: world_model_anim_kzn_24 dir: world/model_anim/kzn type: code @@ -9474,7 +9208,7 @@ segments: vram: 0x80234000 vram_of_symbol: Vine0Base subsegments: - - [0x7E03B0, c, "24"] + - [auto, c, "24"] - name: world_script_api dir: world/script_api type: code @@ -9482,18 +9216,17 @@ segments: vram: 0x80280000 follows_vram: heaps2 subsegments: - - [0x7E0E80, c, shops] - - [0x7E2AA0, c, rooms] - - [0x7E3700, c, push_blocks] - - [0x7E4690, c, enter_exit] - - [0x7E7380] + - [auto, c, shops] + - [auto, c, rooms] + - [auto, c, push_blocks] + - [auto, c, enter_exit] - name: texture_memory type: code start: 0x7E73A0 vram: 0x8028E000 vram_of_symbol: world_battle_vram_end subsegments: - - [0x7E73A0, c, texture_memory] + - [auto, c, texture_memory] ############ @@ -9506,15 +9239,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x7E73A0, c, machi_0_header] - - [0x7E73A0, c, machi_1_tables] - - [0x7E73A0, c, machi_2_main] - - [0x7E73D0, c, machi_3_entity] - - [0x7E7550, c, machi_4_goomba_king] - - [0x7E7550, c, machi_5_npc] - - [0x7E7850, c, machi_6_misstar] - - [0x7E7A30, c, machi_7_partner] - - [0x7E7A30] + - [auto, c, machi_0_header] + - [auto, c, machi_1_tables] + - [auto, c, machi_2_main] + - [auto, c, machi_3_entity] + - [auto, c, machi_4_goomba_king] + - [auto, c, machi_5_npc] + - [auto, c, machi_6_misstar] + - [auto, c, machi_7_partner] - name: mac_00 dir: world/area_mac/mac_00 type: code @@ -9522,22 +9254,21 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x7EAD10, c, mac_00_0_header] - - [0x7EAD10, c, mac_00_1_music] - - [0x7EAD10, c, mac_00_2_main] - - [0x7EB340, c, mac_00_3_entity] - - [0x7EB340, c, mac_00_4_rooms] - - [0x7EB340, c, mac_00_5_npc] - - [0x7ECFD0, c, mac_00_6_shop] - - [0x7ECFD0, c, mac_00_7_music_mix] - - [0x7ED100, c, mac_00_8_demo] - - [0x7ED100, c, mac_00_9_water_gfx] - - [0x7ED280, c, mac_00_10_shared_npc] - - [0x7EE870, c, mac_00_11_intro_npc] - - [0x7EE870, c, mac_00_12_intro] - - [0x7EE870, c, mac_00_13_epilogue_npc] - - [0x7EE870, c, mac_00_14_epilogue] - - [0x7EE870] + - [auto, c, mac_00_0_header] + - [auto, c, mac_00_1_music] + - [auto, c, mac_00_2_main] + - [auto, c, mac_00_3_entity] + - [auto, c, mac_00_4_rooms] + - [auto, c, mac_00_5_npc] + - [auto, c, mac_00_6_shop] + - [auto, c, mac_00_7_music_mix] + - [auto, c, mac_00_8_demo] + - [auto, c, mac_00_9_water_gfx] + - [auto, c, mac_00_10_shared_npc] + - [auto, c, mac_00_11_intro_npc] + - [auto, c, mac_00_12_intro] + - [auto, c, mac_00_13_epilogue_npc] + - [auto, c, mac_00_14_epilogue] - name: mac_01 dir: world/area_mac/mac_01 type: code @@ -9545,29 +9276,29 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x800880, c, mac_01_0_header] - - [0x800880, c, mac_01_1_music] - - [0x800880, c, mac_01_2_main] - - [0x800880, c, mac_01_3_entity] - - [0x800880, c, mac_01_4_rooms] - - [0x800880, c, mac_01_5_shop] - - [0x800C40, c, mac_01_6_crystal_ball_gfx] - - [0x801700, c, mac_01_7_bulletin] - - [0x8017D0, c, mac_01_8_music_mix] - - [0x801900, c, mac_01_9_npc] - - [0x805DD0, c, mac_01_10_intro_npc] - - [0x806C60, c, mac_01_11_epilogue_npc] - - [0x806C60, c, mac_01_12_intro] - - [0x806D10, c, mac_01_13_foliage] - - [0x806F50, .data, mac_01_0_header] - - [0x806FF0, .data, mac_01_1_music] - - [0x8071D0, .data, mac_01_2_main] - - [0x807C00, .data, mac_01_3_entity] - - [0x807CB0, .data, mac_01_4_rooms] - - [0x808680, .data, mac_01_5_shop] - - [0x808CA0, .data, mac_01_6_crystal_ball_gfx] - - [0x808D70, .data, mac_01_7_bulletin] - - [0x8090E0, .data, mac_01_8_music_mix] + - [auto, c, mac_01_0_header] + - [auto, c, mac_01_1_music] + - [auto, c, mac_01_2_main] + - [auto, c, mac_01_3_entity] + - [auto, c, mac_01_4_rooms] + - [auto, c, mac_01_5_shop] + - [auto, c, mac_01_6_crystal_ball_gfx] + - [auto, c, mac_01_7_bulletin] + - [auto, c, mac_01_8_music_mix] + - [auto, c, mac_01_9_npc] + - [auto, c, mac_01_10_intro_npc] + - [auto, c, mac_01_11_epilogue_npc] + - [auto, c, mac_01_12_intro] + - [auto, c, mac_01_13_foliage] + - [auto, .data, mac_01_0_header] + - [auto, .data, mac_01_1_music] + - [auto, .data, mac_01_2_main] + - [auto, .data, mac_01_3_entity] + - [auto, .data, mac_01_4_rooms] + - [auto, .data, mac_01_5_shop] + - [auto, .data, mac_01_6_crystal_ball_gfx] + - [auto, .data, mac_01_7_bulletin] + - [auto, .data, mac_01_8_music_mix] - start: 0x8091F0 type: .data name: mac_01_9_npc @@ -9578,10 +9309,10 @@ segments: - [0x80D558, rgba16, ../../toad_house/blanket, 16, 32, namespaced] - [0x80D958] - [0x81F9C0] - - [0x81F9C0, .data, mac_01_10_intro_npc] - - [0x8202D0, .data, mac_01_11_epilogue_npc] - - [0x822100, .data, mac_01_12_intro] - - [0x822460, .data, mac_01_13_foliage] + - [auto, .data, mac_01_10_intro_npc] + - [auto, .data, mac_01_11_epilogue_npc] + - [auto, .data, mac_01_12_intro] + - [auto, .data, mac_01_13_foliage] - name: mac_02 dir: world/area_mac/mac_02 type: code @@ -9589,15 +9320,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8232C0, c, mac_02_0_header] - - [0x8232C0, c, mac_02_1_music] - - [0x8232C0, c, mac_02_2_main] - - [0x8238B0, c, mac_02_3_rooms] - - [0x823970, c, mac_02_4_foliage] - - [0x823BB0, c, mac_02_5_entity] - - [0x823BF0, c, mac_02_6_npc] - - [0x8266B0, c, mac_02_7_music_mix] - - [0x8267E0] + - [auto, c, mac_02_0_header] + - [auto, c, mac_02_1_music] + - [auto, c, mac_02_2_main] + - [auto, c, mac_02_3_rooms] + - [auto, c, mac_02_4_foliage] + - [auto, c, mac_02_5_entity] + - [auto, c, mac_02_6_npc] + - [auto, c, mac_02_7_music_mix] - name: mac_03 dir: world/area_mac/mac_03 type: code @@ -9605,16 +9335,15 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x831800, c, mac_03_0_header] - - [0x831800, c, mac_03_1_music] - - [0x831800, c, mac_03_2_main] - - [0x831B20, c, mac_03_3_train] - - [0x831CB0, c, mac_03_4_npc] - - [0x833500, c, mac_03_5_entity] - - [0x833500, c, mac_03_6_foliage] - - [0x833740, c, mac_03_7_oinks] - - [0x834070, c, mac_03_8_demo] - - [0x834070] + - [auto, c, mac_03_0_header] + - [auto, c, mac_03_1_music] + - [auto, c, mac_03_2_main] + - [auto, c, mac_03_3_train] + - [auto, c, mac_03_4_npc] + - [auto, c, mac_03_5_entity] + - [auto, c, mac_03_6_foliage] + - [auto, c, mac_03_7_oinks] + - [auto, c, mac_03_8_demo] - name: mac_04 dir: world/area_mac/mac_04 type: code @@ -9622,17 +9351,16 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x842BD0, c, mac_04_0_header] - - [0x842C20, c, mac_04_1_music] - - [0x842C20, c, mac_04_2_main] - - [0x842D90, c, mac_04_3_rooms] - - [0x842DF0, c, mac_04_4_foliage] - - [0x843030, c, mac_04_5_shop] - - [0x843030, c, mac_04_6_npc] - - [0x844860, c, mac_04_7_wish_scene] - - [0x844860, c, mac_04_8_entity] - - [0x844AC0, c, mac_04_9_music_mix] - - [0x844BF0] + - [auto, c, mac_04_0_header] + - [auto, c, mac_04_1_music] + - [auto, c, mac_04_2_main] + - [auto, c, mac_04_3_rooms] + - [auto, c, mac_04_4_foliage] + - [auto, c, mac_04_5_shop] + - [auto, c, mac_04_6_npc] + - [auto, c, mac_04_7_wish_scene] + - [auto, c, mac_04_8_entity] + - [auto, c, mac_04_9_music_mix] - name: mac_05 dir: world/area_mac/mac_05 type: code @@ -9640,15 +9368,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x852170, c, mac_05_0_header] - - [0x852170, c, mac_05_1_music] - - [0x852170, c, mac_05_2_entity] - - [0x852170, c, mac_05_3_main] - - [0x852600, c, mac_05_4_npc] - - [0x855560, c, mac_05_5_whale] - - [0x855F20, c, mac_05_6_rooms] - - [0x855F20, c, mac_05_7_club64_sign] - - [0x8562D0] + - [auto, c, mac_05_0_header] + - [auto, c, mac_05_1_music] + - [auto, c, mac_05_2_entity] + - [auto, c, mac_05_3_main] + - [auto, c, mac_05_4_npc] + - [auto, c, mac_05_5_whale] + - [auto, c, mac_05_6_rooms] + - [auto, c, mac_05_7_club64_sign] - name: mac_06 dir: world/area_mac/mac_06 type: code @@ -9656,11 +9383,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x864B40, c, mac_06_0_header] - - [0x864B40, c, mac_06_1_main] - - [0x865000, c, mac_06_2_whale] - - [0x8659C0, c, mac_06_3_npc] - - [0x8661D0] + - [auto, c, mac_06_0_header] + - [auto, c, mac_06_1_main] + - [auto, c, mac_06_2_whale] + - [auto, c, mac_06_3_npc] - name: tik_01 dir: world/area_tik/tik_01 type: code @@ -9668,13 +9394,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8694B0, c, tik_01_0_header] - - [0x8694B0, c, tik_01_1_music] - - [0x8694B0, c, tik_01_2_main] - - [0x869AA0, c, tik_01_3_drips] - - [0x869EE0, c, tik_01_4_entity] - - [0x869EE0, c, tik_01_5_npc] - - [0x869F40] + - [auto, c, tik_01_0_header] + - [auto, c, tik_01_1_music] + - [auto, c, tik_01_2_main] + - [auto, c, tik_01_3_drips] + - [auto, c, tik_01_4_entity] + - [auto, c, tik_01_5_npc] - name: tik_02 dir: world/area_tik/tik_02 type: code @@ -9682,13 +9407,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x86C740, c, tik_02_0_header] - - [0x86C740, c, tik_02_1_music] - - [0x86C740, c, tik_02_2_main] - - [0x86CA50, c, tik_02_3_entity] - - [0x86CD10, c, tik_02_4_drips] - - [0x86D0E0, c, tik_02_5_npc] - - [0x86D0E0] + - [auto, c, tik_02_0_header] + - [auto, c, tik_02_1_music] + - [auto, c, tik_02_2_main] + - [auto, c, tik_02_3_entity] + - [auto, c, tik_02_4_drips] + - [auto, c, tik_02_5_npc] - name: tik_03 dir: world/area_tik/tik_03 type: code @@ -9696,14 +9420,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x86EB00, c, tik_03_0_header] - - [0x86EB00, c, tik_03_1_music] - - [0x86EB00, c, tik_03_2_main] - - [0x86F0F0, c, tik_03_3_drips] - - [0x86F460, c, tik_03_4_platforms] - - [0x86F4C0, c, tik_03_5_entity] - - [0x86F4C0, c, tik_03_6_demo] - - [0x86F5D0] + - [auto, c, tik_03_0_header] + - [auto, c, tik_03_1_music] + - [auto, c, tik_03_2_main] + - [auto, c, tik_03_3_drips] + - [auto, c, tik_03_4_platforms] + - [auto, c, tik_03_5_entity] + - [auto, c, tik_03_6_demo] - name: tik_04 dir: world/area_tik/tik_04 type: code @@ -9711,13 +9434,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x871A30, c, tik_04_0_header] - - [0x871A30, c, tik_04_1_music] - - [0x871A30, c, tik_04_2_main] - - [0x872020, c, tik_04_3_drips] - - [0x872390, c, tik_04_4_platforms] - - [0x8726A0, c, tik_04_5_npc] - - [0x8726A0] + - [auto, c, tik_04_0_header] + - [auto, c, tik_04_1_music] + - [auto, c, tik_04_2_main] + - [auto, c, tik_04_3_drips] + - [auto, c, tik_04_4_platforms] + - [auto, c, tik_04_5_npc] - name: tik_05 dir: world/area_tik/tik_05 type: code @@ -9725,13 +9447,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x874DC0, c, tik_05_0_header] - - [0x874DC0, c, tik_05_1_music] - - [0x874DC0, c, tik_05_2_main] - - [0x8750D0, c, tik_05_3_drips] - - [0x875440, c, tik_05_4_entity] - - [0x875810, c, tik_05_5_npc] - - [0x875810] + - [auto, c, tik_05_0_header] + - [auto, c, tik_05_1_music] + - [auto, c, tik_05_2_main] + - [auto, c, tik_05_3_drips] + - [auto, c, tik_05_4_entity] + - [auto, c, tik_05_5_npc] - name: tik_06 dir: world/area_tik/tik_06 type: code @@ -9739,12 +9460,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x876EE0, c, tik_06_0_header] - - [0x876EE0, c, tik_06_1_music] - - [0x876EE0, c, tik_06_2_main] - - [0x8774D0, c, tik_06_3_drips] - - [0x877840, c, tik_06_4_entity] - - [0x877840] + - [auto, c, tik_06_0_header] + - [auto, c, tik_06_1_music] + - [auto, c, tik_06_2_main] + - [auto, c, tik_06_3_drips] + - [auto, c, tik_06_4_entity] - name: tik_07 dir: world/area_tik/tik_07 type: code @@ -9752,14 +9472,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x879BE0, c, tik_07_0_header] - - [0x879BE0, c, tik_07_1_music] - - [0x879BE0, c, tik_07_2_main] - - [0x879EC0, c, tik_07_3_entity] - - [0x87AC00, c, tik_07_4_drips] - - [0x87AF70, c, tik_07_5_platforms] - - [0x87AFD0, c, tik_07_6_npc] - - [0x87C4D0] + - [auto, c, tik_07_0_header] + - [auto, c, tik_07_1_music] + - [auto, c, tik_07_2_main] + - [auto, c, tik_07_3_entity] + - [auto, c, tik_07_4_drips] + - [auto, c, tik_07_5_platforms] + - [auto, c, tik_07_6_npc] - name: tik_08 dir: world/area_tik/tik_08 type: code @@ -9767,13 +9486,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x87EDF0, c, tik_08_0_header] - - [0x87EDF0, c, tik_08_1_music] - - [0x87EDF0, c, tik_08_2_main] - - [0x87F3E0, c, tik_08_3_drips] - - [0x87F750, c, tik_08_4_entity] - - [0x87F820, c, tik_08_5_npc] - - [0x87F8B0] + - [auto, c, tik_08_0_header] + - [auto, c, tik_08_1_music] + - [auto, c, tik_08_2_main] + - [auto, c, tik_08_3_drips] + - [auto, c, tik_08_4_entity] + - [auto, c, tik_08_5_npc] - name: tik_09 dir: world/area_tik/tik_09 type: code @@ -9781,13 +9499,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8821C0, c, tik_09_0_header] - - [0x8821C0, c, tik_09_1_music] - - [0x8821C0, c, tik_09_2_main] - - [0x8827B0, c, tik_09_3_drips] - - [0x882B20, c, tik_09_4_entity] - - [0x882BF0, c, tik_09_5_npc] - - [0x883460] + - [auto, c, tik_09_0_header] + - [auto, c, tik_09_1_music] + - [auto, c, tik_09_2_main] + - [auto, c, tik_09_3_drips] + - [auto, c, tik_09_4_entity] + - [auto, c, tik_09_5_npc] - name: tik_10 dir: world/area_tik/tik_10 type: code @@ -9795,12 +9512,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8863C0, c, tik_10_0_header] - - [0x8863C0, c, tik_10_1_music] - - [0x8863C0, c, tik_10_2_main] - - [0x8866D0, c, tik_10_3_drips] - - [0x886A40, c, tik_10_4_entity] - - [0x887780] + - [auto, c, tik_10_0_header] + - [auto, c, tik_10_1_music] + - [auto, c, tik_10_2_main] + - [auto, c, tik_10_3_drips] + - [auto, c, tik_10_4_entity] - name: tik_12 dir: world/area_tik/tik_12 type: code @@ -9808,13 +9524,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x888BD0, c, tik_12_0_header] - - [0x888BD0, c, tik_12_1_music] - - [0x888BD0, c, tik_12_2_main] - - [0x8891C0, c, tik_12_3_drips] - - [0x889530, c, tik_12_4_entity] - - [0x88A530, c, tik_12_5_npc] - - [0x88AE20] + - [auto, c, tik_12_0_header] + - [auto, c, tik_12_1_music] + - [auto, c, tik_12_2_main] + - [auto, c, tik_12_3_drips] + - [auto, c, tik_12_4_entity] + - [auto, c, tik_12_5_npc] - name: tik_14 dir: world/area_tik/tik_14 type: code @@ -9822,12 +9537,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x88D600, c, tik_14_0_header] - - [0x88D600, c, tik_14_1_music] - - [0x88D600, c, tik_14_2_main] - - [0x88DBF0, c, tik_14_3_drips] - - [0x88DF60, c, tik_14_4_entity] - - [0x88DF60] + - [auto, c, tik_14_0_header] + - [auto, c, tik_14_1_music] + - [auto, c, tik_14_2_main] + - [auto, c, tik_14_3_drips] + - [auto, c, tik_14_4_entity] - name: tik_15 dir: world/area_tik/tik_15 type: code @@ -9835,13 +9549,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x88FBA0, c, tik_15_0_header] - - [0x88FBA0, c, tik_15_1_music] - - [0x88FBA0, c, tik_15_2_main] - - [0x890190, c, tik_15_3_entity] - - [0x890190, c, tik_15_4_drips] - - [0x890500, c, tik_15_5_npc] - - [0x8906B0] + - [auto, c, tik_15_0_header] + - [auto, c, tik_15_1_music] + - [auto, c, tik_15_2_main] + - [auto, c, tik_15_3_entity] + - [auto, c, tik_15_4_drips] + - [auto, c, tik_15_5_npc] - name: tik_17 dir: world/area_tik/tik_17 type: code @@ -9849,11 +9562,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x892A20, c, tik_17_0_header] - - [0x892A20, c, tik_17_1_music] - - [0x892A50, c, tik_17_2_entity] - - [0x893790, c, tik_17_3_main] - - [0x893D80] + - [auto, c, tik_17_0_header] + - [auto, c, tik_17_1_music] + - [auto, c, tik_17_2_entity] + - [auto, c, tik_17_3_main] - name: tik_18 dir: world/area_tik/tik_18 type: code @@ -9861,13 +9573,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8956E0, c, tik_18_0_header] - - [0x8956E0, c, tik_18_1_music] - - [0x8956E0, c, tik_18_2_main] - - [0x8959F0, c, tik_18_3_drips] - - [0x895D60, c, tik_18_4_npc] - - [0x895D60, c, tik_18_5_entity] - - [0x895D90] + - [auto, c, tik_18_0_header] + - [auto, c, tik_18_1_music] + - [auto, c, tik_18_2_main] + - [auto, c, tik_18_3_drips] + - [auto, c, tik_18_4_npc] + - [auto, c, tik_18_5_entity] - name: tik_19 dir: world/area_tik/tik_19 type: code @@ -9875,11 +9586,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8975E0, c, tik_19_0_header] - - [0x8975E0, c, tik_19_1_music] - - [0x8975E0, c, tik_19_2_main] - - [0x897BD0, c, tik_19_3_entity] - - [0x898910] + - [auto, c, tik_19_0_header] + - [auto, c, tik_19_1_music] + - [auto, c, tik_19_2_main] + - [auto, c, tik_19_3_entity] - name: tik_20 dir: world/area_tik/tik_20 type: code @@ -9887,12 +9597,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x89A350, c, tik_20_0_header] - - [0x89A350, c, tik_20_1_music] - - [0x89A350, c, tik_20_2_main] - - [0x89ACB0, c, tik_20_3_npc] - - [0x89B490, c, tik_20_4_entity] - - [0x89B490] + - [auto, c, tik_20_0_header] + - [auto, c, tik_20_1_music] + - [auto, c, tik_20_2_main] + - [auto, c, tik_20_3_npc] + - [auto, c, tik_20_4_entity] - name: tik_21 dir: world/area_tik/tik_21 type: code @@ -9900,11 +9609,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x89D7A0, c, tik_21_0_header] - - [0x89D7A0, c, tik_21_1_music] - - [0x89D7A0, c, tik_21_2_main] - - [0x89E100, c, tik_21_3_entity] - - [0x89E100] + - [auto, c, tik_21_0_header] + - [auto, c, tik_21_1_music] + - [auto, c, tik_21_2_main] + - [auto, c, tik_21_3_entity] - name: tik_22 dir: world/area_tik/tik_22 type: code @@ -9912,10 +9620,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x89FEC0, c, tik_22_0_header] - - [0x89FEC0, c, tik_22_1_music] - - [0x89FEF0, c, tik_22_2_main] - - [0x8A0870] + - [auto, c, tik_22_0_header] + - [auto, c, tik_22_1_music] + - [auto, c, tik_22_2_main] - name: tik_23 dir: world/area_tik/tik_23 type: code @@ -9923,12 +9630,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8A23D0, c, tik_23_0_header] - - [0x8A23D0, c, tik_23_1_music] - - [0x8A23D0, c, tik_23_2_main] - - [0x8A2D30, c, tik_23_3_entity] - - [0x8A2D30, c, tik_23_4_npc] - - [0x8A3510] + - [auto, c, tik_23_0_header] + - [auto, c, tik_23_1_music] + - [auto, c, tik_23_2_main] + - [auto, c, tik_23_3_entity] + - [auto, c, tik_23_4_npc] - name: tik_24 dir: world/area_tik/tik_24 type: code @@ -9936,13 +9642,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8A5A80, c, tik_24_0_header] - - [0x8A5AD0, c, tik_24_1_music] - - [0x8A5AD0, c, tik_24_2_main] - - [0x8A5DE0, c, tik_24_3_drips] - - [0x8A6150, c, tik_24_4_entity] - - [0x8A6150, c, tik_24_5_npc] - - [0x8A6930] + - [auto, c, tik_24_0_header] + - [auto, c, tik_24_1_music] + - [auto, c, tik_24_2_main] + - [auto, c, tik_24_3_drips] + - [auto, c, tik_24_4_entity] + - [auto, c, tik_24_5_npc] - name: tik_25 dir: world/area_tik/tik_25 type: code @@ -9950,11 +9655,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8A7F80, c, tik_25_0_header] - - [0x8A7F80, c, tik_25_1_music] - - [0x8A7F80, c, tik_25_2_main] - - [0x8A8600, c, tik_25_3_entity] - - [0x8A8740] + - [auto, c, tik_25_0_header] + - [auto, c, tik_25_1_music] + - [auto, c, tik_25_2_main] + - [auto, c, tik_25_3_entity] - name: kgr_01 dir: world/area_kgr/kgr_01 type: code @@ -9962,10 +9666,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8A9A10, c, kgr_01_1_main] - - [0x8A9B70, c, kgr_01_2_wiggle] - - [0x8A9F10, c, kgr_01_3_extra] - - [0x8A9F30] + - [auto, c, kgr_01_1_main] + - [auto, c, kgr_01_2_wiggle] + - [auto, c, kgr_01_3_extra] - name: kgr_02 dir: world/area_kgr/kgr_02 type: code @@ -9973,11 +9676,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8AA450, c, kgr_02_1_main] - - [0x8AA5B0, c, kgr_02_2_unused] - - [0x8AAB80, c, kgr_02_3_npc] - - [0x8AABB0, c, kgr_02_4_extra] - - [0x8AABD0] + - [auto, c, kgr_02_1_main] + - [auto, c, kgr_02_2_unused] + - [auto, c, kgr_02_3_npc] + - [auto, c, kgr_02_4_extra] - name: kmr_00 dir: world/area_kmr/kmr_00 type: code @@ -9985,13 +9687,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8ABF90, c, kmr_00_0_header] - - [0x8ABF90, c, kmr_00_1_music] - - [0x8ABF90, c, kmr_00_2_main] - - [0x8ABF90, c, kmr_00_3_revival] - - [0x8ACC40, c, kmr_00_4_npc] - - [0x8ACC40, c, kmr_00_5_entity] - - [0x8ACD00] + - [auto, c, kmr_00_0_header] + - [auto, c, kmr_00_1_music] + - [auto, c, kmr_00_2_main] + - [auto, c, kmr_00_3_revival] + - [auto, c, kmr_00_4_npc] + - [auto, c, kmr_00_5_entity] - name: kmr_02 dir: world/area_kmr/kmr_02 type: code @@ -9999,25 +9700,25 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8B0070, c, kmr_02_0_header] - - [0x8B0070, c, kmr_02_1_music] - - [0x8B0070, c, kmr_02_2_main] - - [0x8B30E0, c, kmr_02_3_npc] - - [0x8B33E0, c, kmr_02_4_rooms_1] - - [0x8B33E0, c, kmr_02_5_entity] - - [0x8B36B0, c, kmr_02_6_rooms_2] - - [0x8B36B0, c, kmr_02_7_kammy] - - [0x8B37D0, c, kmr_02_8_foliage] - - [0x8B3A10, c, kmr_02_9_images] - - [0x8B3AB0, .data, kmr_02_0_header] - - [0x8B3BA0, .data, kmr_02_1_music] - - [0x8B3D10, .data, kmr_02_2_main] - - [0x8B5640, .data, kmr_02_3_npc] - - [0x8C1460, .data, kmr_02_4_rooms_1] - - [0x8C4A40, .data, kmr_02_5_entity] - - [0x8C51D0, .data, kmr_02_6_rooms_2] - - [0x8C56A0, .data, kmr_02_7_kammy] - - [0x8C7010, .data, kmr_02_8_foliage] + - [auto, c, kmr_02_0_header] + - [auto, c, kmr_02_1_music] + - [auto, c, kmr_02_2_main] + - [auto, c, kmr_02_3_npc] + - [auto, c, kmr_02_4_rooms_1] + - [auto, c, kmr_02_5_entity] + - [auto, c, kmr_02_6_rooms_2] + - [auto, c, kmr_02_7_kammy] + - [auto, c, kmr_02_8_foliage] + - [auto, c, kmr_02_9_images] + - [auto, .data, kmr_02_0_header] + - [auto, .data, kmr_02_1_music] + - [auto, .data, kmr_02_2_main] + - [auto, .data, kmr_02_3_npc] + - [auto, .data, kmr_02_4_rooms_1] + - [auto, .data, kmr_02_5_entity] + - [auto, .data, kmr_02_6_rooms_2] + - [auto, .data, kmr_02_7_kammy] + - [auto, .data, kmr_02_8_foliage] - start: 0x8C7B70 type: .data name: kmr_02_9_images @@ -10032,14 +9733,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8C7F90, c, kmr_03_0_header] - - [0x8C7F90, c, kmr_03_1_music] - - [0x8C7F90, c, kmr_03_2_main] - - [0x8C7F90, c, kmr_03_3_npc] - - [0x8C82B0, c, kmr_03_4_entity] - - [0x8C83A0, c, kmr_03_5_foliage] - - [0x8C85E0, c, kmr_03_6_fall_down] - - [0x8C8680] + - [auto, c, kmr_03_0_header] + - [auto, c, kmr_03_1_music] + - [auto, c, kmr_03_2_main] + - [auto, c, kmr_03_3_npc] + - [auto, c, kmr_03_4_entity] + - [auto, c, kmr_03_5_foliage] + - [auto, c, kmr_03_6_fall_down] - name: kmr_04 dir: world/area_kmr/kmr_04 type: code @@ -10047,17 +9747,17 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8CA900, c, kmr_04_0_header] - - [0x8CA900, c, kmr_04_1_music] - - [0x8CA900, c, kmr_04_2_main] - - [0x8CA900, c, kmr_04_3_npc] - - [0x8CA960, c, kmr_04_4_entity] - - [0x8CA960, c, kmr_04_5_foliage] - - [0x8CAD70, .data, kmr_04_0_header] - - [0x8CAE60, .data, kmr_04_1_music] - - [0x8CAF00, .data, kmr_04_2_main] - - [0x8CB160, .data, kmr_04_3_npc] - - [0x8CC380, .data, kmr_04_4_entity] + - [auto, c, kmr_04_0_header] + - [auto, c, kmr_04_1_music] + - [auto, c, kmr_04_2_main] + - [auto, c, kmr_04_3_npc] + - [auto, c, kmr_04_4_entity] + - [auto, c, kmr_04_5_foliage] + - [auto, .data, kmr_04_0_header] + - [auto, .data, kmr_04_1_music] + - [auto, .data, kmr_04_2_main] + - [auto, .data, kmr_04_3_npc] + - [auto, .data, kmr_04_4_entity] - start: 0x8CC4F0 type: .data name: kmr_04_5_foliage @@ -10072,13 +9772,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8CE070, c, kmr_05_0_header] - - [0x8CE070, c, kmr_05_1_music] - - [0x8CE070, c, kmr_05_2_main] - - [0x8CE070, c, kmr_05_3_npc] - - [0x8CF570, c, kmr_05_4_entity] - - [0x8CF570, c, kmr_05_5_foliage] - - [0x8CF7F0] + - [auto, c, kmr_05_0_header] + - [auto, c, kmr_05_1_music] + - [auto, c, kmr_05_2_main] + - [auto, c, kmr_05_3_npc] + - [auto, c, kmr_05_4_entity] + - [auto, c, kmr_05_5_foliage] - name: kmr_06 dir: world/area_kmr/kmr_06 type: code @@ -10086,13 +9785,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8D1510, c, kmr_06_0_header] - - [0x8D1510, c, kmr_06_1_music] - - [0x8D1510, c, kmr_06_2_main] - - [0x8D1510, c, kmr_06_3_npc] - - [0x8D2A10, c, kmr_06_4_entity] - - [0x8D2A10, c, kmr_06_5_sticker_sign] - - [0x8D32B0] + - [auto, c, kmr_06_0_header] + - [auto, c, kmr_06_1_music] + - [auto, c, kmr_06_2_main] + - [auto, c, kmr_06_3_npc] + - [auto, c, kmr_06_4_entity] + - [auto, c, kmr_06_5_sticker_sign] - name: kmr_07 dir: world/area_kmr/kmr_07 type: code @@ -10100,12 +9798,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8D3DC0, c, kmr_07_0_header] - - [0x8D3DC0, c, kmr_07_1_music] - - [0x8D3DC0, c, kmr_07_2_main] - - [0x8D3DC0, c, kmr_07_3_npc] - - [0x8D4880, c, kmr_07_4_entity] - - [0x8D4880] + - [auto, c, kmr_07_0_header] + - [auto, c, kmr_07_1_music] + - [auto, c, kmr_07_2_main] + - [auto, c, kmr_07_3_npc] + - [auto, c, kmr_07_4_entity] - name: kmr_09 dir: world/area_kmr/kmr_09 type: code @@ -10113,12 +9810,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8D5E00, c, kmr_09_0_header] - - [0x8D5E00, c, kmr_09_1_music] - - [0x8D5E00, c, kmr_09_2_main] - - [0x8D5E00, c, kmr_09_3_npc] - - [0x8D7330, c, kmr_09_4_entity] - - [0x8D7330] + - [auto, c, kmr_09_0_header] + - [auto, c, kmr_09_1_music] + - [auto, c, kmr_09_2_main] + - [auto, c, kmr_09_3_npc] + - [auto, c, kmr_09_4_entity] - name: kmr_10 dir: world/area_kmr/kmr_10 type: code @@ -10126,13 +9822,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8D84D0, c, kmr_10_0_header] - - [0x8D84D0, c, kmr_10_1_music] - - [0x8D84D0, c, kmr_10_2_main] - - [0x8D84D0, c, kmr_10_3_npc] - - [0x8D84D0, c, kmr_10_4_entity] - - [0x8D88A0, c, kmr_10_5_foliage] - - [0x8D8AE0] + - [auto, c, kmr_10_0_header] + - [auto, c, kmr_10_1_music] + - [auto, c, kmr_10_2_main] + - [auto, c, kmr_10_3_npc] + - [auto, c, kmr_10_4_entity] + - [auto, c, kmr_10_5_foliage] - name: kmr_11 dir: world/area_kmr/kmr_11 type: code @@ -10140,19 +9835,18 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8DA100, c, kmr_11_0_header] - - [0x8DA100, c, kmr_11_1_music] - - [0x8DA100, c, kmr_11_2_main] - - [0x8DA3A0, c, kmr_11_3_scenes] - - [0x8DA470, c, kmr_11_4_npc] - - [0x8DAFC0, c, kmr_11_5_entity] - - [0x8DB020, c, kmr_11_6_kammy] - - [0x8DB020, c, kmr_11_7_foliage] - - [0x8DB260, c, kmr_11_8_fortress_skeleton] - - [0x8DB260, c, kmr_11_9_fortress_animation] - - [0x8DB260, c, kmr_11_10_bridge_skeleton] - - [0x8DB260, c, kmr_11_11_bridge_animation] - - [0x8DB260] + - [auto, c, kmr_11_0_header] + - [auto, c, kmr_11_1_music] + - [auto, c, kmr_11_2_main] + - [auto, c, kmr_11_3_scenes] + - [auto, c, kmr_11_4_npc] + - [auto, c, kmr_11_5_entity] + - [auto, c, kmr_11_6_kammy] + - [auto, c, kmr_11_7_foliage] + - [auto, c, kmr_11_8_fortress_skeleton] + - [auto, c, kmr_11_9_fortress_animation] + - [auto, c, kmr_11_10_bridge_skeleton] + - [auto, c, kmr_11_11_bridge_animation] - name: kmr_12 dir: world/area_kmr/kmr_12 type: code @@ -10160,12 +9854,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8EB360, c, kmr_12_0_header] - - [0x8EB360, c, kmr_12_1_music] - - [0x8EB360, c, kmr_12_2_main] - - [0x8EB360, c, kmr_12_3_npc] - - [0x8EB390, c, kmr_12_4_entity] - - [0x8EB390] + - [auto, c, kmr_12_0_header] + - [auto, c, kmr_12_1_music] + - [auto, c, kmr_12_2_main] + - [auto, c, kmr_12_3_npc] + - [auto, c, kmr_12_4_entity] - name: kmr_20 dir: world/area_kmr/kmr_20 type: code @@ -10173,33 +9866,33 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8EBE20, c, kmr_20_0_header] - - [0x8EBE20, c, kmr_20_1_music] - - [0x8EBE50, c, kmr_20_2_main] - - [0x8EC150, c, kmr_20_3_rooms] - - [0x8EC1A0, c, kmr_20_4_documents] - - [0x8ECBF0, c, kmr_20_5_entity] - - [0x8ECC40, c, kmr_20_6_trees] - - [0x8ECE80, c, kmr_20_7_bushes] - - [0x8ED0C0, c, kmr_20_8_bed] - - [0x8ED440, c, kmr_20_9_npc_scenes] - - [0x8ED440, c, kmr_20_10_npc] - - [0x8ED5A0, c, kmr_20_11_npc_intro] - - [0x8EDB70, c, kmr_20_12_npc_epilogue] - - [0x8EDFC0, c, kmr_20_13_records] - - [0x8EE9D0, .data, kmr_20_0_header] - - [0x8EEA60, .data, kmr_20_1_music] - - [0x8EEBC0, .data, kmr_20_2_main] - - [0x8EFDA0, .data, kmr_20_3_rooms] - - [0x8F01E0, .data, kmr_20_4_documents] - - [0x8F1500, .data, kmr_20_5_entity] - - [0x8F1C00, .data, kmr_20_6_trees] - - [0x8F2610, .data, kmr_20_7_bushes] - - [0x8F3130, .data, kmr_20_8_bed] - - [0x8F61F0, .data, kmr_20_9_npc_scenes] - - [0x8F66D0, .data, kmr_20_10_npc] - - [0x8F9D30, .data, kmr_20_11_npc_intro] - - [0x8FCDE0, .data, kmr_20_12_npc_epilogue] + - [auto, c, kmr_20_0_header] + - [auto, c, kmr_20_1_music] + - [auto, c, kmr_20_2_main] + - [auto, c, kmr_20_3_rooms] + - [auto, c, kmr_20_4_documents] + - [auto, c, kmr_20_5_entity] + - [auto, c, kmr_20_6_trees] + - [auto, c, kmr_20_7_bushes] + - [auto, c, kmr_20_8_bed] + - [auto, c, kmr_20_9_npc_scenes] + - [auto, c, kmr_20_10_npc] + - [auto, c, kmr_20_11_npc_intro] + - [auto, c, kmr_20_12_npc_epilogue] + - [auto, c, kmr_20_13_records] + - [auto, .data, kmr_20_0_header] + - [auto, .data, kmr_20_1_music] + - [auto, .data, kmr_20_2_main] + - [auto, .data, kmr_20_3_rooms] + - [auto, .data, kmr_20_4_documents] + - [auto, .data, kmr_20_5_entity] + - [auto, .data, kmr_20_6_trees] + - [auto, .data, kmr_20_7_bushes] + - [auto, .data, kmr_20_8_bed] + - [auto, .data, kmr_20_9_npc_scenes] + - [auto, .data, kmr_20_10_npc] + - [auto, .data, kmr_20_11_npc_intro] + - [auto, .data, kmr_20_12_npc_epilogue] - start: 0x8FEB70 type: .data name: kmr_20_13_records @@ -10213,9 +9906,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8FEE80, c, kmr_21_0_header] - - [0x8FEE90, c, kmr_21_1_main] - - [0x8FF160] + - [auto, c, kmr_21_0_header] + - [auto, c, kmr_21_1_main] - name: kmr_22 dir: world/area_kmr/kmr_22 type: code @@ -10223,11 +9915,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x8FF670, c, kmr_22_0_header] - - [0x8FF680, c, kmr_22_1_main] - - [0x8FF8B0, c, kmr_22_2_npc] - - [0x900380, .data, kmr_22_0_header] - - [0x900450, .data, kmr_22_1_main] + - [auto, c, kmr_22_0_header] + - [auto, c, kmr_22_1_main] + - [auto, c, kmr_22_2_npc] + - [auto, .data, kmr_22_0_header] + - [auto, .data, kmr_22_1_main] - start: 0x900A80 type: .data name: kmr_22_2_npc @@ -10244,11 +9936,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x907A30, c, kmr_23_0_header] - - [0x907A40, c, kmr_23_1_main] - - [0x907A70, c, kmr_23_2_npc] - - [0x908B00, .data, kmr_23_0_header] - - [0x908BC0, .data, kmr_23_1_main] + - [auto, c, kmr_23_0_header] + - [auto, c, kmr_23_1_main] + - [auto, c, kmr_23_2_npc] + - [auto, .data, kmr_23_0_header] + - [auto, .data, kmr_23_1_main] - start: 0x909090 type: .data name: kmr_23_2_npc @@ -10266,9 +9958,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x90B240, c, kmr_24_0_header] - - [0x90B250, c, kmr_24_1_main] - - [0x90B350] + - [auto, c, kmr_24_0_header] + - [auto, c, kmr_24_1_main] - name: kmr_30 dir: world/area_kmr/kmr_30 type: code @@ -10276,11 +9967,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x90B6D0, c, kmr_30_0_header] - - [0x90B6D0, c, kmr_30_1_main] - - [0x90B9E0, c, kmr_30_2_npc] - - [0x90B9E0, c, kmr_30_3_the_end] - - [0x90BBB0] + - [auto, c, kmr_30_0_header] + - [auto, c, kmr_30_1_main] + - [auto, c, kmr_30_2_npc] + - [auto, c, kmr_30_3_the_end] - name: iwa_00 dir: world/area_iwa/iwa_00 type: code @@ -10288,12 +9978,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x90CC40, c, iwa_00_0_header] - - [0x90CC40, c, iwa_00_1_main] - - [0x90CC40, c, iwa_00_2_entity] - - [0x90CC40, c, iwa_00_3_npc] - - [0x90CEF0, c, iwa_00_4_slide] - - [0x90CF20] + - [auto, c, iwa_00_0_header] + - [auto, c, iwa_00_1_main] + - [auto, c, iwa_00_2_entity] + - [auto, c, iwa_00_3_npc] + - [auto, c, iwa_00_4_slide] - name: iwa_01 dir: world/area_iwa/iwa_01 type: code @@ -10301,15 +9990,15 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x90F6B0, c, iwa_01_0_header] - - [0x90F6B0, c, iwa_01_1_main] - - [0x90F6B0, c, iwa_01_2_entity] - - [0x90F6B0, c, iwa_01_3_splash] - - [0x90FBD0, c, iwa_01_4_npc] - - [0x912960, c, iwa_01_5_slide] - - [0x912990, .data, iwa_01_0_header] - - [0x912A10, .data, iwa_01_1_main] - - [0x912F60, .data, iwa_01_2_entity] + - [auto, c, iwa_01_0_header] + - [auto, c, iwa_01_1_main] + - [auto, c, iwa_01_2_entity] + - [auto, c, iwa_01_3_splash] + - [auto, c, iwa_01_4_npc] + - [auto, c, iwa_01_5_slide] + - [auto, .data, iwa_01_0_header] + - [auto, .data, iwa_01_1_main] + - [auto, .data, iwa_01_2_entity] - start: 0x913070 type: .data name: iwa_01_3_splash @@ -10318,8 +10007,8 @@ segments: - [0x913470, vtx, splash] - [0x9134B0, gfx, splash] - [0x913578] - - [0x9135D0, .data, iwa_01_4_npc] - - [0x9154B0, .data, iwa_01_5_slide] + - [auto, .data, iwa_01_4_npc] + - [auto, .data, iwa_01_5_slide] - name: iwa_02 dir: world/area_iwa/iwa_02 type: code @@ -10327,11 +10016,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x915D70, c, iwa_02_0_header] - - [0x915D70, c, iwa_02_1_main] - - [0x915D70, c, iwa_02_2_entity] - - [0x915D70, c, iwa_02_3_npc] - - [0x916E70] + - [auto, c, iwa_02_0_header] + - [auto, c, iwa_02_1_main] + - [auto, c, iwa_02_2_entity] + - [auto, c, iwa_02_3_npc] - name: iwa_03 dir: world/area_iwa/iwa_03 type: code @@ -10339,12 +10027,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x918BB0, c, iwa_03_0_header] - - [0x918BB0, c, iwa_03_1_main] - - [0x918BB0, c, iwa_03_2_entity] - - [0x918EF0, c, iwa_03_3_npc] - - [0x919ED0, c, iwa_03_4_slide] - - [0x919F00] + - [auto, c, iwa_03_0_header] + - [auto, c, iwa_03_1_main] + - [auto, c, iwa_03_2_entity] + - [auto, c, iwa_03_3_npc] + - [auto, c, iwa_03_4_slide] - name: iwa_04 dir: world/area_iwa/iwa_04 type: code @@ -10352,12 +10039,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x91B8E0, c, iwa_04_0_header] - - [0x91B8E0, c, iwa_04_1_music] - - [0x91B8E0, c, iwa_04_2_main] - - [0x91B8E0, c, iwa_04_3_entity] - - [0x91B960, c, iwa_04_4_npc] - - [0x91C9C0] + - [auto, c, iwa_04_0_header] + - [auto, c, iwa_04_1_music] + - [auto, c, iwa_04_2_main] + - [auto, c, iwa_04_3_entity] + - [auto, c, iwa_04_4_npc] - name: iwa_10 dir: world/area_iwa/iwa_10 type: code @@ -10365,16 +10051,15 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x91E570, c, iwa_10_0_header] - - [0x91E570, c, iwa_10_1_music] - - [0x91E570, c, iwa_10_2_main] - - [0x91E5B0, c, iwa_10_3_npc] - - [0x91E6D0, c, iwa_10_4_train] - - [0x91F5A0, c, iwa_10_5_entity] - - [0x91FA80, c, iwa_10_6_parakarry] - - [0x91FA80, c, iwa_10_7_new_partner] - - [0x91FB20, c, iwa_10_8_foliage] - - [0x91FD60] + - [auto, c, iwa_10_0_header] + - [auto, c, iwa_10_1_music] + - [auto, c, iwa_10_2_main] + - [auto, c, iwa_10_3_npc] + - [auto, c, iwa_10_4_train] + - [auto, c, iwa_10_5_entity] + - [auto, c, iwa_10_6_parakarry] + - [auto, c, iwa_10_7_new_partner] + - [auto, c, iwa_10_8_foliage] - name: iwa_11 dir: world/area_iwa/iwa_11 type: code @@ -10382,13 +10067,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9269F0, c, iwa_11_0_header] - - [0x9269F0, c, iwa_11_1_music] - - [0x9269F0, c, iwa_11_2_main] - - [0x926A10, c, iwa_11_3_train] - - [0x926C70, c, iwa_11_4_scenery] - - [0x926C70, c, iwa_11_5_npc] - - [0x926D00] + - [auto, c, iwa_11_0_header] + - [auto, c, iwa_11_1_music] + - [auto, c, iwa_11_2_main] + - [auto, c, iwa_11_3_train] + - [auto, c, iwa_11_4_scenery] + - [auto, c, iwa_11_5_npc] - name: sbk_00 dir: world/area_sbk/sbk_00 type: code @@ -10396,11 +10080,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x929270, c, sbk_00_0_header] - - [0x929270, c, sbk_00_1_main] - - [0x9292B0, c, sbk_00_2_npc] - - [0x9292B0, c, sbk_00_3_entity] - - [0x9292D0] + - [auto, c, sbk_00_0_header] + - [auto, c, sbk_00_1_main] + - [auto, c, sbk_00_2_npc] + - [auto, c, sbk_00_3_entity] - name: sbk_01 dir: world/area_sbk/sbk_01 type: code @@ -10408,9 +10091,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x929A90, c, sbk_01_1_main] - - [0x929AD0, c, sbk_01_2_npc] - - [0x929AF0] + - [auto, c, sbk_01_1_main] + - [auto, c, sbk_01_2_npc] - name: sbk_02 #TODO dir: world/area_sbk/sbk_02 type: code @@ -10418,13 +10100,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x92A2B0, c, sbk_02_0_header] - - [0x92A2F0, c, sbk_02_1_music] - - [0x92A2F0, c, sbk_02_2_main] - - [0x92A2F0, c, sbk_02_3_ruins] - - [0x92A9A0, c, sbk_02_4_npc] - - [0x92A9A0, c, sbk_02_5_entity] - - [0x92AEB0] + - [auto, c, sbk_02_0_header] + - [auto, c, sbk_02_1_music] + - [auto, c, sbk_02_2_main] + - [auto, c, sbk_02_3_ruins] + - [auto, c, sbk_02_4_npc] + - [auto, c, sbk_02_5_entity] - name: sbk_03 dir: world/area_sbk/sbk_03 type: code @@ -10432,9 +10113,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x92F8B0, c, sbk_03_1_main] - - [0x92F8F0, c, sbk_03_2_npc] - - [0x92F910] + - [auto, c, sbk_03_1_main] + - [auto, c, sbk_03_2_npc] - name: sbk_04 dir: world/area_sbk/sbk_04 type: code @@ -10442,9 +10122,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9304D0, c, sbk_04_1_main] - - [0x930510, c, sbk_04_2_npc] - - [0x930530] + - [auto, c, sbk_04_1_main] + - [auto, c, sbk_04_2_npc] - name: sbk_05 dir: world/area_sbk/sbk_05 type: code @@ -10452,10 +10131,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x930CF0, c, sbk_05_1_main] - - [0x930D30, c, sbk_05_2_entity] - - [0x930D30, c, sbk_05_3_npc] - - [0x930D50] + - [auto, c, sbk_05_1_main] + - [auto, c, sbk_05_2_entity] + - [auto, c, sbk_05_3_npc] - name: sbk_06 dir: world/area_sbk/sbk_06 type: code @@ -10463,11 +10141,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9325C0, c, sbk_06_1_main] - - [0x932600, c, sbk_06_2_npc] - - [0x932600, c, sbk_06_3_foliage] - - [0x932600, c, sbk_06_4_entity] - - [0x932940] + - [auto, c, sbk_06_1_main] + - [auto, c, sbk_06_2_npc] + - [auto, c, sbk_06_3_foliage] + - [auto, c, sbk_06_4_entity] - name: sbk_10 dir: world/area_sbk/sbk_10 type: code @@ -10475,9 +10152,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x933C80, c, sbk_10_1_main] - - [0x933C80, c, sbk_10_2_entity] - - [0x933CC0] + - [auto, c, sbk_10_1_main] + - [auto, c, sbk_10_2_entity] - name: sbk_11 dir: world/area_sbk/sbk_11 type: code @@ -10485,9 +10161,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x934040, c, sbk_11_1_main] - - [0x934080, c, sbk_11_2_npc] - - [0x9341A0] + - [auto, c, sbk_11_1_main] + - [auto, c, sbk_11_2_npc] - name: sbk_12 dir: world/area_sbk/sbk_12 type: code @@ -10495,9 +10170,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x934D40, c, sbk_12_1_main] - - [0x934D80, c, sbk_12_2_npc] - - [0x934DA0] + - [auto, c, sbk_12_1_main] + - [auto, c, sbk_12_2_npc] - name: sbk_13 dir: world/area_sbk/sbk_13 type: code @@ -10505,9 +10179,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9357E0, c, sbk_13_1_main] - - [0x935820, c, sbk_13_2_npc] - - [0x935940] + - [auto, c, sbk_13_1_main] + - [auto, c, sbk_13_2_npc] - name: sbk_14 dir: world/area_sbk/sbk_14 type: code @@ -10515,9 +10188,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9366E0, c, sbk_14_1_main] - - [0x9366E0, c, sbk_14_2_entity] - - [0x936720] + - [auto, c, sbk_14_1_main] + - [auto, c, sbk_14_2_entity] - name: sbk_15 dir: world/area_sbk/sbk_15 type: code @@ -10525,9 +10197,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x936CD0, c, sbk_15_1_main] - - [0x936D10, c, sbk_15_2_npc] - - [0x936D30] + - [auto, c, sbk_15_1_main] + - [auto, c, sbk_15_2_npc] - name: sbk_16 dir: world/area_sbk/sbk_16 type: code @@ -10535,9 +10206,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x937570, c, sbk_16_1_main] - - [0x9375B0, c, sbk_16_2_foliage] - - [0x9377F0] + - [auto, c, sbk_16_1_main] + - [auto, c, sbk_16_2_foliage] - name: sbk_20 dir: world/area_sbk/sbk_20 type: code @@ -10545,10 +10215,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x938590, c, sbk_20_1_main] - - [0x9385D0, c, sbk_20_2_entity] - - [0x9385D0, c, sbk_20_2_npc] - - [0x9386D0] + - [auto, c, sbk_20_1_main] + - [auto, c, sbk_20_2_entity] + - [auto, c, sbk_20_2_npc] - name: sbk_21 dir: world/area_sbk/sbk_21 type: code @@ -10556,8 +10225,7 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x939560, c, sbk_21_1_main] - - [0x9395A0] + - [auto, c, sbk_21_1_main] - name: sbk_22 dir: world/area_sbk/sbk_22 type: code @@ -10565,10 +10233,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x939930, c, sbk_22_1_main] - - [0x939970, c, sbk_22_2_npc] - - [0x939970, c, sbk_22_3_entity] - - [0x939A90] + - [auto, c, sbk_22_1_main] + - [auto, c, sbk_22_2_npc] + - [auto, c, sbk_22_3_entity] - name: sbk_23 dir: world/area_sbk/sbk_23 type: code @@ -10576,9 +10243,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x93A760, c, sbk_23_1_main] - - [0x93A760, c, sbk_23_2_entity] - - [0x93A7A0] + - [auto, c, sbk_23_1_main] + - [auto, c, sbk_23_2_entity] - name: sbk_24 dir: world/area_sbk/sbk_24 type: code @@ -10586,11 +10252,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x93AC30, c, sbk_24_1_main] - - [0x93AC70, c, sbk_24_2_npc] - - [0x93AC70, c, sbk_24_3_entity] - - [0x93AC70, c, sbk_24_4_foliage] - - [0x93AFB0] + - [auto, c, sbk_24_1_main] + - [auto, c, sbk_24_2_npc] + - [auto, c, sbk_24_3_entity] + - [auto, c, sbk_24_4_foliage] - name: sbk_25 dir: world/area_sbk/sbk_25 type: code @@ -10598,11 +10263,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x93C280, c, sbk_25_1_main] - - [0x93C2C0, c, sbk_25_2_npc] - - [0x93C2C0, c, sbk_25_3_foliage] - - [0x93C2C0, c, sbk_25_4_entity] - - [0x93C600] + - [auto, c, sbk_25_1_main] + - [auto, c, sbk_25_2_npc] + - [auto, c, sbk_25_3_foliage] + - [auto, c, sbk_25_4_entity] - name: sbk_26 dir: world/area_sbk/sbk_26 type: code @@ -10610,10 +10274,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x93DCD0, c, sbk_26_1_main] - - [0x93DD10, c, sbk_26_2_npc] - - [0x93DE30, c, sbk_26_3_foliage] - - [0x93E070] + - [auto, c, sbk_26_1_main] + - [auto, c, sbk_26_2_npc] + - [auto, c, sbk_26_3_foliage] - name: sbk_30 dir: world/area_sbk/sbk_30 type: code @@ -10621,12 +10284,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x93F5B0, c, sbk_30_0_header] - - [0x93F5B0, c, sbk_30_1_music] - - [0x93F5B0, c, sbk_30_2_main] - - [0x93F5B0, c, sbk_30_3_npc] - - [0x93F5B0, c, sbk_30_4_foliage] - - [0x940DC0] + - [auto, c, sbk_30_0_header] + - [auto, c, sbk_30_1_music] + - [auto, c, sbk_30_2_main] + - [auto, c, sbk_30_3_npc] + - [auto, c, sbk_30_4_foliage] - name: sbk_31 dir: world/area_sbk/sbk_31 type: code @@ -10634,9 +10296,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x944000, c, sbk_31_1_main] - - [0x944040, c, sbk_31_2_npc] - - [0x944140] + - [auto, c, sbk_31_1_main] + - [auto, c, sbk_31_2_npc] - name: sbk_32 dir: world/area_sbk/sbk_32 type: code @@ -10644,9 +10305,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x944A60, c, sbk_32_1_main] - - [0x944AA0, c, sbk_32_2_npc] - - [0x944BC0] + - [auto, c, sbk_32_1_main] + - [auto, c, sbk_32_2_npc] - name: sbk_33 dir: world/area_sbk/sbk_33 type: code @@ -10654,10 +10314,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: # unusual organization - - [0x9459D0, c, sbk_33_0_header] - - [0x9459D0, c, sbk_33_1_entity] - - [0x9459D0, c, sbk_33_2_main] - - [0x945A10] + - [auto, c, sbk_33_0_header] + - [auto, c, sbk_33_1_entity] + - [auto, c, sbk_33_2_main] - name: sbk_34 dir: world/area_sbk/sbk_34 type: code @@ -10665,10 +10324,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x945ED0, c, sbk_34_1_main] - - [0x945F10, c, sbk_34_2_npc] - - [0x946670, c, sbk_34_3_foliage] - - [0x9468B0] + - [auto, c, sbk_34_1_main] + - [auto, c, sbk_34_2_npc] + - [auto, c, sbk_34_3_foliage] - name: sbk_35 dir: world/area_sbk/sbk_35 type: code @@ -10676,10 +10334,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9486B0, c, sbk_35_1_main] - - [0x9486F0, c, sbk_35_2_npc] - - [0x9486F0, c, sbk_35_3_foliage] - - [0x949E40] + - [auto, c, sbk_35_1_main] + - [auto, c, sbk_35_2_npc] + - [auto, c, sbk_35_3_foliage] - name: sbk_36 dir: world/area_sbk/sbk_36 type: code @@ -10687,10 +10344,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x949E60, c, sbk_36_1_main] - - [0x949EA0, c, sbk_36_2_foliage] - - [0x949EA0, c, sbk_36_3_entity] - - [0x94A0E0] + - [auto, c, sbk_36_1_main] + - [auto, c, sbk_36_2_foliage] + - [auto, c, sbk_36_3_entity] - name: sbk_40 dir: world/area_sbk/sbk_40 type: code @@ -10698,10 +10354,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x94B3A0, c, sbk_40_1_main] - - [0x94B3E0, c, sbk_40_2_npc] - - [0x94B3E0, c, sbk_40_3_entity] - - [0x94B4E0] + - [auto, c, sbk_40_1_main] + - [auto, c, sbk_40_2_npc] + - [auto, c, sbk_40_3_entity] - name: sbk_41 dir: world/area_sbk/sbk_41 type: code @@ -10709,9 +10364,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x94C040, c, sbk_41_1_main] - - [0x94C040, c, sbk_41_2_entity] - - [0x94C080] + - [auto, c, sbk_41_1_main] + - [auto, c, sbk_41_2_entity] - name: sbk_42 dir: world/area_sbk/sbk_42 type: code @@ -10719,9 +10373,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x94C510, c, sbk_42_1_main] - - [0x94C550, c, sbk_42_2_npc] - - [0x94C650] + - [auto, c, sbk_42_1_main] + - [auto, c, sbk_42_2_npc] - name: sbk_43 dir: world/area_sbk/sbk_43 type: code @@ -10729,9 +10382,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x94D170, c, sbk_43_1_main] - - [0x94D170, c, sbk_43_2_entity] - - [0x94D170] + - [auto, c, sbk_43_1_main] + - [auto, c, sbk_43_2_entity] - name: sbk_44 dir: world/area_sbk/sbk_44 type: code @@ -10739,9 +10391,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x94D5A0, c, sbk_44_1_main] - - [0x94D5E0, c, sbk_44_2_npc] - - [0x94D700] + - [auto, c, sbk_44_1_main] + - [auto, c, sbk_44_2_npc] - name: sbk_45 dir: world/area_sbk/sbk_45 type: code @@ -10749,9 +10400,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x94E4A0, c, sbk_45_1_main] - - [0x94E4A0, c, sbk_45_2_entity] - - [0x94E4E0] + - [auto, c, sbk_45_1_main] + - [auto, c, sbk_45_2_entity] - name: sbk_46 dir: world/area_sbk/sbk_46 type: code @@ -10759,11 +10409,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x94E9A0, c, sbk_46_1_main] - - [0x94E9E0, c, sbk_46_2_npc] - - [0x94EB00, c, sbk_46_3_foliage] - - [0x94EB00, c, sbk_46_4_entity] - - [0x94ED40] + - [auto, c, sbk_46_1_main] + - [auto, c, sbk_46_2_npc] + - [auto, c, sbk_46_3_foliage] + - [auto, c, sbk_46_4_entity] - name: sbk_50 dir: world/area_sbk/sbk_50 type: code @@ -10771,8 +10420,7 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x950610, c, sbk_50_1_main] - - [0x950650] + - [auto, c, sbk_50_1_main] - name: sbk_51 dir: world/area_sbk/sbk_51 type: code @@ -10780,9 +10428,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x950970, c, sbk_51_1_main] - - [0x9509B0, c, sbk_51_2_npc] - - [0x950AD0] + - [auto, c, sbk_51_1_main] + - [auto, c, sbk_51_2_npc] - name: sbk_52 dir: world/area_sbk/sbk_52 type: code @@ -10790,9 +10437,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x951670, c, sbk_52_1_main] - - [0x951670, c, sbk_52_2_entity] - - [0x9516B0] + - [auto, c, sbk_52_1_main] + - [auto, c, sbk_52_2_entity] - name: sbk_53 dir: world/area_sbk/sbk_53 type: code @@ -10800,9 +10446,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x951AE0, c, sbk_53_1_main] - - [0x951B20, c, sbk_53_2_npc] - - [0x951B40] + - [auto, c, sbk_53_1_main] + - [auto, c, sbk_53_2_npc] - name: sbk_54 dir: world/area_sbk/sbk_54 type: code @@ -10810,9 +10455,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x952580, c, sbk_54_1_main] - - [0x952580, c, sbk_54_2_entity] - - [0x9525C0] + - [auto, c, sbk_54_1_main] + - [auto, c, sbk_54_2_entity] - name: sbk_55 dir: world/area_sbk/sbk_55 type: code @@ -10820,11 +10464,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x952A50, c, sbk_55_1_main] - - [0x952A90, c, sbk_55_2_npc] - - [0x952AB0, c, sbk_55_3_foliage] - - [0x952AB0, c, sbk_55_4_entity] - - [0x952CF0] + - [auto, c, sbk_55_1_main] + - [auto, c, sbk_55_2_npc] + - [auto, c, sbk_55_3_foliage] + - [auto, c, sbk_55_4_entity] - name: sbk_56 dir: world/area_sbk/sbk_56 type: code @@ -10832,10 +10475,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x953FC0, c, sbk_56_1_main] - - [0x954D80, c, sbk_56_2_entity] - - [0x954D80, c, sbk_56_3_foliage] - - [0x954FC0] + - [auto, c, sbk_56_1_main] + - [auto, c, sbk_56_2_entity] + - [auto, c, sbk_56_3_foliage] - name: sbk_60 dir: world/area_sbk/sbk_60 type: code @@ -10843,9 +10485,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9569F0, c, sbk_60_1_main] - - [0x956A30, c, sbk_60_2_npc] - - [0x956A50] + - [auto, c, sbk_60_1_main] + - [auto, c, sbk_60_2_npc] - name: sbk_61 dir: world/area_sbk/sbk_61 type: code @@ -10853,9 +10494,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x956F90, c, sbk_61_1_main] - - [0x956F90, c, sbk_61_2_entity] - - [0x956FD0] + - [auto, c, sbk_61_1_main] + - [auto, c, sbk_61_2_entity] - name: sbk_62 dir: world/area_sbk/sbk_62 type: code @@ -10863,9 +10503,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x957350, c, sbk_62_1_main] - - [0x957390, c, sbk_62_2_npc] - - [0x9573B0] + - [auto, c, sbk_62_1_main] + - [auto, c, sbk_62_2_npc] - name: sbk_63 dir: world/area_sbk/sbk_63 type: code @@ -10873,9 +10512,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x957D70, c, sbk_63_1_main] - - [0x957DB0, c, sbk_63_2_npc] - - [0x957DD0] + - [auto, c, sbk_63_1_main] + - [auto, c, sbk_63_2_npc] - name: sbk_64 dir: world/area_sbk/sbk_64 type: code @@ -10883,9 +10521,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x958590, c, sbk_64_1_main] - - [0x958590, c, sbk_64_2_entity] - - [0x9585D0] + - [auto, c, sbk_64_1_main] + - [auto, c, sbk_64_2_entity] - name: sbk_65 dir: world/area_sbk/sbk_65 type: code @@ -10893,8 +10530,7 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x958950, c, sbk_65_1_main] - - [0x958990] + - [auto, c, sbk_65_1_main] - name: sbk_66 dir: world/area_sbk/sbk_66 type: code @@ -10902,11 +10538,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x958CB0, c, sbk_66_1_main] - - [0x958CF0, c, sbk_66_2_npc] - - [0x958CF0, c, sbk_66_3_foliage] - - [0x958CF0, c, sbk_66_4_entity] - - [0x959030] + - [auto, c, sbk_66_1_main] + - [auto, c, sbk_66_2_npc] + - [auto, c, sbk_66_3_foliage] + - [auto, c, sbk_66_4_entity] - name: sbk_99 dir: world/area_sbk/sbk_99 type: code @@ -10914,9 +10549,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x95AEB0, c, sbk_99_1_main] - - [0x95AEB0, c, sbk_99_2_entity] - - [0x95AEB0] + - [auto, c, sbk_99_1_main] + - [auto, c, sbk_99_2_entity] - name: dro_01 dir: world/area_dro/dro_01 type: code @@ -10924,15 +10558,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x95B200, c, dro_01_0_header] - - [0x95B200, c, dro_01_1_music] - - [0x95B200, c, dro_01_2_main] - - [0x95B7E0, c, dro_01_3_npc] - - [0x95E660, c, dro_01_4_shop] - - [0x95E660, c, dro_01_5_rooms] - - [0x95E7A0, c, dro_01_6_entity] - - [0x95EA80, c, dro_01_7_foliage] - - [0x95ECC0] + - [auto, c, dro_01_0_header] + - [auto, c, dro_01_1_music] + - [auto, c, dro_01_2_main] + - [auto, c, dro_01_3_npc] + - [auto, c, dro_01_4_shop] + - [auto, c, dro_01_5_rooms] + - [auto, c, dro_01_6_entity] + - [auto, c, dro_01_7_foliage] - name: dro_02 dir: world/area_dro/dro_02 type: code @@ -10940,17 +10573,17 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9691C0, c, dro_02_0_header] - - [0x9691C0, c, dro_02_1_music] - - [0x9691C0, c, dro_02_2_entity] - - [0x9691C0, c, dro_02_3_main] - - [0x9694C0, c, dro_02_4_rooms] - - [0x9694C0, c, dro_02_5_npc] - - [0x96CC30, .data, dro_02_0_header] - - [0x96CCB0, .data, dro_02_1_music] - - [0x96CD90, .data, dro_02_2_entity] - - [0x96CE00, .data, dro_02_3_main] - - [0x96D380, .data, dro_02_4_rooms] + - [auto, c, dro_02_0_header] + - [auto, c, dro_02_1_music] + - [auto, c, dro_02_2_entity] + - [auto, c, dro_02_3_main] + - [auto, c, dro_02_4_rooms] + - [auto, c, dro_02_5_npc] + - [auto, .data, dro_02_0_header] + - [auto, .data, dro_02_1_music] + - [auto, .data, dro_02_2_entity] + - [auto, .data, dro_02_3_main] + - [auto, .data, dro_02_4_rooms] - start: 0x96DFA0 type: .data name: dro_02_5_npc @@ -10974,12 +10607,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x978140, c, isk_01_0_header] - - [0x978140, c, isk_01_1_music] - - [0x978140, c, isk_01_2_main] - - [0x978140, c, isk_01_3_haze] - - [0x978140, c, isk_01_4_entity] - - [0x978140] + - [auto, c, isk_01_0_header] + - [auto, c, isk_01_1_music] + - [auto, c, isk_01_2_main] + - [auto, c, isk_01_3_haze] + - [auto, c, isk_01_4_entity] - name: isk_02 dir: world/area_isk/isk_02 type: code @@ -10987,13 +10619,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x978710, c, isk_02_0_header] - - [0x978710, c, isk_02_1_main] - - [0x978710, c, isk_02_2_lock] - - [0x978750, c, isk_02_3_ambush] - - [0x978800, c, isk_02_4_entity] - - [0x978800, c, isk_02_5_npc] - - [0x978820] + - [auto, c, isk_02_0_header] + - [auto, c, isk_02_1_main] + - [auto, c, isk_02_2_lock] + - [auto, c, isk_02_3_ambush] + - [auto, c, isk_02_4_entity] + - [auto, c, isk_02_5_npc] - name: isk_03 dir: world/area_isk/isk_03 type: code @@ -11001,12 +10632,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x979E50, c, isk_03_0_header] - - [0x979E50, c, isk_03_1_main] - - [0x979E50, c, isk_03_2_sand] - - [0x979E50, c, isk_03_3_entity] - - [0x979E50, c, isk_03_4_switch] - - [0x979E50] + - [auto, c, isk_03_0_header] + - [auto, c, isk_03_1_main] + - [auto, c, isk_03_2_sand] + - [auto, c, isk_03_3_entity] + - [auto, c, isk_03_4_switch] - name: isk_04 dir: world/area_isk/isk_04 type: code @@ -11014,14 +10644,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x97B630, c, isk_04_0_header] - - [0x97B630, c, isk_04_1_music] - - [0x97B630, c, isk_04_2_main] - - [0x97B630, c, isk_04_3_obstructions] - - [0x97B670, c, isk_04_4_entity] - - [0x97B670, c, isk_04_5_npc] - - [0x97BF60, c, isk_04_6_demo] - - [0x97DA40] + - [auto, c, isk_04_0_header] + - [auto, c, isk_04_1_music] + - [auto, c, isk_04_2_main] + - [auto, c, isk_04_3_obstructions] + - [auto, c, isk_04_4_entity] + - [auto, c, isk_04_5_npc] + - [auto, c, isk_04_6_demo] - name: isk_05 dir: world/area_isk/isk_05 type: code @@ -11029,11 +10658,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x97DAD0, c, isk_05_0_header] - - [0x97DAD0, c, isk_05_1_main] - - [0x97DAD0, c, isk_05_2_entity] - - [0x97DAD0, c, isk_05_3_npc] - - [0x97F990] + - [auto, c, isk_05_0_header] + - [auto, c, isk_05_1_main] + - [auto, c, isk_05_2_entity] + - [auto, c, isk_05_3_npc] - name: isk_06 dir: world/area_isk/isk_06 type: code @@ -11041,12 +10669,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x980A20, c, isk_06_0_header] - - [0x980A20, c, isk_06_1_main] - - [0x980A20, c, isk_06_2_entity] - - [0x980A20, c, isk_06_3_sand] - - [0x980A20, c, isk_06_4_switch] - - [0x980A20] + - [auto, c, isk_06_0_header] + - [auto, c, isk_06_1_main] + - [auto, c, isk_06_2_entity] + - [auto, c, isk_06_3_sand] + - [auto, c, isk_06_4_switch] - name: isk_07 dir: world/area_isk/isk_07 type: code @@ -11054,15 +10681,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x982440, c, isk_07_0_header] - - [0x982440, c, isk_07_1_main] - - [0x982440, c, isk_07_2_entity] - - [0x982440, c, isk_07_3_npc] - - [0x9824F0, c, isk_07_4_stairs] - - [0x9824F0, c, isk_07_5_lock] - - [0x982530, c, isk_07_6_switch] - - [0x984E20, c, isk_07_7_ambush] - - [0x984E20] + - [auto, c, isk_07_0_header] + - [auto, c, isk_07_1_main] + - [auto, c, isk_07_2_entity] + - [auto, c, isk_07_3_npc] + - [auto, c, isk_07_4_stairs] + - [auto, c, isk_07_5_lock] + - [auto, c, isk_07_6_switch] + - [auto, c, isk_07_7_ambush] - name: isk_08 dir: world/area_isk/isk_08 type: code @@ -11070,11 +10696,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x984E30, c, isk_08_0_header] - - [0x984E30, c, isk_08_1_main] - - [0x984E30, c, isk_08_2_npc] - - [0x986090, c, isk_08_3_entity] - - [0x986090] + - [auto, c, isk_08_0_header] + - [auto, c, isk_08_1_main] + - [auto, c, isk_08_2_npc] + - [auto, c, isk_08_3_entity] - name: isk_09 dir: world/area_isk/isk_09 type: code @@ -11082,13 +10707,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9864E0, c, isk_09_0_header] - - [0x9864E0, c, isk_09_1_music] - - [0x9864E0, c, isk_09_2_main] - - [0x9864E0, c, isk_09_3_entity] - - [0x9867D0, c, isk_09_4_stairs] - - [0x9867D0, c, isk_09_5_switch] - - [0x988B50] + - [auto, c, isk_09_0_header] + - [auto, c, isk_09_1_music] + - [auto, c, isk_09_2_main] + - [auto, c, isk_09_3_entity] + - [auto, c, isk_09_4_stairs] + - [auto, c, isk_09_5_switch] - name: isk_10 dir: world/area_isk/isk_10 type: code @@ -11096,11 +10720,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x988B60, c, isk_10_0_header] - - [0x988B60, c, isk_10_1_main] - - [0x988B60, c, isk_10_2_entity] - - [0x98A9E0, c, isk_10_3_bombable] - - [0x98A9E0] + - [auto, c, isk_10_0_header] + - [auto, c, isk_10_1_main] + - [auto, c, isk_10_2_entity] + - [auto, c, isk_10_3_bombable] - name: isk_11 dir: world/area_isk/isk_11 type: code @@ -11108,14 +10731,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x98AA10, c, isk_11_0_header] - - [0x98AA10, c, isk_11_1_music] - - [0x98AA10, c, isk_11_2_main] - - [0x98AA10, c, isk_11_3_entity] - - [0x98AA10, c, isk_11_4_scene] - - [0x98AAC0, c, isk_11_5_puzzle] - - [0x98AB30, c, isk_11_6_lock] - - [0x98AB70] + - [auto, c, isk_11_0_header] + - [auto, c, isk_11_1_music] + - [auto, c, isk_11_2_main] + - [auto, c, isk_11_3_entity] + - [auto, c, isk_11_4_scene] + - [auto, c, isk_11_5_puzzle] + - [auto, c, isk_11_6_lock] - name: isk_12 dir: world/area_isk/isk_12 type: code @@ -11123,12 +10745,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x98D640, c, isk_12_0_header] - - [0x98D640, c, isk_12_1_main] - - [0x98D640, c, isk_12_2_entity] - - [0x98D640, c, isk_12_3_sand] - - [0x98D640, c, isk_12_4_switch] - - [0x98F7C0] + - [auto, c, isk_12_0_header] + - [auto, c, isk_12_1_main] + - [auto, c, isk_12_2_entity] + - [auto, c, isk_12_3_sand] + - [auto, c, isk_12_4_switch] - name: isk_13 dir: world/area_isk/isk_13 type: code @@ -11136,11 +10757,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x98F7E0, c, isk_13_0_header] - - [0x98F7E0, c, isk_13_1_main] - - [0x98F7E0, c, isk_13_2_entity] - - [0x98F7E0, c, isk_13_3_npc] - - [0x992680] + - [auto, c, isk_13_0_header] + - [auto, c, isk_13_1_main] + - [auto, c, isk_13_2_entity] + - [auto, c, isk_13_3_npc] - name: isk_14 dir: world/area_isk/isk_14 type: code @@ -11148,11 +10768,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x992730, c, isk_14_0_header] - - [0x992730, c, isk_14_1_main] - - [0x992730, c, isk_14_2_entity] - - [0x992730, c, isk_14_3_npc] - - [0x994490] + - [auto, c, isk_14_0_header] + - [auto, c, isk_14_1_main] + - [auto, c, isk_14_2_entity] + - [auto, c, isk_14_3_npc] - name: isk_16 dir: world/area_isk/isk_16 type: code @@ -11160,12 +10779,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9951F0, c, isk_16_0_header] - - [0x9951F0, c, isk_16_1_main] - - [0x9959F0, c, isk_16_2_npc] - - [0x9959F0, c, isk_16_3_boss] - - [0x997F40, c, isk_16_4_entity] - - [0x997F40] + - [auto, c, isk_16_0_header] + - [auto, c, isk_16_1_main] + - [auto, c, isk_16_2_npc] + - [auto, c, isk_16_3_boss] + - [auto, c, isk_16_4_entity] - name: isk_18 dir: world/area_isk/isk_18 type: code @@ -11173,11 +10791,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x997F70, c, isk_18_0_header] - - [0x997F70, c, isk_18_1_main] - - [0x997F70, c, isk_18_2_npc] - - [0x9996D0, c, isk_18_3_entity] - - [0x9996D0] + - [auto, c, isk_18_0_header] + - [auto, c, isk_18_1_main] + - [auto, c, isk_18_2_npc] + - [auto, c, isk_18_3_entity] - name: isk_19 dir: world/area_isk/isk_19 type: code @@ -11185,11 +10802,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x999740, c, isk_19_0_header] - - [0x999740, c, isk_19_1_music] - - [0x999740, c, isk_19_2_main] - - [0x999740, c, isk_19_3_entity] - - [0x999740] + - [auto, c, isk_19_0_header] + - [auto, c, isk_19_1_music] + - [auto, c, isk_19_2_main] + - [auto, c, isk_19_3_entity] - name: trd_00 dir: world/area_trd/trd_00 type: code @@ -11197,11 +10813,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x999C70, c, trd_00_0_header] - - [0x999C70, c, trd_00_1_main] - - [0x999F80, c, trd_00_2_entity] - - [0x99A240, c, trd_00_3_npc] - - [0x99A2A0] + - [auto, c, trd_00_0_header] + - [auto, c, trd_00_1_main] + - [auto, c, trd_00_2_entity] + - [auto, c, trd_00_3_npc] - name: trd_01 dir: world/area_trd/trd_01 type: code @@ -11209,11 +10824,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x99C990, c, trd_01_0_header] - - [0x99C990, c, trd_01_1_main] - - [0x99CCA0, c, trd_01_2_entity] - - [0x99CD80, c, trd_01_3_npc] - - [0x99E050] + - [auto, c, trd_01_0_header] + - [auto, c, trd_01_1_main] + - [auto, c, trd_01_2_entity] + - [auto, c, trd_01_3_npc] - name: trd_02 dir: world/area_trd/trd_02 type: code @@ -11221,11 +10835,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9A0FE0, c, trd_02_0_header] - - [0x9A0FE0, c, trd_02_1_main] - - [0x9A0FE0, c, trd_02_2_entity] - - [0x9A10C0, c, trd_02_3_npc] - - [0x9A2A30] + - [auto, c, trd_02_0_header] + - [auto, c, trd_02_1_main] + - [auto, c, trd_02_2_entity] + - [auto, c, trd_02_3_npc] - name: trd_03 dir: world/area_trd/trd_03 type: code @@ -11233,12 +10846,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9A4650, c, trd_03_0_header] - - [0x9A4650, c, trd_03_1_main] - - [0x9A4650, c, trd_03_2_entity] - - [0x9A46F0, c, trd_03_3_npc] - - [0x9A4ED0, c, trd_03_4_puzzle] - - [0x9A5040] + - [auto, c, trd_03_0_header] + - [auto, c, trd_03_1_main] + - [auto, c, trd_03_2_entity] + - [auto, c, trd_03_3_npc] + - [auto, c, trd_03_4_puzzle] - name: trd_04 dir: world/area_trd/trd_04 type: code @@ -11246,11 +10858,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9A83F0, c, trd_04_0_header] - - [0x9A83F0, c, trd_04_1_main] - - [0x9A8700, c, trd_04_2_entity] - - [0x9A88A0, c, trd_04_3_npc] - - [0x9ABC90] + - [auto, c, trd_04_0_header] + - [auto, c, trd_04_1_main] + - [auto, c, trd_04_2_entity] + - [auto, c, trd_04_3_npc] - name: trd_05 dir: world/area_trd/trd_05 type: code @@ -11258,12 +10869,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9AE700, c, trd_05_0_header] - - [0x9AE700, c, trd_05_1_main] - - [0x9AE700, c, trd_05_2_entity] - - [0x9AE720, c, trd_05_3_trap] - - [0x9AEE20, c, trd_05_4_npc] - - [0x9AEE70] + - [auto, c, trd_05_0_header] + - [auto, c, trd_05_1_main] + - [auto, c, trd_05_2_entity] + - [auto, c, trd_05_3_trap] + - [auto, c, trd_05_4_npc] - name: trd_06 dir: world/area_trd/trd_06 type: code @@ -11271,13 +10881,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9B1790, c, trd_06_0_header] - - [0x9B1790, c, trd_06_1_main] - - [0x9B1AA0, c, trd_06_2_falling] - - [0x9B2280, c, trd_06_3_npc_prisoners] - - [0x9B2280, c, trd_06_4_npc_koopa_bros] - - [0x9B2280, c, trd_06_5_entity] - - [0x9B24B0] + - [auto, c, trd_06_0_header] + - [auto, c, trd_06_1_main] + - [auto, c, trd_06_2_falling] + - [auto, c, trd_06_3_npc_prisoners] + - [auto, c, trd_06_4_npc_koopa_bros] + - [auto, c, trd_06_5_entity] - name: trd_07 dir: world/area_trd/trd_07 type: code @@ -11285,11 +10894,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9B6980, c, trd_07_0_header] - - [0x9B6980, c, trd_07_1_main] - - [0x9B6C90, c, trd_07_2_npc] - - [0x9B8F80, c, trd_07_3_magic_doors] - - [0x9B9270] + - [auto, c, trd_07_0_header] + - [auto, c, trd_07_1_main] + - [auto, c, trd_07_2_npc] + - [auto, c, trd_07_3_magic_doors] - name: trd_08 dir: world/area_trd/trd_08 type: code @@ -11297,11 +10905,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9BB2A0, c, trd_08_0_header] - - [0x9BB2A0, c, trd_08_1_main] - - [0x9BB2A0, c, trd_08_2_entity] - - [0x9BB5B0, c, trd_08_3_npc] - - [0x9BBCC0] + - [auto, c, trd_08_0_header] + - [auto, c, trd_08_1_main] + - [auto, c, trd_08_2_entity] + - [auto, c, trd_08_3_npc] - name: trd_09 dir: world/area_trd/trd_09 type: code @@ -11309,12 +10916,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9BD660, c, trd_09_0_header] - - [0x9BD660, c, trd_09_1_main] - - [0x9BD660, c, trd_09_2_entity] - - [0x9BD660, c, trd_09_3_npc] - - [0x9BD720, c, trd_09_4_demo] - - [0x9BD830] + - [auto, c, trd_09_0_header] + - [auto, c, trd_09_1_main] + - [auto, c, trd_09_2_entity] + - [auto, c, trd_09_3_npc] + - [auto, c, trd_09_4_demo] - name: trd_10 dir: world/area_trd/trd_10 type: code @@ -11322,11 +10928,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9C2910, c, trd_10_0_header] - - [0x9C2910, c, trd_10_1_main] - - [0x9C3130, c, trd_10_2_npc] - - [0x9C3130, c, trd_10_3_fake_bowser] - - [0x9C3160] + - [auto, c, trd_10_0_header] + - [auto, c, trd_10_1_main] + - [auto, c, trd_10_2_npc] + - [auto, c, trd_10_3_fake_bowser] - name: nok_01 dir: world/area_nok/nok_01 type: code @@ -11334,16 +10939,15 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9C53E0, c, nok_01_0_header] - - [0x9C53E0, c, nok_01_1_music] - - [0x9C53E0, c, nok_01_2_main] - - [0x9C53E0, c, nok_01_3_entity] - - [0x9C53E0, c, nok_01_4_npc] - - [0x9C7B40, c, nok_01_5_shop] - - [0x9C7B40, c, nok_01_6_rooms] - - [0x9C7BA0, c, nok_01_7_radio] - - [0x9C7D10, c, nok_01_8_foliage] - - [0x9C7F50] + - [auto, c, nok_01_0_header] + - [auto, c, nok_01_1_music] + - [auto, c, nok_01_2_main] + - [auto, c, nok_01_3_entity] + - [auto, c, nok_01_4_npc] + - [auto, c, nok_01_5_shop] + - [auto, c, nok_01_6_rooms] + - [auto, c, nok_01_7_radio] + - [auto, c, nok_01_8_foliage] - name: nok_02 dir: world/area_nok/nok_02 type: code @@ -11351,18 +10955,17 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9D7020, c, nok_02_0_header] - - [0x9D7020, c, nok_02_1_music] - - [0x9D7020, c, nok_02_2_main] - - [0x9D7770, c, nok_02_3_entity] - - [0x9D7990, c, nok_02_4_rooms] - - [0x9D7AA0, c, nok_02_5_bookshelf] - - [0x9D7AA0, c, nok_02_6_npc] - - [0x9DA8F0, c, nok_02_7_demo] - - [0x9DA9E0, c, nok_02_8_koot_favors] - - [0x9DB380, c, nok_02_9_foliage] - - [0x9DB5C0, c, nok_02_10_epilogue] - - [0x9DB5C0] + - [auto, c, nok_02_0_header] + - [auto, c, nok_02_1_music] + - [auto, c, nok_02_2_main] + - [auto, c, nok_02_3_entity] + - [auto, c, nok_02_4_rooms] + - [auto, c, nok_02_5_bookshelf] + - [auto, c, nok_02_6_npc] + - [auto, c, nok_02_7_demo] + - [auto, c, nok_02_8_koot_favors] + - [auto, c, nok_02_9_foliage] + - [auto, c, nok_02_10_epilogue] - name: nok_03 dir: world/area_nok/nok_03 type: code @@ -11370,12 +10973,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9EB7F0, c, nok_03_0_header] - - [0x9EB7F0, c, nok_03_1_music] - - [0x9EB7F0, c, nok_03_2_main] - - [0x9EB7F0, c, nok_03_3_entity] - - [0x9EB7F0, c, nok_03_4_npc] - - [0x9EC610] + - [auto, c, nok_03_0_header] + - [auto, c, nok_03_1_music] + - [auto, c, nok_03_2_main] + - [auto, c, nok_03_3_entity] + - [auto, c, nok_03_4_npc] - name: nok_04 dir: world/area_nok/nok_04 type: code @@ -11383,13 +10985,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9EDBF0, c, nok_04_0_header] - - [0x9EDBF0, c, nok_04_1_music] - - [0x9EDBF0, c, nok_04_2_main] - - [0x9EDBF0, c, nok_04_3_entity] - - [0x9EDBF0, c, nok_04_4_npc] - - [0x9EEA80, c, nok_04_5_new_partner] - - [0x9EEB20] + - [auto, c, nok_04_0_header] + - [auto, c, nok_04_1_music] + - [auto, c, nok_04_2_main] + - [auto, c, nok_04_3_entity] + - [auto, c, nok_04_4_npc] + - [auto, c, nok_04_5_new_partner] - name: nok_11 dir: world/area_nok/nok_11 type: code @@ -11397,12 +10998,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9F4A40, c, nok_11_0_header] - - [0x9F4A40, c, nok_11_1_music] - - [0x9F4A40, c, nok_11_2_main] - - [0x9F4A40, c, nok_11_3_entity] - - [0x9F4A40, c, nok_11_4_npc] - - [0x9F6990] + - [auto, c, nok_11_0_header] + - [auto, c, nok_11_1_music] + - [auto, c, nok_11_2_main] + - [auto, c, nok_11_3_entity] + - [auto, c, nok_11_4_npc] - name: nok_12 dir: world/area_nok/nok_12 type: code @@ -11410,15 +11010,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0x9FA7F0, c, nok_12_0_header] - - [0x9FA7F0, c, nok_12_1_music] - - [0x9FA7F0, c, nok_12_2_main] - - [0x9FA970, c, nok_12_3_entity] - - [0x9FAAE0, c, nok_12_4_bridge] - - [0x9FAB20, c, nok_12_5_foliage] - - [0x9FAD60, c, nok_12_6_npc] - - [0x9FC6D0, c, nok_12_7_demo] - - [0x9FC8B0] + - [auto, c, nok_12_0_header] + - [auto, c, nok_12_1_music] + - [auto, c, nok_12_2_main] + - [auto, c, nok_12_3_entity] + - [auto, c, nok_12_4_bridge] + - [auto, c, nok_12_5_foliage] + - [auto, c, nok_12_6_npc] + - [auto, c, nok_12_7_demo] - name: nok_13 dir: world/area_nok/nok_13 type: code @@ -11426,13 +11025,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA00600, c, nok_13_0_header] - - [0xA00600, c, nok_13_1_music] - - [0xA00600, c, nok_13_2_main] - - [0xA00600, c, nok_13_3_entity] - - [0xA00600, c, nok_13_4_npc] - - [0xA01420, c, nok_13_5] - - [0xA01A90] + - [auto, c, nok_13_0_header] + - [auto, c, nok_13_1_music] + - [auto, c, nok_13_2_main] + - [auto, c, nok_13_3_entity] + - [auto, c, nok_13_4_npc] + - [auto, c, nok_13_5] - name: nok_14 dir: world/area_nok/nok_14 type: code @@ -11440,13 +11038,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA02840, c, nok_14_0_header] - - [0xA02840, c, nok_14_1_music] - - [0xA02840, c, nok_14_2_main] - - [0xA029C0, c, nok_14_3_entity] - - [0xA029C0, c, nok_14_4_bridge] - - [0xA02A00, c, nok_14_5_npc] - - [0xA04C60] + - [auto, c, nok_14_0_header] + - [auto, c, nok_14_1_music] + - [auto, c, nok_14_2_main] + - [auto, c, nok_14_3_entity] + - [auto, c, nok_14_4_bridge] + - [auto, c, nok_14_5_npc] - name: nok_15 dir: world/area_nok/nok_15 type: code @@ -11454,13 +11051,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA06F00, c, nok_15_0_header] - - [0xA06F00, c, nok_15_1_music] - - [0xA06F00, c, nok_15_2_main] - - [0xA071E0, c, nok_15_3_entity] - - [0xA071E0, c, nok_15_4_npc] - - [0xA09440, c, nok_15_5_foliage] - - [0xA09680] + - [auto, c, nok_15_0_header] + - [auto, c, nok_15_1_music] + - [auto, c, nok_15_2_main] + - [auto, c, nok_15_3_entity] + - [auto, c, nok_15_4_npc] + - [auto, c, nok_15_5_foliage] - name: hos_00 dir: world/area_hos/hos_00 type: code @@ -11468,15 +11064,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA0BCF0, c, hos_00_0_header] - - [0xA0BD40, c, hos_00_1_music] - - [0xA0BD40, c, hos_00_2_main] - - [0xA0C4B0, c, hos_00_3_unused] - - [0xA0C4B0, c, hos_00_4_npc] - - [0xA0C4E0, c, hos_00_5_entity] - - [0xA0C4E0, c, hos_00_6_scenes] - - [0xA0C930, c, hos_00_7_shade_gfx] - - [0xA0CA00] + - [auto, c, hos_00_0_header] + - [auto, c, hos_00_1_music] + - [auto, c, hos_00_2_main] + - [auto, c, hos_00_3_unused] + - [auto, c, hos_00_4_npc] + - [auto, c, hos_00_5_entity] + - [auto, c, hos_00_6_scenes] + - [auto, c, hos_00_7_shade_gfx] - name: hos_01 dir: world/area_hos/hos_01 type: code @@ -11484,14 +11079,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA10880, c, hos_01_0_header] - - [0xA10880, c, hos_01_1_music] - - [0xA10880, c, hos_01_2_main] - - [0xA11020, c, hos_01_3_model_fx] - - [0xA11530, c, hos_01_4_npc] - - [0xA11650, c, hos_01_5_entity] - - [0xA11650, c, hos_01_6_star_way] - - [0xA116A0] + - [auto, c, hos_01_0_header] + - [auto, c, hos_01_1_music] + - [auto, c, hos_01_2_main] + - [auto, c, hos_01_3_model_fx] + - [auto, c, hos_01_4_npc] + - [auto, c, hos_01_5_entity] + - [auto, c, hos_01_6_star_way] - name: hos_02 dir: world/area_hos/hos_02 type: code @@ -11499,14 +11093,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA16220, c, hos_02_0_header] - - [0xA16220, c, hos_02_1_music] - - [0xA16220, c, hos_02_2_main] - - [0xA16220, c, hos_02_3_model_fx] - - [0xA171F0, c, hos_02_4_unused] - - [0xA17210, c, hos_02_5_npc] - - [0xA18D00, c, hos_02_6_descent] - - [0xA18D00] + - [auto, c, hos_02_0_header] + - [auto, c, hos_02_1_music] + - [auto, c, hos_02_2_main] + - [auto, c, hos_02_3_model_fx] + - [auto, c, hos_02_4_unused] + - [auto, c, hos_02_5_npc] + - [auto, c, hos_02_6_descent] - name: hos_03 dir: world/area_hos/hos_03 type: code @@ -11514,16 +11107,15 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA1B100, c, hos_03_0_header] - - [0xA1B100, c, hos_03_1_music] - - [0xA1B100, c, hos_03_2_main] - - [0xA1B130, c, hos_03_3_model_fx] - - [0xA1BB70, c, hos_03_4_rooms] - - [0xA1BB70, c, hos_03_5_foliage] - - [0xA1BDB0, c, hos_03_6_npc] - - [0xA1E640, c, hos_03_7_shop] - - [0xA1E640, c, hos_03_8_entity] - - [0xA1E640] + - [auto, c, hos_03_0_header] + - [auto, c, hos_03_1_music] + - [auto, c, hos_03_2_main] + - [auto, c, hos_03_3_model_fx] + - [auto, c, hos_03_4_rooms] + - [auto, c, hos_03_5_foliage] + - [auto, c, hos_03_6_npc] + - [auto, c, hos_03_7_shop] + - [auto, c, hos_03_8_entity] - name: hos_04 dir: world/area_hos/hos_04 type: code @@ -11531,15 +11123,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA26ED0, c, hos_04_0_header] - - [0xA26ED0, c, hos_04_1_music] - - [0xA26ED0, c, hos_04_2_main] - - [0xA26ED0, c, hos_04_3_fountains] - - [0xA27490, c, hos_04_4_unused] - - [0xA274B0, c, hos_04_6_intro] - - [0xA27A30, c, hos_04_7_starship] - - [0xA27AA0, c, hos_04_8_narrator] - - [0xA27D60] + - [auto, c, hos_04_0_header] + - [auto, c, hos_04_1_music] + - [auto, c, hos_04_2_main] + - [auto, c, hos_04_3_fountains] + - [auto, c, hos_04_4_unused] + - [auto, c, hos_04_6_intro] + - [auto, c, hos_04_7_starship] + - [auto, c, hos_04_8_narrator] - name: hos_05 dir: world/area_hos/hos_05 type: code @@ -11547,16 +11138,15 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA2A240, c, hos_05_0_header] - - [0xA2A240, c, hos_05_1_music] - - [0xA2A240, c, hos_05_2_main] - - [0xA2A240, c, hos_05_3_misc] - - [0xA2AA70, c, hos_05_4_npc] - - [0xA2AAC0, c, hos_05_5_intro] - - [0xA2EC30, c, hos_05_6_narrator] - - [0xA2EF00, c, hos_05_7_model_fx] - - [0xA2FA00, c, hos_05_8_star_ship] - - [0xA2FAA0] + - [auto, c, hos_05_0_header] + - [auto, c, hos_05_1_music] + - [auto, c, hos_05_2_main] + - [auto, c, hos_05_3_misc] + - [auto, c, hos_05_4_npc] + - [auto, c, hos_05_5_intro] + - [auto, c, hos_05_6_narrator] + - [auto, c, hos_05_7_model_fx] + - [auto, c, hos_05_8_star_ship] - name: hos_06 dir: world/area_hos/hos_06 type: code @@ -11564,14 +11154,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA394E0, c, hos_06_0_header] - - [0xA394E0, c, hos_06_1_entity] - - [0xA394E0, c, hos_06_2_main] - - [0xA397F0, c, hos_06_3_merlow] - - [0xA3A210, c, hos_06_4_rooms] - - [0xA3A230, c, hos_06_5_merluvlee] - - [0xA3B4B0, c, hos_06_6_chest] - - [0xA3BA40] + - [auto, c, hos_06_0_header] + - [auto, c, hos_06_1_entity] + - [auto, c, hos_06_2_main] + - [auto, c, hos_06_3_merlow] + - [auto, c, hos_06_4_rooms] + - [auto, c, hos_06_5_merluvlee] + - [auto, c, hos_06_6_chest] - name: hos_10 dir: world/area_hos/hos_10 type: code @@ -11579,15 +11168,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA3F740, c, hos_10_0_header] - - [0xA3F760, c, hos_10_1_music] - - [0xA3F760, c, hos_10_2_npc1] - - [0xA3F760, c, hos_10_3_npc2] - - [0xA3F760, c, hos_10_4_main] - - [0xA3F760, c, hos_10_5_intro] - - [0xA3FBA0, c, hos_10_6_pre_title] - - [0xA3FEB0, c, hos_10_7_ending] - - [0xA403C0] + - [auto, c, hos_10_0_header] + - [auto, c, hos_10_1_music] + - [auto, c, hos_10_2_npc1] + - [auto, c, hos_10_3_npc2] + - [auto, c, hos_10_4_main] + - [auto, c, hos_10_5_intro] + - [auto, c, hos_10_6_pre_title] + - [auto, c, hos_10_7_ending] - name: hos_20 dir: world/area_hos/hos_20 type: code @@ -11595,10 +11183,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA45930, c, hos_20_0_header] - - [0xA45930, c, hos_20_1_main] - - [0xA45C40, c, hos_20_2_starship] - - [0xA45C90] + - [auto, c, hos_20_0_header] + - [auto, c, hos_20_1_main] + - [auto, c, hos_20_2_starship] - name: kpa_01 dir: world/area_kpa/kpa_01 type: code @@ -11606,12 +11193,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA46F60, c, kpa_01_0_header] - - [0xA46F60, c, kpa_01_1_music] - - [0xA46F60, c, kpa_01_2_main] - - [0xA470C0, c, kpa_01_3_npc] - - [0xA479B0, c, kpa_01_4_entity] - - [0xA479B0] + - [auto, c, kpa_01_0_header] + - [auto, c, kpa_01_1_music] + - [auto, c, kpa_01_2_main] + - [auto, c, kpa_01_3_npc] + - [auto, c, kpa_01_4_entity] - name: kpa_03 dir: world/area_kpa/kpa_03 type: code @@ -11619,12 +11205,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA485C0, c, kpa_03_0_header] - - [0xA485C0, c, kpa_03_1_music] - - [0xA485C0, c, kpa_03_2_main] - - [0xA48720, c, kpa_03_3_npc] - - [0xA4A410, c, kpa_03_4_entity] - - [0xA4A480] + - [auto, c, kpa_03_0_header] + - [auto, c, kpa_03_1_music] + - [auto, c, kpa_03_2_main] + - [auto, c, kpa_03_3_npc] + - [auto, c, kpa_03_4_entity] - name: kpa_04 dir: world/area_kpa/kpa_04 type: code @@ -11632,11 +11217,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA4BF60, c, kpa_04_0_header] - - [0xA4BF60, c, kpa_04_1_music] - - [0xA4BF60, c, kpa_04_2_main] - - [0xA4BF60, c, kpa_04_3_statues] - - [0xA4C0D0] + - [auto, c, kpa_04_0_header] + - [auto, c, kpa_04_1_music] + - [auto, c, kpa_04_2_main] + - [auto, c, kpa_04_3_statues] - name: kpa_08 dir: world/area_kpa/kpa_08 type: code @@ -11644,12 +11228,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA4CA20, c, kpa_08_0_header] - - [0xA4CA20, c, kpa_08_1_music] - - [0xA4CA20, c, kpa_08_2_main] - - [0xA4CA20, c, kpa_08_3_entity] - - [0xA4CAC0, c, kpa_08_4_npc] - - [0xA4DEC0] + - [auto, c, kpa_08_0_header] + - [auto, c, kpa_08_1_music] + - [auto, c, kpa_08_2_main] + - [auto, c, kpa_08_3_entity] + - [auto, c, kpa_08_4_npc] - name: kpa_09 dir: world/area_kpa/kpa_09 type: code @@ -11657,12 +11240,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA4F000, c, kpa_09_0_header] - - [0xA4F000, c, kpa_09_1_music] - - [0xA4F000, c, kpa_09_2_main] - - [0xA4F000, c, kpa_09_3_entity] - - [0xA4F0A0, c, kpa_09_4_npc] - - [0xA502F0] + - [auto, c, kpa_09_0_header] + - [auto, c, kpa_09_1_music] + - [auto, c, kpa_09_2_main] + - [auto, c, kpa_09_3_entity] + - [auto, c, kpa_09_4_npc] - name: kpa_10 dir: world/area_kpa/kpa_10 type: code @@ -11670,12 +11252,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA51980, c, kpa_10_0_header] - - [0xA51980, c, kpa_10_1_music] - - [0xA51980, c, kpa_10_2_main] - - [0xA51980, c, kpa_10_3_npc] - - [0xA51980, c, kpa_10_4_entity] - - [0xA51C90] + - [auto, c, kpa_10_0_header] + - [auto, c, kpa_10_1_music] + - [auto, c, kpa_10_2_main] + - [auto, c, kpa_10_3_npc] + - [auto, c, kpa_10_4_entity] - name: kpa_11 dir: world/area_kpa/kpa_11 type: code @@ -11683,12 +11264,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA528C0, c, kpa_11_0_header] - - [0xA528C0, c, kpa_11_1_music] - - [0xA528C0, c, kpa_11_2_main] - - [0xA52BD0, c, kpa_11_3_entity] - - [0xA52BD0, c, kpa_11_4_npc] - - [0xA533B0] + - [auto, c, kpa_11_0_header] + - [auto, c, kpa_11_1_music] + - [auto, c, kpa_11_2_main] + - [auto, c, kpa_11_3_entity] + - [auto, c, kpa_11_4_npc] - name: kpa_12 dir: world/area_kpa/kpa_12 type: code @@ -11696,11 +11276,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA54950, c, kpa_12_0_header] - - [0xA54990, c, kpa_12_1_music] - - [0xA54990, c, kpa_12_2_main] - - [0xA54CA0, c, kpa_12_3_platforms] - - [0xA54DC0] + - [auto, c, kpa_12_0_header] + - [auto, c, kpa_12_1_music] + - [auto, c, kpa_12_2_main] + - [auto, c, kpa_12_3_platforms] - name: kpa_13 dir: world/area_kpa/kpa_13 type: code @@ -11708,12 +11287,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA55F20, c, kpa_13_0_header] - - [0xA55F60, c, kpa_13_1_music] - - [0xA55F60, c, kpa_13_2_main] - - [0xA56270, c, kpa_13_3_entity] - - [0xA56270, c, kpa_13_4_platforms] - - [0xA56390] + - [auto, c, kpa_13_0_header] + - [auto, c, kpa_13_1_music] + - [auto, c, kpa_13_2_main] + - [auto, c, kpa_13_3_entity] + - [auto, c, kpa_13_4_platforms] - name: kpa_14 dir: world/area_kpa/kpa_14 type: code @@ -11721,12 +11299,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA574B0, c, kpa_14_0_header] - - [0xA574F0, c, kpa_14_1_music] - - [0xA574F0, c, kpa_14_2_main] - - [0xA57830, c, kpa_14_3_entity] - - [0xA57D20, c, kpa_14_4_platforms] - - [0xA57D20] + - [auto, c, kpa_14_0_header] + - [auto, c, kpa_14_1_music] + - [auto, c, kpa_14_2_main] + - [auto, c, kpa_14_3_entity] + - [auto, c, kpa_14_4_platforms] - name: kpa_15 dir: world/area_kpa/kpa_15 type: code @@ -11734,11 +11311,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA59390, c, kpa_15_0_header] - - [0xA59390, c, kpa_15_1_music] - - [0xA59390, c, kpa_15_2_main] - - [0xA596A0, c, kpa_15_3_entity] - - [0xA59960] + - [auto, c, kpa_15_0_header] + - [auto, c, kpa_15_1_music] + - [auto, c, kpa_15_2_main] + - [auto, c, kpa_15_3_entity] - name: kpa_16 dir: world/area_kpa/kpa_16 type: code @@ -11746,12 +11322,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA5A030, c, kpa_16_0_header] - - [0xA5A030, c, kpa_16_1_music] - - [0xA5A030, c, kpa_16_2_main] - - [0xA5A340, c, kpa_16_3_entity] - - [0xA5A340, c, kpa_16_4_npc] - - [0xA5A3D0] + - [auto, c, kpa_16_0_header] + - [auto, c, kpa_16_1_music] + - [auto, c, kpa_16_2_main] + - [auto, c, kpa_16_3_entity] + - [auto, c, kpa_16_4_npc] - name: kpa_17 dir: world/area_kpa/kpa_17 type: code @@ -11759,12 +11334,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA5CA20, c, kpa_17_0_header] - - [0xA5CA20, c, kpa_17_1_music] - - [0xA5CA20, c, kpa_17_2_entity] - - [0xA5CA20, c, kpa_17_3_main] - - [0xA5CA20, c, kpa_17_4_npc] - - [0xA5CA20] + - [auto, c, kpa_17_0_header] + - [auto, c, kpa_17_1_music] + - [auto, c, kpa_17_2_entity] + - [auto, c, kpa_17_3_main] + - [auto, c, kpa_17_4_npc] - name: kpa_32 dir: world/area_kpa/kpa_32 type: code @@ -11772,11 +11346,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA5E0C0, c, kpa_32_0_header] - - [0xA5E0C0, c, kpa_32_1_music] - - [0xA5E0C0, c, kpa_32_2_entity] - - [0xA5E0C0, c, kpa_32_3_main] - - [0xA5E3D0] + - [auto, c, kpa_32_0_header] + - [auto, c, kpa_32_1_music] + - [auto, c, kpa_32_2_entity] + - [auto, c, kpa_32_3_main] - name: kpa_33 dir: world/area_kpa/kpa_33 type: code @@ -11784,11 +11357,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA5F080, c, kpa_33_0_header] - - [0xA5F080, c, kpa_33_1_music] - - [0xA5F080, c, kpa_33_2_entity] - - [0xA5F080, c, kpa_33_3_main] - - [0xA5F390] + - [auto, c, kpa_33_0_header] + - [auto, c, kpa_33_1_music] + - [auto, c, kpa_33_2_entity] + - [auto, c, kpa_33_3_main] - name: kpa_40 dir: world/area_kpa/kpa_40 type: code @@ -11796,10 +11368,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA60040, c, kpa_40_0_header] - - [0xA60040, c, kpa_40_1_music] - - [0xA60040, c, kpa_40_2_main] - - [0xA60040] + - [auto, c, kpa_40_0_header] + - [auto, c, kpa_40_1_music] + - [auto, c, kpa_40_2_main] - name: kpa_41 dir: world/area_kpa/kpa_41 type: code @@ -11807,10 +11378,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA60470, c, kpa_41_0_header] - - [0xA60470, c, kpa_41_1_music] - - [0xA60470, c, kpa_41_2_main] - - [0xA60470] + - [auto, c, kpa_41_0_header] + - [auto, c, kpa_41_1_music] + - [auto, c, kpa_41_2_main] - name: kpa_50 dir: world/area_kpa/kpa_50 type: code @@ -11818,11 +11388,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA609D0, c, kpa_50_0_header] - - [0xA609D0, c, kpa_50_1_music] - - [0xA609D0, c, kpa_50_2_main] - - [0xA609D0, c, kpa_50_3_npc] - - [0xA623F0] + - [auto, c, kpa_50_0_header] + - [auto, c, kpa_50_1_music] + - [auto, c, kpa_50_2_main] + - [auto, c, kpa_50_3_npc] - name: kpa_51 dir: world/area_kpa/kpa_51 type: code @@ -11830,11 +11399,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA64090, c, kpa_51_0_header] - - [0xA640E0, c, kpa_51_1_music] - - [0xA640E0, c, kpa_51_2_main] - - [0xA640E0, c, kpa_51_3_npc] - - [0xA65CB0] + - [auto, c, kpa_51_0_header] + - [auto, c, kpa_51_1_music] + - [auto, c, kpa_51_2_main] + - [auto, c, kpa_51_3_npc] - name: kpa_52 dir: world/area_kpa/kpa_52 type: code @@ -11842,12 +11410,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA67100, c, kpa_52_0_header] - - [0xA67100, c, kpa_52_1_music] - - [0xA67100, c, kpa_52_2_entity] - - [0xA671E0, c, kpa_52_3_main] - - [0xA671E0, c, kpa_52_4_npc] - - [0xA68430] + - [auto, c, kpa_52_0_header] + - [auto, c, kpa_52_1_music] + - [auto, c, kpa_52_2_entity] + - [auto, c, kpa_52_3_main] + - [auto, c, kpa_52_4_npc] - name: kpa_53 dir: world/area_kpa/kpa_53 type: code @@ -11855,12 +11422,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA6ACA0, c, kpa_53_0_header] - - [0xA6ACF0, c, kpa_53_1_music] - - [0xA6ACF0, c, kpa_53_2_main] - - [0xA6ACF0, c, kpa_53_3_npc] - - [0xA6AE10, c, kpa_53_4_entity] - - [0xA6AE10] + - [auto, c, kpa_53_0_header] + - [auto, c, kpa_53_1_music] + - [auto, c, kpa_53_2_main] + - [auto, c, kpa_53_3_npc] + - [auto, c, kpa_53_4_entity] - name: kpa_60 dir: world/area_kpa/kpa_60 type: code @@ -11868,12 +11434,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA6CB00, c, kpa_60_0_header] - - [0xA6CB00, c, kpa_60_1_music] - - [0xA6CB00, c, kpa_60_2_entity] - - [0xA6CBE0, c, kpa_60_3_main] - - [0xA6CEF0, c, kpa_60_4_scenes] - - [0xA6CEF0] + - [auto, c, kpa_60_0_header] + - [auto, c, kpa_60_1_music] + - [auto, c, kpa_60_2_entity] + - [auto, c, kpa_60_3_main] + - [auto, c, kpa_60_4_scenes] - name: kpa_61 dir: world/area_kpa/kpa_61 type: code @@ -11881,12 +11446,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA6E3E0, c, kpa_61_0_header] - - [0xA6E3E0, c, kpa_61_1_music] - - [0xA6E3E0, c, kpa_61_2_main] - - [0xA6E6F0, c, kpa_61_3_npc] - - [0xA70720, c, kpa_61_4_entity] - - [0xA70720] + - [auto, c, kpa_61_0_header] + - [auto, c, kpa_61_1_music] + - [auto, c, kpa_61_2_main] + - [auto, c, kpa_61_3_npc] + - [auto, c, kpa_61_4_entity] - name: kpa_62 dir: world/area_kpa/kpa_62 type: code @@ -11894,11 +11458,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA72220, c, kpa_62_0_header] - - [0xA72220, c, kpa_62_1_music] - - [0xA72220, c, kpa_62_2_entity] - - [0xA72300, c, kpa_62_3_main] - - [0xA72610] + - [auto, c, kpa_62_0_header] + - [auto, c, kpa_62_1_music] + - [auto, c, kpa_62_2_entity] + - [auto, c, kpa_62_3_main] - name: kpa_63 dir: world/area_kpa/kpa_63 type: code @@ -11906,12 +11469,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA735B0, c, kpa_63_0_header] - - [0xA735B0, c, kpa_63_1_music] - - [0xA735B0, c, kpa_63_2_entity] - - [0xA735B0, c, kpa_63_3_main] - - [0xA735B0, c, kpa_63_4_scenes] - - [0xA73740] + - [auto, c, kpa_63_0_header] + - [auto, c, kpa_63_1_music] + - [auto, c, kpa_63_2_entity] + - [auto, c, kpa_63_3_main] + - [auto, c, kpa_63_4_scenes] - name: kpa_70 dir: world/area_kpa/kpa_70 type: code @@ -11919,13 +11481,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA74870, c, kpa_70_0_header] - - [0xA74870, c, kpa_70_1_music] - - [0xA74870, c, kpa_70_2_main] - - [0xA74B80, c, kpa_70_3_npc] - - [0xA75360, c, kpa_70_4_chain_skele] - - [0xA75360, c, kpa_70_5_chain_anim] - - [0xA75360] + - [auto, c, kpa_70_0_header] + - [auto, c, kpa_70_1_music] + - [auto, c, kpa_70_2_main] + - [auto, c, kpa_70_3_npc] + - [auto, c, kpa_70_4_chain_skele] + - [auto, c, kpa_70_5_chain_anim] - name: kpa_81 dir: world/area_kpa/kpa_81 type: code @@ -11933,11 +11494,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA784C0, c, kpa_81_0_header] - - [0xA784C0, c, kpa_81_1_music] - - [0xA784C0, c, kpa_81_2_main] - - [0xA78510, c, kpa_81_3_npc] - - [0xA78900] + - [auto, c, kpa_81_0_header] + - [auto, c, kpa_81_1_music] + - [auto, c, kpa_81_2_main] + - [auto, c, kpa_81_3_npc] - name: kpa_82 dir: world/area_kpa/kpa_82 type: code @@ -11945,11 +11505,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA7A500, c, kpa_82_0_header] - - [0xA7A500, c, kpa_82_1_music] - - [0xA7A500, c, kpa_82_2_main] - - [0xA7A550, c, kpa_82_3_npc] - - [0xA7A940] + - [auto, c, kpa_82_0_header] + - [auto, c, kpa_82_1_music] + - [auto, c, kpa_82_2_main] + - [auto, c, kpa_82_3_npc] - name: kpa_83 dir: world/area_kpa/kpa_83 type: code @@ -11957,11 +11516,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA83490, c, kpa_83_0_header] - - [0xA83490, c, kpa_83_1_music] - - [0xA83490, c, kpa_83_2_main] - - [0xA834E0, c, kpa_83_3_npc] - - [0xA83500] + - [auto, c, kpa_83_0_header] + - [auto, c, kpa_83_1_music] + - [auto, c, kpa_83_2_main] + - [auto, c, kpa_83_3_npc] - name: kpa_90 dir: world/area_kpa/kpa_90 type: code @@ -11969,10 +11527,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA867B0, c, kpa_90_0_header] - - [0xA867B0, c, kpa_90_1_music] - - [0xA867B0, c, kpa_90_2_main] - - [0xA867B0] + - [auto, c, kpa_90_0_header] + - [auto, c, kpa_90_1_music] + - [auto, c, kpa_90_2_main] - name: kpa_91 dir: world/area_kpa/kpa_91 type: code @@ -11980,12 +11537,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA86A50, c, kpa_91_0_header] - - [0xA86A50, c, kpa_91_1_music] - - [0xA86A50, c, kpa_91_2_main] - - [0xA86A50, c, kpa_91_3_npc] - - [0xA88280, c, kpa_91_4_entity] - - [0xA88360] + - [auto, c, kpa_91_0_header] + - [auto, c, kpa_91_1_music] + - [auto, c, kpa_91_2_main] + - [auto, c, kpa_91_3_npc] + - [auto, c, kpa_91_4_entity] - name: kpa_94 dir: world/area_kpa/kpa_94 type: code @@ -11993,10 +11549,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA8C7C0, c, kpa_94_0_header] - - [0xA8C7C0, c, kpa_94_1_music] - - [0xA8C7C0, c, kpa_94_2_main] - - [0xA8C7C0] + - [auto, c, kpa_94_0_header] + - [auto, c, kpa_94_1_music] + - [auto, c, kpa_94_2_main] - name: kpa_95 dir: world/area_kpa/kpa_95 type: code @@ -12004,12 +11559,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA8CA80, c, kpa_95_0_header] - - [0xA8CA80, c, kpa_95_1_music] - - [0xA8CA80, c, kpa_95_2_entity] - - [0xA8CB60, c, kpa_95_3_main] - - [0xA8CB60, c, kpa_95_4_npc] - - [0xA8E390] + - [auto, c, kpa_95_0_header] + - [auto, c, kpa_95_1_music] + - [auto, c, kpa_95_2_entity] + - [auto, c, kpa_95_3_main] + - [auto, c, kpa_95_4_npc] - name: kpa_96 dir: world/area_kpa/kpa_96 type: code @@ -12017,11 +11571,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA927C0, c, kpa_96_0_header] - - [0xA927C0, c, kpa_96_1_music] - - [0xA927C0, c, kpa_96_2_main] - - [0xA927C0, c, kpa_96_3_npc] - - [0xA927F0] + - [auto, c, kpa_96_0_header] + - [auto, c, kpa_96_1_music] + - [auto, c, kpa_96_2_main] + - [auto, c, kpa_96_3_npc] - name: kpa_100 dir: world/area_kpa/kpa_100 type: code @@ -12029,11 +11582,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA93160, c, kpa_100_0_header] - - [0xA931B0, c, kpa_100_1_music] - - [0xA931B0, c, kpa_100_2_main] - - [0xA931B0, c, kpa_100_3_entity] - - [0xA931B0] + - [auto, c, kpa_100_0_header] + - [auto, c, kpa_100_1_music] + - [auto, c, kpa_100_2_main] + - [auto, c, kpa_100_3_entity] - name: kpa_101 dir: world/area_kpa/kpa_101 type: code @@ -12041,11 +11593,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA93440, c, kpa_101_0_header] - - [0xA93440, c, kpa_101_1_music] - - [0xA93440, c, kpa_101_2_main] - - [0xA93710, c, kpa_101_3_entity] - - [0xA93710] + - [auto, c, kpa_101_0_header] + - [auto, c, kpa_101_1_music] + - [auto, c, kpa_101_2_main] + - [auto, c, kpa_101_3_entity] - name: kpa_102 dir: world/area_kpa/kpa_102 type: code @@ -12053,11 +11604,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA93740, c, kpa_102_0_header] - - [0xA93740, c, kpa_102_1_music] - - [0xA93740, c, kpa_102_2_main] - - [0xA93A50, c, kpa_102_3_npc] - - [0xA96CD0] + - [auto, c, kpa_102_0_header] + - [auto, c, kpa_102_1_music] + - [auto, c, kpa_102_2_main] + - [auto, c, kpa_102_3_npc] - name: kpa_111 dir: world/area_kpa/kpa_111 type: code @@ -12065,13 +11615,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA99590, c, kpa_111_0_header] - - [0xA99590, c, kpa_111_1_music] - - [0xA99590, c, kpa_111_2_main] - - [0xA99590, c, kpa_111_3_statues] - - [0xA99700, c, kpa_111_4_npc] - - [0xA9A950, c, kpa_111_5_entity] - - [0xA9A950] + - [auto, c, kpa_111_0_header] + - [auto, c, kpa_111_1_music] + - [auto, c, kpa_111_2_main] + - [auto, c, kpa_111_3_statues] + - [auto, c, kpa_111_4_npc] + - [auto, c, kpa_111_5_entity] - name: kpa_112 dir: world/area_kpa/kpa_112 type: code @@ -12079,10 +11628,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA9C990, c, kpa_112_0_header] - - [0xA9C990, c, kpa_112_1_music] - - [0xA9C990, c, kpa_112_2_main] - - [0xA9C990] + - [auto, c, kpa_112_0_header] + - [auto, c, kpa_112_1_music] + - [auto, c, kpa_112_2_main] - name: kpa_113 dir: world/area_kpa/kpa_113 type: code @@ -12090,13 +11638,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA9CC30, c, kpa_113_0_header] - - [0xA9CC30, c, kpa_113_1_music] - - [0xA9CC30, c, kpa_113_2_main] - - [0xA9CC30, c, kpa_113_3_entity] - - [0xA9CC70, c, kpa_113_4_statues] - - [0xA9CDE0, c, kpa_113_5_npc] - - [0xA9D6D0] + - [auto, c, kpa_113_0_header] + - [auto, c, kpa_113_1_music] + - [auto, c, kpa_113_2_main] + - [auto, c, kpa_113_3_entity] + - [auto, c, kpa_113_4_statues] + - [auto, c, kpa_113_5_npc] - name: kpa_114 dir: world/area_kpa/kpa_114 type: code @@ -12104,11 +11651,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA9E980, c, kpa_114_0_header] - - [0xA9E9D0, c, kpa_114_1_music] - - [0xA9E9D0, c, kpa_114_2_main] - - [0xA9E9D0, c, kpa_114_3_entity] - - [0xA9E9D0] + - [auto, c, kpa_114_0_header] + - [auto, c, kpa_114_1_music] + - [auto, c, kpa_114_2_main] + - [auto, c, kpa_114_3_entity] - name: kpa_115 dir: world/area_kpa/kpa_115 type: code @@ -12116,12 +11662,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xA9ED40, c, kpa_115_0_header] - - [0xA9ED40, c, kpa_115_1_music] - - [0xA9ED40, c, kpa_115_2_main] - - [0xA9ED40, c, kpa_115_3_statues] - - [0xA9EEB0, c, kpa_115_4_npc] - - [0xAA0100] + - [auto, c, kpa_115_0_header] + - [auto, c, kpa_115_1_music] + - [auto, c, kpa_115_2_main] + - [auto, c, kpa_115_3_statues] + - [auto, c, kpa_115_4_npc] - name: kpa_116 dir: world/area_kpa/kpa_116 type: code @@ -12129,10 +11674,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAA1EE0, c, kpa_116_0_header] - - [0xAA1EE0, c, kpa_116_1_music] - - [0xAA1EE0, c, kpa_116_2_main] - - [0xAA1EE0] + - [auto, c, kpa_116_0_header] + - [auto, c, kpa_116_1_music] + - [auto, c, kpa_116_2_main] - name: kpa_117 dir: world/area_kpa/kpa_117 type: code @@ -12140,10 +11684,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAA2180, c, kpa_117_0_header] - - [0xAA2180, c, kpa_117_1_music] - - [0xAA2180, c, kpa_117_2_main] - - [0xAA2180] + - [auto, c, kpa_117_0_header] + - [auto, c, kpa_117_1_music] + - [auto, c, kpa_117_2_main] - name: kpa_118 dir: world/area_kpa/kpa_118 type: code @@ -12151,10 +11694,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAA23C0, c, kpa_118_0_header] - - [0xAA23C0, c, kpa_118_1_music] - - [0xAA23C0, c, kpa_118_2_main] - - [0xAA23C0] + - [auto, c, kpa_118_0_header] + - [auto, c, kpa_118_1_music] + - [auto, c, kpa_118_2_main] - name: kpa_119 dir: world/area_kpa/kpa_119 type: code @@ -12162,11 +11704,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAA2660, c, kpa_119_0_header] - - [0xAA2660, c, kpa_119_1_music] - - [0xAA2660, c, kpa_119_2_entity] - - [0xAA2660, c, kpa_119_3_main] - - [0xAA2660] + - [auto, c, kpa_119_0_header] + - [auto, c, kpa_119_1_music] + - [auto, c, kpa_119_2_entity] + - [auto, c, kpa_119_3_main] - name: kpa_121 dir: world/area_kpa/kpa_121 type: code @@ -12174,10 +11715,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAA28F0, c, kpa_121_0_header] - - [0xAA28F0, c, kpa_121_1_music] - - [0xAA28F0, c, kpa_121_2_main] - - [0xAA28F0] + - [auto, c, kpa_121_0_header] + - [auto, c, kpa_121_1_music] + - [auto, c, kpa_121_2_main] - name: kpa_130 dir: world/area_kpa/kpa_130 type: code @@ -12185,11 +11725,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAA2D20, c, kpa_130_0_header] - - [0xAA2D20, c, kpa_130_1_music] - - [0xAA2D20, c, kpa_130_2_main] - - [0xAA2D20, c, kpa_130_3_npc] - - [0xAA3460] + - [auto, c, kpa_130_0_header] + - [auto, c, kpa_130_1_music] + - [auto, c, kpa_130_2_main] + - [auto, c, kpa_130_3_npc] - name: kpa_133 dir: world/area_kpa/kpa_133 type: code @@ -12197,14 +11736,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAA7480, c, kpa_133_0_header] - - [0xAA7480, c, kpa_133_1_music] - - [0xAA7480, c, kpa_133_2_main] - - [0xAA7790, c, kpa_133_3_entity] - - [0xAA78F0, c, kpa_133_4_npc] - - [0xAA78F0, c, kpa_133_5_water] - - [0xAA78F0, c, kpa_133_6] - - [0xAA78F0] + - [auto, c, kpa_133_0_header] + - [auto, c, kpa_133_1_music] + - [auto, c, kpa_133_2_main] + - [auto, c, kpa_133_3_entity] + - [auto, c, kpa_133_4_npc] + - [auto, c, kpa_133_5_water] + - [auto, c, kpa_133_6] - name: kpa_134 dir: world/area_kpa/kpa_134 type: code @@ -12212,14 +11750,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAA8FA0, c, kpa_134_0_header] - - [0xAA8FA0, c, kpa_134_1_music] - - [0xAA8FA0, c, kpa_134_2_main] - - [0xAA92B0, c, kpa_134_3_chains] - - [0xAA94B0, c, kpa_134_4_npc] - - [0xAA94B0, c, kpa_134_5_panels] - - [0xAA94B0, c, kpa_134_6_entity] - - [0xAA96A0] + - [auto, c, kpa_134_0_header] + - [auto, c, kpa_134_1_music] + - [auto, c, kpa_134_2_main] + - [auto, c, kpa_134_3_chains] + - [auto, c, kpa_134_4_npc] + - [auto, c, kpa_134_5_panels] + - [auto, c, kpa_134_6_entity] - name: osr_00 dir: world/area_osr/osr_00 type: code @@ -12227,13 +11764,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAAC830, c, osr_00_0_header] - - [0xAAC830, c, osr_00_1_music] - - [0xAAC830, c, osr_00_2_main] - - [0xAACBB0, c, osr_00_3_npc_intro] - - [0xAACBB0, c, osr_00_4_npc_epilogue] - - [0xAACBB0, c, osr_00_5_scenes] - - [0xAACFC0] + - [auto, c, osr_00_0_header] + - [auto, c, osr_00_1_music] + - [auto, c, osr_00_2_main] + - [auto, c, osr_00_3_npc_intro] + - [auto, c, osr_00_4_npc_epilogue] + - [auto, c, osr_00_5_scenes] - name: osr_01 dir: world/area_osr/osr_01 type: code @@ -12241,11 +11777,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAAFFF0, c, osr_01_0_header] - - [0xAB0040, c, osr_01_1_music] - - [0xAB0040, c, osr_01_2_main] - - [0xAB0350, c, osr_01_3_npc] - - [0xAB0AB0] + - [auto, c, osr_01_0_header] + - [auto, c, osr_01_1_music] + - [auto, c, osr_01_2_main] + - [auto, c, osr_01_3_npc] - name: osr_02 dir: world/area_osr/osr_02 type: code @@ -12253,12 +11788,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAB2170, c, osr_02_0_header] - - [0xAB2190, c, osr_02_1_main] - - [0xAB21D0, c, osr_02_2_entity] - - [0xAB21D0, c, osr_02_3_npc] - - [0xAB2290, c, osr_02_4_npc_peach] - - [0xAB22C0] + - [auto, c, osr_02_0_header] + - [auto, c, osr_02_1_main] + - [auto, c, osr_02_2_entity] + - [auto, c, osr_02_3_npc] + - [auto, c, osr_02_4_npc_peach] - name: osr_03 dir: world/area_osr/osr_03 type: code @@ -12266,14 +11800,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAB6290, c, osr_03_0_header] - - [0xAB62B0, c, osr_03_1_main] - - [0xAB62B0, c, osr_03_2_npc] - - [0xAB62B0, c, osr_03_3_intro] - - [0xAB6320, c, osr_03_4_starship] - - [0xAB6320, c, osr_03_5_interlude] - - [0xAB6430, c, osr_03_6_ending] - - [0xAB6610] + - [auto, c, osr_03_0_header] + - [auto, c, osr_03_1_main] + - [auto, c, osr_03_2_npc] + - [auto, c, osr_03_3_intro] + - [auto, c, osr_03_4_starship] + - [auto, c, osr_03_5_interlude] + - [auto, c, osr_03_6_ending] - name: osr_04 dir: world/area_osr/osr_04 type: code @@ -12281,10 +11814,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAB92B0, c, osr_04_0_header] - - [0xAB9300, c, osr_04_1_main] - - [0xAB9300, c, osr_04_2_assault] - - [0xAB9370] + - [auto, c, osr_04_0_header] + - [auto, c, osr_04_1_main] + - [auto, c, osr_04_2_assault] - name: kkj_00 dir: world/area_kkj/kkj_00 type: code @@ -12292,14 +11824,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xABB290, c, kkj_00_0_header] - - [0xABB290, c, kkj_00_1_music] - - [0xABB290, c, kkj_00_2_main] - - [0xABB340, c, kkj_00_3_npc_intro] - - [0xABC1D0, c, kkj_00_4_scene_intro] - - [0xABC1D0, c, kkj_00_5_npc_ending] - - [0xABC1D0, c, kkj_00_6_scene_ending] - - [0xABC250] + - [auto, c, kkj_00_0_header] + - [auto, c, kkj_00_1_music] + - [auto, c, kkj_00_2_main] + - [auto, c, kkj_00_3_npc_intro] + - [auto, c, kkj_00_4_scene_intro] + - [auto, c, kkj_00_5_npc_ending] + - [auto, c, kkj_00_6_scene_ending] - name: kkj_01 dir: world/area_kkj/kkj_01 type: code @@ -12307,11 +11838,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAC5170, c, kkj_01_0_header] - - [0xAC5170, c, kkj_01_1_music] - - [0xAC5170, c, kkj_01_2_main] - - [0xAC5170, c, kkj_01_3_npc] - - [0xAC6000] + - [auto, c, kkj_01_0_header] + - [auto, c, kkj_01_1_music] + - [auto, c, kkj_01_2_main] + - [auto, c, kkj_01_3_npc] - name: kkj_02 dir: world/area_kkj/kkj_02 type: code @@ -12319,11 +11849,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAC8D20, c, kkj_02_0_header] - - [0xAC8D20, c, kkj_02_1_music] - - [0xAC8D20, c, kkj_02_2_main] - - [0xAC8D20, c, kkj_02_3_npc] - - [0xAC8D20] + - [auto, c, kkj_02_0_header] + - [auto, c, kkj_02_1_music] + - [auto, c, kkj_02_2_main] + - [auto, c, kkj_02_3_npc] - name: kkj_03 dir: world/area_kkj/kkj_03 type: code @@ -12331,12 +11860,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAC9710, c, kkj_03_0_header] - - [0xAC9730, c, kkj_03_1_music] - - [0xAC9A40, c, kkj_03_2_main] - - [0xAC9A40, c, kkj_03_3_npc] - - [0xAC9A40, c, kkj_03_4_scenes] - - [0xAC9A40] + - [auto, c, kkj_03_0_header] + - [auto, c, kkj_03_1_music] + - [auto, c, kkj_03_2_main] + - [auto, c, kkj_03_3_npc] + - [auto, c, kkj_03_4_scenes] - name: kkj_10 dir: world/area_kkj/kkj_10 type: code @@ -12344,12 +11872,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xACAB20, c, kkj_10_0_header] - - [0xACAB20, c, kkj_10_1_main] - - [0xACAB90, c, kkj_10_2_entity] - - [0xACABD0, c, kkj_10_3_npcs_early] - - [0xACB3C0, c, kkj_10_4_npcs_later] - - [0xACBBF0] + - [auto, c, kkj_10_0_header] + - [auto, c, kkj_10_1_main] + - [auto, c, kkj_10_2_entity] + - [auto, c, kkj_10_3_npcs_early] + - [auto, c, kkj_10_4_npcs_later] - name: kkj_11 dir: world/area_kkj/kkj_11 type: code @@ -12357,14 +11884,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xACE140, c, kkj_11_0_header] - - [0xACE140, c, kkj_11_1_main] - - [0xACE1B0, c, kkj_11_2_entity] - - [0xACE1F0, c, kkj_11_3_scene] - - [0xACE1F0, c, kkj_11_4_demo] - - [0xACE1F0, c, kkj_11_5_npcs_early] - - [0xACE9E0, c, kkj_11_6_npcs_later] - - [0xACF210] + - [auto, c, kkj_11_0_header] + - [auto, c, kkj_11_1_main] + - [auto, c, kkj_11_2_entity] + - [auto, c, kkj_11_3_scene] + - [auto, c, kkj_11_4_demo] + - [auto, c, kkj_11_5_npcs_early] + - [auto, c, kkj_11_6_npcs_later] - name: kkj_12 dir: world/area_kkj/kkj_12 type: code @@ -12372,10 +11898,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAD4090, c, kkj_12_0_header] - - [0xAD4090, c, kkj_12_1_main] - - [0xAD4100, c, kkj_12_2_npc] - - [0xAD4940] + - [auto, c, kkj_12_0_header] + - [auto, c, kkj_12_1_main] + - [auto, c, kkj_12_2_npc] - name: kkj_13 dir: world/area_kkj/kkj_13 type: code @@ -12383,13 +11908,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAD5ED0, c, kkj_13_0_header] - - [0xAD5EF0, c, kkj_13_1_music] - - [0xAD6200, c, kkj_13_2_main] - - [0xAD6200, c, kkj_13_3_npcs_finale] - - [0xAD6260, c, kkj_13_4_npcs_intro] - - [0xAD6260, c, kkj_13_5_intro_scenes] - - [0xAD6630] + - [auto, c, kkj_13_0_header] + - [auto, c, kkj_13_1_music] + - [auto, c, kkj_13_2_main] + - [auto, c, kkj_13_3_npcs_finale] + - [auto, c, kkj_13_4_npcs_intro] + - [auto, c, kkj_13_5_intro_scenes] - name: kkj_14 dir: world/area_kkj/kkj_14 type: code @@ -12397,23 +11921,22 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xADAEA0, c, kkj_14_0_header] - - [0xADAEF0, c, kkj_14_1_music] - - [0xADAEF0, c, kkj_14_2_main] - - [0xADB240, c, kkj_14_3_interactables] - - [0xADB360, c, kkj_14_4_npc_guards] - - [0xADB360, c, kkj_14_5_npc_ch0] - - [0xADB360, c, kkj_14_6_npc_ch2] - - [0xADB360, c, kkj_14_7_npc_ch7] - - [0xADB360, c, kkj_14_8_chapter0] - - [0xADB360, c, kkj_14_9_chapter1] - - [0xADB360, c, kkj_14_10_chapter2] - - [0xADB360, c, kkj_14_11_chapter3] - - [0xADB360, c, kkj_14_12_chapter4] - - [0xADB360, c, kkj_14_13_chapter5] - - [0xADB360, c, kkj_14_14_chapter6] - - [0xADB360, c, kkj_14_15_chapter7] - - [0xADB360] + - [auto, c, kkj_14_0_header] + - [auto, c, kkj_14_1_music] + - [auto, c, kkj_14_2_main] + - [auto, c, kkj_14_3_interactables] + - [auto, c, kkj_14_4_npc_guards] + - [auto, c, kkj_14_5_npc_ch0] + - [auto, c, kkj_14_6_npc_ch2] + - [auto, c, kkj_14_7_npc_ch7] + - [auto, c, kkj_14_8_chapter0] + - [auto, c, kkj_14_9_chapter1] + - [auto, c, kkj_14_10_chapter2] + - [auto, c, kkj_14_11_chapter3] + - [auto, c, kkj_14_12_chapter4] + - [auto, c, kkj_14_13_chapter5] + - [auto, c, kkj_14_14_chapter6] + - [auto, c, kkj_14_15_chapter7] - name: kkj_15 dir: world/area_kkj/kkj_15 type: code @@ -12421,18 +11944,17 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAE5590, c, kkj_15_0_header] - - [0xAE5590, c, kkj_15_1_music] - - [0xAE5590, c, kkj_15_2_main] - - [0xAE58D0, c, kkj_15_3_rotating_wall] - - [0xAE5A90, c, kkj_15_4_chapter0] - - [0xAE5B60, c, kkj_15_5_chapter1] - - [0xAE5B60, c, kkj_15_6_chapter2] - - [0xAE5B60, c, kkj_15_7_chapter3] - - [0xAE5BA0, c, kkj_15_8_npc_chapter0] - - [0xAE5BA0, c, kkj_15_9_npc_chapter1] - - [0xAE5BA0, c, kkj_15_10_npc_chapter3] - - [0xAE5BA0] + - [auto, c, kkj_15_0_header] + - [auto, c, kkj_15_1_music] + - [auto, c, kkj_15_2_main] + - [auto, c, kkj_15_3_rotating_wall] + - [auto, c, kkj_15_4_chapter0] + - [auto, c, kkj_15_5_chapter1] + - [auto, c, kkj_15_6_chapter2] + - [auto, c, kkj_15_7_chapter3] + - [auto, c, kkj_15_8_npc_chapter0] + - [auto, c, kkj_15_9_npc_chapter1] + - [auto, c, kkj_15_10_npc_chapter3] - name: kkj_16 dir: world/area_kkj/kkj_16 type: code @@ -12440,13 +11962,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAED410, c, kkj_16_0_header] - - [0xAED410, c, kkj_16_1_main] - - [0xAED470, c, kkj_16_2_npcs_early] - - [0xAEDC60, c, kkj_16_3_npcs_later] - - [0xAEE490, c, kkj_16_4_stealth] - - [0xAEE490, c, kkj_16_5_entity] - - [0xAEE490] + - [auto, c, kkj_16_0_header] + - [auto, c, kkj_16_1_main] + - [auto, c, kkj_16_2_npcs_early] + - [auto, c, kkj_16_3_npcs_later] + - [auto, c, kkj_16_4_stealth] + - [auto, c, kkj_16_5_entity] - name: kkj_17 dir: world/area_kkj/kkj_17 type: code @@ -12454,11 +11975,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAF1C60, c, kkj_17_0_header] - - [0xAF1C60, c, kkj_17_1_main] - - [0xAF1C60, c, kkj_17_2_entity] - - [0xAF1C60, c, kkj_17_3_chest] - - [0xAF2200] + - [auto, c, kkj_17_0_header] + - [auto, c, kkj_17_1_main] + - [auto, c, kkj_17_2_entity] + - [auto, c, kkj_17_3_chest] - name: kkj_18 dir: world/area_kkj/kkj_18 type: code @@ -12466,12 +11986,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAF2CA0, c, kkj_18_0_header] - - [0xAF2CA0, c, kkj_18_1_music] - - [0xAF2CA0, c, kkj_18_2_main] - - [0xAF2FE0, c, kkj_18_3_npc] - - [0xAF2FE0, c, kkj_18_4_gourmet] - - [0xAF34C0] + - [auto, c, kkj_18_0_header] + - [auto, c, kkj_18_1_music] + - [auto, c, kkj_18_2_main] + - [auto, c, kkj_18_3_npc] + - [auto, c, kkj_18_4_gourmet] - name: kkj_19 dir: world/area_kkj/kkj_19 type: code @@ -12479,13 +11998,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAF7950, c, kkj_19_0_header] - - [0xAF7950, c, kkj_19_1_music] - - [0xAF7C00, c, kkj_19_2_main] - - [0xAF7C00, c, kkj_19_3_npcs_intro] - - [0xAF7C00, c, kkj_19_4_npcs_peach] - - [0xAF7C00, c, kkj_19_5_baking] - - [0xAF8660] + - [auto, c, kkj_19_0_header] + - [auto, c, kkj_19_1_music] + - [auto, c, kkj_19_2_main] + - [auto, c, kkj_19_3_npcs_intro] + - [auto, c, kkj_19_4_npcs_peach] + - [auto, c, kkj_19_5_baking] - name: kkj_20 dir: world/area_kkj/kkj_20 type: code @@ -12493,12 +12011,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xAFDB40, c, kkj_20_0_header] - - [0xAFDB40, c, kkj_20_1_music] - - [0xAFDB40, c, kkj_20_2_main] - - [0xAFDB40, c, kkj_20_3_entity] - - [0xAFDE00, c, kkj_20_4_npc] - - [0xAFE130] + - [auto, c, kkj_20_0_header] + - [auto, c, kkj_20_1_music] + - [auto, c, kkj_20_2_main] + - [auto, c, kkj_20_3_entity] + - [auto, c, kkj_20_4_npc] - name: kkj_21 dir: world/area_kkj/kkj_21 type: code @@ -12506,9 +12023,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB022A0, c, kkj_21_0_header] - - [0xB022A0, c, kkj_21_1_main] - - [0xB022A0] + - [auto, c, kkj_21_0_header] + - [auto, c, kkj_21_1_main] - name: kkj_22 dir: world/area_kkj/kkj_22 type: code @@ -12516,10 +12032,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB024F0, c, kkj_22_0_header] - - [0xB024F0, c, kkj_22_1_music] - - [0xB024F0, c, kkj_22_2_main] - - [0xB024F0] + - [auto, c, kkj_22_0_header] + - [auto, c, kkj_22_1_music] + - [auto, c, kkj_22_2_main] - name: kkj_23 dir: world/area_kkj/kkj_23 type: code @@ -12527,13 +12042,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB02880, c, kkj_23_0_header] - - [0xB028A0, c, kkj_23_1_music] - - [0xB028A0, c, kkj_23_2_main] - - [0xB02900, c, kkj_23_3_npcs_finale] - - [0xB02960, c, kkj_23_4_npcs_peach] - - [0xB03190, c, kkj_23_5_scene] - - [0xB03250] + - [auto, c, kkj_23_0_header] + - [auto, c, kkj_23_1_music] + - [auto, c, kkj_23_2_main] + - [auto, c, kkj_23_3_npcs_finale] + - [auto, c, kkj_23_4_npcs_peach] + - [auto, c, kkj_23_5_scene] - name: kkj_24 dir: world/area_kkj/kkj_24 type: code @@ -12541,11 +12055,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB06570, c, kkj_24_0_header] - - [0xB06570, c, kkj_24_1_music] - - [0xB06570, c, kkj_24_2_main] - - [0xB06590, c, kkj_24_3_entity] - - [0xB06590] + - [auto, c, kkj_24_0_header] + - [auto, c, kkj_24_1_music] + - [auto, c, kkj_24_2_main] + - [auto, c, kkj_24_3_entity] - name: kkj_25 dir: world/area_kkj/kkj_25 type: code @@ -12553,17 +12066,16 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB06A00, c, kkj_25_0_header] - - [0xB06A20, c, kkj_25_1_main] - - [0xB06A20, c, kkj_25_2_npc_initial] - - [0xB06A50, c, kkj_25_3_npc_midpoint] - - [0xB06A80, c, kkj_25_4_npc_final] - - [0xB06A80, c, kkj_25_5_arena] - - [0xB06D10, c, kkj_25_6_peach_free] - - [0xB07660, c, kkj_25_7_kammy_defeated] - - [0xB07730, c, kkj_25_8_bowser_defeated] - - [0xB07940, c, kkj_25_9_entity] - - [0xB07940] + - [auto, c, kkj_25_0_header] + - [auto, c, kkj_25_1_main] + - [auto, c, kkj_25_2_npc_initial] + - [auto, c, kkj_25_3_npc_midpoint] + - [auto, c, kkj_25_4_npc_final] + - [auto, c, kkj_25_5_arena] + - [auto, c, kkj_25_6_peach_free] + - [auto, c, kkj_25_7_kammy_defeated] + - [auto, c, kkj_25_8_bowser_defeated] + - [auto, c, kkj_25_9_entity] - name: kkj_26 dir: world/area_kkj/kkj_26 type: code @@ -12571,11 +12083,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB13120, c, kkj_26_0_header] - - [0xB13120, c, kkj_26_1_main] - - [0xB13150, c, kkj_26_2_scenes] - - [0xB13150, c, kkj_26_3_demo] - - [0xB13150] + - [auto, c, kkj_26_0_header] + - [auto, c, kkj_26_1_main] + - [auto, c, kkj_26_2_scenes] + - [auto, c, kkj_26_3_demo] - name: kkj_27 dir: world/area_kkj/kkj_27 type: code @@ -12583,11 +12094,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB13D70, c, kkj_27_0_header] - - [0xB13D70, c, kkj_27_1_music] - - [0xB13D70, c, kkj_27_2_main] - - [0xB14080, c, kkj_27_3_rotating_wall] - - [0xB14210] + - [auto, c, kkj_27_0_header] + - [auto, c, kkj_27_1_music] + - [auto, c, kkj_27_2_main] + - [auto, c, kkj_27_3_rotating_wall] - name: kkj_28 dir: world/area_kkj/kkj_28 type: code @@ -12595,9 +12105,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB14EA0, c, kkj_28_0_header] - - [0xB14EA0, c, kkj_28_1_main] - - [0xB14EA0] + - [auto, c, kkj_28_0_header] + - [auto, c, kkj_28_1_main] - name: kkj_29 dir: world/area_kkj/kkj_29 type: code @@ -12605,11 +12114,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB150B0, c, kkj_29_0_header] - - [0xB150B0, c, kkj_29_1_main] - - [0xB150E0, c, kkj_29_2_npc] - - [0xB150E0, c, kkj_29_3_quiz] - - [0xB15120] + - [auto, c, kkj_29_0_header] + - [auto, c, kkj_29_1_main] + - [auto, c, kkj_29_2_npc] + - [auto, c, kkj_29_3_quiz] - name: tst_01 dir: world/area_tst/tst_01 type: code @@ -12617,9 +12125,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB1A900, c, tst_01_1_main] - - [0xB1A900, c, tst_01_2_entity] - - [0xB1A900] + - [auto, c, tst_01_1_main] + - [auto, c, tst_01_2_entity] - name: tst_02 dir: world/area_tst/tst_02 type: code @@ -12627,9 +12134,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB1AC30, c, tst_02_1_main] - - [0xB1AC30, c, tst_02_2_entity] - - [0xB1AC30] + - [auto, c, tst_02_1_main] + - [auto, c, tst_02_2_entity] - name: tst_03 dir: world/area_tst/tst_03 type: code @@ -12637,9 +12143,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB1AF80, c, tst_03_1_main] - - [0xB1AF80, c, tst_03_2_entity] - - [0xB1AF80] + - [auto, c, tst_03_1_main] + - [auto, c, tst_03_2_entity] - name: tst_04 dir: world/area_tst/tst_04 type: code @@ -12647,11 +12152,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB1B570, c, tst_04_1_main] - - [0xB1B7D0, c, tst_04_2_entity] - - [0xB1B8D0, c, tst_04_3_reflection] - - [0xB1BBD0, c, tst_04_4_npc] - - [0xB1BC00] + - [auto, c, tst_04_1_main] + - [auto, c, tst_04_2_entity] + - [auto, c, tst_04_3_reflection] + - [auto, c, tst_04_4_npc] - name: tst_10 dir: world/area_tst/tst_10 type: code @@ -12659,8 +12163,7 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB1C540, c, tst_10_1_main] - - [0xB1C540] + - [auto, c, tst_10_1_main] - name: tst_11 dir: world/area_tst/tst_11 type: code @@ -12668,9 +12171,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB1CA50, c, tst_11_1_main] - - [0xB1CA50, c, tst_11_2_extra] - - [0xB1D1C0] + - [auto, c, tst_11_1_main] + - [auto, c, tst_11_2_extra] - name: tst_12 dir: world/area_tst/tst_12 type: code @@ -12678,7 +12180,7 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB1D2F0, c, tst_12_1_main] + - [auto, c, tst_12_1_main] - name: tst_13 dir: world/area_tst/tst_13 type: code @@ -12686,7 +12188,7 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB1D760, c, tst_13_1_main] + - [auto, c, tst_13_1_main] - start: 0xB1DB20 type: .data name: tst_13_1_main @@ -12702,7 +12204,7 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB20470, c, tst_20_1_main] + - [auto, c, tst_20_1_main] - name: jan_00 dir: world/area_jan/jan_00 type: code @@ -12710,13 +12212,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB20540, c, jan_00_0_header] - - [0xB20540, c, jan_00_1_main] - - [0xB20880, c, jan_00_2_npc] - - [0xB20880, c, jan_00_3_entity] - - [0xB216E0, c, jan_00_4_whale] - - [0xB21EA0, c, jan_00_5_foliage] - - [0xB220E0] + - [auto, c, jan_00_0_header] + - [auto, c, jan_00_1_main] + - [auto, c, jan_00_2_npc] + - [auto, c, jan_00_3_entity] + - [auto, c, jan_00_4_whale] + - [auto, c, jan_00_5_foliage] - name: jan_01 dir: world/area_jan/jan_01 type: code @@ -12724,13 +12225,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB28030, c, jan_01_0_header] - - [0xB28030, c, jan_01_1_music] - - [0xB28030, c, jan_01_2_main] - - [0xB28370, c, jan_01_3_npc] - - [0xB291C0, c, jan_01_4_entity] - - [0xB291C0, c, jan_01_5_foliage] - - [0xB29400] + - [auto, c, jan_01_0_header] + - [auto, c, jan_01_1_music] + - [auto, c, jan_01_2_main] + - [auto, c, jan_01_3_npc] + - [auto, c, jan_01_4_entity] + - [auto, c, jan_01_5_foliage] - name: jan_02 dir: world/area_jan/jan_02 type: code @@ -12738,13 +12238,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB2C470, c, jan_02_0_header] - - [0xB2C470, c, jan_02_1_music] - - [0xB2C4A0, c, jan_02_2_main] - - [0xB2C8A0, c, jan_02_3_npc] - - [0xB2EB50, c, jan_02_4_entity] - - [0xB2EB50, c, jan_02_5_foliage] - - [0xB2ED90] + - [auto, c, jan_02_0_header] + - [auto, c, jan_02_1_music] + - [auto, c, jan_02_2_main] + - [auto, c, jan_02_3_npc] + - [auto, c, jan_02_4_entity] + - [auto, c, jan_02_5_foliage] - name: jan_03 dir: world/area_jan/jan_03 type: code @@ -12752,15 +12251,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB34BD0, c, jan_03_0_header] - - [0xB34BD0, c, jan_03_1_music] - - [0xB34BD0, c, jan_03_2_main] - - [0xB351F0, c, jan_03_3_shop] - - [0xB351F0, c, jan_03_4_npc] - - [0xB37B70, c, jan_03_5_entity] - - [0xB37C20, c, jan_03_6_rooms] - - [0xB37C20, c, jan_03_7_foliage] - - [0xB37E60] + - [auto, c, jan_03_0_header] + - [auto, c, jan_03_1_music] + - [auto, c, jan_03_2_main] + - [auto, c, jan_03_3_shop] + - [auto, c, jan_03_4_npc] + - [auto, c, jan_03_5_entity] + - [auto, c, jan_03_6_rooms] + - [auto, c, jan_03_7_foliage] - name: jan_04 dir: world/area_jan/jan_04 type: code @@ -12768,18 +12266,17 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB44770, c, jan_04_0_header] - - [0xB447B0, c, jan_04_1_music] - - [0xB447B0, c, jan_04_2_main] - - [0xB44AC0, c, jan_04_3_entity] - - [0xB44D80, c, jan_04_4_npc] - - [0xB44F10, c, jan_04_5_unused] - - [0xB44F10, c, jan_04_6_trees] - - [0xB451F0, c, jan_04_7_scenes] - - [0xB451F0, c, jan_04_8_treasure] - - [0xB454F0, c, jan_04_9_bushes] - - [0xB45730, c, jan_04_10_demo] - - [0xB45860] + - [auto, c, jan_04_0_header] + - [auto, c, jan_04_1_music] + - [auto, c, jan_04_2_main] + - [auto, c, jan_04_3_entity] + - [auto, c, jan_04_4_npc] + - [auto, c, jan_04_5_unused] + - [auto, c, jan_04_6_trees] + - [auto, c, jan_04_7_scenes] + - [auto, c, jan_04_8_treasure] + - [auto, c, jan_04_9_bushes] + - [auto, c, jan_04_10_demo] - name: jan_05 dir: world/area_jan/jan_05 type: code @@ -12787,15 +12284,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB4AA70, c, jan_05_0_header] - - [0xB4AAB0, c, jan_05_1_music] - - [0xB4AAB0, c, jan_05_2_main] - - [0xB4ADC0, c, jan_05_3_log] - - [0xB4AF10, c, jan_05_4_bushes] - - [0xB4B260, c, jan_05_5_npc] - - [0xB4CEC0, c, jan_05_6_trees] - - [0xB4D140, c, jan_05_7_entity] - - [0xB4D140] + - [auto, c, jan_05_0_header] + - [auto, c, jan_05_1_music] + - [auto, c, jan_05_2_main] + - [auto, c, jan_05_3_log] + - [auto, c, jan_05_4_bushes] + - [auto, c, jan_05_5_npc] + - [auto, c, jan_05_6_trees] + - [auto, c, jan_05_7_entity] - name: jan_06 dir: world/area_jan/jan_06 type: code @@ -12803,15 +12299,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB52830, c, jan_06_0_header] - - [0xB52830, c, jan_06_1_main] - - [0xB52B40, c, jan_06_2_statue] - - [0xB52BE0, c, jan_06_3_log] - - [0xB52D30, c, jan_06_4_trees] - - [0xB52F70, c, jan_06_5_entity] - - [0xB52F70, c, jan_06_6_npc] - - [0xB54BD0, c, jan_06_7_bushes] - - [0xB54E10] + - [auto, c, jan_06_0_header] + - [auto, c, jan_06_1_main] + - [auto, c, jan_06_2_statue] + - [auto, c, jan_06_3_log] + - [auto, c, jan_06_4_trees] + - [auto, c, jan_06_5_entity] + - [auto, c, jan_06_6_npc] + - [auto, c, jan_06_7_bushes] - name: jan_07 dir: world/area_jan/jan_07 type: code @@ -12819,13 +12314,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB59870, c, jan_07_0_header] - - [0xB59870, c, jan_07_1_music] - - [0xB59870, c, jan_07_2_main] - - [0xB59870, c, jan_07_3_npc] - - [0xB5A610, c, jan_07_4_trees] - - [0xB5A850, c, jan_07_5_bushes] - - [0xB5AA90] + - [auto, c, jan_07_0_header] + - [auto, c, jan_07_1_music] + - [auto, c, jan_07_2_main] + - [auto, c, jan_07_3_npc] + - [auto, c, jan_07_4_trees] + - [auto, c, jan_07_5_bushes] - name: jan_08 dir: world/area_jan/jan_08 type: code @@ -12833,14 +12327,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB5E2B0, c, jan_08_0_header] - - [0xB5E2B0, c, jan_08_1_music] - - [0xB5E2B0, c, jan_08_2_main] - - [0xB5E5C0, c, jan_08_3_bushes] - - [0xB5E910, c, jan_08_4_entity] - - [0xB5F650, c, jan_08_5_npc] - - [0xB604A0, c, jan_08_6_trees] - - [0xB606E0] + - [auto, c, jan_08_0_header] + - [auto, c, jan_08_1_music] + - [auto, c, jan_08_2_main] + - [auto, c, jan_08_3_bushes] + - [auto, c, jan_08_4_entity] + - [auto, c, jan_08_5_npc] + - [auto, c, jan_08_6_trees] - name: jan_09 dir: world/area_jan/jan_09 type: code @@ -12848,13 +12341,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB65AB0, c, jan_09_0_header] - - [0xB65AB0, c, jan_09_1_main] - - [0xB660A0, c, jan_09_2_bushes] - - [0xB663F0, c, jan_09_3_npc] - - [0xB67190, c, jan_09_4_trees] - - [0xB673D0, c, jan_09_5_entity] - - [0xB673D0] + - [auto, c, jan_09_0_header] + - [auto, c, jan_09_1_main] + - [auto, c, jan_09_2_bushes] + - [auto, c, jan_09_3_npc] + - [auto, c, jan_09_4_trees] + - [auto, c, jan_09_5_entity] - name: jan_10 dir: world/area_jan/jan_10 type: code @@ -12862,15 +12354,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB6C390, c, jan_10_0_header] - - [0xB6C390, c, jan_10_1_music] - - [0xB6C390, c, jan_10_2_main] - - [0xB6C6A0, c, jan_10_3_npc] - - [0xB6D4C0, c, jan_10_4_log] - - [0xB6D610, c, jan_10_5_trees] - - [0xB6D890, c, jan_10_6_bushes] - - [0xB6DAD0, c, jan_10_7_entity] - - [0xB6DAD0] + - [auto, c, jan_10_0_header] + - [auto, c, jan_10_1_music] + - [auto, c, jan_10_2_main] + - [auto, c, jan_10_3_npc] + - [auto, c, jan_10_4_log] + - [auto, c, jan_10_5_trees] + - [auto, c, jan_10_6_bushes] + - [auto, c, jan_10_7_entity] - name: jan_11 dir: world/area_jan/jan_11 type: code @@ -12878,11 +12369,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB70860, c, jan_11_0_header] - - [0xB70860, c, jan_11_1_music] - - [0xB70860, c, jan_11_2_main] - - [0xB71010, c, jan_11_3_npc] - - [0xB71060] + - [auto, c, jan_11_0_header] + - [auto, c, jan_11_1_music] + - [auto, c, jan_11_2_main] + - [auto, c, jan_11_3_npc] - name: jan_12 dir: world/area_jan/jan_12 type: code @@ -12890,13 +12380,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB730B0, c, jan_12_0_header] - - [0xB730B0, c, jan_12_1_main] - - [0xB730B0, c, jan_12_2_vines] - - [0xB73330, c, jan_12_3_trees] - - [0xB73570, c, jan_12_4_entity] - - [0xB73570, c, jan_12_5_npc] - - [0xB74310] + - [auto, c, jan_12_0_header] + - [auto, c, jan_12_1_main] + - [auto, c, jan_12_2_vines] + - [auto, c, jan_12_3_trees] + - [auto, c, jan_12_4_entity] + - [auto, c, jan_12_5_npc] - name: jan_13 dir: world/area_jan/jan_13 type: code @@ -12904,12 +12393,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB767B0, c, jan_13_0_header] - - [0xB767B0, c, jan_13_1_main] - - [0xB767B0, c, jan_13_2_puzzle] - - [0xB76B40, c, jan_13_3_trees] - - [0xB76D80, c, jan_13_4_entity] - - [0xB76D80] + - [auto, c, jan_13_0_header] + - [auto, c, jan_13_1_main] + - [auto, c, jan_13_2_puzzle] + - [auto, c, jan_13_3_trees] + - [auto, c, jan_13_4_entity] - name: jan_14 dir: world/area_jan/jan_14 type: code @@ -12917,12 +12405,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB7A050, c, jan_14_0_header] - - [0xB7A050, c, jan_14_1_main] - - [0xB7A050, c, jan_14_2_vines] - - [0xB7A2D0, c, jan_14_3_trees] - - [0xB7A510, c, jan_14_4_npc] - - [0xB7B330] + - [auto, c, jan_14_0_header] + - [auto, c, jan_14_1_main] + - [auto, c, jan_14_2_vines] + - [auto, c, jan_14_3_trees] + - [auto, c, jan_14_4_npc] - name: jan_15 dir: world/area_jan/jan_15 type: code @@ -12930,12 +12417,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB7D920, c, jan_15_0_header] - - [0xB7D920, c, jan_15_1_main] - - [0xB7D920, c, jan_15_2_npc] - - [0xB7D9E0, c, jan_15_3_trees] - - [0xB7DC20, c, jan_15_4_entity] - - [0xB7DC20] + - [auto, c, jan_15_0_header] + - [auto, c, jan_15_1_main] + - [auto, c, jan_15_2_npc] + - [auto, c, jan_15_3_trees] + - [auto, c, jan_15_4_entity] - name: jan_16 dir: world/area_jan/jan_16 type: code @@ -12943,13 +12429,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB80000, c, jan_16_0_header] - - [0xB80000, c, jan_16_1_music] - - [0xB80000, c, jan_16_2_main] - - [0xB80300, c, jan_16_3_npc] - - [0xB80300, c, jan_16_4_entity] - - [0xB80300, c, jan_16_5_bushes] - - [0xB80540] + - [auto, c, jan_16_0_header] + - [auto, c, jan_16_1_music] + - [auto, c, jan_16_2_main] + - [auto, c, jan_16_3_npc] + - [auto, c, jan_16_4_entity] + - [auto, c, jan_16_5_bushes] - name: jan_17 dir: world/area_jan/jan_17 type: code @@ -12957,11 +12442,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB837C0, c, jan_17_0_header] - - [0xB837C0, c, jan_17_1_music] - - [0xB837C0, c, jan_17_2_main] - - [0xB837E0, c, jan_17_3_entity] - - [0xB837E0] + - [auto, c, jan_17_0_header] + - [auto, c, jan_17_1_music] + - [auto, c, jan_17_2_main] + - [auto, c, jan_17_3_entity] - name: jan_18 dir: world/area_jan/jan_18 type: code @@ -12969,11 +12453,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB83B90, c, jan_18_0_header] - - [0xB83B90, c, jan_18_1_music] - - [0xB83B90, c, jan_18_2_main] - - [0xB83B90, c, jan_18_3_entity] - - [0xB83B90] + - [auto, c, jan_18_0_header] + - [auto, c, jan_18_1_music] + - [auto, c, jan_18_2_main] + - [auto, c, jan_18_3_entity] - name: jan_19 dir: world/area_jan/jan_19 type: code @@ -12981,11 +12464,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB83E60, c, jan_19_0_header] - - [0xB83E60, c, jan_19_1_music] - - [0xB83E60, c, jan_19_2_main] - - [0xB83E80, c, jan_19_3_entity] - - [0xB83E80] + - [auto, c, jan_19_0_header] + - [auto, c, jan_19_1_music] + - [auto, c, jan_19_2_main] + - [auto, c, jan_19_3_entity] - name: jan_22 dir: world/area_jan/jan_22 type: code @@ -12993,15 +12475,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB84180, c, jan_22_0_header] - - [0xB84180, c, jan_22_1_music] - - [0xB84180, c, jan_22_2_main] - - [0xB84180, c, jan_22_3_npc] - - [0xB851A0, c, jan_22_4_entity] - - [0xB851A0, c, jan_22_5_zipline] - - [0xB85550, c, jan_22_6_bushes] - - [0xB858A0, c, jan_22_7_trees] - - [0xB85AE0] + - [auto, c, jan_22_0_header] + - [auto, c, jan_22_1_music] + - [auto, c, jan_22_2_main] + - [auto, c, jan_22_3_npc] + - [auto, c, jan_22_4_entity] + - [auto, c, jan_22_5_zipline] + - [auto, c, jan_22_6_bushes] + - [auto, c, jan_22_7_trees] - name: jan_23 dir: world/area_jan/jan_23 type: code @@ -13009,11 +12490,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB8FCD0, c, jan_23_0_header] - - [0xB8FCD0, c, jan_23_1_music] - - [0xB8FCD0, c, jan_23_2_main] - - [0xB8FCD0, c, jan_23_3_npc] - - [0xB8FCD0] + - [auto, c, jan_23_0_header] + - [auto, c, jan_23_1_music] + - [auto, c, jan_23_2_main] + - [auto, c, jan_23_3_npc] - name: mim_01 dir: world/area_mim/mim_01 type: code @@ -13021,14 +12501,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB93440, c, mim_01_0_header] - - [0xB93440, c, mim_01_1_music] - - [0xB93440, c, mim_01_2_main] - - [0xB934B0, c, mim_01_3_entity] - - [0xB934B0, c, mim_01_4_hint] - - [0xB934B0, c, mim_01_5_gate] - - [0xB93940, c, mim_01_6_npc] - - [0xB952F0] + - [auto, c, mim_01_0_header] + - [auto, c, mim_01_1_music] + - [auto, c, mim_01_2_main] + - [auto, c, mim_01_3_entity] + - [auto, c, mim_01_4_hint] + - [auto, c, mim_01_5_gate] + - [auto, c, mim_01_6_npc] - name: mim_02 dir: world/area_mim/mim_02 type: code @@ -13036,13 +12515,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB97C00, c, mim_02_0_header] - - [0xB97C00, c, mim_02_1_music] - - [0xB97C00, c, mim_02_2_main] - - [0xB97C70, c, mim_02_3_npc] - - [0xB97C70, c, mim_02_4_gate] - - [0xB97C70, c, mim_02_5_hint] - - [0xB98DE0] + - [auto, c, mim_02_0_header] + - [auto, c, mim_02_1_music] + - [auto, c, mim_02_2_main] + - [auto, c, mim_02_3_npc] + - [auto, c, mim_02_4_gate] + - [auto, c, mim_02_5_hint] - name: mim_03 dir: world/area_mim/mim_03 type: code @@ -13050,14 +12528,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB9B480, c, mim_03_0_header] - - [0xB9B480, c, mim_03_1_music] - - [0xB9B480, c, mim_03_2_main] - - [0xB9B480, c, mim_03_3_entity] - - [0xB9B480, c, mim_03_4_hint] - - [0xB9B480, c, mim_03_5_gate] - - [0xB9B480, c, mim_03_6_npc] - - [0xB9B9B0] + - [auto, c, mim_03_0_header] + - [auto, c, mim_03_1_music] + - [auto, c, mim_03_2_main] + - [auto, c, mim_03_3_entity] + - [auto, c, mim_03_4_hint] + - [auto, c, mim_03_5_gate] + - [auto, c, mim_03_6_npc] - name: mim_04 dir: world/area_mim/mim_04 type: code @@ -13065,14 +12542,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xB9D960, c, mim_04_0_header] - - [0xB9D960, c, mim_04_1_music] - - [0xB9D960, c, mim_04_2_main] - - [0xB9D9D0, c, mim_04_3_entity] - - [0xB9D9D0, c, mim_04_4_hint] - - [0xB9DB60, c, mim_04_5_gate] - - [0xB9DB60, c, mim_04_6_npc] - - [0xB9EA90] + - [auto, c, mim_04_0_header] + - [auto, c, mim_04_1_music] + - [auto, c, mim_04_2_main] + - [auto, c, mim_04_3_entity] + - [auto, c, mim_04_4_hint] + - [auto, c, mim_04_5_gate] + - [auto, c, mim_04_6_npc] - name: mim_05 dir: world/area_mim/mim_05 type: code @@ -13080,14 +12556,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBA0730, c, mim_05_0_header] - - [0xBA07A0, c, mim_05_1_music] - - [0xBA07A0, c, mim_05_2_main] - - [0xBA07A0, c, mim_05_3_entity] - - [0xBA07A0, c, mim_05_4_hint] - - [0xBA07A0, c, mim_05_5_gate] - - [0xBA07A0, c, mim_05_6_npc] - - [0xBA2150] + - [auto, c, mim_05_0_header] + - [auto, c, mim_05_1_music] + - [auto, c, mim_05_2_main] + - [auto, c, mim_05_3_entity] + - [auto, c, mim_05_4_hint] + - [auto, c, mim_05_5_gate] + - [auto, c, mim_05_6_npc] - name: mim_06 dir: world/area_mim/mim_06 type: code @@ -13095,14 +12570,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBA4780, c, mim_06_0_header] - - [0xBA4780, c, mim_06_1_music] - - [0xBA4780, c, mim_06_2_main] - - [0xBA4780, c, mim_06_3_entity] - - [0xBA47F0, c, mim_06_4_hint] - - [0xBA47F0, c, mim_06_5_gate] - - [0xBA4CF0, c, mim_06_6_npc] - - [0xBA74B0] + - [auto, c, mim_06_0_header] + - [auto, c, mim_06_1_music] + - [auto, c, mim_06_2_main] + - [auto, c, mim_06_3_entity] + - [auto, c, mim_06_4_hint] + - [auto, c, mim_06_5_gate] + - [auto, c, mim_06_6_npc] - name: mim_07 dir: world/area_mim/mim_07 type: code @@ -13110,14 +12584,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBAA140, c, mim_07_0_header] - - [0xBAA140, c, mim_07_1_music] - - [0xBAA140, c, mim_07_2_main] - - [0xBAA1B0, c, mim_07_3_entity] - - [0xBAA1B0, c, mim_07_4_hint] - - [0xBAA3B0, c, mim_07_5_gate] - - [0xBAA3B0, c, mim_07_6_npc] - - [0xBAB1D0] + - [auto, c, mim_07_0_header] + - [auto, c, mim_07_1_music] + - [auto, c, mim_07_2_main] + - [auto, c, mim_07_3_entity] + - [auto, c, mim_07_4_hint] + - [auto, c, mim_07_5_gate] + - [auto, c, mim_07_6_npc] - name: mim_08 dir: world/area_mim/mim_08 type: code @@ -13125,13 +12598,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBAD940, c, mim_08_0_header] - - [0xBAD940, c, mim_08_1_music] - - [0xBAD940, c, mim_08_2_main] - - [0xBAD9E0, c, mim_08_3_entity] - - [0xBAD9E0, c, mim_08_4_gate] - - [0xBAD9E0, c, mim_08_5_npc] - - [0xBB0880] + - [auto, c, mim_08_0_header] + - [auto, c, mim_08_1_music] + - [auto, c, mim_08_2_main] + - [auto, c, mim_08_3_entity] + - [auto, c, mim_08_4_gate] + - [auto, c, mim_08_5_npc] - name: mim_09 dir: world/area_mim/mim_09 type: code @@ -13139,14 +12611,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBB2E00, c, mim_09_0_header] - - [0xBB2E00, c, mim_09_1_music] - - [0xBB2E00, c, mim_09_2_main] - - [0xBB2EA0, c, mim_09_3_entity] - - [0xBB2EA0, c, mim_09_4_hint] - - [0xBB2EA0, c, mim_09_5_gate] - - [0xBB2EA0, c, mim_09_6_npc] - - [0xBB3CC0] + - [auto, c, mim_09_0_header] + - [auto, c, mim_09_1_music] + - [auto, c, mim_09_2_main] + - [auto, c, mim_09_3_entity] + - [auto, c, mim_09_4_hint] + - [auto, c, mim_09_5_gate] + - [auto, c, mim_09_6_npc] - name: mim_10 dir: world/area_mim/mim_10 type: code @@ -13154,12 +12625,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBB59E0, c, mim_10_0_header] - - [0xBB59E0, c, mim_10_1_music] - - [0xBB59E0, c, mim_10_2_entity] - - [0xBB59E0, c, mim_10_3_main] - - [0xBB59E0, c, mim_10_4_npc] - - [0xBB5B70] + - [auto, c, mim_10_0_header] + - [auto, c, mim_10_1_music] + - [auto, c, mim_10_2_entity] + - [auto, c, mim_10_3_main] + - [auto, c, mim_10_4_npc] - name: mim_11 dir: world/area_mim/mim_11 type: code @@ -13167,14 +12637,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBB7070, c, mim_11_0_header] - - [0xBB7070, c, mim_11_1_music] - - [0xBB7070, c, mim_11_2_main] - - [0xBB7070, c, mim_11_3_gate] - - [0xBB7070, c, mim_11_4_entity] - - [0xBB7940, c, mim_11_5_npc] - - [0xBB79F0, c, mim_11_6_foliage] - - [0xBB7C30] + - [auto, c, mim_11_0_header] + - [auto, c, mim_11_1_music] + - [auto, c, mim_11_2_main] + - [auto, c, mim_11_3_gate] + - [auto, c, mim_11_4_entity] + - [auto, c, mim_11_5_npc] + - [auto, c, mim_11_6_foliage] - name: mim_12 dir: world/area_mim/mim_12 type: code @@ -13182,13 +12651,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBBB380, c, mim_12_0_header] - - [0xBBB380, c, mim_12_1_music] - - [0xBBB380, c, mim_12_2_entity] - - [0xBBB380, c, mim_12_3_main] - - [0xBBB380, c, mim_12_4_npc] - - [0xBBB380, c, mim_12_5_gate] - - [0xBBB960] + - [auto, c, mim_12_0_header] + - [auto, c, mim_12_1_music] + - [auto, c, mim_12_2_entity] + - [auto, c, mim_12_3_main] + - [auto, c, mim_12_4_npc] + - [auto, c, mim_12_5_gate] - name: obk_01 dir: world/area_obk/obk_01 type: code @@ -13196,15 +12664,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBBD1A0, c, obk_01_0_header] - - [0xBBD1A0, c, obk_01_1_music] - - [0xBBD1A0, c, obk_01_2_main] - - [0xBBD1A0, c, obk_01_3_chandelier] - - [0xBBD980, c, obk_01_4_portrait] - - [0xBBD980, c, obk_01_5_jump_scare] - - [0xBBD980, c, obk_01_6_npc] - - [0xBBE2E0, c, obk_01_7_entity] - - [0xBBE2E0] + - [auto, c, obk_01_0_header] + - [auto, c, obk_01_1_music] + - [auto, c, obk_01_2_main] + - [auto, c, obk_01_3_chandelier] + - [auto, c, obk_01_4_portrait] + - [auto, c, obk_01_5_jump_scare] + - [auto, c, obk_01_6_npc] + - [auto, c, obk_01_7_entity] - name: obk_02 dir: world/area_obk/obk_02 type: code @@ -13212,14 +12679,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBC2A90, c, obk_02_0_header] - - [0xBC2A90, c, obk_02_1_music] - - [0xBC2A90, c, obk_02_2_main] - - [0xBC2A90, c, obk_02_3_npc] - - [0xBC2CD0, c, obk_02_4_bombable] - - [0xBC2CD0, c, obk_02_5_clock] - - [0xBC4260, c, obk_02_6_entity] - - [0xBC4260] + - [auto, c, obk_02_0_header] + - [auto, c, obk_02_1_music] + - [auto, c, obk_02_2_main] + - [auto, c, obk_02_3_npc] + - [auto, c, obk_02_4_bombable] + - [auto, c, obk_02_5_clock] + - [auto, c, obk_02_6_entity] - name: obk_03 dir: world/area_obk/obk_03 type: code @@ -13227,15 +12693,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBC4280, c, obk_03_0_header] - - [0xBC4280, c, obk_03_1_music] - - [0xBC4280, c, obk_03_2_main] - - [0xBC4280, c, obk_03_3_shop] - - [0xBC4280, c, obk_03_4_entity] - - [0xBC43F0, c, obk_03_5_stairs] - - [0xBC43F0, c, obk_03_6_npc] - - [0xBC4B50, c, obk_03_7_rocking_chair] - - [0xBC5270] + - [auto, c, obk_03_0_header] + - [auto, c, obk_03_1_music] + - [auto, c, obk_03_2_main] + - [auto, c, obk_03_3_shop] + - [auto, c, obk_03_4_entity] + - [auto, c, obk_03_5_stairs] + - [auto, c, obk_03_6_npc] + - [auto, c, obk_03_7_rocking_chair] - name: obk_04 dir: world/area_obk/obk_04 type: code @@ -13243,14 +12708,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBC7E60, c, obk_04_0_header] - - [0xBC7E60, c, obk_04_1_music] - - [0xBC7E60, c, obk_04_2_entity] - - [0xBC7EB0, c, obk_04_3_npc] - - [0xBC87A0, c, obk_04_4_main] - - [0xBC87A0, c, obk_04_5_hole] - - [0xBC87A0, c, obk_04_6_game] - - [0xBC8CE0] + - [auto, c, obk_04_0_header] + - [auto, c, obk_04_1_music] + - [auto, c, obk_04_2_entity] + - [auto, c, obk_04_3_npc] + - [auto, c, obk_04_4_main] + - [auto, c, obk_04_5_hole] + - [auto, c, obk_04_6_game] - name: obk_05 dir: world/area_obk/obk_05 type: code @@ -13258,14 +12722,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBCD060, c, obk_05_0_header] - - [0xBCD060, c, obk_05_1_music] - - [0xBCD060, c, obk_05_2_main] - - [0xBCD7D0, c, obk_05_3_rocking_chair] - - [0xBCD800, c, obk_05_4_hole] - - [0xBCD800, c, obk_05_5_npc] - - [0xBCDA40, c, obk_05_6_entity] - - [0xBCDA40] + - [auto, c, obk_05_0_header] + - [auto, c, obk_05_1_music] + - [auto, c, obk_05_2_main] + - [auto, c, obk_05_3_rocking_chair] + - [auto, c, obk_05_4_hole] + - [auto, c, obk_05_5_npc] + - [auto, c, obk_05_6_entity] - name: obk_06 dir: world/area_obk/obk_06 type: code @@ -13273,12 +12736,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBCE690, c, obk_06_0_header] - - [0xBCE690, c, obk_06_1_music] - - [0xBCE690, c, obk_06_2_main] - - [0xBCE690, c, obk_06_3_bombable] - - [0xBCE690, c, obk_06_4_entity] - - [0xBCE690] + - [auto, c, obk_06_0_header] + - [auto, c, obk_06_1_music] + - [auto, c, obk_06_2_main] + - [auto, c, obk_06_3_bombable] + - [auto, c, obk_06_4_entity] - name: obk_07 dir: world/area_obk/obk_07 type: code @@ -13286,14 +12748,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBCEBF0, c, obk_07_0_header] - - [0xBCEBF0, c, obk_07_1_music] - - [0xBCEBF0, c, obk_07_2_main] - - [0xBCEBF0, c, obk_07_3_entity] - - [0xBCEEB0, c, obk_07_4_fireplace] - - [0xBCEEB0, c, obk_07_5_npc] - - [0xBCF0F0, c, obk_07_6_phonograph] - - [0xBD0780] + - [auto, c, obk_07_0_header] + - [auto, c, obk_07_1_music] + - [auto, c, obk_07_2_main] + - [auto, c, obk_07_3_entity] + - [auto, c, obk_07_4_fireplace] + - [auto, c, obk_07_5_npc] + - [auto, c, obk_07_6_phonograph] - name: obk_08 dir: world/area_obk/obk_08 type: code @@ -13301,14 +12762,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBD3870, c, obk_08_0_header] - - [0xBD3870, c, obk_08_1_music] - - [0xBD3870, c, obk_08_2_main] - - [0xBD3870, c, obk_08_3_cabinets] - - [0xBD40B0, c, obk_08_4_entity] - - [0xBD4110, c, obk_08_5_npc] - - [0xBD4A90, c, obk_08_6_game] - - [0xBD5010] + - [auto, c, obk_08_0_header] + - [auto, c, obk_08_1_music] + - [auto, c, obk_08_2_main] + - [auto, c, obk_08_3_cabinets] + - [auto, c, obk_08_4_entity] + - [auto, c, obk_08_5_npc] + - [auto, c, obk_08_6_game] - name: obk_09 dir: world/area_obk/obk_09 type: code @@ -13316,14 +12776,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBDA7B0, c, obk_09_0_header] - - [0xBDA7B0, c, obk_09_1_music] - - [0xBDA7B0, c, obk_09_2_main] - - [0xBDA7B0, c, obk_09_3_meet_bow] - - [0xBDA940, c, obk_09_4_npc] - - [0xBDAB00, c, obk_09_5_new_partner] - - [0xBDABA0, c, obk_09_6_epilogue] - - [0xBDABE0] + - [auto, c, obk_09_0_header] + - [auto, c, obk_09_1_music] + - [auto, c, obk_09_2_main] + - [auto, c, obk_09_3_meet_bow] + - [auto, c, obk_09_4_npc] + - [auto, c, obk_09_5_new_partner] + - [auto, c, obk_09_6_epilogue] - name: arn_02 dir: world/area_arn/arn_02 type: code @@ -13331,12 +12790,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBDD1B0, c, arn_02_0_header] - - [0xBDD1B0, c, arn_02_1_music] - - [0xBDD1B0, c, arn_02_2_main] - - [0xBDD1B0, c, arn_02_3_entity] - - [0xBDD1B0, c, arn_02_4_npc] - - [0xBDE190] + - [auto, c, arn_02_0_header] + - [auto, c, arn_02_1_music] + - [auto, c, arn_02_2_main] + - [auto, c, arn_02_3_entity] + - [auto, c, arn_02_4_npc] - name: arn_03 dir: world/area_arn/arn_03 type: code @@ -13344,12 +12802,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBDED90, c, arn_03_0_header] - - [0xBDED90, c, arn_03_1_music] - - [0xBDED90, c, arn_03_2_main] - - [0xBDED90, c, arn_03_3_npc] - - [0xBDED90, c, arn_03_4_entity] - - [0xBE04B0] + - [auto, c, arn_03_0_header] + - [auto, c, arn_03_1_music] + - [auto, c, arn_03_2_main] + - [auto, c, arn_03_3_npc] + - [auto, c, arn_03_4_entity] - name: arn_04 dir: world/area_arn/arn_04 type: code @@ -13357,12 +12814,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBE37B0, c, arn_04_0_header] - - [0xBE37B0, c, arn_04_1_music] - - [0xBE37B0, c, arn_04_2_main] - - [0xBE37B0, c, arn_04_3_npc] - - [0xBE37B0, c, arn_04_4_entity] - - [0xBE6B20] + - [auto, c, arn_04_0_header] + - [auto, c, arn_04_1_music] + - [auto, c, arn_04_2_main] + - [auto, c, arn_04_3_npc] + - [auto, c, arn_04_4_entity] - name: arn_05 dir: world/area_arn/arn_05 type: code @@ -13370,12 +12826,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBE7BE0, c, arn_05_0_header] - - [0xBE7BE0, c, arn_05_1_music] - - [0xBE7BE0, c, arn_05_2_main] - - [0xBE7BE0, c, arn_05_3_npc] - - [0xBE7BE0, c, arn_05_4_entity] - - [0xBE8EE0] + - [auto, c, arn_05_0_header] + - [auto, c, arn_05_1_music] + - [auto, c, arn_05_2_main] + - [auto, c, arn_05_3_npc] + - [auto, c, arn_05_4_entity] - name: arn_07 dir: world/area_arn/arn_07 type: code @@ -13383,13 +12838,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBECDF0, c, arn_07_0_header] - - [0xBECDF0, c, arn_07_1_music] - - [0xBECDF0, c, arn_07_2_main] - - [0xBED5F0, c, arn_07_3_windmill] - - [0xBED660, c, arn_07_4_entity] - - [0xBED740, c, arn_07_5_npc] - - [0xBEEC80] + - [auto, c, arn_07_0_header] + - [auto, c, arn_07_1_music] + - [auto, c, arn_07_2_main] + - [auto, c, arn_07_3_windmill] + - [auto, c, arn_07_4_entity] + - [auto, c, arn_07_5_npc] - name: arn_08 dir: world/area_arn/arn_08 type: code @@ -13397,15 +12851,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBF47A0, c, arn_08_0_header] - - [0xBF47A0, c, arn_08_1_music] - - [0xBF47A0, c, arn_08_2_main] - - [0xBF47A0, c, arn_08_3_well] - - [0xBF47A0, c, arn_08_4_gears] - - [0xBF4860, c, arn_08_5_demo] - - [0xBF4860, c, arn_08_6_npc] - - [0xBF4860, c, arn_08_7_entity] - - [0xBF4A30] + - [auto, c, arn_08_0_header] + - [auto, c, arn_08_1_music] + - [auto, c, arn_08_2_main] + - [auto, c, arn_08_3_well] + - [auto, c, arn_08_4_gears] + - [auto, c, arn_08_5_demo] + - [auto, c, arn_08_6_npc] + - [auto, c, arn_08_7_entity] - name: arn_09 dir: world/area_arn/arn_09 type: code @@ -13413,13 +12866,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBF6060, c, arn_09_0_header] - - [0xBF6060, c, arn_09_1_music] - - [0xBF6060, c, arn_09_2_main] - - [0xBF6060, c, arn_09_3_entity] - - [0xBF6060, c, arn_09_4_launch] - - [0xBF6060, c, arn_09_5_npc] - - [0xBF60A0] + - [auto, c, arn_09_0_header] + - [auto, c, arn_09_1_music] + - [auto, c, arn_09_2_main] + - [auto, c, arn_09_3_entity] + - [auto, c, arn_09_4_launch] + - [auto, c, arn_09_5_npc] - name: arn_10 dir: world/area_arn/arn_10 type: code @@ -13427,12 +12879,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBF6A00, c, arn_10_0_header] - - [0xBF6A00, c, arn_10_1_music] - - [0xBF6A00, c, arn_10_2_main] - - [0xBF6A00, c, arn_10_3_npc] - - [0xBF6A00, c, arn_10_4_entity] - - [0xBF6A00] + - [auto, c, arn_10_0_header] + - [auto, c, arn_10_1_music] + - [auto, c, arn_10_2_main] + - [auto, c, arn_10_3_npc] + - [auto, c, arn_10_4_entity] - name: arn_11 dir: world/area_arn/arn_11 type: code @@ -13440,11 +12891,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBF7680, c, arn_11_0_header] - - [0xBF7680, c, arn_11_1_music] - - [0xBF7680, c, arn_11_2_main] - - [0xBF7680, c, arn_11_3_npc] - - [0xBF7680] + - [auto, c, arn_11_0_header] + - [auto, c, arn_11_1_music] + - [auto, c, arn_11_2_main] + - [auto, c, arn_11_3_npc] - name: arn_12 dir: world/area_arn/arn_12 type: code @@ -13452,12 +12902,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBF8790, c, arn_12_0_header] - - [0xBF8790, c, arn_12_1_music] - - [0xBF8790, c, arn_12_2_main] - - [0xBF8790, c, arn_12_3_npc] - - [0xBF8790, c, arn_12_4_entity] - - [0xBF8790] + - [auto, c, arn_12_0_header] + - [auto, c, arn_12_1_music] + - [auto, c, arn_12_2_main] + - [auto, c, arn_12_3_npc] + - [auto, c, arn_12_4_entity] - name: arn_13 dir: world/area_arn/arn_13 type: code @@ -13465,12 +12914,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBF9410, c, arn_13_0_header] - - [0xBF9410, c, arn_13_1_music] - - [0xBF9410, c, arn_13_2_main] - - [0xBF9410, c, arn_13_3_npc] - - [0xBF9410, c, arn_13_4_entity] - - [0xBF9410] + - [auto, c, arn_13_0_header] + - [auto, c, arn_13_1_music] + - [auto, c, arn_13_2_main] + - [auto, c, arn_13_3_npc] + - [auto, c, arn_13_4_entity] - name: dgb_00 dir: world/area_dgb/dgb_00 type: code @@ -13478,12 +12926,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBFA0A0, c, dgb_00_0_header] - - [0xBFA0A0, c, dgb_00_1_music] - - [0xBFA0A0, c, dgb_00_2_main] - - [0xBFA100, c, dgb_00_3_npc] - - [0xBFA150, c, dgb_00_4_entity] - - [0xBFA150] + - [auto, c, dgb_00_0_header] + - [auto, c, dgb_00_1_music] + - [auto, c, dgb_00_2_main] + - [auto, c, dgb_00_3_npc] + - [auto, c, dgb_00_4_entity] - name: dgb_01 dir: world/area_dgb/dgb_01 type: code @@ -13491,27 +12938,27 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xBFD880, c, dgb_01_0_header] - - [0xBFD880, c, dgb_01_1_music] - - [0xBFD880, c, dgb_01_2_main] - - [0xBFD880, c, dgb_01_3_bridges] - - [0xBFD8C0, c, dgb_01_4_entity] - - [0xBFD9A0, c, dgb_01_5_npc] - - [0xC00C70, c, dgb_01_6_img0] - - [0xC00C70, c, dgb_01_6_img1] - - [0xC00C70, c, dgb_01_6_img2] - - [0xC00C70, c, dgb_01_6_img3] - - [0xC00C70, c, dgb_01_6_img4] - - [0xC00C70, c, dgb_01_6_img5] - - [0xC00C70, c, dgb_01_6_img6] - - [0xC00C70, c, dgb_01_6_img7] - - [0xC00C70, c, dgb_01_7] - - [0xC00C70, .data, dgb_01_0_header] - - [0xC00D20, .data, dgb_01_1_music] - - [0xC00DD0, .data, dgb_01_2_main] - - [0xC01770, .data, dgb_01_3_bridges] - - [0xC02350, .data, dgb_01_4_entity] - - [0xC02550, .data, dgb_01_5_npc] + - [auto, c, dgb_01_0_header] + - [auto, c, dgb_01_1_music] + - [auto, c, dgb_01_2_main] + - [auto, c, dgb_01_3_bridges] + - [auto, c, dgb_01_4_entity] + - [auto, c, dgb_01_5_npc] + - [auto, c, dgb_01_6_img0] + - [auto, c, dgb_01_6_img1] + - [auto, c, dgb_01_6_img2] + - [auto, c, dgb_01_6_img3] + - [auto, c, dgb_01_6_img4] + - [auto, c, dgb_01_6_img5] + - [auto, c, dgb_01_6_img6] + - [auto, c, dgb_01_6_img7] + - [auto, c, dgb_01_7] + - [auto, .data, dgb_01_0_header] + - [auto, .data, dgb_01_1_music] + - [auto, .data, dgb_01_2_main] + - [auto, .data, dgb_01_3_bridges] + - [auto, .data, dgb_01_4_entity] + - [auto, .data, dgb_01_5_npc] - start: 0xC047F0 type: .data name: dgb_01_6_img0 @@ -13569,7 +13016,7 @@ segments: vram: 0x80200000 vram_of_symbol: D_80200000 subsegments: - - [0xC20F40, c, dgb_01_smash_bridges] + - [auto, c, dgb_01_smash_bridges] - start: 0xC20F40 type: .data name: dgb_01_smash_bridges @@ -13871,11 +13318,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC2EBA0, c, dgb_02_0_header] - - [0xC2EBA0, c, dgb_02_1_music] - - [0xC2EBA0, c, dgb_02_2_main] - - [0xC2EBA0, c, dgb_02_3_npc] - - [0xC2FFD0] + - [auto, c, dgb_02_0_header] + - [auto, c, dgb_02_1_music] + - [auto, c, dgb_02_2_main] + - [auto, c, dgb_02_3_npc] - name: dgb_03 dir: world/area_dgb/dgb_03 type: code @@ -13883,13 +13329,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC314E0, c, dgb_03_0_header] - - [0xC314E0, c, dgb_03_1_music] - - [0xC314E0, c, dgb_03_2_main] - - [0xC314E0, c, dgb_03_3_clock] - - [0xC314E0, c, dgb_03_4_entity] - - [0xC31730, c, dgb_03_5_npc] - - [0xC33CB0] + - [auto, c, dgb_03_0_header] + - [auto, c, dgb_03_1_music] + - [auto, c, dgb_03_2_main] + - [auto, c, dgb_03_3_clock] + - [auto, c, dgb_03_4_entity] + - [auto, c, dgb_03_5_npc] - name: dgb_04 dir: world/area_dgb/dgb_04 type: code @@ -13897,12 +13342,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC36530, c, dgb_04_0_header] - - [0xC36530, c, dgb_04_1_music] - - [0xC36530, c, dgb_04_2_main] - - [0xC36530, c, dgb_04_3_npc] - - [0xC38900, c, dgb_04_4_entity] - - [0xC39640] + - [auto, c, dgb_04_0_header] + - [auto, c, dgb_04_1_music] + - [auto, c, dgb_04_2_main] + - [auto, c, dgb_04_3_npc] + - [auto, c, dgb_04_4_entity] - name: dgb_05 dir: world/area_dgb/dgb_05 type: code @@ -13910,13 +13354,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC3AA10, c, dgb_05_0_header] - - [0xC3AA10, c, dgb_05_1_music] - - [0xC3AA10, c, dgb_05_2_main] - - [0xC3AA10, c, dgb_05_3_hole] - - [0xC3AA10, c, dgb_05_4_entity] - - [0xC3AA70, c, dgb_05_5_npc] - - [0xC3BEA0] + - [auto, c, dgb_05_0_header] + - [auto, c, dgb_05_1_music] + - [auto, c, dgb_05_2_main] + - [auto, c, dgb_05_3_hole] + - [auto, c, dgb_05_4_entity] + - [auto, c, dgb_05_5_npc] - name: dgb_06 dir: world/area_dgb/dgb_06 type: code @@ -13924,12 +13367,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC3D080, c, dgb_06_0_header] - - [0xC3D080, c, dgb_06_1_music] - - [0xC3D080, c, dgb_06_2_main] - - [0xC3D080, c, dgb_06_3_entity] - - [0xC3D080, c, dgb_06_4_npc] - - [0xC3D340] + - [auto, c, dgb_06_0_header] + - [auto, c, dgb_06_1_music] + - [auto, c, dgb_06_2_main] + - [auto, c, dgb_06_3_entity] + - [auto, c, dgb_06_4_npc] - name: dgb_07 dir: world/area_dgb/dgb_07 type: code @@ -13937,12 +13379,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC3DBF0, c, dgb_07_0_header] - - [0xC3DBF0, c, dgb_07_1_music] - - [0xC3DBF0, c, dgb_07_2_main] - - [0xC3DBF0, c, dgb_07_3_entity] - - [0xC3DBF0, c, dgb_07_4_npc] - - [0xC3F020] + - [auto, c, dgb_07_0_header] + - [auto, c, dgb_07_1_music] + - [auto, c, dgb_07_2_main] + - [auto, c, dgb_07_3_entity] + - [auto, c, dgb_07_4_npc] - name: dgb_08 dir: world/area_dgb/dgb_08 type: code @@ -13950,12 +13391,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC3FDB0, c, dgb_08_0_header] - - [0xC3FDB0, c, dgb_08_1_music] - - [0xC3FDB0, c, dgb_08_2_main] - - [0xC3FDB0, c, dgb_08_3_npc] - - [0xC43A40, c, dgb_08_4_entity] - - [0xC43A40] + - [auto, c, dgb_08_0_header] + - [auto, c, dgb_08_1_music] + - [auto, c, dgb_08_2_main] + - [auto, c, dgb_08_3_npc] + - [auto, c, dgb_08_4_entity] - name: dgb_09 dir: world/area_dgb/dgb_09 type: code @@ -13963,12 +13403,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC46BE0, c, dgb_09_0_header] - - [0xC46BE0, c, dgb_09_1_music] - - [0xC46BE0, c, dgb_09_2_main] - - [0xC46BE0, c, dgb_09_3_breakable] - - [0xC46BE0, c, dgb_09_4_npc] - - [0xC4A3E0] + - [auto, c, dgb_09_0_header] + - [auto, c, dgb_09_1_music] + - [auto, c, dgb_09_2_main] + - [auto, c, dgb_09_3_breakable] + - [auto, c, dgb_09_4_npc] - name: dgb_10 dir: world/area_dgb/dgb_10 type: code @@ -13976,12 +13415,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC4C390, c, dgb_10_0_header] - - [0xC4C390, c, dgb_10_1_music] - - [0xC4C390, c, dgb_10_2_main] - - [0xC4C390, c, dgb_10_3_hole] - - [0xC4C580, c, dgb_10_4_entity] - - [0xC4C580] + - [auto, c, dgb_10_0_header] + - [auto, c, dgb_10_1_music] + - [auto, c, dgb_10_2_main] + - [auto, c, dgb_10_3_hole] + - [auto, c, dgb_10_4_entity] - name: dgb_11 dir: world/area_dgb/dgb_11 type: code @@ -13989,11 +13427,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC4D3E0, c, dgb_11_0_header] - - [0xC4D3E0, c, dgb_11_1_music] - - [0xC4D3E0, c, dgb_11_2_main] - - [0xC4D3E0, c, dgb_11_3_entity] - - [0xC4D430] + - [auto, c, dgb_11_0_header] + - [auto, c, dgb_11_1_music] + - [auto, c, dgb_11_2_main] + - [auto, c, dgb_11_3_entity] - name: dgb_12 dir: world/area_dgb/dgb_12 type: code @@ -14001,12 +13438,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC4DEF0, c, dgb_12_0_header] - - [0xC4DEF0, c, dgb_12_1_music] - - [0xC4DEF0, c, dgb_12_2_main] - - [0xC4DEF0, c, dgb_12_3_spikes] - - [0xC4DEF0, c, dgb_12_4_entity] - - [0xC4E1B0] + - [auto, c, dgb_12_0_header] + - [auto, c, dgb_12_1_music] + - [auto, c, dgb_12_2_main] + - [auto, c, dgb_12_3_spikes] + - [auto, c, dgb_12_4_entity] - name: dgb_13 dir: world/area_dgb/dgb_13 type: code @@ -14014,12 +13450,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC4E960, c, dgb_13_0_header] - - [0xC4E960, c, dgb_13_1_music] - - [0xC4E960, c, dgb_13_2_main] - - [0xC4E960, c, dgb_13_3_entity] - - [0xC4E960, c, dgb_13_4_drawer] - - [0xC4E960] + - [auto, c, dgb_13_0_header] + - [auto, c, dgb_13_1_music] + - [auto, c, dgb_13_2_main] + - [auto, c, dgb_13_3_entity] + - [auto, c, dgb_13_4_drawer] - name: dgb_14 dir: world/area_dgb/dgb_14 type: code @@ -14027,11 +13462,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC4F030, c, dgb_14_0_header] - - [0xC4F030, c, dgb_14_1_music] - - [0xC4F030, c, dgb_14_2_main] - - [0xC4F030, c, dgb_14_3_entity] - - [0xC4F030] + - [auto, c, dgb_14_0_header] + - [auto, c, dgb_14_1_music] + - [auto, c, dgb_14_2_main] + - [auto, c, dgb_14_3_entity] - name: dgb_15 dir: world/area_dgb/dgb_15 type: code @@ -14039,12 +13473,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC4F510, c, dgb_15_0_header] - - [0xC4F510, c, dgb_15_1_music] - - [0xC4F510, c, dgb_15_2_main] - - [0xC4F510, c, dgb_15_3_npc] - - [0xC50CA0, c, dgb_15_4_entity] - - [0xC50D80] + - [auto, c, dgb_15_0_header] + - [auto, c, dgb_15_1_music] + - [auto, c, dgb_15_2_main] + - [auto, c, dgb_15_3_npc] + - [auto, c, dgb_15_4_entity] - name: dgb_16 dir: world/area_dgb/dgb_16 type: code @@ -14052,12 +13485,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC52540, c, dgb_16_0_header] - - [0xC52540, c, dgb_16_1_music] - - [0xC52540, c, dgb_16_2_main] - - [0xC52540, c, dgb_16_3_entity] - - [0xC52540, c, dgb_16_4_npc] - - [0xC53970] + - [auto, c, dgb_16_0_header] + - [auto, c, dgb_16_1_music] + - [auto, c, dgb_16_2_main] + - [auto, c, dgb_16_3_entity] + - [auto, c, dgb_16_4_npc] - name: dgb_17 dir: world/area_dgb/dgb_17 type: code @@ -14065,11 +13497,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC55A60, c, dgb_17_0_header] - - [0xC55A60, c, dgb_17_1_music] - - [0xC55A60, c, dgb_17_2_main] - - [0xC55A60, c, dgb_17_3_entity] - - [0xC55A60] + - [auto, c, dgb_17_0_header] + - [auto, c, dgb_17_1_music] + - [auto, c, dgb_17_2_main] + - [auto, c, dgb_17_3_entity] - name: dgb_18 dir: world/area_dgb/dgb_18 type: code @@ -14077,12 +13508,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC55F40, c, dgb_18_0_header] - - [0xC55F40, c, dgb_18_1_music] - - [0xC55F40, c, dgb_18_2_main] - - [0xC55F40, c, dgb_18_3_npc] - - [0xC56EF0, c, dgb_18_4_entity] - - [0xC571B0] + - [auto, c, dgb_18_0_header] + - [auto, c, dgb_18_1_music] + - [auto, c, dgb_18_2_main] + - [auto, c, dgb_18_3_npc] + - [auto, c, dgb_18_4_entity] - name: kzn_01 dir: world/area_kzn/kzn_01 type: code @@ -14090,10 +13520,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC599D0, c, kzn_01_0_header] - - [0xC599D0, c, kzn_01_1_main] - - [0xC59CE0, c, kzn_01_2_npc] - - [0xC59CE0] + - [auto, c, kzn_01_0_header] + - [auto, c, kzn_01_1_main] + - [auto, c, kzn_01_2_npc] - name: kzn_02 dir: world/area_kzn/kzn_02 type: code @@ -14101,12 +13530,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC5A740, c, kzn_02_0_header] - - [0xC5A740, c, kzn_02_1_main] - - [0xC5AA50, c, kzn_02_2_platforms] - - [0xC5AC20, c, kzn_02_3_npc] - - [0xC5CE70, c, kzn_02_4_demo] - - [0xC5CF60] + - [auto, c, kzn_02_0_header] + - [auto, c, kzn_02_1_main] + - [auto, c, kzn_02_2_platforms] + - [auto, c, kzn_02_3_npc] + - [auto, c, kzn_02_4_demo] - name: kzn_03 dir: world/area_kzn/kzn_03 type: code @@ -14114,12 +13542,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC60D10, c, kzn_03_0_header] - - [0xC60D10, c, kzn_03_1_main] - - [0xC61020, c, kzn_03_2_npc] - - [0xC63A10, c, kzn_03_3_entity] - - [0xC63A10, c, kzn_03_4_ziplines] - - [0xC63DA0] + - [auto, c, kzn_03_0_header] + - [auto, c, kzn_03_1_main] + - [auto, c, kzn_03_2_npc] + - [auto, c, kzn_03_3_entity] + - [auto, c, kzn_03_4_ziplines] - name: kzn_04 dir: world/area_kzn/kzn_04 type: code @@ -14127,11 +13554,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC68130, c, kzn_04_0_header] - - [0xC68130, c, kzn_04_1_main] - - [0xC68440, c, kzn_04_2_entity] - - [0xC69180, c, kzn_04_3_npc] - - [0xC69890] + - [auto, c, kzn_04_0_header] + - [auto, c, kzn_04_1_main] + - [auto, c, kzn_04_2_entity] + - [auto, c, kzn_04_3_npc] - name: kzn_05 dir: world/area_kzn/kzn_05 type: code @@ -14139,9 +13565,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC6C0D0, c, kzn_05_0_header] - - [0xC6C0D0, c, kzn_05_1_main] - - [0xC6C3E0] + - [auto, c, kzn_05_0_header] + - [auto, c, kzn_05_1_main] - name: kzn_06 dir: world/area_kzn/kzn_06 type: code @@ -14149,11 +13574,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC6C920, c, kzn_06_0_header] - - [0xC6C920, c, kzn_06_1_main] - - [0xC6CC30, c, kzn_06_2_entity] - - [0xC6CD10, c, kzn_06_3_extra] - - [0xC6D390] + - [auto, c, kzn_06_0_header] + - [auto, c, kzn_06_1_main] + - [auto, c, kzn_06_2_entity] + - [auto, c, kzn_06_3_extra] - name: kzn_07 dir: world/area_kzn/kzn_07 type: code @@ -14161,12 +13585,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC6E330, c, kzn_07_0_header] - - [0xC6E330, c, kzn_07_1_music] - - [0xC6E330, c, kzn_07_2_main] - - [0xC6EA50, c, kzn_07_3_entity] - - [0xC6EB50, c, kzn_07_4_npc] - - [0xC70640] + - [auto, c, kzn_07_0_header] + - [auto, c, kzn_07_1_music] + - [auto, c, kzn_07_2_main] + - [auto, c, kzn_07_3_entity] + - [auto, c, kzn_07_4_npc] - name: kzn_08 dir: world/area_kzn/kzn_08 type: code @@ -14174,12 +13597,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC71480, c, kzn_08_0_header] - - [0xC71480, c, kzn_08_1_main] - - [0xC71C10, c, kzn_08_2_entity] - - [0xC71ED0, c, kzn_08_3_npc] - - [0xC75360, c, kzn_08_4_extra] - - [0xC755A0] + - [auto, c, kzn_08_0_header] + - [auto, c, kzn_08_1_main] + - [auto, c, kzn_08_2_entity] + - [auto, c, kzn_08_3_npc] + - [auto, c, kzn_08_4_extra] - name: kzn_09 dir: world/area_kzn/kzn_09 type: code @@ -14187,12 +13609,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC76CE0, c, kzn_09_0_header] - - [0xC76CE0, c, kzn_09_1_main] - - [0xC76CE0, c, kzn_09_2_entity] - - [0xC77A20, c, kzn_09_3_zipline] - - [0xC77D00, c, kzn_09_4_npc] - - [0xC7A6F0] + - [auto, c, kzn_09_0_header] + - [auto, c, kzn_09_1_main] + - [auto, c, kzn_09_2_entity] + - [auto, c, kzn_09_3_zipline] + - [auto, c, kzn_09_4_npc] - name: kzn_10 dir: world/area_kzn/kzn_10 type: code @@ -14200,10 +13621,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC7E180, c, kzn_10_0_header] - - [0xC7E180, c, kzn_10_1_main] - - [0xC7E4B0, c, kzn_10_2_tromp] - - [0xC7E850] + - [auto, c, kzn_10_0_header] + - [auto, c, kzn_10_1_main] + - [auto, c, kzn_10_2_tromp] - name: kzn_11 dir: world/area_kzn/kzn_11 type: code @@ -14211,11 +13631,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC801A0, c, kzn_11_0_header] - - [0xC801A0, c, kzn_11_1_main] - - [0xC804B0, c, kzn_11_2_platforms] - - [0xC80600, c, kzn_11_3_npc] - - [0xC82800] + - [auto, c, kzn_11_0_header] + - [auto, c, kzn_11_1_main] + - [auto, c, kzn_11_2_platforms] + - [auto, c, kzn_11_3_npc] - name: kzn_17 dir: world/area_kzn/kzn_17 type: code @@ -14223,12 +13642,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC85AB0, c, kzn_17_0_header] - - [0xC85AB0, c, kzn_17_1_main] - - [0xC85AB0, c, kzn_17_2_entity] - - [0xC85DC0, c, kzn_17_3_npc] - - [0xC887B0, c, kzn_17_4_tromp] - - [0xC88B50] + - [auto, c, kzn_17_0_header] + - [auto, c, kzn_17_1_main] + - [auto, c, kzn_17_2_entity] + - [auto, c, kzn_17_3_npc] + - [auto, c, kzn_17_4_tromp] - name: kzn_18 dir: world/area_kzn/kzn_18 type: code @@ -14236,11 +13654,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC8C0A0, c, kzn_18_0_header] - - [0xC8C0E0, c, kzn_18_1_main] - - [0xC8C3F0, c, kzn_18_2_npc] - - [0xC8C460, c, kzn_18_3_entity] - - [0xC8C460] + - [auto, c, kzn_18_0_header] + - [auto, c, kzn_18_1_main] + - [auto, c, kzn_18_2_npc] + - [auto, c, kzn_18_3_entity] - name: kzn_19 dir: world/area_kzn/kzn_19 type: code @@ -14248,17 +13665,17 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC8DBB0, c, kzn_19_0_header] - - [0xC8DBB0, c, kzn_19_1_music] - - [0xC8DBB0, c, kzn_19_2_main] - - [0xC8E6B0, c, kzn_19_3_npc_settings] - - [0xC8E6B0, c, kzn_19_4_npc] - - [0xC8E6B0, c, kzn_19_5_eruption] - - [0xC8E6B0, c, kzn_19_6_entity] - - [0xC8F8E0, .data, kzn_19_0_header] - - [0xC8F960, .data, kzn_19_1_music] - - [0xC8FA40, .data, kzn_19_2_main] - - [0xC90B10, .data, kzn_19_3_npc_settings] + - [auto, c, kzn_19_0_header] + - [auto, c, kzn_19_1_music] + - [auto, c, kzn_19_2_main] + - [auto, c, kzn_19_3_npc_settings] + - [auto, c, kzn_19_4_npc] + - [auto, c, kzn_19_5_eruption] + - [auto, c, kzn_19_6_entity] + - [auto, .data, kzn_19_0_header] + - [auto, .data, kzn_19_1_music] + - [auto, .data, kzn_19_2_main] + - [auto, .data, kzn_19_3_npc_settings] - start: 0xC90BF0 type: .data name: kzn_19_4_npc @@ -14268,8 +13685,8 @@ segments: - [0xC91488, palette, ../../lava_piranha/vine] - [0xC91688, gfx_common, ../../lava_piranha/vine] - [0xC91768] - - [0xC959B0, .data, kzn_19_5_eruption] - - [0xC95E70, .data, kzn_19_6_entity] + - [auto, .data, kzn_19_5_eruption] + - [auto, .data, kzn_19_6_entity] - name: kzn_20 dir: world/area_kzn/kzn_20 type: code @@ -14277,11 +13694,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC95F30, c, kzn_20_0_header] - - [0xC95F30, c, kzn_20_1_music] - - [0xC95F30, c, kzn_20_2_main] - - [0xC96240, c, kzn_20_3_npc] - - [0xC969F0] + - [auto, c, kzn_20_0_header] + - [auto, c, kzn_20_1_music] + - [auto, c, kzn_20_2_main] + - [auto, c, kzn_20_3_npc] - name: kzn_22 dir: world/area_kzn/kzn_22 type: code @@ -14289,12 +13705,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC9A200, c, kzn_22_0_header] - - [0xC9A200, c, kzn_22_1_music] - - [0xC9A200, c, kzn_22_2_main] - - [0xC9A540, c, kzn_22_3_entity] - - [0xC9A540, c, kzn_22_4_npc] - - [0xC9A590] + - [auto, c, kzn_22_0_header] + - [auto, c, kzn_22_1_music] + - [auto, c, kzn_22_2_main] + - [auto, c, kzn_22_3_entity] + - [auto, c, kzn_22_4_npc] - name: kzn_23 dir: world/area_kzn/kzn_23 type: code @@ -14302,11 +13717,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC9C300, c, kzn_23_0_header] - - [0xC9C300, c, kzn_23_1_music] - - [0xC9C300, c, kzn_23_2_main] - - [0xC9C610, c, kzn_23_3_npc] - - [0xC9C920] + - [auto, c, kzn_23_0_header] + - [auto, c, kzn_23_1_music] + - [auto, c, kzn_23_2_main] + - [auto, c, kzn_23_3_npc] - name: flo_00 dir: world/area_flo/flo_00 type: code @@ -14314,14 +13728,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xC9DF20, c, flo_00_0_header] - - [0xC9DF20, c, flo_00_1_music] - - [0xC9DF20, c, flo_00_2_main] - - [0xC9DF60, c, flo_00_3_npc] - - [0xC9EE30, c, flo_00_4_epilogue] - - [0xC9EE30, c, flo_00_5_beanstalk] - - [0xC9F300, c, flo_00_6_entity] - - [0xC9F300] + - [auto, c, flo_00_0_header] + - [auto, c, flo_00_1_music] + - [auto, c, flo_00_2_main] + - [auto, c, flo_00_3_npc] + - [auto, c, flo_00_4_epilogue] + - [auto, c, flo_00_5_beanstalk] + - [auto, c, flo_00_6_entity] - name: flo_03 dir: world/area_flo/flo_03 type: code @@ -14329,13 +13742,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCA72A0, c, flo_03_0_header] - - [0xCA72A0, c, flo_03_1_music] - - [0xCA72A0, c, flo_03_2_main] - - [0xCA72E0, c, flo_03_3_npc] - - [0xCA7690, c, flo_03_4_foliage] - - [0xCA78D0, c, flo_03_5_entity] - - [0xCA78D0] + - [auto, c, flo_03_0_header] + - [auto, c, flo_03_1_music] + - [auto, c, flo_03_2_main] + - [auto, c, flo_03_3_npc] + - [auto, c, flo_03_4_foliage] + - [auto, c, flo_03_5_entity] - name: flo_07 dir: world/area_flo/flo_07 type: code @@ -14343,11 +13755,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCAC1F0, c, flo_07_0_header] - - [0xCAC1F0, c, flo_07_1_music] - - [0xCAC1F0, c, flo_07_2_main] - - [0xCAC5D0, c, flo_07_3_npc] - - [0xCAC5D0] + - [auto, c, flo_07_0_header] + - [auto, c, flo_07_1_music] + - [auto, c, flo_07_2_main] + - [auto, c, flo_07_3_npc] - name: flo_08 dir: world/area_flo/flo_08 type: code @@ -14355,14 +13766,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCAED40, c, flo_08_0_header] - - [0xCAED40, c, flo_08_1_music] - - [0xCAED40, c, flo_08_2_entity] - - [0xCAFA80, c, flo_08_3_main] - - [0xCAFAC0, c, flo_08_4_npc] - - [0xCB0940, c, flo_08_5_foliage] - - [0xCB0B80, c, flo_08_6_vines] - - [0xCB0C20] + - [auto, c, flo_08_0_header] + - [auto, c, flo_08_1_music] + - [auto, c, flo_08_2_entity] + - [auto, c, flo_08_3_main] + - [auto, c, flo_08_4_npc] + - [auto, c, flo_08_5_foliage] + - [auto, c, flo_08_6_vines] - name: flo_09 dir: world/area_flo/flo_09 type: code @@ -14370,13 +13780,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCB5000, c, flo_09_0_header] - - [0xCB5000, c, flo_09_1_music] - - [0xCB5000, c, flo_09_2_main] - - [0xCB5040, c, flo_09_3_vines] - - [0xCB50E0, c, flo_09_4_foliage] - - [0xCB5320, c, flo_09_5_npc] - - [0xCB6820] + - [auto, c, flo_09_0_header] + - [auto, c, flo_09_1_music] + - [auto, c, flo_09_2_main] + - [auto, c, flo_09_3_vines] + - [auto, c, flo_09_4_foliage] + - [auto, c, flo_09_5_npc] - name: flo_10 dir: world/area_flo/flo_10 type: code @@ -14384,15 +13793,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCB9200, c, flo_10_0_header] - - [0xCB9240, c, flo_10_1_music] - - [0xCB9240, c, flo_10_2_entity] - - [0xCB9240, c, flo_10_3_main] - - [0xCB9280, c, flo_10_4_fountain] - - [0xCB96B0, c, flo_10_5_npc] - - [0xCB96B0, c, flo_10_6_waterfx] - - [0xCBA430, c, flo_10_7_foliage] - - [0xCBA670] + - [auto, c, flo_10_0_header] + - [auto, c, flo_10_1_music] + - [auto, c, flo_10_2_entity] + - [auto, c, flo_10_3_main] + - [auto, c, flo_10_4_fountain] + - [auto, c, flo_10_5_npc] + - [auto, c, flo_10_6_waterfx] + - [auto, c, flo_10_7_foliage] - name: flo_11 dir: world/area_flo/flo_11 type: code @@ -14400,12 +13808,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCBDCD0, c, flo_11_0_header] - - [0xCBDCD0, c, flo_11_1_music] - - [0xCBDCD0, c, flo_11_2_main] - - [0xCBDFF0, c, flo_11_3_npc] - - [0xCBDFF0, c, flo_11_4_entity] - - [0xCBDFF0] + - [auto, c, flo_11_0_header] + - [auto, c, flo_11_1_music] + - [auto, c, flo_11_2_main] + - [auto, c, flo_11_3_npc] + - [auto, c, flo_11_4_entity] - name: flo_12 dir: world/area_flo/flo_12 type: code @@ -14413,11 +13820,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCC0E30, c, flo_12_0_header] - - [0xCC0E30, c, flo_12_1_music] - - [0xCC0E30, c, flo_12_2_main] - - [0xCC0E70, c, flo_12_3_npc] - - [0xCC1520] + - [auto, c, flo_12_0_header] + - [auto, c, flo_12_1_music] + - [auto, c, flo_12_2_main] + - [auto, c, flo_12_3_npc] - name: flo_13 dir: world/area_flo/flo_13 type: code @@ -14425,13 +13831,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCC3810, c, flo_13_0_header] - - [0xCC3810, c, flo_13_1_music] - - [0xCC3810, c, flo_13_2_entity] - - [0xCC3810, c, flo_13_3_main] - - [0xCC3850, c, flo_13_4_npc] - - [0xCC6DE0, c, flo_13_5_new_partner] - - [0xCC6E80] + - [auto, c, flo_13_0_header] + - [auto, c, flo_13_1_music] + - [auto, c, flo_13_2_entity] + - [auto, c, flo_13_3_main] + - [auto, c, flo_13_4_npc] + - [auto, c, flo_13_5_new_partner] - name: flo_14 dir: world/area_flo/flo_14 type: code @@ -14439,14 +13844,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCCB310, c, flo_14_0_header] - - [0xCCB310, c, flo_14_1_music] - - [0xCCB310, c, flo_14_2_main] - - [0xCCB650, c, flo_14_3_bubbles] - - [0xCCBE20, c, flo_14_4_npc] - - [0xCCD670, c, flo_14_5_entity] - - [0xCCD670, c, flo_14_6_logs] - - [0xCCD6A0] + - [auto, c, flo_14_0_header] + - [auto, c, flo_14_1_music] + - [auto, c, flo_14_2_main] + - [auto, c, flo_14_3_bubbles] + - [auto, c, flo_14_4_npc] + - [auto, c, flo_14_5_entity] + - [auto, c, flo_14_6_logs] - name: flo_15 dir: world/area_flo/flo_15 type: code @@ -14454,13 +13858,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCD06C0, c, flo_15_0_header] - - [0xCD06C0, c, flo_15_1_music] - - [0xCD06C0, c, flo_15_2_main] - - [0xCD06C0, c, flo_15_3_npc] - - [0xCD06C0, c, flo_15_4_entity] - - [0xCD06C0, c, flo_15_5_stairs] - - [0xCD06C0] + - [auto, c, flo_15_0_header] + - [auto, c, flo_15_1_music] + - [auto, c, flo_15_2_main] + - [auto, c, flo_15_3_npc] + - [auto, c, flo_15_4_entity] + - [auto, c, flo_15_5_stairs] - name: flo_16 dir: world/area_flo/flo_16 type: code @@ -14468,14 +13871,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCD1E30, c, flo_16_0_header] - - [0xCD1E30, c, flo_16_1_music] - - [0xCD1E30, c, flo_16_2_main] - - [0xCD1E70, c, flo_16_3_vines] - - [0xCD1F10, c, flo_16_4_entity] - - [0xCD2C80, c, flo_16_5_npc] - - [0xCD4770, c, flo_16_6_puzzle] - - [0xCD47A0] + - [auto, c, flo_16_0_header] + - [auto, c, flo_16_1_music] + - [auto, c, flo_16_2_main] + - [auto, c, flo_16_3_vines] + - [auto, c, flo_16_4_entity] + - [auto, c, flo_16_5_npc] + - [auto, c, flo_16_6_puzzle] - name: flo_17 dir: world/area_flo/flo_17 type: code @@ -14483,13 +13885,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCD72E0, c, flo_17_0_header] - - [0xCD72E0, c, flo_17_1_music] - - [0xCD72E0, c, flo_17_2_main] - - [0xCD7320, c, flo_17_3_logs] - - [0xCD7350, c, flo_17_4_npc] - - [0xCDA500, c, flo_17_5_entity] - - [0xCDA500] + - [auto, c, flo_17_0_header] + - [auto, c, flo_17_1_music] + - [auto, c, flo_17_2_main] + - [auto, c, flo_17_3_logs] + - [auto, c, flo_17_4_npc] + - [auto, c, flo_17_5_entity] - name: flo_18 dir: world/area_flo/flo_18 type: code @@ -14497,13 +13898,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCDC6A0, c, flo_18_0_header] - - [0xCDC6A0, c, flo_18_1_music] - - [0xCDC6A0, c, flo_18_2_main] - - [0xCDC9E0, c, flo_18_3_machine] - - [0xCDCBD0, c, flo_18_4_npc] - - [0xCDCC30, c, flo_18_5_foliage] - - [0xCDCE70] + - [auto, c, flo_18_0_header] + - [auto, c, flo_18_1_music] + - [auto, c, flo_18_2_main] + - [auto, c, flo_18_3_machine] + - [auto, c, flo_18_4_npc] + - [auto, c, flo_18_5_foliage] - name: flo_19 dir: world/area_flo/flo_19 type: code @@ -14511,13 +13911,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCE36F0, c, flo_19_0_header] - - [0xCE36F0, c, flo_19_1_music] - - [0xCE36F0, c, flo_19_2_entity] - - [0xCE36F0, c, flo_19_3_main] - - [0xCE3A30, c, flo_19_4_clouds] - - [0xCE3BC0, c, flo_19_5_beanstalk] - - [0xCE4030] + - [auto, c, flo_19_0_header] + - [auto, c, flo_19_1_music] + - [auto, c, flo_19_2_entity] + - [auto, c, flo_19_3_main] + - [auto, c, flo_19_4_clouds] + - [auto, c, flo_19_5_beanstalk] - name: flo_21 dir: world/area_flo/flo_21 type: code @@ -14525,12 +13924,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCE6700, c, flo_21_0_header] - - [0xCE6700, c, flo_21_1_music] - - [0xCE6700, c, flo_21_2_main] - - [0xCE7240, c, flo_21_3_clouds] - - [0xCE73D0, c, flo_21_4_npc] - - [0xCE73F0] + - [auto, c, flo_21_0_header] + - [auto, c, flo_21_1_music] + - [auto, c, flo_21_2_main] + - [auto, c, flo_21_3_clouds] + - [auto, c, flo_21_4_npc] - name: flo_22 dir: world/area_flo/flo_22 type: code @@ -14538,13 +13936,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCEC240, c, flo_22_0_header] - - [0xCEC240, c, flo_22_1_music] - - [0xCEC240, c, flo_22_2_main] - - [0xCEC280, c, flo_22_3_npc] - - [0xCEC280, c, flo_22_4_well] - - [0xCEC290, c, flo_22_5_foliage] - - [0xCEC4D0] + - [auto, c, flo_22_0_header] + - [auto, c, flo_22_1_music] + - [auto, c, flo_22_2_main] + - [auto, c, flo_22_3_npc] + - [auto, c, flo_22_4_well] + - [auto, c, flo_22_5_foliage] - name: flo_23 dir: world/area_flo/flo_23 type: code @@ -14552,12 +13949,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCEE260, c, flo_23_0_header] - - [0xCEE260, c, flo_23_1_music] - - [0xCEE260, c, flo_23_2_main] - - [0xCEE2A0, c, flo_23_3_npc] - - [0xCEEF30, c, flo_23_4_entity] - - [0xCEEF30] + - [auto, c, flo_23_0_header] + - [auto, c, flo_23_1_music] + - [auto, c, flo_23_2_main] + - [auto, c, flo_23_3_npc] + - [auto, c, flo_23_4_entity] - name: flo_24 dir: world/area_flo/flo_24 type: code @@ -14565,13 +13961,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCF0940, c, flo_24_0_header] - - [0xCF0940, c, flo_24_1_music] - - [0xCF0940, c, flo_24_2_main] - - [0xCF0980, c, flo_24_3_foliage] - - [0xCF0BC0, c, flo_24_4_water] - - [0xCF0ED0, c, flo_24_5_entity] - - [0xCF0ED0] + - [auto, c, flo_24_0_header] + - [auto, c, flo_24_1_music] + - [auto, c, flo_24_2_main] + - [auto, c, flo_24_3_foliage] + - [auto, c, flo_24_4_water] + - [auto, c, flo_24_5_entity] - name: flo_25 dir: world/area_flo/flo_25 type: code @@ -14579,14 +13974,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCF2BD0, c, flo_25_0_header] - - [0xCF2BD0, c, flo_25_1_music] - - [0xCF2BD0, c, flo_25_2_main] - - [0xCF2C10, c, flo_25_3_npc] - - [0xCF4BC0, c, flo_25_4_entity] - - [0xCF4BC0, c, flo_25_5_foliage] - - [0xCF4E00, c, flo_25_6_vine] - - [0xCF4EA0] + - [auto, c, flo_25_0_header] + - [auto, c, flo_25_1_music] + - [auto, c, flo_25_2_main] + - [auto, c, flo_25_3_npc] + - [auto, c, flo_25_4_entity] + - [auto, c, flo_25_5_foliage] + - [auto, c, flo_25_6_vine] - name: sam_01 dir: world/area_sam/sam_01 type: code @@ -14594,14 +13988,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xCF7B70, c, sam_01_0_header] - - [0xCF7B70, c, sam_01_1_music] - - [0xCF7B70, c, sam_01_2_main] - - [0xCF7E80, c, sam_01_3_rooms] - - [0xCF7E80, c, sam_01_4_npc] - - [0xCF95F0, c, sam_01_5_scenes] - - [0xCF9800, c, sam_01_6_entity] - - [0xCF9AC0] + - [auto, c, sam_01_0_header] + - [auto, c, sam_01_1_music] + - [auto, c, sam_01_2_main] + - [auto, c, sam_01_3_rooms] + - [auto, c, sam_01_4_npc] + - [auto, c, sam_01_5_scenes] + - [auto, c, sam_01_6_entity] - name: sam_02 dir: world/area_sam/sam_02 type: code @@ -14609,14 +14002,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD05730, c, sam_02_0_header] - - [0xD05730, c, sam_02_1_music] - - [0xD05730, c, sam_02_2_main] - - [0xD05F60, c, sam_02_3_rooms] - - [0xD05F60, c, sam_02_4_npc] - - [0xD072F0, c, sam_02_5_entity] - - [0xD072F0, c, sam_02_6_shop] - - [0xD072F0] + - [auto, c, sam_02_0_header] + - [auto, c, sam_02_1_music] + - [auto, c, sam_02_2_main] + - [auto, c, sam_02_3_rooms] + - [auto, c, sam_02_4_npc] + - [auto, c, sam_02_5_entity] + - [auto, c, sam_02_6_shop] - name: sam_03 dir: world/area_sam/sam_03 type: code @@ -14624,12 +14016,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD110C0, c, sam_03_0_header] - - [0xD110C0, c, sam_03_1_music] - - [0xD110C0, c, sam_03_2_main] - - [0xD110C0, c, sam_03_3_npc1] - - [0xD11110, c, sam_03_4_npc2] - - [0xD119E0] + - [auto, c, sam_03_0_header] + - [auto, c, sam_03_1_music] + - [auto, c, sam_03_2_main] + - [auto, c, sam_03_3_npc1] + - [auto, c, sam_03_4_npc2] - name: sam_04 dir: world/area_sam/sam_04 type: code @@ -14637,13 +14028,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD135D0, c, sam_04_0_header] - - [0xD135D0, c, sam_04_1_music] - - [0xD135D0, c, sam_04_2_main] - - [0xD13810, c, sam_04_3_snowmen] - - [0xD138E0, c, sam_04_4_npc] - - [0xD13CD0, c, sam_04_5_entity] - - [0xD13CD0] + - [auto, c, sam_04_0_header] + - [auto, c, sam_04_1_music] + - [auto, c, sam_04_2_main] + - [auto, c, sam_04_3_snowmen] + - [auto, c, sam_04_4_npc] + - [auto, c, sam_04_5_entity] - name: sam_05 dir: world/area_sam/sam_05 type: code @@ -14651,18 +14041,18 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD187E0, c, sam_05_0_header] - - [0xD187E0, c, sam_05_1_music] - - [0xD187E0, c, sam_05_2_main] - - [0xD187E0, c, sam_05_3_entity] - - [0xD187E0, c, sam_05_4_npc] - - [0xD1A520, c, sam_05_5_scenes] - - [0xD1A520, c, sam_05_6_monstar_gfx] - - [0xD1A520, c, sam_05_7_monstar_vtx] - - [0xD1A520, .data, sam_05_0_header] - - [0xD1A580, .data, sam_05_1_music] - - [0xD1A5B0, .data, sam_05_2_main] - - [0xD1A890, .data, sam_05_3_entity] + - [auto, c, sam_05_0_header] + - [auto, c, sam_05_1_music] + - [auto, c, sam_05_2_main] + - [auto, c, sam_05_3_entity] + - [auto, c, sam_05_4_npc] + - [auto, c, sam_05_5_scenes] + - [auto, c, sam_05_6_monstar_gfx] + - [auto, c, sam_05_7_monstar_vtx] + - [auto, .data, sam_05_0_header] + - [auto, .data, sam_05_1_music] + - [auto, .data, sam_05_2_main] + - [auto, .data, sam_05_3_entity] - start: 0xD1A900 type: .data name: sam_05_4_npc @@ -14674,7 +14064,7 @@ segments: - [0xD1B550, ia4, monstar_blank3, 32, 32] - [0xD1B750, palette, monstar] - [0xD1B770] - - [0xD1E5E0, .data, sam_05_5_scenes] + - [auto, .data, sam_05_5_scenes] - start: 0xD1F780 type: .data name: sam_05_6_monstar_gfx @@ -14693,13 +14083,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD1FE90, c, sam_06_0_header] - - [0xD1FE90, c, sam_06_1_music] - - [0xD1FE90, c, sam_06_2_main] - - [0xD203E0, c, sam_06_3_rooms] - - [0xD203E0, c, sam_06_4_npc] - - [0xD224B0, c, sam_06_5_entity] - - [0xD224B0] + - [auto, c, sam_06_0_header] + - [auto, c, sam_06_1_music] + - [auto, c, sam_06_2_main] + - [auto, c, sam_06_3_rooms] + - [auto, c, sam_06_4_npc] + - [auto, c, sam_06_5_entity] - name: sam_07 dir: world/area_sam/sam_07 type: code @@ -14707,13 +14096,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD2BD30, c, sam_07_0_header] - - [0xD2BD30, c, sam_07_1_music] - - [0xD2BD30, c, sam_07_2_main] - - [0xD2BD30, c, sam_07_3_entity] - - [0xD2BD30, c, sam_07_4_frozen_pit] - - [0xD2C380, c, sam_07_5_npc] - - [0xD2DD30] + - [auto, c, sam_07_0_header] + - [auto, c, sam_07_1_music] + - [auto, c, sam_07_2_main] + - [auto, c, sam_07_3_entity] + - [auto, c, sam_07_4_frozen_pit] + - [auto, c, sam_07_5_npc] - name: sam_08 dir: world/area_sam/sam_08 type: code @@ -14721,13 +14109,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD2FC80, c, sam_08_0_header] - - [0xD2FC80, c, sam_08_1_music] - - [0xD2FC80, c, sam_08_2_main] - - [0xD2FC80, c, sam_08_3_entity] - - [0xD309C0, c, sam_08_4_npc] - - [0xD31290, c, sam_08_5_scenes] - - [0xD31430] + - [auto, c, sam_08_0_header] + - [auto, c, sam_08_1_music] + - [auto, c, sam_08_2_main] + - [auto, c, sam_08_3_entity] + - [auto, c, sam_08_4_npc] + - [auto, c, sam_08_5_scenes] - name: sam_09 dir: world/area_sam/sam_09 type: code @@ -14735,12 +14122,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD362F0, c, sam_09_0_header] - - [0xD362F0, c, sam_09_1_music] - - [0xD362F0, c, sam_09_2_main] - - [0xD362F0, c, sam_09_3_entity] - - [0xD362F0, c, sam_09_4_sockets] - - [0xD366F0] + - [auto, c, sam_09_0_header] + - [auto, c, sam_09_1_music] + - [auto, c, sam_09_2_main] + - [auto, c, sam_09_3_entity] + - [auto, c, sam_09_4_sockets] - name: sam_10 dir: world/area_sam/sam_10 type: code @@ -14748,13 +14134,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD37800, c, sam_10_0_header] - - [0xD37800, c, sam_10_1_music] - - [0xD37800, c, sam_10_2_main] - - [0xD37800, c, sam_10_3_entity] - - [0xD37AF0, c, sam_10_4_stairs] - - [0xD37BD0, c, sam_10_5_npc] - - [0xD384A0] + - [auto, c, sam_10_0_header] + - [auto, c, sam_10_1_music] + - [auto, c, sam_10_2_main] + - [auto, c, sam_10_3_entity] + - [auto, c, sam_10_4_stairs] + - [auto, c, sam_10_5_npc] - name: sam_11 dir: world/area_sam/sam_11 type: code @@ -14762,17 +14147,16 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD3A5D0, c, sam_11_0_header] - - [0xD3A610, c, sam_11_1_music] - - [0xD3A610, c, sam_11_2_main] - - [0xD3A850, c, sam_11_3_rooms] - - [0xD3A850, c, sam_11_4_entity] - - [0xD3A930, c, sam_11_5_npc] - - [0xD3ADA0, c, sam_11_6_pond] - - [0xD3C740, c, sam_11_7_staircase] - - [0xD3C740, c, sam_11_8_pond_anim] - - [0xD3C740, c, sam_11_9_pond_skele] - - [0xD3C740] + - [auto, c, sam_11_0_header] + - [auto, c, sam_11_1_music] + - [auto, c, sam_11_2_main] + - [auto, c, sam_11_3_rooms] + - [auto, c, sam_11_4_entity] + - [auto, c, sam_11_5_npc] + - [auto, c, sam_11_6_pond] + - [auto, c, sam_11_7_staircase] + - [auto, c, sam_11_8_pond_anim] + - [auto, c, sam_11_9_pond_skele] - name: sam_12 dir: world/area_sam/sam_12 type: code @@ -14780,13 +14164,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD4BA20, c, sam_12_0_header] - - [0xD4BA20, c, sam_12_1_music] - - [0xD4BA20, c, sam_12_2_main] - - [0xD4BA20, c, sam_12_3_npc] - - [0xD4BAB0, c, sam_12_4_scenes] - - [0xD4BDC0, c, sam_12_5_entity] - - [0xD4BDC0] + - [auto, c, sam_12_0_header] + - [auto, c, sam_12_1_music] + - [auto, c, sam_12_2_main] + - [auto, c, sam_12_3_npc] + - [auto, c, sam_12_4_scenes] + - [auto, c, sam_12_5_entity] - name: pra_01 dir: world/area_pra/pra_01 type: code @@ -14794,12 +14177,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD4D040, c, pra_01_0_header] - - [0xD4D060, c, pra_01_1_music] - - [0xD4D060, c, pra_01_2_main] - - [0xD4DFC0, c, pra_01_3_npc] - - [0xD4E3F0, c, pra_01_4_entity] - - [0xD4E3F0] + - [auto, c, pra_01_0_header] + - [auto, c, pra_01_1_music] + - [auto, c, pra_01_2_main] + - [auto, c, pra_01_3_npc] + - [auto, c, pra_01_4_entity] - name: pra_02 dir: world/area_pra/pra_02 type: code @@ -14807,12 +14189,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD4FFF0, c, pra_02_0_header] - - [0xD50010, c, pra_02_1_music] - - [0xD50010, c, pra_02_2_main] - - [0xD50F10, c, pra_02_3_npc] - - [0xD51300, c, pra_02_4_entity] - - [0xD51650] + - [auto, c, pra_02_0_header] + - [auto, c, pra_02_1_music] + - [auto, c, pra_02_2_main] + - [auto, c, pra_02_3_npc] + - [auto, c, pra_02_4_entity] - name: pra_03 dir: world/area_pra/pra_03 type: code @@ -14820,11 +14201,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD53CB0, c, pra_03_0_header] - - [0xD53CD0, c, pra_03_1_music] - - [0xD53CD0, c, pra_03_2_main] - - [0xD53CD0, c, pra_03_3_entity] - - [0xD53E60] + - [auto, c, pra_03_0_header] + - [auto, c, pra_03_1_music] + - [auto, c, pra_03_2_main] + - [auto, c, pra_03_3_entity] - name: pra_04 dir: world/area_pra/pra_04 type: code @@ -14832,12 +14212,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD54690, c, pra_04_0_header] - - [0xD546B0, c, pra_04_1_music] - - [0xD546B0, c, pra_04_2_main] - - [0xD546B0, c, pra_04_3_entity] - - [0xD54840, c, pra_04_4_npc] - - [0xD54FD0] + - [auto, c, pra_04_0_header] + - [auto, c, pra_04_1_music] + - [auto, c, pra_04_2_main] + - [auto, c, pra_04_3_entity] + - [auto, c, pra_04_4_npc] - name: pra_05 dir: world/area_pra/pra_05 type: code @@ -14845,11 +14224,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD55BB0, c, pra_05_0_header] - - [0xD55BD0, c, pra_05_1_music] - - [0xD55BD0, c, pra_05_2_main] - - [0xD56AD0, c, pra_05_3_entity] - - [0xD56D90] + - [auto, c, pra_05_0_header] + - [auto, c, pra_05_1_music] + - [auto, c, pra_05_2_main] + - [auto, c, pra_05_3_entity] - name: pra_06 dir: world/area_pra/pra_06 type: code @@ -14857,11 +14235,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD57430, c, pra_06_0_header] - - [0xD57430, c, pra_06_1_music] - - [0xD57430, c, pra_06_2_main] - - [0xD58380, c, pra_06_3_entity] - - [0xD58380] + - [auto, c, pra_06_0_header] + - [auto, c, pra_06_1_music] + - [auto, c, pra_06_2_main] + - [auto, c, pra_06_3_entity] - name: pra_09 dir: world/area_pra/pra_09 type: code @@ -14869,11 +14246,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD58890, c, pra_09_0_header] - - [0xD588B0, c, pra_09_1_music] - - [0xD588B0, c, pra_09_2_main] - - [0xD597B0, c, pra_09_3_npc] - - [0xD59EE0] + - [auto, c, pra_09_0_header] + - [auto, c, pra_09_1_music] + - [auto, c, pra_09_2_main] + - [auto, c, pra_09_3_npc] - name: pra_10 dir: world/area_pra/pra_10 type: code @@ -14881,11 +14257,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD5F2B0, c, pra_10_0_header] - - [0xD5F2D0, c, pra_10_1_music] - - [0xD5F2D0, c, pra_10_2_main] - - [0xD601D0, c, pra_10_3_npc] - - [0xD60960] + - [auto, c, pra_10_0_header] + - [auto, c, pra_10_1_music] + - [auto, c, pra_10_2_main] + - [auto, c, pra_10_3_npc] - name: pra_11 dir: world/area_pra/pra_11 type: code @@ -14893,11 +14268,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD61500, c, pra_11_0_header] - - [0xD61520, c, pra_11_1_music] - - [0xD61520, c, pra_11_2_main] - - [0xD62420, c, pra_11_3_entity] - - [0xD626E0] + - [auto, c, pra_11_0_header] + - [auto, c, pra_11_1_music] + - [auto, c, pra_11_2_main] + - [auto, c, pra_11_3_entity] - name: pra_12 dir: world/area_pra/pra_12 type: code @@ -14905,11 +14279,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD62D10, c, pra_12_0_header] - - [0xD62D10, c, pra_12_1_music] - - [0xD62D10, c, pra_12_2_main] - - [0xD63C60, c, pra_12_3_entity] - - [0xD63F20] + - [auto, c, pra_12_0_header] + - [auto, c, pra_12_1_music] + - [auto, c, pra_12_2_main] + - [auto, c, pra_12_3_entity] - name: pra_13 dir: world/area_pra/pra_13 type: code @@ -14917,11 +14290,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD645E0, c, pra_13_0_header] - - [0xD64600, c, pra_13_1_music] - - [0xD64600, c, pra_13_2_main] - - [0xD65500, c, pra_13_3_npc] - - [0xD65BC0] + - [auto, c, pra_13_0_header] + - [auto, c, pra_13_1_music] + - [auto, c, pra_13_2_main] + - [auto, c, pra_13_3_npc] - name: pra_14 dir: world/area_pra/pra_14 type: code @@ -14929,11 +14301,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD67D00, c, pra_14_0_header] - - [0xD67D20, c, pra_14_1_music] - - [0xD67D20, c, pra_14_2_main] - - [0xD68C20, c, pra_14_3_entity] - - [0xD68EE0] + - [auto, c, pra_14_0_header] + - [auto, c, pra_14_1_music] + - [auto, c, pra_14_2_main] + - [auto, c, pra_14_3_entity] - name: pra_15 dir: world/area_pra/pra_15 type: code @@ -14941,11 +14312,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD69810, c, pra_15_0_header] - - [0xD69830, c, pra_15_1_music] - - [0xD69830, c, pra_15_2_main] - - [0xD69850, c, pra_15_3_entity] - - [0xD69850] + - [auto, c, pra_15_0_header] + - [auto, c, pra_15_1_music] + - [auto, c, pra_15_2_main] + - [auto, c, pra_15_3_entity] - name: pra_16 dir: world/area_pra/pra_16 type: code @@ -14953,10 +14323,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD69B20, c, pra_16_0_header] - - [0xD69B40, c, pra_16_1_music] - - [0xD69B40, c, pra_16_2_main] - - [0xD6AA40] + - [auto, c, pra_16_0_header] + - [auto, c, pra_16_1_music] + - [auto, c, pra_16_2_main] - name: pra_18 dir: world/area_pra/pra_18 type: code @@ -14964,11 +14333,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD6B620, c, pra_18_0_header] - - [0xD6B640, c, pra_18_1_music] - - [0xD6B640, c, pra_18_2_main] - - [0xD6B640, c, pra_18_3_npc] - - [0xD6C540] + - [auto, c, pra_18_0_header] + - [auto, c, pra_18_1_music] + - [auto, c, pra_18_2_main] + - [auto, c, pra_18_3_npc] - name: pra_19 dir: world/area_pra/pra_19 type: code @@ -14976,11 +14344,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD6E9B0, c, pra_19_0_header] - - [0xD6E9D0, c, pra_19_1_music] - - [0xD6E9D0, c, pra_19_2_main] - - [0xD6F8D0, c, pra_19_3_npc] - - [0xD70360] + - [auto, c, pra_19_0_header] + - [auto, c, pra_19_1_music] + - [auto, c, pra_19_2_main] + - [auto, c, pra_19_3_npc] - name: pra_20 dir: world/area_pra/pra_20 type: code @@ -14988,10 +14355,9 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD763A0, c, pra_20_0_header] - - [0xD763C0, c, pra_20_1_music] - - [0xD763C0, c, pra_20_2_main] - - [0xD772C0] + - [auto, c, pra_20_0_header] + - [auto, c, pra_20_1_music] + - [auto, c, pra_20_2_main] - name: pra_21 dir: world/area_pra/pra_21 type: code @@ -14999,11 +14365,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD77F20, c, pra_21_0_header] - - [0xD77F40, c, pra_21_1_music] - - [0xD77F40, c, pra_21_2_main] - - [0xD77F40, c, pra_21_3_entity] - - [0xD78040] + - [auto, c, pra_21_0_header] + - [auto, c, pra_21_1_music] + - [auto, c, pra_21_2_main] + - [auto, c, pra_21_3_entity] - name: pra_22 dir: world/area_pra/pra_22 type: code @@ -15011,11 +14376,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD78880, c, pra_22_0_header] - - [0xD788A0, c, pra_22_1_music] - - [0xD788A0, c, pra_22_2_main] - - [0xD78A50, c, pra_22_3_entity] - - [0xD78B50] + - [auto, c, pra_22_0_header] + - [auto, c, pra_22_1_music] + - [auto, c, pra_22_2_main] + - [auto, c, pra_22_3_entity] - name: pra_27 dir: world/area_pra/pra_27 type: code @@ -15023,11 +14387,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD799F0, c, pra_27_0_header] - - [0xD799F0, c, pra_27_1_music] - - [0xD799F0, c, pra_27_2_main] - - [0xD7A940, c, pra_27_3_entity] - - [0xD7AC00] + - [auto, c, pra_27_0_header] + - [auto, c, pra_27_1_music] + - [auto, c, pra_27_2_main] + - [auto, c, pra_27_3_entity] - name: pra_28 dir: world/area_pra/pra_28 type: code @@ -15035,11 +14398,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD7B2A0, c, pra_28_0_header] - - [0xD7B2A0, c, pra_28_1_music] - - [0xD7B2A0, c, pra_28_2_main] - - [0xD7C1F0, c, pra_28_3_entity] - - [0xD7C4B0] + - [auto, c, pra_28_0_header] + - [auto, c, pra_28_1_music] + - [auto, c, pra_28_2_main] + - [auto, c, pra_28_3_entity] - name: pra_29 dir: world/area_pra/pra_29 type: code @@ -15047,12 +14409,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD7CB50, c, pra_29_0_header] - - [0xD7CB70, c, pra_29_1_music] - - [0xD7CB70, c, pra_29_2_entity] - - [0xD7CB70, c, pra_29_3_main] - - [0xD7DA70, c, pra_29_4_bridge] - - [0xD7DDD0] + - [auto, c, pra_29_0_header] + - [auto, c, pra_29_1_music] + - [auto, c, pra_29_2_entity] + - [auto, c, pra_29_3_main] + - [auto, c, pra_29_4_bridge] - name: pra_31 dir: world/area_pra/pra_31 type: code @@ -15060,23 +14421,23 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD7ED60, c, pra_31_0_header] - - [0xD7ED80, c, pra_31_1_music] - - [0xD7ED80, c, pra_31_2_npc] - - [0xD7F270, c, pra_31_3_main] - - [0xD7F270, c, pra_31_4_puzzle] - - [0xD7FE10, c, pra_31_5_texture_1] - - [0xD7FE10, c, pra_31_6_texture_2] - - [0xD7FE10, c, pra_31_7_texture_3] - - [0xD7FE10, c, pra_31_8_stairs_skele] - - [0xD7FE10, c, pra_31_9_stairs_anim] - - [0xD7FE10, c, pra_31_10_stairs_lights] - - [0xD7FE10, c, pra_31_11_stairs_vtx] - - [0xD7FE10, .data, pra_31_0_header] - - [0xD7FE80, .data, pra_31_1_music] - - [0xD7FEC0, .data, pra_31_2_npc] - - [0xD80E20, .data, pra_31_3_main] - - [0xD81250, .data, pra_31_4_puzzle] + - [auto, c, pra_31_0_header] + - [auto, c, pra_31_1_music] + - [auto, c, pra_31_2_npc] + - [auto, c, pra_31_3_main] + - [auto, c, pra_31_4_puzzle] + - [auto, c, pra_31_5_texture_1] + - [auto, c, pra_31_6_texture_2] + - [auto, c, pra_31_7_texture_3] + - [auto, c, pra_31_8_stairs_skele] + - [auto, c, pra_31_9_stairs_anim] + - [auto, c, pra_31_10_stairs_lights] + - [auto, c, pra_31_11_stairs_vtx] + - [auto, .data, pra_31_0_header] + - [auto, .data, pra_31_1_music] + - [auto, .data, pra_31_2_npc] + - [auto, .data, pra_31_3_main] + - [auto, .data, pra_31_4_puzzle] - start: 0xD82270 type: .data name: pra_31_5_texture_1 @@ -15139,8 +14500,8 @@ segments: - [0xD84790, gfx, unk_33] - [0xD847B8, gfx, unk_34] - [0xD847F0] - - [0xD84E90, .data, pra_31_9_stairs_anim] - - [0xD86480, .data, pra_31_10_stairs_lights] + - [auto, .data, pra_31_9_stairs_anim] + - [auto, .data, pra_31_10_stairs_lights] - start: 0xD864A0 type: .data name: pra_31_11_stairs_vtx @@ -15156,11 +14517,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD86A00, c, pra_32_0_header] - - [0xD86A20, c, pra_32_1_music] - - [0xD86A20, c, pra_32_2_main] - - [0xD86A20, c, pra_32_3_npc] - - [0xD87240] + - [auto, c, pra_32_0_header] + - [auto, c, pra_32_1_music] + - [auto, c, pra_32_2_main] + - [auto, c, pra_32_3_npc] - name: pra_33 dir: world/area_pra/pra_33 type: code @@ -15168,11 +14528,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD896E0, c, pra_33_0_header] - - [0xD89700, c, pra_33_1_music] - - [0xD89700, c, pra_33_2_main] - - [0xD8A600, c, pra_33_3_entity] - - [0xD8A770] + - [auto, c, pra_33_0_header] + - [auto, c, pra_33_1_music] + - [auto, c, pra_33_2_main] + - [auto, c, pra_33_3_entity] - name: pra_34 dir: world/area_pra/pra_34 type: code @@ -15180,11 +14539,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD8B3B0, c, pra_34_0_header] - - [0xD8B3D0, c, pra_34_1_music] - - [0xD8B3D0, c, pra_34_2_main] - - [0xD8B3D0, c, pra_34_3_entity] - - [0xD8C3B0] + - [auto, c, pra_34_0_header] + - [auto, c, pra_34_1_music] + - [auto, c, pra_34_2_main] + - [auto, c, pra_34_3_entity] - name: pra_35 dir: world/area_pra/pra_35 type: code @@ -15192,12 +14550,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD8B3B0, c, pra_35_0_header] - - [0xD8D270, c, pra_35_1_music] - - [0xD8D270, c, pra_35_2_main] - - [0xD8D270, c, pra_35_3_npc] - - [0xD8FBA0, c, pra_35_4_entity] - - [0xD8FE60] + - [auto, c, pra_35_0_header] + - [auto, c, pra_35_1_music] + - [auto, c, pra_35_2_main] + - [auto, c, pra_35_3_npc] + - [auto, c, pra_35_4_entity] - name: pra_36 dir: world/area_pra/pra_36 type: code @@ -15205,11 +14562,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD91700, c, pra_36_0_header] - - [0xD91700, c, pra_36_1_music] - - [0xD91700, c, pra_36_2_main] - - [0xD92650, c, pra_36_3_npc] - - [0xD92650] + - [auto, c, pra_36_0_header] + - [auto, c, pra_36_1_music] + - [auto, c, pra_36_2_main] + - [auto, c, pra_36_3_npc] - name: pra_37 dir: world/area_pra/pra_37 type: code @@ -15217,11 +14573,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD92F40, c, pra_37_0_header] - - [0xD92F40, c, pra_37_1_music] - - [0xD92F40, c, pra_37_2_main] - - [0xD93E90, c, pra_37_3_npc] - - [0xD94760] + - [auto, c, pra_37_0_header] + - [auto, c, pra_37_1_music] + - [auto, c, pra_37_2_main] + - [auto, c, pra_37_3_npc] - name: pra_38 dir: world/area_pra/pra_38 type: code @@ -15229,11 +14584,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD955F0, c, pra_38_0_header] - - [0xD955F0, c, pra_38_1_music] - - [0xD955F0, c, pra_38_2_main] - - [0xD96540, c, pra_38_3_npc] - - [0xD96CD0] + - [auto, c, pra_38_0_header] + - [auto, c, pra_38_1_music] + - [auto, c, pra_38_2_main] + - [auto, c, pra_38_3_npc] - name: pra_39 dir: world/area_pra/pra_39 type: code @@ -15241,11 +14595,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD97890, c, pra_39_0_header] - - [0xD97890, c, pra_39_1_music] - - [0xD97890, c, pra_39_2_main] - - [0xD987E0, c, pra_39_3_npc] - - [0xD98F70] + - [auto, c, pra_39_0_header] + - [auto, c, pra_39_1_music] + - [auto, c, pra_39_2_main] + - [auto, c, pra_39_3_npc] - name: pra_40 dir: world/area_pra/pra_40 type: code @@ -15253,11 +14606,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD999B0, c, pra_40_0_header] - - [0xD999D0, c, pra_40_1_music] - - [0xD999D0, c, pra_40_2_main] - - [0xD9A8D0, c, pra_40_3_entity] - - [0xD9A8D0] + - [auto, c, pra_40_0_header] + - [auto, c, pra_40_1_music] + - [auto, c, pra_40_2_main] + - [auto, c, pra_40_3_entity] - name: omo_01 dir: world/area_omo/omo_01 type: code @@ -15265,13 +14617,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD9AEF0, c, omo_01_0_header] - - [0xD9AEF0, c, omo_01_1_music] - - [0xD9AEF0, c, omo_01_2_main] - - [0xD9AEF0, c, omo_01_3_gizmos] - - [0xD9B150, c, omo_01_4_npc] - - [0xD9BB20, c, omo_01_5_entity] - - [0xD9BB20] + - [auto, c, omo_01_0_header] + - [auto, c, omo_01_1_music] + - [auto, c, omo_01_2_main] + - [auto, c, omo_01_3_gizmos] + - [auto, c, omo_01_4_npc] + - [auto, c, omo_01_5_entity] - name: omo_02 dir: world/area_omo/omo_02 type: code @@ -15279,14 +14630,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xD9D4D0, c, omo_02_0_header] - - [0xD9D4D0, c, omo_02_1_music] - - [0xD9D4D0, c, omo_02_2_main] - - [0xD9D4D0, c, omo_02_3_entity] - - [0xD9D510, c, omo_02_4_gizmos] - - [0xD9D790, c, omo_02_5_barricade] - - [0xD9DE40, c, omo_02_6_npc] - - [0xDA0080] + - [auto, c, omo_02_0_header] + - [auto, c, omo_02_1_music] + - [auto, c, omo_02_2_main] + - [auto, c, omo_02_3_entity] + - [auto, c, omo_02_4_gizmos] + - [auto, c, omo_02_5_barricade] + - [auto, c, omo_02_6_npc] - name: omo_03 dir: world/area_omo/omo_03 type: code @@ -15294,16 +14644,15 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDA5240, c, omo_03_0_header] - - [0xDA5240, c, omo_03_1_music] - - [0xDA5240, c, omo_03_2_main] - - [0xDA5240, c, omo_03_3_gizmos] - - [0xDA5240, c, omo_03_4_entity] - - [0xDA5260, c, omo_03_5_npc] - - [0xDA5260, c, omo_03_6_train] - - [0xDA5AD0, c, omo_03_7_train_drop] - - [0xDA5AD0, c, omo_03_8_epilogue] - - [0xDA5AD0] + - [auto, c, omo_03_0_header] + - [auto, c, omo_03_1_music] + - [auto, c, omo_03_2_main] + - [auto, c, omo_03_3_gizmos] + - [auto, c, omo_03_4_entity] + - [auto, c, omo_03_5_npc] + - [auto, c, omo_03_6_train] + - [auto, c, omo_03_7_train_drop] + - [auto, c, omo_03_8_epilogue] - name: omo_04 dir: world/area_omo/omo_04 type: code @@ -15311,14 +14660,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDAD400, c, omo_04_0_header] - - [0xDAD400, c, omo_04_1_music] - - [0xDAD400, c, omo_04_2_main] - - [0xDAD400, c, omo_04_3_gizmos] - - [0xDAD400, c, omo_04_4_entity] - - [0xDAD7A0, c, omo_04_5_npc] - - [0xDAF240, c, omo_04_6_scenes] - - [0xDAF320] + - [auto, c, omo_04_0_header] + - [auto, c, omo_04_1_music] + - [auto, c, omo_04_2_main] + - [auto, c, omo_04_3_gizmos] + - [auto, c, omo_04_4_entity] + - [auto, c, omo_04_5_npc] + - [auto, c, omo_04_6_scenes] - name: omo_05 dir: world/area_omo/omo_05 type: code @@ -15326,13 +14674,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDB22C0, c, omo_05_0_header] - - [0xDB22C0, c, omo_05_1_music] - - [0xDB22C0, c, omo_05_2_main] - - [0xDB22C0, c, omo_05_3_gizmos] - - [0xDB22C0, c, omo_05_4_npc] - - [0xDB46C0, c, omo_05_5_entity] - - [0xDB46C0] + - [auto, c, omo_05_0_header] + - [auto, c, omo_05_1_music] + - [auto, c, omo_05_2_main] + - [auto, c, omo_05_3_gizmos] + - [auto, c, omo_05_4_npc] + - [auto, c, omo_05_5_entity] - name: omo_06 dir: world/area_omo/omo_06 type: code @@ -15340,14 +14687,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDB7910, c, omo_06_0_header] - - [0xDB7910, c, omo_06_1_music] - - [0xDB7910, c, omo_06_2_main] - - [0xDB7910, c, omo_06_3_gizmos] - - [0xDB7910, c, omo_06_4_train] - - [0xDB8180, c, omo_06_5_npc] - - [0xDB8180, c, omo_06_6_entity] - - [0xDB8440] + - [auto, c, omo_06_0_header] + - [auto, c, omo_06_1_music] + - [auto, c, omo_06_2_main] + - [auto, c, omo_06_3_gizmos] + - [auto, c, omo_06_4_train] + - [auto, c, omo_06_5_npc] + - [auto, c, omo_06_6_entity] - name: omo_07 dir: world/area_omo/omo_07 type: code @@ -15355,14 +14701,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDBD2B0, c, omo_07_0_header] - - [0xDBD2B0, c, omo_07_1_music] - - [0xDBD2B0, c, omo_07_2_main] - - [0xDBD2B0, c, omo_07_3_gizmos] - - [0xDBD2B0, c, omo_07_4_npc] - - [0xDC01D0, c, omo_07_5_entity] - - [0xDC04D0, c, omo_07_6_scenes] - - [0xDC05B0] + - [auto, c, omo_07_0_header] + - [auto, c, omo_07_1_music] + - [auto, c, omo_07_2_main] + - [auto, c, omo_07_3_gizmos] + - [auto, c, omo_07_4_npc] + - [auto, c, omo_07_5_entity] + - [auto, c, omo_07_6_scenes] - name: omo_08 dir: world/area_omo/omo_08 type: code @@ -15370,14 +14715,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDC43D0, c, omo_08_0_header] - - [0xDC43D0, c, omo_08_1_music] - - [0xDC43D0, c, omo_08_2_main] - - [0xDC43D0, c, omo_08_3_boxes] - - [0xDC43D0, c, omo_08_4_train] - - [0xDC4C40, c, omo_08_5_entity] - - [0xDC4C40, c, omo_08_6_npc] - - [0xDC51B0] + - [auto, c, omo_08_0_header] + - [auto, c, omo_08_1_music] + - [auto, c, omo_08_2_main] + - [auto, c, omo_08_3_boxes] + - [auto, c, omo_08_4_train] + - [auto, c, omo_08_5_entity] + - [auto, c, omo_08_6_npc] - name: omo_09 dir: world/area_omo/omo_09 type: code @@ -15385,16 +14729,15 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDCCCD0, c, omo_09_0_header] - - [0xDCCCD0, c, omo_09_1_music] - - [0xDCCCD0, c, omo_09_2_main] - - [0xDCCCD0, c, omo_09_3_conveyors] - - [0xDCCFA0, c, omo_09_4_slot_machine] - - [0xDCD3B0, c, omo_09_5_gizmos] - - [0xDCD3F0, c, omo_09_6_entity] - - [0xDCD6B0, c, omo_09_7_npc] - - [0xDD02E0, c, omo_09_8_scenes] - - [0xDD03C0] + - [auto, c, omo_09_0_header] + - [auto, c, omo_09_1_music] + - [auto, c, omo_09_2_main] + - [auto, c, omo_09_3_conveyors] + - [auto, c, omo_09_4_slot_machine] + - [auto, c, omo_09_5_gizmos] + - [auto, c, omo_09_6_entity] + - [auto, c, omo_09_7_npc] + - [auto, c, omo_09_8_scenes] - name: omo_10 dir: world/area_omo/omo_10 type: code @@ -15402,14 +14745,13 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDD79B0, c, omo_10_0_header] - - [0xDD79B0, c, omo_10_1_music] - - [0xDD79B0, c, omo_10_2_main] - - [0xDD79B0, c, omo_10_3_gizmos] - - [0xDD79B0, c, omo_10_4_train] - - [0xDD8220, c, omo_10_5_npc] - - [0xDD8220, c, omo_10_6_entity] - - [0xDD8220] + - [auto, c, omo_10_0_header] + - [auto, c, omo_10_1_music] + - [auto, c, omo_10_2_main] + - [auto, c, omo_10_3_gizmos] + - [auto, c, omo_10_4_train] + - [auto, c, omo_10_5_npc] + - [auto, c, omo_10_6_entity] - name: omo_11 dir: world/area_omo/omo_11 type: code @@ -15417,13 +14759,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDDC830, c, omo_11_0_header] - - [0xDDC830, c, omo_11_1_music] - - [0xDDC830, c, omo_11_2_main] - - [0xDDC830, c, omo_11_3_gizmos] - - [0xDDCFC0, c, omo_11_4_entity] - - [0xDDDD00, c, omo_11_5_npc] - - [0xDDDD00] + - [auto, c, omo_11_0_header] + - [auto, c, omo_11_1_music] + - [auto, c, omo_11_2_main] + - [auto, c, omo_11_3_gizmos] + - [auto, c, omo_11_4_entity] + - [auto, c, omo_11_5_npc] - name: omo_12 dir: world/area_omo/omo_12 type: code @@ -15431,12 +14772,11 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDDF310, c, omo_12_0_header] - - [0xDDF310, c, omo_12_1_music] - - [0xDDF310, c, omo_12_2_main] - - [0xDDF310, c, omo_12_3_npc] - - [0xDDF730, c, omo_12_4_new_partner] - - [0xDDF7D0] + - [auto, c, omo_12_0_header] + - [auto, c, omo_12_1_music] + - [auto, c, omo_12_2_main] + - [auto, c, omo_12_3_npc] + - [auto, c, omo_12_4_new_partner] - name: omo_13 dir: world/area_omo/omo_13 type: code @@ -15444,13 +14784,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDE2490, c, omo_13_0_header] - - [0xDE2490, c, omo_13_1_music] - - [0xDE2490, c, omo_13_2_main] - - [0xDE2490, c, omo_13_3_gizmos] - - [0xDE2710, c, omo_13_4_npc] - - [0xDE36C0, c, omo_13_5_entity] - - [0xDE3980] + - [auto, c, omo_13_0_header] + - [auto, c, omo_13_1_music] + - [auto, c, omo_13_2_main] + - [auto, c, omo_13_3_gizmos] + - [auto, c, omo_13_4_npc] + - [auto, c, omo_13_5_entity] - name: omo_14 dir: world/area_omo/omo_14 type: code @@ -15458,11 +14797,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDE56B0, c, omo_14_0_header] - - [0xDE56B0, c, omo_14_1_music] - - [0xDE56B0, c, omo_14_2_main] - - [0xDE5810, c, omo_14_3_npc] - - [0xDE5C70] + - [auto, c, omo_14_0_header] + - [auto, c, omo_14_1_music] + - [auto, c, omo_14_2_main] + - [auto, c, omo_14_3_npc] - name: omo_15 dir: world/area_omo/omo_15 type: code @@ -15470,11 +14808,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDE8770, c, omo_15_0_header] - - [0xDE8770, c, omo_15_1_music] - - [0xDE8770, c, omo_15_2_main] - - [0xDE8F70, c, omo_15_3_npc] - - [0xDE8F70] + - [auto, c, omo_15_0_header] + - [auto, c, omo_15_1_music] + - [auto, c, omo_15_2_main] + - [auto, c, omo_15_3_npc] - name: omo_16 dir: world/area_omo/omo_16 type: code @@ -15482,11 +14819,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDEBED0, c, omo_16_0_header] - - [0xDEBED0, c, omo_16_1_main] - - [0xDEBED0, c, omo_16_2_train] - - [0xDEC4D0, c, omo_16_3_npc] - - [0xDEC4D0] + - [auto, c, omo_16_0_header] + - [auto, c, omo_16_1_main] + - [auto, c, omo_16_2_train] + - [auto, c, omo_16_3_npc] - name: omo_17 dir: world/area_omo/omo_17 type: code @@ -15494,13 +14830,12 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDEEEA0, c, omo_17_0_header] - - [0xDEEEA0, c, omo_17_1_main] - - [0xDEEEA0, c, omo_17_2_gizmos] - - [0xDEEEA0, c, omo_17_3_train] - - [0xDEF400, c, omo_17_4_npc] - - [0xDF25B0, c, omo_17_5_entity] - - [0xDF25B0] + - [auto, c, omo_17_0_header] + - [auto, c, omo_17_1_main] + - [auto, c, omo_17_2_gizmos] + - [auto, c, omo_17_3_train] + - [auto, c, omo_17_4_npc] + - [auto, c, omo_17_5_entity] - name: end_00 dir: world/area_end/end_00 type: code @@ -15508,19 +14843,18 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xDF6A00, c, end_00_0_header] - - [0xDF6A20, c, end_00_1_main] - - [0xDF6A20, c, end_00_2_credits] - - [0xDF9080, c, end_00_3_parade_setup] - - [0xDF9080, c, end_00_4_allies] - - [0xDF9300, c, end_00_5_koopas] - - [0xDF9300, c, end_00_6_caravan] - - [0xDF9510, c, end_00_7_boos] - - [0xDF9510, c, end_00_8_yoshis] - - [0xDF9510, c, end_00_9_huff_n_puff] - - [0xDF9510, c, end_00_A_crystal_king] - - [0xDF9510, c, end_00_B_bowser] - - [0xDF9540] + - [auto, c, end_00_0_header] + - [auto, c, end_00_1_main] + - [auto, c, end_00_2_credits] + - [auto, c, end_00_3_parade_setup] + - [auto, c, end_00_4_allies] + - [auto, c, end_00_5_koopas] + - [auto, c, end_00_6_caravan] + - [auto, c, end_00_7_boos] + - [auto, c, end_00_8_yoshis] + - [auto, c, end_00_9_huff_n_puff] + - [auto, c, end_00_A_crystal_king] + - [auto, c, end_00_B_bowser] - name: end_01 dir: world/area_end/end_01 type: code @@ -15528,15 +14862,14 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xE05360, c, end_01_0_header] - - [0xE05370, c, end_01_1_main] - - [0xE05390, c, end_01_2_credits] - - [0xE079F0, c, end_01_3_parade_setup] - - [0xE07C20, c, end_01_4_opera_float] - - [0xE07C20, c, end_01_5_flower_float] - - [0xE08050, c, end_01_6_shyguy_float] - - [0xE08050, c, end_01_7_peach_float] - - [0xE08350] + - [auto, c, end_01_0_header] + - [auto, c, end_01_1_main] + - [auto, c, end_01_2_credits] + - [auto, c, end_01_3_parade_setup] + - [auto, c, end_01_4_opera_float] + - [auto, c, end_01_5_flower_float] + - [auto, c, end_01_6_shyguy_float] + - [auto, c, end_01_7_peach_float] - name: mgm_00 dir: world/area_mgm/mgm_00 type: code @@ -15544,11 +14877,10 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xE0E7A0, c, mgm_00_0_header] - - [0xE0E7A0, c, mgm_00_1_main] - - [0xE0EA80, c, mgm_00_2_npc] - - [0xE0F980, c, mgm_00_3_scoreboard] - - [0xE0FF60] + - [auto, c, mgm_00_0_header] + - [auto, c, mgm_00_1_main] + - [auto, c, mgm_00_2_npc] + - [auto, c, mgm_00_3_scoreboard] - name: mgm_01 dir: world/area_mgm/mgm_01 type: code @@ -15556,15 +14888,15 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xE12760, c, mgm_01_0_header] - - [0xE12760, c, mgm_01_1_main] - - [0xE12930, c, mgm_01_2_npc] - - [0xE12930, c, mgm_01_3_entity] - - [0xE12930, c, mgm_01_4_images] - - [0xE13F10, .data, mgm_01_0_header] - - [0xE13F60, .data, mgm_01_1_main] - - [0xE141D0, .data, mgm_01_2_npc] - - [0xE153A0, .data, mgm_01_3_entity] + - [auto, c, mgm_01_0_header] + - [auto, c, mgm_01_1_main] + - [auto, c, mgm_01_2_npc] + - [auto, c, mgm_01_3_entity] + - [auto, c, mgm_01_4_images] + - [auto, .data, mgm_01_0_header] + - [auto, .data, mgm_01_1_main] + - [auto, .data, mgm_01_2_npc] + - [auto, .data, mgm_01_3_entity] - start: 0xE15440 type: .data name: mgm_01_4_images @@ -15585,20 +14917,20 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xE15D80, c, mgm_02_0_header] - - [0xE15D80, c, mgm_02_1_main] - - [0xE15D80, c, mgm_02_2_npc] - - [0xE15D80, c, mgm_02_3_images] - - [0xE18180, .data, mgm_02_0_header] - - [0xE181D0, .data, mgm_02_1_main] - - [0xE183D0, .data, mgm_02_2_npc] - - start: 0xE1E020 - type: .data - name: mgm_02_3_images - subsegments: - - [0xE1E020, ci4, panel_peach, 32, 32] - - [0xE1E220, palette, panel_peach] - - [0xE1E240] + - [auto, c, mgm_02_0_header] + - [auto, c, mgm_02_1_main] + - [auto, c, mgm_02_2_npc] + - [auto, c, mgm_02_3_images] + - [auto, .data, mgm_02_0_header] + - [auto, .data, mgm_02_1_main] + - [auto, .data, mgm_02_2_npc] + - start: 0xE1E020 + type: .data + name: mgm_02_3_images + subsegments: + - [0xE1E020, ci4, panel_peach, 32, 32] + - [0xE1E220, palette, panel_peach] + - [0xE1E240] - name: mgm_03 dir: world/area_mgm/mgm_03 type: code @@ -15606,8 +14938,8 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xE1E380, c, mgm_03_0_header] - - [0xE1E380, c, mgm_03_1_main] + - [auto, c, mgm_03_0_header] + - [auto, c, mgm_03_1_main] - name: gv_01 dir: world/area_gv/gv_01 type: code @@ -15615,23 +14947,22 @@ segments: vram: 0x80240000 vram_of_symbol: world_model_data_vram_end subsegments: - - [0xE1E460, c, gv_01_0_header] - - [0xE1E460, c, gv_01_1_main] - - [0xE1EC20] + - [auto, c, gv_01_0_header] + - [auto, c, gv_01_1_main] - name: heaps2 type: code start: 0xE20110 vram: 0x80267FF0 vram_of_symbol: map_vram_end subsegments: - - [0xE20110, c, heaps2] + - [auto, c, heaps2] - type: code start: 0xE20110 name: inspect_icon vram: 0x802B7000 vram_of_symbol: world_action_vram_end subsegments: - - [0xE20110, c, inspect_icon] + - [auto, c, inspect_icon] - start: 0xE20B30 type: .data name: inspect_icon @@ -15647,7 +14978,7 @@ segments: vram: 0x802B7000 vram_of_symbol: world_action_vram_end subsegments: - - [0xE20EB0, c, speech_bubble] + - [auto, c, speech_bubble] - start: 0xE215C0 type: .data name: speech_bubble @@ -15663,7 +14994,7 @@ segments: vram: 0x802B7000 vram_of_symbol: world_action_vram_end subsegments: - - [0xE21870, c, pulse_stone] + - [auto, c, pulse_stone] - start: 0xE21EB0 type: .data name: pulse_stone @@ -15680,7 +15011,7 @@ segments: vram: 0x802B7000 vram_of_symbol: world_action_vram_end subsegments: - - [0xE225B0, c, i_spy] + - [auto, c, i_spy] - start: 0xE22B30 type: .data name: i_spy @@ -15698,7 +15029,7 @@ segments: vram: 0x802B7E00 vram_of_symbol: world_misc_vram_end subsegments: - - [0xE23260, c, model_clear_render_tasks] + - [auto, c, model_clear_render_tasks] - type: code name: world_action_idle dir: world/action @@ -15706,8 +15037,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE23260, c, idle] - - [0xE23690] + - [auto, c, idle] - type: code name: world_action_walk dir: world/action @@ -15715,8 +15045,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE236E0, c, walk] - - [0xE23FF0] + - [auto, c, walk] - type: code name: world_action_jump dir: world/action @@ -15724,7 +15053,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE24040, c, jump] + - [auto, c, jump] - type: code name: world_action_step_up dir: world/action @@ -15732,8 +15061,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE245D0, c, step_up] - - [0xE248D0] + - [auto, c, step_up] - type: code name: world_action_land dir: world/action @@ -15741,7 +15069,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE24920, c, land] + - [auto, c, land] - type: code name: world_action_hammer dir: world/action @@ -15749,8 +15077,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE24ED0, c, hammer] - - [0xE25C80] + - [auto, c, hammer] - type: code name: world_action_spin dir: world/action @@ -15758,8 +15085,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE25D60, c, spin] - - [0xE26700] + - [auto, c, spin] - type: code name: world_action_tornado_jump dir: world/action @@ -15767,8 +15093,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE26710, c, tornado_jump] - - [0xE26DA0] + - [auto, c, tornado_jump] - type: code name: world_action_spin_jump dir: world/action @@ -15776,8 +15101,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE26DE0, c, spin_jump] - - [0xE274C0] + - [auto, c, spin_jump] - type: code name: world_action_slide dir: world/action @@ -15785,8 +15109,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE27510, c, slide] - - [0xE27C50] + - [auto, c, slide] - type: code name: world_action_hit_fire dir: world/action @@ -15794,7 +15117,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE27C90, c, hit_fire] + - [auto, c, hit_fire] - type: code name: world_action_hit_lava dir: world/action @@ -15802,8 +15125,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE27F40, c, hit_lava] - - [0xE28790] + - [auto, c, hit_lava] - type: code name: world_action_knockback dir: world/action @@ -15811,7 +15133,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE287F0, c, knockback] + - [auto, c, knockback] - type: code name: world_action_misc dir: world/action @@ -15819,8 +15141,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE28A30, c, misc] - - [0xE29190] + - [auto, c, misc] - type: code name: world_action_use_munchlesia dir: world/action @@ -15828,8 +15149,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE291A0, c, use_munchlesia] - - [0xE29450] + - [auto, c, use_munchlesia] - type: code name: world_action_use_spinning_flower dir: world/action @@ -15837,8 +15157,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE29470, c, use_spinning_flower] - - [0xE2A300] + - [auto, c, use_spinning_flower] - type: code name: world_action_use_tweester dir: world/action @@ -15846,8 +15165,7 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE2A340, c, use_tweester] - - [0xE2A690] + - [auto, c, use_tweester] - type: code name: world_action_sneaky_parasol dir: world/action @@ -15855,37 +15173,33 @@ segments: vram: 0x802B6000 follows_vram: texture_memory subsegments: - - [0xE2A6B0, c, sneaky_parasol] - - [0xE2B430] + - [auto, c, sneaky_parasol] - type: code dir: entity/default start: 0xE2B530 vram: 0x802BAE00 follows_vram: model_clear_render_tasks subsegments: - - [0xE2B530, c, Padlock] - - [0xE2BE40, c, BoardedFloor] - - [0xE2C930, c, BombableRock] - - [0xE2D410] + - [auto, c, Padlock] + - [auto, c, BoardedFloor] + - [auto, c, BombableRock] - type: code dir: entity/jan_iwa start: 0xE2D730 vram: 0x802BAE00 follows_vram: model_clear_render_tasks subsegments: - - [0xE2D730, c, Plants1] - - [0xE2E5F0, c, Plants2] - - [0xE2EDE0, c, ArrowSign] - - [0xE2EFD0] + - [auto, c, Plants1] + - [auto, c, Plants2] + - [auto, c, ArrowSign] - type: code dir: entity/sbk_omo start: 0xE2F750 vram: 0x802BAE00 follows_vram: model_clear_render_tasks subsegments: - - [0xE2F750, c, Tweester] - - [0xE307C0, c, StarBoxLauncher] - - [0xE31380] + - [auto, c, Tweester] + - [auto, c, StarBoxLauncher] - name: entity_model_Hammer1Block dir: entity/model type: code @@ -15893,7 +15207,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE31530, c, Hammer1Block] + - [auto, c, Hammer1Block] - start: 0xE31530 type: .data name: Hammer1Block @@ -15909,7 +15223,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE31A30, c, Hammer2Block] + - [auto, c, Hammer2Block] - start: 0xE31A30 type: .data name: Hammer2Block @@ -15925,7 +15239,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE31F30, c, Hammer3Block] + - [auto, c, Hammer3Block] - start: 0xE31F30 type: .data name: Hammer3Block @@ -15941,7 +15255,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE32420, c, ShatteringHammer1Block] + - [auto, c, ShatteringHammer1Block] - start: 0xE32420 type: .data name: ShatteringHammer1Block @@ -15957,7 +15271,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE35670, c, ShatteringHammer2Block] + - [auto, c, ShatteringHammer2Block] - start: 0xE35670 type: .data name: ShatteringHammer2Block @@ -15972,7 +15286,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE38890, c, ShatteringHammer3Block] + - [auto, c, ShatteringHammer3Block] - start: 0xE38890 type: .data name: ShatteringHammer3Block @@ -15988,7 +15302,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE3B870, c, YellowBlock] + - [auto, c, YellowBlock] - start: 0xE3B870 type: .data name: YellowBlock @@ -16003,7 +15317,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE3C320, c, RedBlock] + - [auto, c, RedBlock] - start: 0xE3C320 type: .data name: RedBlock @@ -16018,7 +15332,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE3CDD0, c, UnusedBlock] + - [auto, c, UnusedBlock] - start: 0xE3CDD0 type: .data name: UnusedBlock @@ -16036,7 +15350,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE3DA60, c, PushBlock] + - [auto, c, PushBlock] - start: 0xE3DA60 type: .data name: PushBlock @@ -16052,7 +15366,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE3DDB0, c, BrickBlock] + - [auto, c, BrickBlock] - start: 0xE3DDB0 type: .data name: BrickBlock @@ -16068,7 +15382,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE3E260, c, ShatteringBrickBlock] + - [auto, c, ShatteringBrickBlock] - start: 0xE3E260 type: .data name: ShatteringBrickBlock @@ -16083,7 +15397,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE42240, c, InertYellowBlock] + - [auto, c, InertYellowBlock] - start: 0xE42240 type: .data name: InertYellowBlock @@ -16100,7 +15414,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE42740, c, InertRedBlock] + - [auto, c, InertRedBlock] - start: 0xE42740 type: .data name: InertRedBlock @@ -16116,7 +15430,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE431F0, c, HeartBlock] + - [auto, c, HeartBlock] - start: 0xE431F0 type: .data name: HeartBlock @@ -16131,7 +15445,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE43B20, c, PowBlock] + - [auto, c, PowBlock] - start: 0xE43B20 type: .data name: PowBlock @@ -16147,7 +15461,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE44800, c, SuperBlock] + - [auto, c, SuperBlock] - start: 0xE44800 type: .data name: SuperBlock @@ -16163,7 +15477,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE45110, c, UltraBlock] + - [auto, c, UltraBlock] - start: 0xE45110 type: .data name: UltraBlock @@ -16179,7 +15493,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE459F0, c, HitYellowBlock_gfx] + - [auto, c, HitYellowBlock_gfx] - start: 0xE459F0 type: .data name: HitYellowBlock_gfx @@ -16195,7 +15509,7 @@ segments: start: 0xE46E10 vram: 0x00000000 subsegments: - - [0xE46E10, c, HitYellowBlock_anim] + - [auto, c, HitYellowBlock_anim] - name: entity_model_HitFloatingYellowBlock_gfx dir: entity/model type: code @@ -16203,7 +15517,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE470B0, c, HitFloatingYellowBlock_gfx] + - [auto, c, HitFloatingYellowBlock_gfx] - start: 0xE470B0 type: .data name: HitFloatingYellowBlock_gfx @@ -16219,7 +15533,7 @@ segments: start: 0xE484F0 vram: 0x00000000 subsegments: - - [0xE484F0, c, HitFloatingYellowBlock_anim] + - [auto, c, HitFloatingYellowBlock_anim] - name: entity_model_HitRedBlock_gfx dir: entity/model type: code @@ -16227,7 +15541,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE48780, c, HitRedBlock_gfx] + - [auto, c, HitRedBlock_gfx] - start: 0xE48780 type: .data name: HitRedBlock_gfx @@ -16243,7 +15557,7 @@ segments: start: 0xE49BE0 vram: 0x00000000 subsegments: - - [0xE49BE0, c, HitRedBlock_anim] + - [auto, c, HitRedBlock_anim] - name: entity_model_HeartBlockContent dir: entity/model type: code @@ -16251,7 +15565,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE49E40, c, HeartBlockContent] + - [auto, c, HeartBlockContent] - start: 0xE49E40 type: .data name: HeartBlockContent @@ -16269,7 +15583,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE4A6A0, c, SuperBlockContent] + - [auto, c, SuperBlockContent] - start: 0xE4A6A0 type: .data name: SuperBlockContent @@ -16287,7 +15601,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE4AA80, c, UltraBlockContent] + - [auto, c, UltraBlockContent] - start: 0xE4AA80 type: .data name: UltraBlockContent @@ -16305,7 +15619,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE4B2E0, c, SaveBlock] + - [auto, c, SaveBlock] - start: 0xE4B2E0 type: .data name: SaveBlock @@ -16326,7 +15640,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE4E7F0, c, BoardedFloor] + - [auto, c, BoardedFloor] - start: 0xE4E7F0 type: .data name: BoardedFloor @@ -16352,7 +15666,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE51640, c, WoodenCrate] + - [auto, c, WoodenCrate] - start: 0xE51640 type: .data name: WoodenCrate @@ -16371,7 +15685,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE55A40, c, StarBoxLauncher] + - [auto, c, StarBoxLauncher] - start: 0xE55A40 type: .data name: StarBoxLauncher @@ -16394,7 +15708,7 @@ segments: start: 0xE56BA0 vram: 0x0A000000 subsegments: - - [0xE56BA0, c, HiddenPanel] + - [auto, c, HiddenPanel] - name: entity_model_Tweester dir: entity/model type: code @@ -16402,7 +15716,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE56E60, c, Tweester] + - [auto, c, Tweester] - start: 0xE56E60 type: .data name: Tweester @@ -16424,7 +15738,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE58CD0, c, BlueWarpPipe] + - [auto, c, BlueWarpPipe] - start: 0xE58CD0 type: .data name: BlueWarpPipe @@ -16445,7 +15759,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE59480, c, Signpost] + - [auto, c, Signpost] - start: 0xE59480 type: .data name: Signpost @@ -16462,7 +15776,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE59F00, c, ArrowSign] + - [auto, c, ArrowSign] - start: 0xE59F00 type: .data name: ArrowSign @@ -16478,7 +15792,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE5AB50, c, Padlock] + - [auto, c, Padlock] - start: 0xE5AB50 type: .data name: Padlock @@ -16503,7 +15817,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE5CD80, c, PadlockRedFrame] + - [auto, c, PadlockRedFrame] - start: 0xE5CD80 type: .data name: PadlockRedFrame @@ -16525,7 +15839,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE5E730, c, PadlockRedFace] + - [auto, c, PadlockRedFace] - start: 0xE5E730 type: .data name: PadlockRedFace @@ -16549,7 +15863,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE60550, c, PadlockBlueFace] + - [auto, c, PadlockBlueFace] - start: 0xE60550 type: .data name: PadlockBlueFace @@ -16573,7 +15887,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE62370, c, GreenStompSwitch] + - [auto, c, GreenStompSwitch] - start: 0xE62370 type: .data name: GreenStompSwitch @@ -16593,7 +15907,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE62AC0, c, RedSwitch] + - [auto, c, RedSwitch] - start: 0xE62AC0 type: .data name: RedSwitch @@ -16613,7 +15927,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE639C0, c, BlueSwitch] + - [auto, c, BlueSwitch] - start: 0xE639C0 type: .data name: BlueSwitch @@ -16634,7 +15948,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE648D0, c, Chest] + - [auto, c, Chest] - start: 0xE648D0 type: .data name: Chest @@ -16658,7 +15972,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE657A0, c, ScriptSpring_gfx] + - [auto, c, ScriptSpring_gfx] - start: 0xE657A0 type: .data name: ScriptSpring_gfx @@ -16685,7 +15999,7 @@ segments: start: 0xE67120 vram: 0x00000000 subsegments: - - [0xE67120, c, ScriptSpring_anim] + - [auto, c, ScriptSpring_anim] - name: entity_model_SimpleSpring_gfx dir: entity/model type: code @@ -16693,7 +16007,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE68580, c, SimpleSpring_gfx] + - [auto, c, SimpleSpring_gfx] - start: 0xE68580 type: .data name: SimpleSpring_gfx @@ -16718,7 +16032,7 @@ segments: start: 0xE69D50 vram: 0x00000000 subsegments: - - [0xE69D50, c, SimpleSpring_anim] + - [auto, c, SimpleSpring_anim] - name: entity_model_BellbellPlant_gfx dir: entity/model type: code @@ -16726,7 +16040,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE6B1B0, c, BellbellPlant_gfx] + - [auto, c, BellbellPlant_gfx] - start: 0xE6B1B0 type: .data name: BellbellPlant_gfx @@ -16744,7 +16058,7 @@ segments: start: 0xE6C440 vram: 0x00000000 subsegments: - - [0xE6C440, c, BellbellPlant_anim] + - [auto, c, BellbellPlant_anim] - name: entity_model_TrumpetPlant_gfx dir: entity/model type: code @@ -16752,7 +16066,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE6D390, c, TrumpetPlant_gfx] + - [auto, c, TrumpetPlant_gfx] - start: 0xE6D390 type: .data name: TrumpetPlant_gfx @@ -16767,7 +16081,7 @@ segments: start: 0xE6E2D0 vram: 0x00000000 subsegments: - - [0xE6E2D0, c, TrumpetPlant_anim] + - [auto, c, TrumpetPlant_anim] - name: entity_model_MunchlesiaReset_gfx dir: entity/model type: code @@ -16775,7 +16089,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE6E660, c, MunchlesiaReset_gfx] + - [auto, c, MunchlesiaReset_gfx] - start: 0xE6E660 type: .data name: MunchlesiaReset_gfx @@ -16789,7 +16103,7 @@ segments: start: 0xE74750 vram: 0x00000000 subsegments: - - [0xE74750, c, MunchlesiaReset_anim] + - [auto, c, MunchlesiaReset_anim] - name: entity_model_MunchlesiaGrab_gfx dir: entity/model type: code @@ -16797,7 +16111,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE74BD0, c, MunchlesiaGrab_gfx] + - [auto, c, MunchlesiaGrab_gfx] - start: 0xE74BD0 type: .data name: MunchlesiaGrab_gfx @@ -16811,7 +16125,7 @@ segments: start: 0xE7ACC0 vram: 0x00000000 subsegments: - - [0xE7ACC0, c, MunchlesiaGrab_anim] + - [auto, c, MunchlesiaGrab_anim] - name: entity_model_MunchlesiaEnvelop_gfx dir: entity/model type: code @@ -16819,7 +16133,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE7B0E0, c, MunchlesiaEnvelop_gfx] + - [auto, c, MunchlesiaEnvelop_gfx] - start: 0xE7B0E0 type: .data name: MunchlesiaEnvelop_gfx @@ -16833,7 +16147,7 @@ segments: start: 0xE811D0 vram: 0x00000000 subsegments: - - [0xE811D0, c, MunchlesiaEnvelop_anim] + - [auto, c, MunchlesiaEnvelop_anim] - name: entity_model_MunchlesiaBeginChew_gfx dir: entity/model type: code @@ -16841,7 +16155,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE815F0, c, MunchlesiaBeginChew_gfx] + - [auto, c, MunchlesiaBeginChew_gfx] - start: 0xE815F0 type: .data name: MunchlesiaBeginChew_gfx @@ -16855,7 +16169,7 @@ segments: start: 0xE88030 vram: 0x00000000 subsegments: - - [0xE88030, c, MunchlesiaBeginChew_anim] + - [auto, c, MunchlesiaBeginChew_anim] - name: entity_model_MunchlesiaChewing_gfx dir: entity/model type: code @@ -16863,7 +16177,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE884A0, c, MunchlesiaChewing_gfx] + - [auto, c, MunchlesiaChewing_gfx] - start: 0xE884A0 type: .data name: MunchlesiaChewing_gfx @@ -16877,7 +16191,7 @@ segments: start: 0xE8A410 vram: 0x00000000 subsegments: - - [0xE8A410, c, MunchlesiaChewing_anim] + - [auto, c, MunchlesiaChewing_anim] - name: entity_model_MunchlesiaSpitOut_gfx dir: entity/model type: code @@ -16885,7 +16199,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE8A9E0, c, MunchlesiaSpitOut_gfx] + - [auto, c, MunchlesiaSpitOut_gfx] - start: 0xE8A9E0 type: .data name: MunchlesiaSpitOut_gfx @@ -16899,7 +16213,7 @@ segments: start: 0xE91420 vram: 0x00000000 subsegments: - - [0xE91420, c, MunchlesiaSpitOut_anim] + - [auto, c, MunchlesiaSpitOut_anim] - name: entity_model_MunchlesiaReset1_gfx dir: entity/model type: code @@ -16907,7 +16221,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE91890, c, MunchlesiaReset1_gfx] + - [auto, c, MunchlesiaReset1_gfx] - start: 0xE91890 type: .data name: MunchlesiaReset1_gfx @@ -16921,14 +16235,14 @@ segments: start: 0xE982D0 vram: 0x00000000 subsegments: - - [0xE982D0, c, MunchlesiaReset1_anim] + - [auto, c, MunchlesiaReset1_anim] - name: entity_model_CymbalPlant_anim dir: entity/model type: code start: 0xE98740 vram: 0x00000000 subsegments: - - [0xE98740, c, CymbalPlant_anim] + - [auto, c, CymbalPlant_anim] - name: entity_model_CymbalPlant_gfx dir: entity/model type: code @@ -16936,7 +16250,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE992F0, c, CymbalPlant_gfx] + - [auto, c, CymbalPlant_gfx] - start: 0xE992F0 type: .data name: CymbalPlant_gfx @@ -16959,7 +16273,7 @@ segments: start: 0xE9A990 vram: 0x00000000 subsegments: - - [0xE9A990, c, PinkFlower_anim] + - [auto, c, PinkFlower_anim] - name: entity_model_PinkFlower_gfx dir: entity/model type: code @@ -16967,7 +16281,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE9B500, c, PinkFlower_gfx] + - [auto, c, PinkFlower_gfx] - start: 0xE9B500 type: .data name: PinkFlower_gfx @@ -16988,7 +16302,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE9C900, c, SpinningFlower] + - [auto, c, SpinningFlower] - start: 0xE9C900 type: .data name: SpinningFlower @@ -17008,7 +16322,7 @@ segments: vram: 0x0A000000 symbol_name_format: $VRAM_$ROM subsegments: - - [0xE9D650, c, BombableRock] + - [auto, c, BombableRock] - start: 0xE9D650 type: .data name: BombableRock @@ -17032,10 +16346,10 @@ segments: # start: 0xE9AFF0 # vram: 0x80240000 # subsegments: - # - [0xE9AFF0, c, kzn_11_0_header] - # - [0xE9AFF0, c, kzn_11_1_main] - # - [0xE9B300, c, kzn_11_2_platforms] - # - [0xE9B450, c, kzn_11_3_npc] + # - [auto, c, kzn_11_0_header] + # - [auto, c, kzn_11_1_main] + # - [auto, c, kzn_11_2_platforms] + # - [auto, c, kzn_11_3_npc] # - [0xE9D650] - name: dead_kzn_17 dir: world/dead/area_kzn/kzn_17 @@ -17043,288 +16357,288 @@ segments: start: 0xEA0900 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEA0900, c, kzn_17_0_header] - - [0xEA0900, c, kzn_17_1_main] - - [0xEA0900, c, kzn_17_2_entity] - - [0xEA0C10, c, kzn_17_3_npc] - - [0xEA36E0, c, kzn_17_4_tromp] - - [0xEA3A80] + - [auto, c, kzn_17_0_header] + - [auto, c, kzn_17_1_main] + - [auto, c, kzn_17_2_entity] + - [auto, c, kzn_17_3_npc] + - [auto, c, kzn_17_4_tromp] - name: dead_kzn_18 dir: world/dead/area_kzn/kzn_18 type: code start: 0xEA6FD0 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEA6FD0, c, kzn_18_0_header] - - [0xEA7010, c, kzn_18_1_main] - - [0xEA7320, c, kzn_18_2_npc] - - [0xEA7390, c, kzn_18_3_entity] - - [0xEA7390] + - [auto, c, kzn_18_0_header] + - [auto, c, kzn_18_1_main] + - [auto, c, kzn_18_2_npc] + - [auto, c, kzn_18_3_entity] - name: dead_kzn_19 dir: world/dead/area_kzn/kzn_19 type: code start: 0xEA8AE0 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEA8AE0, c, kzn_19_0_header] - - [0xEA8AE0, c, kzn_19_1_music] - - [0xEA8AE0, c, kzn_19_2_main] - - [0xEA95E0, c, kzn_19_3_npc_settings] - - [0xEA95E0, c, kzn_19_4_npc] - - [0xEA95E0, c, kzn_19_5_eruption] - - [0xEA95E0, c, kzn_19_6_entity] - - [0xEAA810] + - [auto, c, kzn_19_0_header] + - [auto, c, kzn_19_1_music] + - [auto, c, kzn_19_2_main] + - [auto, c, kzn_19_3_npc_settings] + - [auto, c, kzn_19_4_npc] + - [auto, c, kzn_19_5_eruption] + - [auto, c, kzn_19_6_entity] - name: dead_kzn_20 dir: world/dead/area_kzn/kzn_20 type: code start: 0xEB0E60 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEB0E60, c, kzn_20_0_header] - - [0xEB0E60, c, kzn_20_1_music] - - [0xEB0E60, c, kzn_20_2_main] - - [0xEB1170, c, kzn_20_3_npc] - - [0xEB1920] + - [auto, c, kzn_20_0_header] + - [auto, c, kzn_20_1_music] + - [auto, c, kzn_20_2_main] + - [auto, c, kzn_20_3_npc] - name: dead_kzn_22 dir: world/dead/area_kzn/kzn_22 type: code start: 0xEB5130 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEB5130, c, kzn_22_0_header] - - [0xEB5130, c, kzn_22_1_music] - - [0xEB5130, c, kzn_22_2_main] - - [0xEB5470, c, kzn_22_3_entity] - - [0xEB5470, c, kzn_22_4_npc] - - [0xEB54C0] + - [auto, c, kzn_22_0_header] + - [auto, c, kzn_22_1_music] + - [auto, c, kzn_22_2_main] + - [auto, c, kzn_22_3_entity] + - [auto, c, kzn_22_4_npc] - name: dead_kzn_23 dir: world/dead/area_kzn/kzn_23 type: code start: 0xEB7230 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEB7230, c, kzn_23_0_header] - - [0xEB7230, c, kzn_23_1_music] - - [0xEB7230, c, kzn_23_2_main] - - [0xEB7540, c, kzn_23_3_npc] - - [0xEB7850] + - [auto, c, kzn_23_0_header] + - [auto, c, kzn_23_1_music] + - [auto, c, kzn_23_2_main] + - [auto, c, kzn_23_3_npc] - name: dead_flo_00 dir: world/dead/area_flo/flo_00 type: code start: 0xEB8E50 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEB8E50, c, flo_00_0_header] - - [0xEB8E50, c, flo_00_1_music] - - [0xEB8E50, c, flo_00_2_main] - - [0xEB8E90, c, flo_00_3_npc] - - [0xEB9D90, c, flo_00_4_epilogue] - - [0xEB9D90, c, flo_00_5_beanstalk] - - [0xEBA260, c, flo_00_6_entity] - - [0xEBA260] + - [auto, c, flo_00_0_header] + - [auto, c, flo_00_1_music] + - [auto, c, flo_00_2_main] + - [auto, c, flo_00_3_npc] + - [auto, c, flo_00_4_epilogue] + - [auto, c, flo_00_5_beanstalk] + - [auto, c, flo_00_6_entity] - name: dead_flo_03 dir: world/dead/area_flo/flo_03 type: code start: 0xEC2200 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEC2200, c, flo_03_0_header] - - [0xEC2200, c, flo_03_1_music] - - [0xEC2200, c, flo_03_2_main] - - [0xEC2240, c, flo_03_3_npc] - - [0xEC2610, c, flo_03_4_foliage] - - [0xEC2850, c, flo_03_5_entity] - - [0xEC2850] + - [auto, c, flo_03_0_header] + - [auto, c, flo_03_1_music] + - [auto, c, flo_03_2_main] + - [auto, c, flo_03_3_npc] + - [auto, c, flo_03_4_foliage] + - [auto, c, flo_03_5_entity] - name: dead_flo_07 dir: world/dead/area_flo/flo_07 type: code start: 0xEC71B0 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEC71B0, c, flo_07_0_header] - - [0xEC71B0, c, flo_07_1_music] - - [0xEC71B0, c, flo_07_2_main] - - [0xEC7590, c, flo_07_3_npc] - - [0xEC7590] + - [auto, c, flo_07_0_header] + - [auto, c, flo_07_1_music] + - [auto, c, flo_07_2_main] + - [auto, c, flo_07_3_npc] - name: dead_flo_08 dir: world/dead/area_flo/flo_08 type: code start: 0xEC9D00 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEC9D00, c, flo_08_0_header] - - [0xEC9D00, c, flo_08_1_music] - - [0xEC9D00, c, flo_08_2_entity] - - [0xECAA40, c, flo_08_3_main] - - [0xECAA80, c, flo_08_4_npc] - - [0xECB930, c, flo_08_5_foliage] - - [0xECBB70, c, flo_08_6_vines] - - [0xECBC10] + - [auto, c, flo_08_0_header] + - [auto, c, flo_08_1_music] + - [auto, c, flo_08_2_entity] + - [auto, c, flo_08_3_main] + - [auto, c, flo_08_4_npc] + - [auto, c, flo_08_5_foliage] + - [auto, c, flo_08_6_vines] - name: dead_flo_09 dir: world/dead/area_flo/flo_09 type: code start: 0xECFFF0 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xECFFF0, c, flo_09_0_header] - - [0xECFFF0, c, flo_09_1_music] - - [0xECFFF0, c, flo_09_2_main] - - [0xED0030, c, flo_09_3_vines] - - [0xED00D0, c, flo_09_4_foliage] - - [0xED0310, c, flo_09_5_npc] - - [0xED1840] + - [auto, c, flo_09_0_header] + - [auto, c, flo_09_1_music] + - [auto, c, flo_09_2_main] + - [auto, c, flo_09_3_vines] + - [auto, c, flo_09_4_foliage] + - [auto, c, flo_09_5_npc] - name: dead_flo_10 dir: world/dead/area_flo/flo_10 type: code start: 0xED4220 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xED4220, c, flo_10_0_header] - - [0xED4260, c, flo_10_1_music] - - [0xED4260, c, flo_10_2_entity] - - [0xED4260, c, flo_10_3_main] - - [0xED42A0, c, flo_10_4_fountain] - - [0xED46D0, c, flo_10_5_npc] - - [0xED46D0, c, flo_10_6_waterfx] - - [0xED5540, c, flo_10_7_foliage] - - [0xED5780] + - [auto, c, flo_10_0_header] + - [auto, c, flo_10_1_music] + - [auto, c, flo_10_2_entity] + - [auto, c, flo_10_3_main] + - [auto, c, flo_10_4_fountain] + - [auto, c, flo_10_5_npc] + - [auto, c, flo_10_6_waterfx] + - [auto, c, flo_10_7_foliage] - name: dead_flo_11 dir: world/dead/area_flo/flo_11 type: code start: 0xED8E20 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xED8E20, c, flo_11_0_header] - - [0xED8E20, c, flo_11_1_music] - - [0xED8E20, c, flo_11_2_main] - - [0xED9170, c, flo_11_3_npc] - - [0xED9170, c, flo_11_4_entity] - - [0xED9170] + - [auto, c, flo_11_0_header] + - [auto, c, flo_11_1_music] + - [auto, c, flo_11_2_main] + - [auto, c, flo_11_3_npc] + - [auto, c, flo_11_4_entity] - name: dead_flo_12 dir: world/dead/area_flo/flo_12 type: code start: 0xEDBFE0 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEDBFE0, c, flo_12_0_header] - - [0xEDBFE0, c, flo_12_1_music] - - [0xEDBFE0, c, flo_12_2_main] - - [0xEDC020, c, flo_12_3_npc] - - [0xEDC6D0] + - [auto, c, flo_12_0_header] + - [auto, c, flo_12_1_music] + - [auto, c, flo_12_2_main] + - [auto, c, flo_12_3_npc] - name: dead_flo_13 dir: world/dead/area_flo/flo_13 type: code start: 0xEDE9C0 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEDE9C0, c, flo_13_0_header] - - [0xEDE9C0, c, flo_13_1_music] - - [0xEDE9C0, c, flo_13_2_entity] - - [0xEDE9C0, c, flo_13_3_main] - - [0xEDEA00, c, flo_13_4_npc] - - [0xEE2040, c, flo_13_5_new_partner] - - [0xEE20E0] + - [auto, c, flo_13_0_header] + - [auto, c, flo_13_1_music] + - [auto, c, flo_13_2_entity] + - [auto, c, flo_13_3_main] + - [auto, c, flo_13_4_npc] + - [auto, c, flo_13_5_new_partner] - name: dead_flo_14 dir: world/dead/area_flo/flo_14 type: code start: 0xEE65B0 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEE65B0, c, flo_14_0_header] - - [0xEE65B0, c, flo_14_1_music] - - [0xEE65B0, c, flo_14_2_main] - - [0xEE68F0, c, flo_14_3_bubbles] - - [0xEE70C0, c, flo_14_4_npc] - - [0xEE8940, c, flo_14_5_entity] - - [0xEE8940, c, flo_14_6_logs] - - [0xEE8970] + - [auto, c, flo_14_0_header] + - [auto, c, flo_14_1_music] + - [auto, c, flo_14_2_main] + - [auto, c, flo_14_3_bubbles] + - [auto, c, flo_14_4_npc] + - [auto, c, flo_14_5_entity] + - [auto, c, flo_14_6_logs] - name: dead_flo_15 dir: world/dead/area_flo/flo_15 type: code start: 0xEEB990 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEEB990, c, flo_15_0_header] - - [0xEEB990, c, flo_15_1_music] - - [0xEEB990, c, flo_15_2_main] - - [0xEEB990, c, flo_15_3_npc] - - [0xEEB990, c, flo_15_4_entity] - - [0xEEB990, c, flo_15_5_stairs] - - [0xEEB990] + - [auto, c, flo_15_0_header] + - [auto, c, flo_15_1_music] + - [auto, c, flo_15_2_main] + - [auto, c, flo_15_3_npc] + - [auto, c, flo_15_4_entity] + - [auto, c, flo_15_5_stairs] - name: dead_flo_16 dir: world/dead/area_flo/flo_16 type: code start: 0xEED100 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEED100, c, flo_16_0_header] - - [0xEED100, c, flo_16_1_music] - - [0xEED100, c, flo_16_2_main] - - [0xEED140, c, flo_16_3_vines] - - [0xEED1E0, c, flo_16_4_entity] - - [0xEEDF50, c, flo_16_5_npc] - - [0xEEFAA0, c, flo_16_6_puzzle] - - [0xEEFAD0] + - [auto, c, flo_16_0_header] + - [auto, c, flo_16_1_music] + - [auto, c, flo_16_2_main] + - [auto, c, flo_16_3_vines] + - [auto, c, flo_16_4_entity] + - [auto, c, flo_16_5_npc] + - [auto, c, flo_16_6_puzzle] - name: dead_flo_17 dir: world/dead/area_flo/flo_17 type: code start: 0xEF2610 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEF2610, c, flo_17_0_header] - - [0xEF2610, c, flo_17_1_music] - - [0xEF2610, c, flo_17_2_main] - - [0xEF2650, c, flo_17_3_logs] - - [0xEF2680, c, flo_17_4_npc] - - [0xEF58E0, c, flo_17_5_entity] - - [0xEF58E0] + - [auto, c, flo_17_0_header] + - [auto, c, flo_17_1_music] + - [auto, c, flo_17_2_main] + - [auto, c, flo_17_3_logs] + - [auto, c, flo_17_4_npc] + - [auto, c, flo_17_5_entity] - name: dead_flo_18 dir: world/dead/area_flo/flo_18 type: code start: 0xEF7A80 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEF7A80, c, flo_18_0_header] - - [0xEF7A80, c, flo_18_1_music] - - [0xEF7A80, c, flo_18_2_main] - - [0xEF7DC0, c, flo_18_3_machine] - - [0xEF7FB0, c, flo_18_4_npc] - - [0xEF8010, c, flo_18_5_foliage] - - [0xEF8250] + - [auto, c, flo_18_0_header] + - [auto, c, flo_18_1_music] + - [auto, c, flo_18_2_main] + - [auto, c, flo_18_3_machine] + - [auto, c, flo_18_4_npc] + - [auto, c, flo_18_5_foliage] - name: dead_flo_19 dir: world/dead/area_flo/flo_19 type: code start: 0xEFEB00 vram: 0x80240000 vram_of_symbol: world_model_data_vram_end + dead_code: True subsegments: - - [0xEFEB00, c, flo_19_0_header] - - [0xEFEB00, c, flo_19_1_music] - - [0xEFEB00, c, flo_19_2_entity] - - [0xEFEB00, c, flo_19_3_main] - - [0xEFEE40, c, flo_19_4_clouds] - - [0xEFEFD0, c, flo_19_5_beanstalk] - - [0xEFF440] + - [auto, c, flo_19_0_header] + - [auto, c, flo_19_1_music] + - [auto, c, flo_19_2_entity] + - [auto, c, flo_19_3_main] + - [auto, c, flo_19_4_clouds] + - [auto, c, flo_19_5_beanstalk] ############# ### Audio ### @@ -17475,14 +16789,8 @@ segments: - [0xFADE70, bin, bgm/New_Partner_82] # BGM end - [0xFAE860, bin] # more audio stuff - [0x19425C0, bin] # INIT file -############### -### Sprites ### -############### - [0x1942C40, bin] - - start: 0x1943000 - align: 8 - type: pm_sprites - name: sprites + - { start: 0x1943000, align: 8, type: pm_sprites, name: sprites } - [0x1B82208, bin] # end of sprite data - todo: figure out what this is - start: 0x1B83000 type: pm_msg @@ -17537,7 +16845,5 @@ segments: - [0x1C84D30, bin] # junk(?) - [0x1E00000, bin] # junk (player sprite data; can be zeroed out with no effect) - [0x1E40000, pm_map_data, mapfs] - - type: bin - start: 0x27FEE22 - subalign: 2 + - { type: bin, start: 0x27FEE22, subalign: 2 } - [0x2800000]