From db578d97885fc2eb32e24a2c41a4c2da56a4bd9e Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 22 Sep 2021 20:17:46 +0900 Subject: [PATCH] a5dd0 (model file) + filemenu decomp (#420) * remove some warnings, improve build speed on master * update Camera * update_camera_zone_interp not matching but close :/ * cleanup * configure fix * cleanup, better gbi macros * decomp and syms * a couple more * 2 more and stuff * more naming * 3 * syms * mdl_get_child_count * more stuff * get_model_list_index_from_tree_index * 5 more * header org * update_entity_shadow_position * fog color funcs * more color stuff * display lists * create_shadow_from_data * 4 evt shtuffsh * func_80117D00 * func_80111790 * some BSS * entity_raycast_down * MakeEntity and almost step_entity_commandList * step_current_game_mode * filemenu stuff * lots more filemenu stuff * cleanup * formatting * fixes * 1 more * more fixes --- .vscode/settings.json | 3 +- Jenkinsfile | 2 +- include/common_structs.h | 181 +- include/filemenu.h | 22 + include/functions.h | 2 +- include/macros.h | 17 - include/map.h | 1 + include/model.h | 151 ++ include/variables.h | 10 - src/163400.c | 439 +++- src/165490.c | 111 +- src/167570.c | 1 + src/168590.c | 133 +- src/43F0.c | 1 + src/8800.c | 34 +- src/B0E0.c | 359 ++- src/a5dd0_len_114e0.c | 1989 ++++++++++++++--- src/curtains.c | 13 +- src/effects.c | 2 +- src/evt/cam_api.c | 58 +- src/evt/map_api.c | 4 +- src/evt/script_list.c | 54 +- src/game_modes.c | 8 +- src/main_loop.c | 28 +- src/npc.h | 8 +- src/state_file_select.c | 2 +- src/state_logos.c | 2 +- src/state_title_screen.c | 23 +- src/world/area_arn/arn_04/arn_04.h | 2 - src/world/script_api/7E4690.c | 2 +- tools/build/configure.py | 7 +- tools/sortsymz.py | 56 + tools/symz.txt | 1276 +++++++++++ .../warnings_count/update_current_warnings.sh | 7 - .../asm/data/{16A3E0.data.s => 16A680.data.s} | 138 -- .../nonmatchings/163400/filemenu_cleanup.s | 8 +- .../filemenu_draw_contents_copy_arrow.s | 12 +- .../163400/filemenu_draw_cursor.s | 41 - .../asm/nonmatchings/163400/filemenu_init.s | 16 +- .../163400/filemenu_set_cursor_alpha.s | 9 - .../163400/filemenu_set_selected.s | 26 - .../asm/nonmatchings/163400/filemenu_update.s | 32 +- .../163400/filemenu_update_cursor.s | 28 +- .../filemenu_update_hidden_name_confirm.s | 87 - .../filemenu_update_hidden_name_input.s | 30 - .../filemenu_update_hidden_options_bottom.s | 30 - .../filemenu_update_hidden_options_left.s | 30 - .../filemenu_update_hidden_options_right.s | 30 - .../163400/filemenu_update_hidden_title.s | 30 - .../filemenu_update_hidden_with_rotation.s | 33 - .../163400/filemenu_update_show_name_input.s | 35 - .../filemenu_update_show_options_bottom.s | 35 - .../filemenu_update_show_options_left.s | 35 - .../filemenu_update_show_options_right.s | 35 - .../163400/filemenu_update_show_title.s | 35 - .../filemenu_update_show_with_rotation.s | 37 - .../asm/nonmatchings/163400/func_8024330C.s | 35 - .../asm/nonmatchings/163400/func_802435C4.s | 30 - .../asm/nonmatchings/163400/func_80244BC4.s | 8 +- .../filemenu_draw_contents_file_0_info.s | 24 - .../filemenu_draw_contents_file_0_title.s | 24 - .../filemenu_draw_contents_file_1_info.s | 24 - .../filemenu_draw_contents_file_1_title.s | 24 - .../filemenu_draw_contents_file_2_info.s | 24 - .../filemenu_draw_contents_file_2_title.s | 24 - .../filemenu_draw_contents_file_3_info.s | 24 - .../filemenu_draw_contents_file_3_title.s | 24 - .../165490/filemenu_draw_contents_file_info.s | 8 +- .../165490/filemenu_draw_contents_mono.s | 34 - .../165490/filemenu_draw_contents_stereo.s | 35 - .../165490/filemenu_main_cleanup.s | 26 - .../165490/filemenu_main_handle_input.s | 84 +- .../nonmatchings/165490/filemenu_main_init.s | 4 +- .../165490/filemenu_main_update.s | 8 +- .../filemenu_yesno_draw_prompt_contents.s | 12 +- .../167570/filemenu_yesno_handle_input.s | 68 +- .../168590/filemenu_choose_name_cleanup.s | 26 - .../filemenu_choose_name_handle_input.s | 24 +- .../filemenu_draw_contents_choose_name.s | 4 +- ...ilemenu_draw_contents_file_create_header.s | 94 - .../filemenu_info_draw_message_contents.s | 181 -- .../168590/filemenu_info_handle_input.s | 91 - .../nonmatchings/168590/filemenu_info_init.s | 26 - .../B0E0/update_camera_zone_interp.s | 16 +- .../a5dd0_len_114e0/AssignAreaFlag.s | 35 - .../a5dd0_len_114e0/AssignBlockFlag.s | 24 - .../a5dd0_len_114e0/AssignCrateFlag.s | 28 - .../a5dd0_len_114e0/AssignPanelFlag.s | 28 - .../nonmatchings/a5dd0_len_114e0/MakeEntity.s | 96 - .../a5dd0_len_114e0/_load_model_textures.s | 4 +- .../a5dd0_len_114e0/appendGfx_model.s | 124 +- .../a5dd0_len_114e0/appendGfx_model_group.s | 8 +- .../a5dd0_len_114e0/build_custom_gfx.s | 81 - .../a5dd0_len_114e0/calculate_model_sizes.s | 62 - .../a5dd0_len_114e0/clear_entity_data.s | 16 +- .../a5dd0_len_114e0/clear_game_modes.s | 14 - .../a5dd0_len_114e0/clear_model_data.s | 140 +- .../a5dd0_len_114e0/clear_render_tasks.s | 21 - .../a5dd0_len_114e0/clear_render_tasks_alt.s | 21 - .../a5dd0_len_114e0/create_shadow_from_data.s | 99 - .../a5dd0_len_114e0/disable_transform_group.s | 43 - .../a5dd0_len_114e0/enable_transform_group.s | 43 - .../a5dd0_len_114e0/entity_free_static_data.s | 8 +- .../a5dd0_len_114e0/entity_raycast_down.s | 165 -- .../a5dd0_len_114e0/execute_render_tasks.s | 44 +- .../a5dd0_len_114e0/func_80110E58.s | 8 +- .../a5dd0_len_114e0/func_80110F10.s | 12 +- .../a5dd0_len_114e0/func_80111790.s | 26 - .../a5dd0_len_114e0/func_80114B58.s | 20 +- .../a5dd0_len_114e0/func_80115498.s | 4 +- .../a5dd0_len_114e0/func_80116674.s | 4 +- .../a5dd0_len_114e0/func_80116698.s | 4 +- .../a5dd0_len_114e0/func_80117D00.s | 103 - .../a5dd0_len_114e0/func_8011B1D8.s | 8 +- .../a5dd0_len_114e0/func_8011B7C0.s | 16 +- .../a5dd0_len_114e0/func_8011B950.s | 16 +- .../get_model_center_and_size.s | 59 - .../get_model_env_color_parameters.s | 25 - .../get_model_fog_color_parameters.s | 37 - .../get_model_list_index_from_tree_index.s | 40 - .../a5dd0_len_114e0/get_model_property.s | 21 - .../get_transform_group_index.s | 30 - .../a5dd0_len_114e0/init_model_data.s | 86 - .../a5dd0_len_114e0/is_entity_data_loaded.s | 8 +- .../a5dd0_len_114e0/is_identity_fixed_mtx.s | 25 - .../a5dd0_len_114e0/load_data_for_models.s | 38 - .../a5dd0_len_114e0/load_model_textures.s | 12 +- .../a5dd0_len_114e0/load_model_transforms.s | 28 +- .../a5dd0_len_114e0/load_simple_entity_data.s | 101 - .../a5dd0_len_114e0/load_split_entity_data.s | 24 +- .../a5dd0_len_114e0/load_tile_header.s | 28 +- .../a5dd0_len_114e0/make_transform_group.s | 164 -- .../a5dd0_len_114e0/mdl_create_model.s | 20 +- .../a5dd0_len_114e0/mdl_get_child_count.s | 46 - .../a5dd0_len_114e0/mdl_get_copied_gfx.s | 21 - .../a5dd0_len_114e0/mdl_get_copied_vertices.s | 19 - .../mdl_get_next_texture_address.s | 8 +- .../mdl_make_local_vertex_copy.s | 4 +- .../a5dd0_len_114e0/mdl_set_all_fog_mode.s | 4 +- .../a5dd0_len_114e0/render_models.s | 4 +- .../a5dd0_len_114e0/render_transform_group.s | 62 - .../render_transform_group_node.s | 114 - .../a5dd0_len_114e0/set_mdl_custom_gfx_set.s | 20 - .../set_model_env_color_parameters.s | 19 - .../set_model_fog_color_parameters.s | 28 - .../a5dd0_len_114e0/step_current_game_mode.s | 35 - .../update_entity_shadow_position.s | 193 -- .../evt/map_api/apply_transform_to_children.s | 8 +- .../kzn_06/C6CD10/func_802403F0_C6CD10.s | 4 +- .../kzn_06/C6CD10/func_80240738_C6D058.s | 4 +- .../kzn_07/C6E330/func_80240000_C6E330.s | 4 +- .../kzn_07/C6E330/func_80240348_C6E678.s | 4 +- .../kzn_08/C71480/func_80240000_C71480.s | 4 +- .../kzn_08/C71480/func_80240348_C717C8.s | 4 +- ver/us/splat.yaml | 5 +- ver/us/symbol_addrs.txt | 144 +- ver/us/undefined_syms.txt | 97 +- 157 files changed, 4962 insertions(+), 4770 deletions(-) create mode 100644 include/filemenu.h create mode 100644 include/model.h create mode 100644 tools/sortsymz.py create mode 100644 tools/symz.txt delete mode 100755 tools/warnings_count/update_current_warnings.sh rename ver/us/asm/data/{16A3E0.data.s => 16A680.data.s} (88%) delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_draw_cursor.s delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_set_cursor_alpha.s delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_set_selected.s delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_update_hidden_name_confirm.s delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_update_hidden_name_input.s delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_update_hidden_options_bottom.s delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_update_hidden_options_left.s delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_update_hidden_options_right.s delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_update_hidden_title.s delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_update_hidden_with_rotation.s delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_update_show_name_input.s delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_update_show_options_bottom.s delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_update_show_options_left.s delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_update_show_options_right.s delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_update_show_title.s delete mode 100644 ver/us/asm/nonmatchings/163400/filemenu_update_show_with_rotation.s delete mode 100644 ver/us/asm/nonmatchings/163400/func_8024330C.s delete mode 100644 ver/us/asm/nonmatchings/163400/func_802435C4.s delete mode 100644 ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_0_info.s delete mode 100644 ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_0_title.s delete mode 100644 ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_1_info.s delete mode 100644 ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_1_title.s delete mode 100644 ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_2_info.s delete mode 100644 ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_2_title.s delete mode 100644 ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_3_info.s delete mode 100644 ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_3_title.s delete mode 100644 ver/us/asm/nonmatchings/165490/filemenu_draw_contents_mono.s delete mode 100644 ver/us/asm/nonmatchings/165490/filemenu_draw_contents_stereo.s delete mode 100644 ver/us/asm/nonmatchings/165490/filemenu_main_cleanup.s delete mode 100644 ver/us/asm/nonmatchings/168590/filemenu_choose_name_cleanup.s delete mode 100644 ver/us/asm/nonmatchings/168590/filemenu_draw_contents_file_create_header.s delete mode 100644 ver/us/asm/nonmatchings/168590/filemenu_info_draw_message_contents.s delete mode 100644 ver/us/asm/nonmatchings/168590/filemenu_info_handle_input.s delete mode 100644 ver/us/asm/nonmatchings/168590/filemenu_info_init.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignAreaFlag.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignBlockFlag.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignCrateFlag.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignPanelFlag.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/MakeEntity.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/build_custom_gfx.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/calculate_model_sizes.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_game_modes.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_render_tasks.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_render_tasks_alt.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/create_shadow_from_data.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/disable_transform_group.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/enable_transform_group.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_raycast_down.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80111790.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80117D00.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_center_and_size.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_env_color_parameters.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_fog_color_parameters.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_list_index_from_tree_index.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_property.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/get_transform_group_index.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/init_model_data.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/is_identity_fixed_mtx.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/load_data_for_models.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/load_simple_entity_data.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/make_transform_group.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_child_count.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_copied_gfx.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_copied_vertices.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/render_transform_group.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/render_transform_group_node.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/set_mdl_custom_gfx_set.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/set_model_env_color_parameters.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/set_model_fog_color_parameters.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/step_current_game_mode.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entity_shadow_position.s diff --git a/.vscode/settings.json b/.vscode/settings.json index b0d99089cb..b3ff1808a5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -24,7 +24,8 @@ "ver/current": true, "ver/us/build": true, "ver/jp/build": true, - "expected": true + "expected": true, + "**/*.i": true, }, "python.autoComplete.extraPaths": [ "./tools" diff --git a/Jenkinsfile b/Jenkinsfile index d6a4e57bc9..9c5ea9228f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -64,7 +64,7 @@ pipeline { sh 'python3 progress.py jp --csv >> reports/progress_jp.csv' sh 'python3 progress.py jp --shield-json > reports/progress_jp_shield.json' - sh './tools/warnings_count/update_current_warnings.sh' + sh 'cat build_log.txt | grep warning | sort > tools/warnings_count/warnings.txt' sh 'cp tools/warnings_count/warnings.txt reports/warnings.txt' stash includes: 'reports/*', name: 'reports' diff --git a/include/common_structs.h b/include/common_structs.h index 2ed313b35b..b4a5924b9b 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -17,6 +17,10 @@ typedef struct { u8 r, g, b, a; } Color_RGBA8; +typedef struct { + u8 r, g, b; +} Color_RGB8; + typedef struct Vec2b { /* 0x00 */ s8 x; /* 0x01 */ s8 y; @@ -510,12 +514,22 @@ typedef struct CameraUnk { /* 0x68 */ char unk_68[0x24]; } CameraUnk; // size = 0x8C +typedef struct CameraControlSettings { + /* 0x00 */ s32 type; + /* 0x04 */ f32 boomLength; + /* 0x08 */ f32 boomPitch; + /* 0x0C */ Vec3f posA; + /* 0x18 */ Vec3f posB; + /* 0x24 */ f32 viewPitch; + /* 0x28 */ s32 flag; +} CameraControlSettings; // size = 0x2C + typedef struct Camera { /* 0x000 */ u16 flags; /* 0x002 */ s16 moveFlags; - /* 0x004 */ s16 mode; + /* 0x004 */ s16 updateMode; /* 0x006 */ s16 unk_06; - /* 0x008 */ s16 unk_08; + /* 0x008 */ s16 changingMap; /* 0x00A */ s16 viewportW; /* 0x00C */ s16 viewportH; /* 0x00E */ s16 viewportStartX; @@ -533,7 +547,7 @@ typedef struct Camera { /* 0x028 */ s16 unk_28; /* 0x02A */ s16 zoomPercent; /* 0x02C */ s16 bgColor[3]; - /* 0x032 */ s16 targetScreenCoords[3]; + /* 0x032 */ Vec3s targetScreenCoords; /* 0x038 */ u16 perspNorm; /* 0x03A */ char unk_3A[2]; /* 0x03C */ Vec3f lookAt_eye; @@ -553,7 +567,7 @@ typedef struct Camera { /* 0x094 */ f32 currentPitch; /* 0x098 */ s32 unk_98; /* 0x09C */ s32 unk_9C; - /* 0x0A0 */ Vp viewport; + /* 0x0A0 */ Vp vp; /* 0x0B0 */ Vp vpAlt; /* 0x0C0 */ s32 unk_C0; /* 0x0C4 */ f32 unk_C4; @@ -565,33 +579,34 @@ typedef struct Camera { /* 0x1D4 */ char unk_1D4[0x28]; /* 0x1FC */ void (*fpDoPreRender)(struct Camera*); /* 0x200 */ void (*fpDoPostRender)(struct Camera*); - /* 0x204 */ struct Matrix4s* unkMatrix; + /* 0x204 */ Matrix4s* unkMatrix; /* 0x208 */ s32 unk_208; - /* 0x20C */ struct Matrix4s* unkEffectMatrix; + /* 0x20C */ Matrix4s* unkEffectMatrix; /* 0x210 */ char unk_210[0x2]; /* 0x212 */ s16 unk_212; /* 0x214 */ CameraUnk unk_214[4]; - /* 0x444 */ struct Zone* prevZone; - /* 0x448 */ struct Zone* currentZone; - /* 0x44C */ struct CamPosSettings initialSettings; /* for start of blend between zones */ - /* 0x468 */ struct CamPosSettings targetSettings; /* goal for blend between zones */ - /* 0x484 */ f32 sinInterpAlpha; + /* 0x444 */ CameraControlSettings* prevController; + /* 0x448 */ CameraControlSettings* currentController; + /* 0x44C */ CamPosSettings oldCameraSettings; + /* 0x468 */ CamPosSettings newCameraSettings; + /* 0x484 */ f32 interpAlpha; /* 0x488 */ f32 linearInterp; /* 0x48C */ f32 linearInterpScale; /* 3.0? */ /* 0x490 */ f32 moveSpeed; - /* 0x494 */ char unk_494[0x8]; + /* 0x494 */ f32 unk_494; + /* 0x498 */ f32 unk_498; /* 0x49C */ f32 unk_49C; - /* 0x4A0 */ char unk_4A0[0x10]; + /* 0x4A0 */ f32 savedTargetY; + /* 0x4A4 */ f32 unk_4A4; + /* 0x4A8 */ f32 unk_4A8; + /* 0x4AC */ f32 unk_4AC; /* 0x4B0 */ Vec3f movePos; - /* 0x4BC */ char unk_4BC[28]; - /* 0x4D8 */ s32 controllerType; - /* 0x4DC */ f32 controllerBoomLen; - /* 0x4E0 */ f32 controllerBoomPitch; - /* 0x4E4 */ Vec3f posA; - /* 0x4F0 */ Vec3f posB; - /* 0x4FC */ f32 controllerViewPitch; - /* 0x500 */ s32 unk_500; - /* 0x504 */ s16 boolTargetPlayer; + /* 0x4BC */ Vec3f prevPrevMovePos; + /* 0x4C8 */ Vec3f prevMovePos; + /* 0x4D4 */ u16 prevPrevFollowFlags; + /* 0x4D6 */ u16 prevFollowFlags; + /* 0x4D8 */ CameraControlSettings controlSettings; + /* 0x504 */ u16 followPlayer; /* 0x506 */ u16 unk_506; /* 0x508 */ f32 panPhase; /* 0x50C */ f32 leadAmount; @@ -816,58 +831,6 @@ typedef struct ModelDisplayData { /* 0x4 */ char unk_00[0x4]; } ModelDisplayData; // size = 0x8 -typedef struct ModelNodeProperty { - /* 0x0 */ s32 key; - /* 0x4 */ s32 dataType; - /* 0x8 */ s32 data; -} ModelNodeProperty; // size = 0x8; - -typedef struct ModelNode { - /* 0x00 */ s32 type; /* 2 = model */ - /* 0x04 */ ModelDisplayData* displayData; - /* 0x08 */ s32 numProperties; - /* 0x0C */ ModelNodeProperty* propertyList; - /* 0x10 */ struct ModelGroupData* groupData; -} ModelNode; // size = 0x14 - -typedef struct Model { - /* 0x00 */ u16 flags; - /* 0x02 */ s16 modelID; - /* 0x04 */ Matrix4s* currentMatrix; - /* 0x08 */ ModelNode* modelNode; - /* 0x0C */ ModelGroupData* groupData; - /* 0x10 */ s32* currentSpecialMatrix; - /* 0x14 */ char unk_14[4]; - /* 0x18 */ Matrix4s specialMatrix; - /* 0x58 */ Matrix4f transformMatrix; - /* 0x98 */ Vec3f center; - /* 0xA4 */ u8 texPannerID; - /* 0xA5 */ u8 specialDisplayListID; - /* 0xA6 */ s8 renderMode; - /* 0xA7 */ char unk_A7; - /* 0xA8 */ u8 textureID; - /* 0xA9 */ u8 unk_A9; - /* 0xAA */ char unk_AA[6]; -} Model; // size = 0xB0 - -typedef struct ModelTransformGroup { - /* 0x00 */ u16 flags; - /* 0x02 */ s16 groupModelID; - /* 0x04 */ Matrix4s* matrixRDP_N; - /* 0x08 */ ModelNode* modelNode; - /* 0x0C */ Matrix4s* transformMtx; - /* 0x10 */ Matrix4f matrixA; - /* 0x50 */ Matrix4f matrixB; - /* 0x90 */ Vec3f center; - /* 0x9C */ u8 minChildModelIndex; - /* 0x9D */ u8 maxChildModelIndex; - /* 0x9E */ u8 renderMode; - /* 0x9F */ s8 matrixMode; -} ModelTransformGroup; // size = 0xA0 - -typedef Model* ModelList[MAX_MODELS]; -typedef ModelTransformGroup* ModelTransformGroupList[MAX_MODEL_TRANSFORM_GROUPS]; - typedef struct AnimatedMesh { /* 0x000 */ s32 flags; /* 0x004 */ u8 renderMode; @@ -1041,10 +1004,19 @@ typedef struct ItemEntity { /* 0x58 */ s32 unk_58; } ItemEntity; // size = 0x5C -typedef struct StaticShadowData { - /* 0x00 */ s16 flags; - /* 0x02 */ char unk_02[34]; -} StaticShadowData; // size = 0x24 +typedef struct StaticAnimatorNode { + /* 0x00 */ u32* displayList; // can sometime point to a node??? + /* 0x04 */ Vec3s rot; /* range = -180,180 */ + /* 0x0A */ char unk_0A[0x2]; + /* 0x0C */ Vec3f pos; + /* 0x18 */ struct StaticAnimatorNode* sibling; + /* 0x1C */ struct StaticAnimatorNode* child; + /* 0x20 */ s16 vertexStartOffset; + /* 0x22 */ char unk_22[0x2]; + /* 0x24 */ Vtx* vtxList; + /* 0x28 */ s16 modelID; + /* 0x2A */ char unk_2A[0x2]; +} StaticAnimatorNode; // size = 0x2C typedef struct SpriteComponent { /* 0x00 */ char unk_00[8]; @@ -1286,7 +1258,7 @@ typedef struct GameStatus { /* 0x0A8 */ s8 creditsViewportMode; /* 0x0A9 */ s8 unk_A9; /* 0x0AA */ s8 demoFlags; - /* 0x0AB */ s8 unk_AB; + /* 0x0AB */ u8 unk_AB; /* 0x0AC */ s8 loadMenuState; /* 0x0AD */ s8 menuCounter; /* 0x0AE */ s8 bSkipIntro; @@ -1345,6 +1317,15 @@ typedef struct Shadow { typedef Shadow* ShadowList[MAX_SHADOWS]; +typedef struct StaticShadowData { + /* 0x00 */ u16 flags; + /* 0x02 */ char unk_02[0x2]; + /* 0x04 */ s32 unk_04; + /* 0x08 */ StaticAnimatorNode** animModelNode; + /* 0x0C */ void (*onCreateCallback)(Shadow* shadow); + /* 0x10 */ char unk_10[0x14]; +} StaticShadowData; // size = 0x24 + typedef struct PushBlockGrid { /* 0x00 */ s8* cells; /* 0x04 */ u8 numCellsX; @@ -1373,18 +1354,6 @@ typedef struct RenderTask { /* 0x0C */ void (*appendGfx)(void*); } RenderTask; // size = 0x10 -typedef void(*CustomModelGfxBuilderFunc)(s32 index); - -typedef struct CustomModelGfxBuilder { - /* 0x00 */ CustomModelGfxBuilderFunc pre; - /* 0x00 */ CustomModelGfxBuilderFunc post; -} CustomModelGfxBuilder; // size = 0x8 - -typedef struct CustomModelGfx { - /* 0x00 */ Gfx* pre; - /* 0x00 */ Gfx* post; -} CustomModelGfx; // size = 0x8 - typedef struct SelectableTarget { /* 0x00 */ s16 actorID; /* 0x02 */ s16 partID; /* sometimes loaded as byte from 0x3 */ @@ -1664,15 +1633,6 @@ typedef struct CollisionHeader { /* 0x18 */ char unk_18[8]; } CollisionHeader; // size = 0x20 -typedef struct Zone { - /* 0x00 */ s32 type; - /* 0x04 */ f32 boomLength; - /* 0x08 */ f32 boomPitch; - /* 0x0C */ f32 pos[6]; - /* 0x24 */ f32 viewPitch; - /* 0x28 */ s32 flag; -} Zone; // size = 0x2C - typedef struct ActorMovement { /* 0x00 */ Vec3f currentPos; /* 0x0C */ Vec3f goalPos; @@ -1939,12 +1899,6 @@ typedef struct PlayerStatus { /* 0x281 */ char unk_281[7]; } PlayerStatus; // size = 0x288 -typedef struct AnimatedModelNode { - /* 0x00 */ u32* displayList; - /* 0x04 */ s16 rot[3]; /* range = -180,180 */ - /* 0x0A */ char unk_0A[34]; -} AnimatedModelNode; // size = 0x2C - typedef struct EncounterStatus { /* 0x000 */ s32 flags; /* 0x004 */ s8 eFirstStrike; /* 0 = none, 1 = player, 2 = enemy */ @@ -2044,10 +1998,10 @@ typedef struct PauseMapSpace { } PauseMapSpace; // size = 0x14 typedef struct MenuPanel { - /* 0x00 */ s8 initialized; //? + /* 0x00 */ u8 initialized; //? /* 0x01 */ s8 col; // might be backwards /* 0x02 */ s8 row; // might be backwards - /* 0x03 */ s8 selected; + /* 0x03 */ u8 selected; /* 0x04 */ s8 page; // filemenu: 0 = select, 1 = delete, 3 = copy from, 4 = copy to, all else = save /* 0x05 */ s8 numCols; /* 0x06 */ s8 numRows; @@ -2057,7 +2011,7 @@ typedef struct MenuPanel { /* 0x10 */ UNK_FUN_PTR(fpHandleInput); /* 0x14 */ UNK_FUN_PTR(fpUpdate); /* 0x18 */ UNK_FUN_PTR(fpCleanup); -} MenuPanel; +} MenuPanel; // size = 0x1C typedef struct WindowBackground { /* 0x00 */ s32* imgData; @@ -2298,17 +2252,10 @@ typedef struct TempSetZoneEnabled { /* 0x04 */ s16 id1; /* 0x06 */ s16 id2; /* 0x08 */ char unk_08[0x8]; - /* 0x10 */ s32 unk_10; + /* 0x10 */ CameraControlSettings* unk_10; /* 0x14 */ char unk_14[0x8]; } TempSetZoneEnabled; // size = 0x1C -typedef struct RenderTaskEntry { - /* 0x00 */ s32 unk_00; - /* 0x04 */ s32 unk_04; - /* 0x08 */ void* appendGfxArg; - /* 0x0C */ void (*appendGfx)(void*); -} RenderTaskEntry; // size = 0x10 - typedef struct ActionCommandStatus { /* 0x00 */ s32 unk_00; /* 0x04 */ s32 hudElements[15]; diff --git a/include/filemenu.h b/include/filemenu.h new file mode 100644 index 0000000000..178f84e78c --- /dev/null +++ b/include/filemenu.h @@ -0,0 +1,22 @@ +#ifndef _FILEMENU_H_ +#define _FILEMENU_H_ + +#include "common.h" + +extern MenuPanel* filemenu_menus[4]; + +void pause_partners_draw_movelist_flower(MenuPanel* menu, s32 posX, s32 posY); + +extern BSS s32 filemenu_iterFileIdx; +extern BSS s32 filemenu_pressedButtons; +extern BSS s32 filemenu_8024C088; +extern BSS s32 filemenu_heldButtons; +extern BSS s32 filemenu_8024C090; +extern BSS s32 filemenu_loadedFileIdx; +extern BSS s32 filemenu_8024C098[2]; +extern BSS s32 filemenu_cursorHudElemID; +extern BSS s32 filemenu_8024C0A4[3]; +extern BSS s32 filemenu_hudElemIDs[20]; +extern BSS s32 filemenu_8024C100[8]; + +#endif diff --git a/include/functions.h b/include/functions.h index 3756f0bde8..ae1fd3cdf9 100644 --- a/include/functions.h +++ b/include/functions.h @@ -61,7 +61,7 @@ void set_entity_model_flags(s32 idx, s32 newFlags); void clear_entity_model_flags(s32 idx, s32 newFlags); void exec_entity_model_commandlist(s32 idx); s32 load_entity_model(s32* cmdList); -RenderTaskEntry* queue_render_task(RenderTask* task); +RenderTask* queue_render_task(RenderTask* task); void setup_pause_menu_tab(MenuWindowBP* bpArray, s32 arraySize); diff --git a/include/macros.h b/include/macros.h index 68183a011a..f64595d603 100644 --- a/include/macros.h +++ b/include/macros.h @@ -62,23 +62,6 @@ #define PACK_FILL_COLOR(r, g, b, a) (GPACK_RGBA5551(r, g, b, a) << 0x10) | GPACK_RGBA5551(r, g, b, a) -//NOTE: SCRIPT_ALLOC is probably not quite correct, but this is the closest thing to matching for the functions its used in. Needs more work. -#define SCRIPT_ALLOC(new, index) \ -{ \ - (*gCurrentScriptListPtr)[index] = new = heap_malloc(sizeof(Evt)); \ - gNumScripts++; \ - ASSERT(new != NULL); \ -} - -#define SCRIPT_FREE(index) \ -{ \ - ScriptList** temp = &gCurrentScriptListPtr; \ - s32 *numScripts = &gNumScripts; \ - heap_free((**temp)[index]); \ - (**temp)[index] = NULL; \ - (*numScripts)--; \ -} - #define SQ(x) (x*x) #define CUBE(x) (x*x*x) #define QUART(x) (x*x*x*x) diff --git a/include/map.h b/include/map.h index b1a8186cde..4e15a3d1f6 100644 --- a/include/map.h +++ b/include/map.h @@ -4,6 +4,7 @@ #include "common_structs.h" #include "enums.h" #include "script_api/map.h" +#include "model.h" // TODO: consider moving Npc here diff --git a/include/model.h b/include/model.h new file mode 100644 index 0000000000..992564e458 --- /dev/null +++ b/include/model.h @@ -0,0 +1,151 @@ +#ifndef _MODEL_H_ +#define _MODEL_H_ + +#include "common.h" + +typedef union ModelNodePropertyData { + s32 s; + f32 f; + s32* p; +} ModelNodePropertyData; + +typedef struct ModelNodeProperty { + /* 0x0 */ s32 key; + /* 0x4 */ s32 dataType; + /* 0x8 */ ModelNodePropertyData data; +} ModelNodeProperty; // size = 0xC; + +typedef struct ModelNode { + /* 0x00 */ s32 type; /* 2 = model */ + /* 0x04 */ ModelDisplayData* displayData; + /* 0x08 */ s32 numProperties; + /* 0x0C */ ModelNodeProperty* propertyList; + /* 0x10 */ struct ModelGroupData* groupData; +} ModelNode; // size = 0x14 + +typedef struct Model { + /* 0x00 */ u16 flags; + /* 0x02 */ u16 modelID; + /* 0x04 */ Matrix4s* currentMatrix; + /* 0x08 */ ModelNode* modelNode; + /* 0x0C */ ModelGroupData* groupData; + /* 0x10 */ s32* currentSpecialMatrix; + /* 0x14 */ char unk_14[4]; + /* 0x18 */ Matrix4s specialMatrix; + /* 0x58 */ Matrix4f transformMatrix; + /* 0x98 */ Vec3f center; + /* 0xA4 */ u8 texPannerID; + /* 0xA5 */ u8 specialDisplayListID; + /* 0xA6 */ s8 renderMode; + /* 0xA7 */ char unk_A7; + /* 0xA8 */ u8 textureID; + /* 0xA9 */ u8 unk_A9; + /* 0xAA */ char unk_AA[6]; +} Model; // size = 0xB0 + +typedef struct ModelTransformGroup { + /* 0x00 */ u16 flags; + /* 0x02 */ u16 groupModelID; + /* 0x04 */ Mtx* matrixRDP_N; + /* 0x08 */ ModelNode* modelNode; + /* 0x0C */ Matrix4s* transformMtx; + /* 0x10 */ Mtx matrixA; + /* 0x50 */ Matrix4f matrixB; + /* 0x90 */ Vec3f center; + /* 0x9C */ u8 minChildModelIndex; + /* 0x9D */ u8 maxChildModelIndex; + /* 0x9E */ u8 renderMode; + /* 0x9F */ s8 matrixMode; +} ModelTransformGroup; // size = 0xA0 + +typedef Model* ModelList[MAX_MODELS]; +typedef ModelTransformGroup* ModelTransformGroupList[MAX_MODEL_TRANSFORM_GROUPS]; + +typedef struct ModelLocalVertexCopy { + /* 0x00 */ s32 numVertices; + /* 0x04 */ Vtx* minVertexAddr; + /* 0x08 */ Gfx* gfxCopy[2]; + /* 0x10 */ Vtx* vtxCopy[2]; + /* 0x18 */ s32 selector; +} ModelLocalVertexCopy; // size = 0x1C + +typedef struct ModelTreeInfo { + /* 0x00 */ u8 modelIndex; + /* 0x01 */ s8 treeDepth; + /* 0x02 */ s8 textureID; + /* 0x03 */ char unk_03; +} ModelTreeInfo; // size = 0x04 + +typedef struct TextureHandle { + /* 0x00 */ Gfx* gfx; + /* 0x04 */ TileDescriptor desc; + /* 0x34 */ s32* raster; + /* 0x38 */ s32* palette; + /* 0x3C */ s32* auxRaster; + /* 0x40 */ s32* auxPalette; +} TextureHandle; // size = 0x44 + +typedef void(*ModelCustomGfxBuilderFunc)(s32 index); + +typedef struct ModelCustomGfxBuilder { + /* 0x00 */ ModelCustomGfxBuilderFunc pre; + /* 0x00 */ ModelCustomGfxBuilderFunc post; +} ModelCustomGfxBuilder; // size = 0x8 + +typedef struct ModelCustomGfx { + /* 0x00 */ Gfx* pre; + /* 0x00 */ Gfx* post; +} ModelCustomGfx; // size = 0x8 + +typedef struct ModelBlueprint { + /* 0x0 */ s16 flags; + /* 0x2 */ char unk_02[0x2]; + /* 0x4 */ ModelNode* mdlNode; + /* 0x8 */ ModelGroupData* groupData; + /* 0xC */ Matrix4s* mtx; +} ModelBlueprint; // size = 0x10 + +typedef ModelCustomGfx ModelCustomGfxList[32]; +typedef ModelCustomGfxBuilder ModelCustomGfxBuilderList[32]; + +// In memory this is a list of ModelNodeProperty, but due to the way it uses +// the fields (storing into the "type" field) we decided to make a struct for this +typedef struct ModelBoundingBox { + /* 0x00 */ s32 key; // MODEL_PROP_KEY_BOUNDING_BOX + /* 0x04 */ s32 halfSizeX; + /* 0x08 */ f32 minX; + /* 0x0C */ char unk_0C[0x04]; + /* 0x10 */ s32 halfSizeY; + /* 0x14 */ f32 minY; + /* 0x18 */ char unk_18[0x04]; + /* 0x1C */ s32 halfSizeZ; + /* 0x20 */ f32 minZ; + /* 0x24 */ char unk_24[0x8]; + /* 0x2C */ f32 maxX; + /* 0x30 */ char unk_30[0x8]; + /* 0x38 */ f32 maxY; + /* 0x3C */ char unk_3C[0x8]; + /* 0x44 */ f32 maxZ; +} ModelBoundingBox; // size = 0x48? + +typedef enum ModelPropertyKeys { + MODEL_PROP_KEY_RENDER_MODE = 0x5C, + MODEL_PROP_KEY_CAMERA_DATA = 0x5D, + MODEL_PROP_KEY_TEXTURE_NAME = 0x5E, + MODEL_PROP_KEY_SPECIAL = 0x5F, + MODEL_PROP_KEY_GROUP_TYPE = 0x60, + MODEL_PROP_KEY_BOUNDING_BOX = 0x61, + MODEL_PROP_KEY_62 = 0x62, +} ModelPropertyKeys; + +typedef enum ShapeTypes { + SHAPE_TYPE_MODEL = 2, + SHAPE_TYPE_GROUP = 5, + SHAPE_TYPE_ROOT = 7, + SHAPE_TYPE_SPECIAL_GROUP = 10, +} ShapeTypes; + +typedef ModelTreeInfo ModelTreeInfoList[0x200]; +extern ModelTreeInfoList* mdl_currentModelTreeNodeInfo; + +#endif diff --git a/include/variables.h b/include/variables.h index d25108eef0..bee6243617 100644 --- a/include/variables.h +++ b/include/variables.h @@ -53,19 +53,9 @@ extern s32 gScriptIndexList[MAX_SCRIPTS]; extern s32 gMoveScriptTable[][4]; -extern ModelList gWorldModelList; -extern ModelList gBattleModelList; -extern ModelList* gCurrentModelListPtr; - -// TODO: potentially a display list, figure this out -extern u32* gWorldModelSpecialDls[32]; -extern u32* gBattleModelSpecialDls[32]; -extern CustomModelGfx* gCurrentModelSpecialDlsPtr; - extern EntityList gWorldEntityList; extern EntityList gBattleEntityList; extern EntityList* gCurrentEntityListPtr; -extern s32 gLastCreatedEntityIndex; extern DynamicEntityList gWorldDynamicEntityList; extern DynamicEntityList gBattleDynamicEntityList; diff --git a/src/163400.c b/src/163400.c index 19c76c82d9..8ec4c051df 100644 --- a/src/163400.c +++ b/src/163400.c @@ -1,13 +1,84 @@ #include "common.h" +#include "filemenu.h" -// TODO this is the bss for the whole segment - break it up -static char bss[0xA0]; +extern s32 D_80241ECC; +extern MenuPanel D_8024A098; +extern MenuPanel D_8024A114; +extern MenuPanel D_8024A158; +extern MenuPanel D_8024A1D8; +extern s32 D_8024BA60; +extern s32 D_8024BA98; + +void filemenu_draw_cursor(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening); +void filemenu_draw_contents_copy_arrow( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +); + +s32* D_80249B80[] = { &D_80241ECC }; +MenuPanel* filemenu_menus[4] = { &D_8024A098, &D_8024A114, &D_8024A158, &D_8024A1D8 }; +s32 D_80249B94 = 160; +s32 D_80249B98 = -120; +s32 D_80249B9C[] = {0}; +s32 D_80249BA0 = 160; +s32 D_80249BA4[] = { -120 }; +s32 filemenu_cursorGoalAlpha = 0; +s32 filemenu_cursorGoalAlpha2 = 0; +s32 D_80249BB0[] = { 0x00000001, 0x00000000 }; +s32 D_80249BB8[] = { 0x00000000 }; +s16 D_80249BBC[16] = { 315, 303, 283, 260, 235, 210, 185, 160, 135, 110, 85, 60, 37, 17, 5, 0 }; +s16 D_80249BDC[16] = { 315, 303, 283, 260, 235, 210, 185, 160, 135, 110, 85, 60, 37, 17, 5, 0 }; +s16 D_80249BFC[16] = { 157, 151, 141, 130, 117, 105, 92, 80, 67, 55, 42, 30, 18, 8, 2, 0 }; +s16 D_80249C1C[16] = { 157, 151, 141, 130, 117, 105, 92, 80, 67, 55, 42, 30, 18, 8, 2, 0 }; +s16 D_80249C3C[16] = { 63, 60, 56, 52, 47, 42, 37, 32, 27, 22, 17, 12, 7, 3, 1, 0 }; +s16 D_80249C5C[16] = { 63, 60, 56, 52, 47, 42, 37, 32, 27, 22, 17, 12, 7, 3, 1, 0 }; +s16 D_80249C7C[10] = { -5, -17, -37, -60, -85, -110, -135, -160, -185, -210 }; +s16 D_80249C90[10] = { -5, -17, -37, -60, -85, -110, -135, -160, -185, -210 }; +s16 D_80249CA4[10] = { -2, -8, -18, -30, -42, -55, -70, -85, -100, -115 }; +s16 D_80249CB8[10] = { -2, -8, -18, -30, -42, -55, -70, -85, -100, -115 }; +s16 D_80249CCC[10] = { -1, -3, -7, -12, -17, -22, -27, -32, -37, -42 }; +s16 D_80249CE0[10] = { -1, -3, -7, -12, -17, -22, -27, -32, -37, -42 }; +s16 D_80249CF4[16] = { 180, 173, 161, 148, 134, 120, 105, 91, 77, 62, 48, 34, 21, 9, 2, 0 }; +s16 D_80249D14[] = { 0, 2, 9, 21, 34, 48, 62, 77, 91, 105, 120, 134, 148, 161, 173, 180 }; +s16 D_80249D34[] = { 185, 160, 135, 110, 85, 60, 37, 17, 5, 0 }; +s16 D_80249D48[10] = { 0, 5, 17, 37, 60, 85, 110, 135, 160, 185}; +s32 D_80249D4C = 0; // padding? +s32 D_80249D60[] = { 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000, }; +s32 D_80249D70[] = { 0x40E00000, 0x41480000, 0x41500000, 0x41680000, 0x41600000, 0x41500000, 0x41380000, 0x41180000, + 0x40F00000, 0x40B00000, 0x40600000, 0x40000000, 0x3F800000, 0x3F000000, 0x00000000, }; +s32 D_80249DAC[] = { 0x2C000010, 0x00180120, 0x00C00000, 0x00000000, 0x00000000, 0xFF000000, 0x00000001, 0x40000000, }; +s32 D_80249DCC[] = { &D_8024BA60, 0x18000000, 0x00000120, 0x00C00000, filemenu_draw_contents_copy_arrow, 0x00000000, + 0x2C000000, 0x00000001, 0x00000000, &D_8024BA98, 0x17000000, 0x00000140, 0x00F00000, + filemenu_draw_cursor, 0x00000000, 0xFF000000, 0x00000001, 0x00000000, &D_8024BA98, 0x00000000, + 0x00000000, }; + +BSS s32 filemenu_iterFileIdx; +BSS s32 filemenu_pressedButtons; +BSS s32 filemenu_8024C088; +BSS s32 filemenu_heldButtons; +BSS s32 filemenu_8024C090; +BSS s32 filemenu_loadedFileIdx; +BSS s32 filemenu_8024C098[2]; +BSS s32 filemenu_cursorHudElemID; +BSS s32 filemenu_8024C0A4[3]; +BSS s32 filemenu_hudElemIDs[20]; +BSS s32 filemenu_8024C100[8]; INCLUDE_ASM(s32, "163400", mainmenu_draw_rect); -INCLUDE_ASM(s32, "163400", filemenu_set_selected); +void filemenu_set_selected(MenuPanel* menu, s32 col, s32 row) { + menu->col = col; + menu->row = row; + menu->selected = menu->gridData[(menu->page * menu->numCols * menu->numRows) + + (menu->numCols * (s8) row) + menu->col]; +} -INCLUDE_ASM(s32, "163400", filemenu_set_cursor_alpha); +void filemenu_set_cursor_alpha(s32 arg0) { + filemenu_cursorGoalAlpha = arg0; + filemenu_cursorGoalAlpha2 = arg0; +} INCLUDE_ASM(s32, "163400", filemenu_set_cursor_goal_pos); @@ -15,33 +86,322 @@ INCLUDE_ASM(s32, "163400", filemenu_update_cursor); INCLUDE_ASM(s32, "163400", filemenu_update); -INCLUDE_ASM(s32, "163400", func_8024330C); +void func_8024330C( + s32 windowIdx, + s32* flags, + s32* posX, s32* posY, s32* posZ, + s32* scaleX, s32* scaleY, + s32* rotX, f32* rotY, s32* rotZ, + s32* darkening, + s32* opacity +) { + Window* window = &gWindows[windowIdx]; + s32 updateCounter = window->updateCounter; -INCLUDE_ASM(s32, "163400", filemenu_update_show_name_input); + if (updateCounter == 0) { + window->flags &= ~0x4; + } -INCLUDE_ASM(s32, "163400", filemenu_update_show_options_left); + if (updateCounter < ARRAY_COUNT(D_80249BBC)) { + *posX -= D_80249BBC[updateCounter]; + } else { + *posX -= D_80249BBC[ARRAY_COUNT(D_80249BBC) - 1]; + window->flags &= ~0x8; + } +} -INCLUDE_ASM(s32, "163400", filemenu_update_show_options_right); +void filemenu_update_show_name_input( + s32 windowIdx, + s32* flags, + s32* posX, s32* posY, s32* posZ, + s32* scaleX, s32* scaleY, + s32* rotX, f32* rotY, s32* rotZ, + s32* darkening, + s32* opacity +) { + Window* window = &gWindows[windowIdx]; + s32 updateCounter = window->updateCounter; -INCLUDE_ASM(s32, "163400", filemenu_update_show_options_bottom); + if (updateCounter == 0) { + window->flags &= ~0x4; + } -INCLUDE_ASM(s32, "163400", filemenu_update_show_title); + if (updateCounter < ARRAY_COUNT(D_80249BDC)) { + *posX += D_80249BDC[updateCounter]; + } else { + *posX += D_80249BDC[ARRAY_COUNT(D_80249BDC) - 1]; + window->flags &= ~0x8; + } +} -INCLUDE_ASM(s32, "163400", func_802435C4); +void filemenu_update_show_options_left( + s32 windowIdx, + s32* flags, + s32* posX, s32* posY, s32* posZ, + s32* scaleX, s32* scaleY, + s32* rotX, f32* rotY, s32* rotZ, + s32* darkening, + s32* opacity +) { + Window* window = &gWindows[windowIdx]; + s32 updateCounter = window->updateCounter; -INCLUDE_ASM(s32, "163400", filemenu_update_hidden_name_input); + if (updateCounter == 0) { + window->flags &= ~0x4; + } -INCLUDE_ASM(s32, "163400", filemenu_update_hidden_options_left); + if (updateCounter < ARRAY_COUNT(D_80249BFC)) { + *posX -= D_80249BFC[updateCounter]; + } else { + *posX -= D_80249BFC[ARRAY_COUNT(D_80249BFC) - 1]; + window->flags &= ~0x8; + } +} -INCLUDE_ASM(s32, "163400", filemenu_update_hidden_options_right); +void filemenu_update_show_options_right( + s32 windowIdx, + s32* flags, + s32* posX, s32* posY, s32* posZ, + s32* scaleX, s32* scaleY, + s32* rotX, f32* rotY, s32* rotZ, + s32* darkening, + s32* opacity +) { + Window* window = &gWindows[windowIdx]; + s32 updateCounter = window->updateCounter; -INCLUDE_ASM(s32, "163400", filemenu_update_hidden_title); + if (updateCounter == 0) { + window->flags &= ~0x4; + } -INCLUDE_ASM(s32, "163400", filemenu_update_hidden_options_bottom); + if (updateCounter < ARRAY_COUNT(D_80249C1C)) { + *posX += D_80249C1C[updateCounter]; + } else { + *posX += D_80249C1C[ARRAY_COUNT(D_80249C1C) - 1]; + window->flags &= ~0x8; + } +} -INCLUDE_ASM(s32, "163400", filemenu_update_show_with_rotation); +void filemenu_update_show_options_bottom( + s32 windowIdx, + s32* flags, + s32* posX, s32* posY, s32* posZ, + s32* scaleX, s32* scaleY, + s32* rotX, f32* rotY, s32* rotZ, + s32* darkening, + s32* opacity +) { + Window* window = &gWindows[windowIdx]; + s32 updateCounter = window->updateCounter; -INCLUDE_ASM(s32, "163400", filemenu_update_hidden_with_rotation); + if (updateCounter == 0) { + window->flags &= ~0x4; + } + + if (updateCounter < ARRAY_COUNT(D_80249C3C)) { + *posY += D_80249C3C[updateCounter]; + } else { + *posY += D_80249C3C[ARRAY_COUNT(D_80249C3C) - 1]; + window->flags &= ~0x8; + } +} + +void filemenu_update_show_title( + s32 windowIdx, + s32* flags, + s32* posX, s32* posY, s32* posZ, + s32* scaleX, s32* scaleY, + s32* rotX, f32* rotY, s32* rotZ, + s32* darkening, + s32* opacity +) { + Window* window = &gWindows[windowIdx]; + s32 updateCounter = window->updateCounter; + + if (updateCounter == 0) { + window->flags &= ~0x4; + } + + if (updateCounter < ARRAY_COUNT(D_80249C5C)) { + *posY -= D_80249C5C[updateCounter]; + } else { + *posY -= D_80249C5C[ARRAY_COUNT(D_80249C5C) - 1]; + window->flags &= ~0x8; + } +} + +void func_802435C4( + s32 windowIdx, + s32* flags, + s32* posX, s32* posY, s32* posZ, + s32* scaleX, s32* scaleY, + s32* rotX, f32* rotY, s32* rotZ, + s32* darkening, + s32* opacity +) { + Window* window = &gWindows[windowIdx]; + s32 updateCounter = window->updateCounter; + + if (updateCounter < ARRAY_COUNT(D_80249C7C)) { + *posX += D_80249C7C[updateCounter]; + } else { + *posX += D_80249C7C[ARRAY_COUNT(D_80249C7C) - 1]; + window->flags &= ~0x8; + window->flags |= 0x4; + } +} + +void filemenu_update_hidden_name_input( + s32 windowIdx, + s32* flags, + s32* posX, s32* posY, s32* posZ, + s32* scaleX, s32* scaleY, + s32* rotX, f32* rotY, s32* rotZ, + s32* darkening, + s32* opacity +) { + Window* window = &gWindows[windowIdx]; + s32 updateCounter = window->updateCounter; + + if (updateCounter < ARRAY_COUNT(D_80249C90)) { + *posX -= D_80249C90[updateCounter]; + } else { + *posX -= D_80249C90[ARRAY_COUNT(D_80249C90) - 1]; + window->flags &= ~0x8; + window->flags |= 0x4; + } +} + +void filemenu_update_hidden_options_left( + s32 windowIdx, + s32* flags, + s32* posX, s32* posY, s32* posZ, + s32* scaleX, s32* scaleY, + s32* rotX, f32* rotY, s32* rotZ, + s32* darkening, + s32* opacity +) { + Window* window = &gWindows[windowIdx]; + s32 updateCounter = window->updateCounter; + + if (updateCounter < ARRAY_COUNT(D_80249CA4)) { + *posX += D_80249CA4[updateCounter]; + } else { + *posX += D_80249CA4[ARRAY_COUNT(D_80249CA4) - 1]; + window->flags &= ~0x8; + window->flags |= 0x4; + } +} + +void filemenu_update_hidden_options_right( + s32 windowIdx, + s32* flags, + s32* posX, s32* posY, s32* posZ, + s32* scaleX, s32* scaleY, + s32* rotX, f32* rotY, s32* rotZ, + s32* darkening, + s32* opacity +) { + Window* window = &gWindows[windowIdx]; + s32 updateCounter = window->updateCounter; + + if (updateCounter < ARRAY_COUNT(D_80249CB8)) { + *posX -= D_80249CB8[updateCounter]; + } else { + *posX -= D_80249CB8[ARRAY_COUNT(D_80249CB8) - 1]; + window->flags &= ~0x8; + window->flags |= 0x4; + } +} + +void filemenu_update_hidden_title( + s32 windowIdx, + s32* flags, + s32* posX, s32* posY, s32* posZ, + s32* scaleX, s32* scaleY, + s32* rotX, f32* rotY, s32* rotZ, + s32* darkening, + s32* opacity +) { + Window* window = &gWindows[windowIdx]; + s32 updateCounter = window->updateCounter; + + if (updateCounter < ARRAY_COUNT(D_80249CCC)) { + *posY += D_80249CCC[updateCounter]; + } else { + *posY += D_80249CCC[ARRAY_COUNT(D_80249CCC) - 1]; + window->flags &= ~0x8; + window->flags |= 0x4; + } +} + +void filemenu_update_hidden_options_bottom( + s32 windowIdx, + s32* flags, + s32* posX, s32* posY, s32* posZ, + s32* scaleX, s32* scaleY, + s32* rotX, f32* rotY, s32* rotZ, + s32* darkening, + s32* opacity +) { + Window* window = &gWindows[windowIdx]; + s32 updateCounter = window->updateCounter; + + if (updateCounter < ARRAY_COUNT(D_80249CE0)) { + *posY -= D_80249CE0[updateCounter]; + } else { + *posY -= D_80249CE0[ARRAY_COUNT(D_80249CE0) - 1]; + window->flags &= ~0x8; + window->flags |= 0x4; + } +} + +void filemenu_update_show_with_rotation( + s32 windowIdx, + s32* flags, + s32* posX, s32* posY, s32* posZ, + s32* scaleX, s32* scaleY, + s32* rotX, f32* rotY, s32* rotZ, + s32* darkening, + s32* opacity +) { + Window* window = &gWindows[windowIdx]; + s32 updateCounter = window->updateCounter; + + if (updateCounter == 0) { + window->flags &= ~0x4; + } + + if (updateCounter < ARRAY_COUNT(D_80249CF4)) { + *rotY += D_80249CF4[updateCounter]; + *flags = 8 | 1; + } else { + *flags = 0; + window->flags &= ~0x8; + } +} + +void filemenu_update_hidden_with_rotation( + s32 windowIdx, + s32* flags, + s32* posX, s32* posY, s32* posZ, + s32* scaleX, s32* scaleY, + s32* rotX, f32* rotY, s32* rotZ, + s32* darkening, + s32* opacity +) { + Window* window = &gWindows[windowIdx]; + s32 updateCounter = window->updateCounter; + + if (updateCounter < 10) { // TODO: array count? + *rotY += -D_80249D14[updateCounter]; + *flags = 8 | 1; + } else { + *flags = 0; + window->flags &= ~0x8; + window->flags |= 0x4; + } +} INCLUDE_ASM(s32, "163400", filemenu_update_select_file); @@ -49,13 +409,50 @@ INCLUDE_ASM(s32, "163400", filemenu_update_deselect_file); INCLUDE_ASM(s32, "163400", filemenu_update_show_name_confirm); -INCLUDE_ASM(s32, "163400", filemenu_update_hidden_name_confirm); +void filemenu_update_hidden_name_confirm( + s32 windowIdx, + s32* flags, + s32* posX, s32* posY, s32* posZ, + s32* scaleX, s32* scaleY, + s32* rotX, f32* rotY, s32* rotZ, + s32* darkening, + s32* opacity +) { + Window* window = &gWindows[windowIdx]; + s32 updateCounter = window->updateCounter; -INCLUDE_ASM(s32, "163400", filemenu_draw_cursor); + if (updateCounter < ARRAY_COUNT(D_80249D48)) { + gDPPipeSync(gMasterGfxPos++); + gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); + gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, 140 - (updateCounter * 14)); + mainmenu_draw_rect(0, 0, 1280, 960, 0, 0, 0, 0, 0); + *posY -= D_80249D48[updateCounter]; + } else { + window->flags &= ~0x8; + window->flags |= 0x4; + } +} + +void filemenu_draw_cursor(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { + s32 temp_a1; + + filemenu_update_cursor(); + temp_a1 = *D_80249B9C; + if (temp_a1 > 0) { + if (temp_a1 > 255) { + temp_a1 = 255; + } + set_hud_element_alpha(filemenu_cursorHudElemID, temp_a1); + set_hud_element_render_pos(filemenu_cursorHudElemID, baseX + D_80249B94, baseY + D_80249B98); + draw_hud_element_3(filemenu_cursorHudElemID); + } +} INCLUDE_ASM(s32, "163400", filemenu_draw_contents_copy_arrow); -INCLUDE_ASM(void, "163400", filemenu_init, s32 arg0); +INCLUDE_ASM(void, "163400", filemenu_init); INCLUDE_ASM(s32, "163400", filemenu_cleanup); diff --git a/src/165490.c b/src/165490.c index 7f018b64c8..13a209e854 100644 --- a/src/165490.c +++ b/src/165490.c @@ -1,10 +1,37 @@ #include "common.h" +#include "filemenu.h" INCLUDE_ASM(s32, "165490", filemenu_draw_contents_title); -INCLUDE_ASM(s32, "165490", filemenu_draw_contents_stereo); +void filemenu_draw_contents_stereo( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + if (gGameStatusPtr->unk_AB == 1) { + set_hud_element_render_pos(filemenu_hudElemIDs[18], baseX + 34, baseY + 10); + draw_hud_element_3(filemenu_hudElemIDs[18]); + } else { + set_hud_element_render_pos(filemenu_hudElemIDs[19], baseX + 34, baseY + 10); + draw_hud_element_3(filemenu_hudElemIDs[19]); + } +} -INCLUDE_ASM(s32, "165490", filemenu_draw_contents_mono); +void filemenu_draw_contents_mono( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + if (gGameStatusPtr->unk_AB == 0) { + set_hud_element_render_pos(filemenu_hudElemIDs[16], baseX + 34, baseY + 10); + draw_hud_element_3(filemenu_hudElemIDs[16]); + } else { + set_hud_element_render_pos(filemenu_hudElemIDs[17], baseX + 34, baseY + 10); + draw_hud_element_3(filemenu_hudElemIDs[17]); + } +} INCLUDE_ASM(s32, "165490", filemenu_draw_contents_option_left); @@ -16,21 +43,77 @@ INCLUDE_ASM(s32, "165490", filemenu_draw_contents_file_info); INCLUDE_ASM(s32, "165490", filemenu_draw_contents_file_title); -INCLUDE_ASM(s32, "165490", filemenu_draw_contents_file_0_info); +void filemenu_draw_contents_file_0_info( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + filemenu_draw_contents_file_info(0, menu, baseX, baseY, width, height, opacity, darkening); +} -INCLUDE_ASM(s32, "165490", filemenu_draw_contents_file_1_info); +void filemenu_draw_contents_file_1_info( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + filemenu_draw_contents_file_info(1, menu, baseX, baseY, width, height, opacity, darkening); +} -INCLUDE_ASM(s32, "165490", filemenu_draw_contents_file_2_info); +void filemenu_draw_contents_file_2_info( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + filemenu_draw_contents_file_info(2, menu, baseX, baseY, width, height, opacity, darkening); +} -INCLUDE_ASM(s32, "165490", filemenu_draw_contents_file_3_info); +void filemenu_draw_contents_file_3_info( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + filemenu_draw_contents_file_info(3, menu, baseX, baseY, width, height, opacity, darkening); +} -INCLUDE_ASM(s32, "165490", filemenu_draw_contents_file_0_title); +void filemenu_draw_contents_file_0_title( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + filemenu_draw_contents_file_title(0, menu, baseX, baseY, width, height, opacity, darkening); +} -INCLUDE_ASM(s32, "165490", filemenu_draw_contents_file_1_title); +void filemenu_draw_contents_file_1_title( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + filemenu_draw_contents_file_title(1, menu, baseX, baseY, width, height, opacity, darkening); +} -INCLUDE_ASM(s32, "165490", filemenu_draw_contents_file_2_title); +void filemenu_draw_contents_file_2_title( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + filemenu_draw_contents_file_title(2, menu, baseX, baseY, width, height, opacity, darkening); +} -INCLUDE_ASM(s32, "165490", filemenu_draw_contents_file_3_title); +void filemenu_draw_contents_file_3_title( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + filemenu_draw_contents_file_title(3, menu, baseX, baseY, width, height, opacity, darkening); +} INCLUDE_ASM(s32, "165490", filemenu_main_init); @@ -38,4 +121,10 @@ INCLUDE_ASM(s32, "165490", filemenu_main_handle_input); INCLUDE_ASM(s32, "165490", filemenu_main_update); -INCLUDE_ASM(s32, "165490", filemenu_main_cleanup); +void filemenu_main_cleanup(void) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(filemenu_hudElemIDs); i++) { + free_hud_element(filemenu_hudElemIDs[i]); + } +} diff --git a/src/167570.c b/src/167570.c index 617488c349..5cd9ea0097 100644 --- a/src/167570.c +++ b/src/167570.c @@ -1,4 +1,5 @@ #include "common.h" +#include "filemenu.h" INCLUDE_ASM(s32, "167570", filemenu_yesno_draw_options_contents); diff --git a/src/168590.c b/src/168590.c index 1a174bf785..cde32ce473 100644 --- a/src/168590.c +++ b/src/168590.c @@ -1,10 +1,98 @@ #include "common.h" +#include "filemenu.h" -INCLUDE_ASM(s32, "168590", filemenu_info_draw_message_contents); +extern MenuWindowBP D_8024A134[1]; -INCLUDE_ASM(s32, "168590", filemenu_info_init); +extern s32 filemenu_iterFileIdx; +extern s32 filemenu_pressedButtons; +extern s8 D_8024C090; +extern s32 filemenu_loadedFileIdx; +extern s8 D_8024C098_C09918; +extern s32 D_8024C100_C09980[3]; +extern s32 D_8024C110; -INCLUDE_ASM(s32, "168590", filemenu_info_handle_input); +s32 filemenu_get_menu_message(s32 index); +void filemenu_update_show_options_left(s32 windowIndex, s32* flags, s32* posX, s32* posY, s32* posZ, s32* scaleX, + s32* scaleY, s32* rotX, s32* rotY, s32* rotZ, s32* darkening, s32* opacity); +void filemenu_update_show_options_right(s32 windowIndex, s32* flags, s32* posX, s32* posY, s32* posZ, s32* scaleX, + s32* scaleY, s32* rotX, s32* rotY, s32* rotZ, s32* darkening, s32* opacity); +void filemenu_update_show_options_bottom(s32 windowIndex, s32* flags, s32* posX, s32* posY, s32* posZ, s32* scaleX, + s32* scaleY, s32* rotX, s32* rotY, s32* rotZ, s32* darkening, s32* opacity); + +void filemenu_info_draw_message_contents(MenuPanel* menu, s32 baseX, s32 baseY) { + s8 page = menu->page; + + switch (page) { + case 0: + filemenu_draw_message(filemenu_get_menu_message(0x1A), baseX + 10, baseY + 4, 255, 0, 0); + draw_number(filemenu_menus[0]->selected + 1, baseX + 48, baseY + 6, 0, 0, 255, 3); + filemenu_draw_message(filemenu_get_menu_message(0x1B), baseX + 49, baseY + 4, 255, 0, 0); + break; + case 2: + filemenu_draw_message(filemenu_get_menu_message(0x1D), baseX + 10, baseY + 4, 255, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(0x1A), baseX + 84, baseY + 4, 255, 0, 0); + draw_number(filemenu_loadedFileIdx + 1, baseX + 122, baseY + 6, 0, 0, 255, 3); + filemenu_draw_message(filemenu_get_menu_message(0x1E), baseX + 10, baseY + 18, 255, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(0x1A), baseX + 30, baseY + 18, 255, 0, 0); + draw_number(filemenu_iterFileIdx + 1, baseX + 68, baseY + 20, 0, 0, 255, 3); + filemenu_draw_message(filemenu_get_menu_message(0x22), baseX + 65, baseY + 18, 255, 0, 0); + break; + case 1: + filemenu_draw_message(filemenu_get_menu_message(0x1C), baseX + 10, baseY + 4, 255, 0, 0); + break; + case 3: + filemenu_draw_message(filemenu_get_menu_message(0x1A), baseX + 10, baseY + 4, 255, 0, 0); + draw_number(filemenu_menus[0]->selected + 1, baseX + 48, baseY + 6, 0, 0, 255, page); + filemenu_draw_message(filemenu_get_menu_message(0x1F), baseX + 49, baseY + 4, 255, 0, 0); + break; + } + filemenu_set_cursor_alpha(0); +} + +void filemenu_info_init(s8* tab) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(D_8024A134); i++) { + D_8024A134[i].tab = tab; + } + + setup_pause_menu_tab(D_8024A134, 1); + *tab = 1; +} + +void filemenu_info_handle_input(void) { + if (filemenu_pressedButtons & (BUTTON_A | BUTTON_B)) { + MenuPanel* menu = filemenu_menus[0]; + s32 page; + + D_8024C098_C09918 = 0; + page = menu->page; + + switch(page) { + case 1: + menu->page = 0; + set_window_update(0x33, filemenu_update_show_options_left); + set_window_update(0x34, filemenu_update_show_options_right); + set_window_update(0x35, filemenu_update_show_options_bottom); + set_window_update(0x37, filemenu_update_show_options_bottom); + filemenu_set_selected(menu, 0, 2); + break; + case 4: + menu->page = 0; + set_window_update(0x33, filemenu_update_show_options_left); + set_window_update(0x34, filemenu_update_show_options_right); + set_window_update(0x35, filemenu_update_show_options_bottom); + set_window_update(0x37, filemenu_update_show_options_bottom); + filemenu_set_selected(menu, 1, 2); + break; + case 2: + menu->page = page; + filemenu_set_selected(menu, 1, 2); + break; + } + set_window_update(0x2F, 2); + } +} void filemenu_info_update(void) { } @@ -21,7 +109,36 @@ void func_80248170(s32 idx) { } } -INCLUDE_ASM(s32, "168590", filemenu_draw_contents_file_create_header); +void filemenu_draw_contents_file_create_header(MenuPanel* menu, s32 baseX, s32 baseY) { + s32 xOffset; + s32 yOffset; + s32 i; + s32 tempAmt; + + filemenu_draw_message(filemenu_get_menu_message(0x20), baseX + 10, baseY + 6, 255, 0, 0); + filemenu_draw_file_name(&D_8024C110, 8, baseX + 36, baseY + 22, 255, 0, 0, 0xB); + xOffset = 41; + + for (i = 0; i < 8; i++) { + set_hud_element_render_pos(D_8024C100_C09980[1], baseX + 42 + (i * 11), baseY + xOffset); + if (i == 0) { + draw_hud_element_3(D_8024C100_C09980[1]); + } else { + draw_hud_element_2(D_8024C100_C09980[1]); + } + } + + tempAmt = 8; + if (D_8024C098_C09918 == 3) { + s32 phi_v0 = 122; + + if (D_8024C090 != tempAmt) { + phi_v0 = (D_8024C090 * 0xB) + 45; + } + set_hud_element_render_pos(D_8024C100_C09980[0], baseX + phi_v0, baseY + 45); + draw_hud_element_2(D_8024C100_C09980[0]); + } +} INCLUDE_ASM(s32, "168590", filemenu_draw_contents_choose_name); @@ -32,4 +149,10 @@ INCLUDE_ASM(s32, "168590", filemenu_choose_name_handle_input); void filemenu_choose_name_update(void) { } -INCLUDE_ASM(s32, "168590", filemenu_choose_name_cleanup); +void filemenu_choose_name_cleanup(void) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(D_8024C100_C09980); i++) { + free_hud_element(D_8024C100_C09980[i]); + } +} diff --git a/src/43F0.c b/src/43F0.c index 305cccfccc..ea0cad5368 100644 --- a/src/43F0.c +++ b/src/43F0.c @@ -179,6 +179,7 @@ void copy_matrix(Matrix4f src, Matrix4f dest) { bcopy(src, dest, sizeof(Matrix4f)); } +// maybe u32 s32 dma_copy(Addr romStart, Addr romEnd, void* vramDest) { u32 length = romEnd - romStart; s32 i; diff --git a/src/8800.c b/src/8800.c index 483aae06e7..3f5a6ba12c 100644 --- a/src/8800.c +++ b/src/8800.c @@ -19,7 +19,7 @@ void update_cameras(void) { gCurrentCamID = i; - switch (cam->mode) { + switch (cam->updateMode) { case 3: update_camera_zone_interp(cam); break; @@ -70,9 +70,9 @@ void update_cameras(void) { } get_screen_coords(0, cam->targetPos.x, cam->targetPos.y, cam->targetPos.z, &sx, &sy, &sz); - cam->targetScreenCoords[0] = sx; - cam->targetScreenCoords[1] = sy; - cam->targetScreenCoords[2] = sz; + cam->targetScreenCoords.x = sx; + cam->targetScreenCoords.y = sy; + cam->targetScreenCoords.z = sz; } } @@ -111,7 +111,7 @@ void render_frame(s32 flag) { s32 lrx; s32 lry; - gSPViewport(gMasterGfxPos++, &camera->viewport); + gSPViewport(gMasterGfxPos++, &camera->vp); gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); gSPTexture(gMasterGfxPos++, 0, 0, 0, G_TX_RENDERTILE, G_OFF); @@ -178,8 +178,8 @@ void render_frame(s32 flag) { camera->unkMatrix = &gDisplayContext->matrixStack[gMatrixListPos]; matrixListPos = gMatrixListPos++; guRotate(&gDisplayContext->matrixStack[matrixListPos], -camera->trueRotation.x, 0.0f, 1.0f, 0.0f); - camera->vpAlt.vp.vtrans[0] = camera->viewport.vp.vtrans[0] + gGameStatusPtr->unk_82; - camera->vpAlt.vp.vtrans[1] = camera->viewport.vp.vtrans[1] + gGameStatusPtr->unk_83; + camera->vpAlt.vp.vtrans[0] = camera->vp.vp.vtrans[0] + gGameStatusPtr->unk_82; + camera->vpAlt.vp.vtrans[1] = camera->vp.vp.vtrans[1] + gGameStatusPtr->unk_83; if (!(camera->flags & CAM_FLAG_ORTHO)) { if (gCurrentCamID != CAM_CAM3) { @@ -359,7 +359,7 @@ Camera* initialize_next_camera(CameraInitData* initData) { camera->trueRotation.x = 0.0f; camera->trueRotation.y = 0.0f; camera->trueRotation.z = 0.0f; - camera->mode = initData->type; + camera->updateMode = initData->type; camera->unk_06 = 1; camera->nearClip = initData->nearClip; camera->farClip = initData->farClip; @@ -392,7 +392,7 @@ Camera* initialize_next_camera(CameraInitData* initData) { camera->unk_52C = 0; camera->aabbForZoneBelow = 0; camera->unk_506 = 0; - camera->boolTargetPlayer = 0; + camera->followPlayer = 0; camera->unk_C4 = 1000.0f; camera->unk_520 = 0.2f; camera->moveSpeed = 1.0f; @@ -409,15 +409,15 @@ void set_cam_viewport(s16 id, s16 x, s16 y, s16 width, s16 height) { camera->viewportStartX = x; camera->viewportStartY = y; - camera->viewport.vp.vscale[0] = 2.0f * camera->viewportW; - camera->viewport.vp.vscale[1] = 2.0f * camera->viewportH; - camera->viewport.vp.vscale[2] = 0x1FF; - camera->viewport.vp.vscale[3] = 0; + camera->vp.vp.vscale[0] = 2.0f * camera->viewportW; + camera->vp.vp.vscale[1] = 2.0f * camera->viewportH; + camera->vp.vp.vscale[2] = 0x1FF; + camera->vp.vp.vscale[3] = 0; - camera->viewport.vp.vtrans[0] = (((camera->viewportStartX + (camera->viewportW / 2)) << 16) >> 14); - camera->viewport.vp.vtrans[1] = (((camera->viewportStartY + (camera->viewportH / 2)) << 16) >> 14); - camera->viewport.vp.vtrans[2] = 0x1FF; - camera->viewport.vp.vtrans[3] = 0; + camera->vp.vp.vtrans[0] = (((camera->viewportStartX + (camera->viewportW / 2)) << 16) >> 14); + camera->vp.vp.vtrans[1] = (((camera->viewportStartY + (camera->viewportH / 2)) << 16) >> 14); + camera->vp.vp.vtrans[2] = 0x1FF; + camera->vp.vp.vtrans[3] = 0; camera->vpAlt.vp.vscale[0] = 2.0f * camera->viewportW; camera->vpAlt.vp.vscale[1] = 2.0f * camera->viewportH; diff --git a/src/B0E0.c b/src/B0E0.c index 9ee32de145..d3b5a21c7a 100644 --- a/src/B0E0.c +++ b/src/B0E0.c @@ -1,7 +1,12 @@ #include "common.h" +extern CamPosSettings blendedCamSettings; +extern f32 D_800A08DC; +extern f32 D_800A08E0; + void func_80030210(Camera* camera, f32 arg1, f32 arg2, s32 arg3); + void update_camera_mode_unused(Camera* camera); // Issues with zero float temp? #ifdef NON_MATCHING @@ -176,22 +181,370 @@ void func_8003034C(Camera* camera) { } } -void func_80030450(void) { +void func_80030450(Camera* camera) { } -s32 test_ray_zone_aabb(f32 x, f32 y, f32 z) { +CameraControlSettings* test_ray_zone_aabb(f32 x, f32 y, f32 z) { f32 hitX, hitY, hitZ; f32 hitDepth = 32767.0f; f32 nx, ny, nz; s32 zoneID = test_ray_zones(x, y, z, 0.0f, -1.0f, 0.0f, &hitX, &hitY, &hitZ, &hitDepth, &nx, &ny, &nz); if (zoneID < 0) { - return 0; + return NULL; } return D_800D91D4[zoneID].unk_10; } +void update_camera_from_controller(Camera*, CamPosSettings*, CameraControlSettings**, CamPosSettings*, CameraControlSettings**, f32, f32, f32, f32, f32, f32, s32, f32*, s32); // extern INCLUDE_ASM(s32, "B0E0", update_camera_from_controller); +void update_camera_zone_interp(Camera* camera); +// Mostly issues with the switch +#ifdef NON_MATCHING +void update_camera_zone_interp(Camera* camera) { + CameraControlSettings* cs; + f32 targetX; + f32 targetY; + f32 targetZ; + f32 deltaX; + f32 deltaY; + f32 deltaZ; + f32 boomYawDiff; + f32 settingDiff; + f32 deltaSqSum; + f32 panPhase; + f32 temp_f20_2; + f32 temp_f22; + f32 temp_f22_3; + f32 temp_f22_4; + f32 cosNegViewPitch; + f32 sinNegViewPitch; + f32 temp_f24; + f32 temp_f24_2; + f32 temp_f26; + f32 temp_f4_4; + f32 interpAlpha; + f32 interpAlphaInv; + f32 temp_f8_2; + f64 temp_f22_2; + s32 cond2; + f32 posX; + f32 posY; + f32 posZ; + f32 tX; + f32 tY; + f32 tZ; + s32 changingZone; + f32 dist; + + targetX = camera->targetPos.x; + targetY = camera->targetPos.y; + targetZ = camera->targetPos.z; + changingZone = FALSE; + + if (camera->changingMap) { + camera->currentController = NULL; + camera->prevController = NULL; + camera->linearInterp = 0.0f; + camera->unk_494 = 0.0f; + camera->savedTargetY = targetY; + camera->unk_98 = 0; + camera->unk_9C = 0; + camera->unk_4A4 = 0.0f; + camera->unk_4A8 = 0.0f; + camera->unk_4AC = 0.0f; + camera->prevPrevFollowFlags = 0; + camera->prevFollowFlags = 0; + camera->panPhase = 0.0f; + D_800A08DC = 0.0f; + D_800A08E0 = 0.0f; + camera->interpAlpha = 1.0f; + camera->unk_498 = 1.0f; + camera->linearInterpScale = 1.0f; + } + + if (camera->moveFlags & 1) { + camera->unk_498 = 0.0f; + } else if (camera->unk_494 != targetY) { + camera->unk_494 = targetY; + camera->unk_498 = 0.0f; + } + + if (targetY < camera->unk_494 && targetY <= camera->savedTargetY) { + camera->unk_494 = targetY; + camera->unk_498 = 1.0f; + } + + camera->unk_498 += (1.01 - camera->unk_498) / camera->unk_49C; + + if (camera->unk_498 > 1.0) { + camera->unk_498 = 1.0f; + } + + if (camera->moveFlags & 4) { + camera->unk_498 += 0.3; + if (camera->unk_498 >= 1.0) { + camera->unk_498 = 1.0f; + } + } + + if (!(camera->moveFlags & 2)) { + camera->savedTargetY += (camera->unk_494 - camera->savedTargetY) * camera->unk_498; + } + + if (camera->unk_506 != 0 || camera->unk_4A4 != targetX || camera->unk_4A8 != targetY || + camera->unk_4AC != targetZ || camera->changingMap) { + + if (camera->followPlayer) { + cs = &camera->controlSettings; + } else { + cs = test_ray_zone_aabb(targetX, targetY + 10.0f, targetZ); + } + + cond2 = FALSE; + + if (cs != NULL && camera->currentController != NULL && cs->type == camera->currentController->type && + cs->flag == camera->currentController->flag && cs->boomLength == camera->currentController->boomLength && + cs->boomPitch == camera->currentController->boomPitch && + cs->viewPitch == camera->currentController->viewPitch) { + + switch (cs->type) { + case 0: + if (cs->posA.x == camera->currentController->posA.x && + cs->posA.z == camera->currentController->posA.z && + cs->posB.x == camera->currentController->posB.x && + cs->posB.z == camera->currentController->posB.z) { + + cond2 = TRUE; + } + break; + case 1: + if (!cs->flag) { + if (cs->posA.x == camera->currentController->posA.x && + cs->posA.z == camera->currentController->posA.z) { + + cond2 = TRUE; + } + } else { + if (cs->posA.x == camera->currentController->posA.x && + cs->posA.z == camera->currentController->posA.z && + cs->posB.x == camera->currentController->posB.x && + cs->posB.z == camera->currentController->posB.z) { + + cond2 = TRUE; + } + } + break; + default: + if (cs->posA.x == camera->currentController->posA.x && + cs->posA.z == camera->currentController->posA.z && + cs->posA.y == camera->currentController->posA.y && + cs->posB.y == camera->currentController->posB.y && + cs->posB.x == camera->currentController->posB.x && + cs->posB.z == camera->currentController->posB.z) { + + cond2 = TRUE; + } + break; + } + } + + if (camera->unk_506 != 0 || (!cond2 && cs != camera->currentController)) { + if (camera->interpAlpha == 1.0f) { + camera->prevController = camera->currentController; + } else { + camera->prevController = (CameraControlSettings*)-1; + } + + camera->oldCameraSettings = blendedCamSettings; + changingZone = TRUE; + camera->currentController = cs; + camera->interpAlpha = 0.0f; + camera->linearInterp = 0.0f; + camera->unk_506 = 0; + camera->linearInterpScale = camera->moveSpeed; + camera->prevPrevFollowFlags = camera->prevFollowFlags; + camera->prevFollowFlags = camera->followPlayer; + camera->prevPrevMovePos.x = camera->prevMovePos.x; + camera->prevPrevMovePos.y = camera->prevMovePos.y; + camera->prevPrevMovePos.z = camera->prevMovePos.z; + camera->prevMovePos.x = camera->movePos.x; + camera->prevMovePos.y = camera->movePos.y; + camera->prevMovePos.z = camera->movePos.z; + } + } + + posX = targetX; + if (camera->prevPrevFollowFlags) { + posX = camera->prevPrevMovePos.x; + posY = camera->prevPrevMovePos.y; + posZ = camera->prevPrevMovePos.z; + } else { + posY = camera->savedTargetY; + posZ = targetZ; + } + + tX = targetX; + if (camera->prevFollowFlags) { + camera->savedTargetY = camera->prevMovePos.y; + tX = camera->prevMovePos.x; + tY = camera->savedTargetY; + tZ = camera->prevMovePos.z; + } else { + tY = camera->savedTargetY; + tZ = targetZ; + } + + update_camera_from_controller(camera, &camera->oldCameraSettings, &camera->prevController, + &camera->newCameraSettings, &camera->currentController, posX, posY, posZ, tX, tY, tZ, + camera->changingMap, &camera->interpAlpha, changingZone); + + if (camera->changingMap) { + camera->oldCameraSettings = camera->newCameraSettings; + camera->changingMap = FALSE; + camera->interpAlpha = 1.0f; + } + + if (camera->oldCameraSettings.boomYaw - camera->newCameraSettings.boomYaw > 180.0f) { + camera->oldCameraSettings.boomYaw -= 360.0f; + } + if (camera->oldCameraSettings.boomYaw - camera->newCameraSettings.boomYaw < -180.0f) { + camera->oldCameraSettings.boomYaw += 360.0f; + } + + boomYawDiff = camera->oldCameraSettings.boomYaw - camera->newCameraSettings.boomYaw; + if (boomYawDiff < 0.0f) { + boomYawDiff = -boomYawDiff; + } + if (boomYawDiff > 180.0f) { + boomYawDiff = 360.0f - boomYawDiff; + } + + settingDiff = camera->oldCameraSettings.boomPitch - camera->newCameraSettings.boomPitch; + if (settingDiff < 0.0f) { + settingDiff = -settingDiff; + } + if (settingDiff > 180.0f) { + settingDiff = 360.0f - settingDiff; + } + if (boomYawDiff < settingDiff) { + boomYawDiff = settingDiff; + } + + settingDiff = camera->oldCameraSettings.viewPitch - camera->newCameraSettings.viewPitch; + if (settingDiff < 0.0f) { + settingDiff = -settingDiff; + } + if (settingDiff > 180.0f) { + settingDiff = 360.0f - settingDiff; + } + if (boomYawDiff < settingDiff) { + boomYawDiff = settingDiff; + } + + settingDiff = camera->oldCameraSettings.boomLength - camera->newCameraSettings.boomLength; + if (settingDiff < 0.0f) { + settingDiff = -settingDiff; + } + if (boomYawDiff < settingDiff) { + boomYawDiff = settingDiff; + } + + deltaX = camera->oldCameraSettings.position.x - camera->newCameraSettings.position.x; + deltaY = camera->oldCameraSettings.position.y - camera->newCameraSettings.position.y; + deltaZ = camera->oldCameraSettings.position.z - camera->newCameraSettings.position.z; + deltaSqSum = SQ(deltaX) + SQ(deltaY) + SQ(deltaZ); + + if (deltaSqSum != 0.0f) { + deltaSqSum = sqrtf(deltaSqSum) * 0.2; + } + + if (boomYawDiff < deltaSqSum) { + boomYawDiff = deltaSqSum; + } + if (boomYawDiff > 90.0f) { + boomYawDiff = 90.0f; + } + if (boomYawDiff < 20.0f) { + boomYawDiff = 20.0f; + } + + if (boomYawDiff != 0.0f) { + camera->linearInterp += (1.0f / boomYawDiff) * camera->linearInterpScale; + if (camera->linearInterp > 1.0f) { + camera->linearInterp = 1.0f; + } + } + + if (camera->interpAlpha < 1.0) { + panPhase = camera->panPhase; + temp_f22 = panPhase * PI_D; + temp_f24 = 2.0f / (cos_rad(temp_f22) + 1.0f); + temp_f22_2 = cos_rad((camera->linearInterp * PI_D * (1.0f - panPhase)) + temp_f22); + camera->interpAlpha = (2.0f - ((f32) ((temp_f22_2 + ((1.0 - cos_rad(temp_f22)) * 0.5)) * temp_f24) + 1.0f)) * 0.5001; + } + + if (camera->interpAlpha >= 1.0f) { + camera->interpAlpha = 1.0f; + camera->linearInterp = 0.0f; + } + + interpAlpha = camera->interpAlpha; + interpAlphaInv = 1.0f - interpAlpha; + camera->unk_4A4 = targetX; + camera->unk_4A8 = targetY; + camera->unk_4AC = targetZ; + blendedCamSettings.boomYaw = (camera->oldCameraSettings.boomYaw * interpAlphaInv) + (camera->newCameraSettings.boomYaw * interpAlpha); + blendedCamSettings.boomLength = (camera->oldCameraSettings.boomLength * interpAlphaInv) + (camera->newCameraSettings.boomLength * interpAlpha); + blendedCamSettings.boomPitch = (camera->oldCameraSettings.boomPitch * interpAlphaInv) + (camera->newCameraSettings.boomPitch * interpAlpha); + blendedCamSettings.viewPitch = (camera->oldCameraSettings.viewPitch * interpAlphaInv) + (camera->newCameraSettings.viewPitch * interpAlpha); + blendedCamSettings.position.x = (camera->oldCameraSettings.position.x * interpAlphaInv) + (camera->newCameraSettings.position.x * interpAlpha); + blendedCamSettings.position.y = (camera->oldCameraSettings.position.y * interpAlphaInv) + (camera->newCameraSettings.position.y * interpAlpha); + blendedCamSettings.position.z = (camera->oldCameraSettings.position.z * interpAlphaInv) + (camera->newCameraSettings.position.z * interpAlpha); + blendedCamSettings.boomLength *= camera->zoomPercent; + blendedCamSettings.boomLength *= 0.01; + + func_80030450(camera); + temp_f20_2 = blendedCamSettings.boomYaw + D_800A08E0; + temp_f26 = sin_deg(temp_f20_2); + temp_f24_2 = -cos_deg(temp_f20_2); + temp_f22_3 = cos_deg(blendedCamSettings.boomPitch + D_800A08DC); + temp_f22_4 = sin_deg(blendedCamSettings.boomPitch + D_800A08DC); + + if (!(camera->moveFlags & 2)) { + camera->lookAt_eye.y = blendedCamSettings.position.y + (blendedCamSettings.boomLength * temp_f22_4); + } + + camera->lookAt_eye.x = blendedCamSettings.position.x - (temp_f26 * blendedCamSettings.boomLength * temp_f22_3); + camera->lookAt_eye.z = blendedCamSettings.position.z - (temp_f24_2 * blendedCamSettings.boomLength * temp_f22_3); + cosNegViewPitch = cos_deg(-blendedCamSettings.viewPitch); + sinNegViewPitch = sin_deg(-blendedCamSettings.viewPitch); + + if (camera->lookAt_eye.x == blendedCamSettings.position.x && camera->lookAt_eye.z == blendedCamSettings.position.z) { + dist = 0.0f; + } else { + dist = dist2D(camera->lookAt_eye.x, camera->lookAt_eye.z, blendedCamSettings.position.x, blendedCamSettings.position.z); + } + + temp_f8_2 = blendedCamSettings.position.y - camera->lookAt_eye.y; + if (!(camera->moveFlags & 2)) { + camera->lookAt_obj.y = camera->lookAt_eye.y + ((dist * sinNegViewPitch) + (temp_f8_2 * cosNegViewPitch)); + } + temp_f4_4 = (dist * cosNegViewPitch) - (temp_f8_2 * sinNegViewPitch); + camera->lookAt_obj.x = camera->lookAt_eye.x + (temp_f26 * temp_f4_4); + camera->lookAt_obj.z = camera->lookAt_eye.z + (temp_f24_2 * temp_f4_4); + camera->currentYaw = blendedCamSettings.boomYaw + D_800A08E0; + camera->trueRotation.x = camera->currentYaw; + camera->currentBoomLength = blendedCamSettings.boomLength; + camera->currentBlendedYawNegated = -blendedCamSettings.boomYaw; + camera->currentPitch = -blendedCamSettings.boomPitch - blendedCamSettings.viewPitch; + camera->unk_54 = camera->lookAt_obj.x; + camera->unk_58 = camera->lookAt_obj.y; + camera->unk_5C = camera->lookAt_obj.z; + camera->currentYOffset = 0.0f; +} +#else INCLUDE_ASM(s32, "B0E0", update_camera_zone_interp); +#endif diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index 5d5a87a6f9..ed112fd065 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -1,6 +1,16 @@ #include "common.h" +#include "model.h" #include "ld_addrs.h" +typedef struct GameMode { + /* 0x00 */ u16 flags; + /* 0x04 */ void (*init)(void); + /* 0x08 */ void (*step)(void); + /* 0x0C */ UNK_FUN_PTR(unk_0C); + /* 0x10 */ void (*render)(void); + /* 0x14 */ void (*renderAux)(void); ///< @see state_render_frontUI +} GameMode; // size = 0x18 + typedef struct Fog { /* 0x00 */ s32 enabled; /* 0x04 */ s32 r; @@ -11,85 +21,76 @@ typedef struct Fog { /* 0x18 */ s32 endDistance; } Fog; // size = 0x1C -typedef struct GameMode { - /* 0x00 */ u16 flags; - /* 0x04 */ void (*init)(void); - /* 0x08 */ void (*step)(struct GameMode*); - /* 0x0C */ UNK_FUN_PTR(unk_0C); - /* 0x10 */ void (*render)(void); - /* 0x14 */ void (*renderAux)(void); ///< @see state_render_frontUI -} GameMode; // size = 0x18 - -extern s32 D_8014B7F8[]; -extern s32 D_8014B820[]; -extern s32 D_8014B848[]; -extern s32 D_8014B870[]; -extern s32 D_8014B898[]; -extern s32 D_8014B8C0[]; -extern s32 D_8014B8E8[]; -extern s32 D_8014B910[]; -extern s32 D_8014B938[]; -extern s32 D_8014B960[]; -extern s32 D_8014B988[]; -extern s32 D_8014B9B0[]; -extern s32 D_8014B9D8[]; -extern s32 D_8014BA00[]; -extern s32 D_8014BA20[]; -extern s32 D_8014BA48[]; -extern s32 D_8014BA70[]; -extern s32 D_8014BA98[]; -extern s32 D_8014BAC0[]; -extern s32 D_8014BAE8[]; -extern s32 D_8014BB10[]; -extern s32 D_8014BB38[]; -extern s32 D_8014BB60[]; -extern s32 D_8014BB88[]; -extern s32 D_8014BBB0[]; -extern s32 D_8014BBD8[]; -extern s32 D_8014BC00[]; -extern s32 D_8014BC28[]; -extern s32 D_8014BC50[]; -extern s32 D_8014BC78[]; -extern s32 D_8014BCA0[]; -extern s32 D_8014BCC8[]; -extern s32 D_8014BCF8[]; -extern s32 D_8014BD18[]; -extern s32 D_8014BD40[]; -extern s32 D_8014BD68[]; -extern s32 D_8014BD88[]; -extern s32 D_8014BDB0[]; -extern s32 D_8014BDD8[]; -extern s32 D_8014BE00[]; -extern s32 D_8014BE28[]; -extern s32 D_8014BE50[]; -extern s32 D_8014BE78[]; -extern s32 D_8014BEA0[]; -extern s32 D_8014BEC8[]; -extern s32 D_8014BEF0[]; -extern s32 D_8014BF18[]; -extern s32 D_8014BF40[]; -extern s32 D_8014BF68[]; -extern s32 D_8014BF90[]; -extern s32 D_8014BFB8[]; -extern s32 D_8014BFE0[]; -extern s32 D_8014C008[]; -extern s32 D_8014C028[]; -extern s32 D_8014C050[]; -extern s32 D_8014C078[]; -extern s32 D_8014C098[]; -extern s32 D_8014C0C0[]; -extern s32 D_8014C0E8[]; -extern s32 D_8014C110[]; -extern s32 D_8014C138[]; -extern s32 D_8014C160[]; +extern Gfx D_8014B7F8[]; +extern Gfx D_8014B820[]; +extern Gfx D_8014B848[]; +extern Gfx D_8014B870[]; +extern Gfx D_8014B898[]; +extern Gfx D_8014B8C0[]; +extern Gfx D_8014B8E8[]; +extern Gfx D_8014B910[]; +extern Gfx D_8014B938[]; +extern Gfx D_8014B960[]; +extern Gfx D_8014B988[]; +extern Gfx D_8014B9B0[]; +extern Gfx D_8014B9D8[]; +extern Gfx D_8014BA00[]; +extern Gfx D_8014BA20[]; +extern Gfx D_8014BA48[]; +extern Gfx D_8014BA70[]; +extern Gfx D_8014BA98[]; +extern Gfx D_8014BAC0[]; +extern Gfx D_8014BAE8[]; +extern Gfx D_8014BB10[]; +extern Gfx D_8014BB38[]; +extern Gfx D_8014BB60[]; +extern Gfx D_8014BB88[]; +extern Gfx D_8014BBB0[]; +extern Gfx D_8014BBD8[]; +extern Gfx D_8014BC00[]; +extern Gfx D_8014BC28[]; +extern Gfx D_8014BC50[]; +extern Gfx D_8014BC78[]; +extern Gfx D_8014BCA0[]; +extern Gfx D_8014BCC8[]; +extern Gfx D_8014BCF8[]; +extern Gfx D_8014BD18[]; +extern Gfx D_8014BD40[]; +extern Gfx D_8014BD68[]; +extern Gfx D_8014BD88[]; +extern Gfx D_8014BDB0[]; +extern Gfx D_8014BDD8[]; +extern Gfx D_8014BE00[]; +extern Gfx D_8014BE28[]; +extern Gfx D_8014BE50[]; +extern Gfx D_8014BE78[]; +extern Gfx D_8014BEA0[]; +extern Gfx D_8014BEC8[]; +extern Gfx D_8014BEF0[]; +extern Gfx D_8014BF18[]; +extern Gfx D_8014BF40[]; +extern Gfx D_8014BF68[]; +extern Gfx D_8014BF90[]; +extern Gfx D_8014BFB8[]; +extern Gfx D_8014BFE0[]; +extern Gfx D_8014C008[]; +extern Gfx D_8014C028[]; +extern Gfx D_8014C050[]; +extern Gfx D_8014C078[]; +extern Gfx D_8014C098[]; +extern Gfx D_8014C0C0[]; +extern Gfx D_8014C0E8[]; +extern Gfx D_8014C110[]; +extern Gfx D_8014C138[]; +extern Gfx D_8014C160[]; s32 D_8014AFB0 = 0xFF; s32 D_8014AFB4[] = {0, 0, 0}; -s32* D_8014AFC0[] = { D_8014B7F8, D_8014B910, D_8014B820, D_8014B938, D_8014B848, D_8014B960, D_8014B870, D_8014B988, D_8014B898, D_8014BA20, D_8014B9B0, D_8014BAC0, D_8014B8C0, D_8014B9D8, D_8014B8E8, D_8014BA00 }; +Gfx* D_8014AFC0[] = { D_8014B7F8, D_8014B910, D_8014B820, D_8014B938, D_8014B848, D_8014B960, D_8014B870, D_8014B988, D_8014B898, D_8014BA20, D_8014B9B0, D_8014BAC0, D_8014B8C0, D_8014B9D8, D_8014B8E8, D_8014BA00 }; -s32* D_8014B000[] = { D_8014BB60, D_8014BC78, D_8014BB88, D_8014BCA0, D_8014BBB0, D_8014BCC8, D_8014BBD8, D_8014BCF8, D_8014BC00, D_8014BD88, D_8014BD18, D_8014BC28, D_8014BD40, D_8014BC50, D_8014BD68, D_8014BE78, D_8014BF90, D_8014BEA0, D_8014BFB8, D_8014BEC8, D_8014BFE0, D_8014BEF0, D_8014C008, D_8014BF18, D_8014C098, D_8014C028, D_8014BF40, D_8014C050, D_8014BF68, D_8014C078, D_8014BA48, D_8014BA70, D_8014BA98, D_8014BDB0, D_8014BDD8, D_8014BE00, D_8014C0C0, D_8014C0E8, D_8014C110, D_8014BB10, D_8014BB38, D_8014BE28, D_8014BE50, D_8014C138, D_8014C160, NULL }; +Gfx* D_8014B000[] = { D_8014BB60, D_8014BC78, D_8014BB88, D_8014BCA0, D_8014BBB0, D_8014BCC8, D_8014BBD8, D_8014BCF8, D_8014BC00, D_8014BD88, D_8014BD18, D_8014BC28, D_8014BD40, D_8014BC50, D_8014BD68, D_8014BE78, D_8014BF90, D_8014BEA0, D_8014BFB8, D_8014BEC8, D_8014BFE0, D_8014BEF0, D_8014C008, D_8014BF18, D_8014C098, D_8014C028, D_8014BF40, D_8014C050, D_8014BF68, D_8014C078, D_8014BA48, D_8014BA70, D_8014BA98, D_8014BDB0, D_8014BDD8, D_8014BE00, D_8014C0C0, D_8014C0E8, D_8014C110, D_8014BB10, D_8014BB38, D_8014BE28, D_8014BE50, D_8014C138, D_8014C160, NULL }; s32 D_8014B0B8 = 0xFCFFFFFF; @@ -99,32 +100,36 @@ s32 D_8014B400 = 0xFCFFFFFF; s32 D_8014B404[] = { 0xFFFE793C, 0xFCFFFFFF, 0xFFFE7838, 0xFCFFFFFF, 0xFFFE7838, 0xFC457FFF, 0xFFFDF838, 0xFC41FFFF, 0xFFFEF838, 0xFC127E24, 0xFFFFF3F9, 0xFC127FFF, 0xFFFFF238, 0xFC127FFF, 0xFFFFF238, 0xFC127E0A, 0xF3FFF238, 0xFC127E03, 0xFFFFF378, 0xFC147E28, 0x44FE793C, 0xFC147FFF, 0x4FFE7838, 0xFC147FFF, 0x4FFE7838, 0xFC147E0A, 0x4FFE72F8, 0xFC147E03, 0x4FFE7978, 0xFCFFFFFF, 0xFFFCF279, 0xFCFFFFFF, 0xFFFCF238, 0xFCFFFFFF, 0xFFFCF238, 0xFC157FFF, 0xFFFDF238, 0xFCFFFE03, 0xFFFCF378, 0xFC26A004, 0x1FFC93FC, 0xFC26A004, 0x1FFC93F8, 0xFC26A004, 0x1FFC93FC, 0xFC26A004, 0x1FFC92F8, 0xFC26A003, 0x1FFC9378, 0xFC26A004, 0x1F1093FF, 0xFC26A004, 0x1FFC93F8, 0xFC26A004, 0x1F1093FF, 0xFC26A004, 0x1FFC92F8, 0xFC26A003, 0x1FFC9378, 0xFC26A004, 0x1F1093FF, 0xFC26A004, 0x1FFC93F8, 0xFC26A004, 0x1F1093FF, 0xFC26A004, 0x1FFC92F8, 0xFC26A003, 0x1FFC9378, 0xFC20A204, 0xFFFFFFF8, 0xFC111404, 0xFFFFFFF8, 0xFC20A204, 0xFFFFFFF8, 0xFC20A204, 0xFFFFFFF8, 0xFC20A203, 0xFF13FF7F, 0xFC20A204, 0xFFFFFFF8, 0xFC111404, 0xFFFFFFF8, 0xFC20A204, 0xFFFFFFF8, 0xFC20A204, 0xFFFFFFF8, 0xFC20A203, 0xFFFFFF78, 0xFC20A204, 0xFFFFFFF8, 0xFC111404, 0xFFFFFFF8, 0xFC20A204, 0xFFFFFFF8, 0xFC20A204, 0xFFFFFFF8, 0xFC20A203, 0xFFFFFF78, 0xFC20A204, 0xFFFFFFF8, 0xFC111404, 0xFFFFFFF8, 0xFC20A204, 0xFFFFFFF8, 0xFC20A204, 0xFFFFFFF8, 0xFC20A203, 0xFFFFFF78, 0xFC20A204, 0xFFFFFFF8, 0xFC111404, 0xFFFFFFF8, 0xFC20A204, 0xFFFFFFF8, 0xFC20A204, 0xFFFFFFF8, 0xFC20A203, 0xFFFFFF78, 0xFC20A204, 0xFFFFFFF8, 0xFC111404, 0xFFFFFFF8, 0xFC20A204, 0xFFFFFFF8, 0xFC20A204, 0xFFFFFFF8, 0xFC20A203, 0xFFFFFF78, 0xFCFF99FF, 0xFFFFAF38, 0xFCFF99FF, 0xFFFFAF38, 0xFCFF99FF, 0xFFFFAF38, 0xFCFF99FF, 0xFFFFAF38, 0xFCFF9883, 0xFFFFAF78, 0xFC15FFFF, 0x2FFD7238, 0xFC15FFFF, 0x2FFD7238, 0xFC15FFFF, 0x2FFD7238, 0xFC15FFFF, 0x2FFD7238, 0xFC15FE03, 0x2FFD7378, 0xFC61E4C1, 0x12FC9238, 0xFC61E4C1, 0x12FC9238, 0xFC61E4C1, 0x12FC9238, 0xFC61E4C1, 0x12FC9238, 0xFC61E4C1, 0x12FC9238, 0xFC61FEC3, 0x11FCF279, 0xFC61FFFF, 0x1FFCF238, 0xFC61FFFF, 0x1FFCF238, 0xFC61FFFF, 0x1FFCF238, 0xFC61FE03, 0x1FFCF378, 0xFC10E228, 0x40C8A449, 0xFC10E228, 0x40C8A449, 0xFC10E228, 0x40C8A449, 0xFC10E228, 0x40C8A449, 0xFC10E228, 0x40C8A449, 0xFC75FEEB, 0xFFFFFDFE, 0xFC75FEEB, 0xFFFFFDFE, 0xFC75FEEB, 0xFFFFFDFE, 0xFC75FEEB, 0xFFFFFDFE, 0xFC75FEEB, 0xFFFFFDFE, 0xFC75FEEB, 0xFFFFFDFE, 0xFC75FEEB, 0xFFFFFDFE, 0xFC75FEEB, 0xFFFFFDFE, 0xFC75FEEB, 0xFFFFFDFE, 0xFC75FEEB, 0xFFFFFDFE, 0xFC75FEEB, 0xFFFFFDFE, 0xFC75FEEB, 0xFFFFFDFE, 0xFC75FEEB, 0xFFFFFDFE, 0xFC75FEEB, 0xFFFFFDFE, 0xFC75FEEB, 0xFFFFFDFE, }; -s32 D_8014B748 = 0x8028E000; +s32 mdl_textureBaseAddress = 0x8028E000; -s8 D_8014B74C = 0; -s8 D_8014B74D = 0; -s8 D_8014B74E = 0; -s8 D_8014B74F = 0; -s8 D_8014B750 = 0; -s8 D_8014B751 = 0; -s8 D_8014B752 = 0; -s8 D_8014B753 = 0; -s8 D_8014B754 = 0; -s8 D_8014B755 = 0; -s8 D_8014B756 = 0; -s8 D_8014B757 = 0; -s32 D_8014B758 = 950; -s32 D_8014B75C = 1000; -s8 D_8014B760 = 0xFF; -s8 D_8014B761 = 0xFF; -s8 D_8014B762 = 0xFF; -s8 D_8014B763 = 0; -s8 D_8014B764 = 0; -s8 D_8014B765 = 0; +s8 mdl_bgMultiplyColorA = 0; +s8 mdl_bgMultiplyColorR = 0; +s8 mdl_bgMultiplyColorG = 0; +s8 mdl_bgMultiplyColorB = 0; + +s8 mdl_renderModelFogPrimColorR = 0; +s8 mdl_renderModelFogPrimColorG = 0; +s8 mdl_renderModelFogPrimColorB = 0; +s8 mdl_renderModelFogPrimColorA = 0; + +s8 mdl_renderModelFogColorR = 0; +s8 mdl_renderModelFogColorG = 0; +s8 mdl_renderModelFogColorB = 0; +s8 mdl_renderModelFogColorA = 0; // unused? + +s32 mdl_renderModelFogStart = 950; +s32 mdl_renderModelFogEnd = 1000; + +s8 gRenderModelPrimR = 255; +s8 gRenderModelPrimG = 255; +s8 gRenderModelPrimB = 255; +s8 gRenderModelEnvR = 0; +s8 gRenderModelEnvG = 0; +s8 gRenderModelEnvB = 0; s8 D_8014B766 = 0; s8 D_8014B767 = 0; -Matrix4s D_8014B768 = { +Matrix4s mdl_RDPIdentity = { .whole = { {1, 0, 0, 0}, {0, 1, 0, 0}, @@ -143,161 +148,588 @@ s32 D_8014B7A8[] = { 0x00000006, 0x00000000, 0x00000005, 0x00020000, 0x00000004, s32 D_8014B7F0[] = { 0x00000000, 0x00000000, }; -s32 D_8014B7F8[] = { 0xE200001C, 0x00552078, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220405, 0xDF000000, 0x00000000, }; +Gfx D_8014B7F8[] = { + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | + G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014B820[] = { 0xE200001C, 0x00552D58, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220405, 0xDF000000, 0x00000000, }; +Gfx D_8014B820[] = { + gsDPSetRenderMode(G_RM_AA_ZB_OPA_DECAL, G_RM_AA_ZB_OPA_DECAL2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | + G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014B848[] = { 0xE200001C, 0x00552478, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220405, 0xDF000000, 0x00000000, }; +Gfx D_8014B848[] = { + gsDPSetRenderMode(G_RM_AA_ZB_OPA_INTER, G_RM_AA_ZB_OPA_INTER2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | + G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014B870[] = { 0xE200001C, 0x00553078, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014B870[] = { + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014B898[] = { 0xE200001C, 0x005049D8, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014B898[] = { + gsDPSetRenderMode(G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014B8C0[] = { 0xE200001C, 0x00504DD8, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014B8C0[] = { + gsDPSetRenderMode(G_RM_AA_ZB_XLU_DECAL, G_RM_AA_ZB_XLU_DECAL2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014B8E8[] = { 0xE200001C, 0x005045D8, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014B8E8[] = { + gsDPSetRenderMode(G_RM_AA_ZB_XLU_INTER, G_RM_AA_ZB_XLU_INTER2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014B910[] = { 0xE200001C, 0x00552230, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220405, 0xDF000000, 0x00000000, }; +Gfx D_8014B910[] = { + gsDPSetRenderMode(G_RM_ZB_OPA_SURF, G_RM_ZB_OPA_SURF2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014B938[] = { 0xE200001C, 0x00552E10, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220405, 0xDF000000, 0x00000000, }; +Gfx D_8014B938[] = { + gsDPSetRenderMode(G_RM_ZB_OPA_DECAL, G_RM_ZB_OPA_DECAL2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014B960[] = { 0xE200001C, 0x00552478, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220405, 0xFCFFFFFF, 0xFFFE793C, 0xDF000000, 0x00000000, }; +Gfx D_8014B960[] = { + gsDPSetRenderMode(G_RM_AA_ZB_OPA_INTER, G_RM_AA_ZB_OPA_INTER2), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPEndDisplayList(), +}; -s32 D_8014B988[] = { 0xE200001C, 0x00553078, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220405, 0xDF000000, 0x00000000, }; +Gfx D_8014B988[] = { + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014B9B0[] = { 0xE200001C, 0x00504A50, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014B9B0[] = { + gsDPSetRenderMode(G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014B9D8[] = { 0xE200001C, 0x00504F50, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014B9D8[] = { + gsDPSetRenderMode(G_RM_ZB_OVL_SURF, G_RM_ZB_OVL_SURF2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BA00[] = { 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BA00[] = { + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BA20[] = { 0xE200001C, 0x005049F8, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BA20[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | + GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), AA_EN | Z_CMP | Z_UPD | IM_RD | + CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | + GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BA48[] = { 0xE200001C, 0x00552048, 0xE3000A01, 0x00000000, 0xD9C0F9FA, 0x00000000, 0xD9FFFFFF, 0x00220404, 0xDF000000, 0x00000000, }; +Gfx D_8014BA48[] = { + gsDPSetRenderMode(G_RM_AA_OPA_SURF, G_RM_AA_OPA_SURF2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BA70[] = { 0xE200001C, 0x00553048, 0xE3000A01, 0x00000000, 0xD9C0F9FA, 0x00000000, 0xD9FFFFFF, 0x00220004, 0xDF000000, 0x00000000, }; +Gfx D_8014BA70[] = { + gsDPSetRenderMode(G_RM_AA_TEX_EDGE, G_RM_AA_TEX_EDGE2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BA98[] = { 0xE200001C, 0x005041C8, 0xE3000A01, 0x00000000, 0xD9C0F9FA, 0x00000000, 0xD9FFFFFF, 0x00220004, 0xDF000000, 0x00000000, }; +Gfx D_8014BA98[] = { + gsDPSetRenderMode(G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BAC0[] = { 0xE200001C, 0x005049F8, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BAC0[] = { + gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | + GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), AA_EN | Z_CMP | Z_UPD | IM_RD | + CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | + GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BAE8[] = { 0xE200001C, 0x00504B40, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BAE8[] = { + gsDPSetRenderMode(IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | + GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), IM_RD | CVG_DST_SAVE | ZMODE_XLU | + FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BB10[] = { 0xE200001C, 0x00504B50, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BB10[] = { + gsDPSetRenderMode(G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BB38[] = { 0xE200001C, 0x00504340, 0xE3000A01, 0x00000000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BB38[] = { + gsDPSetRenderMode(G_RM_CLD_SURF, G_RM_CLD_SURF2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BB60[] = { 0xE200001C, 0x0C192078, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220405, 0xDF000000, 0x00000000, }; +Gfx D_8014BB60[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BB88[] = { 0xE200001C, 0x0C192D58, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220405, 0xDF000000, 0x00000000, }; +Gfx D_8014BB88[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_OPA_DECAL2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BBB0[] = { 0xE200001C, 0x0C192478, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220405, 0xDF000000, 0x00000000, }; +Gfx D_8014BBB0[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_OPA_INTER2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BBD8[] = { 0xE200001C, 0x0C193078, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BBD8[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BC00[] = { 0xE200001C, 0x0C1849D8, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BC00[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BC28[] = { 0xE200001C, 0x0C184DD8, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BC28[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_DECAL2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BC50[] = { 0xE200001C, 0x0C1845D8, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BC50[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_INTER2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BC78[] = { 0xE200001C, 0x0C192230, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220405, 0xDF000000, 0x00000000, }; +Gfx D_8014BC78[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_OPA_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BCA0[] = { 0xE200001C, 0x0C192E10, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220405, 0xDF000000, 0x00000000, }; +Gfx D_8014BCA0[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_OPA_DECAL2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BCC8[] = { 0xE200001C, 0x0C192478, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220405, 0xFCFFFFFF, 0xFFFE793C, 0xDF000000, 0x00000000, }; +Gfx D_8014BCC8[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_OPA_INTER2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPEndDisplayList(), +}; -s32 D_8014BCF8[] = { 0xE200001C, 0x0C193078, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xDF000000, 0x00000000, }; +Gfx D_8014BCF8[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BD18[] = { 0xE200001C, 0x0C184A50, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BD18[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_XLU_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BD40[] = { 0xE200001C, 0x0C184E50, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BD40[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_XLU_DECAL2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BD68[] = { 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BD68[] = { + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BD88[] = { 0xE200001C, 0x0C1849D8, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BD88[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BDB0[] = { 0xE200001C, 0x0C192048, 0xE3000A01, 0x00100000, 0xD9C0F9FA, 0x00000000, 0xD9FFFFFF, 0x00220404, 0xDF000000, 0x00000000, }; +Gfx D_8014BDB0[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_OPA_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BDD8[] = { 0xE200001C, 0x0C193048, 0xE3000A01, 0x00100000, 0xD9C0F9FA, 0x00000000, 0xD9FFFFFF, 0x00220004, 0xDF000000, 0x00000000, }; +Gfx D_8014BDD8[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_TEX_EDGE2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BE00[] = { 0xE200001C, 0x0C1841C8, 0xE3000A01, 0x00100000, 0xD9C0F9FA, 0x00000000, 0xD9FFFFFF, 0x00220004, 0xDF000000, 0x00000000, }; +Gfx D_8014BE00[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_XLU_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BE28[] = { 0xE200001C, 0x0C184B50, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BE28[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BE50[] = { 0xE200001C, 0x0C184340, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014BE50[] = { + gsDPSetRenderMode(G_RM_PASS, G_RM_CLD_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BE78[] = { 0xE200001C, 0xC8112078, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00230405, 0xDF000000, 0x00000000, }; +Gfx D_8014BE78[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BEA0[] = { 0xE200001C, 0xC8112D58, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00230405, 0xDF000000, 0x00000000, }; +Gfx D_8014BEA0[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_DECAL2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BEC8[] = { 0xE200001C, 0xC8112478, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00230405, 0xDF000000, 0x00000000, }; +Gfx D_8014BEC8[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_INTER2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BEF0[] = { 0xE200001C, 0xC8113078, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00230005, 0xDF000000, 0x00000000, }; +Gfx D_8014BEF0[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BF18[] = { 0xE200001C, 0xC81049D8, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00230005, 0xDF000000, 0x00000000, }; +Gfx D_8014BF18[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BF40[] = { 0xE200001C, 0xC8104DD8, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00230005, 0xDF000000, 0x00000000, }; +Gfx D_8014BF40[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_DECAL2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BF68[] = { 0xE200001C, 0xC81045D8, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00230005, 0xDF000000, 0x00000000, }; +Gfx D_8014BF68[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_INTER2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BF90[] = { 0xE200001C, 0xC8112230, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00230405, 0xDF000000, 0x00000000, }; +Gfx D_8014BF90[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_OPA_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BFB8[] = { 0xE200001C, 0xC8112E10, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00230405, 0xDF000000, 0x00000000, }; +Gfx D_8014BFB8[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_OPA_DECAL2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014BFE0[] = { 0xE200001C, 0xC8112478, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00230405, 0xDF000000, 0x00000000, }; +Gfx D_8014BFE0[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_INTER2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014C008[] = { 0xE200001C, 0xC8113078, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xDF000000, 0x00000000, }; +Gfx D_8014C008[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014C028[] = { 0xE200001C, 0xC8104A50, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00230005, 0xDF000000, 0x00000000, }; +Gfx D_8014C028[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014C050[] = { 0xE200001C, 0xC8104E50, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00230005, 0xDF000000, 0x00000000, }; +Gfx D_8014C050[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_DECAL2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014C078[] = { 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00230005, 0xDF000000, 0x00000000, }; +Gfx D_8014C078[] = { + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014C098[] = { 0xE200001C, 0xC81049D8, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00230005, 0xDF000000, 0x00000000, }; +Gfx D_8014C098[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014C0C0[] = { 0xE200001C, 0xC8112048, 0xE3000A01, 0x00100000, 0xD9C0F9FA, 0x00000000, 0xD9FFFFFF, 0x00230404, 0xDF000000, 0x00000000, }; +Gfx D_8014C0C0[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_OPA_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014C0E8[] = { 0xE200001C, 0xC8113048, 0xE3000A01, 0x00100000, 0xD9C0F9FA, 0x00000000, 0xD9FFFFFF, 0x00230004, 0xDF000000, 0x00000000, }; +Gfx D_8014C0E8[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_TEX_EDGE2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014C110[] = { 0xE200001C, 0xC81041C8, 0xE3000A01, 0x00100000, 0xD9C0F9FA, 0x00000000, 0xD9FFFFFF, 0x00230004, 0xDF000000, 0x00000000, }; +Gfx D_8014C110[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_XLU_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014C138[] = { 0xE200001C, 0xC8104B50, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014C138[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_CLD_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; -s32 D_8014C160[] = { 0xE200001C, 0xC8104340, 0xE3000A01, 0x00100000, 0xD9C0F9FB, 0x00000000, 0xD9FFFFFF, 0x00220005, 0xDF000000, 0x00000000, }; +Gfx D_8014C160[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_CLD_SURF2), + gsDPSetCycleType(G_CYC_2CYCLE), + gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; s32 D_8014C188[] = { 0xFFFE7960, 0x000F4240, 0x000F4240, 0x000F4240, 0x00000000, 0x000F4240, 0x000F4240, 0x000F4240, 0x00000000, 0x000F4240, 0x000F4240, 0x000F4240, 0x00000000, 0x000F4240, 0x000F4240, 0x000F4240, 0x00000000, 0x007A1200, 0x007A1200, 0x007A1200, 0x00000000, 0x007A1200, 0x007270E0, 0x007270E0, 0x007270E0, 0x00000000, 0x006ACFC0, 0x006ACFC0, 0x006ACFC0, 0x006ACFC0, 0x00632EA0, 0x00632EA0, 0x00632EA0, 0x00000000, 0x005B8D80, 0x005B8D80, 0x005B8D80, 0x00000000, 0x0053EC60, 0x0053EC60, 0x0053EC60, 0x007A1200, 0x003D0900, 0x0040D990, 0x0044AA20, 0x0044AA20, 0x007A1200, 0x000AAE60, }; // render mode -> distance map? s8 D_8014C248[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +// TODO BSS to sort out +extern ModelNode** gCurrentModelTreeRoot; +extern ModelTransformGroupList wTransformGroups; +extern ModelTransformGroupList bTransformGroups; + // BSS static s32 B_801512B0[2]; -static CustomModelGfxBuilder* gCurrentCustomModelGfxBuilders; +static ModelCustomGfxBuilderList* gCurrentCustomModelGfxBuildersPtr; static s32 D_801512BC; static s32 D_801512C0; -static s32 D_801512C4; -static s32 D_801512C8[6]; +static s32 gEntityHeapBase; +static s32 D_801512C8; +BSS ModelList* gCurrentModels; +static s32 D_801512D0[4]; static ModelTransformGroupList* gCurrentTransformGroups; static s8 gMsgGlobalWaveCounter[0x4]; -static s8 D_801512E8[0x8]; +static ModelCustomGfxList* gCurrentCustomModelGfxPtr; +static s32 gLastCreatedEntityIndex; static s8 B_801512F0[0x410]; static GameMode gMainGameState[2]; // TODO rename extern s32 D_80151324; extern s32 D_8015132C; extern s32 D_80151330; -extern Fog* wFog; + +extern s32 wStaticEntityDataSize; +extern s32 bStaticEntityDataSize; + +extern StaticEntityData* wStaticEntityData[30]; +extern StaticEntityData* bStaticEntityData[4]; + +extern TileDescriptor gCurrentTileDescriptor; + +extern ModelList wModelList; +extern ModelList bModelList; + +// TODO: potentially a display list, figure this out +extern u32* wModelSpecialDls[32]; +extern u32* bModelSpecialDls[32]; + + +extern ModelCustomGfxBuilder wCustomModelGfxBuilders; +extern ModelCustomGfxBuilder bCustomModelGfxBuilders; +extern ModelLocalVertexCopy** D_80152190; +extern ModelLocalVertexCopy** D_801521D0; + +extern ModelLocalVertexCopy** gCurrentModelLocalVtxBuffers; +extern ModelNode* D_80152214; +extern ModelNode* D_80152218; +extern ModelTreeInfoList D_80152220; +extern ModelTreeInfoList D_80152A20; + +extern s8 wBgRenderType; +extern s8 bBgRenderType; +extern s32 mdl_treeIterPos; +extern Fog wFogSettings; +extern Fog bFogSettings; +extern Fog* gCurrentFogSettings; extern s32 texPannerMainU[MAX_TEX_PANNERS]; extern s32 texPannerMainV[MAX_TEX_PANNERS]; extern s32 texPannerAuxU[MAX_TEX_PANNERS]; extern s32 texPannerAuxV[MAX_TEX_PANNERS]; -extern RenderTaskEntry* D_801533A0[]; -extern s32 D_801533AC; -extern s32 D_801533B0; // num render task entries? -extern s8 D_8015A578; +extern u16 mdl_currentTransformGroupChildIndex; +extern ModelNode* D_80153370; +extern u16 D_80153374; +extern u16 D_80153376; +extern s16 D_8015336E; +extern RenderTask* mdl_renderTaskLists[3]; +extern s32 mdl_renderTaskMode; +extern s32 mdl_renderTaskCount; // num render task entries? + +extern s8 D_8015A578; +extern TextureHandle mdl_textureHandles[128]; +extern RenderTask mdl_clearRenderTasks[3][0x100]; -// funcs void update_shadows(void); s32 step_entity_commandlist(Entity* entity); void render_shadows(void); @@ -310,6 +742,8 @@ void _delete_shadow(s32 shadowIndex); s32 entity_get_collision_flags(Entity* entity); void entity_free_static_data(StaticEntityData* data); void update_entity_shadow_position(Entity* entity); +void load_model_transforms(ModelNode* model, ModelNode* parent, Matrix4f mdlTxMtx, s32 treeDepth); +void enable_transform_group(u16 modelID); void update_entities(void) { s32 i; @@ -393,7 +827,7 @@ void update_entities(void) { if (entity->hasEntityScript) { entity->hasEntityScript--; if (!(entity->hasEntityScript)) { - while (step_entity_commandlist(entity) != 0); + while (step_entity_commandlist(entity)); } } } @@ -470,10 +904,85 @@ void set_entity_commandlist(Entity* entity, s32* entityScript) { entity->savedReadPos = entity->scriptReadPos; } +// Ordering issues with the savedReadPos cases (4 and 5) +#ifdef NON_MATCHING +s32 step_entity_commandlist(Entity* entity) { + s32* args = entity->scriptReadPos; + s32 ret; + s32 a1; + s32 (*tempfunc)(Entity*); + + switch (*args++) { + case 0: + entity->hasEntityScript = -1; + entity->updateScriptCallback = NULL; + entity->scriptReadPos = NULL; + ret = FALSE; + break; + case 1: + entity->scriptReadPos = *args; + entity->hasEntityScript = 1; + entity->savedReadPos = entity->scriptReadPos; + ret = TRUE; + break; + case 2: + tempfunc = *args++; + entity->scriptReadPos = args; + (tempfunc)(entity); + ret = TRUE; + break; + case 3: + entity->hasEntityScript = *args++; + entity->updateScriptCallback = (s32 (*)(Entity*)) *args++; + entity->scriptReadPos = args++; + ret = FALSE; + break; + case 4: + entity->scriptReadPos = entity->savedReadPos[*args++]; + ret = TRUE; + break; + case 5: + a1 = *args++; + entity->savedReadPos[a1] = args; + entity->scriptReadPos = args; + ret = TRUE; + break; + case 6: + if (entity->boundScriptBytecode != NULL) { + entity->flags |= 0x1000000; + } + entity->scriptReadPos = args++; + ret = TRUE; + break; + case 7: + entity->flags |= *args++; + entity->scriptReadPos = args++; + ret = TRUE; + break; + case 8: + entity->flags &= ~*args++; + entity->scriptReadPos = args++; + ret = TRUE; + break; + case 9: + sfx_play_sound(*args++); + entity->scriptReadPos = args++; + ret = TRUE; + break; + default: + args++; + entity->scriptReadPos = args++; + ret = TRUE; + break; + } + return ret; +} +#else INCLUDE_ASM(s32, "a5dd0_len_114e0", step_entity_commandlist, Entity* entity); +#endif void exec_entity_commandlist(Entity* entity) { - while (step_entity_commandlist(entity) != 0); + while (step_entity_commandlist(entity)); } void func_8010FD98(s32 arg0, s32 alpha) { @@ -496,7 +1005,6 @@ void entity_model_set_shadow_color(s32 alpha) { } void render_entities(void) { - s32 phi_v0; s32 i; for (i = 0; i < MAX_ENTITIES; i++) { @@ -839,22 +1347,149 @@ INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80110F10); INCLUDE_ASM(s32, "a5dd0_len_114e0", entity_anim_make_vertex_pointers); +s32 is_entity_data_loaded(Entity* entity, StaticEntityData* entityData, s32* loadedStart, s32* loadedEnd); INCLUDE_ASM(s32, "a5dd0_len_114e0", is_entity_data_loaded); -INCLUDE_ASM(s32, "a5dd0_len_114e0", load_simple_entity_data); +void load_simple_entity_data(Entity* entity, StaticEntityData* entityData) { + s32 loadedStart; + s32 loadedEnd; + s32 entitySize; + u32 temp; + s32 sizeTemp; + + entity->vertexSegment = 10; + if (!gGameStatusPtr->isBattle) { + sizeTemp = wStaticEntityDataSize; + } else { + sizeTemp = bStaticEntityDataSize; + } + + if (is_entity_data_loaded(entity, entityData, &loadedStart, &loadedEnd)) { + if (sizeTemp + ((entityData->dmaEnd - entityData->dmaStart) >> 2) >= 0x5FFDU) { + get_entity_type(entity->listIndex); + get_entity_type(entity->listIndex); + PANIC(); + } + entitySize = (entityData->dmaEnd - entityData->dmaStart) >> 2; + entity->vertexData = (gEntityHeapBase - (sizeTemp * 4)) - (entitySize * 4); + temp = dma_copy(entityData->dmaStart, entityData->dmaEnd, entity->vertexData); + sizeTemp += temp / 4; + get_entity_type(entity->listIndex); + } else { + entitySize = (entityData->dmaEnd - entityData->dmaStart) >> 2; + entity->vertexData = (gEntityHeapBase - (loadedStart * 4)) - (entitySize * 4); + get_entity_type(entity->listIndex); + } + + if (!gGameStatusPtr->isBattle) { + wStaticEntityDataSize = sizeTemp; + } else { + bStaticEntityDataSize = sizeTemp; + } +} INCLUDE_ASM(s32, "a5dd0_len_114e0", load_split_entity_data); -INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80111790); +s32 func_80111790(void) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(*gCurrentEntityListPtr); i++) { + Entity* entity = (*gCurrentEntityListPtr)[i]; + + if (entity != NULL && entity->staticData->dmaStart != NULL) { + if (entity->staticData->dmaStart == entity->staticData) { + return TRUE; + } + } + } + return FALSE; +} INCLUDE_ASM(void, "a5dd0_len_114e0", entity_free_static_data, StaticEntityData* data); INCLUDE_ASM(s32, "a5dd0_len_114e0", create_entity, StaticEntityData* data, s32 x, s32 y, s32 z, s32 arg4, ...); -INCLUDE_ASM(s32, "a5dd0_len_114e0", create_shadow_from_data); +s32 create_shadow_from_data(StaticShadowData* data, f32 x, f32 y, f32 z) { + Shadow* shadow; + s32 i; -INCLUDE_ASM(s32, "a5dd0_len_114e0", MakeEntity, Evt* script, s32 isInitialCall); + for (i = 0; i < ARRAY_COUNT(*gCurrentShadowListPtr); i++) { + if ((*gCurrentShadowListPtr)[i] == NULL) { + break; + } + } + + ASSERT(i < 60); + + shadow = heap_malloc(sizeof(*shadow)); + (*gCurrentShadowListPtr)[i] = shadow; + mem_clear(shadow, sizeof(*shadow)); + shadow->listIndex = i; + shadow->flags = data->flags | 0x80000000; + shadow->unk_05 = 0x80; + shadow->unk_06 = 0x80; + shadow->position.x = x; + shadow->position.y = y; + shadow->position.z = z; + shadow->scale.x = 1.0f; + shadow->scale.y = 1.0f; + shadow->scale.z = 1.0f; + + if (data->animModelNode != NULL) { + shadow->flags |= 8; + shadow->entityModelID = create_model_animator(data->unk_04); + load_model_animator_tree(shadow->entityModelID, data->animModelNode); + } else { + shadow->entityModelID = load_entity_model(data->unk_04); + } + + if (data->onCreateCallback != NULL) { + data->onCreateCallback(shadow); + } + update_shadow_transform_matrix(shadow); + return shadow->listIndex; +} + +s32 MakeEntity(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + StaticEntityData* entityData; + s32 x, y, z; + s32 flags; + s32 temp_v0; + s32 entityIndex; + s32 t80000000; + s32* temp; + + if (isInitialCall != TRUE) { + return ApiStatus_DONE2; + } + + entityData = (StaticEntityData*)evt_get_variable(script, *args++); + temp = &D_8015C7D0[2]; + t80000000 = 0x80000000; + x = evt_get_variable(script, *args++); + y = evt_get_variable(script, *args++); + z = evt_get_variable(script, *args++); + flags = evt_get_variable(script, *args++); + + *temp-- = 0; + *temp-- = 0; + *temp = 0; + + do { + temp_v0 = evt_get_variable(script, *args++); + + if (temp_v0 != t80000000) { + *temp++ = temp_v0; + } + } while (temp_v0 != t80000000); + + entityIndex = create_entity(entityData, x, y, z, flags, D_8015C7D0[0], D_8015C7D0[1], D_8015C7D0[2], t80000000); + gLastCreatedEntityIndex = entityIndex; + script->varTable[0] = entityIndex; + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "a5dd0_len_114e0", SetEntityCullMode); @@ -887,9 +1522,38 @@ ApiStatus AssignScript(Evt* script, s32 isInitialCall) { return ApiStatus_DONE1; } -INCLUDE_ASM(s32, "a5dd0_len_114e0", AssignAreaFlag, Evt* script, s32 isInitialCall); +ApiStatus AssignAreaFlag(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; -INCLUDE_ASM(s32, "a5dd0_len_114e0", AssignBlockFlag, Evt* script, s32 isInitialCall); + if (isInitialCall == TRUE) { + s32 temp_s0 = evt_get_variable(script, *args++); + Entity* entity = get_entity_by_index(gLastCreatedEntityIndex); + + // TODO find proper struct for the dataBuf + ((s16*)(entity->dataBuf))[16] = temp_s0; + if (get_area_flag(temp_s0) != 0) { + entity->flags |= 0x20000000; + } + return ApiStatus_DONE2; + } + + return ApiStatus_DONE1; +} + +ApiStatus AssignBlockFlag(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall == TRUE) { + s32 temp_s0 = evt_get_variable_index(script, *args++); + Entity* entity = get_entity_by_index(gLastCreatedEntityIndex); + + // TODO find proper struct for the dataBuf + ((s16*)(entity->dataBuf))[5] = temp_s0; + return ApiStatus_DONE2; + } + + return ApiStatus_DONE1; +} ApiStatus AssignFlag(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -904,9 +1568,33 @@ ApiStatus AssignFlag(Evt* script, s32 isInitialCall) { return ApiStatus_DONE1; } -INCLUDE_ASM(s32, "a5dd0_len_114e0", AssignPanelFlag, Evt* script, s32 isInitialCall); +ApiStatus AssignPanelFlag(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; -INCLUDE_ASM(s32, "a5dd0_len_114e0", AssignCrateFlag, Evt* script, s32 isInitialCall); + if (isInitialCall == TRUE) { + // TODO find proper struct for the dataBuf + s16* dataBuf = (s16*)get_entity_by_index(gLastCreatedEntityIndex)->dataBuf; + + dataBuf[3] = evt_get_variable_index(script, *args++); + return ApiStatus_DONE2; + } + + return ApiStatus_DONE1; +} + +ApiStatus AssignCrateFlag(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall == TRUE) { + // TODO find proper struct for the dataBuf + s16* dataBuf = (s16*)get_entity_by_index(gLastCreatedEntityIndex)->dataBuf; + + dataBuf[2] = evt_get_variable_index(script, *args++); + return ApiStatus_DONE2; + } + + return ApiStatus_DONE1; +} INCLUDE_ASM(s32, "a5dd0_len_114e0", create_entity_shadow); @@ -916,9 +1604,120 @@ void delete_shadow(s32 shadowIndex) { _delete_shadow(shadowIndex); } -INCLUDE_ASM(void, "a5dd0_len_114e0", update_entity_shadow_position, Entity* entity); +void update_entity_shadow_position(Entity* entity) { + Shadow* shadow = get_shadow_by_index(entity->shadowIndex); -INCLUDE_ASM(s32, "a5dd0_len_114e0", entity_raycast_down); + if (shadow != NULL) { + f32 rayX; + f32 rayY; + f32 rayZ; + f32 hitYaw; + f32 hitPitch; + f32 hitLength; + f32 origHitLength; + + if (entity->alpha < 255) { + shadow->unk_05 = entity->alpha / 2; + } else { + u8 alphaTemp; + + if (shadow->flags & 0x800000) { + alphaTemp = 160; + } else { + alphaTemp = 128; + } + shadow->unk_05 = alphaTemp; + } + + if (!(entity->flags & 4)) { + if (shadow->flags & 0x400000) { + shadow->flags &= ~0x400000; + } else { + return; + } + } + + rayX = entity->position.x; + rayY = entity->position.y; + rayZ = entity->position.z; + + if (!entity_raycast_down(&rayX, &rayY, &rayZ, &hitYaw, &hitPitch, &hitLength) && hitLength == 32767.0f) { + hitLength = 0.0f; + } + + origHitLength = hitLength; + + if (shadow->flags & 0x200) { + hitLength = 212.5f; + shadow->scale.x = entity->aabb.x / hitLength; + shadow->scale.z = entity->aabb.z / hitLength; + } else { + hitLength = ((hitLength / 150.0f) + 0.95) * 250.0; + shadow->scale.x = (entity->aabb.x / hitLength) * entity->scale.x; + shadow->scale.z = (entity->aabb.z / hitLength) * entity->scale.z; + } + + shadow->position.x = entity->position.x; + shadow->position.z = entity->position.z; + shadow->position.y = rayY; + entity->shadowPosY = rayY; + shadow->rotation.x = hitYaw; + shadow->rotation.z = hitPitch; + shadow->rotation.y = entity->rotation.y; + + if (entity->position.y < rayY) { + shadow->flags |= 0x40000000; + entity->position.y = rayY + 10.0f; + } else { + shadow->flags &= ~0x40000000; + } + + shadow->flags = (shadow->flags & ~1) | ((u16)entity->flags & 1); + if (!(entity->flags & 0x400) && origHitLength == 0.0f) { + shadow->flags |= 1; + } + } else { + entity->shadowPosY = 0.0f; + } +} + +s32 entity_raycast_down(f32* x, f32* y, f32* z, f32* hitYaw, f32* hitPitch, f32* hitLength) { + f32 hitX, hitY, hitZ; + f32 hitDepth; + f32 hitNx, hitNy, hitNz; + s32 entityID; + s32 colliderID; + s32 hitID; + s32 ret; + + hitDepth = 32767.0f; + *hitLength = 32767.0f; + entityID = test_ray_entities(*x, *y, *z, 0.0f, -1.0f, 0.0f, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, &hitNy, &hitNz); + hitID = -1; + ret = FALSE; + + if ((entityID >= 0) && ((get_entity_type(entityID) != 0xC) || (hitNx == 0.0f && hitNz == 0.0f && hitNy == 1.0))) { + hitID = entityID | 0x4000; + } + + colliderID = test_ray_colliders(0x10000, *x, *y, *z, 0.0f, -1.0f, 0.0f, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, + &hitNy, &hitNz); + if (colliderID >= 0) { + hitID = colliderID; + } + + if (hitID >= 0) { + *hitLength = hitDepth; + *y = hitY; + *hitYaw = -atan2(0.0f, 0.0f, hitNz * 100.0f, hitNy * 100.0f); + *hitPitch = -atan2(0.0f, 0.0f, hitNx * 100.0f, hitNy * 100.0f); + ret = TRUE; + } else { + *hitYaw = 0.0f; + *hitPitch = 0.0f; + } + return ret; +} INCLUDE_ASM(void, "a5dd0_len_114e0", set_standard_shadow_scale, Shadow* shadow, f32 scale); @@ -931,20 +1730,17 @@ INCLUDE_ASM(s32, "a5dd0_len_114e0", is_block_on_ground); void state_delegate_NOP(void) { } -// ordering -#ifdef NON_MATCHING +// Dumb temp and weird i decrement and temp increment stuff needed to match void clear_game_modes(void) { + GameMode* state = &gMainGameState[0]; s32 i; - for (i = 0; i < ARRAY_COUNT(gMainGameState); i++) { - gMainGameState[i].flags = 0; + for (i = ARRAY_COUNT(gMainGameState) - 1; i >= 0; i--, state++) { + state->flags = 0; } } -#else -INCLUDE_ASM(s32, "a5dd0_len_114e0", clear_game_modes); -#endif -// regalloc? +// weird ordering at the beginning #ifndef NON_MATCHING INCLUDE_ASM(s32, "a5dd0_len_114e0", set_next_game_mode); #else @@ -963,13 +1759,22 @@ GameMode* set_next_game_mode(GameMode* arg0) { gameMode->flags = 1 | 2; gameMode->init = arg0->init; - gameMode->unk_08 = arg0->unk_08; + gameMode->step = arg0->step; gameMode->render = arg0->render; gameMode->unk_0C = NULL; - if (gameMode->init == NULL) gameMode->init = state_delegate_NOP; - if (gameMode->step == NULL) gameMode->step = state_delegate_NOP; - if (gameMode->unk_0C == NULL) gameMode->unk_0C = state_delegate_NOP; - if (gameMode->render == NULL) gameMode->render = state_delegate_NOP; + + if (gameMode->init == NULL) { + gameMode->init = state_delegate_NOP; + } + if (gameMode->step == NULL) { + gameMode->step = state_delegate_NOP; + } + if (gameMode->unk_0C == NULL) { + gameMode->unk_0C = state_delegate_NOP; + } + if (gameMode->render == NULL) { + gameMode->render = state_delegate_NOP; + } gameMode->renderAux = state_delegate_NOP; gameMode->init(); @@ -1029,24 +1834,21 @@ void func_80112E4C(s32 i) { gMainGameState[i].flags |= 0x10; } -#ifndef NON_MATCHING -INCLUDE_ASM(s32, "a5dd0_len_114e0", step_current_game_mode); -#else void step_current_game_mode(void) { - GameMode* gameMode; + GameMode* gameMode = gMainGameState; s32 i; - for (i = 0; i < ARRAY_COUNT(gMainGameState); i++) { - gameMode = &gMainGameState[i]; - if (gameMode->flags != 0 && !(gameMode->flags & 4) && !(gameMode->flags & 8)) { - gameMode->flags &= ~2; - gameMode->step(gameMode); + for (i = 0; i < ARRAY_COUNT(gMainGameState); i++, gameMode++) { + if (gameMode->flags != 0) { + if (!(gameMode->flags & 4)) { + if (!(gameMode->flags & 8)) { + gameMode->flags &= ~2; + gameMode->step(); + } + } } } - - //return i; } -#endif // similar to step_current_game_mode, but calls unk_0C INCLUDE_ASM(s32, "a5dd0_len_114e0", state_do_unk); @@ -1057,64 +1859,455 @@ INCLUDE_ASM(s32, "a5dd0_len_114e0", state_render_backUI); // calls renderAux and render INCLUDE_ASM(s32, "a5dd0_len_114e0", state_render_frontUI); +void appendGfx_model(Model* model); INCLUDE_ASM(void, "a5dd0_len_114e0", appendGfx_model, Model*); INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80114B58); +void load_tile_header(char* textureName, s32 romOffset, s32 size); INCLUDE_ASM(s32, "a5dd0_len_114e0", load_tile_header); INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80115498); -INCLUDE_ASM(s32, "a5dd0_len_114e0", get_model_property); +// Goofy temps needed to match +ModelNodeProperty* get_model_property(ModelNode* node, ModelPropertyKeys key) { + s32 numProperties = node->numProperties; + ModelNodeProperty* propertyList = node->propertyList; + s32 i; + + for (i = 0; i < numProperties; i++, propertyList++) { + if (propertyList->key == key) { + return propertyList; + } + } + return NULL; +} INCLUDE_ASM(s32, "a5dd0_len_114e0", _load_model_textures); INCLUDE_ASM(s32, "a5dd0_len_114e0", load_model_textures); -INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_get_child_count); +s32 mdl_get_child_count(ModelNode* model) { + s32 ret = 0; + if (model->type != 2 && model->groupData != NULL) { + s32 numChildren = model->groupData->numChildren; + + if (numChildren != 0) { + s32 i; + + ret += numChildren; + for (i = 0; i < numChildren; i++) { + ret += mdl_get_child_count(model->groupData->childList[i]); + } + } + } + return ret; +} + +// Issue with pointer advancement in the gCurrentCustomModelGfxPtr loop (adding 8 bytes instead of 4) +#ifdef NON_MATCHING +void clear_model_data(void) { + s32 i; + + if (!gGameStatusPtr->isBattle) { + gCurrentModels = wModelList; + gCurrentTransformGroups = wTransformGroups; + gCurrentCustomModelGfxPtr = wModelSpecialDls; + gCurrentCustomModelGfxBuildersPtr = &wCustomModelGfxBuilders; + gCurrentModelTreeRoot = &D_80152214; + gCurrentModelLocalVtxBuffers = &D_80152190; + mdl_currentModelTreeNodeInfo = D_80152220; + D_801512F0 = &wBgRenderType; + mdl_bgMultiplyColorA = 0; + mdl_bgMultiplyColorR = 0; + mdl_bgMultiplyColorG = 0; + mdl_bgMultiplyColorB = 0; + gCurrentFogSettings = &wFogSettings; + } else { + gCurrentModels = bModelList; + gCurrentTransformGroups = bTransformGroups; + gCurrentCustomModelGfxPtr = bModelSpecialDls; + gCurrentCustomModelGfxBuildersPtr = &bCustomModelGfxBuilders; + gCurrentModelTreeRoot = &D_80152218; + gCurrentModelLocalVtxBuffers = &D_801521D0; + mdl_currentModelTreeNodeInfo = D_80152A20; + D_801512F0 = &bBgRenderType; + gCurrentFogSettings = &bFogSettings; + } + + for (i = 0; i < ARRAY_COUNT(*gCurrentModels); i++) { + (*gCurrentModels)[i] = 0; + } + + for (i = 0; i < ARRAY_COUNT(*gCurrentTransformGroups); i++) { + (*gCurrentTransformGroups)[i] = 0; + } + + for (i = 0; i < ARRAY_COUNT(*gCurrentCustomModelGfxPtr); i++) { + (*gCurrentCustomModelGfxPtr)[i].pre = 0; + (*gCurrentCustomModelGfxBuildersPtr)[i].pre = 0; + } + + *gCurrentModelTreeRoot = NULL; + + for (i = 0; i < ARRAY_COUNT(*mdl_currentModelTreeNodeInfo); i++) { + (*mdl_currentModelTreeNodeInfo)[i].modelIndex = -1; + (*mdl_currentModelTreeNodeInfo)[i].treeDepth = 0; + (*mdl_currentModelTreeNodeInfo)[i].textureID = 0; + } + + *D_801512F0 = 0; + gCurrentFogSettings->r = 10; + gCurrentFogSettings->g = 10; + gCurrentFogSettings->b = 10; + gCurrentFogSettings->startDistance = 950; + gCurrentFogSettings->enabled = FALSE; + gCurrentFogSettings->a = 0; + gCurrentFogSettings->endDistance = 1000; + + for (i = 0; i < ARRAY_COUNT(texPannerAuxV); i++) { + texPannerAuxV[i] = 0; + texPannerAuxU[i] = 0; + texPannerMainV[i] = 0; + texPannerMainU[i] = 0; + } +} +#else INCLUDE_ASM(s32, "a5dd0_len_114e0", clear_model_data); +#endif -INCLUDE_ASM(s32, "a5dd0_len_114e0", init_model_data); +void init_model_data(void) { + if (!gGameStatusPtr->isBattle) { + gCurrentModels = &wModelList; + gCurrentTransformGroups = &wTransformGroups; + gCurrentCustomModelGfxPtr = wModelSpecialDls; + gCurrentCustomModelGfxBuildersPtr = &wCustomModelGfxBuilders; + gCurrentModelTreeRoot = &D_80152214; + gCurrentModelLocalVtxBuffers = &D_80152190; + mdl_currentModelTreeNodeInfo = &D_80152220; + D_801512F0 = &wBgRenderType; + gCurrentFogSettings = &wFogSettings; + } else { + gCurrentModels = &bModelList; + gCurrentTransformGroups = &bTransformGroups; + gCurrentCustomModelGfxPtr = bModelSpecialDls; + gCurrentCustomModelGfxBuildersPtr = &bCustomModelGfxBuilders; + gCurrentModelTreeRoot = &D_80152218; + gCurrentModelLocalVtxBuffers = &D_801521D0; + mdl_currentModelTreeNodeInfo = &D_80152A20; + D_801512F0 = &bBgRenderType; + gCurrentFogSettings = &bFogSettings; + } +} -INCLUDE_ASM(s32, "a5dd0_len_114e0", calculate_model_sizes); +void calculate_model_sizes(void) { + s32 i; + for (i = 0; i < ARRAY_COUNT(*gCurrentModels); i++) { + Model* model = (*gCurrentModels)[i]; + + if (model != NULL) { + ModelBoundingBox* bb = (ModelBoundingBox*)get_model_property(model->modelNode, MODEL_PROP_KEY_BOUNDING_BOX); + + bb->halfSizeX = (bb->maxX - bb->minX) * 0.5; + bb->halfSizeY = (bb->maxY - bb->minY) * 0.5; + bb->halfSizeZ = (bb->maxZ - bb->minZ) * 0.5; + model->flags |= 0x1000; + } + } +} + +void mdl_create_model(ModelBlueprint* bp, s32 arg1); INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_create_model); +// The global here is getting optimized out because nothing is happening to it. Very weird +#ifdef NON_MATCHING +void func_80116674(void) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(*gCurrentModels); i++) { + Model* m = (*gCurrentModels)[i]; + } +} +#else INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80116674); +#endif INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80116698); INCLUDE_ASM(s32, "a5dd0_len_114e0", render_models); -void appendGfx_model_group(Model*); -void appendGfx_model(Model*); -void render_transform_group(Model*); - +void appendGfx_model_group(Model* model); INCLUDE_ASM(void, "a5dd0_len_114e0", appendGfx_model_group, Model*); -INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80117D00); +void func_80117D00(Model* model) { + Model* mdl = model; // temps needed to match + ModelNode* modelNode = mdl->modelNode; -INCLUDE_ASM(s32, "a5dd0_len_114e0", render_transform_group_node); + if (model->modelNode->type != SHAPE_TYPE_MODEL) { + if (modelNode->groupData != NULL) { + s32 numChildren = modelNode->groupData->numChildren; -INCLUDE_ASM(void, "a5dd0_len_114e0", render_transform_group, Model*); + if (numChildren != 0) { + s32 i; + + for (i = 0; i < numChildren; i++, mdl_treeIterPos++) { + Model newModel = *mdl; + ModelNodeProperty* prop; + + newModel.flags = mdl->flags; + newModel.currentSpecialMatrix = mdl->currentSpecialMatrix; + newModel.modelNode = modelNode->groupData->childList[i]; + newModel.texPannerID = mdl->texPannerID; + newModel.specialDisplayListID = mdl->specialDisplayListID; + + if (newModel.modelNode->type == SHAPE_TYPE_MODEL) { + prop = get_model_property(newModel.modelNode, MODEL_PROP_KEY_RENDER_MODE); + } else { + prop = NULL; + } + + if (prop != NULL) { + newModel.renderMode = prop->data.s; + } else { + newModel.renderMode = 0; + } + + newModel.textureID = (*mdl_currentModelTreeNodeInfo)[mdl_treeIterPos].textureID; + newModel.unk_A9 = 0; + func_80117D00(&newModel); + } + } + } + } else { + appendGfx_model(mdl); + } +} + +// this looks like a switch, but I can't figure it out +void render_transform_group_node(ModelNode* node) { + Gfx** gfx = &gMasterGfxPos; + Model* model; + + if (node != NULL) { + if (node->type == SHAPE_TYPE_GROUP) { + ModelNodeProperty* groupTypeProp = get_model_property(node, MODEL_PROP_KEY_GROUP_TYPE); + + if (groupTypeProp != NULL && groupTypeProp->data.s != 0) { + model = get_model_from_list_index(mdl_currentTransformGroupChildIndex); + if (!(model->flags & 2)) { + appendGfx_model_group(model); + } + mdl_currentTransformGroupChildIndex++; + return; + } + } + if (node->type != SHAPE_TYPE_MODEL) { + if (node->groupData != NULL) { + s32 numChildren; + s32 i; + + if (node->groupData->transformMatrix != NULL) { + gSPMatrix((*gfx)++, node->groupData->transformMatrix, + G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + } + + numChildren = node->groupData->numChildren; + if (numChildren != 0) { + for (i = 0; i < numChildren; i++) { + render_transform_group_node(node->groupData->childList[i]); + } + } + + if (node->groupData->transformMatrix != NULL) { + gSPPopMatrix((*gfx)++, G_MTX_MODELVIEW); + } + } + return; + } + + model = get_model_from_list_index(mdl_currentTransformGroupChildIndex); + if (!(model->flags & 2)) { + appendGfx_model(model); + } + mdl_currentTransformGroupChildIndex++; + } +} + + +// arg0 and gfx temps needed +void render_transform_group(ModelTransformGroup* group) { + ModelTransformGroup* mtg = group; + Gfx** gfx = &gMasterGfxPos; + + if (!(mtg->flags & 4)) { + mdl_currentTransformGroupChildIndex = mtg->minChildModelIndex; + if (!(mtg->flags & 0x2000)) { + gSPMatrix((*gfx)++, mtg->transformMtx, (G_MTX_PUSH | G_MTX_LOAD) | G_MTX_MODELVIEW); + } + + render_transform_group_node(mtg->modelNode); + if (!(mtg->flags & 0x2000)) { + gSPPopMatrix((*gfx)++, G_MTX_MODELVIEW); + } + gDPPipeSync((*gfx)++); + } +} INCLUDE_ASM(s32, "a5dd0_len_114e0", func_801180E8); Model* get_model_from_list_index(s32 listIndex) { - return (*gCurrentModelListPtr)[listIndex]; + return (*gCurrentModels)[listIndex]; } -INCLUDE_ASM(s32, "a5dd0_len_114e0", load_data_for_models); +void load_data_for_models(ModelNode* model, s32 romOffset, s32 size) { + Matrix4f mtx; + guMtxIdentF(mtx); + + if (romOffset != 0) { + load_model_textures(model, romOffset, size); + } + + *gCurrentModelTreeRoot = model; + mdl_treeIterPos = 0; + + if (model != NULL) { + load_model_transforms(model, NULL, mtx, 0); + } +} + +// tiny reg swap in the first loop +#ifdef NON_MATCHING +void load_model_transforms(ModelNode* model, ModelNode* parent, Matrix4f mdlTxMtx, s32 treeDepth) { + Matrix4f sp10; + Matrix4f sp50; + ModelBlueprint modelBP; + ModelBlueprint* modelBPptr = &modelBP; + ModelNodeProperty* groupTypeProperty; + s32 i; + + if (model->groupData != NULL && model->groupData->numChildren != 0) { + s32 groupType; + + if (model->groupData->transformMatrix != NULL) { + Matrix4f spA0; + + guMtxL2F(spA0, model->groupData->transformMatrix); + guMtxCatF(spA0, mdlTxMtx, sp10); + } + groupTypeProperty = get_model_property(model, MODEL_PROP_KEY_GROUP_TYPE); + + if (groupTypeProperty == NULL) { + groupType = 0; + } else { + groupType = groupTypeProperty->data.s; + } + + if (model->type != 5 || groupType == 0) { + for (i = 0; i < model->groupData->numChildren; i++) { + ModelNode** modelTemp; + Matrix4f* txMtx; + + modelTemp = &model->groupData->childList[i]; + + if (model->groupData->transformMatrix != NULL) { + txMtx = sp10; + } else { + txMtx = mdlTxMtx; + } + + load_model_transforms(*modelTemp, model, txMtx, treeDepth + 1); + } + + (*mdl_currentModelTreeNodeInfo)[mdl_treeIterPos].modelIndex = -1; + (*mdl_currentModelTreeNodeInfo)[mdl_treeIterPos].treeDepth = treeDepth; + mdl_treeIterPos += 1; + return; + } + } + + guMtxF2L(mdlTxMtx, sp50); + modelBPptr->flags = 0; + modelBPptr->mdlNode = model; + modelBPptr->groupData = parent->groupData; + modelBPptr->mtx = sp50; + + if (model->type == 5) { + s32 childCount = mdl_get_child_count(model); + + for (i = mdl_treeIterPos; i < mdl_treeIterPos + childCount; i++) { + (*mdl_currentModelTreeNodeInfo)[i].modelIndex = -1; + (*mdl_currentModelTreeNodeInfo)[i].treeDepth = treeDepth + 1; + } + mdl_treeIterPos += childCount; + } + + mdl_create_model(modelBPptr, 4); + (*mdl_currentModelTreeNodeInfo)[mdl_treeIterPos].treeDepth = treeDepth; + mdl_treeIterPos += 1; +} +#else INCLUDE_ASM(s32, "a5dd0_len_114e0", load_model_transforms); +#endif -INCLUDE_ASM(s32, "a5dd0_len_114e0", get_model_list_index_from_tree_index, s32 treeIndex); +s32 get_model_list_index_from_tree_index(s32 treeIndex) { + s32 i; -INCLUDE_ASM(s32, "a5dd0_len_114e0", get_transform_group_index, s32 arg0); + if (treeIndex < 0x100) { + u8 modelIndex = (*mdl_currentModelTreeNodeInfo)[treeIndex].modelIndex; -INCLUDE_ASM(void, "a5dd0_len_114e0", get_model_center_and_size, u16 modelID, f32* centerX, f32* centerY, - f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ); + if (modelIndex != (u8)-1) { + return modelIndex; + } + } + + for (i = 0; i < 0x100; i++) { + Model* model = get_model_from_list_index(i); + + if (model != NULL && model->modelID == treeIndex) { + return i; + } + } + return 0; +} + +s32 get_transform_group_index(s32 modelID) { + ModelTransformGroup* group; + s32 i; + + for (i = 0; i < MAX_MODEL_TRANSFORM_GROUPS; i++) { + group = get_transform_group(i); + + if (group != NULL && group->groupModelID == modelID) { + return i; + } + } + + return -1; +} + +// TODO this seems to be returning center for the model and center for the BB (not the size) +void get_model_center_and_size(u16 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ) { + Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(modelID)); + ModelNode* node = model->modelNode; + ModelBoundingBox* bb; + + *centerX = model->center.x; + *centerY = model->center.y; + *centerZ = model->center.z; + + bb = (ModelBoundingBox*)get_model_property(node, MODEL_PROP_KEY_BOUNDING_BOX); + + if (bb != NULL) { + *sizeX = bb->halfSizeX; + *sizeY = bb->halfSizeY; + *sizeZ = bb->halfSizeZ; + } else { + *sizeX = *sizeY = *sizeZ = 0.0f; + } +} ModelTransformGroup* get_transform_group(s32 index) { return (*gCurrentTransformGroups)[index]; @@ -1122,24 +2315,124 @@ ModelTransformGroup* get_transform_group(s32 index) { INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011B1D8); -INCLUDE_ASM(s32, "a5dd0_len_114e0", make_transform_group); +void make_transform_group(u16 modelID) { + mdl_treeIterPos = 0; + D_80153370 = NULL; + D_8015336E = modelID; + D_80153376 = 0; + D_80153374 = 0; + func_8011B1D8(*gCurrentModelTreeRoot); -INCLUDE_ASM(s32, "a5dd0_len_114e0", enable_transform_group); + if (D_80153370 != 0) { + ModelTransformGroup* newMtg; + ModelNode* node; + ModelNodeProperty* prop; + ModelBoundingBox* bb; + f32 x, y, z; + s32 i; -INCLUDE_ASM(s32, "a5dd0_len_114e0", disable_transform_group); + for (i = 0; i < ARRAY_COUNT(*gCurrentTransformGroups); i++) { + if ((*gCurrentTransformGroups)[i] == NULL) { + break; + } + } + + (*gCurrentTransformGroups)[i] = newMtg = heap_malloc(sizeof(ModelTransformGroup)); + newMtg->flags = 1; + newMtg->groupModelID = modelID; + newMtg->minChildModelIndex = get_model_list_index_from_tree_index(D_80153374); + newMtg->maxChildModelIndex = get_model_list_index_from_tree_index(D_80153376); + newMtg->matrixMode = 0; + newMtg->matrixRDP_N = NULL; + newMtg->modelNode = D_80153370; + guMtxIdent(&newMtg->matrixA); + newMtg->flags |= 0x2000; + guMtxIdentF(newMtg->matrixB); + + node = newMtg->modelNode; + + if (node->type != SHAPE_TYPE_GROUP) { + prop = get_model_property(node, MODEL_PROP_KEY_RENDER_MODE); + } else { + prop = get_model_property(node, MODEL_PROP_KEY_GROUP_TYPE); + + if (prop != NULL) { + prop = &prop[1]; + } + } + + if (prop != NULL) { + newMtg->renderMode = prop->data.s; + } else { + newMtg->renderMode = 1; + } + + bb = (ModelBoundingBox*)get_model_property(node, MODEL_PROP_KEY_BOUNDING_BOX); + if (bb != NULL) { + x = (bb->minX + bb->maxX) * 0.5f; + y = (bb->minY + bb->maxY) * 0.5f; + z = (bb->minZ + bb->maxZ) * 0.5f; + } else { + x = y = z = 0.0f; + } + + if (newMtg->matrixRDP_N != NULL) { + guMtxXFML(newMtg->matrixRDP_N, x, y, z, &x, &y, &z); + } + + newMtg->center.x = x; + newMtg->center.y = y; + newMtg->center.z = z; + enable_transform_group(modelID); + } +} + +void enable_transform_group(u16 modelID) { + ModelTransformGroup* group = get_transform_group(get_transform_group_index(modelID)); + s32 i; + + group->flags &= ~0x4; + + for (i = group->minChildModelIndex; i <= group->maxChildModelIndex; i++) { + Model* model = get_model_from_list_index(i); + + model->flags |= 0x8; + + if (model->currentMatrix != NULL) { + model->flags |= 0x1000; + } + } +} + +void disable_transform_group(u16 modelID) { + ModelTransformGroup* group = get_transform_group(get_transform_group_index(modelID)); + s32 i; + + group->flags |= 0x4; + + for (i = group->minChildModelIndex; i <= group->maxChildModelIndex; i++) { + Model* model = get_model_from_list_index(i); + + model->flags &= ~0x8; + + if (model->currentMatrix != NULL) { + model->flags |= 0x1000; + } + } +} void clone_model(u16 srcModelID, u16 newModelID) { Model* srcModel = get_model_from_list_index(get_model_list_index_from_tree_index(srcModelID)); Model* newModel; s32 i; - for (i = 0; i < ARRAY_COUNT(*gCurrentModelListPtr); i++) { - if ((*gCurrentModelListPtr)[i] == NULL) { + for (i = 0; i < ARRAY_COUNT(*gCurrentModels); i++) { + if ((*gCurrentModels)[i] == NULL) { break; } } - (*gCurrentModelListPtr)[i] = newModel = heap_malloc(sizeof(Model)); + (*gCurrentModels)[i] = newModel = heap_malloc(sizeof(Model)); *newModel = *srcModel; newModel->modelID = newModelID; } @@ -1151,8 +2444,8 @@ INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011B950); void func_8011BAE8(void) { s32 i; - for (i = 0; i < ARRAY_COUNT(*gCurrentModelListPtr); i++) { - Model* model = (*gCurrentModelListPtr)[i]; + for (i = 0; i < ARRAY_COUNT(*gCurrentModels); i++) { + Model* model = (*gCurrentModels)[i]; if (model != NULL) { model->flags &= ~0x0400; @@ -1169,39 +2462,39 @@ void func_8011BAE8(void) { } void enable_world_fog(void) { - wFog->enabled = TRUE; + gCurrentFogSettings->enabled = TRUE; } void disable_world_fog(void) { - wFog->enabled = FALSE; + gCurrentFogSettings->enabled = FALSE; } void set_world_fog_dist(s32 start, s32 end) { - wFog->startDistance = start; - wFog->endDistance = end; + gCurrentFogSettings->startDistance = start; + gCurrentFogSettings->endDistance = end; } void set_world_fog_color(s32 r, s32 g, s32 b, s32 a) { - wFog->r = r; - wFog->g = g; - wFog->b = b; - wFog->a = a; + gCurrentFogSettings->r = r; + gCurrentFogSettings->g = g; + gCurrentFogSettings->b = b; + gCurrentFogSettings->a = a; } s32 is_world_fog_enabled(void) { - return wFog->enabled; + return gCurrentFogSettings->enabled; } void get_world_fog_distance(s32* start, s32* end) { - *start = wFog->startDistance; - *end = wFog->endDistance; + *start = gCurrentFogSettings->startDistance; + *end = gCurrentFogSettings->endDistance; } void get_world_fog_color(s32* r, s32* g, s32* b, s32* a) { - *r = wFog->r; - *g = wFog->g; - *b = wFog->b; - *a = wFog->a; + *r = gCurrentFogSettings->r; + *g = gCurrentFogSettings->g; + *b = gCurrentFogSettings->b; + *a = gCurrentFogSettings->a; } void set_tex_panner(Model* model, s8 texPannerID) { @@ -1224,44 +2517,135 @@ void set_aux_pan_v(s32 texPannerID, s32 value) { texPannerAuxV[texPannerID] = value; } -INCLUDE_ASM(s32, "a5dd0_len_114e0", set_mdl_custom_gfx_set); +void set_mdl_custom_gfx_set(Model* model, s32 customGfxIndex, u32 fogType) { + if (customGfxIndex == -1) { + customGfxIndex = model->specialDisplayListID & 15; + } + + if (fogType == -1) { + fogType = model->specialDisplayListID / 16; + } + + model->specialDisplayListID = (customGfxIndex & 15) + ((fogType & 15) * 16); +} void set_custom_gfx(s32 customGfxIndex, Gfx* pre, Gfx* post) { - gCurrentModelSpecialDlsPtr[customGfxIndex].pre = pre; - gCurrentModelSpecialDlsPtr[customGfxIndex].post = post; + (*gCurrentCustomModelGfxPtr)[customGfxIndex].pre = pre; + (*gCurrentCustomModelGfxPtr)[customGfxIndex].post = post; } -void set_custom_gfx_builders(s32 customGfxIndex, CustomModelGfxBuilderFunc pre, CustomModelGfxBuilderFunc post) { - gCurrentCustomModelGfxBuilders[customGfxIndex].pre = pre; - gCurrentCustomModelGfxBuilders[customGfxIndex].post = post; +void set_custom_gfx_builders(s32 customGfxIndex, ModelCustomGfxBuilderFunc pre, ModelCustomGfxBuilderFunc post) { + (*gCurrentCustomModelGfxBuildersPtr)[customGfxIndex].pre = pre; + (*gCurrentCustomModelGfxBuildersPtr)[customGfxIndex].post = post; } -INCLUDE_ASM(s32, "a5dd0_len_114e0", build_custom_gfx); +void build_custom_gfx(void) { + Gfx* gfx = gMasterGfxPos; + ModelCustomGfxBuilderFunc preFunc; + ModelCustomGfxBuilderFunc postFunc; + s32 i; + gSPBranchList(gMasterGfxPos++, 0x00000000); + + for (i = 0; i < 0x10; i++) { + preFunc = (*gCurrentCustomModelGfxBuildersPtr)[i].pre; + + if (preFunc != NULL) { + (*gCurrentCustomModelGfxPtr)[i].pre = gMasterGfxPos; + preFunc(i); + gSPEndDisplayList(gMasterGfxPos++); + } + + postFunc = (*gCurrentCustomModelGfxBuildersPtr)[i].post; + if (postFunc != NULL) { + (*gCurrentCustomModelGfxPtr)[i].post = gMasterGfxPos; + postFunc(i); + gSPEndDisplayList(gMasterGfxPos++); + } + } + + gSPBranchList(gfx, gMasterGfxPos); +} + +// weird temps necessary to match /// @returns TRUE if mtx is NULL or identity. -INCLUDE_ASM(s32, "a5dd0_len_114e0", is_identity_fixed_mtx); +s32 is_identity_fixed_mtx(Matrix4s* mtx) { + s32* mtxIt = (s32*)mtx; + s32* identityIt; + s32 i; + + if (mtx == NULL) { + return TRUE; + } + + identityIt = (s32*)&mdl_RDPIdentity; + + for (i = 0; i < 16; i++, mtxIt++, identityIt++) { + if (*mtxIt != *identityIt) { + return FALSE; + } + } + + return TRUE; +} void set_background_color_blend(u8 r, u8 g, u8 b, u8 a) { - D_8014B74D = r; - D_8014B74E = g; - D_8014B74F = b; - D_8014B74C = a; + mdl_bgMultiplyColorR = r; + mdl_bgMultiplyColorG = g; + mdl_bgMultiplyColorB = b; + mdl_bgMultiplyColorA = a; } void get_background_color_blend(u8* r, u8* g, u8* b, u8* a) { - *r = D_8014B74D; - *g = D_8014B74E; - *b = D_8014B74F; - *a = D_8014B74C; + *r = mdl_bgMultiplyColorR; + *g = mdl_bgMultiplyColorG; + *b = mdl_bgMultiplyColorB; + *a = mdl_bgMultiplyColorA; } -INCLUDE_ASM(s32, "a5dd0_len_114e0", set_model_fog_color_parameters); +void set_model_fog_color_parameters(s8 primR, s8 primG, s8 primB, s8 primA, s32 fogR, s32 fogG, s32 fogB, s32 fogStart, + s32 fogEnd) { + mdl_renderModelFogPrimColorR = primR; + mdl_renderModelFogPrimColorG = primG; + mdl_renderModelFogPrimColorB = primB; + mdl_renderModelFogPrimColorA = primA; + mdl_renderModelFogColorR = fogR; + mdl_renderModelFogColorG = fogG; + mdl_renderModelFogColorB = fogB; + mdl_renderModelFogStart = fogStart; + mdl_renderModelFogEnd = fogEnd; +} -INCLUDE_ASM(s32, "a5dd0_len_114e0", get_model_fog_color_parameters); +void get_model_fog_color_parameters(u8* primR, u8* primG, u8* primB, u8* primA, u8* fogR, u8* fogG, u8* fogB, + s32* fogStart, s32* fogEnd) { + *primR = mdl_renderModelFogPrimColorR; + *primG = mdl_renderModelFogPrimColorG; + *primB = mdl_renderModelFogPrimColorB; + *primA = mdl_renderModelFogPrimColorA; + *fogR = mdl_renderModelFogColorR; + *fogG = mdl_renderModelFogColorG; + *fogB = mdl_renderModelFogColorB; + *fogStart = mdl_renderModelFogStart; + *fogEnd = mdl_renderModelFogEnd; +} -INCLUDE_ASM(s32, "a5dd0_len_114e0", set_model_env_color_parameters); +void set_model_env_color_parameters(u8 primR, u8 primG, u8 primB, u8 envR, s32 envG, s32 envB) { + gRenderModelPrimR = primR; + gRenderModelPrimG = primG; + gRenderModelPrimB = primB; + gRenderModelEnvR = envR; + gRenderModelEnvG = envG; + gRenderModelEnvB = envB; +} -INCLUDE_ASM(s32, "a5dd0_len_114e0", get_model_env_color_parameters); +void get_model_env_color_parameters(u8* primR, u8* primG, u8* primB, u8* envR, u8* envG, u8* envB) { + *primR = gRenderModelPrimR; + *primG = gRenderModelPrimG; + *primB = gRenderModelPrimB; + *envR = gRenderModelEnvR; + *envG = gRenderModelEnvG; + *envB = gRenderModelEnvB; +} INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_get_vertex_count); @@ -1271,10 +2655,29 @@ INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_local_gfx_copy_vertices); INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_make_local_vertex_copy); -INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_get_copied_vertices); +void mdl_get_copied_vertices(s32 copyIndex, Vtx** firstVertex, Vtx** copiedVertices, s32* numCopied) { + ModelLocalVertexCopy* mlvc = gCurrentModelLocalVtxBuffers[copyIndex]; + s32 selector = mlvc->selector; -INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_get_copied_gfx); + *firstVertex = mlvc->minVertexAddr; + *copiedVertices = mlvc->vtxCopy[selector]; + *numCopied = mlvc->numVertices; +} +Gfx* mdl_get_copied_gfx(s32 copyIndex) { + ModelLocalVertexCopy* mlvc = gCurrentModelLocalVtxBuffers[copyIndex]; + s32 selector = mlvc->selector; + Gfx* gfxCopy = mlvc->gfxCopy[selector]; + + mlvc->selector++; + if (mlvc->selector >= 2) { + mlvc->selector = 0; + } + + return gfxCopy; +} + +void mdl_project_tex_coords(s32 modelID, Gfx* destGfx, Matrix4f* destMtx, Vtx* destVertices); INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_project_tex_coords); INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011C80C); @@ -1308,27 +2711,45 @@ INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_get_next_texture_address); INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_set_all_fog_mode); -INCLUDE_ASM(s32, "a5dd0_len_114e0", clear_render_tasks); +void clear_render_tasks(void) { + s32 i; -INCLUDE_ASM(s32, "a5dd0_len_114e0", clear_render_tasks_alt); - -RenderTaskEntry* queue_render_task(RenderTask* task) { - RenderTaskEntry* entry = D_801533A0[D_801533AC]; - - ASSERT(D_801533B0 < 0x100); - - entry = &entry[D_801533B0++]; - - entry->unk_00 = 1; - if (task->renderMode == 0x2D) { - entry->unk_00 = 0x21; + for (i = 0; i < 3; i++) { + mdl_renderTaskLists[i] = mdl_clearRenderTasks[i]; } - entry->appendGfxArg = task->appendGfxArg; - entry->appendGfx = task->appendGfx; - entry->unk_04 = D_8014C188[task->renderMode] - task->distance; + mdl_renderTaskMode = 0; + mdl_renderTaskCount = 0; +} - return entry; +void clear_render_tasks_alt(void) { + s32 i; + + for (i = 0; i < 3; i++) { + mdl_renderTaskLists[i] = mdl_clearRenderTasks[i]; + } + + mdl_renderTaskMode = 0; + mdl_renderTaskCount = 0; +} + +RenderTask* queue_render_task(RenderTask* task) { + RenderTask* ret = mdl_renderTaskLists[mdl_renderTaskMode]; + + ASSERT(mdl_renderTaskCount < 0x100); + + ret = &ret[mdl_renderTaskCount++]; + + ret->renderMode = 1; + if (task->renderMode == 0x2D) { + ret->renderMode = 0x21; + } + + ret->appendGfxArg = task->appendGfxArg; + ret->appendGfx = task->appendGfx; + ret->distance = D_8014C188[task->renderMode] - task->distance; + + return ret; } INCLUDE_ASM(s32, "a5dd0_len_114e0", execute_render_tasks); diff --git a/src/curtains.c b/src/curtains.c index e63b48e973..575b188b38 100644 --- a/src/curtains.c +++ b/src/curtains.c @@ -185,15 +185,10 @@ Gfx D_80077140[] = { gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2), gsDPSetTextureLUT(G_TT_NONE), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_8b, ui_no_controller_png_width, ui_no_controller_png), - gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_8b, 16, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, - G_TX_NOMIRROR | G_TX_CLAMP, 7, G_TX_NOLOD), - gsDPLoadSync(), - gsDPLoadTile(G_TX_LOADTILE, 0, 0, 0x01FC, 0x007C), - gsDPPipeSync(), - gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_8b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, - G_TX_NOMIRROR | G_TX_CLAMP, 7, G_TX_NOLOD), - gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x01FC, 0x007C), + gsDPLoadTextureTile(ui_no_controller_png, G_IM_FMT_IA, G_IM_SIZ_8b, ui_no_controller_png_width, + ui_no_controller_png_height, 0, 0, ui_no_controller_png_width - 1, + ui_no_controller_png_height - 1, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 7, + 5, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING), gsSPSetGeometryMode(G_SHADE | G_SHADING_SMOOTH), gsSPEndDisplayList(), diff --git a/src/effects.c b/src/effects.c index 45bf7b65f2..9e83b24361 100644 --- a/src/effects.c +++ b/src/effects.c @@ -427,7 +427,7 @@ void render_effects_UI(void) { Camera* camera = &gCameras[gCurrentCameraID]; gDPPipeSync(gMasterGfxPos++); - gSPViewport(gMasterGfxPos++, &camera->viewport); + gSPViewport(gMasterGfxPos++, &camera->vp); gSPClearGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH | G_CLIPPING | 0x40F9FA); diff --git a/src/evt/cam_api.c b/src/evt/cam_api.c index 672ef78c4e..2fa1ac738a 100644 --- a/src/evt/cam_api.c +++ b/src/evt/cam_api.c @@ -48,9 +48,9 @@ ApiStatus SetCamPerspective(Evt* script, s32 isInitialCall) { Camera* camera = &cameras[id]; camera->farClip = farClip; - camera->mode = mode; + camera->updateMode = mode; camera->unk_06 = 1; - camera->unk_08 = 1; + camera->changingMap = TRUE; camera->vfov = vfov; camera->nearClip = nearClip; return ApiStatus_DONE2; @@ -63,7 +63,7 @@ ApiStatus func_802CA90C(Evt* script, s32 isInitialCall) { Camera* cameras = gCameras; Camera* camera = &cameras[id]; - camera->mode = mode; + camera->updateMode = mode; camera->unk_06 = 0; return ApiStatus_DONE2; } @@ -77,7 +77,7 @@ ApiStatus func_802CA988(Evt* script, s32 isInitialCall) { Bytecode outVar4 = *args++; f32 temp1, temp2, temp3; - gCameras[id].mode = 2; + gCameras[id].updateMode = 2; gCameras[id].unk_06 = 0; gCameras[id].unk_1C = -round(gCameras[id].currentPitch); gCameras[id].unk_1E = -gCameras[id].currentBlendedYawNegated; @@ -249,10 +249,10 @@ ApiStatus PanToTarget(Evt* script, s32 isInitialCall) { camera->unk_506 = 1; if (targetType != 0) { - camera->boolTargetPlayer = 1; + camera->followPlayer = 1; camera->panPhase = panPhase; } else { - camera->boolTargetPlayer = 0; + camera->followPlayer = 0; camera->panPhase = 0.0f; camera->moveSpeed = 1.0f; } @@ -271,8 +271,8 @@ ApiStatus SetCamType(Evt* script, s32 isInitialCall) { s32 controllerType = evt_get_variable(script, *args++); s32 enabled = evt_get_variable(script, *args++); - camera->unk_500 = enabled; - camera->controllerType = controllerType; + camera->controlSettings.flag = enabled; + camera->controlSettings.type = controllerType; return ApiStatus_DONE2; } @@ -284,8 +284,8 @@ ApiStatus SetCamPitch(Evt* script, s32 isInitialCall) { f32 boomPitch = evt_get_float_variable(script, *args++); f32 viewPitch = evt_get_float_variable(script, *args++); - camera->controllerBoomPitch = boomPitch; - camera->controllerViewPitch = viewPitch; + camera->controlSettings.boomPitch = boomPitch; + camera->controlSettings.viewPitch = viewPitch; return ApiStatus_DONE2; } @@ -296,7 +296,7 @@ ApiStatus SetCamDistance(Evt* script, s32 isInitialCall) { Camera* camera = &cameras[id]; f32 boomLength = evt_get_float_variable(script, *args++); - camera->controllerBoomLen = boomLength; + camera->controlSettings.boomLength = boomLength; return ApiStatus_DONE2; } @@ -308,8 +308,8 @@ ApiStatus SetCamPosA(Evt* script, s32 isInitialCall) { f32 x = evt_get_float_variable(script, *args++); f32 z = evt_get_float_variable(script, *args++); - camera->posA.x = x; - camera->posA.z = z; + camera->controlSettings.posA.x = x; + camera->controlSettings.posA.z = z; return ApiStatus_DONE2; } @@ -321,8 +321,8 @@ ApiStatus SetCamPosB(Evt* script, s32 isInitialCall) { f32 x = evt_get_float_variable(script, *args++); f32 z = evt_get_float_variable(script, *args++); - camera->posB.x = x; - camera->posB.z = z; + camera->controlSettings.posB.x = x; + camera->controlSettings.posB.z = z; return ApiStatus_DONE2; } @@ -334,8 +334,8 @@ ApiStatus SetCamPosC(Evt* script, s32 isInitialCall) { f32 y1 = evt_get_float_variable(script, *args++); f32 y2 = evt_get_float_variable(script, *args++); - camera->posA.y = y1; - camera->posB.y = y2; + camera->controlSettings.posA.y = y1; + camera->controlSettings.posB.y = y2; return ApiStatus_DONE2; } @@ -374,8 +374,8 @@ ApiStatus GetCamType(Evt* script, s32 isInitialCall) { Camera* cameras = gCameras; Camera* camera = &cameras[id]; - evt_set_variable(script, outVar1, camera->controllerType); - evt_set_variable(script, outVar2, camera->unk_500); + evt_set_variable(script, outVar1, camera->controlSettings.type); + evt_set_variable(script, outVar2, camera->controlSettings.flag); return ApiStatus_DONE2; } @@ -387,8 +387,8 @@ ApiStatus GetCamPitch(Evt* script, s32 isInitialCall) { Camera* cameras = gCameras; Camera* camera = &cameras[id]; - evt_set_float_variable(script, outVar1, camera->controllerBoomPitch); - evt_set_float_variable(script, outVar2, camera->controllerViewPitch); + evt_set_float_variable(script, outVar1, camera->controlSettings.boomPitch); + evt_set_float_variable(script, outVar2, camera->controlSettings.viewPitch); return ApiStatus_DONE2; } @@ -399,7 +399,7 @@ ApiStatus GetCamDistance(Evt* script, s32 isInitialCall) { Camera* cameras = gCameras; Camera* camera = &cameras[id]; - evt_set_float_variable(script, outVar1, camera->controllerBoomLen); + evt_set_float_variable(script, outVar1, camera->controlSettings.boomLength); return ApiStatus_DONE2; } @@ -411,8 +411,8 @@ ApiStatus GetCamPosA(Evt* script, s32 isInitialCall) { Camera* cameras = gCameras; Camera* camera = &cameras[id]; - evt_set_float_variable(script, outVar1, camera->posA.x); - evt_set_float_variable(script, outVar2, camera->posA.z); + evt_set_float_variable(script, outVar1, camera->controlSettings.posA.x); + evt_set_float_variable(script, outVar2, camera->controlSettings.posA.z); return ApiStatus_DONE2; } @@ -424,8 +424,8 @@ ApiStatus GetCamPosB(Evt* script, s32 isInitialCall) { Camera* cameras = gCameras; Camera* camera = &cameras[id]; - evt_set_float_variable(script, outVar1, camera->posB.x); - evt_set_float_variable(script, outVar2, camera->posB.z); + evt_set_float_variable(script, outVar1, camera->controlSettings.posB.x); + evt_set_float_variable(script, outVar2, camera->controlSettings.posB.z); return ApiStatus_DONE2; } @@ -437,8 +437,8 @@ ApiStatus GetCamPosC(Evt* script, s32 isInitialCall) { Camera* cameras = gCameras; Camera* camera = &cameras[id]; - evt_set_float_variable(script, outVar1, camera->posA.y); - evt_set_float_variable(script, outVar2, camera->posB.y); + evt_set_float_variable(script, outVar1, camera->controlSettings.posA.y); + evt_set_float_variable(script, outVar2, camera->controlSettings.posB.y); return ApiStatus_DONE2; } @@ -464,7 +464,7 @@ ApiStatus WaitForCam(Evt* script, s32 isInitialCall) { Camera* cameras = gCameras; Camera* camera = &cameras[id]; - if (isInitialCall || !(endInterpValue <= camera->sinInterpAlpha)) { + if (isInitialCall || !(endInterpValue <= camera->interpAlpha)) { return ApiStatus_BLOCK; } return ApiStatus_DONE2; diff --git a/src/evt/map_api.c b/src/evt/map_api.c index d74dfcb788..b94759720f 100644 --- a/src/evt/map_api.c +++ b/src/evt/map_api.c @@ -511,7 +511,7 @@ ApiStatus ResetFromLava(Evt* script, s32 isInitialCall) { LavaReset* lavaReset; if (isInitialCall) { - lavaReset = gLavaResetList = evt_get_variable(script, *args++); + lavaReset = gLavaResetList = (LavaReset*)evt_get_variable(script, *args++); while (TRUE) { if (lavaReset->colliderID == -1) { @@ -647,7 +647,7 @@ void goto_map(Evt* script, s32 mode) { areaID = evt_get_variable(script, *args++); mapID = evt_get_variable(script, *args++); } else { - get_map_IDs_by_name(evt_get_variable(script, *args++), &areaID, &mapID); + get_map_IDs_by_name((char*)evt_get_variable(script, *args++), &areaID, &mapID); } gGameStatusPtr->areaID = areaID; diff --git a/src/evt/script_list.c b/src/evt/script_list.c index 678012fe8c..40752bca9a 100644 --- a/src/evt/script_list.c +++ b/src/evt/script_list.c @@ -167,7 +167,9 @@ Evt* start_script(EvtSource* source, s32 priority, s32 initialState) { ASSERT(i < MAX_SCRIPTS); curScriptIndex = i; - SCRIPT_ALLOC(newScript, curScriptIndex); + (*gCurrentScriptListPtr)[curScriptIndex] = newScript = heap_malloc(sizeof(*newScript)); + gNumScripts++; + ASSERT(newScript != NULL); newScript->state = initialState | 1; newScript->currentOpcode = 0; @@ -290,11 +292,10 @@ Evt* start_script_in_group(EvtSource* source, u8 priority, u8 initialState, u8 g } Evt* start_child_script(Evt* parentScript, EvtSource* source, s32 initialState) { - s32 i; s32 curScriptIndex; s32 scriptListCount; - s32* tempCounter; Evt* child; + s32 i; for (i = 0; i < MAX_SCRIPTS; i++) { if ((*gCurrentScriptListPtr)[i] == NULL) { @@ -303,9 +304,10 @@ Evt* start_child_script(Evt* parentScript, EvtSource* source, s32 initialState) } ASSERT(i < MAX_SCRIPTS); - curScriptIndex = i; - SCRIPT_ALLOC(child, curScriptIndex); + + (*gCurrentScriptListPtr)[curScriptIndex] = child = heap_malloc(sizeof(*child)); + gNumScripts++; ASSERT(child != NULL); parentScript->childScript = child; @@ -352,9 +354,8 @@ Evt* start_child_script(Evt* parentScript, EvtSource* source, s32 initialState) suspend_frozen_scripts(child); - tempCounter = &gStaticScriptCounter; - if (*tempCounter == 0) { - *tempCounter = 1; + if (gStaticScriptCounter == 0) { + gStaticScriptCounter = 1; } return child; @@ -374,7 +375,10 @@ Evt* func_802C39F8(Evt* parentScript, Bytecode* nextLine, s32 newState) { ASSERT(i < MAX_SCRIPTS); curScriptIndex = i; - SCRIPT_ALLOC(child, curScriptIndex); + + (*gCurrentScriptListPtr)[curScriptIndex] = child = heap_malloc(sizeof(*child)); + gNumScripts++; + ASSERT(child != NULL); child->state = newState | 1; child->ptrNextLine = nextLine; @@ -579,7 +583,9 @@ void kill_script(Evt* instanceToKill) { instanceToKill->userData = NULL; } - SCRIPT_FREE(i); + heap_free((*gCurrentScriptListPtr)[i]); + (*gCurrentScriptListPtr)[i] = NULL; + gNumScripts--; } void kill_script_by_ID(s32 id) { @@ -676,16 +682,16 @@ Trigger* bind_trigger_1(EvtSource* script, s32 flags, s32 triggerFlagIndex, s32 } void suspend_group_script(Evt* script, s32 groupFlags) { - int i; - Evt* scriptContextPtr; Evt* childScript = script->childScript; + s32 i; if (childScript != NULL) { suspend_group_script(childScript, groupFlags); } for (i = 0; i < MAX_SCRIPTS; i++) { - scriptContextPtr = (*gCurrentScriptListPtr)[i]; + Evt* scriptContextPtr = (*gCurrentScriptListPtr)[i]; + if (scriptContextPtr != NULL && scriptContextPtr->parentScript == script) { suspend_group_script(scriptContextPtr, groupFlags); } @@ -697,16 +703,16 @@ void suspend_group_script(Evt* script, s32 groupFlags) { } void resume_group_script(Evt* script, s32 groupFlags) { - int i; - Evt* scriptContextPtr; Evt* childScript = script->childScript; + s32 i; if (childScript != NULL) { resume_group_script(childScript, groupFlags); } for (i = 0; i < MAX_SCRIPTS; i++) { - scriptContextPtr = (*gCurrentScriptListPtr)[i]; + Evt* scriptContextPtr = (*gCurrentScriptListPtr)[i]; + if (scriptContextPtr != NULL && scriptContextPtr->parentScript == script) { suspend_group_script(scriptContextPtr, groupFlags); } @@ -719,10 +725,10 @@ void resume_group_script(Evt* script, s32 groupFlags) { s32 suspend_all_script(s32 id) { s32 i; - Evt* scriptContextPtr; for (i = 0; i < MAX_SCRIPTS; i++) { - scriptContextPtr = (*gCurrentScriptListPtr)[i]; + Evt* scriptContextPtr = (*gCurrentScriptListPtr)[i]; + if (scriptContextPtr != NULL && scriptContextPtr->id == id) { suspend_group_script(scriptContextPtr, 0xEF); } @@ -833,9 +839,8 @@ Evt* get_script_by_id(s32 id) { } void set_script_flags(Evt* script, s32 flags) { - int i; - Evt* scriptContextPtr; Evt* childScript = script->childScript; + s32 i; script->state |= flags; if (childScript != NULL) { @@ -843,7 +848,8 @@ void set_script_flags(Evt* script, s32 flags) { } for (i = 0; i < MAX_SCRIPTS; i++) { - scriptContextPtr = (*gCurrentScriptListPtr)[i]; + Evt* scriptContextPtr = (*gCurrentScriptListPtr)[i]; + if (scriptContextPtr != NULL && scriptContextPtr->parentScript == script) { set_script_flags(script->parentScript, flags); } @@ -851,9 +857,8 @@ void set_script_flags(Evt* script, s32 flags) { } void clear_script_flags(Evt* script, s32 flags) { - int i; - Evt* scriptContextPtr; Evt* childScript = script->childScript; + s32 i; script->state &= ~flags; if (childScript != NULL) { @@ -861,7 +866,8 @@ void clear_script_flags(Evt* script, s32 flags) { } for (i = 0; i < MAX_SCRIPTS; i++) { - scriptContextPtr = (*gCurrentScriptListPtr)[i]; + Evt* scriptContextPtr = (*gCurrentScriptListPtr)[i]; + if (scriptContextPtr != NULL && scriptContextPtr->parentScript == script) { clear_script_flags(scriptContextPtr, flags); } diff --git a/src/game_modes.c b/src/game_modes.c index 399cde4d36..14b150f036 100644 --- a/src/game_modes.c +++ b/src/game_modes.c @@ -67,10 +67,10 @@ StateFunc D_80077828[] = { NULL, state_init_intro, state_step_intro, NULL, state StateFunc D_8007783C[] = { NULL, state_init_demo, state_step_demo, NULL, state_drawUI_demo }; -StateFunc gameModeMap[] = { - &gameModeBlueprints, &D_800776FC, &D_80077710, &D_80077724, &D_80077774, &D_80077738, &D_8007774C, &D_80077760, - &D_80077788, &D_8007779C, &D_800777B0, &D_800777C4, &D_800777D8, &D_800777EC, &D_80077800, &D_80077814, &D_80077828, - &D_8007783C, NULL, NULL, +StateFunc* gameModeMap[] = { + gameModeBlueprints, D_800776FC, D_80077710, D_80077724, D_80077774, D_80077738, D_8007774C, D_80077760, D_80077788, + D_8007779C, D_800777B0, D_800777C4, D_800777D8, D_800777EC, D_80077800, D_80077814, D_80077828, D_8007783C, NULL, + NULL, }; // BSS diff --git a/src/main_loop.c b/src/main_loop.c index 727080a582..8c54b5adf2 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -407,17 +407,9 @@ void func_80027BAC(s32 arg0, s32 arg1) { gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); for (i = 0; i < 40; i++) { - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, arg0 + (0xF00 * i)); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 0x0000, G_TX_LOADTILE, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, - G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x04FC, 0x0014); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 0x0000, G_TX_RENDERTILE, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, - G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 0x04FC, 0x0014); + gDPLoadTextureTile(gMasterGfxPos++, arg0 + (0xF00 * i), G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, + SCREEN_HEIGHT, 0, 0, SCREEN_WIDTH - 1, 5, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPTextureRectangle(gMasterGfxPos++, 0, i * temp, 0x04FC, (i * 24) + 20, G_TX_RENDERTILE, 0, 0, 0x1000, 0x0400); gDPPipeSync(gMasterGfxPos++); } @@ -482,17 +474,9 @@ void gfx_draw_background(void) { gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); for (i = 0; i < 40; i++) { - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxZBuffer + (i * 0x780)); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 0x0000, G_TX_LOADTILE, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, - G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x04FC, 0x0014); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 0x0000, G_TX_RENDERTILE, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, - G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 0x04FC, 0x0014); + gDPLoadTextureTile(gMasterGfxPos++, nuGfxZBuffer + (i * 0x780), G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, + SCREEN_HEIGHT, 0, 0, SCREEN_WIDTH - 1, 5, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPTextureRectangle(gMasterGfxPos++, 0, i * a, 0x0500, a + (i * 0x18), G_TX_RENDERTILE, -0x0020, 0, 0x0400, 0x0400); gDPPipeSync(gMasterGfxPos++); diff --git a/src/npc.h b/src/npc.h index cb570e420f..669dbbd814 100644 --- a/src/npc.h +++ b/src/npc.h @@ -94,13 +94,13 @@ void npc_draw_with_palswap(Npc* npc, s32 arg1, s32 arg2); void npc_draw_palswap_mode_0(Npc* npc, s32 arg1, s32 arg2); -s32 npc_draw_palswap_mode_1(); +s32 npc_draw_palswap_mode_1(Npc*, s32, s32); -s32 npc_blend_palette_colors(); +s32 npc_blend_palette_colors(void); -s32 npc_draw_palswap_mode_2(); +s32 npc_draw_palswap_mode_2(Npc*, s32, s32, s32); -s32 npc_draw_palswap_mode_4(); +s32 npc_draw_palswap_mode_4(Npc*, s32, s32); void npc_set_decoration(Npc* npc, s32 idx, s32 decorationType); diff --git a/src/state_file_select.c b/src/state_file_select.c index 185b16a678..4c0c166b62 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -38,7 +38,7 @@ void state_init_file_select(void) { set_hud_element_nonworld_cache(0, 0); clear_hud_element_cache(); load_model_textures(0, 0, 0); - gCameras[0].mode = 6; + gCameras[0].updateMode = 6; gCameras[0].unk_06 = 1; gCameras[0].nearClip = 16; gCameras[0].farClip = 4096; diff --git a/src/state_logos.c b/src/state_logos.c index dd18c24f04..45af71ff9b 100644 --- a/src/state_logos.c +++ b/src/state_logos.c @@ -36,7 +36,7 @@ void state_init_logos(void) { nuContRmbForceStop(); create_cameras_a(); - gCameras[0].mode = 6; + gCameras[0].updateMode = 6; gCameras[0].unk_06 = 1; gCameras[0].nearClip = 0x10; gCameras[0].farClip = 0x1000; diff --git a/src/state_title_screen.c b/src/state_title_screen.c index 564112ebe4..e7ce340f30 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -117,15 +117,8 @@ void title_screen_draw_press_start(void) { gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0xF8, 0xF0, 0x98, D_80077A28); gDPPipeSync(gMasterGfxPos++); - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, D_800A0980); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadBlock(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 2047, 128); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 0x01FC, 0x007C); + gDPLoadTextureBlock(gMasterGfxPos++, D_800A0980, G_IM_FMT_IA, G_IM_SIZ_8b, 128, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPTextureRectangle(gMasterGfxPos++, 0x0180, 0x0224, 0x0380, 0x02A4, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); gDPPipeSync(gMasterGfxPos++); } @@ -149,15 +142,9 @@ void title_screen_draw_copyright(f32 arg0) { for (i = 0; i < 2; i++) { alpha = 0; // TODO figure out why this is needed - gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_IA, G_IM_SIZ_8b, 144, &D_800A097C[0x240 * i]); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_IA, G_IM_SIZ_8b, 18, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPLoadSync(gMasterGfxPos++); - gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x023C, 0x003C); - gDPPipeSync(gMasterGfxPos++); - gDPSetTile(gMasterGfxPos++, G_IM_FMT_IA, G_IM_SIZ_8b, 18, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 0x023C, 0x003C); + gDPLoadTextureTile(gMasterGfxPos++, &D_800A097C[0x240 * i], G_IM_FMT_IA, G_IM_SIZ_8b, 144, 32, 0, 0, 143, 15, 0, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, + G_TX_NOLOD); gSPTextureRectangle(gMasterGfxPos++, 0x0164, 0x2FC + (0x40 * i), 0x03A4, 0x33C + (0x40 * i), G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); } diff --git a/src/world/area_arn/arn_04/arn_04.h b/src/world/area_arn/arn_04/arn_04.h index eb315cb05f..98cf5b7ce5 100644 --- a/src/world/area_arn/arn_04/arn_04.h +++ b/src/world/area_arn/arn_04/arn_04.h @@ -13,5 +13,3 @@ extern EvtSource N(main); extern EvtSource N(802433D0); extern NpcGroupList N(npcGroupList_80244000); extern EvtSource N(makeEntities); - -extern s16 gCurrentCamID; diff --git a/src/world/script_api/7E4690.c b/src/world/script_api/7E4690.c index de3c0212e8..e4d5a42e9e 100644 --- a/src/world/script_api/7E4690.c +++ b/src/world/script_api/7E4690.c @@ -59,7 +59,7 @@ ApiStatus SetPlayerPositionFromSaveData(Evt* script, s32 isInitialCall) { enable_partner_ai(); } - camera->unk_08 = 1; + camera->changingMap = TRUE; return ApiStatus_DONE2; } diff --git a/tools/build/configure.py b/tools/build/configure.py index e9327e9c3c..a827c37b09 100755 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -54,8 +54,8 @@ def write_ninja_rules(ninja: ninja_syntax.Writer, cpp: str, cppflags: str, extra cxx = f"{BUILD_TOOLS}/cc/gcc/g++" compile_script = f"$python {BUILD_TOOLS}/cc_dsl/compile_script.py" - CPPFLAGS = "-w -Iver/$version/build/include -Iinclude -Isrc -Iassets/$version -D_LANGUAGE_C -D_FINALROM -DVERSION=$version " \ - "-ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32" + CPPFLAGS = "-w -Iver/$version/build/include -Iinclude -Isrc -Iassets/$version -D_LANGUAGE_C -D_FINALROM " \ + "-DVERSION=$version -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 -nostdinc" cflags = f"-c -G0 -O2 -fno-common -B {BUILD_TOOLS}/cc/gcc/ {extra_cflags}" @@ -185,6 +185,9 @@ OS_K0_TO_PHYSICAL = "int" "G_.*" = "int" "TEXEL.*" = "int" PRIMITIVE = "int" + +[decompme.compilers] +"tools/build/cc/gcc/gcc" = "gcc2.8.1" """) def write_ninja_for_tools(ninja: ninja_syntax.Writer): diff --git a/tools/sortsymz.py b/tools/sortsymz.py new file mode 100644 index 0000000000..0b7c7af035 --- /dev/null +++ b/tools/sortsymz.py @@ -0,0 +1,56 @@ +import os + + +syms = [] +groups = {} + +with open("tools/symz.txt") as f: + for line in f.readlines(): + name, addr = line.strip().strip(";").split(" = ") + syms.append((name, int(addr, 0), set())) + +# Search src for syms +for root, dirs, files in os.walk("src"): + for file in files: + if file.endswith(".c"): + with open(os.path.join(root, file)) as f: + text = f.read() + for sym in syms: + if sym[0] in text: + sym[2].add(os.path.join(root, file).replace("src/", "")[:-2]) + +# Search asm for syms +for root, dirs, files in os.walk("ver/us/asm"): + for file in files: + if file.endswith(".s"): + with open(os.path.join(root, file)) as f: + text = f.read() + for sym in syms: + if sym[0] in text: + sym[2].add(root.replace("ver/us/asm/nonmatchings/", "")) + +for sym in syms: + if len(sym[2]) == 0: + group = "" + elif len(sym[2]) > 1: + group = "multig" + else: + group = next(iter(sym[2])) + + if group not in groups: + groups[group] = [] + groups[group].append(sym) + +for group in groups: + if group == "": + print("The following symbols can be simply removed from undefined_syms:") + elif group == "multig": + print("The following symbols are found in multiple locations:") + else: + print(group + ":") + + sorted_syms = sorted(groups[group], key=lambda tup: tup[1]) + + for sym in sorted_syms: + print(f"{sym[0]} = 0x{sym[1]:X}") + print() diff --git a/tools/symz.txt b/tools/symz.txt new file mode 100644 index 0000000000..96247022a2 --- /dev/null +++ b/tools/symz.txt @@ -0,0 +1,1276 @@ +D_00000094 = 0x94; +D_00000094_2 = 0x94; +D_000001E4 = 0x1E4; +D_0A000808 = 0x0A000808; +D_0A000328 = 0x0A000328; +D_0A000380 = 0x0A000380; +D_0A000740 = 0x0A000740; +D_0A000750 = 0x0A000750; +D_0A000800 = 0x0A000800; +D_0A000EE8 = 0x0A000EE8; +D_0A000EF8 = 0x0A000EF8; +D_0A004350 = 0x0A004350; +D_0A0026F0 = 0x0A0026F0; +D_0A0031E0 = 0x0A0031E0; +D_0A001508 = 0x0A001508; +D_0A0031B0 = 0x0A0031B0; +D_0A0014D8 = 0x0A0014D8; +D_0A002F78 = 0x0A002F78; +D_0A001218 = 0x0A001218; +D_0A003F70 = 0x0A003F70; +D_0A002318 = 0x0A002318; +D_0A003508 = 0x0A003508; +D_00E32420 = 0x00E32420; +D_00E35670 = 0x00E35670; +D_00E38890 = 0x00E38890; +D_00E3B870 = 0x00E3B870; +D_00E3E260 = 0x00E3E260; +D_00E42240 = 0x00E42240; +D_00E4B2E0 = 0x00E4B2E0; +D_00E4E7F0 = 0x00E4E7F0; +D_00E62370 = 0x00E62370; +D_00E62AC0 = 0x00E62AC0; +D_00E639C0 = 0x00E639C0; +D_00E648D0 = 0x00E648D0; +gBackgroundImage = 0x80200000; +func_80242040_8B20B0 = 0x80242040; +spiked_goomba = 0x8021B0AC; +paragoomba = 0x8021CD00; +D_802C05CC = 0x802C05CC; +gPauseMenuStrings = 0x8026F778; +D_802442D0 = 0x802442D0; +D_802AB513 = 0x802AB513; +D_802E9904 = 0x802E9904; +D_802E98E0 = 0x802E98E0; +D_802E99DC = 0x802E99DC; +D_80093DB0 = 0x80093DB0; +D_80247AF0_CCB300 = 0x80247AF0; +D_802491C0_CA70E0 = 0x802491C0; +D_80246568_C8C018 = 0x80246568; +D_8024B9A8_B8FB28 = 0x8024B9A8; +D_8038F800 = 0x8038F800; +D_803B5000 = 0x803B5000; +D_802EF0D0 = 0x802EF0D0; +D_800FBB60 = 0x800FBB60; +D_800FBBE0 = 0x800FBBE0; +D_7012BC11 = 0x7012BC11; +D_7012ACA1 = 0x7012ACA1; +D_80200000 = 0x80200000; +D_80000000 = 0x80000000; +osTvType = 0x80000300; +D_80000308 = 0x80000308; +D_8000030C = 0x8000030C; +D_80000318 = 0x80000318; +D_8000031C = 0x8000031C; +D_80026AC7 = 0x80026AC7; +D_8004AA85 = 0x8004AA85; +D_80117160 = 0x80117160; +D_80117163 = 0x80117163; +D_80117578 = 0x80117578; +D_80117604 = 0x80117604; +D_8011762C = 0x8011762C; +D_80117840 = 0x80117840; +D_80117848 = 0x80117848; +D_80117852 = 0x80117852; +D_801512B0 = 0x801512B0; +D_801512B4 = 0x801512B4; +D_800A08C0 = 0x800A08C0; +gCurrentCustomModelGfxBuildersPtr = 0x801512B8; +D_801512BC = 0x801512BC; +D_801512C0 = 0x801512C0; +gEntityHeapBase = 0x801512C4; +D_801512C8 = 0x801512C8; +gCurrentModels = 0x801512CC; +D_801512D0 = 0x801512D0; +D_801512D4 = 0x801512D4; +gMsgBGScrollAmtX = 0x801512D8; +D_801512DA = 0x801512DA; +gCurrentTransformGroups = 0x801512E0; +gMsgGlobalWaveCounter = 0x801512E4; +gCurrentCustomModelGfxPtr = 0x801512E8; +gLastCreatedEntityIndex = 0x801512EC; +D_801512F0 = 0x801512F0; +gMsgVarImages = 0x801512F4; +D_801512F8 = 0x801512F8; +gCurrentModelTreeRoot = 0x801512FC; +D_80151300 = 0x80151300; +D_80151304 = 0x80151304; +D_80151308 = 0x80151308; +gMsgBGScrollAmtY = 0x8015130C; +D_8015130E = 0x8015130E; +D_80151310 = 0x80151310; +D_80151314 = 0x80151314; +gEntityModelCount = 0x80151318; +D_8015131C = 0x8015131C; +D_80151324 = 0x80151324; +D_80151328 = 0x80151328; +D_8015132C = 0x8015132C; +D_80151330 = 0x80151330; +gTriggerCount = 0x80151334; +D_80151338 = 0x80151338; +D_8015133C = 0x8015133C; +gCurrentDoorSoundsSet = 0x80151340; +D_80151344 = 0x80151344; +gWorldEntityList = 0x80151380; +gBattleEntityList = 0x801513F8; +gCurrentEntityListPtr = 0x80151470; +gWorldShadowList = 0x80151478; +gBattleShadowList = 0x80151568; +gCurrentShadowListPtr = 0x80151658; +wStaticEntityDataSize = 0x8015165C; +bStaticEntityDataSize = 0x80151660; +wStaticEntityData = 0x80151668; +D_801516DC = 0x801516DC; +bStaticEntityData = 0x801516E8; +D_801516F4 = 0x801516F4; +D_801516FC = 0x801516FC; +gMainGameState = 0x80151700; +gCurrentTileDescriptor = 0x80151740; +wModelList = 0x80151770; +bModelList = 0x80151B70; +wTransformGroups = 0x80151F70; +bTransformGroups = 0x80151F80; +wModelSpecialDls = 0x80151F90; +bModelSpecialDls = 0x80152010; +wCustomModelGfxBuilders = 0x80152090; +bCustomModelGfxBuilders = 0x80152110; +D_80152190 = 0x80152190; +D_801521D0 = 0x801521D0; +gCurrentModelLocalVtxBuffers = 0x80152210; +D_80152214 = 0x80152214; +D_80152218 = 0x80152218; +D_80152220 = 0x80152220; +D_80152A20 = 0x80152A20; +wBgRenderType = 0x80153220; +bBgRenderType = 0x80153221; +mdl_treeIterPos = 0x80153224; +D_80153226 = 0x80153226; +wFogSettings = 0x80153228; +bFogSettings = 0x80153248; +gCurrentFogSettings = 0x80153264; +texPannerMainU = 0x80153268; +texPannerMainV = 0x801532A8; +texPannerAuxU = 0x801532E8; +texPannerAuxV = 0x80153328; +mdl_nextTextureAddress = 0x80153368; +mdl_currentTransformGroupChildIndex = 0x8015336C; +D_8015336E = 0x8015336E; +D_80153370 = 0x80153370; +D_80153374 = 0x80153374; +D_80153376 = 0x80153376; +D_80153380 = 0x80153380; +mdl_renderTaskLists = 0x801533A0; +mdl_renderTaskMode = 0x801533AC; +mdl_renderTaskCount = 0x801533B0; +D_801533C0 = 0x801533C0; +D_801536B8 = 0x801536B8; +D_801536C0 = 0x801536C0; +D_801539B8 = 0x801539B8; +D_801539C0 = 0x801539C0; +D_80153A00 = 0x80153A00; +gCurrentAnimMeshListPtr = 0x80153A40; +D_80153A44 = 0x80153A44; +D_80153A48 = 0x80153A48; +D_80153A4B = 0x80153A4B; +D_80153A4C = 0x80153A4C; +D_80153A4F = 0x80153A4F; +D_80153A50 = 0x80153A50; +D_80153A53 = 0x80153A53; +D_80153A54 = 0x80153A54; +D_80153A57 = 0x80153A57; +D_80153A58 = 0x80153A58; +D_80153A5C = 0x80153A5C; +D_80153A60 = 0x80153A60; +D_80153A68 = 0x80153A68; +D_80153AA8 = 0x80153AA8; +D_80153AE8 = 0x80153AE8; +D_80153B28 = 0x80153B28; +D_80153B68 = 0x80153B68; +gWorldEntityModelList = 0x80153B70; +gBattleEntityModelList = 0x80153F70; +gCurrentEntityModelList = 0x80154370; +D_80154374 = 0x80154374; +entity_fog_enabled = 0x80154378; +entity_fog_red = 0x8015437C; +D_8015437F = 0x8015437F; +entity_fog_green = 0x80154380; +D_80154383 = 0x80154383; +entity_fog_blue = 0x80154384; +D_80154387 = 0x80154387; +entity_fog_alpha = 0x80154388; +D_8015438B = 0x8015438B; +entity_fog_dist_min = 0x8015438C; +entity_fog_dist_max = 0x80154390; +gWorldDynamicEntityList = 0x801543A0; +gBattleDynamicEntityList = 0x801543E0; +gCurrentDynamicEntityListPtr = 0x80154420; +gMessageBuffers = 0x80154430; +gMessagePrinters = 0x80154C30; +gMessageStringVars = 0x80155C38; +D_80155C98 = 0x80155C98; +gMessageWindowProjMatrix = 0x80155CA0; +D_80155D20 = 0x80155D20; +gMessageDrawStatePtr = 0x80155D74; +D_80155D80 = 0x80155D80; +D_80155D84 = 0x80155D84; +D_80155D88 = 0x80155D88; +D_80155D8C = 0x80155D8C; +D_80155D8E = 0x80155D8E; +D_80155D90 = 0x80155D90; +D_80155DA0 = 0x80155DA0; +D_801561A0 = 0x801561A0; +D_801565A0 = 0x801565A0; +D_801565A4 = 0x801565A4; +D_801565A6 = 0x801565A6; +D_801565A8 = 0x801565A8; +D_801565B0 = 0x801565B0; +D_801568E0 = 0x801568E0; +D_801568E4 = 0x801568E4; +D_801568E8 = 0x801568E8; +D_801568EC = 0x801568EC; +D_801568F0 = 0x801568F0; +D_801568F4 = 0x801568F4; +D_801568F8 = 0x801568F8; +D_80156900 = 0x80156900; +D_80156903 = 0x80156903; +D_80156904 = 0x80156904; +D_80156908 = 0x80156908; +D_8015690B = 0x8015690B; +D_8015690C = 0x8015690C; +D_80156948 = 0x80156948; +D_80156950 = 0x80156950; +D_80156954 = 0x80156954; +D_80156958 = 0x80156958; +D_80156960 = 0x80156960; +D_80156968 = 0x80156968; +D_80156970 = 0x80156970; +D_80156980 = 0x80156980; +D_80156F20 = 0x80156F20; +D_80156F60 = 0x80156F60; +D_80157460 = 0x80157460; +hudElements = 0x80157960; +D_80157964 = 0x80157964; +D_80157968 = 0x80157968; +D_80157970 = 0x80157970; +D_80157F70 = 0x80157F70; +D_80158570 = 0x80158570; +D_80158574 = 0x80158574; +D_80158580 = 0x80158580; +D_80158B80 = 0x80158B80; +D_80159180 = 0x80159180; +wTriggerList = 0x80159190; +bTriggerList = 0x80159290; +gCurrentTriggerListPtr = 0x80159390; +D_801593A0 = 0x801593A0; +D_8015959E = 0x8015959E; +D_801595A0 = 0x801595A0; +D_801595C0 = 0x801595C0; +D_80159670 = 0x80159670; +D_80159720 = 0x80159720; +D_801597D0 = 0x801597D0; +D_80159880 = 0x80159880; +D_801598A0 = 0x801598A0; +D_801599B8 = 0x801599B8; +D_80159AD0 = 0x80159AD0; +D_80159AD4 = 0x80159AD4; +gMusicUnkVolume = 0x80159AE0; +gMusicTargetVolume = 0x80159AE2; +gMusicUnkVolume2 = 0x80159AE4; +gMusicCurrentVolume = 0x80159AE6; +gMusicSettings = 0x80159AF0; +D_80159B08 = 0x80159B08; +D_80159B50 = 0x80159B50; +gWindows = 0x80159D50; +D_80159D54 = 0x80159D54; +D_80159E7E = 0x80159E7E; +D_8015A010 = 0x8015A010; +D_8015A070 = 0x8015A070; +D_8015A07C = 0x8015A07C; +D_8015A1E2 = 0x8015A1E2; +D_8015A2BC = 0x8015A2BC; +D_8015A2BE = 0x8015A2BE; +D_8015A2D0 = 0x8015A2D0; +D_8015A370 = 0x8015A370; +gCollisionStatus = 0x8015A550; +D_8015A578 = 0x8015A578; +D_8015A57A = 0x8015A57A; +mdl_textureHandles = 0x8015A590; +D_8015C74C = 0x8015C74C; +D_8015C790 = 0x8015C790; +D_8015C7A4 = 0x8015C7A4; +D_8015C7A8 = 0x8015C7A8; +D_8015C7C0 = 0x8015C7C0; +D_8015C7D0 = 0x8015C7D0; +D_8015C7D2 = 0x8015C7D2; +D_8015C7D8 = 0x8015C7D8; +D_8015C7E0 = 0x8015C7E0; +D_80164000 = 0x80164000; +D_80169B12 = 0x80169B12; +D_80169B16 = 0x80169B16; +D_80197000 = 0x80197000; +D_801A6000 = 0x801A6000; +D_801A7000 = 0x801A7000; +D_801AA000 = 0x801AA000; +D_80210000 = 0x80210000; +D_80219040 = 0x80219040; +D_80220740 = 0x80220740; +D_80220744 = 0x80220744; +D_80220750 = 0x80220750; +D_80220754 = 0x80220754; +D_80220760 = 0x80220760; +D_80220770 = 0x80220770; +D_80220780 = 0x80220780; +D_80224D60 = 0x80224D60; +D_80224D64 = 0x80224D64; +D_80224D70 = 0x80224D70; +D_80224D74 = 0x80224D74; +D_80224D80 = 0x80224D80; +D_80224D90 = 0x80224D90; +D_80224DA0 = 0x80224DA0; +D_80224DB0 = 0x80224DB0; +D_8022ADD0 = 0x8022ADD0; +D_8022B550 = 0x8022B550; +D_802310D0 = 0x802310D0; +D_80232C20 = 0x80232C20; +D_80232C4C = 0x80232C4C; +D_80232C50 = 0x80232C50; +D_80235E00 = 0x80235E00; +D_802367F0 = 0x802367F0; +D_8023BD70 = 0x8023BD70; +D_8023BD78 = 0x8023BD78; +D_8023BD98 = 0x8023BD98; +D_8023BDB4 = 0x8023BDB4; +D_8023BDB8 = 0x8023BDB8; +D_8023BDBC = 0x8023BDBC; +D_8023BDC0 = 0x8023BDC0; +D_8023BDC4 = 0x8023BDC4; +D_8023BDC8 = 0x8023BDC8; +D_8023C070 = 0x8023C070; +D_8023C1B0 = 0x8023C1B0; +D_8023C1B4 = 0x8023C1B4; +D_8023C1B8 = 0x8023C1B8; +D_8023C1BC = 0x8023C1BC; +D_8023C1C0 = 0x8023C1C0; +D_8023C1C4 = 0x8023C1C4; +D_8023C1C8 = 0x8023C1C8; +D_8023C1CC = 0x8023C1CC; +D_8023C1D0 = 0x8023C1D0; +D_8023CDA0 = 0x8023CDA0; +D_8023CDA4 = 0x8023CDA4; +D_8023D1E0 = 0x8023D1E0; +D_8023D1E4 = 0x8023D1E4; +D_8023D26C = 0x8023D26C; +D_8023D270 = 0x8023D270; +D_8023D274 = 0x8023D274; +D_8023D278 = 0x8023D278; +D_8023D27C = 0x8023D27C; +D_8023D280 = 0x8023D280; +D_8023D284 = 0x8023D284; +D_8023D288 = 0x8023D288; +D_8023D28C = 0x8023D28C; +D_8023D290 = 0x8023D290; +D_8023D294 = 0x8023D294; +D_8023D298 = 0x8023D298; +D_8023D29C = 0x8023D29C; +D_8023D2A0 = 0x8023D2A0; +D_8023D2A4 = 0x8023D2A4; +D_8023D2A8 = 0x8023D2A8; +D_8023D2AC = 0x8023D2AC; +D_8023D2B0 = 0x8023D2B0; +D_8023D2B4 = 0x8023D2B4; +D_8023D2B8 = 0x8023D2B8; +D_8023D2BC = 0x8023D2BC; +D_8023D2C0 = 0x8023D2C0; +D_8023D2C4 = 0x8023D2C4; +D_8023D2C8 = 0x8023D2C8; +D_8023D2D0 = 0x8023D2D0; +D_8023D330 = 0x8023D330; +D_8023D334 = 0x8023D334; +D_8023D338 = 0x8023D338; +D_80241ECC = 0x80241ECC; +D_80242208 = 0x80242208; +D_80242344 = 0x80242344; +D_802429BC = 0x802429BC; +D_802429E0 = 0x802429E0; +D_80242FB0 = 0x80242FB0; +D_80243190 = 0x80243190; +D_80243374 = 0x80243374; +D_80243720 = 0x80243720; +D_80243BE0 = 0x80243BE0; +D_802440E0 = 0x802440E0; +D_802440E1 = 0x802440E1; +D_802440E2 = 0x802440E2; +D_802440E3 = 0x802440E3; +D_802440E5 = 0x802440E5; +D_802440EB = 0x802440EB; +D_802440EF = 0x802440EF; +D_802440F3 = 0x802440F3; +D_802440F7 = 0x802440F7; +D_802440F8 = 0x802440F8; +D_802440FB = 0x802440FB; +D_802440FF = 0x802440FF; +D_80244104 = 0x80244104; +D_802442D0 = 0x802442D0; +D_80244494 = 0x80244494; +D_802447C0 = 0x802447C0; +D_80244A20 = 0x80244A20; +D_80244C18 = 0x80244C18; +D_80244D88 = 0x80244D88; +D_802451F0 = 0x802451F0; +D_80245230 = 0x80245230; +D_802453D8 = 0x802453D8; +D_80245430 = 0x80245430; +D_80245601 = 0x80245601; +D_80245602 = 0x80245602; +D_80245603 = 0x80245603; +D_80245604 = 0x80245604; +D_80245605 = 0x80245605; +D_80245608 = 0x80245608; +D_8024560B = 0x8024560B; +D_8024560C = 0x8024560C; +D_8024560F = 0x8024560F; +D_80245610 = 0x80245610; +D_80245613 = 0x80245613; +D_80245614 = 0x80245614; +D_80245617 = 0x80245617; +D_80245618 = 0x80245618; +D_8024561B = 0x8024561B; +D_8024561C = 0x8024561C; +D_8024561F = 0x8024561F; +D_80245620 = 0x80245620; +D_80245650 = 0x80245650; +D_80245928 = 0x80245928; +D_8024592C = 0x8024592C; +D_802459C0 = 0x802459C0; +D_80245AB4 = 0x80245AB4; +D_802461F0 = 0x802461F0; +D_80246260 = 0x80246260; +D_802462F0 = 0x802462F0; +D_80246300 = 0x80246300; +D_80246424 = 0x80246424; +D_8024652C = 0x8024652C; +D_80246530 = 0x80246530; +D_80246534 = 0x80246534; +D_80246554 = 0x80246554; +D_8024655C = 0x8024655C; +D_80246578 = 0x80246578; +D_80246598 = 0x80246598; +D_8024659C = 0x8024659C; +D_802465A0 = 0x802465A0; +D_802465CC = 0x802465CC; +D_802465F0 = 0x802465F0; +D_802466D0 = 0x802466D0; +D_80246794 = 0x80246794; +D_802467B4 = 0x802467B4; +D_80246894 = 0x80246894; +D_80246990 = 0x80246990; +D_80246BE8 = 0x80246BE8; +D_80247050 = 0x80247050; +D_80247120 = 0x80247120; +D_802474A0 = 0x802474A0; +D_80247548 = 0x80247548; +D_80247664 = 0x80247664; +D_80247750 = 0x80247750; +D_802479F0 = 0x802479F0; +D_80247BF0 = 0x80247BF0; +D_80247CA0 = 0x80247CA0; +D_80247CB4 = 0x80247CB4; +D_80247D00 = 0x80247D00; +D_80247DF0 = 0x80247DF0; +D_80247E68 = 0x80247E68; +D_80248380 = 0x80248380; +D_80248388 = 0x80248388; +D_802483C0 = 0x802483C0; +D_802483C4 = 0x802483C4; +D_802483D0 = 0x802483D0; +D_80248480 = 0x80248480; +D_8024854C = 0x8024854C; +D_80248600 = 0x80248600; +D_80248624 = 0x80248624; +D_80248650 = 0x80248650; +D_80248850 = 0x80248850; +D_80248924 = 0x80248924; +D_80248938 = 0x80248938; +D_80248940 = 0x80248940; +D_80248944 = 0x80248944; +D_80248948 = 0x80248948; +D_80248F90 = 0x80248F90; +D_80249158 = 0x80249158; +D_80249440 = 0x80249440; +D_8024A290 = 0x8024A290; +D_8024A2A0 = 0x8024A2A0; +D_8024A2C4 = 0x8024A2C4; +D_8024A2D0 = 0x8024A2D0; +D_8024B990 = 0x8024B990; +D_8024B9B4 = 0x8024B9B4; +D_8024B9B8 = 0x8024B9B8; +D_8024BA90 = 0x8024BA90; +D_8024BB80 = 0x8024BB80; +D_8024BDD0 = 0x8024BDD0; +D_8024BDE8 = 0x8024BDE8; +D_8024BDF0 = 0x8024BDF0; +D_8024BDF4 = 0x8024BDF4; +D_8024BDF8 = 0x8024BDF8; +D_8024BEA0 = 0x8024BEA0; +D_8024C068 = 0x8024C068; +D_8024C088 = 0x8024C088; +D_8024C090 = 0x8024C090; +D_8024C108 = 0x8024C108; +D_8024C110 = 0x8024C110; +D_8024C117 = 0x8024C117; +D_8024C1D8 = 0x8024C1D8; +D_8024C5E0 = 0x8024C5E0; +D_8024DBC0 = 0x8024DBC0; +D_8024DD88 = 0x8024DD88; +D_8024DF10 = 0x8024DF10; +D_8024DF18 = 0x8024DF18; +D_8024DF1C = 0x8024DF1C; +D_8024DF20 = 0x8024DF20; +D_8024DF24 = 0x8024DF24; +D_8024DFC0 = 0x8024DFC0; +D_8024DFD8 = 0x8024DFD8; +D_8024DFE0 = 0x8024DFE0; +D_8024DFE4 = 0x8024DFE4; +D_8024DFE8 = 0x8024DFE8; +D_8024DFF0 = 0x8024DFF0; +D_8024E1B4 = 0x8024E1B4; +D_8024E540 = 0x8024E540; +D_8024E558 = 0x8024E558; +D_8024E560 = 0x8024E560; +D_8024E564 = 0x8024E564; +D_8024E568 = 0x8024E568; +D_8024E570 = 0x8024E570; +D_8024E738 = 0x8024E738; +D_8024E960 = 0x8024E960; +D_8024EA10 = 0x8024EA10; +D_8024EA14 = 0x8024EA14; +D_8024EA18 = 0x8024EA18; +gPauseMenuPanels = 0x8024EF80; +D_8024EF84 = 0x8024EF84; +D_8024EF88 = 0x8024EF88; +D_8024EF90 = 0x8024EF90; +gPauseMenuCursorPosY = 0x8024EFA0; +D_8024EFB8 = 0x8024EFB8; +D_8024EFC0 = 0x8024EFC0; +D_8024EFC8 = 0x8024EFC8; +D_8024F010 = 0x8024F010; +D_8024F080 = 0x8024F080; +D_8024F248 = 0x8024F248; +D_8024F2A0 = 0x8024F2A0; +D_8024F2A1 = 0x8024F2A1; +D_8024F2A2 = 0x8024F2A2; +D_8024F2A3 = 0x8024F2A3; +D_8024F2A4 = 0x8024F2A4; +D_8024F2A5 = 0x8024F2A5; +D_8024F2A8 = 0x8024F2A8; +D_8024F2AB = 0x8024F2AB; +D_8024F2AC = 0x8024F2AC; +D_8024F2AF = 0x8024F2AF; +D_8024F2B0 = 0x8024F2B0; +D_8024F2B3 = 0x8024F2B3; +D_8024F2B4 = 0x8024F2B4; +D_8024F2B7 = 0x8024F2B7; +D_8024F2B8 = 0x8024F2B8; +D_8024F2BB = 0x8024F2BB; +D_8024F2BC = 0x8024F2BC; +D_8024F2BF = 0x8024F2BF; +D_8024F2C4 = 0x8024F2C4; +D_8024F2C8 = 0x8024F2C8; +D_8024F2CC = 0x8024F2CC; +D_8024F2D8 = 0x8024F2D8; +D_8024F2DC = 0x8024F2DC; +D_8024F2E0 = 0x8024F2E0; +D_8024F2EC = 0x8024F2EC; +D_8024F2F4 = 0x8024F2F4; +D_8024F2F8 = 0x8024F2F8; +D_8024F2FC = 0x8024F2FC; +D_8024F304 = 0x8024F304; +D_8024F308 = 0x8024F308; +D_8024F30C = 0x8024F30C; +D_8024F318 = 0x8024F318; +D_8024F338 = 0x8024F338; +D_8024F358 = 0x8024F358; +D_8024F374 = 0x8024F374; +D_8024F378 = 0x8024F378; +D_8024F3F8 = 0x8024F3F8; +D_8024F448 = 0x8024F448; +D_8024F498 = 0x8024F498; +D_8024F4E8 = 0x8024F4E8; +D_8024F581 = 0x8024F581; +D_8024F582 = 0x8024F582; +D_8024F583 = 0x8024F583; +D_8024F584 = 0x8024F584; +D_8024F585 = 0x8024F585; +D_8024F588 = 0x8024F588; +D_8024F58B = 0x8024F58B; +D_8024F58C = 0x8024F58C; +D_8024F58F = 0x8024F58F; +D_8024F590 = 0x8024F590; +D_8024F593 = 0x8024F593; +D_8024F594 = 0x8024F594; +D_8024F597 = 0x8024F597; +D_8024F598 = 0x8024F598; +D_8024F59B = 0x8024F59B; +D_8024F59C = 0x8024F59C; +D_8024F59F = 0x8024F59F; +D_8024F5A0 = 0x8024F5A0; +D_8024F5A4 = 0x8024F5A4; +D_8024F5C4 = 0x8024F5C4; +D_8024F5C8 = 0x8024F5C8; +D_8024F5D0 = 0x8024F5D0; +D_8024F7E4 = 0x8024F7E4; +D_8024F7F0 = 0x8024F7F0; +D_8024FBA0 = 0x8024FBA0; +D_8024FD68 = 0x8024FD68; +D_8024FED8 = 0x8024FED8; +D_8024FEF0 = 0x8024FEF0; +D_8024FEF8 = 0x8024FEF8; +D_8024FEFC = 0x8024FEFC; +D_8024FF00 = 0x8024FF00; +D_8024FF04 = 0x8024FF04; +D_80250EF0 = 0x80250EF0; +D_802513D0 = 0x802513D0; +D_802513E8 = 0x802513E8; +D_802513F4 = 0x802513F4; +D_802513F8 = 0x802513F8; +D_80251400 = 0x80251400; +D_80251450 = 0x80251450; +D_80251468 = 0x80251468; +D_80251470 = 0x80251470; +D_80251478 = 0x80251478; +D_802515C4 = 0x802515C4; +D_80251C40 = 0x80251C40; +D_80251C58 = 0x80251C58; +D_80251C60 = 0x80251C60; +D_80251C68 = 0x80251C68; +D_80251C70 = 0x80251C70; +D_80251E34 = 0x80251E34; +D_802529D0 = 0x802529D0; +D_802529E8 = 0x802529E8; +D_802529F0 = 0x802529F0; +D_802529F4 = 0x802529F4; +D_80252A00 = 0x80252A00; +D_80252BC8 = 0x80252BC8; +D_80252D38 = 0x80252D38; +D_80253060 = 0x80253060; +D_80253378 = 0x80253378; +D_80253384 = 0x80253384; +D_8025338C = 0x8025338C; +D_80253390 = 0x80253390; +D_802547D0 = 0x802547D0; +D_802549B8 = 0x802549B8; +D_802549C4 = 0x802549C4; +D_802549C8 = 0x802549C8; +D_802549D0 = 0x802549D0; +D_80254B94 = 0x80254B94; +D_80254BA0 = 0x80254BA0; +D_80254D68 = 0x80254D68; +D_80255B70 = 0x80255B70; +D_80255B88 = 0x80255B88; +D_80255B90 = 0x80255B90; +D_80255B94 = 0x80255B94; +D_80255B98 = 0x80255B98; +D_80255BA0 = 0x80255BA0; +D_80255D68 = 0x80255D68; +D_80255ED8 = 0x80255ED8; +D_80255EE0 = 0x80255EE0; +D_802560A4 = 0x802560A4; +D_80257118 = 0x80257118; +D_80257320 = 0x80257320; +D_80257F20 = 0x80257F20; +D_80257F21 = 0x80257F21; +D_80257F22 = 0x80257F22; +D_80257F23 = 0x80257F23; +D_80257F24 = 0x80257F24; +D_80257F25 = 0x80257F25; +D_80257F26 = 0x80257F26; +D_80257F27 = 0x80257F27; +D_80257F28 = 0x80257F28; +D_80257F29 = 0x80257F29; +D_80257F2C = 0x80257F2C; +D_80257F40 = 0x80257F40; +D_80257F48 = 0x80257F48; +D_80257F4C = 0x80257F4C; +D_80257F50 = 0x80257F50; +D_80257F58 = 0x80257F58; +D_8025811C = 0x8025811C; +D_80258120 = 0x80258120; +D_80258140 = 0x80258140; +D_80258340 = 0x80258340; +D_8025B0A8 = 0x8025B0A8; +D_8025B2A8 = 0x8025B2A8; +D_8025B2AC = 0x8025B2AC; +D_8025B2B0 = 0x8025B2B0; +D_8025C0D0 = 0x8025C0D0; +D_80262A40 = 0x80262A40; +D_80262A58 = 0x80262A58; +D_80262A60 = 0x80262A60; +D_80262A64 = 0x80262A64; +D_80262A68 = 0x80262A68; +D_80262A70 = 0x80262A70; +D_80262C34 = 0x80262C34; +D_80262C38 = 0x80262C38; +D_80262F68 = 0x80262F68; +D_80268000 = 0x80268000; +gPauseMenuCommonIconIDs = 0x802700E8; +D_80270108 = 0x80270108; +D_8027010C = 0x8027010C; +D_80270110 = 0x80270110; +D_80270114 = 0x80270114; +D_80270118 = 0x80270118; +D_8027011C = 0x8027011C; +gPauseMenuTabIconIDs = 0x80270130; +D_80270148 = 0x80270148; +D_8027014C = 0x8027014C; +gStatsMenuIconIDs = 0x80270150; +gBadgeMenuItemIDs = 0x80270180; +gBadgeMenuCurrentPage = 0x80270280; +gBadgeMenuPages = 0x80270288; +D_80270289 = 0x80270289; +D_8027028A = 0x8027028A; +gBadgeMenuSelectedIndex = 0x80270378; +D_8027037C = 0x8027037C; +gBadgeMenuSelectedItemID = 0x80270380; +gBadgeMenuNumItems = 0x80270384; +D_80270388 = 0x80270388; +gBadgeMenuCurrentScrollPos = 0x8027038C; +gBadgeMenuTargetScrollPos = 0x80270390; +D_80270394 = 0x80270394; +gBadgeMenuLevel = 0x80270398; +gBadgeMenuCurrentTab = 0x8027039C; +gBadgeMenuBShowNotEnoughBP = 0x802703A0; +D_802703A8 = 0x802703A8; +D_802703FC = 0x802703FC; +gItemMenuItemIDs = 0x80270400; +gItemMenuCurrentPage = 0x802704C8; +gItemMenuPages = 0x802704D0; +D_802704D1 = 0x802704D1; +D_802704D2 = 0x802704D2; +gItemMenuSelectedIndex = 0x802705C0; +D_802705C4 = 0x802705C4; +gItemMenuSelectedItemID = 0x802705C8; +gItemMenuNumItems = 0x802705CC; +D_802705D0 = 0x802705D0; +gItemMenuCurrentScrollPos = 0x802705D4; +gItemMenuTargetScrollPos = 0x802705D8; +D_802705DC = 0x802705DC; +gItemMenuLevel = 0x802705E0; +gItemMenuCurrentTab = 0x802705E4; +gItemIcons = 0x802705E8; +D_80270634 = 0x80270634; +D_80270640 = 0x80270640; +D_80270660 = 0x80270660; +D_80270680 = 0x80270680; +D_802706A0 = 0x802706A0; +D_802706A4 = 0x802706A4; +D_802706A8 = 0x802706A8; +D_802706AC = 0x802706AC; +D_802706B0 = 0x802706B0; +D_802706C0 = 0x802706C0; +D_802706E0 = 0x802706E0; +D_802706FC = 0x802706FC; +D_80270700 = 0x80270700; +pause_map_cameraX = 0x80270704; +pause_map_cameraY = 0x80270708; +pause_map_marioX = 0x8027070C; +pause_map_marioY = 0x80270710; +pause_map_targetX = 0x80270714; +pause_map_targetY = 0x80270718; +pause_map_cursorCurrentOption = 0x8027071C; +pause_map_cursorCurrentOptionCopy = 0x80270720; +pause_map_spacesInSnapRange = 0x80270724; +D_80282EE9 = 0x80282EE9; +D_80282EEA = 0x80282EEA; +bMarioHideAnims = 0x80283370; +D_8029DA30 = 0x8029DA30; +D_8029DA33 = 0x8029DA33; +D_8029DA34 = 0x8029DA34; +D_8029DA40 = 0x8029DA40; +D_8029DA44 = 0x8029DA44; +D_8029DA48 = 0x8029DA48; +D_8029DA4C = 0x8029DA4C; +D_8029DA50 = 0x8029DA50; +D_8029EFB0 = 0x8029EFB0; +D_8029EFB4 = 0x8029EFB4; +D_8029EFB8 = 0x8029EFB8; +D_8029EFBC = 0x8029EFBC; +D_8029EFC0 = 0x8029EFC0; +D_8029EFE8 = 0x8029EFE8; +D_8029F010 = 0x8029F010; +D_8029F038 = 0x8029F038; +D_8029F236 = 0x8029F236; +D_8029F240 = 0x8029F240; +D_8029F244 = 0x8029F244; +D_8029F248 = 0x8029F248; +D_8029F24C = 0x8029F24C; +D_8029F250 = 0x8029F250; +D_8029F254 = 0x8029F254; +D_8029F258 = 0x8029F258; +D_8029F25C = 0x8029F25C; +D_8029F260 = 0x8029F260; +D_8029F264 = 0x8029F264; +D_8029F270 = 0x8029F270; +D_8029F274 = 0x8029F274; +D_8029F278 = 0x8029F278; +D_8029F27C = 0x8029F27C; +D_8029F27E = 0x8029F27E; +D_8029F280 = 0x8029F280; +D_8029F282 = 0x8029F282; +D_8029F284 = 0x8029F284; +D_8029F286 = 0x8029F286; +D_8029F288 = 0x8029F288; +D_8029F28C = 0x8029F28C; +D_8029F290 = 0x8029F290; +D_8029F294 = 0x8029F294; +D_8029F298 = 0x8029F298; +D_8029F29C = 0x8029F29C; +D_8029F29E = 0x8029F29E; +D_8029F2A0 = 0x8029F2A0; +D_8029F2A2 = 0x8029F2A2; +D_8029F2A3 = 0x8029F2A3; +D_8029F2A4 = 0x8029F2A4; +D_8029F2A5 = 0x8029F2A5; +D_8029F2A6 = 0x8029F2A6; +D_8029F2A7 = 0x8029F2A7; +D_8029F2A8 = 0x8029F2A8; +D_8029F2AC = 0x8029F2AC; +D_8029F2B0 = 0x8029F2B0; +D_8029F2B4 = 0x8029F2B4; +popupMessages = 0x8029F2C0; +D_8029F640 = 0x8029F640; +D_8029F642 = 0x8029F642; +D_8029F644 = 0x8029F644; +D_8029F646 = 0x8029F646; +D_8029F648 = 0x8029F648; +D_8029F64A = 0x8029F64A; +D_8029F64C = 0x8029F64C; +D_8029F64E = 0x8029F64E; +D_8029F650 = 0x8029F650; +gSpeakingActorPrintCtx = 0x8029FA60; +D_8029FA64 = 0x8029FA64; +gSpeakingActorPrintIsDone = 0x8029FA68; +gSpeakingActorTalkAnim = 0x8029FA6C; +gSpeakingActorIdleAnim = 0x8029FA70; +gSpeakingActor = 0x8029FA74; +gSpeakingActorPart = 0x8029FA78; +D_8029FA80 = 0x8029FA80; +D_8029FA88 = 0x8029FA88; +D_8029FA90 = 0x8029FA90; +D_8029FAA8 = 0x8029FAA8; +D_8029FAC4 = 0x8029FAC4; +D_8029FAE8 = 0x8029FAE8; +D_8029FB48 = 0x8029FB48; +D_8029FB4C = 0x8029FB4C; +D_8029FB50 = 0x8029FB50; +D_8029FB54 = 0x8029FB54; +D_8029FB60 = 0x8029FB60; +D_8029FB64 = 0x8029FB64; +D_8029FB68 = 0x8029FB68; +D_8029FB6C = 0x8029FB6C; +D_8029FB70 = 0x8029FB70; +D_8029FB74 = 0x8029FB74; +D_8029FB78 = 0x8029FB78; +D_8029FB7C = 0x8029FB7C; +D_8029FB80 = 0x8029FB80; +D_8029FB84 = 0x8029FB84; +D_8029FB88 = 0x8029FB88; +D_8029FB8C = 0x8029FB8C; +D_8029FB90 = 0x8029FB90; +D_8029FB94 = 0x8029FB94; +D_8029FB98 = 0x8029FB98; +D_8029FB9C = 0x8029FB9C; +D_8029FBA0 = 0x8029FBA0; +D_8029FBA4 = 0x8029FBA4; +D_8029FBA8 = 0x8029FBA8; +D_8029FBAC = 0x8029FBAC; +D_8029FBB0 = 0x8029FBB0; +D_8029FBC0 = 0x8029FBC0; +D_8029FBD0 = 0x8029FBD0; +D_8029FBD4 = 0x8029FBD4; +gActionCommandStatus = 0x8029FBE0; +D_8029FC2A = 0x8029FC2A; +D_8029FC3E = 0x8029FC3E; +D_8029FC4C = 0x8029FC4C; +D_802A19B0 = 0x802A19B0; +D_802A19C0 = 0x802A19C0; +D_802A1A90 = 0x802A1A90; +D_802A1AC0 = 0x802A1AC0; +D_802A1B40 = 0x802A1B40; +D_802A1CD0 = 0x802A1CD0; +D_802A1CD4 = 0x802A1CD4; +D_802A1D60 = 0x802A1D60; +D_802A21F0 = 0x802A21F0; +D_802A25C8 = 0x802A25C8; +D_802A25E4 = 0x802A25E4; +D_802A25E8 = 0x802A25E8; +D_802A25EC = 0x802A25EC; +D_802A25F0 = 0x802A25F0; +D_802A25F4 = 0x802A25F4; +D_802A25F8 = 0x802A25F8; +D_802A25FC = 0x802A25FC; +D_802A2C20 = 0x802A2C20; +D_802A2C50 = 0x802A2C50; +D_802A2CC0 = 0x802A2CC0; +D_802A2DD8 = 0x802A2DD8; +D_802A2DEC = 0x802A2DEC; +D_802A2DF0 = 0x802A2DF0; +D_802A2DF4 = 0x802A2DF4; +D_802A2DF8 = 0x802A2DF8; +D_802A2DFC = 0x802A2DFC; +D_802A2E00 = 0x802A2E00; +D_802A37F0 = 0x802A37F0; +D_802A37F8 = 0x802A37F8; +D_802A3818 = 0x802A3818; +D_802A3834 = 0x802A3834; +D_802A3838 = 0x802A3838; +D_802A3F58 = 0x802A3F58; +D_802A3F88 = 0x802A3F88; +D_802A4020 = 0x802A4020; +D_802A4350 = 0x802A4350; +D_802A43D0 = 0x802A43D0; +D_802A9620 = 0x802A9620; +D_802A98C0 = 0x802A98C0; +D_802A9920 = 0x802A9920; +D_802A9B00 = 0x802A9B00; +D_802A9F0C = 0x802A9F0C; +D_802A9F34 = 0x802A9F34; +D_802A9F5C = 0x802A9F5C; +D_802A9F84 = 0x802A9F84; +D_802A9FAC = 0x802A9FAC; +D_802AA320 = 0x802AA320; +D_802AA694 = 0x802AA694; +D_802AAA08 = 0x802AAA08; +D_802AAA30 = 0x802AAA30; +D_802ACC60 = 0x802ACC60; +D_802ACC64 = 0x802ACC64; +D_802ACC68 = 0x802ACC68; +D_802ACC6C = 0x802ACC6C; +D_802ACC70 = 0x802ACC70; +D_802ACCD0 = 0x802ACCD0; +D_802ACFE8 = 0x802ACFE8; +D_802ACFEC = 0x802ACFEC; +D_802ACFF0 = 0x802ACFF0; +D_802ACFF4 = 0x802ACFF4; +D_802ACFFC = 0x802ACFFC; +D_802ACFFD = 0x802ACFFD; +D_802AD000 = 0x802AD000; +D_802AD001 = 0x802AD001; +D_802AD002 = 0x802AD002; +D_802AD003 = 0x802AD003; +D_802AD004 = 0x802AD004; +D_802AD006 = 0x802AD006; +D_802AD008 = 0x802AD008; +D_802AD00A = 0x802AD00A; +D_802AD010 = 0x802AD010; +D_802AD028 = 0x802AD028; +D_802AD040 = 0x802AD040; +D_802AD044 = 0x802AD044; +D_802AD048 = 0x802AD048; +D_802AD04C = 0x802AD04C; +D_802AD050 = 0x802AD050; +D_802AD054 = 0x802AD054; +D_802AD058 = 0x802AD058; +D_802AD05C = 0x802AD05C; +D_802AD060 = 0x802AD060; +D_802AD064 = 0x802AD064; +D_802AD068 = 0x802AD068; +D_802AD069 = 0x802AD069; +D_802AD06A = 0x802AD06A; +D_802AD06B = 0x802AD06B; +D_802AD06C = 0x802AD06C; +D_802AD070 = 0x802AD070; +main_battle_menu_iconScripts = 0x802AD078; +battle_menu_messageIDs = 0x802AD090; +D_802AD0A8 = 0x802AD0A8; +main_menu_numOptions = 0x802AD0AC; +D_802AD0B0 = 0x802AD0B0; +D_802AD0B3 = 0x802AD0B3; +battle_menu_submenuIDs = 0x802AD0B8; +D_802AD0BB = 0x802AD0BB; +D_802AD0BC = 0x802AD0BC; +D_802AD0C0 = 0x802AD0C0; +battle_menu_isEnabled = 0x802AD0D0; +battle_menu_isMessageDisabled = 0x802AD0E8; +D_802AD0EB = 0x802AD0EB; +D_802AD100 = 0x802AD100; +D_802AD104 = 0x802AD104; +battle_menu_moveState = 0x802AD108; +battle_menu_moveCursorPos = 0x802AD109; +D_802AD10A = 0x802AD10A; +D_802AD10B = 0x802AD10B; +battle_menu_moveScrollLine = 0x802AD10C; +D_802AD10D = 0x802AD10D; +D_802AD10E = 0x802AD10E; +D_802AD10F = 0x802AD10F; +battle_menu_moveScrollOffset = 0x802AD110; +D_802AD112 = 0x802AD112; +battle_menu_moveTextColor = 0x802AD114; +battle_menu_moveTextOpacity = 0x802AD116; +battle_menu_moveCursorIcon = 0x802AD118; +battle_menu_moveUpArrowIcon = 0x802AD11C; +battle_menu_moveDownArrowIcon = 0x802AD120; +battle_menu_moveOptionIconIDs = 0x802AD128; +battle_menu_moveTitleIcon = 0x802AD188; +battle_menu_moveOptionCostUnitIconIDs = 0x802AD190; +battle_menu_moveX = 0x802AD1F0; +battle_menu_moveY = 0x802AD1F2; +battle_menu_moveOptionIndexMap = 0x802AD1F8; +D_802AD258 = 0x802AD258; +battle_menu_moveOptionIconScripts = 0x802AD260; +battle_menu_moveOptionNames = 0x802AD2C0; +battle_menu_moveOptionDisplayCosts = 0x802AD320; +battle_menu_moveOptionDisplayCostReductions = 0x802AD380; +battle_menu_moveOptionDisplayCostReductionColors = 0x802AD3E0; +battle_menu_moveOptionBPCosts = 0x802AD440; +battle_menu_hasSpiritsMenu = 0x802AD4A0; +battle_menu_moveOptionCount = 0x802AD4A4; +D_802AD4A7 = 0x802AD4A7; +D_802AD4A8 = 0x802AD4A8; +battle_menu_moveIndices = 0x802AD4B0; +D_802AD4B2 = 0x802AD4B2; +D_802AD4B3 = 0x802AD4B3; +battle_menu_moveOptionsEnabled = 0x802AD510; +battle_menu_moveOptionDescriptions = 0x802AD570; +battle_menu_moveOptionSortPriorities = 0x802AD5D0; +battle_menu_moveOptionCantUseTypes = 0x802AD5E8; +battle_menu_moveOptionActive = 0x802AD600; +D_802AD603 = 0x802AD603; +D_802AD604 = 0x802AD604; +D_802AD605 = 0x802AD605; +D_802AD606 = 0x802AD606; +D_802AD607 = 0x802AD607; +D_802AD608 = 0x802AD608; +D_802AD609 = 0x802AD609; +D_802AD60A = 0x802AD60A; +D_802AD60B = 0x802AD60B; +D_802AD60C = 0x802AD60C; +D_802AD60E = 0x802AD60E; +D_802AD610 = 0x802AD610; +D_802AD612 = 0x802AD612; +D_802AD614 = 0x802AD614; +D_802AD618 = 0x802AD618; +D_802AD61C = 0x802AD61C; +D_802AD620 = 0x802AD620; +D_802AD624 = 0x802AD624; +D_802AD628 = 0x802AD628; +D_802AD63C = 0x802AD63C; +D_802AD63E = 0x802AD63E; +D_802AD640 = 0x802AD640; +D_802AD658 = 0x802AD658; +D_802AD66C = 0x802AD66C; +D_802AD66F = 0x802AD66F; +D_802AD670 = 0x802AD670; +D_802AD673 = 0x802AD673; +D_802AD678 = 0x802AD678; +D_802AD67B = 0x802AD67B; +D_802AD690 = 0x802AD690; +D_802AD6A8 = 0x802AD6A8; +D_802AD6AA = 0x802AD6AA; +D_802AD6C0 = 0x802AD6C0; +D_802AD6D4 = 0x802AD6D4; +D_802B6240 = 0x802B6240; +D_802B62B0 = 0x802B62B0; +D_802B62D0 = 0x802B62D0; +D_802B62D4 = 0x802B62D4; +D_802B62D8 = 0x802B62D8; +D_802B62DC = 0x802B62DC; +D_802B62E0 = 0x802B62E0; +D_802B6730 = 0x802B6730; +D_802B6780 = 0x802B6780; +D_802B6784 = 0x802B6784; +D_802B6788 = 0x802B6788; +D_802B678C = 0x802B678C; +D_802B6790 = 0x802B6790; +D_802B6794 = 0x802B6794; +D_802B6798 = 0x802B6798; +D_802B679C = 0x802B679C; +D_802B68B0 = 0x802B68B0; +D_802B68B4 = 0x802B68B4; +D_802B68B8 = 0x802B68B8; +D_802B68BC = 0x802B68BC; +D_802B6E80 = 0x802B6E80; +D_802B6ED0 = 0x802B6ED0; +D_802B6ED4 = 0x802B6ED4; +D_802B6ED8 = 0x802B6ED8; +D_802B6EDC = 0x802B6EDC; +D_802B6EE0 = 0x802B6EE0; +D_802B6EE4 = 0x802B6EE4; +D_802B6EE8 = 0x802B6EE8; +D_802B6EEC = 0x802B6EEC; +D_802B6EF0 = 0x802B6EF0; +D_802B6EF4 = 0x802B6EF4; +mdl_clearRenderTasks = 0x802B7E00; +D_802BDF30 = 0x802BDF30; +D_802BDF34 = 0x802BDF34; +D_802BDF38 = 0x802BDF38; +D_802BDF60 = 0x802BDF60; +D_802BE0C0 = 0x802BE0C0; +D_802BE0C4 = 0x802BE0C4; +D_802BE0E4 = 0x802BE0E4; +D_802BE0E8 = 0x802BE0E8; +D_802BE0EC = 0x802BE0EC; +D_802BE300 = 0x802BE300; +D_802BE304 = 0x802BE304; +D_802BE308 = 0x802BE308; +D_802BE30C = 0x802BE30C; +D_802BE310 = 0x802BE310; +D_802BE920 = 0x802BE920; +D_802BE924 = 0x802BE924; +D_802BE928 = 0x802BE928; +D_802BE92C = 0x802BE92C; +D_802BE930 = 0x802BE930; +D_802BE934 = 0x802BE934; +D_802BE938 = 0x802BE938; +D_802BEBB0 = 0x802BEBB0; +D_802BEBB4 = 0x802BEBB4; +D_802BEBB8 = 0x802BEBB8; +D_802BEBBC = 0x802BEBBC; +D_802BEBC4 = 0x802BEBC4; +D_802BEC50 = 0x802BEC50; +D_802BEC54 = 0x802BEC54; +D_802BEC58 = 0x802BEC58; +D_802BEC5C = 0x802BEC5C; +D_802BEC60 = 0x802BEC60; +D_802BEC64 = 0x802BEC64; +D_802BEC68 = 0x802BEC68; +D_802BEC6C = 0x802BEC6C; +D_802BEC70 = 0x802BEC70; +D_802BEC74 = 0x802BEC74; +D_802BEC78 = 0x802BEC78; +D_802BFF00 = 0x802BFF00; +D_802BFF04 = 0x802BFF04; +D_802BFF08 = 0x802BFF08; +D_802BFF0C = 0x802BFF0C; +D_802BFF10 = 0x802BFF10; +D_802BFF14 = 0x802BFF14; +D_802BFF18 = 0x802BFF18; +D_802BFF1C = 0x802BFF1C; +D_802BFF20 = 0x802BFF20; +D_802BFF24 = 0x802BFF24; +D_802BFF28 = 0x802BFF28; +D_802C0000 = 0x802C0000; +D_802C05CC = 0x802C05CC; +gMapFlags = 0x802DA480; +gMapVars = 0x802DA484; +gNumScripts = 0x802DA488; +gWorldScriptList = 0x802DA490; +gBattleScriptList = 0x802DA690; +gCurrentScriptListPtr = 0x802DA890; +gScriptIndexList = 0x802DA898; +gScriptIdList = 0x802DAA98; +gScriptListCount = 0x802DAC98; +evtDebugPrintBuffer = 0x802DACA0; +gLavaResetList = 0x802DADA0; +D_802DADA4 = 0x802DADA4; +gBattleMeshAnimationList = 0x802DADB0; +gWorldMeshAnimationList = 0x802DADF0; +gCurrentMeshAnimationListPtr = 0x802DAE30; +D_802DAE40 = 0x802DAE40; +D_802DAE44 = 0x802DAE44; +D_802DAE50 = 0x802DAE50; +D_802DAE54 = 0x802DAE54; +gCurrentPrintContext = 0x802DB260; +D_802DB264 = 0x802DB264; +D_802DB268 = 0x802DB268; +D_802DB5B0 = 0x802DB5B0; +D_802DB5C0 = 0x802DB5C0; +D_802DB6C0 = 0x802DB6C0; +D_802DB7C0 = 0x802DB7C0; +D_802DB7D0 = 0x802DB7D0; +D_802DB7D8 = 0x802DB7D8; +D_802DB800 = 0x802DB800; +D_802DB830 = 0x802DB830; +D_802DBB60 = 0x802DBB60; +D_802DBB68 = 0x802DBB68; +gWorldMapFlags = 0x802DBC70; +D_802DBC7C = 0x802DBC7C; +D_802DBC88 = 0x802DBC88; +gWorldMapVars = 0x802DBCA8; +gBattleMapVars = 0x802DBCE8; +D_802DBD28 = 0x802DBD28; +gBattleMapFlags = 0x802DBD34; +spr_allocateBtlComponentsOnWorldHeap = 0x802DF524; +D_802DF530 = 0x802DF530; +D_802DF540 = 0x802DF540; +spr_playerSprites = 0x802DF548; +D_802DF57C = 0x802DF57C; +spr_playerMaxComponents = 0x802DF580; +spr_playerCurrentAnimInfo = 0x802DF588; +D_802DF58C = 0x802DF58C; +D_802DF590 = 0x802DF590; +spr_npcSprites = 0x802DF5B0; +spr_npcSpriteInstanceCount = 0x802DF958; +D_802DFA48 = 0x802DFA48; +D_802DFA4C = 0x802DFA4C; +D_802DFA58 = 0x802DFA58; +D_802DFE44 = 0x802DFE44; +D_802DFE48 = 0x802DFE48; +D_802DFE9C = 0x802DFE9C; +D_802DFEA0 = 0x802DFEA0; +D_802DFEAC = 0x802DFEAC; +D_802DFEB0 = 0x802DFEB0; +D_802DFEB8 = 0x802DFEB8; +D_802E004C = 0x802E004C; +D_802E0050 = 0x802E0050; +D_802E0080 = 0x802E0080; +D_802E0090 = 0x802E0090; +D_802E0C10 = 0x802E0C10; +D_802E0C14 = 0x802E0C14; +D_802E0C20 = 0x802E0C20; +D_802E0C58 = 0x802E0C58; +D_802E0C5C = 0x802E0C5C; +D_802E0C60 = 0x802E0C60; +D_802E0C64 = 0x802E0C64; +D_802E0C68 = 0x802E0C68; +D_802E0C70 = 0x802E0C70; +D_802EB390 = 0x802EB390; +D_802EB394 = 0x802EB394; +D_802EB398 = 0x802EB398; +D_802EB39C = 0x802EB39C; +D_802EB3A0 = 0x802EB3A0; +D_802EB3B0 = 0x802EB3B0; +D_802EB3C0 = 0x802EB3C0; +D_802ED970 = 0x802ED970; +D_802EE8D0 = 0x802EE8D0; +D_802F39D0 = 0x802F39D0; +D_802F4560 = 0x802F4560; +D_802FB800 = 0x802FB800; +gSpriteHeapPtr = 0x8034F800; +D_803DA800 = 0x803DA800; +D_8887FFFB = 0x8887FFFB; +D_A0000000 = 0xA0000000; +D_A4000000 = 0xA4000000; +D_A4000768 = 0xA4000768; +D_A4001000 = 0xA4001000; +D_A4040010 = 0xA4040010; +D_A4300000 = 0xA4300000; +D_A4300004 = 0xA4300004; +D_A4300008 = 0xA4300008; +D_A430000C = 0xA430000C; +D_A4400010 = 0xA4400010; +D_A450000C = 0xA450000C; +D_A4600004 = 0xA4600004; +D_A460000C = 0xA460000C; +D_A4600010 = 0xA4600010; +D_A4700000 = 0xA4700000; +D_A4700010 = 0xA4700010; +D_A4800018 = 0xA4800018; +D_A6000000 = 0xA6000000; +D_B0000000 = 0xB0000000; +D_B0000008 = 0xB0000008; +D_B0000010 = 0xB0000010; +D_D9FCFFFF = 0xD9FCFFFF; +D_E001C5E0 = 0xE001C5E0; +D_E007EC2F = 0xE007EC2F; +D_E00963E0 = 0xE00963E0; +D_E1000010 = 0xE1000010; +D_E7000008 = 0xE7000008; +D_E8000008 = 0xE8000008; +D_F0000008 = 0xF0000008; +D_F1FFFFFF = 0xF1FFFFFF; +D_F5000007 = 0xF5000007; +D_F79DDD0F = 0xF79DDD0F; +D_FA000028 = 0xFA000028; +D_FD100008 = 0xFD100008; +D_802510B0 = 0x802510B0; +D_8026A2B0 = 0x8026A2B0; diff --git a/tools/warnings_count/update_current_warnings.sh b/tools/warnings_count/update_current_warnings.sh deleted file mode 100755 index 910d604034..0000000000 --- a/tools/warnings_count/update_current_warnings.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -e - -# This script should only be used when we need to modify the accepted amount of warnings. - -rm -rf ver/*/build/src -ninja | grep warning | sort > tools/warnings_count/warnings.txt diff --git a/ver/us/asm/data/16A3E0.data.s b/ver/us/asm/data/16A680.data.s similarity index 88% rename from ver/us/asm/data/16A3E0.data.s rename to ver/us/asm/data/16A680.data.s index f29f01e6e4..8f309a2cf4 100644 --- a/ver/us/asm/data/16A3E0.data.s +++ b/ver/us/asm/data/16A680.data.s @@ -2,144 +2,6 @@ .section .data -glabel D_80249B80 -.word D_80241ECC - -glabel D_80249B84 -.word D_8024A098 - -glabel D_80249B88 -.word D_8024A114 - -glabel D_80249B8C -.word D_8024A158 - -glabel D_80249B90 -.word D_8024A1D8 - -glabel D_80249B94 -.word 0x000000A0 - -glabel D_80249B98 -.word 0xFFFFFF88 - -glabel D_80249B9C -.word 0x00000000 - -glabel D_80249BA0 -.word 0x000000A0 - -glabel D_80249BA4 -.word 0xFFFFFF88 - -glabel D_80249BA8 -.word 0x00000000 - -glabel D_80249BAC -.word 0x00000000 - -glabel D_80249BB0 -.word 0x00000001, 0x00000000 - -glabel D_80249BB8 -.word 0x00000000 - -glabel D_80249BBC -.short 0x013B, 0x012F, 0x011B, 0x0104, 0x00EB, 0x00D2, 0x00B9, 0x00A0, 0x0087, 0x006E, 0x0055, 0x003C, 0x0025, 0x0011, 0x0005 - -glabel D_80249BDA -.short 0x0000 - -glabel D_80249BDC -.short 0x013B, 0x012F, 0x011B, 0x0104, 0x00EB, 0x00D2, 0x00B9, 0x00A0, 0x0087, 0x006E, 0x0055, 0x003C, 0x0025, 0x0011, 0x0005 - -glabel D_80249BFA -.short 0x0000 - -glabel D_80249BFC -.short 0x009D, 0x0097, 0x008D, 0x0082, 0x0075, 0x0069, 0x005C, 0x0050, 0x0043, 0x0037, 0x002A, 0x001E, 0x0012, 0x0008, 0x0002 - -glabel D_80249C1A -.short 0x0000 - -glabel D_80249C1C -.short 0x009D, 0x0097, 0x008D, 0x0082, 0x0075, 0x0069, 0x005C, 0x0050, 0x0043, 0x0037, 0x002A, 0x001E, 0x0012, 0x0008, 0x0002 - -glabel D_80249C3A -.short 0x0000 - -glabel D_80249C3C -.short 0x003F, 0x003C, 0x0038, 0x0034, 0x002F, 0x002A, 0x0025, 0x0020, 0x001B, 0x0016, 0x0011, 0x000C, 0x0007, 0x0003, 0x0001 - -glabel D_80249C5A -.short 0x0000 - -glabel D_80249C5C -.short 0x003F, 0x003C, 0x0038, 0x0034, 0x002F, 0x002A, 0x0025, 0x0020, 0x001B, 0x0016, 0x0011, 0x000C, 0x0007, 0x0003, 0x0001 - -glabel D_80249C7A -.short 0x0000 - -glabel D_80249C7C -.short 0xFFFB, 0xFFEF, 0xFFDB, 0xFFC4, 0xFFAB, 0xFF92, 0xFF79, 0xFF60, 0xFF47 - -glabel D_80249C8E -.short 0xFF2E - -glabel D_80249C90 -.short 0xFFFB, 0xFFEF, 0xFFDB, 0xFFC4, 0xFFAB, 0xFF92, 0xFF79, 0xFF60, 0xFF47 - -glabel D_80249CA2 -.short 0xFF2E - -glabel D_80249CA4 -.short 0xFFFE, 0xFFF8, 0xFFEE, 0xFFE2, 0xFFD6, 0xFFC9, 0xFFBA, 0xFFAB, 0xFF9C - -glabel D_80249CB6 -.short 0xFF8D - -glabel D_80249CB8 -.short 0xFFFE, 0xFFF8, 0xFFEE, 0xFFE2, 0xFFD6, 0xFFC9, 0xFFBA, 0xFFAB, 0xFF9C - -glabel D_80249CCA -.short 0xFF8D - -glabel D_80249CCC -.short 0xFFFF, 0xFFFD, 0xFFF9, 0xFFF4, 0xFFEF, 0xFFEA, 0xFFE5, 0xFFE0, 0xFFDB - -glabel D_80249CDE -.short 0xFFD6 - -glabel D_80249CE0 -.short 0xFFFF, 0xFFFD, 0xFFF9, 0xFFF4, 0xFFEF, 0xFFEA, 0xFFE5, 0xFFE0, 0xFFDB - -glabel D_80249CF2 -.short 0xFFD6 - -glabel D_80249CF4 -.short 0x00B4, 0x00AD, 0x00A1, 0x0094, 0x0086, 0x0078, 0x0069, 0x005B, 0x004D, 0x003E, 0x0030, 0x0022, 0x0015, 0x0009, 0x0002, 0x0000 - -glabel D_80249D14 -.short 0x0000, 0x0002, 0x0009, 0x0015, 0x0022, 0x0030, 0x003E, 0x004D, 0x005B, 0x0069, 0x0078, 0x0086, 0x0094, 0x00A1, 0x00AD, 0x00B4 - -glabel D_80249D34 -.short 0x00B9, 0x00A0, 0x0087, 0x006E, 0x0055, 0x003C, 0x0025, 0x0011, 0x0005, 0x0000 - -glabel D_80249D48 -.short 0x0000, 0x0005, 0x0011, 0x0025, 0x003C, 0x0055, 0x006E, 0x0087, 0x00A0, 0x00B9, 0x0000, 0x0000 - -glabel D_80249D60 -.word 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000 - -glabel D_80249D70 -.word 0x40E00000, 0x41480000, 0x41500000, 0x41680000, 0x41600000, 0x41500000, 0x41380000, 0x41180000, 0x40F00000, 0x40B00000, 0x40600000, 0x40000000, 0x3F800000, 0x3F000000, 0x00000000 - -glabel D_80249DAC -.word 0x2C000010, 0x00180120, 0x00C00000, 0x00000000, 0x00000000, 0xFF000000, 0x00000001, 0x40000000 - -glabel D_80249DCC -.word D_8024BA60, 0x18000000, 0x00000120, 0x00C00000, filemenu_draw_contents_copy_arrow, 0x00000000, 0x2C000000, 0x00000001, 0x00000000, D_8024BA98, 0x17000000, 0x00000140, 0x00F00000, filemenu_draw_cursor, 0x00000000, 0xFF000000, 0x00000001, 0x00000000, D_8024BA98, 0x00000000, 0x00000000 - glabel D_80249E20 .word 0x802423DC, func_80242434_9D9454, 0x8024248C, 0x802424E4, D_8024253C_AB46AC, 0x80242594, dgb_16_npcGroup_802425EC, 0x80242408, flo_14_updateTexturePan_80242460, 0x802424B8, 0x80242510, D_80242568_A4EF88, 0x802425C0, D_80242618_9800E8, 0x802422D4, 0x80242300, mac_02_SetCamVfov, func_80242358_DCF028, func_80242384_833B84, D_802423B0_9EDBA0 diff --git a/ver/us/asm/nonmatchings/163400/filemenu_cleanup.s b/ver/us/asm/nonmatchings/163400/filemenu_cleanup.s index 4c641811a4..86fae72a13 100644 --- a/ver/us/asm/nonmatchings/163400/filemenu_cleanup.s +++ b/ver/us/asm/nonmatchings/163400/filemenu_cleanup.s @@ -6,8 +6,8 @@ glabel filemenu_cleanup /* 165364 80244B04 AFB00010 */ sw $s0, 0x10($sp) /* 165368 80244B08 0000802D */ daddu $s0, $zero, $zero /* 16536C 80244B0C AFB10014 */ sw $s1, 0x14($sp) -/* 165370 80244B10 3C118025 */ lui $s1, %hi(pause_partners_draw_movelist_flower) -/* 165374 80244B14 2631C0A0 */ addiu $s1, $s1, %lo(pause_partners_draw_movelist_flower) +/* 165370 80244B10 3C118025 */ lui $s1, %hi(filemenu_cursorHudElemID) +/* 165374 80244B14 2631C0A0 */ addiu $s1, $s1, %lo(filemenu_cursorHudElemID) /* 165378 80244B18 AFBF0018 */ sw $ra, 0x18($sp) .L80244B1C: /* 16537C 80244B1C 8E240000 */ lw $a0, ($s1) @@ -16,8 +16,8 @@ glabel filemenu_cleanup /* 165388 80244B28 26100001 */ addiu $s0, $s0, 1 /* 16538C 80244B2C 1A00FFFB */ blez $s0, .L80244B1C /* 165390 80244B30 00000000 */ nop -/* 165394 80244B34 3C118025 */ lui $s1, %hi(D_80249B84) -/* 165398 80244B38 26319B84 */ addiu $s1, $s1, %lo(D_80249B84) +/* 165394 80244B34 3C118025 */ lui $s1, %hi(filemenu_menus) +/* 165398 80244B38 26319B84 */ addiu $s1, $s1, %lo(filemenu_menus) /* 16539C 80244B3C 0000802D */ daddu $s0, $zero, $zero .L80244B40: /* 1653A0 80244B40 8E240000 */ lw $a0, ($s1) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_draw_contents_copy_arrow.s b/ver/us/asm/nonmatchings/163400/filemenu_draw_contents_copy_arrow.s index dc55eaf99d..67bfdb4636 100644 --- a/ver/us/asm/nonmatchings/163400/filemenu_draw_contents_copy_arrow.s +++ b/ver/us/asm/nonmatchings/163400/filemenu_draw_contents_copy_arrow.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel filemenu_draw_contents_copy_arrow -/* 16491C 802440BC 3C048025 */ lui $a0, %hi(D_80249B84) -/* 164920 802440C0 8C849B84 */ lw $a0, %lo(D_80249B84)($a0) +/* 16491C 802440BC 3C048025 */ lui $a0, %hi(filemenu_menus) +/* 164920 802440C0 8C849B84 */ lw $a0, %lo(filemenu_menus)($a0) /* 164924 802440C4 27BDFF08 */ addiu $sp, $sp, -0xf8 /* 164928 802440C8 AFBF00C4 */ sw $ra, 0xc4($sp) /* 16492C 802440CC AFBE00C0 */ sw $fp, 0xc0($sp) @@ -30,8 +30,8 @@ glabel filemenu_draw_contents_copy_arrow /* 164980 80244120 104001DD */ beqz $v0, .L80244898 /* 164984 80244124 00000000 */ nop /* 164988 80244128 90820003 */ lbu $v0, 3($a0) -/* 16498C 8024412C 3C038025 */ lui $v1, %hi(D_8024C094) -/* 164990 80244130 8C63C094 */ lw $v1, %lo(D_8024C094)($v1) +/* 16498C 8024412C 3C038025 */ lui $v1, %hi(filemenu_loadedFileIdx) +/* 164990 80244130 8C63C094 */ lw $v1, %lo(filemenu_loadedFileIdx)($v1) /* 164994 80244134 104301D8 */ beq $v0, $v1, .L80244898 /* 164998 80244138 24040002 */ addiu $a0, $zero, 2 /* 16499C 8024413C 3C028025 */ lui $v0, %hi(D_8024C098_C09918) @@ -77,8 +77,8 @@ glabel filemenu_draw_contents_copy_arrow /* 164A24 802441C4 3C014316 */ lui $at, 0x4316 /* 164A28 802441C8 4481B000 */ mtc1 $at, $f22 .L802441CC: -/* 164A2C 802441CC 3C028025 */ lui $v0, %hi(D_80249B84) -/* 164A30 802441D0 8C429B84 */ lw $v0, %lo(D_80249B84)($v0) +/* 164A2C 802441CC 3C028025 */ lui $v0, %hi(filemenu_menus) +/* 164A30 802441D0 8C429B84 */ lw $v0, %lo(filemenu_menus)($v0) /* 164A34 802441D4 90430003 */ lbu $v1, 3($v0) /* 164A38 802441D8 24020001 */ addiu $v0, $zero, 1 /* 164A3C 802441DC 10620012 */ beq $v1, $v0, .L80244228 diff --git a/ver/us/asm/nonmatchings/163400/filemenu_draw_cursor.s b/ver/us/asm/nonmatchings/163400/filemenu_draw_cursor.s deleted file mode 100644 index b642193bfe..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_draw_cursor.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_cursor -/* 164890 80244030 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 164894 80244034 AFB10014 */ sw $s1, 0x14($sp) -/* 164898 80244038 00A0882D */ daddu $s1, $a1, $zero -/* 16489C 8024403C AFB20018 */ sw $s2, 0x18($sp) -/* 1648A0 80244040 00C0902D */ daddu $s2, $a2, $zero -/* 1648A4 80244044 AFBF001C */ sw $ra, 0x1c($sp) -/* 1648A8 80244048 0C090BDA */ jal filemenu_update_cursor -/* 1648AC 8024404C AFB00010 */ sw $s0, 0x10($sp) -/* 1648B0 80244050 3C058025 */ lui $a1, %hi(D_80249B9C) -/* 1648B4 80244054 8CA59B9C */ lw $a1, %lo(D_80249B9C)($a1) -/* 1648B8 80244058 18A00012 */ blez $a1, .L802440A4 -/* 1648BC 8024405C 28A20100 */ slti $v0, $a1, 0x100 -/* 1648C0 80244060 50400001 */ beql $v0, $zero, .L80244068 -/* 1648C4 80244064 240500FF */ addiu $a1, $zero, 0xff -.L80244068: -/* 1648C8 80244068 3C108025 */ lui $s0, %hi(pause_partners_draw_movelist_flower) -/* 1648CC 8024406C 2610C0A0 */ addiu $s0, $s0, %lo(pause_partners_draw_movelist_flower) -/* 1648D0 80244070 0C0513AC */ jal set_hud_element_alpha -/* 1648D4 80244074 8E040000 */ lw $a0, ($s0) -/* 1648D8 80244078 8E040000 */ lw $a0, ($s0) -/* 1648DC 8024407C 3C058025 */ lui $a1, %hi(D_80249B94) -/* 1648E0 80244080 8CA59B94 */ lw $a1, %lo(D_80249B94)($a1) -/* 1648E4 80244084 3C068025 */ lui $a2, %hi(D_80249B98) -/* 1648E8 80244088 8CC69B98 */ lw $a2, %lo(D_80249B98)($a2) -/* 1648EC 8024408C 02252821 */ addu $a1, $s1, $a1 -/* 1648F0 80244090 0C051261 */ jal set_hud_element_render_pos -/* 1648F4 80244094 02463021 */ addu $a2, $s2, $a2 -/* 1648F8 80244098 8E040000 */ lw $a0, ($s0) -/* 1648FC 8024409C 0C0511F8 */ jal draw_hud_element_3 -/* 164900 802440A0 00000000 */ nop -.L802440A4: -/* 164904 802440A4 8FBF001C */ lw $ra, 0x1c($sp) -/* 164908 802440A8 8FB20018 */ lw $s2, 0x18($sp) -/* 16490C 802440AC 8FB10014 */ lw $s1, 0x14($sp) -/* 164910 802440B0 8FB00010 */ lw $s0, 0x10($sp) -/* 164914 802440B4 03E00008 */ jr $ra -/* 164918 802440B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/163400/filemenu_init.s b/ver/us/asm/nonmatchings/163400/filemenu_init.s index 68c4c22f0a..d4fb682275 100644 --- a/ver/us/asm/nonmatchings/163400/filemenu_init.s +++ b/ver/us/asm/nonmatchings/163400/filemenu_init.s @@ -19,8 +19,8 @@ glabel filemenu_init /* 165178 80244918 0C00A5CF */ jal dma_copy /* 16517C 8024491C AFB00010 */ sw $s0, 0x10($sp) /* 165180 80244920 0000802D */ daddu $s0, $zero, $zero -/* 165184 80244924 3C128025 */ lui $s2, %hi(pause_partners_draw_movelist_flower) -/* 165188 80244928 2652C0A0 */ addiu $s2, $s2, %lo(pause_partners_draw_movelist_flower) +/* 165184 80244924 3C128025 */ lui $s2, %hi(filemenu_cursorHudElemID) +/* 165188 80244928 2652C0A0 */ addiu $s2, $s2, %lo(filemenu_cursorHudElemID) /* 16518C 8024492C 3C118025 */ lui $s1, %hi(D_80249B80) /* 165190 80244930 26319B80 */ addiu $s1, $s1, %lo(D_80249B80) .L80244934: @@ -35,8 +35,8 @@ glabel filemenu_init /* 1651B4 80244954 AE440000 */ sw $a0, ($s2) /* 1651B8 80244958 1A00FFF6 */ blez $s0, .L80244934 /* 1651BC 8024495C 26520004 */ addiu $s2, $s2, 4 -/* 1651C0 80244960 3C028025 */ lui $v0, %hi(pause_partners_draw_movelist_flower) -/* 1651C4 80244964 8C42C0A0 */ lw $v0, %lo(pause_partners_draw_movelist_flower)($v0) +/* 1651C0 80244960 3C028025 */ lui $v0, %hi(filemenu_cursorHudElemID) +/* 1651C4 80244964 8C42C0A0 */ lw $v0, %lo(filemenu_cursorHudElemID)($v0) /* 1651C8 80244968 3C018025 */ lui $at, %hi(D_8024C088) /* 1651CC 8024496C AC22C088 */ sw $v0, %lo(D_8024C088)($at) /* 1651D0 80244970 16800004 */ bnez $s4, .L80244984 @@ -49,8 +49,8 @@ glabel filemenu_init /* 1651E8 80244988 24849DAC */ addiu $a0, $a0, %lo(D_80249DAC) /* 1651EC 8024498C 0C051FCC */ jal setup_pause_menu_tab /* 1651F0 80244990 24050003 */ addiu $a1, $zero, 3 -/* 1651F4 80244994 3C138025 */ lui $s3, %hi(D_80249B84) -/* 1651F8 80244998 8E739B84 */ lw $s3, %lo(D_80249B84)($s3) +/* 1651F4 80244994 3C138025 */ lui $s3, %hi(filemenu_menus) +/* 1651F8 80244998 8E739B84 */ lw $s3, %lo(filemenu_menus)($s3) /* 1651FC 8024499C 3C018025 */ lui $at, %hi(D_8024C098_C09918) /* 165200 802449A0 A020C098 */ sb $zero, %lo(D_8024C098_C09918)($at) /* 165204 802449A4 16800003 */ bnez $s4, .L802449B4 @@ -118,8 +118,8 @@ glabel filemenu_init .L80244A84: /* 1652E4 80244A84 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 1652E8 80244A88 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 1652EC 80244A8C 3C118025 */ lui $s1, %hi(D_80249B84) -/* 1652F0 80244A90 26319B84 */ addiu $s1, $s1, %lo(D_80249B84) +/* 1652EC 80244A8C 3C118025 */ lui $s1, %hi(filemenu_menus) +/* 1652F0 80244A90 26319B84 */ addiu $s1, $s1, %lo(filemenu_menus) /* 1652F4 80244A94 90460166 */ lbu $a2, 0x166($v0) /* 1652F8 80244A98 0000802D */ daddu $s0, $zero, $zero /* 1652FC 80244A9C 30C50001 */ andi $a1, $a2, 1 diff --git a/ver/us/asm/nonmatchings/163400/filemenu_set_cursor_alpha.s b/ver/us/asm/nonmatchings/163400/filemenu_set_cursor_alpha.s deleted file mode 100644 index 7974506326..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_set_cursor_alpha.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_set_cursor_alpha -/* 16364C 80242DEC 3C018025 */ lui $at, %hi(D_80249BA8) -/* 163650 80242DF0 AC249BA8 */ sw $a0, %lo(D_80249BA8)($at) -/* 163654 80242DF4 3C018025 */ lui $at, %hi(D_80249BAC) -/* 163658 80242DF8 03E00008 */ jr $ra -/* 16365C 80242DFC AC249BAC */ sw $a0, %lo(D_80249BAC)($at) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_set_selected.s b/ver/us/asm/nonmatchings/163400/filemenu_set_selected.s deleted file mode 100644 index f6b75022b1..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_set_selected.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_set_selected -/* 1635F4 80242D94 80820004 */ lb $v0, 4($a0) -/* 1635F8 80242D98 80830005 */ lb $v1, 5($a0) -/* 1635FC 80242D9C 00430018 */ mult $v0, $v1 -/* 163600 80242DA0 00003812 */ mflo $a3 -/* 163604 80242DA4 80820006 */ lb $v0, 6($a0) -/* 163608 80242DA8 00000000 */ nop -/* 16360C 80242DAC 00E20018 */ mult $a3, $v0 -/* 163610 80242DB0 00003812 */ mflo $a3 -/* 163614 80242DB4 00061600 */ sll $v0, $a2, 0x18 -/* 163618 80242DB8 00021603 */ sra $v0, $v0, 0x18 -/* 16361C 80242DBC 00620018 */ mult $v1, $v0 -/* 163620 80242DC0 A0850001 */ sb $a1, 1($a0) -/* 163624 80242DC4 80850001 */ lb $a1, 1($a0) -/* 163628 80242DC8 A0860002 */ sb $a2, 2($a0) -/* 16362C 80242DCC 00001012 */ mflo $v0 -/* 163630 80242DD0 00E21821 */ addu $v1, $a3, $v0 -/* 163634 80242DD4 8C820008 */ lw $v0, 8($a0) -/* 163638 80242DD8 00651821 */ addu $v1, $v1, $a1 -/* 16363C 80242DDC 00431021 */ addu $v0, $v0, $v1 -/* 163640 80242DE0 90420000 */ lbu $v0, ($v0) -/* 163644 80242DE4 03E00008 */ jr $ra -/* 163648 80242DE8 A0820003 */ sb $v0, 3($a0) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update.s b/ver/us/asm/nonmatchings/163400/filemenu_update.s index ad31088ea8..9caf080bec 100644 --- a/ver/us/asm/nonmatchings/163400/filemenu_update.s +++ b/ver/us/asm/nonmatchings/163400/filemenu_update.s @@ -14,9 +14,9 @@ glabel filemenu_update /* 163A24 802431C4 AFBF0018 */ sw $ra, 0x18($sp) /* 163A28 802431C8 AFB10014 */ sw $s1, 0x14($sp) /* 163A2C 802431CC 00021080 */ sll $v0, $v0, 2 -/* 163A30 802431D0 3C048025 */ lui $a0, %hi(D_80249B84) +/* 163A30 802431D0 3C048025 */ lui $a0, %hi(filemenu_menus) /* 163A34 802431D4 00822021 */ addu $a0, $a0, $v0 -/* 163A38 802431D8 8C849B84 */ lw $a0, %lo(D_80249B84)($a0) +/* 163A38 802431D8 8C849B84 */ lw $a0, %lo(filemenu_menus)($a0) .L802431DC: /* 163A3C 802431DC 80620003 */ lb $v0, 3($v1) /* 163A40 802431E0 10460003 */ beq $v0, $a2, .L802431F0 @@ -41,20 +41,20 @@ glabel filemenu_update /* 163A80 80243220 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 163A84 80243224 8C430020 */ lw $v1, 0x20($v0) /* 163A88 80243228 8C420010 */ lw $v0, 0x10($v0) -/* 163A8C 8024322C 3C018025 */ lui $at, %hi(D_8024C08C) -/* 163A90 80243230 AC23C08C */ sw $v1, %lo(D_8024C08C)($at) -/* 163A94 80243234 3C018025 */ lui $at, %hi(D_8024C084) -/* 163A98 80243238 AC22C084 */ sw $v0, %lo(D_8024C084)($at) +/* 163A8C 8024322C 3C018025 */ lui $at, %hi(filemenu_heldButtons) +/* 163A90 80243230 AC23C08C */ sw $v1, %lo(filemenu_heldButtons)($at) +/* 163A94 80243234 3C018025 */ lui $at, %hi(filemenu_pressedButtons) +/* 163A98 80243238 AC22C084 */ sw $v0, %lo(filemenu_pressedButtons)($at) /* 163A9C 8024323C 08090C95 */ j .L80243254 /* 163AA0 80243240 00000000 */ nop .L80243244: -/* 163AA4 80243244 3C018025 */ lui $at, %hi(D_8024C08C) -/* 163AA8 80243248 AC20C08C */ sw $zero, %lo(D_8024C08C)($at) -/* 163AAC 8024324C 3C018025 */ lui $at, %hi(D_8024C084) -/* 163AB0 80243250 AC20C084 */ sw $zero, %lo(D_8024C084)($at) +/* 163AA4 80243244 3C018025 */ lui $at, %hi(filemenu_heldButtons) +/* 163AA8 80243248 AC20C08C */ sw $zero, %lo(filemenu_heldButtons)($at) +/* 163AAC 8024324C 3C018025 */ lui $at, %hi(filemenu_pressedButtons) +/* 163AB0 80243250 AC20C084 */ sw $zero, %lo(filemenu_pressedButtons)($at) .L80243254: -/* 163AB4 80243254 3C058025 */ lui $a1, %hi(D_8024C084) -/* 163AB8 80243258 24A5C084 */ addiu $a1, $a1, %lo(D_8024C084) +/* 163AB4 80243254 3C058025 */ lui $a1, %hi(filemenu_pressedButtons) +/* 163AB8 80243258 24A5C084 */ addiu $a1, $a1, %lo(filemenu_pressedButtons) /* 163ABC 8024325C 8CA30000 */ lw $v1, ($a1) /* 163AC0 80243260 30624000 */ andi $v0, $v1, 0x4000 /* 163AC4 80243264 10400004 */ beqz $v0, .L80243278 @@ -63,8 +63,8 @@ glabel filemenu_update /* 163AD0 80243270 00621024 */ and $v0, $v1, $v0 /* 163AD4 80243274 ACA20000 */ sw $v0, ($a1) .L80243278: -/* 163AD8 80243278 3C058025 */ lui $a1, %hi(D_8024C08C) -/* 163ADC 8024327C 24A5C08C */ addiu $a1, $a1, %lo(D_8024C08C) +/* 163AD8 80243278 3C058025 */ lui $a1, %hi(filemenu_heldButtons) +/* 163ADC 8024327C 24A5C08C */ addiu $a1, $a1, %lo(filemenu_heldButtons) /* 163AE0 80243280 8CA30000 */ lw $v1, ($a1) /* 163AE4 80243284 30624000 */ andi $v0, $v1, 0x4000 /* 163AE8 80243288 10400004 */ beqz $v0, .L8024329C @@ -82,8 +82,8 @@ glabel filemenu_update /* 163B14 802432B4 0040F809 */ jalr $v0 /* 163B18 802432B8 00000000 */ nop .L802432BC: -/* 163B1C 802432BC 3C118025 */ lui $s1, %hi(D_80249B84) -/* 163B20 802432C0 26319B84 */ addiu $s1, $s1, %lo(D_80249B84) +/* 163B1C 802432BC 3C118025 */ lui $s1, %hi(filemenu_menus) +/* 163B20 802432C0 26319B84 */ addiu $s1, $s1, %lo(filemenu_menus) /* 163B24 802432C4 0000802D */ daddu $s0, $zero, $zero .L802432C8: /* 163B28 802432C8 8E240000 */ lw $a0, ($s1) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update_cursor.s b/ver/us/asm/nonmatchings/163400/filemenu_update_cursor.s index 21081b851d..2409b8c13b 100644 --- a/ver/us/asm/nonmatchings/163400/filemenu_update_cursor.s +++ b/ver/us/asm/nonmatchings/163400/filemenu_update_cursor.s @@ -51,8 +51,8 @@ glabel filemenu_update_cursor /* 163878 80243018 3C038025 */ lui $v1, %hi(D_80249B98) /* 16387C 8024301C 24639B98 */ addiu $v1, $v1, %lo(D_80249B98) /* 163880 80243020 8C620000 */ lw $v0, ($v1) -/* 163884 80243024 3C048025 */ lui $a0, %hi(D_80249BA8) -/* 163888 80243028 8C849BA8 */ lw $a0, %lo(D_80249BA8)($a0) +/* 163884 80243024 3C048025 */ lui $a0, %hi(filemenu_cursorGoalAlpha) +/* 163888 80243028 8C849BA8 */ lw $a0, %lo(filemenu_cursorGoalAlpha)($a0) /* 16388C 8024302C 00481021 */ addu $v0, $v0, $t0 /* 163890 80243030 14800009 */ bnez $a0, .L80243058 /* 163894 80243034 AC620000 */ sw $v0, ($v1) @@ -104,8 +104,8 @@ glabel filemenu_update_cursor /* 163930 802430D0 8C620000 */ lw $v0, ($v1) /* 163934 802430D4 14400008 */ bnez $v0, .L802430F8 /* 163938 802430D8 28820040 */ slti $v0, $a0, 0x40 -/* 16393C 802430DC 3C028025 */ lui $v0, %hi(D_80249BA8) -/* 163940 802430E0 8C429BA8 */ lw $v0, %lo(D_80249BA8)($v0) +/* 16393C 802430DC 3C028025 */ lui $v0, %hi(filemenu_cursorGoalAlpha) +/* 163940 802430E0 8C429BA8 */ lw $v0, %lo(filemenu_cursorGoalAlpha)($v0) /* 163944 802430E4 14400004 */ bnez $v0, .L802430F8 /* 163948 802430E8 28820040 */ slti $v0, $a0, 0x40 /* 16394C 802430EC 24020001 */ addiu $v0, $zero, 1 @@ -114,8 +114,8 @@ glabel filemenu_update_cursor .L802430F8: /* 163958 802430F8 1440001E */ bnez $v0, .L80243174 /* 16395C 802430FC 240200FF */ addiu $v0, $zero, 0xff -/* 163960 80243100 3C038025 */ lui $v1, %hi(D_80249BAC) -/* 163964 80243104 8C639BAC */ lw $v1, %lo(D_80249BAC)($v1) +/* 163960 80243100 3C038025 */ lui $v1, %hi(filemenu_cursorGoalAlpha2) +/* 163964 80243104 8C639BAC */ lw $v1, %lo(filemenu_cursorGoalAlpha2)($v1) /* 163968 80243108 14620010 */ bne $v1, $v0, .L8024314C /* 16396C 8024310C 00000000 */ nop /* 163970 80243110 3C038025 */ lui $v1, %hi(D_80249BB8) @@ -139,15 +139,15 @@ glabel filemenu_update_cursor /* 1639B4 80243154 1440000F */ bnez $v0, .L80243194 /* 1639B8 80243158 240200FF */ addiu $v0, $zero, 0xff .L8024315C: -/* 1639BC 8024315C 3C028025 */ lui $v0, %hi(D_80249BAC) -/* 1639C0 80243160 8C429BAC */ lw $v0, %lo(D_80249BAC)($v0) -/* 1639C4 80243164 3C018025 */ lui $at, %hi(D_80249BA8) -/* 1639C8 80243168 AC229BA8 */ sw $v0, %lo(D_80249BA8)($at) +/* 1639BC 8024315C 3C028025 */ lui $v0, %hi(filemenu_cursorGoalAlpha2) +/* 1639C0 80243160 8C429BAC */ lw $v0, %lo(filemenu_cursorGoalAlpha2)($v0) +/* 1639C4 80243164 3C018025 */ lui $at, %hi(filemenu_cursorGoalAlpha) +/* 1639C8 80243168 AC229BA8 */ sw $v0, %lo(filemenu_cursorGoalAlpha)($at) /* 1639CC 8024316C 08090C65 */ j .L80243194 /* 1639D0 80243170 240200FF */ addiu $v0, $zero, 0xff .L80243174: -/* 1639D4 80243174 3C028025 */ lui $v0, %hi(D_80249BA8) -/* 1639D8 80243178 8C429BA8 */ lw $v0, %lo(D_80249BA8)($v0) +/* 1639D4 80243174 3C028025 */ lui $v0, %hi(filemenu_cursorGoalAlpha) +/* 1639D8 80243178 8C429BA8 */ lw $v0, %lo(filemenu_cursorGoalAlpha)($v0) /* 1639DC 8024317C 14400005 */ bnez $v0, .L80243194 /* 1639E0 80243180 240200FF */ addiu $v0, $zero, 0xff /* 1639E4 80243184 24020001 */ addiu $v0, $zero, 1 @@ -156,6 +156,6 @@ glabel filemenu_update_cursor .L80243190: /* 1639F0 80243190 240200FF */ addiu $v0, $zero, 0xff .L80243194: -/* 1639F4 80243194 3C018025 */ lui $at, %hi(D_80249BAC) +/* 1639F4 80243194 3C018025 */ lui $at, %hi(filemenu_cursorGoalAlpha2) /* 1639F8 80243198 03E00008 */ jr $ra -/* 1639FC 8024319C AC229BAC */ sw $v0, %lo(D_80249BAC)($at) +/* 1639FC 8024319C AC229BAC */ sw $v0, %lo(filemenu_cursorGoalAlpha2)($at) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_name_confirm.s b/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_name_confirm.s deleted file mode 100644 index 8b8db91d12..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_name_confirm.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_update_hidden_name_confirm -/* 16474C 80243EEC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 164750 80243EF0 3C028016 */ lui $v0, %hi(gWindows) -/* 164754 80243EF4 24429D50 */ addiu $v0, $v0, %lo(gWindows) -/* 164758 80243EF8 00042140 */ sll $a0, $a0, 5 -/* 16475C 80243EFC 00822021 */ addu $a0, $a0, $v0 -/* 164760 80243F00 AFBF0030 */ sw $ra, 0x30($sp) -/* 164764 80243F04 AFB1002C */ sw $s1, 0x2c($sp) -/* 164768 80243F08 AFB00028 */ sw $s0, 0x28($sp) -/* 16476C 80243F0C 9090001C */ lbu $s0, 0x1c($a0) -/* 164770 80243F10 2A02000A */ slti $v0, $s0, 0xa -/* 164774 80243F14 1040003D */ beqz $v0, .L8024400C -/* 164778 80243F18 00E0882D */ daddu $s1, $a3, $zero -/* 16477C 80243F1C 3C06E300 */ lui $a2, 0xe300 -/* 164780 80243F20 34C60A01 */ ori $a2, $a2, 0xa01 -/* 164784 80243F24 3C09FCFF */ lui $t1, 0xfcff -/* 164788 80243F28 3529FFFF */ ori $t1, $t1, 0xffff -/* 16478C 80243F2C 3C07FFFD */ lui $a3, 0xfffd -/* 164790 80243F30 34E7F6FB */ ori $a3, $a3, 0xf6fb -/* 164794 80243F34 3C0AE200 */ lui $t2, 0xe200 -/* 164798 80243F38 354A001C */ ori $t2, $t2, 0x1c -/* 16479C 80243F3C 3C080050 */ lui $t0, 0x50 -/* 1647A0 80243F40 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* 1647A4 80243F44 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* 1647A8 80243F48 35084340 */ ori $t0, $t0, 0x4340 -/* 1647AC 80243F4C 8C640000 */ lw $a0, ($v1) -/* 1647B0 80243F50 3C02E700 */ lui $v0, 0xe700 -/* 1647B4 80243F54 0080282D */ daddu $a1, $a0, $zero -/* 1647B8 80243F58 24840008 */ addiu $a0, $a0, 8 -/* 1647BC 80243F5C AC640000 */ sw $a0, ($v1) -/* 1647C0 80243F60 ACA20000 */ sw $v0, ($a1) -/* 1647C4 80243F64 24820008 */ addiu $v0, $a0, 8 -/* 1647C8 80243F68 ACA00004 */ sw $zero, 4($a1) -/* 1647CC 80243F6C AC620000 */ sw $v0, ($v1) -/* 1647D0 80243F70 24820010 */ addiu $v0, $a0, 0x10 -/* 1647D4 80243F74 AC860000 */ sw $a2, ($a0) -/* 1647D8 80243F78 AC800004 */ sw $zero, 4($a0) -/* 1647DC 80243F7C AC620000 */ sw $v0, ($v1) -/* 1647E0 80243F80 24820018 */ addiu $v0, $a0, 0x18 -/* 1647E4 80243F84 AC890008 */ sw $t1, 8($a0) -/* 1647E8 80243F88 AC87000C */ sw $a3, 0xc($a0) -/* 1647EC 80243F8C AC620000 */ sw $v0, ($v1) -/* 1647F0 80243F90 24820020 */ addiu $v0, $a0, 0x20 -/* 1647F4 80243F94 AC8A0010 */ sw $t2, 0x10($a0) -/* 1647F8 80243F98 AC880014 */ sw $t0, 0x14($a0) -/* 1647FC 80243F9C AC620000 */ sw $v0, ($v1) -/* 164800 80243FA0 3C02FA00 */ lui $v0, 0xfa00 -/* 164804 80243FA4 001018C0 */ sll $v1, $s0, 3 -/* 164808 80243FA8 00701823 */ subu $v1, $v1, $s0 -/* 16480C 80243FAC 00031840 */ sll $v1, $v1, 1 -/* 164810 80243FB0 AC820018 */ sw $v0, 0x18($a0) -/* 164814 80243FB4 2402008C */ addiu $v0, $zero, 0x8c -/* 164818 80243FB8 00431023 */ subu $v0, $v0, $v1 -/* 16481C 80243FBC 304200FF */ andi $v0, $v0, 0xff -/* 164820 80243FC0 AC82001C */ sw $v0, 0x1c($a0) -/* 164824 80243FC4 0000202D */ daddu $a0, $zero, $zero -/* 164828 80243FC8 0080282D */ daddu $a1, $a0, $zero -/* 16482C 80243FCC 24060500 */ addiu $a2, $zero, 0x500 -/* 164830 80243FD0 240703C0 */ addiu $a3, $zero, 0x3c0 -/* 164834 80243FD4 AFA00010 */ sw $zero, 0x10($sp) -/* 164838 80243FD8 AFA00014 */ sw $zero, 0x14($sp) -/* 16483C 80243FDC AFA00018 */ sw $zero, 0x18($sp) -/* 164840 80243FE0 AFA0001C */ sw $zero, 0x1c($sp) -/* 164844 80243FE4 0C090AE8 */ jal mainmenu_draw_rect -/* 164848 80243FE8 AFA00020 */ sw $zero, 0x20($sp) -/* 16484C 80243FEC 00101040 */ sll $v0, $s0, 1 -/* 164850 80243FF0 3C038025 */ lui $v1, %hi(D_80249D48) -/* 164854 80243FF4 00621821 */ addu $v1, $v1, $v0 -/* 164858 80243FF8 84639D48 */ lh $v1, %lo(D_80249D48)($v1) -/* 16485C 80243FFC 8E220000 */ lw $v0, ($s1) -/* 164860 80244000 00431023 */ subu $v0, $v0, $v1 -/* 164864 80244004 08091007 */ j .L8024401C -/* 164868 80244008 AE220000 */ sw $v0, ($s1) -.L8024400C: -/* 16486C 8024400C 90820000 */ lbu $v0, ($a0) -/* 164870 80244010 304200F7 */ andi $v0, $v0, 0xf7 -/* 164874 80244014 34420004 */ ori $v0, $v0, 4 -/* 164878 80244018 A0820000 */ sb $v0, ($a0) -.L8024401C: -/* 16487C 8024401C 8FBF0030 */ lw $ra, 0x30($sp) -/* 164880 80244020 8FB1002C */ lw $s1, 0x2c($sp) -/* 164884 80244024 8FB00028 */ lw $s0, 0x28($sp) -/* 164888 80244028 03E00008 */ jr $ra -/* 16488C 8024402C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_name_input.s b/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_name_input.s deleted file mode 100644 index 8a2885ac8f..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_name_input.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_update_hidden_name_input -/* 163E88 80243628 3C028016 */ lui $v0, %hi(gWindows) -/* 163E8C 8024362C 24429D50 */ addiu $v0, $v0, %lo(gWindows) -/* 163E90 80243630 00042140 */ sll $a0, $a0, 5 -/* 163E94 80243634 00822021 */ addu $a0, $a0, $v0 -/* 163E98 80243638 9083001C */ lbu $v1, 0x1c($a0) -/* 163E9C 8024363C 2862000A */ slti $v0, $v1, 0xa -/* 163EA0 80243640 10400008 */ beqz $v0, .L80243664 -/* 163EA4 80243644 00031040 */ sll $v0, $v1, 1 -/* 163EA8 80243648 3C038025 */ lui $v1, %hi(D_80249C90) -/* 163EAC 8024364C 00621821 */ addu $v1, $v1, $v0 -/* 163EB0 80243650 84639C90 */ lh $v1, %lo(D_80249C90)($v1) -/* 163EB4 80243654 8CC20000 */ lw $v0, ($a2) -/* 163EB8 80243658 00431023 */ subu $v0, $v0, $v1 -/* 163EBC 8024365C 03E00008 */ jr $ra -/* 163EC0 80243660 ACC20000 */ sw $v0, ($a2) -.L80243664: -/* 163EC4 80243664 3C028025 */ lui $v0, %hi(D_80249CA2) -/* 163EC8 80243668 84429CA2 */ lh $v0, %lo(D_80249CA2)($v0) -/* 163ECC 8024366C 8CC30000 */ lw $v1, ($a2) -/* 163ED0 80243670 00621823 */ subu $v1, $v1, $v0 -/* 163ED4 80243674 ACC30000 */ sw $v1, ($a2) -/* 163ED8 80243678 90820000 */ lbu $v0, ($a0) -/* 163EDC 8024367C 304200F7 */ andi $v0, $v0, 0xf7 -/* 163EE0 80243680 34420004 */ ori $v0, $v0, 4 -/* 163EE4 80243684 03E00008 */ jr $ra -/* 163EE8 80243688 A0820000 */ sb $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_options_bottom.s b/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_options_bottom.s deleted file mode 100644 index 232e8f9862..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_options_bottom.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_update_hidden_options_bottom -/* 164018 802437B8 3C028016 */ lui $v0, %hi(gWindows) -/* 16401C 802437BC 24429D50 */ addiu $v0, $v0, %lo(gWindows) -/* 164020 802437C0 00042140 */ sll $a0, $a0, 5 -/* 164024 802437C4 00822021 */ addu $a0, $a0, $v0 -/* 164028 802437C8 9083001C */ lbu $v1, 0x1c($a0) -/* 16402C 802437CC 2862000A */ slti $v0, $v1, 0xa -/* 164030 802437D0 10400008 */ beqz $v0, .L802437F4 -/* 164034 802437D4 00031040 */ sll $v0, $v1, 1 -/* 164038 802437D8 3C038025 */ lui $v1, %hi(D_80249CE0) -/* 16403C 802437DC 00621821 */ addu $v1, $v1, $v0 -/* 164040 802437E0 84639CE0 */ lh $v1, %lo(D_80249CE0)($v1) -/* 164044 802437E4 8CE20000 */ lw $v0, ($a3) -/* 164048 802437E8 00431023 */ subu $v0, $v0, $v1 -/* 16404C 802437EC 03E00008 */ jr $ra -/* 164050 802437F0 ACE20000 */ sw $v0, ($a3) -.L802437F4: -/* 164054 802437F4 3C028025 */ lui $v0, %hi(D_80249CF2) -/* 164058 802437F8 84429CF2 */ lh $v0, %lo(D_80249CF2)($v0) -/* 16405C 802437FC 8CE30000 */ lw $v1, ($a3) -/* 164060 80243800 00621823 */ subu $v1, $v1, $v0 -/* 164064 80243804 ACE30000 */ sw $v1, ($a3) -/* 164068 80243808 90820000 */ lbu $v0, ($a0) -/* 16406C 8024380C 304200F7 */ andi $v0, $v0, 0xf7 -/* 164070 80243810 34420004 */ ori $v0, $v0, 4 -/* 164074 80243814 03E00008 */ jr $ra -/* 164078 80243818 A0820000 */ sb $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_options_left.s b/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_options_left.s deleted file mode 100644 index 0ecc88108f..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_options_left.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_update_hidden_options_left -/* 163EEC 8024368C 3C028016 */ lui $v0, %hi(gWindows) -/* 163EF0 80243690 24429D50 */ addiu $v0, $v0, %lo(gWindows) -/* 163EF4 80243694 00042140 */ sll $a0, $a0, 5 -/* 163EF8 80243698 00822021 */ addu $a0, $a0, $v0 -/* 163EFC 8024369C 9083001C */ lbu $v1, 0x1c($a0) -/* 163F00 802436A0 2862000A */ slti $v0, $v1, 0xa -/* 163F04 802436A4 10400008 */ beqz $v0, .L802436C8 -/* 163F08 802436A8 00031040 */ sll $v0, $v1, 1 -/* 163F0C 802436AC 3C038025 */ lui $v1, %hi(D_80249CA4) -/* 163F10 802436B0 00621821 */ addu $v1, $v1, $v0 -/* 163F14 802436B4 84639CA4 */ lh $v1, %lo(D_80249CA4)($v1) -/* 163F18 802436B8 8CC20000 */ lw $v0, ($a2) -/* 163F1C 802436BC 00431021 */ addu $v0, $v0, $v1 -/* 163F20 802436C0 03E00008 */ jr $ra -/* 163F24 802436C4 ACC20000 */ sw $v0, ($a2) -.L802436C8: -/* 163F28 802436C8 3C028025 */ lui $v0, %hi(D_80249CB6) -/* 163F2C 802436CC 84429CB6 */ lh $v0, %lo(D_80249CB6)($v0) -/* 163F30 802436D0 8CC30000 */ lw $v1, ($a2) -/* 163F34 802436D4 00621821 */ addu $v1, $v1, $v0 -/* 163F38 802436D8 ACC30000 */ sw $v1, ($a2) -/* 163F3C 802436DC 90820000 */ lbu $v0, ($a0) -/* 163F40 802436E0 304200F7 */ andi $v0, $v0, 0xf7 -/* 163F44 802436E4 34420004 */ ori $v0, $v0, 4 -/* 163F48 802436E8 03E00008 */ jr $ra -/* 163F4C 802436EC A0820000 */ sb $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_options_right.s b/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_options_right.s deleted file mode 100644 index 94e1d34fda..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_options_right.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_update_hidden_options_right -/* 163F50 802436F0 3C028016 */ lui $v0, %hi(gWindows) -/* 163F54 802436F4 24429D50 */ addiu $v0, $v0, %lo(gWindows) -/* 163F58 802436F8 00042140 */ sll $a0, $a0, 5 -/* 163F5C 802436FC 00822021 */ addu $a0, $a0, $v0 -/* 163F60 80243700 9083001C */ lbu $v1, 0x1c($a0) -/* 163F64 80243704 2862000A */ slti $v0, $v1, 0xa -/* 163F68 80243708 10400008 */ beqz $v0, .L8024372C -/* 163F6C 8024370C 00031040 */ sll $v0, $v1, 1 -/* 163F70 80243710 3C038025 */ lui $v1, %hi(D_80249CB8) -/* 163F74 80243714 00621821 */ addu $v1, $v1, $v0 -/* 163F78 80243718 84639CB8 */ lh $v1, %lo(D_80249CB8)($v1) -/* 163F7C 8024371C 8CC20000 */ lw $v0, ($a2) -/* 163F80 80243720 00431023 */ subu $v0, $v0, $v1 -/* 163F84 80243724 03E00008 */ jr $ra -/* 163F88 80243728 ACC20000 */ sw $v0, ($a2) -.L8024372C: -/* 163F8C 8024372C 3C028025 */ lui $v0, %hi(D_80249CCA) -/* 163F90 80243730 84429CCA */ lh $v0, %lo(D_80249CCA)($v0) -/* 163F94 80243734 8CC30000 */ lw $v1, ($a2) -/* 163F98 80243738 00621823 */ subu $v1, $v1, $v0 -/* 163F9C 8024373C ACC30000 */ sw $v1, ($a2) -/* 163FA0 80243740 90820000 */ lbu $v0, ($a0) -/* 163FA4 80243744 304200F7 */ andi $v0, $v0, 0xf7 -/* 163FA8 80243748 34420004 */ ori $v0, $v0, 4 -/* 163FAC 8024374C 03E00008 */ jr $ra -/* 163FB0 80243750 A0820000 */ sb $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_title.s b/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_title.s deleted file mode 100644 index cca117ba14..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_title.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_update_hidden_title -/* 163FB4 80243754 3C028016 */ lui $v0, %hi(gWindows) -/* 163FB8 80243758 24429D50 */ addiu $v0, $v0, %lo(gWindows) -/* 163FBC 8024375C 00042140 */ sll $a0, $a0, 5 -/* 163FC0 80243760 00822021 */ addu $a0, $a0, $v0 -/* 163FC4 80243764 9083001C */ lbu $v1, 0x1c($a0) -/* 163FC8 80243768 2862000A */ slti $v0, $v1, 0xa -/* 163FCC 8024376C 10400008 */ beqz $v0, .L80243790 -/* 163FD0 80243770 00031040 */ sll $v0, $v1, 1 -/* 163FD4 80243774 3C038025 */ lui $v1, %hi(D_80249CCC) -/* 163FD8 80243778 00621821 */ addu $v1, $v1, $v0 -/* 163FDC 8024377C 84639CCC */ lh $v1, %lo(D_80249CCC)($v1) -/* 163FE0 80243780 8CE20000 */ lw $v0, ($a3) -/* 163FE4 80243784 00431021 */ addu $v0, $v0, $v1 -/* 163FE8 80243788 03E00008 */ jr $ra -/* 163FEC 8024378C ACE20000 */ sw $v0, ($a3) -.L80243790: -/* 163FF0 80243790 3C028025 */ lui $v0, %hi(D_80249CDE) -/* 163FF4 80243794 84429CDE */ lh $v0, %lo(D_80249CDE)($v0) -/* 163FF8 80243798 8CE30000 */ lw $v1, ($a3) -/* 163FFC 8024379C 00621821 */ addu $v1, $v1, $v0 -/* 164000 802437A0 ACE30000 */ sw $v1, ($a3) -/* 164004 802437A4 90820000 */ lbu $v0, ($a0) -/* 164008 802437A8 304200F7 */ andi $v0, $v0, 0xf7 -/* 16400C 802437AC 34420004 */ ori $v0, $v0, 4 -/* 164010 802437B0 03E00008 */ jr $ra -/* 164014 802437B4 A0820000 */ sb $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_with_rotation.s b/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_with_rotation.s deleted file mode 100644 index 41581c31a6..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_update_hidden_with_rotation.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_update_hidden_with_rotation -/* 1640F8 80243898 3C028016 */ lui $v0, %hi(gWindows) -/* 1640FC 8024389C 24429D50 */ addiu $v0, $v0, %lo(gWindows) -/* 164100 802438A0 00042140 */ sll $a0, $a0, 5 -/* 164104 802438A4 00822021 */ addu $a0, $a0, $v0 -/* 164108 802438A8 9083001C */ lbu $v1, 0x1c($a0) -/* 16410C 802438AC 8FA60020 */ lw $a2, 0x20($sp) -/* 164110 802438B0 2862000A */ slti $v0, $v1, 0xa -/* 164114 802438B4 5040000F */ beql $v0, $zero, .L802438F4 -/* 164118 802438B8 ACA00000 */ sw $zero, ($a1) -/* 16411C 802438BC 00031040 */ sll $v0, $v1, 1 -/* 164120 802438C0 3C018025 */ lui $at, %hi(D_80249D14) -/* 164124 802438C4 00220821 */ addu $at, $at, $v0 -/* 164128 802438C8 84229D14 */ lh $v0, %lo(D_80249D14)($at) -/* 16412C 802438CC C4C00000 */ lwc1 $f0, ($a2) -/* 164130 802438D0 00021023 */ negu $v0, $v0 -/* 164134 802438D4 44821000 */ mtc1 $v0, $f2 -/* 164138 802438D8 00000000 */ nop -/* 16413C 802438DC 468010A0 */ cvt.s.w $f2, $f2 -/* 164140 802438E0 46020000 */ add.s $f0, $f0, $f2 -/* 164144 802438E4 24020009 */ addiu $v0, $zero, 9 -/* 164148 802438E8 E4C00000 */ swc1 $f0, ($a2) -/* 16414C 802438EC 03E00008 */ jr $ra -/* 164150 802438F0 ACA20000 */ sw $v0, ($a1) -.L802438F4: -/* 164154 802438F4 90820000 */ lbu $v0, ($a0) -/* 164158 802438F8 304200F7 */ andi $v0, $v0, 0xf7 -/* 16415C 802438FC 34420004 */ ori $v0, $v0, 4 -/* 164160 80243900 03E00008 */ jr $ra -/* 164164 80243904 A0820000 */ sb $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update_show_name_input.s b/ver/us/asm/nonmatchings/163400/filemenu_update_show_name_input.s deleted file mode 100644 index 24775e0e31..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_update_show_name_input.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_update_show_name_input -/* 163BE0 80243380 3C028016 */ lui $v0, %hi(gWindows) -/* 163BE4 80243384 24429D50 */ addiu $v0, $v0, %lo(gWindows) -/* 163BE8 80243388 00042140 */ sll $a0, $a0, 5 -/* 163BEC 8024338C 00822021 */ addu $a0, $a0, $v0 -/* 163BF0 80243390 9083001C */ lbu $v1, 0x1c($a0) -/* 163BF4 80243394 14600005 */ bnez $v1, .L802433AC -/* 163BF8 80243398 28620010 */ slti $v0, $v1, 0x10 -/* 163BFC 8024339C 90820000 */ lbu $v0, ($a0) -/* 163C00 802433A0 304200FB */ andi $v0, $v0, 0xfb -/* 163C04 802433A4 A0820000 */ sb $v0, ($a0) -/* 163C08 802433A8 28620010 */ slti $v0, $v1, 0x10 -.L802433AC: -/* 163C0C 802433AC 10400008 */ beqz $v0, .L802433D0 -/* 163C10 802433B0 00031040 */ sll $v0, $v1, 1 -/* 163C14 802433B4 3C038025 */ lui $v1, %hi(D_80249BDC) -/* 163C18 802433B8 00621821 */ addu $v1, $v1, $v0 -/* 163C1C 802433BC 84639BDC */ lh $v1, %lo(D_80249BDC)($v1) -/* 163C20 802433C0 8CC20000 */ lw $v0, ($a2) -/* 163C24 802433C4 00431021 */ addu $v0, $v0, $v1 -/* 163C28 802433C8 03E00008 */ jr $ra -/* 163C2C 802433CC ACC20000 */ sw $v0, ($a2) -.L802433D0: -/* 163C30 802433D0 3C028025 */ lui $v0, %hi(D_80249BFA) -/* 163C34 802433D4 84429BFA */ lh $v0, %lo(D_80249BFA)($v0) -/* 163C38 802433D8 8CC30000 */ lw $v1, ($a2) -/* 163C3C 802433DC 00621821 */ addu $v1, $v1, $v0 -/* 163C40 802433E0 ACC30000 */ sw $v1, ($a2) -/* 163C44 802433E4 90820000 */ lbu $v0, ($a0) -/* 163C48 802433E8 304200F7 */ andi $v0, $v0, 0xf7 -/* 163C4C 802433EC 03E00008 */ jr $ra -/* 163C50 802433F0 A0820000 */ sb $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update_show_options_bottom.s b/ver/us/asm/nonmatchings/163400/filemenu_update_show_options_bottom.s deleted file mode 100644 index 26b03688d0..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_update_show_options_bottom.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_update_show_options_bottom -/* 163D3C 802434DC 3C028016 */ lui $v0, %hi(gWindows) -/* 163D40 802434E0 24429D50 */ addiu $v0, $v0, %lo(gWindows) -/* 163D44 802434E4 00042140 */ sll $a0, $a0, 5 -/* 163D48 802434E8 00822021 */ addu $a0, $a0, $v0 -/* 163D4C 802434EC 9083001C */ lbu $v1, 0x1c($a0) -/* 163D50 802434F0 14600005 */ bnez $v1, .L80243508 -/* 163D54 802434F4 28620010 */ slti $v0, $v1, 0x10 -/* 163D58 802434F8 90820000 */ lbu $v0, ($a0) -/* 163D5C 802434FC 304200FB */ andi $v0, $v0, 0xfb -/* 163D60 80243500 A0820000 */ sb $v0, ($a0) -/* 163D64 80243504 28620010 */ slti $v0, $v1, 0x10 -.L80243508: -/* 163D68 80243508 10400008 */ beqz $v0, .L8024352C -/* 163D6C 8024350C 00031040 */ sll $v0, $v1, 1 -/* 163D70 80243510 3C038025 */ lui $v1, %hi(D_80249C3C) -/* 163D74 80243514 00621821 */ addu $v1, $v1, $v0 -/* 163D78 80243518 84639C3C */ lh $v1, %lo(D_80249C3C)($v1) -/* 163D7C 8024351C 8CE20000 */ lw $v0, ($a3) -/* 163D80 80243520 00431021 */ addu $v0, $v0, $v1 -/* 163D84 80243524 03E00008 */ jr $ra -/* 163D88 80243528 ACE20000 */ sw $v0, ($a3) -.L8024352C: -/* 163D8C 8024352C 3C028025 */ lui $v0, %hi(D_80249C5A) -/* 163D90 80243530 84429C5A */ lh $v0, %lo(D_80249C5A)($v0) -/* 163D94 80243534 8CE30000 */ lw $v1, ($a3) -/* 163D98 80243538 00621821 */ addu $v1, $v1, $v0 -/* 163D9C 8024353C ACE30000 */ sw $v1, ($a3) -/* 163DA0 80243540 90820000 */ lbu $v0, ($a0) -/* 163DA4 80243544 304200F7 */ andi $v0, $v0, 0xf7 -/* 163DA8 80243548 03E00008 */ jr $ra -/* 163DAC 8024354C A0820000 */ sb $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update_show_options_left.s b/ver/us/asm/nonmatchings/163400/filemenu_update_show_options_left.s deleted file mode 100644 index 9451867a22..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_update_show_options_left.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_update_show_options_left -/* 163C54 802433F4 3C028016 */ lui $v0, %hi(gWindows) -/* 163C58 802433F8 24429D50 */ addiu $v0, $v0, %lo(gWindows) -/* 163C5C 802433FC 00042140 */ sll $a0, $a0, 5 -/* 163C60 80243400 00822021 */ addu $a0, $a0, $v0 -/* 163C64 80243404 9083001C */ lbu $v1, 0x1c($a0) -/* 163C68 80243408 14600005 */ bnez $v1, .L80243420 -/* 163C6C 8024340C 28620010 */ slti $v0, $v1, 0x10 -/* 163C70 80243410 90820000 */ lbu $v0, ($a0) -/* 163C74 80243414 304200FB */ andi $v0, $v0, 0xfb -/* 163C78 80243418 A0820000 */ sb $v0, ($a0) -/* 163C7C 8024341C 28620010 */ slti $v0, $v1, 0x10 -.L80243420: -/* 163C80 80243420 10400008 */ beqz $v0, .L80243444 -/* 163C84 80243424 00031040 */ sll $v0, $v1, 1 -/* 163C88 80243428 3C038025 */ lui $v1, %hi(D_80249BFC) -/* 163C8C 8024342C 00621821 */ addu $v1, $v1, $v0 -/* 163C90 80243430 84639BFC */ lh $v1, %lo(D_80249BFC)($v1) -/* 163C94 80243434 8CC20000 */ lw $v0, ($a2) -/* 163C98 80243438 00431023 */ subu $v0, $v0, $v1 -/* 163C9C 8024343C 03E00008 */ jr $ra -/* 163CA0 80243440 ACC20000 */ sw $v0, ($a2) -.L80243444: -/* 163CA4 80243444 3C028025 */ lui $v0, %hi(D_80249C1A) -/* 163CA8 80243448 84429C1A */ lh $v0, %lo(D_80249C1A)($v0) -/* 163CAC 8024344C 8CC30000 */ lw $v1, ($a2) -/* 163CB0 80243450 00621823 */ subu $v1, $v1, $v0 -/* 163CB4 80243454 ACC30000 */ sw $v1, ($a2) -/* 163CB8 80243458 90820000 */ lbu $v0, ($a0) -/* 163CBC 8024345C 304200F7 */ andi $v0, $v0, 0xf7 -/* 163CC0 80243460 03E00008 */ jr $ra -/* 163CC4 80243464 A0820000 */ sb $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update_show_options_right.s b/ver/us/asm/nonmatchings/163400/filemenu_update_show_options_right.s deleted file mode 100644 index 9aac6a5f15..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_update_show_options_right.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_update_show_options_right -/* 163CC8 80243468 3C028016 */ lui $v0, %hi(gWindows) -/* 163CCC 8024346C 24429D50 */ addiu $v0, $v0, %lo(gWindows) -/* 163CD0 80243470 00042140 */ sll $a0, $a0, 5 -/* 163CD4 80243474 00822021 */ addu $a0, $a0, $v0 -/* 163CD8 80243478 9083001C */ lbu $v1, 0x1c($a0) -/* 163CDC 8024347C 14600005 */ bnez $v1, .L80243494 -/* 163CE0 80243480 28620010 */ slti $v0, $v1, 0x10 -/* 163CE4 80243484 90820000 */ lbu $v0, ($a0) -/* 163CE8 80243488 304200FB */ andi $v0, $v0, 0xfb -/* 163CEC 8024348C A0820000 */ sb $v0, ($a0) -/* 163CF0 80243490 28620010 */ slti $v0, $v1, 0x10 -.L80243494: -/* 163CF4 80243494 10400008 */ beqz $v0, .L802434B8 -/* 163CF8 80243498 00031040 */ sll $v0, $v1, 1 -/* 163CFC 8024349C 3C038025 */ lui $v1, %hi(D_80249C1C) -/* 163D00 802434A0 00621821 */ addu $v1, $v1, $v0 -/* 163D04 802434A4 84639C1C */ lh $v1, %lo(D_80249C1C)($v1) -/* 163D08 802434A8 8CC20000 */ lw $v0, ($a2) -/* 163D0C 802434AC 00431021 */ addu $v0, $v0, $v1 -/* 163D10 802434B0 03E00008 */ jr $ra -/* 163D14 802434B4 ACC20000 */ sw $v0, ($a2) -.L802434B8: -/* 163D18 802434B8 3C028025 */ lui $v0, %hi(D_80249C3A) -/* 163D1C 802434BC 84429C3A */ lh $v0, %lo(D_80249C3A)($v0) -/* 163D20 802434C0 8CC30000 */ lw $v1, ($a2) -/* 163D24 802434C4 00621821 */ addu $v1, $v1, $v0 -/* 163D28 802434C8 ACC30000 */ sw $v1, ($a2) -/* 163D2C 802434CC 90820000 */ lbu $v0, ($a0) -/* 163D30 802434D0 304200F7 */ andi $v0, $v0, 0xf7 -/* 163D34 802434D4 03E00008 */ jr $ra -/* 163D38 802434D8 A0820000 */ sb $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update_show_title.s b/ver/us/asm/nonmatchings/163400/filemenu_update_show_title.s deleted file mode 100644 index 14f0926680..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_update_show_title.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_update_show_title -/* 163DB0 80243550 3C028016 */ lui $v0, %hi(gWindows) -/* 163DB4 80243554 24429D50 */ addiu $v0, $v0, %lo(gWindows) -/* 163DB8 80243558 00042140 */ sll $a0, $a0, 5 -/* 163DBC 8024355C 00822021 */ addu $a0, $a0, $v0 -/* 163DC0 80243560 9083001C */ lbu $v1, 0x1c($a0) -/* 163DC4 80243564 14600005 */ bnez $v1, .L8024357C -/* 163DC8 80243568 28620010 */ slti $v0, $v1, 0x10 -/* 163DCC 8024356C 90820000 */ lbu $v0, ($a0) -/* 163DD0 80243570 304200FB */ andi $v0, $v0, 0xfb -/* 163DD4 80243574 A0820000 */ sb $v0, ($a0) -/* 163DD8 80243578 28620010 */ slti $v0, $v1, 0x10 -.L8024357C: -/* 163DDC 8024357C 10400008 */ beqz $v0, .L802435A0 -/* 163DE0 80243580 00031040 */ sll $v0, $v1, 1 -/* 163DE4 80243584 3C038025 */ lui $v1, %hi(D_80249C5C) -/* 163DE8 80243588 00621821 */ addu $v1, $v1, $v0 -/* 163DEC 8024358C 84639C5C */ lh $v1, %lo(D_80249C5C)($v1) -/* 163DF0 80243590 8CE20000 */ lw $v0, ($a3) -/* 163DF4 80243594 00431023 */ subu $v0, $v0, $v1 -/* 163DF8 80243598 03E00008 */ jr $ra -/* 163DFC 8024359C ACE20000 */ sw $v0, ($a3) -.L802435A0: -/* 163E00 802435A0 3C028025 */ lui $v0, %hi(D_80249C7A) -/* 163E04 802435A4 84429C7A */ lh $v0, %lo(D_80249C7A)($v0) -/* 163E08 802435A8 8CE30000 */ lw $v1, ($a3) -/* 163E0C 802435AC 00621823 */ subu $v1, $v1, $v0 -/* 163E10 802435B0 ACE30000 */ sw $v1, ($a3) -/* 163E14 802435B4 90820000 */ lbu $v0, ($a0) -/* 163E18 802435B8 304200F7 */ andi $v0, $v0, 0xf7 -/* 163E1C 802435BC 03E00008 */ jr $ra -/* 163E20 802435C0 A0820000 */ sb $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update_show_with_rotation.s b/ver/us/asm/nonmatchings/163400/filemenu_update_show_with_rotation.s deleted file mode 100644 index ecf8582028..0000000000 --- a/ver/us/asm/nonmatchings/163400/filemenu_update_show_with_rotation.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_update_show_with_rotation -/* 16407C 8024381C 3C028016 */ lui $v0, %hi(gWindows) -/* 164080 80243820 24429D50 */ addiu $v0, $v0, %lo(gWindows) -/* 164084 80243824 00042140 */ sll $a0, $a0, 5 -/* 164088 80243828 00822021 */ addu $a0, $a0, $v0 -/* 16408C 8024382C 9083001C */ lbu $v1, 0x1c($a0) -/* 164090 80243830 8FA60020 */ lw $a2, 0x20($sp) -/* 164094 80243834 14600005 */ bnez $v1, .L8024384C -/* 164098 80243838 28620010 */ slti $v0, $v1, 0x10 -/* 16409C 8024383C 90820000 */ lbu $v0, ($a0) -/* 1640A0 80243840 304200FB */ andi $v0, $v0, 0xfb -/* 1640A4 80243844 A0820000 */ sb $v0, ($a0) -/* 1640A8 80243848 28620010 */ slti $v0, $v1, 0x10 -.L8024384C: -/* 1640AC 8024384C 5040000E */ beql $v0, $zero, .L80243888 -/* 1640B0 80243850 ACA00000 */ sw $zero, ($a1) -/* 1640B4 80243854 00031040 */ sll $v0, $v1, 1 -/* 1640B8 80243858 3C018025 */ lui $at, %hi(D_80249CF4) -/* 1640BC 8024385C 00220821 */ addu $at, $at, $v0 -/* 1640C0 80243860 84229CF4 */ lh $v0, %lo(D_80249CF4)($at) -/* 1640C4 80243864 C4C00000 */ lwc1 $f0, ($a2) -/* 1640C8 80243868 44821000 */ mtc1 $v0, $f2 -/* 1640CC 8024386C 00000000 */ nop -/* 1640D0 80243870 468010A0 */ cvt.s.w $f2, $f2 -/* 1640D4 80243874 46020000 */ add.s $f0, $f0, $f2 -/* 1640D8 80243878 24020009 */ addiu $v0, $zero, 9 -/* 1640DC 8024387C E4C00000 */ swc1 $f0, ($a2) -/* 1640E0 80243880 03E00008 */ jr $ra -/* 1640E4 80243884 ACA20000 */ sw $v0, ($a1) -.L80243888: -/* 1640E8 80243888 90820000 */ lbu $v0, ($a0) -/* 1640EC 8024388C 304200F7 */ andi $v0, $v0, 0xf7 -/* 1640F0 80243890 03E00008 */ jr $ra -/* 1640F4 80243894 A0820000 */ sb $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/163400/func_8024330C.s b/ver/us/asm/nonmatchings/163400/func_8024330C.s deleted file mode 100644 index 21e2c38fd4..0000000000 --- a/ver/us/asm/nonmatchings/163400/func_8024330C.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024330C -/* 163B6C 8024330C 3C028016 */ lui $v0, %hi(gWindows) -/* 163B70 80243310 24429D50 */ addiu $v0, $v0, %lo(gWindows) -/* 163B74 80243314 00042140 */ sll $a0, $a0, 5 -/* 163B78 80243318 00822021 */ addu $a0, $a0, $v0 -/* 163B7C 8024331C 9083001C */ lbu $v1, 0x1c($a0) -/* 163B80 80243320 14600005 */ bnez $v1, .L80243338 -/* 163B84 80243324 28620010 */ slti $v0, $v1, 0x10 -/* 163B88 80243328 90820000 */ lbu $v0, ($a0) -/* 163B8C 8024332C 304200FB */ andi $v0, $v0, 0xfb -/* 163B90 80243330 A0820000 */ sb $v0, ($a0) -/* 163B94 80243334 28620010 */ slti $v0, $v1, 0x10 -.L80243338: -/* 163B98 80243338 10400008 */ beqz $v0, .L8024335C -/* 163B9C 8024333C 00031040 */ sll $v0, $v1, 1 -/* 163BA0 80243340 3C038025 */ lui $v1, %hi(D_80249BBC) -/* 163BA4 80243344 00621821 */ addu $v1, $v1, $v0 -/* 163BA8 80243348 84639BBC */ lh $v1, %lo(D_80249BBC)($v1) -/* 163BAC 8024334C 8CC20000 */ lw $v0, ($a2) -/* 163BB0 80243350 00431023 */ subu $v0, $v0, $v1 -/* 163BB4 80243354 03E00008 */ jr $ra -/* 163BB8 80243358 ACC20000 */ sw $v0, ($a2) -.L8024335C: -/* 163BBC 8024335C 3C028025 */ lui $v0, %hi(D_80249BDA) -/* 163BC0 80243360 84429BDA */ lh $v0, %lo(D_80249BDA)($v0) -/* 163BC4 80243364 8CC30000 */ lw $v1, ($a2) -/* 163BC8 80243368 00621823 */ subu $v1, $v1, $v0 -/* 163BCC 8024336C ACC30000 */ sw $v1, ($a2) -/* 163BD0 80243370 90820000 */ lbu $v0, ($a0) -/* 163BD4 80243374 304200F7 */ andi $v0, $v0, 0xf7 -/* 163BD8 80243378 03E00008 */ jr $ra -/* 163BDC 8024337C A0820000 */ sb $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/163400/func_802435C4.s b/ver/us/asm/nonmatchings/163400/func_802435C4.s deleted file mode 100644 index a7ea9a85c9..0000000000 --- a/ver/us/asm/nonmatchings/163400/func_802435C4.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435C4 -/* 163E24 802435C4 3C028016 */ lui $v0, %hi(gWindows) -/* 163E28 802435C8 24429D50 */ addiu $v0, $v0, %lo(gWindows) -/* 163E2C 802435CC 00042140 */ sll $a0, $a0, 5 -/* 163E30 802435D0 00822021 */ addu $a0, $a0, $v0 -/* 163E34 802435D4 9083001C */ lbu $v1, 0x1c($a0) -/* 163E38 802435D8 2862000A */ slti $v0, $v1, 0xa -/* 163E3C 802435DC 10400008 */ beqz $v0, .L80243600 -/* 163E40 802435E0 00031040 */ sll $v0, $v1, 1 -/* 163E44 802435E4 3C038025 */ lui $v1, %hi(D_80249C7C) -/* 163E48 802435E8 00621821 */ addu $v1, $v1, $v0 -/* 163E4C 802435EC 84639C7C */ lh $v1, %lo(D_80249C7C)($v1) -/* 163E50 802435F0 8CC20000 */ lw $v0, ($a2) -/* 163E54 802435F4 00431021 */ addu $v0, $v0, $v1 -/* 163E58 802435F8 03E00008 */ jr $ra -/* 163E5C 802435FC ACC20000 */ sw $v0, ($a2) -.L80243600: -/* 163E60 80243600 3C028025 */ lui $v0, %hi(D_80249C8E) -/* 163E64 80243604 84429C8E */ lh $v0, %lo(D_80249C8E)($v0) -/* 163E68 80243608 8CC30000 */ lw $v1, ($a2) -/* 163E6C 8024360C 00621821 */ addu $v1, $v1, $v0 -/* 163E70 80243610 ACC30000 */ sw $v1, ($a2) -/* 163E74 80243614 90820000 */ lbu $v0, ($a0) -/* 163E78 80243618 304200F7 */ andi $v0, $v0, 0xf7 -/* 163E7C 8024361C 34420004 */ ori $v0, $v0, 4 -/* 163E80 80243620 03E00008 */ jr $ra -/* 163E84 80243624 A0820000 */ sb $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/163400/func_80244BC4.s b/ver/us/asm/nonmatchings/163400/func_80244BC4.s index 1356bd1757..67c421d2da 100644 --- a/ver/us/asm/nonmatchings/163400/func_80244BC4.s +++ b/ver/us/asm/nonmatchings/163400/func_80244BC4.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80244BC4 -/* 165424 80244BC4 3C048025 */ lui $a0, %hi(D_80249B84) -/* 165428 80244BC8 24849B84 */ addiu $a0, $a0, %lo(D_80249B84) +/* 165424 80244BC4 3C048025 */ lui $a0, %hi(filemenu_menus) +/* 165428 80244BC8 24849B84 */ addiu $a0, $a0, %lo(filemenu_menus) /* 16542C 80244BCC 8C820000 */ lw $v0, ($a0) /* 165430 80244BD0 80420004 */ lb $v0, 4($v0) /* 165434 80244BD4 14400009 */ bnez $v0, .L80244BFC @@ -17,8 +17,8 @@ glabel func_80244BC4 /* 165454 80244BF4 1040000B */ beqz $v0, .L80244C24 /* 165458 80244BF8 24020002 */ addiu $v0, $zero, 2 .L80244BFC: -/* 16545C 80244BFC 3C038025 */ lui $v1, %hi(D_80249B84) -/* 165460 80244C00 8C639B84 */ lw $v1, %lo(D_80249B84)($v1) +/* 16545C 80244BFC 3C038025 */ lui $v1, %hi(filemenu_menus) +/* 165460 80244C00 8C639B84 */ lw $v1, %lo(filemenu_menus)($v1) /* 165464 80244C04 80620004 */ lb $v0, 4($v1) /* 165468 80244C08 14400006 */ bnez $v0, .L80244C24 /* 16546C 80244C0C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_0_info.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_0_info.s deleted file mode 100644 index b494caf651..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_0_info.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_contents_file_0_info -/* 165DE8 80245588 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 165DEC 8024558C 0080402D */ daddu $t0, $a0, $zero -/* 165DF0 80245590 00A0482D */ daddu $t1, $a1, $zero -/* 165DF4 80245594 00C0502D */ daddu $t2, $a2, $zero -/* 165DF8 80245598 0100282D */ daddu $a1, $t0, $zero -/* 165DFC 8024559C 8FA20038 */ lw $v0, 0x38($sp) -/* 165E00 802455A0 8FA3003C */ lw $v1, 0x3c($sp) -/* 165E04 802455A4 8FA40040 */ lw $a0, 0x40($sp) -/* 165E08 802455A8 0120302D */ daddu $a2, $t1, $zero -/* 165E0C 802455AC AFA70010 */ sw $a3, 0x10($sp) -/* 165E10 802455B0 0140382D */ daddu $a3, $t2, $zero -/* 165E14 802455B4 AFBF0020 */ sw $ra, 0x20($sp) -/* 165E18 802455B8 AFA4001C */ sw $a0, 0x1c($sp) -/* 165E1C 802455BC 0000202D */ daddu $a0, $zero, $zero -/* 165E20 802455C0 AFA20014 */ sw $v0, 0x14($sp) -/* 165E24 802455C4 0C0913F5 */ jal filemenu_draw_contents_file_info -/* 165E28 802455C8 AFA30018 */ sw $v1, 0x18($sp) -/* 165E2C 802455CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 165E30 802455D0 03E00008 */ jr $ra -/* 165E34 802455D4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_0_title.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_0_title.s deleted file mode 100644 index 01561edf21..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_0_title.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_contents_file_0_title -/* 165F28 802456C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 165F2C 802456CC 0080402D */ daddu $t0, $a0, $zero -/* 165F30 802456D0 00A0482D */ daddu $t1, $a1, $zero -/* 165F34 802456D4 00C0502D */ daddu $t2, $a2, $zero -/* 165F38 802456D8 0100282D */ daddu $a1, $t0, $zero -/* 165F3C 802456DC 8FA20038 */ lw $v0, 0x38($sp) -/* 165F40 802456E0 8FA3003C */ lw $v1, 0x3c($sp) -/* 165F44 802456E4 8FA40040 */ lw $a0, 0x40($sp) -/* 165F48 802456E8 0120302D */ daddu $a2, $t1, $zero -/* 165F4C 802456EC AFA70010 */ sw $a3, 0x10($sp) -/* 165F50 802456F0 0140382D */ daddu $a3, $t2, $zero -/* 165F54 802456F4 AFBF0020 */ sw $ra, 0x20($sp) -/* 165F58 802456F8 AFA4001C */ sw $a0, 0x1c($sp) -/* 165F5C 802456FC 0000202D */ daddu $a0, $zero, $zero -/* 165F60 80245700 AFA20014 */ sw $v0, 0x14($sp) -/* 165F64 80245704 0C091513 */ jal filemenu_draw_contents_file_title -/* 165F68 80245708 AFA30018 */ sw $v1, 0x18($sp) -/* 165F6C 8024570C 8FBF0020 */ lw $ra, 0x20($sp) -/* 165F70 80245710 03E00008 */ jr $ra -/* 165F74 80245714 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_1_info.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_1_info.s deleted file mode 100644 index 6e56abbc65..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_1_info.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_contents_file_1_info -/* 165E38 802455D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 165E3C 802455DC 0080402D */ daddu $t0, $a0, $zero -/* 165E40 802455E0 00A0482D */ daddu $t1, $a1, $zero -/* 165E44 802455E4 00C0502D */ daddu $t2, $a2, $zero -/* 165E48 802455E8 0100282D */ daddu $a1, $t0, $zero -/* 165E4C 802455EC 8FA20038 */ lw $v0, 0x38($sp) -/* 165E50 802455F0 8FA3003C */ lw $v1, 0x3c($sp) -/* 165E54 802455F4 8FA40040 */ lw $a0, 0x40($sp) -/* 165E58 802455F8 0120302D */ daddu $a2, $t1, $zero -/* 165E5C 802455FC AFA70010 */ sw $a3, 0x10($sp) -/* 165E60 80245600 0140382D */ daddu $a3, $t2, $zero -/* 165E64 80245604 AFBF0020 */ sw $ra, 0x20($sp) -/* 165E68 80245608 AFA4001C */ sw $a0, 0x1c($sp) -/* 165E6C 8024560C 24040001 */ addiu $a0, $zero, 1 -/* 165E70 80245610 AFA20014 */ sw $v0, 0x14($sp) -/* 165E74 80245614 0C0913F5 */ jal filemenu_draw_contents_file_info -/* 165E78 80245618 AFA30018 */ sw $v1, 0x18($sp) -/* 165E7C 8024561C 8FBF0020 */ lw $ra, 0x20($sp) -/* 165E80 80245620 03E00008 */ jr $ra -/* 165E84 80245624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_1_title.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_1_title.s deleted file mode 100644 index e4afbd57c7..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_1_title.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_contents_file_1_title -/* 165F78 80245718 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 165F7C 8024571C 0080402D */ daddu $t0, $a0, $zero -/* 165F80 80245720 00A0482D */ daddu $t1, $a1, $zero -/* 165F84 80245724 00C0502D */ daddu $t2, $a2, $zero -/* 165F88 80245728 0100282D */ daddu $a1, $t0, $zero -/* 165F8C 8024572C 8FA20038 */ lw $v0, 0x38($sp) -/* 165F90 80245730 8FA3003C */ lw $v1, 0x3c($sp) -/* 165F94 80245734 8FA40040 */ lw $a0, 0x40($sp) -/* 165F98 80245738 0120302D */ daddu $a2, $t1, $zero -/* 165F9C 8024573C AFA70010 */ sw $a3, 0x10($sp) -/* 165FA0 80245740 0140382D */ daddu $a3, $t2, $zero -/* 165FA4 80245744 AFBF0020 */ sw $ra, 0x20($sp) -/* 165FA8 80245748 AFA4001C */ sw $a0, 0x1c($sp) -/* 165FAC 8024574C 24040001 */ addiu $a0, $zero, 1 -/* 165FB0 80245750 AFA20014 */ sw $v0, 0x14($sp) -/* 165FB4 80245754 0C091513 */ jal filemenu_draw_contents_file_title -/* 165FB8 80245758 AFA30018 */ sw $v1, 0x18($sp) -/* 165FBC 8024575C 8FBF0020 */ lw $ra, 0x20($sp) -/* 165FC0 80245760 03E00008 */ jr $ra -/* 165FC4 80245764 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_2_info.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_2_info.s deleted file mode 100644 index 188198fbc9..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_2_info.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_contents_file_2_info -/* 165E88 80245628 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 165E8C 8024562C 0080402D */ daddu $t0, $a0, $zero -/* 165E90 80245630 00A0482D */ daddu $t1, $a1, $zero -/* 165E94 80245634 00C0502D */ daddu $t2, $a2, $zero -/* 165E98 80245638 0100282D */ daddu $a1, $t0, $zero -/* 165E9C 8024563C 8FA20038 */ lw $v0, 0x38($sp) -/* 165EA0 80245640 8FA3003C */ lw $v1, 0x3c($sp) -/* 165EA4 80245644 8FA40040 */ lw $a0, 0x40($sp) -/* 165EA8 80245648 0120302D */ daddu $a2, $t1, $zero -/* 165EAC 8024564C AFA70010 */ sw $a3, 0x10($sp) -/* 165EB0 80245650 0140382D */ daddu $a3, $t2, $zero -/* 165EB4 80245654 AFBF0020 */ sw $ra, 0x20($sp) -/* 165EB8 80245658 AFA4001C */ sw $a0, 0x1c($sp) -/* 165EBC 8024565C 24040002 */ addiu $a0, $zero, 2 -/* 165EC0 80245660 AFA20014 */ sw $v0, 0x14($sp) -/* 165EC4 80245664 0C0913F5 */ jal filemenu_draw_contents_file_info -/* 165EC8 80245668 AFA30018 */ sw $v1, 0x18($sp) -/* 165ECC 8024566C 8FBF0020 */ lw $ra, 0x20($sp) -/* 165ED0 80245670 03E00008 */ jr $ra -/* 165ED4 80245674 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_2_title.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_2_title.s deleted file mode 100644 index 0d0c24765e..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_2_title.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_contents_file_2_title -/* 165FC8 80245768 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 165FCC 8024576C 0080402D */ daddu $t0, $a0, $zero -/* 165FD0 80245770 00A0482D */ daddu $t1, $a1, $zero -/* 165FD4 80245774 00C0502D */ daddu $t2, $a2, $zero -/* 165FD8 80245778 0100282D */ daddu $a1, $t0, $zero -/* 165FDC 8024577C 8FA20038 */ lw $v0, 0x38($sp) -/* 165FE0 80245780 8FA3003C */ lw $v1, 0x3c($sp) -/* 165FE4 80245784 8FA40040 */ lw $a0, 0x40($sp) -/* 165FE8 80245788 0120302D */ daddu $a2, $t1, $zero -/* 165FEC 8024578C AFA70010 */ sw $a3, 0x10($sp) -/* 165FF0 80245790 0140382D */ daddu $a3, $t2, $zero -/* 165FF4 80245794 AFBF0020 */ sw $ra, 0x20($sp) -/* 165FF8 80245798 AFA4001C */ sw $a0, 0x1c($sp) -/* 165FFC 8024579C 24040002 */ addiu $a0, $zero, 2 -/* 166000 802457A0 AFA20014 */ sw $v0, 0x14($sp) -/* 166004 802457A4 0C091513 */ jal filemenu_draw_contents_file_title -/* 166008 802457A8 AFA30018 */ sw $v1, 0x18($sp) -/* 16600C 802457AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 166010 802457B0 03E00008 */ jr $ra -/* 166014 802457B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_3_info.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_3_info.s deleted file mode 100644 index 5a51ced97a..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_3_info.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_contents_file_3_info -/* 165ED8 80245678 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 165EDC 8024567C 0080402D */ daddu $t0, $a0, $zero -/* 165EE0 80245680 00A0482D */ daddu $t1, $a1, $zero -/* 165EE4 80245684 00C0502D */ daddu $t2, $a2, $zero -/* 165EE8 80245688 0100282D */ daddu $a1, $t0, $zero -/* 165EEC 8024568C 8FA20038 */ lw $v0, 0x38($sp) -/* 165EF0 80245690 8FA3003C */ lw $v1, 0x3c($sp) -/* 165EF4 80245694 8FA40040 */ lw $a0, 0x40($sp) -/* 165EF8 80245698 0120302D */ daddu $a2, $t1, $zero -/* 165EFC 8024569C AFA70010 */ sw $a3, 0x10($sp) -/* 165F00 802456A0 0140382D */ daddu $a3, $t2, $zero -/* 165F04 802456A4 AFBF0020 */ sw $ra, 0x20($sp) -/* 165F08 802456A8 AFA4001C */ sw $a0, 0x1c($sp) -/* 165F0C 802456AC 24040003 */ addiu $a0, $zero, 3 -/* 165F10 802456B0 AFA20014 */ sw $v0, 0x14($sp) -/* 165F14 802456B4 0C0913F5 */ jal filemenu_draw_contents_file_info -/* 165F18 802456B8 AFA30018 */ sw $v1, 0x18($sp) -/* 165F1C 802456BC 8FBF0020 */ lw $ra, 0x20($sp) -/* 165F20 802456C0 03E00008 */ jr $ra -/* 165F24 802456C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_3_title.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_3_title.s deleted file mode 100644 index 905e9671ec..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_3_title.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_contents_file_3_title -/* 166018 802457B8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 16601C 802457BC 0080402D */ daddu $t0, $a0, $zero -/* 166020 802457C0 00A0482D */ daddu $t1, $a1, $zero -/* 166024 802457C4 00C0502D */ daddu $t2, $a2, $zero -/* 166028 802457C8 0100282D */ daddu $a1, $t0, $zero -/* 16602C 802457CC 8FA20038 */ lw $v0, 0x38($sp) -/* 166030 802457D0 8FA3003C */ lw $v1, 0x3c($sp) -/* 166034 802457D4 8FA40040 */ lw $a0, 0x40($sp) -/* 166038 802457D8 0120302D */ daddu $a2, $t1, $zero -/* 16603C 802457DC AFA70010 */ sw $a3, 0x10($sp) -/* 166040 802457E0 0140382D */ daddu $a3, $t2, $zero -/* 166044 802457E4 AFBF0020 */ sw $ra, 0x20($sp) -/* 166048 802457E8 AFA4001C */ sw $a0, 0x1c($sp) -/* 16604C 802457EC 24040003 */ addiu $a0, $zero, 3 -/* 166050 802457F0 AFA20014 */ sw $v0, 0x14($sp) -/* 166054 802457F4 0C091513 */ jal filemenu_draw_contents_file_title -/* 166058 802457F8 AFA30018 */ sw $v1, 0x18($sp) -/* 16605C 802457FC 8FBF0020 */ lw $ra, 0x20($sp) -/* 166060 80245800 03E00008 */ jr $ra -/* 166064 80245804 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_info.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_info.s index 6cada8a021..8eedae79c0 100644 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_info.s +++ b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_info.s @@ -141,8 +141,8 @@ glabel filemenu_draw_contents_file_info /* 165A44 802451E4 00088483 */ sra $s0, $t0, 0x12 /* 165A48 802451E8 02128023 */ subu $s0, $s0, $s2 /* 165A4C 802451EC 02150018 */ mult $s0, $s5 -/* 165A50 802451F0 3C158025 */ lui $s5, %hi(D_8024C0B0) -/* 165A54 802451F4 26B5C0B0 */ addiu $s5, $s5, %lo(D_8024C0B0) +/* 165A50 802451F0 3C158025 */ lui $s5, %hi(filemenu_hudElemIDs) +/* 165A54 802451F4 26B5C0B0 */ addiu $s5, $s5, %lo(filemenu_hudElemIDs) /* 165A58 802451F8 2408000A */ addiu $t0, $zero, 0xa /* 165A5C 802451FC AFA80010 */ sw $t0, 0x10($sp) /* 165A60 80245200 240800FF */ addiu $t0, $zero, 0xff @@ -258,8 +258,8 @@ glabel filemenu_draw_contents_file_info /* 165C14 802453B4 080914F3 */ j .L802453CC /* 165C18 802453B8 8EB00000 */ lw $s0, ($s5) .L802453BC: -/* 165C1C 802453BC 3C088025 */ lui $t0, %hi(D_8024C0B0) -/* 165C20 802453C0 2508C0B0 */ addiu $t0, $t0, %lo(D_8024C0B0) +/* 165C1C 802453BC 3C088025 */ lui $t0, %hi(filemenu_hudElemIDs) +/* 165C20 802453C0 2508C0B0 */ addiu $t0, $t0, %lo(filemenu_hudElemIDs) /* 165C24 802453C4 02C81021 */ addu $v0, $s6, $t0 /* 165C28 802453C8 8C500000 */ lw $s0, ($v0) .L802453CC: diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_mono.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_mono.s deleted file mode 100644 index 60cd42c59b..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_mono.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_contents_mono -/* 1655C0 80244D60 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 1655C4 80244D64 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 1655C8 80244D68 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1655CC 80244D6C AFBF0014 */ sw $ra, 0x14($sp) -/* 1655D0 80244D70 AFB00010 */ sw $s0, 0x10($sp) -/* 1655D4 80244D74 904200AB */ lbu $v0, 0xab($v0) -/* 1655D8 80244D78 14400009 */ bnez $v0, .L80244DA0 -/* 1655DC 80244D7C 24A50022 */ addiu $a1, $a1, 0x22 -/* 1655E0 80244D80 3C108025 */ lui $s0, %hi(D_8024C0B0) -/* 1655E4 80244D84 2610C0B0 */ addiu $s0, $s0, %lo(D_8024C0B0) -/* 1655E8 80244D88 8E040040 */ lw $a0, 0x40($s0) -/* 1655EC 80244D8C 0C051261 */ jal set_hud_element_render_pos -/* 1655F0 80244D90 24C6000A */ addiu $a2, $a2, 0xa -/* 1655F4 80244D94 8E040040 */ lw $a0, 0x40($s0) -/* 1655F8 80244D98 0809136E */ j .L80244DB8 -/* 1655FC 80244D9C 00000000 */ nop -.L80244DA0: -/* 165600 80244DA0 3C108025 */ lui $s0, %hi(D_8024C0B0) -/* 165604 80244DA4 2610C0B0 */ addiu $s0, $s0, %lo(D_8024C0B0) -/* 165608 80244DA8 8E040044 */ lw $a0, 0x44($s0) -/* 16560C 80244DAC 0C051261 */ jal set_hud_element_render_pos -/* 165610 80244DB0 24C6000A */ addiu $a2, $a2, 0xa -/* 165614 80244DB4 8E040044 */ lw $a0, 0x44($s0) -.L80244DB8: -/* 165618 80244DB8 0C0511F8 */ jal draw_hud_element_3 -/* 16561C 80244DBC 00000000 */ nop -/* 165620 80244DC0 8FBF0014 */ lw $ra, 0x14($sp) -/* 165624 80244DC4 8FB00010 */ lw $s0, 0x10($sp) -/* 165628 80244DC8 03E00008 */ jr $ra -/* 16562C 80244DCC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_stereo.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_stereo.s deleted file mode 100644 index a44cbcc762..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_stereo.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_contents_stereo -/* 16554C 80244CEC 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 165550 80244CF0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 165554 80244CF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 165558 80244CF8 AFBF0014 */ sw $ra, 0x14($sp) -/* 16555C 80244CFC AFB00010 */ sw $s0, 0x10($sp) -/* 165560 80244D00 904300AB */ lbu $v1, 0xab($v0) -/* 165564 80244D04 24020001 */ addiu $v0, $zero, 1 -/* 165568 80244D08 14620009 */ bne $v1, $v0, .L80244D30 -/* 16556C 80244D0C 24A50022 */ addiu $a1, $a1, 0x22 -/* 165570 80244D10 3C108025 */ lui $s0, %hi(D_8024C0B0) -/* 165574 80244D14 2610C0B0 */ addiu $s0, $s0, %lo(D_8024C0B0) -/* 165578 80244D18 8E040048 */ lw $a0, 0x48($s0) -/* 16557C 80244D1C 0C051261 */ jal set_hud_element_render_pos -/* 165580 80244D20 24C6000A */ addiu $a2, $a2, 0xa -/* 165584 80244D24 8E040048 */ lw $a0, 0x48($s0) -/* 165588 80244D28 08091352 */ j .L80244D48 -/* 16558C 80244D2C 00000000 */ nop -.L80244D30: -/* 165590 80244D30 3C108025 */ lui $s0, %hi(D_8024C0B0) -/* 165594 80244D34 2610C0B0 */ addiu $s0, $s0, %lo(D_8024C0B0) -/* 165598 80244D38 8E04004C */ lw $a0, 0x4c($s0) -/* 16559C 80244D3C 0C051261 */ jal set_hud_element_render_pos -/* 1655A0 80244D40 24C6000A */ addiu $a2, $a2, 0xa -/* 1655A4 80244D44 8E04004C */ lw $a0, 0x4c($s0) -.L80244D48: -/* 1655A8 80244D48 0C0511F8 */ jal draw_hud_element_3 -/* 1655AC 80244D4C 00000000 */ nop -/* 1655B0 80244D50 8FBF0014 */ lw $ra, 0x14($sp) -/* 1655B4 80244D54 8FB00010 */ lw $s0, 0x10($sp) -/* 1655B8 80244D58 03E00008 */ jr $ra -/* 1655BC 80244D5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_main_cleanup.s b/ver/us/asm/nonmatchings/165490/filemenu_main_cleanup.s deleted file mode 100644 index cd2cce4245..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_main_cleanup.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_main_cleanup -/* 16751C 80246CBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 167520 80246CC0 AFB10014 */ sw $s1, 0x14($sp) -/* 167524 80246CC4 0000882D */ daddu $s1, $zero, $zero -/* 167528 80246CC8 AFB00010 */ sw $s0, 0x10($sp) -/* 16752C 80246CCC 3C108025 */ lui $s0, %hi(D_8024C0B0) -/* 167530 80246CD0 2610C0B0 */ addiu $s0, $s0, %lo(D_8024C0B0) -/* 167534 80246CD4 AFBF0018 */ sw $ra, 0x18($sp) -.L80246CD8: -/* 167538 80246CD8 8E040000 */ lw $a0, ($s0) -/* 16753C 80246CDC 26100004 */ addiu $s0, $s0, 4 -/* 167540 80246CE0 0C05123D */ jal free_hud_element -/* 167544 80246CE4 26310001 */ addiu $s1, $s1, 1 -/* 167548 80246CE8 2A220014 */ slti $v0, $s1, 0x14 -/* 16754C 80246CEC 1440FFFA */ bnez $v0, .L80246CD8 -/* 167550 80246CF0 00000000 */ nop -/* 167554 80246CF4 8FBF0018 */ lw $ra, 0x18($sp) -/* 167558 80246CF8 8FB10014 */ lw $s1, 0x14($sp) -/* 16755C 80246CFC 8FB00010 */ lw $s0, 0x10($sp) -/* 167560 80246D00 03E00008 */ jr $ra -/* 167564 80246D04 27BD0020 */ addiu $sp, $sp, 0x20 -/* 167568 80246D08 00000000 */ nop -/* 16756C 80246D0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/165490/filemenu_main_handle_input.s b/ver/us/asm/nonmatchings/165490/filemenu_main_handle_input.s index 5424ff66dd..d225a1ef3c 100644 --- a/ver/us/asm/nonmatchings/165490/filemenu_main_handle_input.s +++ b/ver/us/asm/nonmatchings/165490/filemenu_main_handle_input.s @@ -21,8 +21,8 @@ glabel filemenu_main_handle_input /* 1662A0 80245A40 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 1662A4 80245A44 AFB3001C */ sw $s3, 0x1c($sp) /* 1662A8 80245A48 0080982D */ daddu $s3, $a0, $zero -/* 1662AC 80245A4C 3C028025 */ lui $v0, %hi(D_8024C08C) -/* 1662B0 80245A50 8C42C08C */ lw $v0, %lo(D_8024C08C)($v0) +/* 1662AC 80245A4C 3C028025 */ lui $v0, %hi(filemenu_heldButtons) +/* 1662B0 80245A50 8C42C08C */ lw $v0, %lo(filemenu_heldButtons)($v0) /* 1662B4 80245A54 3C030004 */ lui $v1, 4 /* 1662B8 80245A58 AFBF0020 */ sw $ra, 0x20($sp) /* 1662BC 80245A5C AFB20018 */ sw $s2, 0x18($sp) @@ -61,8 +61,8 @@ glabel filemenu_main_handle_input /* 16633C 80245ADC 1082FFE6 */ beq $a0, $v0, .L80245A78 /* 166340 80245AE0 00000000 */ nop .L80245AE4: -/* 166344 80245AE4 3C028025 */ lui $v0, %hi(D_8024C08C) -/* 166348 80245AE8 8C42C08C */ lw $v0, %lo(D_8024C08C)($v0) +/* 166344 80245AE4 3C028025 */ lui $v0, %hi(filemenu_heldButtons) +/* 166348 80245AE8 8C42C08C */ lw $v0, %lo(filemenu_heldButtons)($v0) /* 16634C 80245AEC 3C030008 */ lui $v1, 8 /* 166350 80245AF0 00431024 */ and $v0, $v0, $v1 /* 166354 80245AF4 1040001E */ beqz $v0, .L80245B70 @@ -98,8 +98,8 @@ glabel filemenu_main_handle_input /* 1663C8 80245B68 1082FFE6 */ beq $a0, $v0, .L80245B04 /* 1663CC 80245B6C 00000000 */ nop .L80245B70: -/* 1663D0 80245B70 3C028025 */ lui $v0, %hi(D_8024C08C) -/* 1663D4 80245B74 8C42C08C */ lw $v0, %lo(D_8024C08C)($v0) +/* 1663D0 80245B70 3C028025 */ lui $v0, %hi(filemenu_heldButtons) +/* 1663D4 80245B74 8C42C08C */ lw $v0, %lo(filemenu_heldButtons)($v0) /* 1663D8 80245B78 3C030001 */ lui $v1, 1 /* 1663DC 80245B7C 00431024 */ and $v0, $v0, $v1 /* 1663E0 80245B80 10400007 */ beqz $v0, .L80245BA0 @@ -111,8 +111,8 @@ glabel filemenu_main_handle_input /* 1663F8 80245B98 04420001 */ bltzl $v0, .L80245BA0 /* 1663FC 80245B9C A2600002 */ sb $zero, 2($s3) .L80245BA0: -/* 166400 80245BA0 3C028025 */ lui $v0, %hi(D_8024C08C) -/* 166404 80245BA4 8C42C08C */ lw $v0, %lo(D_8024C08C)($v0) +/* 166400 80245BA0 3C028025 */ lui $v0, %hi(filemenu_heldButtons) +/* 166404 80245BA4 8C42C08C */ lw $v0, %lo(filemenu_heldButtons)($v0) /* 166408 80245BA8 3C030002 */ lui $v1, 2 /* 16640C 80245BAC 00431024 */ and $v0, $v0, $v1 /* 166410 80245BB0 1040000C */ beqz $v0, .L80245BE4 @@ -198,8 +198,8 @@ glabel L80245C38_166498 /* 166534 80245CD4 00000000 */ nop /* 166538 80245CD8 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 16653C 80245CDC 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) -/* 166540 80245CE0 3C058025 */ lui $a1, %hi(D_8024C084) -/* 166544 80245CE4 24A5C084 */ addiu $a1, $a1, %lo(D_8024C084) +/* 166540 80245CE0 3C058025 */ lui $a1, %hi(filemenu_pressedButtons) +/* 166544 80245CE4 24A5C084 */ addiu $a1, $a1, %lo(filemenu_pressedButtons) /* 166548 80245CE8 8CA20000 */ lw $v0, ($a1) /* 16654C 80245CEC 8E030000 */ lw $v1, ($s0) /* 166550 80245CF0 30422000 */ andi $v0, $v0, 0x2000 @@ -233,8 +233,8 @@ glabel L80245C38_166498 /* 1665B4 80245D54 0C015860 */ jal func_80056180 /* 1665B8 80245D58 00000000 */ nop .L80245D5C: -/* 1665BC 80245D5C 3C038025 */ lui $v1, %hi(D_8024C084) -/* 1665C0 80245D60 2463C084 */ addiu $v1, $v1, %lo(D_8024C084) +/* 1665BC 80245D5C 3C038025 */ lui $v1, %hi(filemenu_pressedButtons) +/* 1665C0 80245D60 2463C084 */ addiu $v1, $v1, %lo(filemenu_pressedButtons) /* 1665C4 80245D64 8C620000 */ lw $v0, ($v1) /* 1665C8 80245D68 30421000 */ andi $v0, $v0, 0x1000 /* 1665CC 80245D6C 10400009 */ beqz $v0, .L80245D94 @@ -248,8 +248,8 @@ glabel L80245C38_166498 /* 1665EC 80245D8C 34028000 */ ori $v0, $zero, 0x8000 /* 1665F0 80245D90 AC620000 */ sw $v0, ($v1) .L80245D94: -/* 1665F4 80245D94 3C028025 */ lui $v0, %hi(D_8024C084) -/* 1665F8 80245D98 8C42C084 */ lw $v0, %lo(D_8024C084)($v0) +/* 1665F4 80245D94 3C028025 */ lui $v0, %hi(filemenu_pressedButtons) +/* 1665F8 80245D98 8C42C084 */ lw $v0, %lo(filemenu_pressedButtons)($v0) /* 1665FC 80245D9C 30428000 */ andi $v0, $v0, 0x8000 /* 166600 80245DA0 104002D1 */ beqz $v0, .L802468E8 /* 166604 80245DA4 00000000 */ nop @@ -334,8 +334,8 @@ glabel L80245DD0_166630 /* 166734 80245ED4 240400C9 */ addiu $a0, $zero, 0xc9 /* 166738 80245ED8 0000282D */ daddu $a1, $zero, $zero /* 16673C 80245EDC 00A0302D */ daddu $a2, $a1, $zero -/* 166740 80245EE0 3C048025 */ lui $a0, %hi(D_80249B90) -/* 166744 80245EE4 8C849B90 */ lw $a0, %lo(D_80249B90)($a0) +/* 166740 80245EE0 3C048025 */ lui $a0, %hi(filemenu_menus + 0xC) +/* 166744 80245EE4 8C849B90 */ lw $a0, %lo(filemenu_menus + 0xC)($a0) /* 166748 80245EE8 24020003 */ addiu $v0, $zero, 3 /* 16674C 80245EEC 3C018025 */ lui $at, %hi(D_8024C098_C09918) /* 166750 80245EF0 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) @@ -530,8 +530,8 @@ glabel L80245DD0_166630 /* 166A20 802461C0 0000282D */ daddu $a1, $zero, $zero /* 166A24 802461C4 00A0302D */ daddu $a2, $a1, $zero /* 166A28 802461C8 A4E30000 */ sh $v1, ($a3) -/* 166A2C 802461CC 3C048025 */ lui $a0, %hi(D_80249B88) -/* 166A30 802461D0 8C849B88 */ lw $a0, %lo(D_80249B88)($a0) +/* 166A2C 802461CC 3C048025 */ lui $a0, %hi(filemenu_menus + 0x4) +/* 166A30 802461D0 8C849B88 */ lw $a0, %lo(filemenu_menus + 0x4)($a0) /* 166A34 802461D4 24020001 */ addiu $v0, $zero, 1 /* 166A38 802461D8 3C018025 */ lui $at, %hi(D_8024C098_C09918) /* 166A3C 802461DC A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) @@ -634,8 +634,8 @@ glabel L802461E8_166A48 /* 166BA8 80246348 0000282D */ daddu $a1, $zero, $zero /* 166BAC 8024634C 24060001 */ addiu $a2, $zero, 1 /* 166BB0 80246350 A4E30000 */ sh $v1, ($a3) -/* 166BB4 80246354 3C048025 */ lui $a0, %hi(D_80249B88) -/* 166BB8 80246358 8C849B88 */ lw $a0, %lo(D_80249B88)($a0) +/* 166BB4 80246354 3C048025 */ lui $a0, %hi(filemenu_menus + 0x4) +/* 166BB8 80246358 8C849B88 */ lw $a0, %lo(filemenu_menus + 0x4)($a0) /* 166BBC 8024635C 00C0102D */ daddu $v0, $a2, $zero /* 166BC0 80246360 3C018025 */ lui $at, %hi(D_8024C098_C09918) /* 166BC4 80246364 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) @@ -683,8 +683,8 @@ glabel L80246370_166BD0 /* 166C64 80246404 92630003 */ lbu $v1, 3($s3) /* 166C68 80246408 24020004 */ addiu $v0, $zero, 4 /* 166C6C 8024640C A2620004 */ sb $v0, 4($s3) -/* 166C70 80246410 3C018025 */ lui $at, %hi(D_8024C094) -/* 166C74 80246414 AC23C094 */ sw $v1, %lo(D_8024C094)($at) +/* 166C70 80246410 3C018025 */ lui $at, %hi(filemenu_loadedFileIdx) +/* 166C74 80246414 AC23C094 */ sw $v1, %lo(filemenu_loadedFileIdx)($at) /* 166C78 80246418 08091A3A */ j .L802468E8 /* 166C7C 8024641C 00000000 */ nop glabel L80246420_166C80 @@ -704,8 +704,8 @@ glabel L80246420_166C80 /* 166CB0 80246450 10400125 */ beqz $v0, .L802468E8 /* 166CB4 80246454 00000000 */ nop /* 166CB8 80246458 92630003 */ lbu $v1, 3($s3) -/* 166CBC 8024645C 3C028025 */ lui $v0, %hi(D_8024C094) -/* 166CC0 80246460 8C42C094 */ lw $v0, %lo(D_8024C094)($v0) +/* 166CBC 8024645C 3C028025 */ lui $v0, %hi(filemenu_loadedFileIdx) +/* 166CC0 80246460 8C42C094 */ lw $v0, %lo(filemenu_loadedFileIdx)($v0) /* 166CC4 80246464 14430005 */ bne $v0, $v1, .L8024647C /* 166CC8 80246468 00000000 */ nop .L8024646C: @@ -714,8 +714,8 @@ glabel L80246420_166C80 /* 166CD4 80246474 08091A3A */ j .L802468E8 /* 166CD8 80246478 00000000 */ nop .L8024647C: -/* 166CDC 8024647C 3C018025 */ lui $at, %hi(D_8024C080) -/* 166CE0 80246480 AC23C080 */ sw $v1, %lo(D_8024C080)($at) +/* 166CDC 8024647C 3C018025 */ lui $at, %hi(filemenu_iterFileIdx) +/* 166CE0 80246480 AC23C080 */ sw $v1, %lo(filemenu_iterFileIdx)($at) /* 166CE4 80246484 92620003 */ lbu $v0, 3($s3) /* 166CE8 80246488 3C018007 */ lui $at, %hi(D_80077A24) /* 166CEC 8024648C 00220821 */ addu $at, $at, $v0 @@ -730,8 +730,8 @@ glabel L80246420_166C80 /* 166D10 802464B0 24020002 */ addiu $v0, $zero, 2 /* 166D14 802464B4 3C048016 */ lui $a0, %hi(gWindows) /* 166D18 802464B8 24849D50 */ addiu $a0, $a0, %lo(gWindows) -/* 166D1C 802464BC 3C038025 */ lui $v1, %hi(D_80249B8C) -/* 166D20 802464C0 8C639B8C */ lw $v1, %lo(D_80249B8C)($v1) +/* 166D1C 802464BC 3C038025 */ lui $v1, %hi(filemenu_menus + 0x8) +/* 166D20 802464C0 8C639B8C */ lw $v1, %lo(filemenu_menus + 0x8)($v1) /* 166D24 802464C4 A0620004 */ sb $v0, 4($v1) /* 166D28 802464C8 808305E3 */ lb $v1, 0x5e3($a0) /* 166D2C 802464CC 2402009A */ addiu $v0, $zero, 0x9a @@ -788,12 +788,12 @@ glabel L80246420_166C80 /* 166DE8 80246588 24040032 */ addiu $a0, $zero, 0x32 /* 166DEC 8024658C 0C051F9F */ jal set_window_update /* 166DF0 80246590 24050002 */ addiu $a1, $zero, 2 -/* 166DF4 80246594 3C118025 */ lui $s1, %hi(D_8024C094) -/* 166DF8 80246598 2631C094 */ addiu $s1, $s1, %lo(D_8024C094) +/* 166DF4 80246594 3C118025 */ lui $s1, %hi(filemenu_loadedFileIdx) +/* 166DF8 80246598 2631C094 */ addiu $s1, $s1, %lo(filemenu_loadedFileIdx) /* 166DFC 8024659C 0C00ACB4 */ jal fio_load_game /* 166E00 802465A0 8E240000 */ lw $a0, ($s1) -/* 166E04 802465A4 3C108025 */ lui $s0, %hi(D_8024C080) -/* 166E08 802465A8 2610C080 */ addiu $s0, $s0, %lo(D_8024C080) +/* 166E04 802465A4 3C108025 */ lui $s0, %hi(filemenu_iterFileIdx) +/* 166E08 802465A8 2610C080 */ addiu $s0, $s0, %lo(filemenu_iterFileIdx) /* 166E0C 802465AC 3C068007 */ lui $a2, %hi(D_800779C4) /* 166E10 802465B0 24C679C4 */ addiu $a2, $a2, %lo(D_800779C4) /* 166E14 802465B4 8E040000 */ lw $a0, ($s0) @@ -888,8 +888,8 @@ glabel L80246420_166C80 /* 166F64 80246704 0000282D */ daddu $a1, $zero, $zero /* 166F68 80246708 24060001 */ addiu $a2, $zero, 1 /* 166F6C 8024670C A4E30000 */ sh $v1, ($a3) -/* 166F70 80246710 3C048025 */ lui $a0, %hi(D_80249B88) -/* 166F74 80246714 8C849B88 */ lw $a0, %lo(D_80249B88)($a0) +/* 166F70 80246710 3C048025 */ lui $a0, %hi(filemenu_menus + 0x4) +/* 166F74 80246714 8C849B88 */ lw $a0, %lo(filemenu_menus + 0x4)($a0) /* 166F78 80246718 00C0102D */ daddu $v0, $a2, $zero /* 166F7C 8024671C 3C018025 */ lui $at, %hi(D_8024C098_C09918) /* 166F80 80246720 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) @@ -925,8 +925,8 @@ glabel L8024672C_166F8C /* 166FF0 80246790 24020002 */ addiu $v0, $zero, 2 /* 166FF4 80246794 3C018025 */ lui $at, %hi(D_8024C098_C09918) /* 166FF8 80246798 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) -/* 166FFC 8024679C 3C028025 */ lui $v0, %hi(D_80249B8C) -/* 167000 802467A0 8C429B8C */ lw $v0, %lo(D_80249B8C)($v0) +/* 166FFC 8024679C 3C028025 */ lui $v0, %hi(filemenu_menus + 0x8) +/* 167000 802467A0 8C429B8C */ lw $v0, %lo(filemenu_menus + 0x8)($v0) /* 167004 802467A4 24100001 */ addiu $s0, $zero, 1 /* 167008 802467A8 0C051F9F */ jal set_window_update /* 16700C 802467AC A0500004 */ sb $s0, 4($v0) @@ -1004,8 +1004,8 @@ glabel L8024672C_166F8C /* 167118 802468B8 0000282D */ daddu $a1, $zero, $zero /* 16711C 802468BC 24060001 */ addiu $a2, $zero, 1 /* 167120 802468C0 A4E30000 */ sh $v1, ($a3) -/* 167124 802468C4 3C048025 */ lui $a0, %hi(D_80249B88) -/* 167128 802468C8 8C849B88 */ lw $a0, %lo(D_80249B88)($a0) +/* 167124 802468C4 3C048025 */ lui $a0, %hi(filemenu_menus + 0x4) +/* 167128 802468C8 8C849B88 */ lw $a0, %lo(filemenu_menus + 0x4)($a0) /* 16712C 802468CC 00C0102D */ daddu $v0, $a2, $zero /* 167130 802468D0 3C018025 */ lui $at, %hi(D_8024C098_C09918) /* 167134 802468D4 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) @@ -1016,8 +1016,8 @@ glabel L8024672C_166F8C /* 167140 802468E0 0C090B65 */ jal filemenu_set_selected /* 167144 802468E4 00000000 */ nop .L802468E8: -/* 167148 802468E8 3C028025 */ lui $v0, %hi(D_8024C084) -/* 16714C 802468EC 8C42C084 */ lw $v0, %lo(D_8024C084)($v0) +/* 167148 802468E8 3C028025 */ lui $v0, %hi(filemenu_pressedButtons) +/* 16714C 802468EC 8C42C084 */ lw $v0, %lo(filemenu_pressedButtons)($v0) /* 167150 802468F0 30424000 */ andi $v0, $v0, 0x4000 /* 167154 802468F4 10400086 */ beqz $v0, .L80246B10 /* 167158 802468F8 00000000 */ nop @@ -1143,8 +1143,8 @@ glabel L80246A60_1672C0 glabel L80246ABC_16731C /* 16731C 80246ABC 24020003 */ addiu $v0, $zero, 3 /* 167320 80246AC0 A2620004 */ sb $v0, 4($s3) -/* 167324 80246AC4 3C058025 */ lui $a1, %hi(D_8024C094) -/* 167328 80246AC8 8CA5C094 */ lw $a1, %lo(D_8024C094)($a1) +/* 167324 80246AC4 3C058025 */ lui $a1, %hi(filemenu_loadedFileIdx) +/* 167328 80246AC8 8CA5C094 */ lw $a1, %lo(filemenu_loadedFileIdx)($a1) /* 16732C 80246ACC 0260202D */ daddu $a0, $s3, $zero /* 167330 80246AD0 000537C2 */ srl $a2, $a1, 0x1f /* 167334 80246AD4 00A63021 */ addu $a2, $a1, $a2 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_main_init.s b/ver/us/asm/nonmatchings/165490/filemenu_main_init.s index 8aca398edf..e259d5f569 100644 --- a/ver/us/asm/nonmatchings/165490/filemenu_main_init.s +++ b/ver/us/asm/nonmatchings/165490/filemenu_main_init.s @@ -8,8 +8,8 @@ glabel filemenu_main_init /* 166074 80245814 AFB00010 */ sw $s0, 0x10($sp) /* 166078 80245818 0000802D */ daddu $s0, $zero, $zero /* 16607C 8024581C AFB20018 */ sw $s2, 0x18($sp) -/* 166080 80245820 3C128025 */ lui $s2, %hi(D_8024C0B0) -/* 166084 80245824 2652C0B0 */ addiu $s2, $s2, %lo(D_8024C0B0) +/* 166080 80245820 3C128025 */ lui $s2, %hi(filemenu_hudElemIDs) +/* 166084 80245824 2652C0B0 */ addiu $s2, $s2, %lo(filemenu_hudElemIDs) /* 166088 80245828 AFB10014 */ sw $s1, 0x14($sp) /* 16608C 8024582C 3C118025 */ lui $s1, %hi(D_80249E20) /* 166090 80245830 26319E20 */ addiu $s1, $s1, %lo(D_80249E20) diff --git a/ver/us/asm/nonmatchings/165490/filemenu_main_update.s b/ver/us/asm/nonmatchings/165490/filemenu_main_update.s index 3a2640c1a5..2d514a5e04 100644 --- a/ver/us/asm/nonmatchings/165490/filemenu_main_update.s +++ b/ver/us/asm/nonmatchings/165490/filemenu_main_update.s @@ -54,14 +54,14 @@ glabel filemenu_main_update /* 16743C 80246BDC 24C200A8 */ addiu $v0, $a2, 0xa8 /* 167440 80246BE0 ACA200FC */ sw $v0, 0xfc($a1) .L80246BE4: -/* 167444 80246BE4 3C028025 */ lui $v0, %hi(D_80249B84) -/* 167448 80246BE8 8C429B84 */ lw $v0, %lo(D_80249B84)($v0) +/* 167444 80246BE4 3C028025 */ lui $v0, %hi(filemenu_menus) +/* 167448 80246BE8 8C429B84 */ lw $v0, %lo(filemenu_menus)($v0) /* 16744C 80246BEC 80430004 */ lb $v1, 4($v0) /* 167450 80246BF0 24020004 */ addiu $v0, $zero, 4 /* 167454 80246BF4 14620009 */ bne $v1, $v0, .L80246C1C /* 167458 80246BF8 24020001 */ addiu $v0, $zero, 1 -/* 16745C 80246BFC 3C038025 */ lui $v1, %hi(D_8024C094) -/* 167460 80246C00 8C63C094 */ lw $v1, %lo(D_8024C094)($v1) +/* 16745C 80246BFC 3C038025 */ lui $v1, %hi(filemenu_loadedFileIdx) +/* 167460 80246C00 8C63C094 */ lw $v1, %lo(filemenu_loadedFileIdx)($v1) /* 167464 80246C04 10620015 */ beq $v1, $v0, .L80246C5C /* 167468 80246C08 28620002 */ slti $v0, $v1, 2 /* 16746C 80246C0C 50400005 */ beql $v0, $zero, .L80246C24 diff --git a/ver/us/asm/nonmatchings/167570/filemenu_yesno_draw_prompt_contents.s b/ver/us/asm/nonmatchings/167570/filemenu_yesno_draw_prompt_contents.s index 26898c983b..2ff62d8c94 100644 --- a/ver/us/asm/nonmatchings/167570/filemenu_yesno_draw_prompt_contents.s +++ b/ver/us/asm/nonmatchings/167570/filemenu_yesno_draw_prompt_contents.s @@ -49,8 +49,8 @@ glabel L80246E6C_1676CC /* 167714 80246EB4 AFA00014 */ sw $zero, 0x14($sp) /* 167718 80246EB8 26650062 */ addiu $a1, $s3, 0x62 /* 16771C 80246EBC 26860006 */ addiu $a2, $s4, 6 -/* 167720 80246EC0 3C028025 */ lui $v0, %hi(D_80249B84) -/* 167724 80246EC4 8C429B84 */ lw $v0, %lo(D_80249B84)($v0) +/* 167720 80246EC0 3C028025 */ lui $v0, %hi(filemenu_menus) +/* 167724 80246EC4 8C429B84 */ lw $v0, %lo(filemenu_menus)($v0) /* 167728 80246EC8 0000382D */ daddu $a3, $zero, $zero /* 16772C 80246ECC 90440003 */ lbu $a0, 3($v0) /* 167730 80246ED0 240200FF */ addiu $v0, $zero, 0xff @@ -79,8 +79,8 @@ glabel L80246F00_167760 /* 167788 80246F28 AFA00014 */ sw $zero, 0x14($sp) /* 16778C 80246F2C 26650030 */ addiu $a1, $s3, 0x30 /* 167790 80246F30 26860006 */ addiu $a2, $s4, 6 -/* 167794 80246F34 3C028025 */ lui $v0, %hi(D_80249B84) -/* 167798 80246F38 8C429B84 */ lw $v0, %lo(D_80249B84)($v0) +/* 167794 80246F34 3C028025 */ lui $v0, %hi(filemenu_menus) +/* 167798 80246F38 8C429B84 */ lw $v0, %lo(filemenu_menus)($v0) /* 16779C 80246F3C 0000382D */ daddu $a3, $zero, $zero /* 1677A0 80246F40 90440003 */ lbu $a0, 3($v0) /* 1677A4 80246F44 240200FF */ addiu $v0, $zero, 0xff @@ -209,8 +209,8 @@ glabel L802470D4_167934 /* 16797C 8024711C AFA00014 */ sw $zero, 0x14($sp) /* 167980 80247120 266500A5 */ addiu $a1, $s3, 0xa5 /* 167984 80247124 26860006 */ addiu $a2, $s4, 6 -/* 167988 80247128 3C028025 */ lui $v0, %hi(D_80249B84) -/* 16798C 8024712C 8C429B84 */ lw $v0, %lo(D_80249B84)($v0) +/* 167988 80247128 3C028025 */ lui $v0, %hi(filemenu_menus) +/* 16798C 8024712C 8C429B84 */ lw $v0, %lo(filemenu_menus)($v0) /* 167990 80247130 0000382D */ daddu $a3, $zero, $zero /* 167994 80247134 90440003 */ lbu $a0, 3($v0) /* 167998 80247138 240200FF */ addiu $v0, $zero, 0xff diff --git a/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s b/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s index 94158f1161..5b73dcecf3 100644 --- a/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s +++ b/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s @@ -18,8 +18,8 @@ glabel filemenu_yesno_handle_input /* 167A4C 802471EC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 167A50 802471F0 AFB20018 */ sw $s2, 0x18($sp) /* 167A54 802471F4 0080902D */ daddu $s2, $a0, $zero -/* 167A58 802471F8 3C028025 */ lui $v0, %hi(D_8024C08C) -/* 167A5C 802471FC 8C42C08C */ lw $v0, %lo(D_8024C08C)($v0) +/* 167A58 802471F8 3C028025 */ lui $v0, %hi(filemenu_heldButtons) +/* 167A5C 802471FC 8C42C08C */ lw $v0, %lo(filemenu_heldButtons)($v0) /* 167A60 80247200 3C030001 */ lui $v1, 1 /* 167A64 80247204 AFBF001C */ sw $ra, 0x1c($sp) /* 167A68 80247208 AFB10014 */ sw $s1, 0x14($sp) @@ -35,8 +35,8 @@ glabel filemenu_yesno_handle_input /* 167A90 80247230 04420001 */ bltzl $v0, .L80247238 /* 167A94 80247234 A2400002 */ sb $zero, 2($s2) .L80247238: -/* 167A98 80247238 3C028025 */ lui $v0, %hi(D_8024C08C) -/* 167A9C 8024723C 8C42C08C */ lw $v0, %lo(D_8024C08C)($v0) +/* 167A98 80247238 3C028025 */ lui $v0, %hi(filemenu_heldButtons) +/* 167A9C 8024723C 8C42C08C */ lw $v0, %lo(filemenu_heldButtons)($v0) /* 167AA0 80247240 3C030002 */ lui $v1, 2 /* 167AA4 80247244 00431024 */ and $v0, $v0, $v1 /* 167AA8 80247248 1040000C */ beqz $v0, .L8024727C @@ -78,8 +78,8 @@ glabel filemenu_yesno_handle_input /* 167B34 802472D4 0C05272D */ jal sfx_play_sound /* 167B38 802472D8 240400C7 */ addiu $a0, $zero, 0xc7 .L802472DC: -/* 167B3C 802472DC 3C108025 */ lui $s0, %hi(D_8024C084) -/* 167B40 802472E0 2610C084 */ addiu $s0, $s0, %lo(D_8024C084) +/* 167B3C 802472DC 3C108025 */ lui $s0, %hi(filemenu_pressedButtons) +/* 167B40 802472E0 2610C084 */ addiu $s0, $s0, %lo(filemenu_pressedButtons) /* 167B44 802472E4 8E020000 */ lw $v0, ($s0) /* 167B48 802472E8 30421000 */ andi $v0, $v0, 0x1000 /* 167B4C 802472EC 10400009 */ beqz $v0, .L80247314 @@ -93,8 +93,8 @@ glabel filemenu_yesno_handle_input /* 167B6C 8024730C 34028000 */ ori $v0, $zero, 0x8000 /* 167B70 80247310 AE020000 */ sw $v0, ($s0) .L80247314: -/* 167B74 80247314 3C028025 */ lui $v0, %hi(D_8024C084) -/* 167B78 80247318 8C42C084 */ lw $v0, %lo(D_8024C084)($v0) +/* 167B74 80247314 3C028025 */ lui $v0, %hi(filemenu_pressedButtons) +/* 167B78 80247318 8C42C084 */ lw $v0, %lo(filemenu_pressedButtons)($v0) /* 167B7C 8024731C 30428000 */ andi $v0, $v0, 0x8000 /* 167B80 80247320 10400225 */ beqz $v0, .L80247BB8 /* 167B84 80247324 00000000 */ nop @@ -119,8 +119,8 @@ glabel filemenu_yesno_handle_input /* 167BCC 8024736C 00000000 */ nop glabel L80247370_167BD0 /* 167BD0 80247370 24020002 */ addiu $v0, $zero, 2 -/* 167BD4 80247374 3C038025 */ lui $v1, %hi(D_80249B8C) -/* 167BD8 80247378 8C639B8C */ lw $v1, %lo(D_80249B8C)($v1) +/* 167BD4 80247374 3C038025 */ lui $v1, %hi(filemenu_menus + 0x8) +/* 167BD8 80247378 8C639B8C */ lw $v1, %lo(filemenu_menus + 0x8)($v1) /* 167BDC 8024737C 3C048016 */ lui $a0, %hi(gWindows) /* 167BE0 80247380 24849D50 */ addiu $a0, $a0, %lo(gWindows) /* 167BE4 80247384 3C018025 */ lui $at, %hi(D_8024C098_C09918) @@ -183,8 +183,8 @@ glabel L80247370_167BD0 /* 167CB8 80247458 0C051F9F */ jal set_window_update /* 167CBC 8024745C 24040032 */ addiu $a0, $zero, 0x32 /* 167CC0 80247460 0000202D */ daddu $a0, $zero, $zero -/* 167CC4 80247464 3C028025 */ lui $v0, %hi(D_80249B84) -/* 167CC8 80247468 8C429B84 */ lw $v0, %lo(D_80249B84)($v0) +/* 167CC4 80247464 3C028025 */ lui $v0, %hi(filemenu_menus) +/* 167CC8 80247468 8C429B84 */ lw $v0, %lo(filemenu_menus)($v0) /* 167CCC 8024746C 3C068007 */ lui $a2, %hi(D_800779C4) /* 167CD0 80247470 24C679C4 */ addiu $a2, $a2, %lo(D_800779C4) /* 167CD4 80247474 90500003 */ lbu $s0, 3($v0) @@ -223,8 +223,8 @@ glabel L802474E4_167D44 /* 167D50 802474F0 24020002 */ addiu $v0, $zero, 2 /* 167D54 802474F4 3C048016 */ lui $a0, %hi(gWindows) /* 167D58 802474F8 24849D50 */ addiu $a0, $a0, %lo(gWindows) -/* 167D5C 802474FC 3C038025 */ lui $v1, %hi(D_80249B8C) -/* 167D60 80247500 8C639B8C */ lw $v1, %lo(D_80249B8C)($v1) +/* 167D5C 802474FC 3C038025 */ lui $v1, %hi(filemenu_menus + 0x8) +/* 167D60 80247500 8C639B8C */ lw $v1, %lo(filemenu_menus + 0x8)($v1) /* 167D64 80247504 A0620004 */ sb $v0, 4($v1) /* 167D68 80247508 808305E3 */ lb $v1, 0x5e3($a0) /* 167D6C 8024750C 2402009A */ addiu $v0, $zero, 0x9a @@ -282,12 +282,12 @@ glabel L802474E4_167D44 /* 167E2C 802475CC 24A53EEC */ addiu $a1, $a1, %lo(filemenu_update_hidden_name_confirm) /* 167E30 802475D0 0C051F9F */ jal set_window_update /* 167E34 802475D4 24040032 */ addiu $a0, $zero, 0x32 -/* 167E38 802475D8 3C118025 */ lui $s1, %hi(D_8024C094) -/* 167E3C 802475DC 2631C094 */ addiu $s1, $s1, %lo(D_8024C094) +/* 167E38 802475D8 3C118025 */ lui $s1, %hi(filemenu_loadedFileIdx) +/* 167E3C 802475DC 2631C094 */ addiu $s1, $s1, %lo(filemenu_loadedFileIdx) /* 167E40 802475E0 0C00ACB4 */ jal fio_load_game /* 167E44 802475E4 8E240000 */ lw $a0, ($s1) -/* 167E48 802475E8 3C108025 */ lui $s0, %hi(D_8024C080) -/* 167E4C 802475EC 2610C080 */ addiu $s0, $s0, %lo(D_8024C080) +/* 167E48 802475E8 3C108025 */ lui $s0, %hi(filemenu_iterFileIdx) +/* 167E4C 802475EC 2610C080 */ addiu $s0, $s0, %lo(filemenu_iterFileIdx) /* 167E50 802475F0 3C068007 */ lui $a2, %hi(D_800779C4) /* 167E54 802475F4 24C679C4 */ addiu $a2, $a2, %lo(D_800779C4) /* 167E58 802475F8 8E040000 */ lw $a0, ($s0) @@ -324,8 +324,8 @@ glabel L80247664_167EC4 /* 167ED0 80247670 24020001 */ addiu $v0, $zero, 1 /* 167ED4 80247674 3C048016 */ lui $a0, %hi(gWindows) /* 167ED8 80247678 24849D50 */ addiu $a0, $a0, %lo(gWindows) -/* 167EDC 8024767C 3C038025 */ lui $v1, %hi(D_80249B8C) -/* 167EE0 80247680 8C639B8C */ lw $v1, %lo(D_80249B8C)($v1) +/* 167EDC 8024767C 3C038025 */ lui $v1, %hi(filemenu_menus + 0x8) +/* 167EE0 80247680 8C639B8C */ lw $v1, %lo(filemenu_menus + 0x8)($v1) /* 167EE4 80247684 A0620004 */ sb $v0, 4($v1) /* 167EE8 80247688 808305E3 */ lb $v1, 0x5e3($a0) /* 167EEC 8024768C 24020099 */ addiu $v0, $zero, 0x99 @@ -383,8 +383,8 @@ glabel L80247664_167EC4 /* 167FAC 8024774C 24A53EEC */ addiu $a1, $a1, %lo(filemenu_update_hidden_name_confirm) /* 167FB0 80247750 0C051F9F */ jal set_window_update /* 167FB4 80247754 24040032 */ addiu $a0, $zero, 0x32 -/* 167FB8 80247758 3C108025 */ lui $s0, %hi(D_80249B84) -/* 167FBC 8024775C 26109B84 */ addiu $s0, $s0, %lo(D_80249B84) +/* 167FB8 80247758 3C108025 */ lui $s0, %hi(filemenu_menus) +/* 167FBC 8024775C 26109B84 */ addiu $s0, $s0, %lo(filemenu_menus) /* 167FC0 80247760 8E020000 */ lw $v0, ($s0) /* 167FC4 80247764 90420003 */ lbu $v0, 3($v0) /* 167FC8 80247768 3C058007 */ lui $a1, %hi(D_800779C4) @@ -441,8 +441,8 @@ glabel L802477F8_168058 /* 16808C 8024782C 0C0B2026 */ jal evt_set_variable /* 168090 80247830 A460008E */ sh $zero, 0x8e($v1) /* 168094 80247834 0000202D */ daddu $a0, $zero, $zero -/* 168098 80247838 3C028025 */ lui $v0, %hi(D_80249B84) -/* 16809C 8024783C 8C429B84 */ lw $v0, %lo(D_80249B84)($v0) +/* 168098 80247838 3C028025 */ lui $v0, %hi(filemenu_menus) +/* 16809C 8024783C 8C429B84 */ lw $v0, %lo(filemenu_menus)($v0) /* 1680A0 80247840 3C078007 */ lui $a3, %hi(D_800779C4) /* 1680A4 80247844 24E779C4 */ addiu $a3, $a3, %lo(D_800779C4) /* 1680A8 80247848 90510003 */ lbu $s1, 3($v0) @@ -520,8 +520,8 @@ glabel L802477F8_168058 /* 1681C4 80247964 24020003 */ addiu $v0, $zero, 3 /* 1681C8 80247968 3C048016 */ lui $a0, %hi(gWindows) /* 1681CC 8024796C 24849D50 */ addiu $a0, $a0, %lo(gWindows) -/* 1681D0 80247970 3C038025 */ lui $v1, %hi(D_80249B8C) -/* 1681D4 80247974 8C639B8C */ lw $v1, %lo(D_80249B8C)($v1) +/* 1681D0 80247970 3C038025 */ lui $v1, %hi(filemenu_menus + 0x8) +/* 1681D4 80247974 8C639B8C */ lw $v1, %lo(filemenu_menus + 0x8)($v1) /* 1681D8 80247978 A0620004 */ sb $v0, 4($v1) /* 1681DC 8024797C 808305E3 */ lb $v1, 0x5e3($a0) /* 1681E0 80247980 240200B8 */ addiu $v0, $zero, 0xb8 @@ -582,8 +582,8 @@ glabel L80247A3C_16829C /* 1682A8 80247A48 8CA20038 */ lw $v0, 0x38($a1) /* 1682AC 80247A4C 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 1682B0 80247A50 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 1682B4 80247A54 3C048025 */ lui $a0, %hi(D_80249B84) -/* 1682B8 80247A58 8C849B84 */ lw $a0, %lo(D_80249B84)($a0) +/* 1682B4 80247A54 3C048025 */ lui $a0, %hi(filemenu_menus) +/* 1682B8 80247A58 8C849B84 */ lw $a0, %lo(filemenu_menus)($a0) /* 1682BC 80247A5C 00C21023 */ subu $v0, $a2, $v0 /* 1682C0 80247A60 906300AB */ lbu $v1, 0xab($v1) /* 1682C4 80247A64 90900003 */ lbu $s0, 3($a0) @@ -632,8 +632,8 @@ glabel L80247AF8_168358 /* 168358 80247AF8 2404002D */ addiu $a0, $zero, 0x2d /* 16835C 80247AFC 3C108024 */ lui $s0, %hi(filemenu_update_show_with_rotation) /* 168360 80247B00 2610381C */ addiu $s0, $s0, %lo(filemenu_update_show_with_rotation) -/* 168364 80247B04 3C028025 */ lui $v0, %hi(D_80249B84) -/* 168368 80247B08 8C429B84 */ lw $v0, %lo(D_80249B84)($v0) +/* 168364 80247B04 3C028025 */ lui $v0, %hi(filemenu_menus) +/* 168368 80247B08 8C429B84 */ lw $v0, %lo(filemenu_menus)($v0) /* 16836C 80247B0C 3C018025 */ lui $at, %hi(D_8024C098_C09918) /* 168370 80247B10 A020C098 */ sb $zero, %lo(D_8024C098_C09918)($at) /* 168374 80247B14 90510003 */ lbu $s1, 3($v0) @@ -679,8 +679,8 @@ glabel L80247AF8_168358 /* 168410 80247BB0 0C051F9F */ jal set_window_update /* 168414 80247BB4 00000000 */ nop .L80247BB8: -/* 168418 80247BB8 3C028025 */ lui $v0, %hi(D_8024C084) -/* 16841C 80247BBC 8C42C084 */ lw $v0, %lo(D_8024C084)($v0) +/* 168418 80247BB8 3C028025 */ lui $v0, %hi(filemenu_pressedButtons) +/* 16841C 80247BBC 8C42C084 */ lw $v0, %lo(filemenu_pressedButtons)($v0) /* 168420 80247BC0 30424000 */ andi $v0, $v0, 0x4000 /* 168424 80247BC4 1040004D */ beqz $v0, .L80247CFC /* 168428 80247BC8 00000000 */ nop @@ -718,8 +718,8 @@ glabel L80247C3C_16849C /* 16849C 80247C3C 2404002D */ addiu $a0, $zero, 0x2d /* 1684A0 80247C40 3C108024 */ lui $s0, %hi(filemenu_update_show_with_rotation) /* 1684A4 80247C44 2610381C */ addiu $s0, $s0, %lo(filemenu_update_show_with_rotation) -/* 1684A8 80247C48 3C028025 */ lui $v0, %hi(D_80249B84) -/* 1684AC 80247C4C 8C429B84 */ lw $v0, %lo(D_80249B84)($v0) +/* 1684A8 80247C48 3C028025 */ lui $v0, %hi(filemenu_menus) +/* 1684AC 80247C4C 8C429B84 */ lw $v0, %lo(filemenu_menus)($v0) /* 1684B0 80247C50 3C018025 */ lui $at, %hi(D_8024C098_C09918) /* 1684B4 80247C54 A020C098 */ sb $zero, %lo(D_8024C098_C09918)($at) /* 1684B8 80247C58 90510003 */ lbu $s1, 3($v0) diff --git a/ver/us/asm/nonmatchings/168590/filemenu_choose_name_cleanup.s b/ver/us/asm/nonmatchings/168590/filemenu_choose_name_cleanup.s deleted file mode 100644 index 62fa72407f..0000000000 --- a/ver/us/asm/nonmatchings/168590/filemenu_choose_name_cleanup.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_choose_name_cleanup -/* 169B8C 8024932C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 169B90 80249330 AFB10014 */ sw $s1, 0x14($sp) -/* 169B94 80249334 0000882D */ daddu $s1, $zero, $zero -/* 169B98 80249338 AFB00010 */ sw $s0, 0x10($sp) -/* 169B9C 8024933C 3C108025 */ lui $s0, %hi(D_8024C100_C09980) -/* 169BA0 80249340 2610C100 */ addiu $s0, $s0, %lo(D_8024C100_C09980) -/* 169BA4 80249344 AFBF0018 */ sw $ra, 0x18($sp) -.L80249348: -/* 169BA8 80249348 8E040000 */ lw $a0, ($s0) -/* 169BAC 8024934C 26100004 */ addiu $s0, $s0, 4 -/* 169BB0 80249350 0C05123D */ jal free_hud_element -/* 169BB4 80249354 26310001 */ addiu $s1, $s1, 1 -/* 169BB8 80249358 2A220003 */ slti $v0, $s1, 3 -/* 169BBC 8024935C 1440FFFA */ bnez $v0, .L80249348 -/* 169BC0 80249360 00000000 */ nop -/* 169BC4 80249364 8FBF0018 */ lw $ra, 0x18($sp) -/* 169BC8 80249368 8FB10014 */ lw $s1, 0x14($sp) -/* 169BCC 8024936C 8FB00010 */ lw $s0, 0x10($sp) -/* 169BD0 80249370 03E00008 */ jr $ra -/* 169BD4 80249374 27BD0020 */ addiu $sp, $sp, 0x20 -/* 169BD8 80249378 00000000 */ nop -/* 169BDC 8024937C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/168590/filemenu_choose_name_handle_input.s b/ver/us/asm/nonmatchings/168590/filemenu_choose_name_handle_input.s index c68f5e5cdd..7627f4a713 100644 --- a/ver/us/asm/nonmatchings/168590/filemenu_choose_name_handle_input.s +++ b/ver/us/asm/nonmatchings/168590/filemenu_choose_name_handle_input.s @@ -12,8 +12,8 @@ glabel filemenu_choose_name_handle_input /* 169454 80248BF4 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 169458 80248BF8 AFB00010 */ sw $s0, 0x10($sp) /* 16945C 80248BFC 0080802D */ daddu $s0, $a0, $zero -/* 169460 80248C00 3C038025 */ lui $v1, %hi(D_8024C08C) -/* 169464 80248C04 8C63C08C */ lw $v1, %lo(D_8024C08C)($v1) +/* 169460 80248C00 3C038025 */ lui $v1, %hi(filemenu_heldButtons) +/* 169464 80248C04 8C63C08C */ lw $v1, %lo(filemenu_heldButtons)($v1) /* 169468 80248C08 3C020004 */ lui $v0, 4 /* 16946C 80248C0C AFBF0018 */ sw $ra, 0x18($sp) /* 169470 80248C10 AFB10014 */ sw $s1, 0x14($sp) @@ -69,8 +69,8 @@ glabel filemenu_choose_name_handle_input .L80248CCC: /* 16952C 80248CCC A2020001 */ sb $v0, 1($s0) .L80248CD0: -/* 169530 80248CD0 3C038025 */ lui $v1, %hi(D_8024C08C) -/* 169534 80248CD4 8C63C08C */ lw $v1, %lo(D_8024C08C)($v1) +/* 169530 80248CD0 3C038025 */ lui $v1, %hi(filemenu_heldButtons) +/* 169534 80248CD4 8C63C08C */ lw $v1, %lo(filemenu_heldButtons)($v1) /* 169538 80248CD8 3C020001 */ lui $v0, 1 /* 16953C 80248CDC 00621024 */ and $v0, $v1, $v0 /* 169540 80248CE0 1040000B */ beqz $v0, .L80248D10 @@ -149,8 +149,8 @@ glabel filemenu_choose_name_handle_input /* 169650 80248DF0 0C05272D */ jal sfx_play_sound /* 169654 80248DF4 24042102 */ addiu $a0, $zero, 0x2102 .L80248DF8: -/* 169658 80248DF8 3C028025 */ lui $v0, %hi(D_8024C084) -/* 16965C 80248DFC 8C42C084 */ lw $v0, %lo(D_8024C084)($v0) +/* 169658 80248DF8 3C028025 */ lui $v0, %hi(filemenu_pressedButtons) +/* 16965C 80248DFC 8C42C084 */ lw $v0, %lo(filemenu_pressedButtons)($v0) /* 169660 80248E00 30428000 */ andi $v0, $v0, 0x8000 /* 169664 80248E04 1040009A */ beqz $v0, .L80249070 /* 169668 80248E08 00000000 */ nop @@ -323,8 +323,8 @@ glabel L80249034_169894 /* 1698C8 80249068 0C090B65 */ jal filemenu_set_selected /* 1698CC 8024906C 24C6FFFF */ addiu $a2, $a2, -1 .L80249070: -/* 1698D0 80249070 3C038025 */ lui $v1, %hi(D_8024C084) -/* 1698D4 80249074 8C63C084 */ lw $v1, %lo(D_8024C084)($v1) +/* 1698D0 80249070 3C038025 */ lui $v1, %hi(filemenu_pressedButtons) +/* 1698D4 80249074 8C63C084 */ lw $v1, %lo(filemenu_pressedButtons)($v1) /* 1698D8 80249078 30624000 */ andi $v0, $v1, 0x4000 /* 1698DC 8024907C 14400006 */ bnez $v0, .L80249098 /* 1698E0 80249080 30628000 */ andi $v0, $v1, 0x8000 @@ -408,8 +408,8 @@ glabel L80249034_169894 /* 169A0C 802491AC 1440FFFC */ bnez $v0, .L802491A0 /* 169A10 802491B0 00651021 */ addu $v0, $v1, $a1 .L802491B4: -/* 169A14 802491B4 3C028025 */ lui $v0, %hi(D_8024C084) -/* 169A18 802491B8 8C42C084 */ lw $v0, %lo(D_8024C084)($v0) +/* 169A14 802491B4 3C028025 */ lui $v0, %hi(filemenu_pressedButtons) +/* 169A18 802491B8 8C42C084 */ lw $v0, %lo(filemenu_pressedButtons)($v0) /* 169A1C 802491BC 30421000 */ andi $v0, $v0, 0x1000 /* 169A20 802491C0 10400053 */ beqz $v0, .L80249310 /* 169A24 802491C4 0000182D */ daddu $v1, $zero, $zero @@ -495,8 +495,8 @@ glabel L80249034_169894 /* 169B44 802492E4 0000282D */ daddu $a1, $zero, $zero /* 169B48 802492E8 00A0302D */ daddu $a2, $a1, $zero /* 169B4C 802492EC A4E30000 */ sh $v1, ($a3) -/* 169B50 802492F0 3C048025 */ lui $a0, %hi(D_80249B88) -/* 169B54 802492F4 8C849B88 */ lw $a0, %lo(D_80249B88)($a0) +/* 169B50 802492F0 3C048025 */ lui $a0, %hi(filemenu_menus + 0x4) +/* 169B54 802492F4 8C849B88 */ lw $a0, %lo(filemenu_menus + 0x4)($a0) /* 169B58 802492F8 24020001 */ addiu $v0, $zero, 1 /* 169B5C 802492FC 3C018025 */ lui $at, %hi(D_8024C098_C09918) /* 169B60 80249300 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) diff --git a/ver/us/asm/nonmatchings/168590/filemenu_draw_contents_choose_name.s b/ver/us/asm/nonmatchings/168590/filemenu_draw_contents_choose_name.s index e73a6b8f90..061506c355 100644 --- a/ver/us/asm/nonmatchings/168590/filemenu_draw_contents_choose_name.s +++ b/ver/us/asm/nonmatchings/168590/filemenu_draw_contents_choose_name.s @@ -471,8 +471,8 @@ glabel filemenu_draw_contents_choose_name /* 169230 802489D0 24020003 */ addiu $v0, $zero, 3 /* 169234 802489D4 1462001D */ bne $v1, $v0, .L80248A4C /* 169238 802489D8 00000000 */ nop -/* 16923C 802489DC 3C028025 */ lui $v0, %hi(D_8024C08C) -/* 169240 802489E0 8C42C08C */ lw $v0, %lo(D_8024C08C)($v0) +/* 16923C 802489DC 3C028025 */ lui $v0, %hi(filemenu_heldButtons) +/* 169240 802489E0 8C42C08C */ lw $v0, %lo(filemenu_heldButtons)($v0) /* 169244 802489E4 3C03000F */ lui $v1, 0xf /* 169248 802489E8 00431024 */ and $v0, $v0, $v1 /* 16924C 802489EC 10400003 */ beqz $v0, .L802489FC diff --git a/ver/us/asm/nonmatchings/168590/filemenu_draw_contents_file_create_header.s b/ver/us/asm/nonmatchings/168590/filemenu_draw_contents_file_create_header.s deleted file mode 100644 index 8b1636062a..0000000000 --- a/ver/us/asm/nonmatchings/168590/filemenu_draw_contents_file_create_header.s +++ /dev/null @@ -1,94 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_contents_file_create_header -/* 168A18 802481B8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 168A1C 802481BC AFB3002C */ sw $s3, 0x2c($sp) -/* 168A20 802481C0 00A0982D */ daddu $s3, $a1, $zero -/* 168A24 802481C4 AFB40030 */ sw $s4, 0x30($sp) -/* 168A28 802481C8 00C0A02D */ daddu $s4, $a2, $zero -/* 168A2C 802481CC 24040020 */ addiu $a0, $zero, 0x20 -/* 168A30 802481D0 AFBF0038 */ sw $ra, 0x38($sp) -/* 168A34 802481D4 AFB50034 */ sw $s5, 0x34($sp) -/* 168A38 802481D8 AFB20028 */ sw $s2, 0x28($sp) -/* 168A3C 802481DC AFB10024 */ sw $s1, 0x24($sp) -/* 168A40 802481E0 0C0926A9 */ jal filemenu_get_menu_message -/* 168A44 802481E4 AFB00020 */ sw $s0, 0x20($sp) -/* 168A48 802481E8 0040202D */ daddu $a0, $v0, $zero -/* 168A4C 802481EC 2665000A */ addiu $a1, $s3, 0xa -/* 168A50 802481F0 26860006 */ addiu $a2, $s4, 6 -/* 168A54 802481F4 240700FF */ addiu $a3, $zero, 0xff -/* 168A58 802481F8 AFA00010 */ sw $zero, 0x10($sp) -/* 168A5C 802481FC 0C09265F */ jal filemenu_draw_message -/* 168A60 80248200 AFA00014 */ sw $zero, 0x14($sp) -/* 168A64 80248204 3C048025 */ lui $a0, %hi(D_8024C110) -/* 168A68 80248208 2484C110 */ addiu $a0, $a0, %lo(D_8024C110) -/* 168A6C 8024820C 24050008 */ addiu $a1, $zero, 8 -/* 168A70 80248210 26660024 */ addiu $a2, $s3, 0x24 -/* 168A74 80248214 26870016 */ addiu $a3, $s4, 0x16 -/* 168A78 80248218 240200FF */ addiu $v0, $zero, 0xff -/* 168A7C 8024821C AFA20010 */ sw $v0, 0x10($sp) -/* 168A80 80248220 2402000B */ addiu $v0, $zero, 0xb -/* 168A84 80248224 AFA00014 */ sw $zero, 0x14($sp) -/* 168A88 80248228 AFA00018 */ sw $zero, 0x18($sp) -/* 168A8C 8024822C 0C0926AE */ jal filemenu_draw_file_name -/* 168A90 80248230 AFA2001C */ sw $v0, 0x1c($sp) -/* 168A94 80248234 24150029 */ addiu $s5, $zero, 0x29 -/* 168A98 80248238 0000802D */ daddu $s0, $zero, $zero -/* 168A9C 8024823C 3C128025 */ lui $s2, %hi(D_8024C100_C09980) -/* 168AA0 80248240 2652C100 */ addiu $s2, $s2, %lo(D_8024C100_C09980) -/* 168AA4 80248244 2411002A */ addiu $s1, $zero, 0x2a -.L80248248: -/* 168AA8 80248248 8E440004 */ lw $a0, 4($s2) -/* 168AAC 8024824C 02712821 */ addu $a1, $s3, $s1 -/* 168AB0 80248250 0C051261 */ jal set_hud_element_render_pos -/* 168AB4 80248254 02953021 */ addu $a2, $s4, $s5 -/* 168AB8 80248258 16000006 */ bnez $s0, .L80248274 -/* 168ABC 8024825C 00000000 */ nop -/* 168AC0 80248260 8E440004 */ lw $a0, 4($s2) -/* 168AC4 80248264 0C0511F8 */ jal draw_hud_element_3 -/* 168AC8 80248268 2631000B */ addiu $s1, $s1, 0xb -/* 168ACC 8024826C 080920A1 */ j .L80248284 -/* 168AD0 80248270 26100001 */ addiu $s0, $s0, 1 -.L80248274: -/* 168AD4 80248274 8E440004 */ lw $a0, 4($s2) -/* 168AD8 80248278 0C0511F1 */ jal draw_hud_element_2 -/* 168ADC 8024827C 2631000B */ addiu $s1, $s1, 0xb -/* 168AE0 80248280 26100001 */ addiu $s0, $s0, 1 -.L80248284: -/* 168AE4 80248284 2A020008 */ slti $v0, $s0, 8 -/* 168AE8 80248288 1440FFEF */ bnez $v0, .L80248248 -/* 168AEC 8024828C 24020003 */ addiu $v0, $zero, 3 -/* 168AF0 80248290 3C038025 */ lui $v1, %hi(D_8024C098_C09918) -/* 168AF4 80248294 8063C098 */ lb $v1, %lo(D_8024C098_C09918)($v1) -/* 168AF8 80248298 14620013 */ bne $v1, $v0, .L802482E8 -/* 168AFC 8024829C 24040008 */ addiu $a0, $zero, 8 -/* 168B00 802482A0 3C038025 */ lui $v1, %hi(D_8024C090) -/* 168B04 802482A4 8063C090 */ lb $v1, %lo(D_8024C090)($v1) -/* 168B08 802482A8 10640006 */ beq $v1, $a0, .L802482C4 -/* 168B0C 802482AC 2402007A */ addiu $v0, $zero, 0x7a -/* 168B10 802482B0 00031040 */ sll $v0, $v1, 1 -/* 168B14 802482B4 00431021 */ addu $v0, $v0, $v1 -/* 168B18 802482B8 00021080 */ sll $v0, $v0, 2 -/* 168B1C 802482BC 00431023 */ subu $v0, $v0, $v1 -/* 168B20 802482C0 2442002D */ addiu $v0, $v0, 0x2d -.L802482C4: -/* 168B24 802482C4 02622821 */ addu $a1, $s3, $v0 -/* 168B28 802482C8 3C108025 */ lui $s0, %hi(D_8024C100_C09980) -/* 168B2C 802482CC 2610C100 */ addiu $s0, $s0, %lo(D_8024C100_C09980) -/* 168B30 802482D0 8E040000 */ lw $a0, ($s0) -/* 168B34 802482D4 0C051261 */ jal set_hud_element_render_pos -/* 168B38 802482D8 2686002D */ addiu $a2, $s4, 0x2d -/* 168B3C 802482DC 8E040000 */ lw $a0, ($s0) -/* 168B40 802482E0 0C0511F1 */ jal draw_hud_element_2 -/* 168B44 802482E4 00000000 */ nop -.L802482E8: -/* 168B48 802482E8 8FBF0038 */ lw $ra, 0x38($sp) -/* 168B4C 802482EC 8FB50034 */ lw $s5, 0x34($sp) -/* 168B50 802482F0 8FB40030 */ lw $s4, 0x30($sp) -/* 168B54 802482F4 8FB3002C */ lw $s3, 0x2c($sp) -/* 168B58 802482F8 8FB20028 */ lw $s2, 0x28($sp) -/* 168B5C 802482FC 8FB10024 */ lw $s1, 0x24($sp) -/* 168B60 80248300 8FB00020 */ lw $s0, 0x20($sp) -/* 168B64 80248304 03E00008 */ jr $ra -/* 168B68 80248308 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/168590/filemenu_info_draw_message_contents.s b/ver/us/asm/nonmatchings/168590/filemenu_info_draw_message_contents.s deleted file mode 100644 index 4571818534..0000000000 --- a/ver/us/asm/nonmatchings/168590/filemenu_info_draw_message_contents.s +++ /dev/null @@ -1,181 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_info_draw_message_contents -/* 168590 80247D30 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 168594 80247D34 AFB40030 */ sw $s4, 0x30($sp) -/* 168598 80247D38 00A0A02D */ daddu $s4, $a1, $zero -/* 16859C 80247D3C AFB50034 */ sw $s5, 0x34($sp) -/* 1685A0 80247D40 AFBF0038 */ sw $ra, 0x38($sp) -/* 1685A4 80247D44 AFB3002C */ sw $s3, 0x2c($sp) -/* 1685A8 80247D48 AFB20028 */ sw $s2, 0x28($sp) -/* 1685AC 80247D4C AFB10024 */ sw $s1, 0x24($sp) -/* 1685B0 80247D50 AFB00020 */ sw $s0, 0x20($sp) -/* 1685B4 80247D54 80910004 */ lb $s1, 4($a0) -/* 1685B8 80247D58 24020001 */ addiu $v0, $zero, 1 -/* 1685BC 80247D5C 1222006B */ beq $s1, $v0, .L80247F0C -/* 1685C0 80247D60 00C0A82D */ daddu $s5, $a2, $zero -/* 1685C4 80247D64 2A220002 */ slti $v0, $s1, 2 -/* 1685C8 80247D68 10400005 */ beqz $v0, .L80247D80 -/* 1685CC 80247D6C 24020002 */ addiu $v0, $zero, 2 -/* 1685D0 80247D70 12200009 */ beqz $s1, .L80247D98 -/* 1685D4 80247D74 00000000 */ nop -/* 1685D8 80247D78 08091FE9 */ j .L80247FA4 -/* 1685DC 80247D7C 00000000 */ nop -.L80247D80: -/* 1685E0 80247D80 1222001E */ beq $s1, $v0, .L80247DFC -/* 1685E4 80247D84 24020003 */ addiu $v0, $zero, 3 -/* 1685E8 80247D88 12220066 */ beq $s1, $v0, .L80247F24 -/* 1685EC 80247D8C 00000000 */ nop -/* 1685F0 80247D90 08091FE9 */ j .L80247FA4 -/* 1685F4 80247D94 00000000 */ nop -.L80247D98: -/* 1685F8 80247D98 0C0926A9 */ jal filemenu_get_menu_message -/* 1685FC 80247D9C 2404001A */ addiu $a0, $zero, 0x1a -/* 168600 80247DA0 0040202D */ daddu $a0, $v0, $zero -/* 168604 80247DA4 2685000A */ addiu $a1, $s4, 0xa -/* 168608 80247DA8 26B00004 */ addiu $s0, $s5, 4 -/* 16860C 80247DAC 0200302D */ daddu $a2, $s0, $zero -/* 168610 80247DB0 240700FF */ addiu $a3, $zero, 0xff -/* 168614 80247DB4 AFA00010 */ sw $zero, 0x10($sp) -/* 168618 80247DB8 0C09265F */ jal filemenu_draw_message -/* 16861C 80247DBC AFA00014 */ sw $zero, 0x14($sp) -/* 168620 80247DC0 26850030 */ addiu $a1, $s4, 0x30 -/* 168624 80247DC4 26A60006 */ addiu $a2, $s5, 6 -/* 168628 80247DC8 3C028025 */ lui $v0, %hi(D_80249B84) -/* 16862C 80247DCC 8C429B84 */ lw $v0, %lo(D_80249B84)($v0) -/* 168630 80247DD0 0000382D */ daddu $a3, $zero, $zero -/* 168634 80247DD4 90440003 */ lbu $a0, 3($v0) -/* 168638 80247DD8 240200FF */ addiu $v0, $zero, 0xff -/* 16863C 80247DDC AFA20014 */ sw $v0, 0x14($sp) -/* 168640 80247DE0 24020003 */ addiu $v0, $zero, 3 -/* 168644 80247DE4 AFA00010 */ sw $zero, 0x10($sp) -/* 168648 80247DE8 AFA20018 */ sw $v0, 0x18($sp) -/* 16864C 80247DEC 0C049DA7 */ jal draw_number -/* 168650 80247DF0 24840001 */ addiu $a0, $a0, 1 -/* 168654 80247DF4 08091FE0 */ j .L80247F80 -/* 168658 80247DF8 2404001B */ addiu $a0, $zero, 0x1b -.L80247DFC: -/* 16865C 80247DFC 0C0926A9 */ jal filemenu_get_menu_message -/* 168660 80247E00 2404001D */ addiu $a0, $zero, 0x1d -/* 168664 80247E04 0040202D */ daddu $a0, $v0, $zero -/* 168668 80247E08 2692000A */ addiu $s2, $s4, 0xa -/* 16866C 80247E0C 0240282D */ daddu $a1, $s2, $zero -/* 168670 80247E10 26B00004 */ addiu $s0, $s5, 4 -/* 168674 80247E14 0200302D */ daddu $a2, $s0, $zero -/* 168678 80247E18 240700FF */ addiu $a3, $zero, 0xff -/* 16867C 80247E1C AFA00010 */ sw $zero, 0x10($sp) -/* 168680 80247E20 0C09265F */ jal filemenu_draw_message -/* 168684 80247E24 AFA00014 */ sw $zero, 0x14($sp) -/* 168688 80247E28 0C0926A9 */ jal filemenu_get_menu_message -/* 16868C 80247E2C 2404001A */ addiu $a0, $zero, 0x1a -/* 168690 80247E30 0040202D */ daddu $a0, $v0, $zero -/* 168694 80247E34 26850054 */ addiu $a1, $s4, 0x54 -/* 168698 80247E38 0200302D */ daddu $a2, $s0, $zero -/* 16869C 80247E3C 240700FF */ addiu $a3, $zero, 0xff -/* 1686A0 80247E40 AFA00010 */ sw $zero, 0x10($sp) -/* 1686A4 80247E44 0C09265F */ jal filemenu_draw_message -/* 1686A8 80247E48 AFA00014 */ sw $zero, 0x14($sp) -/* 1686AC 80247E4C 2685007A */ addiu $a1, $s4, 0x7a -/* 1686B0 80247E50 26A60006 */ addiu $a2, $s5, 6 -/* 1686B4 80247E54 0000382D */ daddu $a3, $zero, $zero -/* 1686B8 80247E58 241300FF */ addiu $s3, $zero, 0xff -/* 1686BC 80247E5C 3C048025 */ lui $a0, %hi(D_8024C094) -/* 1686C0 80247E60 8C84C094 */ lw $a0, %lo(D_8024C094)($a0) -/* 1686C4 80247E64 24110003 */ addiu $s1, $zero, 3 -/* 1686C8 80247E68 AFA00010 */ sw $zero, 0x10($sp) -/* 1686CC 80247E6C AFB30014 */ sw $s3, 0x14($sp) -/* 1686D0 80247E70 AFB10018 */ sw $s1, 0x18($sp) -/* 1686D4 80247E74 0C049DA7 */ jal draw_number -/* 1686D8 80247E78 24840001 */ addiu $a0, $a0, 1 -/* 1686DC 80247E7C 0C0926A9 */ jal filemenu_get_menu_message -/* 1686E0 80247E80 2404001E */ addiu $a0, $zero, 0x1e -/* 1686E4 80247E84 0040202D */ daddu $a0, $v0, $zero -/* 1686E8 80247E88 0240282D */ daddu $a1, $s2, $zero -/* 1686EC 80247E8C 26B00012 */ addiu $s0, $s5, 0x12 -/* 1686F0 80247E90 0200302D */ daddu $a2, $s0, $zero -/* 1686F4 80247E94 0260382D */ daddu $a3, $s3, $zero -/* 1686F8 80247E98 AFA00010 */ sw $zero, 0x10($sp) -/* 1686FC 80247E9C 0C09265F */ jal filemenu_draw_message -/* 168700 80247EA0 AFA00014 */ sw $zero, 0x14($sp) -/* 168704 80247EA4 0C0926A9 */ jal filemenu_get_menu_message -/* 168708 80247EA8 2404001A */ addiu $a0, $zero, 0x1a -/* 16870C 80247EAC 0040202D */ daddu $a0, $v0, $zero -/* 168710 80247EB0 2685001E */ addiu $a1, $s4, 0x1e -/* 168714 80247EB4 0200302D */ daddu $a2, $s0, $zero -/* 168718 80247EB8 0260382D */ daddu $a3, $s3, $zero -/* 16871C 80247EBC AFA00010 */ sw $zero, 0x10($sp) -/* 168720 80247EC0 0C09265F */ jal filemenu_draw_message -/* 168724 80247EC4 AFA00014 */ sw $zero, 0x14($sp) -/* 168728 80247EC8 26850044 */ addiu $a1, $s4, 0x44 -/* 16872C 80247ECC 26A60014 */ addiu $a2, $s5, 0x14 -/* 168730 80247ED0 3C048025 */ lui $a0, %hi(D_8024C080) -/* 168734 80247ED4 8C84C080 */ lw $a0, %lo(D_8024C080)($a0) -/* 168738 80247ED8 0000382D */ daddu $a3, $zero, $zero -/* 16873C 80247EDC AFA00010 */ sw $zero, 0x10($sp) -/* 168740 80247EE0 AFB30014 */ sw $s3, 0x14($sp) -/* 168744 80247EE4 AFB10018 */ sw $s1, 0x18($sp) -/* 168748 80247EE8 0C049DA7 */ jal draw_number -/* 16874C 80247EEC 24840001 */ addiu $a0, $a0, 1 -/* 168750 80247EF0 0C0926A9 */ jal filemenu_get_menu_message -/* 168754 80247EF4 24040022 */ addiu $a0, $zero, 0x22 -/* 168758 80247EF8 0040202D */ daddu $a0, $v0, $zero -/* 16875C 80247EFC 26850041 */ addiu $a1, $s4, 0x41 -/* 168760 80247F00 0200302D */ daddu $a2, $s0, $zero -/* 168764 80247F04 08091FE6 */ j .L80247F98 -/* 168768 80247F08 0260382D */ daddu $a3, $s3, $zero -.L80247F0C: -/* 16876C 80247F0C 0C0926A9 */ jal filemenu_get_menu_message -/* 168770 80247F10 2404001C */ addiu $a0, $zero, 0x1c -/* 168774 80247F14 0040202D */ daddu $a0, $v0, $zero -/* 168778 80247F18 2685000A */ addiu $a1, $s4, 0xa -/* 16877C 80247F1C 08091FE5 */ j .L80247F94 -/* 168780 80247F20 26A60004 */ addiu $a2, $s5, 4 -.L80247F24: -/* 168784 80247F24 0C0926A9 */ jal filemenu_get_menu_message -/* 168788 80247F28 2404001A */ addiu $a0, $zero, 0x1a -/* 16878C 80247F2C 0040202D */ daddu $a0, $v0, $zero -/* 168790 80247F30 2685000A */ addiu $a1, $s4, 0xa -/* 168794 80247F34 26B00004 */ addiu $s0, $s5, 4 -/* 168798 80247F38 0200302D */ daddu $a2, $s0, $zero -/* 16879C 80247F3C 240700FF */ addiu $a3, $zero, 0xff -/* 1687A0 80247F40 AFA00010 */ sw $zero, 0x10($sp) -/* 1687A4 80247F44 0C09265F */ jal filemenu_draw_message -/* 1687A8 80247F48 AFA00014 */ sw $zero, 0x14($sp) -/* 1687AC 80247F4C 26850030 */ addiu $a1, $s4, 0x30 -/* 1687B0 80247F50 26A60006 */ addiu $a2, $s5, 6 -/* 1687B4 80247F54 3C028025 */ lui $v0, %hi(D_80249B84) -/* 1687B8 80247F58 8C429B84 */ lw $v0, %lo(D_80249B84)($v0) -/* 1687BC 80247F5C 0000382D */ daddu $a3, $zero, $zero -/* 1687C0 80247F60 90440003 */ lbu $a0, 3($v0) -/* 1687C4 80247F64 240200FF */ addiu $v0, $zero, 0xff -/* 1687C8 80247F68 AFA00010 */ sw $zero, 0x10($sp) -/* 1687CC 80247F6C AFA20014 */ sw $v0, 0x14($sp) -/* 1687D0 80247F70 AFB10018 */ sw $s1, 0x18($sp) -/* 1687D4 80247F74 0C049DA7 */ jal draw_number -/* 1687D8 80247F78 24840001 */ addiu $a0, $a0, 1 -/* 1687DC 80247F7C 2404001F */ addiu $a0, $zero, 0x1f -.L80247F80: -/* 1687E0 80247F80 0C0926A9 */ jal filemenu_get_menu_message -/* 1687E4 80247F84 00000000 */ nop -/* 1687E8 80247F88 0040202D */ daddu $a0, $v0, $zero -/* 1687EC 80247F8C 26850031 */ addiu $a1, $s4, 0x31 -/* 1687F0 80247F90 0200302D */ daddu $a2, $s0, $zero -.L80247F94: -/* 1687F4 80247F94 240700FF */ addiu $a3, $zero, 0xff -.L80247F98: -/* 1687F8 80247F98 AFA00010 */ sw $zero, 0x10($sp) -/* 1687FC 80247F9C 0C09265F */ jal filemenu_draw_message -/* 168800 80247FA0 AFA00014 */ sw $zero, 0x14($sp) -.L80247FA4: -/* 168804 80247FA4 0C090B7B */ jal filemenu_set_cursor_alpha -/* 168808 80247FA8 0000202D */ daddu $a0, $zero, $zero -/* 16880C 80247FAC 8FBF0038 */ lw $ra, 0x38($sp) -/* 168810 80247FB0 8FB50034 */ lw $s5, 0x34($sp) -/* 168814 80247FB4 8FB40030 */ lw $s4, 0x30($sp) -/* 168818 80247FB8 8FB3002C */ lw $s3, 0x2c($sp) -/* 16881C 80247FBC 8FB20028 */ lw $s2, 0x28($sp) -/* 168820 80247FC0 8FB10024 */ lw $s1, 0x24($sp) -/* 168824 80247FC4 8FB00020 */ lw $s0, 0x20($sp) -/* 168828 80247FC8 03E00008 */ jr $ra -/* 16882C 80247FCC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/168590/filemenu_info_handle_input.s b/ver/us/asm/nonmatchings/168590/filemenu_info_handle_input.s deleted file mode 100644 index 831bb7631d..0000000000 --- a/ver/us/asm/nonmatchings/168590/filemenu_info_handle_input.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_info_handle_input -/* 168884 80248024 3C028025 */ lui $v0, %hi(D_8024C084) -/* 168888 80248028 8C42C084 */ lw $v0, %lo(D_8024C084)($v0) -/* 16888C 8024802C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 168890 80248030 AFBF0018 */ sw $ra, 0x18($sp) -/* 168894 80248034 AFB10014 */ sw $s1, 0x14($sp) -/* 168898 80248038 3042C000 */ andi $v0, $v0, 0xc000 -/* 16889C 8024803C 10400043 */ beqz $v0, .L8024814C -/* 1688A0 80248040 AFB00010 */ sw $s0, 0x10($sp) -/* 1688A4 80248044 3C118025 */ lui $s1, %hi(D_80249B84) -/* 1688A8 80248048 8E319B84 */ lw $s1, %lo(D_80249B84)($s1) -/* 1688AC 8024804C 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 1688B0 80248050 A020C098 */ sb $zero, %lo(D_8024C098_C09918)($at) -/* 1688B4 80248054 82230004 */ lb $v1, 4($s1) -/* 1688B8 80248058 24020002 */ addiu $v0, $zero, 2 -/* 1688BC 8024805C 10620033 */ beq $v1, $v0, .L8024812C -/* 1688C0 80248060 28620003 */ slti $v0, $v1, 3 -/* 1688C4 80248064 10400005 */ beqz $v0, .L8024807C -/* 1688C8 80248068 24020001 */ addiu $v0, $zero, 1 -/* 1688CC 8024806C 10620008 */ beq $v1, $v0, .L80248090 -/* 1688D0 80248070 2404002F */ addiu $a0, $zero, 0x2f -/* 1688D4 80248074 08092051 */ j .L80248144 -/* 1688D8 80248078 00000000 */ nop -.L8024807C: -/* 1688DC 8024807C 24020004 */ addiu $v0, $zero, 4 -/* 1688E0 80248080 10620017 */ beq $v1, $v0, .L802480E0 -/* 1688E4 80248084 2404002F */ addiu $a0, $zero, 0x2f -/* 1688E8 80248088 08092051 */ j .L80248144 -/* 1688EC 8024808C 00000000 */ nop -.L80248090: -/* 1688F0 80248090 A2200004 */ sb $zero, 4($s1) -/* 1688F4 80248094 3C058024 */ lui $a1, %hi(filemenu_update_show_options_left) -/* 1688F8 80248098 24A533F4 */ addiu $a1, $a1, %lo(filemenu_update_show_options_left) -/* 1688FC 8024809C 0C051F9F */ jal set_window_update -/* 168900 802480A0 24040033 */ addiu $a0, $zero, 0x33 -/* 168904 802480A4 3C058024 */ lui $a1, %hi(filemenu_update_show_options_right) -/* 168908 802480A8 24A53468 */ addiu $a1, $a1, %lo(filemenu_update_show_options_right) -/* 16890C 802480AC 0C051F9F */ jal set_window_update -/* 168910 802480B0 24040034 */ addiu $a0, $zero, 0x34 -/* 168914 802480B4 24040035 */ addiu $a0, $zero, 0x35 -/* 168918 802480B8 3C108024 */ lui $s0, %hi(filemenu_update_show_options_bottom) -/* 16891C 802480BC 261034DC */ addiu $s0, $s0, %lo(filemenu_update_show_options_bottom) -/* 168920 802480C0 0C051F9F */ jal set_window_update -/* 168924 802480C4 0200282D */ daddu $a1, $s0, $zero -/* 168928 802480C8 24040037 */ addiu $a0, $zero, 0x37 -/* 16892C 802480CC 0C051F9F */ jal set_window_update -/* 168930 802480D0 0200282D */ daddu $a1, $s0, $zero -/* 168934 802480D4 0220202D */ daddu $a0, $s1, $zero -/* 168938 802480D8 0809204E */ j .L80248138 -/* 16893C 802480DC 0000282D */ daddu $a1, $zero, $zero -.L802480E0: -/* 168940 802480E0 A2200004 */ sb $zero, 4($s1) -/* 168944 802480E4 3C058024 */ lui $a1, %hi(filemenu_update_show_options_left) -/* 168948 802480E8 24A533F4 */ addiu $a1, $a1, %lo(filemenu_update_show_options_left) -/* 16894C 802480EC 0C051F9F */ jal set_window_update -/* 168950 802480F0 24040033 */ addiu $a0, $zero, 0x33 -/* 168954 802480F4 3C058024 */ lui $a1, %hi(filemenu_update_show_options_right) -/* 168958 802480F8 24A53468 */ addiu $a1, $a1, %lo(filemenu_update_show_options_right) -/* 16895C 802480FC 0C051F9F */ jal set_window_update -/* 168960 80248100 24040034 */ addiu $a0, $zero, 0x34 -/* 168964 80248104 24040035 */ addiu $a0, $zero, 0x35 -/* 168968 80248108 3C108024 */ lui $s0, %hi(filemenu_update_show_options_bottom) -/* 16896C 8024810C 261034DC */ addiu $s0, $s0, %lo(filemenu_update_show_options_bottom) -/* 168970 80248110 0C051F9F */ jal set_window_update -/* 168974 80248114 0200282D */ daddu $a1, $s0, $zero -/* 168978 80248118 24040037 */ addiu $a0, $zero, 0x37 -/* 16897C 8024811C 0C051F9F */ jal set_window_update -/* 168980 80248120 0200282D */ daddu $a1, $s0, $zero -/* 168984 80248124 0809204D */ j .L80248134 -/* 168988 80248128 0220202D */ daddu $a0, $s1, $zero -.L8024812C: -/* 16898C 8024812C A2230004 */ sb $v1, 4($s1) -/* 168990 80248130 0220202D */ daddu $a0, $s1, $zero -.L80248134: -/* 168994 80248134 24050001 */ addiu $a1, $zero, 1 -.L80248138: -/* 168998 80248138 0C090B65 */ jal filemenu_set_selected -/* 16899C 8024813C 24060002 */ addiu $a2, $zero, 2 -/* 1689A0 80248140 2404002F */ addiu $a0, $zero, 0x2f -.L80248144: -/* 1689A4 80248144 0C051F9F */ jal set_window_update -/* 1689A8 80248148 24050002 */ addiu $a1, $zero, 2 -.L8024814C: -/* 1689AC 8024814C 8FBF0018 */ lw $ra, 0x18($sp) -/* 1689B0 80248150 8FB10014 */ lw $s1, 0x14($sp) -/* 1689B4 80248154 8FB00010 */ lw $s0, 0x10($sp) -/* 1689B8 80248158 03E00008 */ jr $ra -/* 1689BC 8024815C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/168590/filemenu_info_init.s b/ver/us/asm/nonmatchings/168590/filemenu_info_init.s deleted file mode 100644 index 3bdfeee54e..0000000000 --- a/ver/us/asm/nonmatchings/168590/filemenu_info_init.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_info_init -/* 168830 80247FD0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 168834 80247FD4 AFB00010 */ sw $s0, 0x10($sp) -/* 168838 80247FD8 0080802D */ daddu $s0, $a0, $zero -/* 16883C 80247FDC 0000182D */ daddu $v1, $zero, $zero -/* 168840 80247FE0 3C028025 */ lui $v0, %hi(D_8024A134) -/* 168844 80247FE4 2442A134 */ addiu $v0, $v0, %lo(D_8024A134) -/* 168848 80247FE8 AFBF0014 */ sw $ra, 0x14($sp) -.L80247FEC: -/* 16884C 80247FEC AC500010 */ sw $s0, 0x10($v0) -/* 168850 80247FF0 24630001 */ addiu $v1, $v1, 1 -/* 168854 80247FF4 1860FFFD */ blez $v1, .L80247FEC -/* 168858 80247FF8 24420024 */ addiu $v0, $v0, 0x24 -/* 16885C 80247FFC 3C048025 */ lui $a0, %hi(D_8024A134) -/* 168860 80248000 2484A134 */ addiu $a0, $a0, %lo(D_8024A134) -/* 168864 80248004 0C051FCC */ jal setup_pause_menu_tab -/* 168868 80248008 24050001 */ addiu $a1, $zero, 1 -/* 16886C 8024800C 24020001 */ addiu $v0, $zero, 1 -/* 168870 80248010 A2020000 */ sb $v0, ($s0) -/* 168874 80248014 8FBF0014 */ lw $ra, 0x14($sp) -/* 168878 80248018 8FB00010 */ lw $s0, 0x10($sp) -/* 16887C 8024801C 03E00008 */ jr $ra -/* 168880 80248020 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/B0E0/update_camera_zone_interp.s b/ver/us/asm/nonmatchings/B0E0/update_camera_zone_interp.s index b548d839b1..a78a59d4aa 100644 --- a/ver/us/asm/nonmatchings/B0E0/update_camera_zone_interp.s +++ b/ver/us/asm/nonmatchings/B0E0/update_camera_zone_interp.s @@ -345,8 +345,8 @@ glabel update_camera_zone_interp .L80031944: /* CD44 80031944 AE220444 */ sw $v0, 0x444($s1) .L80031948: -/* CD48 80031948 3C0C800A */ lui $t4, %hi(D_800A08C0) -/* CD4C 8003194C 258C08C0 */ addiu $t4, $t4, %lo(D_800A08C0) +/* CD48 80031948 3C0C800A */ lui $t4, %hi(blendedCamSettings) +/* CD4C 8003194C 258C08C0 */ addiu $t4, $t4, %lo(blendedCamSettings) /* CD50 80031950 8D890000 */ lw $t1, ($t4) /* CD54 80031954 8D8A0004 */ lw $t2, 4($t4) /* CD58 80031958 8D8B0008 */ lw $t3, 8($t4) @@ -721,8 +721,8 @@ glabel update_camera_zone_interp /* D2B4 80031EB4 E63E04A8 */ swc1 $f30, 0x4a8($s1) /* D2B8 80031EB8 C7B0003C */ lwc1 $f16, 0x3c($sp) /* D2BC 80031EBC 46001080 */ add.s $f2, $f2, $f0 -/* D2C0 80031EC0 3C12800A */ lui $s2, %hi(D_800A08C0) -/* D2C4 80031EC4 265208C0 */ addiu $s2, $s2, %lo(D_800A08C0) +/* D2C0 80031EC0 3C12800A */ lui $s2, %hi(blendedCamSettings) +/* D2C4 80031EC4 265208C0 */ addiu $s2, $s2, %lo(blendedCamSettings) /* D2C8 80031EC8 E63004AC */ swc1 $f16, 0x4ac($s1) /* D2CC 80031ECC E6420000 */ swc1 $f2, ($s2) /* D2D0 80031ED0 C6240450 */ lwc1 $f4, 0x450($s1) @@ -859,8 +859,8 @@ glabel update_camera_zone_interp /* D4D8 800320D8 0800C840 */ j .L80032100 /* D4DC 800320DC 00000000 */ nop .L800320E0: -/* D4E0 800320E0 3C02800A */ lui $v0, %hi(D_800A08C0) -/* D4E4 800320E4 244208C0 */ addiu $v0, $v0, %lo(D_800A08C0) +/* D4E0 800320E0 3C02800A */ lui $v0, %hi(blendedCamSettings) +/* D4E4 800320E4 244208C0 */ addiu $v0, $v0, %lo(blendedCamSettings) /* D4E8 800320E8 C62C003C */ lwc1 $f12, 0x3c($s1) /* D4EC 800320EC C62E0044 */ lwc1 $f14, 0x44($s1) /* D4F0 800320F0 8C460010 */ lw $a2, 0x10($v0) @@ -868,8 +868,8 @@ glabel update_camera_zone_interp /* D4F8 800320F8 8C470018 */ lw $a3, 0x18($v0) /* D4FC 800320FC 46000106 */ mov.s $f4, $f0 .L80032100: -/* D500 80032100 3C03800A */ lui $v1, %hi(D_800A08C0) -/* D504 80032104 246308C0 */ addiu $v1, $v1, %lo(D_800A08C0) +/* D500 80032100 3C03800A */ lui $v1, %hi(blendedCamSettings) +/* D504 80032104 246308C0 */ addiu $v1, $v1, %lo(blendedCamSettings) /* D508 80032108 C4600014 */ lwc1 $f0, 0x14($v1) /* D50C 8003210C 96220002 */ lhu $v0, 2($s1) /* D510 80032110 C6260040 */ lwc1 $f6, 0x40($s1) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignAreaFlag.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignAreaFlag.s deleted file mode 100644 index 9fb0265d37..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignAreaFlag.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel AssignAreaFlag -/* A86F8 80111FF8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A86FC 80111FFC 24020001 */ addiu $v0, $zero, 1 -/* A8700 80112000 AFBF0018 */ sw $ra, 0x18($sp) -/* A8704 80112004 AFB10014 */ sw $s1, 0x14($sp) -/* A8708 80112008 AFB00010 */ sw $s0, 0x10($sp) -/* A870C 8011200C 14A20012 */ bne $a1, $v0, .L80112058 -/* A8710 80112010 8C83000C */ lw $v1, 0xc($a0) -/* A8714 80112014 0C0B1EAF */ jal evt_get_variable -/* A8718 80112018 8C650000 */ lw $a1, ($v1) -/* A871C 8011201C 3C048015 */ lui $a0, %hi(gLastCreatedEntityIndex) -/* A8720 80112020 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) -/* A8724 80112024 0C04417A */ jal get_entity_by_index -/* A8728 80112028 0040802D */ daddu $s0, $v0, $zero -/* A872C 8011202C 0040882D */ daddu $s1, $v0, $zero -/* A8730 80112030 8E220040 */ lw $v0, 0x40($s1) -/* A8734 80112034 0200202D */ daddu $a0, $s0, $zero -/* A8738 80112038 0C05157C */ jal get_area_flag -/* A873C 8011203C A4440020 */ sh $a0, 0x20($v0) -/* A8740 80112040 10400004 */ beqz $v0, .L80112054 -/* A8744 80112044 3C032000 */ lui $v1, 0x2000 -/* A8748 80112048 8E220000 */ lw $v0, ($s1) -/* A874C 8011204C 00431025 */ or $v0, $v0, $v1 -/* A8750 80112050 AE220000 */ sw $v0, ($s1) -.L80112054: -/* A8754 80112054 24020002 */ addiu $v0, $zero, 2 -.L80112058: -/* A8758 80112058 8FBF0018 */ lw $ra, 0x18($sp) -/* A875C 8011205C 8FB10014 */ lw $s1, 0x14($sp) -/* A8760 80112060 8FB00010 */ lw $s0, 0x10($sp) -/* A8764 80112064 03E00008 */ jr $ra -/* A8768 80112068 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignBlockFlag.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignBlockFlag.s deleted file mode 100644 index 55e1939782..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignBlockFlag.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel AssignBlockFlag -/* A876C 8011206C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8770 80112070 24020001 */ addiu $v0, $zero, 1 -/* A8774 80112074 AFBF0014 */ sw $ra, 0x14($sp) -/* A8778 80112078 AFB00010 */ sw $s0, 0x10($sp) -/* A877C 8011207C 14A2000A */ bne $a1, $v0, .L801120A8 -/* A8780 80112080 8C83000C */ lw $v1, 0xc($a0) -/* A8784 80112084 0C0B1F6A */ jal evt_get_variable_index -/* A8788 80112088 8C650000 */ lw $a1, ($v1) -/* A878C 8011208C 3C048015 */ lui $a0, %hi(gLastCreatedEntityIndex) -/* A8790 80112090 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) -/* A8794 80112094 0C04417A */ jal get_entity_by_index -/* A8798 80112098 0040802D */ daddu $s0, $v0, $zero -/* A879C 8011209C 8C430040 */ lw $v1, 0x40($v0) -/* A87A0 801120A0 24020002 */ addiu $v0, $zero, 2 -/* A87A4 801120A4 A470000A */ sh $s0, 0xa($v1) -.L801120A8: -/* A87A8 801120A8 8FBF0014 */ lw $ra, 0x14($sp) -/* A87AC 801120AC 8FB00010 */ lw $s0, 0x10($sp) -/* A87B0 801120B0 03E00008 */ jr $ra -/* A87B4 801120B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignCrateFlag.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignCrateFlag.s deleted file mode 100644 index bd389918f6..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignCrateFlag.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel AssignCrateFlag -/* A8870 80112170 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8874 80112174 AFB10014 */ sw $s1, 0x14($sp) -/* A8878 80112178 0080882D */ daddu $s1, $a0, $zero -/* A887C 8011217C 24020001 */ addiu $v0, $zero, 1 -/* A8880 80112180 AFBF0018 */ sw $ra, 0x18($sp) -/* A8884 80112184 AFB00010 */ sw $s0, 0x10($sp) -/* A8888 80112188 14A2000B */ bne $a1, $v0, .L801121B8 -/* A888C 8011218C 8E30000C */ lw $s0, 0xc($s1) -/* A8890 80112190 3C048015 */ lui $a0, %hi(gLastCreatedEntityIndex) -/* A8894 80112194 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) -/* A8898 80112198 0C04417A */ jal get_entity_by_index -/* A889C 8011219C 00000000 */ nop -/* A88A0 801121A0 8E050000 */ lw $a1, ($s0) -/* A88A4 801121A4 8C500040 */ lw $s0, 0x40($v0) -/* A88A8 801121A8 0C0B1F6A */ jal evt_get_variable_index -/* A88AC 801121AC 0220202D */ daddu $a0, $s1, $zero -/* A88B0 801121B0 A6020004 */ sh $v0, 4($s0) -/* A88B4 801121B4 24020002 */ addiu $v0, $zero, 2 -.L801121B8: -/* A88B8 801121B8 8FBF0018 */ lw $ra, 0x18($sp) -/* A88BC 801121BC 8FB10014 */ lw $s1, 0x14($sp) -/* A88C0 801121C0 8FB00010 */ lw $s0, 0x10($sp) -/* A88C4 801121C4 03E00008 */ jr $ra -/* A88C8 801121C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignPanelFlag.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignPanelFlag.s deleted file mode 100644 index 6c187ff78e..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignPanelFlag.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel AssignPanelFlag -/* A8814 80112114 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8818 80112118 AFB10014 */ sw $s1, 0x14($sp) -/* A881C 8011211C 0080882D */ daddu $s1, $a0, $zero -/* A8820 80112120 24020001 */ addiu $v0, $zero, 1 -/* A8824 80112124 AFBF0018 */ sw $ra, 0x18($sp) -/* A8828 80112128 AFB00010 */ sw $s0, 0x10($sp) -/* A882C 8011212C 14A2000B */ bne $a1, $v0, .L8011215C -/* A8830 80112130 8E30000C */ lw $s0, 0xc($s1) -/* A8834 80112134 3C048015 */ lui $a0, %hi(gLastCreatedEntityIndex) -/* A8838 80112138 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) -/* A883C 8011213C 0C04417A */ jal get_entity_by_index -/* A8840 80112140 00000000 */ nop -/* A8844 80112144 8E050000 */ lw $a1, ($s0) -/* A8848 80112148 8C500040 */ lw $s0, 0x40($v0) -/* A884C 8011214C 0C0B1F6A */ jal evt_get_variable_index -/* A8850 80112150 0220202D */ daddu $a0, $s1, $zero -/* A8854 80112154 A6020006 */ sh $v0, 6($s0) -/* A8858 80112158 24020002 */ addiu $v0, $zero, 2 -.L8011215C: -/* A885C 8011215C 8FBF0018 */ lw $ra, 0x18($sp) -/* A8860 80112160 8FB10014 */ lw $s1, 0x14($sp) -/* A8864 80112164 8FB00010 */ lw $s0, 0x10($sp) -/* A8868 80112168 03E00008 */ jr $ra -/* A886C 8011216C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/MakeEntity.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/MakeEntity.s deleted file mode 100644 index 1c0520a939..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/MakeEntity.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel MakeEntity -/* A8438 80111D38 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A843C 80111D3C AFB20030 */ sw $s2, 0x30($sp) -/* A8440 80111D40 0080902D */ daddu $s2, $a0, $zero -/* A8444 80111D44 24020001 */ addiu $v0, $zero, 1 -/* A8448 80111D48 AFBF004C */ sw $ra, 0x4c($sp) -/* A844C 80111D4C AFBE0048 */ sw $fp, 0x48($sp) -/* A8450 80111D50 AFB70044 */ sw $s7, 0x44($sp) -/* A8454 80111D54 AFB60040 */ sw $s6, 0x40($sp) -/* A8458 80111D58 AFB5003C */ sw $s5, 0x3c($sp) -/* A845C 80111D5C AFB40038 */ sw $s4, 0x38($sp) -/* A8460 80111D60 AFB30034 */ sw $s3, 0x34($sp) -/* A8464 80111D64 AFB1002C */ sw $s1, 0x2c($sp) -/* A8468 80111D68 AFB00028 */ sw $s0, 0x28($sp) -/* A846C 80111D6C 8E50000C */ lw $s0, 0xc($s2) -/* A8470 80111D70 14A2003E */ bne $a1, $v0, .L80111E6C -/* A8474 80111D74 24020002 */ addiu $v0, $zero, 2 -/* A8478 80111D78 8E050000 */ lw $a1, ($s0) -/* A847C 80111D7C 26100004 */ addiu $s0, $s0, 4 -/* A8480 80111D80 0240202D */ daddu $a0, $s2, $zero -/* A8484 80111D84 3C118016 */ lui $s1, %hi(D_8015C7D8) -/* A8488 80111D88 2631C7D8 */ addiu $s1, $s1, %lo(D_8015C7D8) -/* A848C 80111D8C 0C0B1EAF */ jal evt_get_variable -/* A8490 80111D90 3C148000 */ lui $s4, 0x8000 -/* A8494 80111D94 8E050000 */ lw $a1, ($s0) -/* A8498 80111D98 26100004 */ addiu $s0, $s0, 4 -/* A849C 80111D9C 0240202D */ daddu $a0, $s2, $zero -/* A84A0 80111DA0 0C0B1EAF */ jal evt_get_variable -/* A84A4 80111DA4 0040F02D */ daddu $fp, $v0, $zero -/* A84A8 80111DA8 8E050000 */ lw $a1, ($s0) -/* A84AC 80111DAC 26100004 */ addiu $s0, $s0, 4 -/* A84B0 80111DB0 0240202D */ daddu $a0, $s2, $zero -/* A84B4 80111DB4 0C0B1EAF */ jal evt_get_variable -/* A84B8 80111DB8 0040B02D */ daddu $s6, $v0, $zero -/* A84BC 80111DBC 8E050000 */ lw $a1, ($s0) -/* A84C0 80111DC0 26100004 */ addiu $s0, $s0, 4 -/* A84C4 80111DC4 0240202D */ daddu $a0, $s2, $zero -/* A84C8 80111DC8 0C0B1EAF */ jal evt_get_variable -/* A84CC 80111DCC 0040B82D */ daddu $s7, $v0, $zero -/* A84D0 80111DD0 8E050000 */ lw $a1, ($s0) -/* A84D4 80111DD4 26100004 */ addiu $s0, $s0, 4 -/* A84D8 80111DD8 0240202D */ daddu $a0, $s2, $zero -/* A84DC 80111DDC 0C0B1EAF */ jal evt_get_variable -/* A84E0 80111DE0 0040A82D */ daddu $s5, $v0, $zero -/* A84E4 80111DE4 0040982D */ daddu $s3, $v0, $zero -/* A84E8 80111DE8 AE200000 */ sw $zero, ($s1) -/* A84EC 80111DEC 2631FFFC */ addiu $s1, $s1, -4 -/* A84F0 80111DF0 AE200000 */ sw $zero, ($s1) -/* A84F4 80111DF4 2631FFFC */ addiu $s1, $s1, -4 -/* A84F8 80111DF8 AE200000 */ sw $zero, ($s1) -.L80111DFC: -/* A84FC 80111DFC 8E050000 */ lw $a1, ($s0) -/* A8500 80111E00 26100004 */ addiu $s0, $s0, 4 -/* A8504 80111E04 0C0B1EAF */ jal evt_get_variable -/* A8508 80111E08 0240202D */ daddu $a0, $s2, $zero -/* A850C 80111E0C 10540004 */ beq $v0, $s4, .L80111E20 -/* A8510 80111E10 03C0202D */ daddu $a0, $fp, $zero -/* A8514 80111E14 AE220000 */ sw $v0, ($s1) -/* A8518 80111E18 0804477F */ j .L80111DFC -/* A851C 80111E1C 26310004 */ addiu $s1, $s1, 4 -.L80111E20: -/* A8520 80111E20 3C028016 */ lui $v0, %hi(D_8015C7D0) -/* A8524 80111E24 2442C7D0 */ addiu $v0, $v0, %lo(D_8015C7D0) -/* A8528 80111E28 02C0282D */ daddu $a1, $s6, $zero -/* A852C 80111E2C 8C430000 */ lw $v1, ($v0) -/* A8530 80111E30 8C460004 */ lw $a2, 4($v0) -/* A8534 80111E34 8C420008 */ lw $v0, 8($v0) -/* A8538 80111E38 02A0382D */ daddu $a3, $s5, $zero -/* A853C 80111E3C AFB30010 */ sw $s3, 0x10($sp) -/* A8540 80111E40 AFB40020 */ sw $s4, 0x20($sp) -/* A8544 80111E44 AFA60018 */ sw $a2, 0x18($sp) -/* A8548 80111E48 02E0302D */ daddu $a2, $s7, $zero -/* A854C 80111E4C AFA30014 */ sw $v1, 0x14($sp) -/* A8550 80111E50 0C044631 */ jal create_entity -/* A8554 80111E54 AFA2001C */ sw $v0, 0x1c($sp) -/* A8558 80111E58 0040182D */ daddu $v1, $v0, $zero -/* A855C 80111E5C 24020002 */ addiu $v0, $zero, 2 -/* A8560 80111E60 3C018015 */ lui $at, %hi(gLastCreatedEntityIndex) -/* A8564 80111E64 AC2312EC */ sw $v1, %lo(gLastCreatedEntityIndex)($at) -/* A8568 80111E68 AE430084 */ sw $v1, 0x84($s2) -.L80111E6C: -/* A856C 80111E6C 8FBF004C */ lw $ra, 0x4c($sp) -/* A8570 80111E70 8FBE0048 */ lw $fp, 0x48($sp) -/* A8574 80111E74 8FB70044 */ lw $s7, 0x44($sp) -/* A8578 80111E78 8FB60040 */ lw $s6, 0x40($sp) -/* A857C 80111E7C 8FB5003C */ lw $s5, 0x3c($sp) -/* A8580 80111E80 8FB40038 */ lw $s4, 0x38($sp) -/* A8584 80111E84 8FB30034 */ lw $s3, 0x34($sp) -/* A8588 80111E88 8FB20030 */ lw $s2, 0x30($sp) -/* A858C 80111E8C 8FB1002C */ lw $s1, 0x2c($sp) -/* A8590 80111E90 8FB00028 */ lw $s0, 0x28($sp) -/* A8594 80111E94 03E00008 */ jr $ra -/* A8598 80111E98 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/_load_model_textures.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/_load_model_textures.s index 8c42a08136..9465c82f4d 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/_load_model_textures.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/_load_model_textures.s @@ -48,8 +48,8 @@ glabel _load_model_textures /* AC2E8 80115BE8 0C04535B */ jal load_tile_header /* AC2EC 80115BEC 0280302D */ daddu $a2, $s4, $zero .L80115BF0: -/* AC2F0 80115BF0 3C038015 */ lui $v1, %hi(D_80153224) -/* AC2F4 80115BF4 24633224 */ addiu $v1, $v1, %lo(D_80153224) +/* AC2F0 80115BF0 3C038015 */ lui $v1, %hi(mdl_treeIterPos) +/* AC2F4 80115BF4 24633224 */ addiu $v1, $v1, %lo(mdl_treeIterPos) /* AC2F8 80115BF8 8C620000 */ lw $v0, ($v1) /* AC2FC 80115BFC 24420001 */ addiu $v0, $v0, 1 /* AC300 80115C00 AC620000 */ sw $v0, ($v1) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/appendGfx_model.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/appendGfx_model.s index 16246de599..a09398a90a 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/appendGfx_model.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/appendGfx_model.s @@ -54,8 +54,8 @@ glabel appendGfx_model /* A97E4 801130E4 AFAF0028 */ sw $t7, 0x28($sp) /* A97E8 801130E8 92C300A8 */ lbu $v1, 0xa8($s6) /* A97EC 801130EC 82C200A9 */ lb $v0, 0xa9($s6) -/* A97F0 801130F0 3C048016 */ lui $a0, %hi(D_8015A590) -/* A97F4 801130F4 2484A590 */ addiu $a0, $a0, %lo(D_8015A590) +/* A97F0 801130F0 3C048016 */ lui $a0, %hi(mdl_textureHandles) +/* A97F4 801130F4 2484A590 */ addiu $a0, $a0, %lo(mdl_textureHandles) /* A97F8 801130F8 00621821 */ addu $v1, $v1, $v0 /* A97FC 801130FC 00031100 */ sll $v0, $v1, 4 /* A9800 80113100 00431021 */ addu $v0, $v0, $v1 @@ -89,8 +89,8 @@ glabel appendGfx_model /* A9860 80113160 1040000B */ beqz $v0, .L80113190 /* A9864 80113164 00000000 */ nop .L80113168: -/* A9868 80113168 3C028015 */ lui $v0, %hi(wFog) -/* A986C 8011316C 8C423264 */ lw $v0, %lo(wFog)($v0) +/* A9868 80113168 3C028015 */ lui $v0, %hi(gCurrentFogSettings) +/* A986C 8011316C 8C423264 */ lw $v0, %lo(gCurrentFogSettings)($v0) /* A9870 80113170 8C420000 */ lw $v0, ($v0) /* A9874 80113174 10400006 */ beqz $v0, .L80113190 /* A9878 80113178 33020040 */ andi $v0, $t8, 0x40 @@ -127,10 +127,10 @@ glabel appendGfx_model /* A98E4 801131E4 28420011 */ slti $v0, $v0, 0x11 /* A98E8 801131E8 1040007A */ beqz $v0, .L801133D4 /* A98EC 801131EC 3C070001 */ lui $a3, 1 -/* A98F0 801131F0 3C038015 */ lui $v1, %hi(D_8014B75C) -/* A98F4 801131F4 8C63B75C */ lw $v1, %lo(D_8014B75C)($v1) -/* A98F8 801131F8 3C048015 */ lui $a0, %hi(D_8014B758) -/* A98FC 801131FC 8C84B758 */ lw $a0, %lo(D_8014B758)($a0) +/* A98F0 801131F0 3C038015 */ lui $v1, %hi(mdl_renderModelFogEnd) +/* A98F4 801131F4 8C63B75C */ lw $v1, %lo(mdl_renderModelFogEnd)($v1) +/* A98F8 801131F8 3C048015 */ lui $a0, %hi(mdl_renderModelFogStart) +/* A98FC 801131FC 8C84B758 */ lw $a0, %lo(mdl_renderModelFogStart)($a0) /* A9900 80113200 34E7F400 */ ori $a3, $a3, 0xf400 /* A9904 80113204 00641823 */ subu $v1, $v1, $a0 /* A9908 80113208 14600002 */ bnez $v1, .L80113214 @@ -170,18 +170,18 @@ glabel appendGfx_model /* A9980 80113280 0040302D */ daddu $a2, $v0, $zero /* A9984 80113284 3C02FA00 */ lui $v0, 0xfa00 /* A9988 80113288 AD020000 */ sw $v0, ($t0) -/* A998C 8011328C 3C028015 */ lui $v0, %hi(D_8014B750) -/* A9990 80113290 9042B750 */ lbu $v0, %lo(D_8014B750)($v0) -/* A9994 80113294 3C038015 */ lui $v1, %hi(D_8014B751) -/* A9998 80113298 9063B751 */ lbu $v1, %lo(D_8014B751)($v1) -/* A999C 8011329C 3C048015 */ lui $a0, %hi(D_8014B752) -/* A99A0 801132A0 9084B752 */ lbu $a0, %lo(D_8014B752)($a0) +/* A998C 8011328C 3C028015 */ lui $v0, %hi(mdl_renderModelFogPrimColorR) +/* A9990 80113290 9042B750 */ lbu $v0, %lo(mdl_renderModelFogPrimColorR)($v0) +/* A9994 80113294 3C038015 */ lui $v1, %hi(mdl_renderModelFogPrimColorG) +/* A9998 80113298 9063B751 */ lbu $v1, %lo(mdl_renderModelFogPrimColorG)($v1) +/* A999C 8011329C 3C048015 */ lui $a0, %hi(mdl_renderModelFogPrimColorB) +/* A99A0 801132A0 9084B752 */ lbu $a0, %lo(mdl_renderModelFogPrimColorB)($a0) /* A99A4 801132A4 00021600 */ sll $v0, $v0, 0x18 /* A99A8 801132A8 00031C00 */ sll $v1, $v1, 0x10 /* A99AC 801132AC 00431025 */ or $v0, $v0, $v1 /* A99B0 801132B0 00042200 */ sll $a0, $a0, 8 -/* A99B4 801132B4 3C038015 */ lui $v1, %hi(D_8014B753) -/* A99B8 801132B8 9063B753 */ lbu $v1, %lo(D_8014B753)($v1) +/* A99B4 801132B4 3C038015 */ lui $v1, %hi(mdl_renderModelFogPrimColorA) +/* A99B8 801132B8 9063B753 */ lbu $v1, %lo(mdl_renderModelFogPrimColorA)($v1) /* A99BC 801132BC 00441025 */ or $v0, $v0, $a0 /* A99C0 801132C0 00431025 */ or $v0, $v0, $v1 /* A99C4 801132C4 AD020004 */ sw $v0, 4($t0) @@ -190,12 +190,12 @@ glabel appendGfx_model /* A99D0 801132D0 3C02F800 */ lui $v0, 0xf800 /* A99D4 801132D4 AE060000 */ sw $a2, ($s0) /* A99D8 801132D8 AD020000 */ sw $v0, ($t0) -/* A99DC 801132DC 3C028015 */ lui $v0, %hi(D_8014B754) -/* A99E0 801132E0 9042B754 */ lbu $v0, %lo(D_8014B754)($v0) -/* A99E4 801132E4 3C048015 */ lui $a0, %hi(D_8014B755) -/* A99E8 801132E8 9084B755 */ lbu $a0, %lo(D_8014B755)($a0) -/* A99EC 801132EC 3C038015 */ lui $v1, %hi(D_8014B756) -/* A99F0 801132F0 9063B756 */ lbu $v1, %lo(D_8014B756)($v1) +/* A99DC 801132DC 3C028015 */ lui $v0, %hi(mdl_renderModelFogColorR) +/* A99E0 801132E0 9042B754 */ lbu $v0, %lo(mdl_renderModelFogColorR)($v0) +/* A99E4 801132E4 3C048015 */ lui $a0, %hi(mdl_renderModelFogColorG) +/* A99E8 801132E8 9084B755 */ lbu $a0, %lo(mdl_renderModelFogColorG)($a0) +/* A99EC 801132EC 3C038015 */ lui $v1, %hi(mdl_renderModelFogColorB) +/* A99F0 801132F0 9063B756 */ lbu $v1, %lo(mdl_renderModelFogColorB)($v1) /* A99F4 801132F4 00021600 */ sll $v0, $v0, 0x18 /* A99F8 801132F8 00042400 */ sll $a0, $a0, 0x10 /* A99FC 801132FC 00441025 */ or $v0, $v0, $a0 @@ -222,12 +222,12 @@ glabel appendGfx_model /* A9A4C 8011334C 0040282D */ daddu $a1, $v0, $zero /* A9A50 80113350 3C02FA00 */ lui $v0, 0xfa00 /* A9A54 80113354 ACC20000 */ sw $v0, ($a2) -/* A9A58 80113358 3C028015 */ lui $v0, %hi(D_8014B760) -/* A9A5C 8011335C 9042B760 */ lbu $v0, %lo(D_8014B760)($v0) -/* A9A60 80113360 3C048015 */ lui $a0, %hi(D_8014B761) -/* A9A64 80113364 9084B761 */ lbu $a0, %lo(D_8014B761)($a0) -/* A9A68 80113368 3C038015 */ lui $v1, %hi(D_8014B762) -/* A9A6C 8011336C 9063B762 */ lbu $v1, %lo(D_8014B762)($v1) +/* A9A58 80113358 3C028015 */ lui $v0, %hi(gRenderModelPrimR) +/* A9A5C 8011335C 9042B760 */ lbu $v0, %lo(gRenderModelPrimR)($v0) +/* A9A60 80113360 3C048015 */ lui $a0, %hi(gRenderModelPrimG) +/* A9A64 80113364 9084B761 */ lbu $a0, %lo(gRenderModelPrimG)($a0) +/* A9A68 80113368 3C038015 */ lui $v1, %hi(gRenderModelPrimB) +/* A9A6C 8011336C 9063B762 */ lbu $v1, %lo(gRenderModelPrimB)($v1) /* A9A70 80113370 00021600 */ sll $v0, $v0, 0x18 /* A9A74 80113374 00042400 */ sll $a0, $a0, 0x10 /* A9A78 80113378 00441025 */ or $v0, $v0, $a0 @@ -240,12 +240,12 @@ glabel appendGfx_model /* A9A94 80113394 3C02FB00 */ lui $v0, 0xfb00 /* A9A98 80113398 AE050000 */ sw $a1, ($s0) /* A9A9C 8011339C ACC20000 */ sw $v0, ($a2) -/* A9AA0 801133A0 3C028015 */ lui $v0, %hi(D_8014B763) -/* A9AA4 801133A4 9042B763 */ lbu $v0, %lo(D_8014B763)($v0) -/* A9AA8 801133A8 3C048015 */ lui $a0, %hi(D_8014B764) -/* A9AAC 801133AC 9084B764 */ lbu $a0, %lo(D_8014B764)($a0) -/* A9AB0 801133B0 3C038015 */ lui $v1, %hi(D_8014B765) -/* A9AB4 801133B4 9063B765 */ lbu $v1, %lo(D_8014B765)($v1) +/* A9AA0 801133A0 3C028015 */ lui $v0, %hi(gRenderModelEnvR) +/* A9AA4 801133A4 9042B763 */ lbu $v0, %lo(gRenderModelEnvR)($v0) +/* A9AA8 801133A8 3C048015 */ lui $a0, %hi(gRenderModelEnvG) +/* A9AAC 801133AC 9084B764 */ lbu $a0, %lo(gRenderModelEnvG)($a0) +/* A9AB0 801133B0 3C038015 */ lui $v1, %hi(gRenderModelEnvB) +/* A9AB4 801133B4 9063B765 */ lbu $v1, %lo(gRenderModelEnvB)($v1) /* A9AB8 801133B8 00021600 */ sll $v0, $v0, 0x18 /* A9ABC 801133BC 00042400 */ sll $a0, $a0, 0x10 /* A9AC0 801133C0 00441025 */ or $v0, $v0, $a0 @@ -1017,8 +1017,8 @@ glabel L80113E48_AA548 /* AA57C 80113E7C 3C018015 */ lui $at, %hi(D_8014AFC0) /* AA580 80113E80 00220821 */ addu $at, $at, $v0 /* AA584 80113E84 8C22AFC0 */ lw $v0, %lo(D_8014AFC0)($at) -/* AA588 80113E88 3C088015 */ lui $t0, %hi(wFog) -/* AA58C 80113E8C 25083264 */ addiu $t0, $t0, %lo(wFog) +/* AA588 80113E88 3C088015 */ lui $t0, %hi(gCurrentFogSettings) +/* AA58C 80113E8C 25083264 */ addiu $t0, $t0, %lo(gCurrentFogSettings) /* AA590 80113E90 AC820004 */ sw $v0, 4($a0) /* AA594 80113E94 8D050000 */ lw $a1, ($t0) /* AA598 80113E98 3C02F800 */ lui $v0, 0xf800 @@ -1077,8 +1077,8 @@ glabel L80113E48_AA548 /* AA65C 80113F5C 080451A4 */ j L80114690_AAD90 /* AA660 80113F60 ACA60004 */ sw $a2, 4($a1) glabel L80113F64_AA664 -/* AA664 80113F64 3C038015 */ lui $v1, %hi(D_8014B74C) -/* AA668 80113F68 9063B74C */ lbu $v1, %lo(D_8014B74C)($v1) +/* AA664 80113F64 3C038015 */ lui $v1, %hi(mdl_bgMultiplyColorA) +/* AA668 80113F68 9063B74C */ lbu $v1, %lo(mdl_bgMultiplyColorA)($v1) /* AA66C 80113F6C 240200FF */ addiu $v0, $zero, 0xff /* AA670 80113F70 106202ED */ beq $v1, $v0, .L80114B28 /* AA674 80113F74 3C02DE00 */ lui $v0, 0xde00 @@ -1286,8 +1286,8 @@ glabel L80114234_AA934 /* AA948 80114248 AE020000 */ sw $v0, ($s0) /* AA94C 8011424C 0040282D */ daddu $a1, $v0, $zero /* AA950 80114250 3C02F800 */ lui $v0, 0xf800 -/* AA954 80114254 3C038015 */ lui $v1, %hi(wFog) -/* AA958 80114258 8C633264 */ lw $v1, %lo(wFog)($v1) +/* AA954 80114254 3C038015 */ lui $v1, %hi(gCurrentFogSettings) +/* AA958 80114258 8C633264 */ lw $v1, %lo(gCurrentFogSettings)($v1) /* AA95C 8011425C 00A0402D */ daddu $t0, $a1, $zero /* AA960 80114260 ACE20000 */ sw $v0, ($a3) /* AA964 80114264 90620007 */ lbu $v0, 7($v1) @@ -1295,8 +1295,8 @@ glabel L80114234_AA934 /* AA96C 8011426C 9066000F */ lbu $a2, 0xf($v1) /* AA970 80114270 24A50008 */ addiu $a1, $a1, 8 /* AA974 80114274 AE050000 */ sw $a1, ($s0) -/* AA978 80114278 3C038015 */ lui $v1, %hi(D_8014B74C) -/* AA97C 8011427C 9063B74C */ lbu $v1, %lo(D_8014B74C)($v1) +/* AA978 80114278 3C038015 */ lui $v1, %hi(mdl_bgMultiplyColorA) +/* AA97C 8011427C 9063B74C */ lbu $v1, %lo(mdl_bgMultiplyColorA)($v1) /* AA980 80114280 00021600 */ sll $v0, $v0, 0x18 /* AA984 80114284 00042400 */ sll $a0, $a0, 0x10 /* AA988 80114288 00441025 */ or $v0, $v0, $a0 @@ -1306,12 +1306,12 @@ glabel L80114234_AA934 /* AA998 80114298 ACE20004 */ sw $v0, 4($a3) /* AA99C 8011429C 3C02F900 */ lui $v0, 0xf900 /* AA9A0 801142A0 AD020000 */ sw $v0, ($t0) -/* AA9A4 801142A4 3C028015 */ lui $v0, %hi(D_8014B74D) -/* AA9A8 801142A8 9042B74D */ lbu $v0, %lo(D_8014B74D)($v0) -/* AA9AC 801142AC 3C048015 */ lui $a0, %hi(D_8014B74E) -/* AA9B0 801142B0 9084B74E */ lbu $a0, %lo(D_8014B74E)($a0) -/* AA9B4 801142B4 3C038015 */ lui $v1, %hi(D_8014B74F) -/* AA9B8 801142B8 9063B74F */ lbu $v1, %lo(D_8014B74F)($v1) +/* AA9A4 801142A4 3C028015 */ lui $v0, %hi(mdl_bgMultiplyColorR) +/* AA9A8 801142A8 9042B74D */ lbu $v0, %lo(mdl_bgMultiplyColorR)($v0) +/* AA9AC 801142AC 3C048015 */ lui $a0, %hi(mdl_bgMultiplyColorG) +/* AA9B0 801142B0 9084B74E */ lbu $a0, %lo(mdl_bgMultiplyColorG)($a0) +/* AA9B4 801142B4 3C038015 */ lui $v1, %hi(mdl_bgMultiplyColorB) +/* AA9B8 801142B8 9063B74F */ lbu $v1, %lo(mdl_bgMultiplyColorB)($v1) /* AA9BC 801142BC 00021600 */ sll $v0, $v0, 0x18 /* AA9C0 801142C0 00042400 */ sll $a0, $a0, 0x10 /* AA9C4 801142C4 00441025 */ or $v0, $v0, $a0 @@ -1394,16 +1394,16 @@ glabel L801143A8_AAAA8 .L801143AC: /* AAAAC 801143AC 3C02DE00 */ lui $v0, 0xde00 /* AAAB0 801143B0 8E0B0000 */ lw $t3, ($s0) -/* AAAB4 801143B4 3C0A8015 */ lui $t2, %hi(wFog) -/* AAAB8 801143B8 8D4A3264 */ lw $t2, %lo(wFog)($t2) +/* AAAB4 801143B4 3C0A8015 */ lui $t2, %hi(gCurrentFogSettings) +/* AAAB8 801143B8 8D4A3264 */ lw $t2, %lo(gCurrentFogSettings)($t2) /* AAABC 801143BC 0160182D */ daddu $v1, $t3, $zero /* AAAC0 801143C0 AC620000 */ sw $v0, ($v1) /* AAAC4 801143C4 00051080 */ sll $v0, $a1, 2 /* AAAC8 801143C8 3C018015 */ lui $at, %hi(D_8014AFC0) /* AAACC 801143CC 00220821 */ addu $at, $at, $v0 /* AAAD0 801143D0 8C22AFC0 */ lw $v0, %lo(D_8014AFC0)($at) -/* AAAD4 801143D4 3C058015 */ lui $a1, %hi(D_8014B74C) -/* AAAD8 801143D8 90A5B74C */ lbu $a1, %lo(D_8014B74C)($a1) +/* AAAD4 801143D4 3C058015 */ lui $a1, %hi(mdl_bgMultiplyColorA) +/* AAAD8 801143D8 90A5B74C */ lbu $a1, %lo(mdl_bgMultiplyColorA)($a1) /* AAADC 801143DC 240700FF */ addiu $a3, $zero, 0xff /* AAAE0 801143E0 AC620004 */ sw $v0, 4($v1) /* AAAE4 801143E4 8D420014 */ lw $v0, 0x14($t2) @@ -1473,8 +1473,8 @@ glabel L801143A8_AAAA8 /* AABD4 801144D4 00000000 */ nop /* AABD8 801144D8 00470018 */ mult $v0, $a3 /* AABDC 801144DC 00001812 */ mflo $v1 -/* AABE0 801144E0 3C028015 */ lui $v0, %hi(D_8014B74D) -/* AABE4 801144E4 9042B74D */ lbu $v0, %lo(D_8014B74D)($v0) +/* AABE0 801144E0 3C028015 */ lui $v0, %hi(mdl_bgMultiplyColorR) +/* AABE4 801144E4 9042B74D */ lbu $v0, %lo(mdl_bgMultiplyColorR)($v0) /* AABE8 801144E8 00450018 */ mult $v0, $a1 /* AABEC 801144EC 00004012 */ mflo $t0 /* AABF0 801144F0 00684021 */ addu $t0, $v1, $t0 @@ -1489,8 +1489,8 @@ glabel L801143A8_AAAA8 /* AAC14 80114514 3C04800A */ lui $a0, %hi(gMasterGfxPos) /* AAC18 80114518 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* AAC1C 8011451C 00008812 */ mflo $s1 -/* AAC20 80114520 3C038015 */ lui $v1, %hi(D_8014B74E) -/* AAC24 80114524 9063B74E */ lbu $v1, %lo(D_8014B74E)($v1) +/* AAC20 80114520 3C038015 */ lui $v1, %hi(mdl_bgMultiplyColorG) +/* AAC24 80114524 9063B74E */ lbu $v1, %lo(mdl_bgMultiplyColorG)($v1) /* AAC28 80114528 8C820000 */ lw $v0, ($a0) /* AAC2C 8011452C 00650018 */ mult $v1, $a1 /* AAC30 80114530 0040582D */ daddu $t3, $v0, $zero @@ -1505,8 +1505,8 @@ glabel L801143A8_AAAA8 /* AAC54 80114554 AD640000 */ sw $a0, ($t3) /* AAC58 80114558 02882021 */ addu $a0, $s4, $t0 /* AAC5C 8011455C 00007012 */ mflo $t6 -/* AAC60 80114560 3C038015 */ lui $v1, %hi(D_8014B74F) -/* AAC64 80114564 9063B74F */ lbu $v1, %lo(D_8014B74F)($v1) +/* AAC60 80114560 3C038015 */ lui $v1, %hi(mdl_bgMultiplyColorB) +/* AAC64 80114564 9063B74F */ lbu $v1, %lo(mdl_bgMultiplyColorB)($v1) /* AAC68 80114568 000421C3 */ sra $a0, $a0, 7 /* AAC6C 8011456C 00650018 */ mult $v1, $a1 /* AAC70 80114570 000847C3 */ sra $t0, $t0, 0x1f @@ -1636,8 +1636,8 @@ glabel L80114690_AAD90 /* AAE2C 8011472C 10400018 */ beqz $v0, .L80114790 /* AAE30 80114730 00000000 */ nop /* AAE34 80114734 92C200A5 */ lbu $v0, 0xa5($s6) -/* AAE38 80114738 3C038015 */ lui $v1, %hi(gCurrentModelSpecialDlsPtr) -/* AAE3C 8011473C 246312E8 */ addiu $v1, $v1, %lo(gCurrentModelSpecialDlsPtr) +/* AAE38 80114738 3C038015 */ lui $v1, %hi(gCurrentCustomModelGfxPtr) +/* AAE3C 8011473C 246312E8 */ addiu $v1, $v1, %lo(gCurrentCustomModelGfxPtr) /* AAE40 80114740 3042000F */ andi $v0, $v0, 0xf /* AAE44 80114744 00021040 */ sll $v0, $v0, 1 /* AAE48 80114748 A7A20036 */ sh $v0, 0x36($sp) @@ -1861,8 +1861,8 @@ glabel L80114690_AAD90 /* AB188 80114A88 10400016 */ beqz $v0, .L80114AE4 /* AB18C 80114A8C 00000000 */ nop /* AB190 80114A90 97B50036 */ lhu $s5, 0x36($sp) -/* AB194 80114A94 3C078015 */ lui $a3, %hi(gCurrentModelSpecialDlsPtr) -/* AB198 80114A98 24E712E8 */ addiu $a3, $a3, %lo(gCurrentModelSpecialDlsPtr) +/* AB194 80114A94 3C078015 */ lui $a3, %hi(gCurrentCustomModelGfxPtr) +/* AB198 80114A98 24E712E8 */ addiu $a3, $a3, %lo(gCurrentCustomModelGfxPtr) /* AB19C 80114A9C 26B50001 */ addiu $s5, $s5, 1 /* AB1A0 80114AA0 A7B50036 */ sh $s5, 0x36($sp) /* AB1A4 80114AA4 32A2FFFF */ andi $v0, $s5, 0xffff diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/appendGfx_model_group.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/appendGfx_model_group.s index c863a9e5a5..258428b78d 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/appendGfx_model_group.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/appendGfx_model_group.s @@ -5,8 +5,8 @@ glabel appendGfx_model_group /* AE394 80117C94 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AE398 80117C98 AFBF0010 */ sw $ra, 0x10($sp) /* AE39C 80117C9C 94820002 */ lhu $v0, 2($a0) -/* AE3A0 80117CA0 3C05800A */ lui $a1, %hi(D_8009A5F4) -/* AE3A4 80117CA4 8CA5A5F4 */ lw $a1, %lo(D_8009A5F4)($a1) +/* AE3A0 80117CA0 3C05800A */ lui $a1, %hi(mdl_currentModelTreeNodeInfo) +/* AE3A4 80117CA4 8CA5A5F4 */ lw $a1, %lo(mdl_currentModelTreeNodeInfo)($a1) /* AE3A8 80117CA8 2443FFFF */ addiu $v1, $v0, -1 /* AE3AC 80117CAC 00021080 */ sll $v0, $v0, 2 /* AE3B0 80117CB0 00451021 */ addu $v0, $v0, $a1 @@ -25,8 +25,8 @@ glabel appendGfx_model_group .L80117CE0: /* AE3E0 80117CE0 24620001 */ addiu $v0, $v1, 1 .L80117CE4: -/* AE3E4 80117CE4 3C018015 */ lui $at, %hi(D_80153224) -/* AE3E8 80117CE8 AC223224 */ sw $v0, %lo(D_80153224)($at) +/* AE3E4 80117CE4 3C018015 */ lui $at, %hi(mdl_treeIterPos) +/* AE3E8 80117CE8 AC223224 */ sw $v0, %lo(mdl_treeIterPos)($at) /* AE3EC 80117CEC 0C045F40 */ jal func_80117D00 /* AE3F0 80117CF0 00000000 */ nop /* AE3F4 80117CF4 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/build_custom_gfx.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/build_custom_gfx.s deleted file mode 100644 index bec5d3172a..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/build_custom_gfx.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel build_custom_gfx -/* B23EC 8011BCEC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B23F0 8011BCF0 AFB10014 */ sw $s1, 0x14($sp) -/* B23F4 8011BCF4 0000882D */ daddu $s1, $zero, $zero -/* B23F8 8011BCF8 AFB50024 */ sw $s5, 0x24($sp) -/* B23FC 8011BCFC 3C158015 */ lui $s5, %hi(gCurrentCustomModelGfxBuilders) -/* B2400 8011BD00 26B512B8 */ addiu $s5, $s5, %lo(gCurrentCustomModelGfxBuilders) -/* B2404 8011BD04 3C02800A */ lui $v0, %hi(gMasterGfxPos) -/* B2408 8011BD08 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) -/* B240C 8011BD0C AFB20018 */ sw $s2, 0x18($sp) -/* B2410 8011BD10 0040902D */ daddu $s2, $v0, $zero -/* B2414 8011BD14 AFBF0028 */ sw $ra, 0x28($sp) -/* B2418 8011BD18 AFB40020 */ sw $s4, 0x20($sp) -/* B241C 8011BD1C AFB3001C */ sw $s3, 0x1c($sp) -/* B2420 8011BD20 AFB00010 */ sw $s0, 0x10($sp) -/* B2424 8011BD24 8E530000 */ lw $s3, ($s2) -/* B2428 8011BD28 3C14DF00 */ lui $s4, 0xdf00 -/* B242C 8011BD2C 26620008 */ addiu $v0, $s3, 8 -/* B2430 8011BD30 AE420000 */ sw $v0, ($s2) -/* B2434 8011BD34 3C02DE01 */ lui $v0, 0xde01 -/* B2438 8011BD38 AE620000 */ sw $v0, ($s3) -/* B243C 8011BD3C AE600004 */ sw $zero, 4($s3) -.L8011BD40: -/* B2440 8011BD40 8EA20000 */ lw $v0, ($s5) -/* B2444 8011BD44 001180C0 */ sll $s0, $s1, 3 -/* B2448 8011BD48 02021021 */ addu $v0, $s0, $v0 -/* B244C 8011BD4C 8C450000 */ lw $a1, ($v0) -/* B2450 8011BD50 10A0000D */ beqz $a1, .L8011BD88 -/* B2454 8011BD54 0220202D */ daddu $a0, $s1, $zero -/* B2458 8011BD58 3C028015 */ lui $v0, %hi(gCurrentModelSpecialDlsPtr) -/* B245C 8011BD5C 8C4212E8 */ lw $v0, %lo(gCurrentModelSpecialDlsPtr)($v0) -/* B2460 8011BD60 8E430000 */ lw $v1, ($s2) -/* B2464 8011BD64 02021021 */ addu $v0, $s0, $v0 -/* B2468 8011BD68 00A0F809 */ jalr $a1 -/* B246C 8011BD6C AC430000 */ sw $v1, ($v0) -/* B2470 8011BD70 8E420000 */ lw $v0, ($s2) -/* B2474 8011BD74 0040182D */ daddu $v1, $v0, $zero -/* B2478 8011BD78 24420008 */ addiu $v0, $v0, 8 -/* B247C 8011BD7C AE420000 */ sw $v0, ($s2) -/* B2480 8011BD80 AC740000 */ sw $s4, ($v1) -/* B2484 8011BD84 AC600004 */ sw $zero, 4($v1) -.L8011BD88: -/* B2488 8011BD88 8EA20000 */ lw $v0, ($s5) -/* B248C 8011BD8C 02021021 */ addu $v0, $s0, $v0 -/* B2490 8011BD90 8C450004 */ lw $a1, 4($v0) -/* B2494 8011BD94 50A0000F */ beql $a1, $zero, .L8011BDD4 -/* B2498 8011BD98 26310001 */ addiu $s1, $s1, 1 -/* B249C 8011BD9C 0220202D */ daddu $a0, $s1, $zero -/* B24A0 8011BDA0 3C028015 */ lui $v0, %hi(gCurrentModelSpecialDlsPtr) -/* B24A4 8011BDA4 8C4212E8 */ lw $v0, %lo(gCurrentModelSpecialDlsPtr)($v0) -/* B24A8 8011BDA8 8E430000 */ lw $v1, ($s2) -/* B24AC 8011BDAC 02021021 */ addu $v0, $s0, $v0 -/* B24B0 8011BDB0 00A0F809 */ jalr $a1 -/* B24B4 8011BDB4 AC430004 */ sw $v1, 4($v0) -/* B24B8 8011BDB8 8E420000 */ lw $v0, ($s2) -/* B24BC 8011BDBC 0040182D */ daddu $v1, $v0, $zero -/* B24C0 8011BDC0 24420008 */ addiu $v0, $v0, 8 -/* B24C4 8011BDC4 AE420000 */ sw $v0, ($s2) -/* B24C8 8011BDC8 AC740000 */ sw $s4, ($v1) -/* B24CC 8011BDCC AC600004 */ sw $zero, 4($v1) -/* B24D0 8011BDD0 26310001 */ addiu $s1, $s1, 1 -.L8011BDD4: -/* B24D4 8011BDD4 2A220010 */ slti $v0, $s1, 0x10 -/* B24D8 8011BDD8 1440FFD9 */ bnez $v0, .L8011BD40 -/* B24DC 8011BDDC 3C02DE01 */ lui $v0, 0xde01 -/* B24E0 8011BDE0 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* B24E4 8011BDE4 8C63A66C */ lw $v1, %lo(gMasterGfxPos)($v1) -/* B24E8 8011BDE8 AE620000 */ sw $v0, ($s3) -/* B24EC 8011BDEC AE630004 */ sw $v1, 4($s3) -/* B24F0 8011BDF0 8FBF0028 */ lw $ra, 0x28($sp) -/* B24F4 8011BDF4 8FB50024 */ lw $s5, 0x24($sp) -/* B24F8 8011BDF8 8FB40020 */ lw $s4, 0x20($sp) -/* B24FC 8011BDFC 8FB3001C */ lw $s3, 0x1c($sp) -/* B2500 8011BE00 8FB20018 */ lw $s2, 0x18($sp) -/* B2504 8011BE04 8FB10014 */ lw $s1, 0x14($sp) -/* B2508 8011BE08 8FB00010 */ lw $s0, 0x10($sp) -/* B250C 8011BE0C 03E00008 */ jr $ra -/* B2510 8011BE10 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/calculate_model_sizes.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/calculate_model_sizes.s deleted file mode 100644 index 873deda24f..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/calculate_model_sizes.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel calculate_model_sizes -/* AC82C 8011612C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AC830 80116130 F7B40020 */ sdc1 $f20, 0x20($sp) -/* AC834 80116134 3C013FE0 */ lui $at, 0x3fe0 -/* AC838 80116138 4481A800 */ mtc1 $at, $f21 -/* AC83C 8011613C 4480A000 */ mtc1 $zero, $f20 -/* AC840 80116140 AFB10014 */ sw $s1, 0x14($sp) -/* AC844 80116144 0000882D */ daddu $s1, $zero, $zero -/* AC848 80116148 AFBF0018 */ sw $ra, 0x18($sp) -/* AC84C 8011614C AFB00010 */ sw $s0, 0x10($sp) -.L80116150: -/* AC850 80116150 3C038015 */ lui $v1, %hi(gCurrentModelListPtr) -/* AC854 80116154 8C6312CC */ lw $v1, %lo(gCurrentModelListPtr)($v1) -/* AC858 80116158 00111080 */ sll $v0, $s1, 2 -/* AC85C 8011615C 00431021 */ addu $v0, $v0, $v1 -/* AC860 80116160 8C500000 */ lw $s0, ($v0) -/* AC864 80116164 52000020 */ beql $s0, $zero, .L801161E8 -/* AC868 80116168 26310001 */ addiu $s1, $s1, 1 -/* AC86C 8011616C 8E040008 */ lw $a0, 8($s0) -/* AC870 80116170 0C0456C3 */ jal get_model_property -/* AC874 80116174 24050061 */ addiu $a1, $zero, 0x61 -/* AC878 80116178 C444002C */ lwc1 $f4, 0x2c($v0) -/* AC87C 8011617C C4400008 */ lwc1 $f0, 8($v0) -/* AC880 80116180 46002101 */ sub.s $f4, $f4, $f0 -/* AC884 80116184 46002121 */ cvt.d.s $f4, $f4 -/* AC888 80116188 46342102 */ mul.d $f4, $f4, $f20 -/* AC88C 8011618C 00000000 */ nop -/* AC890 80116190 C4420038 */ lwc1 $f2, 0x38($v0) -/* AC894 80116194 C4400014 */ lwc1 $f0, 0x14($v0) -/* AC898 80116198 46001081 */ sub.s $f2, $f2, $f0 -/* AC89C 8011619C 460010A1 */ cvt.d.s $f2, $f2 -/* AC8A0 801161A0 46341082 */ mul.d $f2, $f2, $f20 -/* AC8A4 801161A4 00000000 */ nop -/* AC8A8 801161A8 C4460020 */ lwc1 $f6, 0x20($v0) -/* AC8AC 801161AC C4400044 */ lwc1 $f0, 0x44($v0) -/* AC8B0 801161B0 46060001 */ sub.s $f0, $f0, $f6 -/* AC8B4 801161B4 46000021 */ cvt.d.s $f0, $f0 -/* AC8B8 801161B8 46340002 */ mul.d $f0, $f0, $f20 -/* AC8BC 801161BC 00000000 */ nop -/* AC8C0 801161C0 4620220D */ trunc.w.d $f8, $f4 -/* AC8C4 801161C4 E4480004 */ swc1 $f8, 4($v0) -/* AC8C8 801161C8 4620120D */ trunc.w.d $f8, $f2 -/* AC8CC 801161CC E4480010 */ swc1 $f8, 0x10($v0) -/* AC8D0 801161D0 4620020D */ trunc.w.d $f8, $f0 -/* AC8D4 801161D4 E448001C */ swc1 $f8, 0x1c($v0) -/* AC8D8 801161D8 96020000 */ lhu $v0, ($s0) -/* AC8DC 801161DC 34421000 */ ori $v0, $v0, 0x1000 -/* AC8E0 801161E0 A6020000 */ sh $v0, ($s0) -/* AC8E4 801161E4 26310001 */ addiu $s1, $s1, 1 -.L801161E8: -/* AC8E8 801161E8 2A220100 */ slti $v0, $s1, 0x100 -/* AC8EC 801161EC 1440FFD8 */ bnez $v0, .L80116150 -/* AC8F0 801161F0 00000000 */ nop -/* AC8F4 801161F4 8FBF0018 */ lw $ra, 0x18($sp) -/* AC8F8 801161F8 8FB10014 */ lw $s1, 0x14($sp) -/* AC8FC 801161FC 8FB00010 */ lw $s0, 0x10($sp) -/* AC900 80116200 D7B40020 */ ldc1 $f20, 0x20($sp) -/* AC904 80116204 03E00008 */ jr $ra -/* AC908 80116208 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s index 0af0b6c7ee..596ee9d168 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s @@ -42,8 +42,8 @@ glabel clear_entity_data /* A7444 80110D44 80420070 */ lb $v0, 0x70($v0) /* A7448 80110D48 1440000C */ bnez $v0, .L80110D7C /* A744C 80110D4C 24040003 */ addiu $a0, $zero, 3 -/* A7450 80110D50 3C018015 */ lui $at, %hi(D_8015165C) -/* A7454 80110D54 AC20165C */ sw $zero, %lo(D_8015165C)($at) +/* A7450 80110D50 3C018015 */ lui $at, %hi(wStaticEntityDataSize) +/* A7454 80110D54 AC20165C */ sw $zero, %lo(wStaticEntityDataSize)($at) /* A7458 80110D58 2404001D */ addiu $a0, $zero, 0x1d /* A745C 80110D5C 3C028015 */ lui $v0, %hi(D_801516DC) /* A7460 80110D60 244216DC */ addiu $v0, $v0, %lo(D_801516DC) @@ -55,8 +55,8 @@ glabel clear_entity_data /* A7474 80110D74 08044367 */ j .L80110D9C /* A7478 80110D78 00000000 */ nop .L80110D7C: -/* A747C 80110D7C 3C018015 */ lui $at, %hi(D_80151660) -/* A7480 80110D80 AC201660 */ sw $zero, %lo(D_80151660)($at) +/* A747C 80110D7C 3C018015 */ lui $at, %hi(bStaticEntityDataSize) +/* A7480 80110D80 AC201660 */ sw $zero, %lo(bStaticEntityDataSize)($at) /* A7484 80110D84 3C028015 */ lui $v0, %hi(D_801516F4) /* A7488 80110D88 244216F4 */ addiu $v0, $v0, %lo(D_801516F4) .L80110D8C: @@ -74,8 +74,8 @@ glabel clear_entity_data /* A74B4 80110DB4 34637FF0 */ ori $v1, $v1, 0x7ff0 /* A74B8 80110DB8 3C018015 */ lui $at, %hi(D_80151300) /* A74BC 80110DBC AC221300 */ sw $v0, %lo(D_80151300)($at) -/* A74C0 80110DC0 3C018015 */ lui $at, %hi(D_801512C4) -/* A74C4 80110DC4 AC2312C4 */ sw $v1, %lo(D_801512C4)($at) +/* A74C0 80110DC0 3C018015 */ lui $at, %hi(gEntityHeapBase) +/* A74C4 80110DC4 AC2312C4 */ sw $v1, %lo(gEntityHeapBase)($at) /* A74C8 80110DC8 0804437B */ j .L80110DEC /* A74CC 80110DCC 00000000 */ nop .L80110DD0: @@ -84,8 +84,8 @@ glabel clear_entity_data /* A74D8 80110DD8 3C018015 */ lui $at, %hi(D_80151300) /* A74DC 80110DDC AC221300 */ sw $v0, %lo(D_80151300)($at) /* A74E0 80110DE0 24423000 */ addiu $v0, $v0, 0x3000 -/* A74E4 80110DE4 3C018015 */ lui $at, %hi(D_801512C4) -/* A74E8 80110DE8 AC2212C4 */ sw $v0, %lo(D_801512C4)($at) +/* A74E4 80110DE4 3C018015 */ lui $at, %hi(gEntityHeapBase) +/* A74E8 80110DE8 AC2212C4 */ sw $v0, %lo(gEntityHeapBase)($at) .L80110DEC: /* A74EC 80110DEC 0C044188 */ jal get_entity_list /* A74F0 80110DF0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_game_modes.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_game_modes.s deleted file mode 100644 index 41f88c30a0..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_game_modes.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel clear_game_modes -/* A9298 80112B98 3C038015 */ lui $v1, %hi(gMainGameState) -/* A929C 80112B9C 24631700 */ addiu $v1, $v1, %lo(gMainGameState) -/* A92A0 80112BA0 24020001 */ addiu $v0, $zero, 1 -.L80112BA4: -/* A92A4 80112BA4 A4600000 */ sh $zero, ($v1) -/* A92A8 80112BA8 2442FFFF */ addiu $v0, $v0, -1 -/* A92AC 80112BAC 0441FFFD */ bgez $v0, .L80112BA4 -/* A92B0 80112BB0 24630018 */ addiu $v1, $v1, 0x18 -/* A92B4 80112BB4 03E00008 */ jr $ra -/* A92B8 80112BB8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_model_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_model_data.s index 2605d439eb..0516dc3b35 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_model_data.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_model_data.s @@ -7,89 +7,89 @@ glabel clear_model_data /* AC44C 80115D4C 80420070 */ lb $v0, 0x70($v0) /* AC450 80115D50 1440002C */ bnez $v0, .L80115E04 /* AC454 80115D54 00000000 */ nop -/* AC458 80115D58 3C028015 */ lui $v0, %hi(gWorldModelList) -/* AC45C 80115D5C 24421770 */ addiu $v0, $v0, %lo(gWorldModelList) -/* AC460 80115D60 3C018015 */ lui $at, %hi(gCurrentModelListPtr) -/* AC464 80115D64 AC2212CC */ sw $v0, %lo(gCurrentModelListPtr)($at) -/* AC468 80115D68 3C028015 */ lui $v0, %hi(D_80151F70) -/* AC46C 80115D6C 24421F70 */ addiu $v0, $v0, %lo(D_80151F70) +/* AC458 80115D58 3C028015 */ lui $v0, %hi(wModelList) +/* AC45C 80115D5C 24421770 */ addiu $v0, $v0, %lo(wModelList) +/* AC460 80115D60 3C018015 */ lui $at, %hi(gCurrentModels) +/* AC464 80115D64 AC2212CC */ sw $v0, %lo(gCurrentModels)($at) +/* AC468 80115D68 3C028015 */ lui $v0, %hi(wTransformGroups) +/* AC46C 80115D6C 24421F70 */ addiu $v0, $v0, %lo(wTransformGroups) /* AC470 80115D70 3C018015 */ lui $at, %hi(gCurrentTransformGroups) /* AC474 80115D74 AC2212E0 */ sw $v0, %lo(gCurrentTransformGroups)($at) -/* AC478 80115D78 3C028015 */ lui $v0, %hi(gWorldModelSpecialDls) -/* AC47C 80115D7C 24421F90 */ addiu $v0, $v0, %lo(gWorldModelSpecialDls) -/* AC480 80115D80 3C018015 */ lui $at, %hi(gCurrentModelSpecialDlsPtr) -/* AC484 80115D84 AC2212E8 */ sw $v0, %lo(gCurrentModelSpecialDlsPtr)($at) -/* AC488 80115D88 3C028015 */ lui $v0, %hi(D_80152090) -/* AC48C 80115D8C 24422090 */ addiu $v0, $v0, %lo(D_80152090) -/* AC490 80115D90 3C018015 */ lui $at, %hi(gCurrentCustomModelGfxBuilders) -/* AC494 80115D94 AC2212B8 */ sw $v0, %lo(gCurrentCustomModelGfxBuilders)($at) +/* AC478 80115D78 3C028015 */ lui $v0, %hi(wModelSpecialDls) +/* AC47C 80115D7C 24421F90 */ addiu $v0, $v0, %lo(wModelSpecialDls) +/* AC480 80115D80 3C018015 */ lui $at, %hi(gCurrentCustomModelGfxPtr) +/* AC484 80115D84 AC2212E8 */ sw $v0, %lo(gCurrentCustomModelGfxPtr)($at) +/* AC488 80115D88 3C028015 */ lui $v0, %hi(wCustomModelGfxBuilders) +/* AC48C 80115D8C 24422090 */ addiu $v0, $v0, %lo(wCustomModelGfxBuilders) +/* AC490 80115D90 3C018015 */ lui $at, %hi(gCurrentCustomModelGfxBuildersPtr) +/* AC494 80115D94 AC2212B8 */ sw $v0, %lo(gCurrentCustomModelGfxBuildersPtr)($at) /* AC498 80115D98 3C028015 */ lui $v0, %hi(D_80152214) /* AC49C 80115D9C 24422214 */ addiu $v0, $v0, %lo(D_80152214) -/* AC4A0 80115DA0 3C018015 */ lui $at, %hi(D_801512FC) -/* AC4A4 80115DA4 AC2212FC */ sw $v0, %lo(D_801512FC)($at) +/* AC4A0 80115DA0 3C018015 */ lui $at, %hi(gCurrentModelTreeRoot) +/* AC4A4 80115DA4 AC2212FC */ sw $v0, %lo(gCurrentModelTreeRoot)($at) /* AC4A8 80115DA8 3C028015 */ lui $v0, %hi(D_80152190) /* AC4AC 80115DAC 24422190 */ addiu $v0, $v0, %lo(D_80152190) -/* AC4B0 80115DB0 3C018015 */ lui $at, %hi(D_80152210) -/* AC4B4 80115DB4 AC222210 */ sw $v0, %lo(D_80152210)($at) +/* AC4B0 80115DB0 3C018015 */ lui $at, %hi(gCurrentModelLocalVtxBuffers) +/* AC4B4 80115DB4 AC222210 */ sw $v0, %lo(gCurrentModelLocalVtxBuffers)($at) /* AC4B8 80115DB8 3C028015 */ lui $v0, %hi(D_80152220) /* AC4BC 80115DBC 24422220 */ addiu $v0, $v0, %lo(D_80152220) -/* AC4C0 80115DC0 3C01800A */ lui $at, %hi(D_8009A5F4) -/* AC4C4 80115DC4 AC22A5F4 */ sw $v0, %lo(D_8009A5F4)($at) -/* AC4C8 80115DC8 3C028015 */ lui $v0, %hi(D_80153220) -/* AC4CC 80115DCC 24423220 */ addiu $v0, $v0, %lo(D_80153220) +/* AC4C0 80115DC0 3C01800A */ lui $at, %hi(mdl_currentModelTreeNodeInfo) +/* AC4C4 80115DC4 AC22A5F4 */ sw $v0, %lo(mdl_currentModelTreeNodeInfo)($at) +/* AC4C8 80115DC8 3C028015 */ lui $v0, %hi(wBgRenderType) +/* AC4CC 80115DCC 24423220 */ addiu $v0, $v0, %lo(wBgRenderType) /* AC4D0 80115DD0 3C018015 */ lui $at, %hi(D_801512F0) /* AC4D4 80115DD4 AC2212F0 */ sw $v0, %lo(D_801512F0)($at) -/* AC4D8 80115DD8 3C028015 */ lui $v0, %hi(D_80153228) -/* AC4DC 80115DDC 24423228 */ addiu $v0, $v0, %lo(D_80153228) -/* AC4E0 80115DE0 3C018015 */ lui $at, %hi(D_8014B74C) -/* AC4E4 80115DE4 A020B74C */ sb $zero, %lo(D_8014B74C)($at) -/* AC4E8 80115DE8 3C018015 */ lui $at, %hi(D_8014B74D) -/* AC4EC 80115DEC A020B74D */ sb $zero, %lo(D_8014B74D)($at) -/* AC4F0 80115DF0 3C018015 */ lui $at, %hi(D_8014B74E) -/* AC4F4 80115DF4 A020B74E */ sb $zero, %lo(D_8014B74E)($at) -/* AC4F8 80115DF8 3C018015 */ lui $at, %hi(D_8014B74F) +/* AC4D8 80115DD8 3C028015 */ lui $v0, %hi(wFogSettings) +/* AC4DC 80115DDC 24423228 */ addiu $v0, $v0, %lo(wFogSettings) +/* AC4E0 80115DE0 3C018015 */ lui $at, %hi(mdl_bgMultiplyColorA) +/* AC4E4 80115DE4 A020B74C */ sb $zero, %lo(mdl_bgMultiplyColorA)($at) +/* AC4E8 80115DE8 3C018015 */ lui $at, %hi(mdl_bgMultiplyColorR) +/* AC4EC 80115DEC A020B74D */ sb $zero, %lo(mdl_bgMultiplyColorR)($at) +/* AC4F0 80115DF0 3C018015 */ lui $at, %hi(mdl_bgMultiplyColorG) +/* AC4F4 80115DF4 A020B74E */ sb $zero, %lo(mdl_bgMultiplyColorG)($at) +/* AC4F8 80115DF8 3C018015 */ lui $at, %hi(mdl_bgMultiplyColorB) /* AC4FC 80115DFC 080457A3 */ j .L80115E8C -/* AC500 80115E00 A020B74F */ sb $zero, %lo(D_8014B74F)($at) +/* AC500 80115E00 A020B74F */ sb $zero, %lo(mdl_bgMultiplyColorB)($at) .L80115E04: -/* AC504 80115E04 3C028015 */ lui $v0, %hi(gBattleModelList) -/* AC508 80115E08 24421B70 */ addiu $v0, $v0, %lo(gBattleModelList) -/* AC50C 80115E0C 3C018015 */ lui $at, %hi(gCurrentModelListPtr) -/* AC510 80115E10 AC2212CC */ sw $v0, %lo(gCurrentModelListPtr)($at) -/* AC514 80115E14 3C028015 */ lui $v0, %hi(D_80151F80) -/* AC518 80115E18 24421F80 */ addiu $v0, $v0, %lo(D_80151F80) +/* AC504 80115E04 3C028015 */ lui $v0, %hi(bModelList) +/* AC508 80115E08 24421B70 */ addiu $v0, $v0, %lo(bModelList) +/* AC50C 80115E0C 3C018015 */ lui $at, %hi(gCurrentModels) +/* AC510 80115E10 AC2212CC */ sw $v0, %lo(gCurrentModels)($at) +/* AC514 80115E14 3C028015 */ lui $v0, %hi(bTransformGroups) +/* AC518 80115E18 24421F80 */ addiu $v0, $v0, %lo(bTransformGroups) /* AC51C 80115E1C 3C018015 */ lui $at, %hi(gCurrentTransformGroups) /* AC520 80115E20 AC2212E0 */ sw $v0, %lo(gCurrentTransformGroups)($at) -/* AC524 80115E24 3C028015 */ lui $v0, %hi(gBattleModelSpecialDls) -/* AC528 80115E28 24422010 */ addiu $v0, $v0, %lo(gBattleModelSpecialDls) -/* AC52C 80115E2C 3C018015 */ lui $at, %hi(gCurrentModelSpecialDlsPtr) -/* AC530 80115E30 AC2212E8 */ sw $v0, %lo(gCurrentModelSpecialDlsPtr)($at) -/* AC534 80115E34 3C028015 */ lui $v0, %hi(D_80152110) -/* AC538 80115E38 24422110 */ addiu $v0, $v0, %lo(D_80152110) -/* AC53C 80115E3C 3C018015 */ lui $at, %hi(gCurrentCustomModelGfxBuilders) -/* AC540 80115E40 AC2212B8 */ sw $v0, %lo(gCurrentCustomModelGfxBuilders)($at) +/* AC524 80115E24 3C028015 */ lui $v0, %hi(bModelSpecialDls) +/* AC528 80115E28 24422010 */ addiu $v0, $v0, %lo(bModelSpecialDls) +/* AC52C 80115E2C 3C018015 */ lui $at, %hi(gCurrentCustomModelGfxPtr) +/* AC530 80115E30 AC2212E8 */ sw $v0, %lo(gCurrentCustomModelGfxPtr)($at) +/* AC534 80115E34 3C028015 */ lui $v0, %hi(bCustomModelGfxBuilders) +/* AC538 80115E38 24422110 */ addiu $v0, $v0, %lo(bCustomModelGfxBuilders) +/* AC53C 80115E3C 3C018015 */ lui $at, %hi(gCurrentCustomModelGfxBuildersPtr) +/* AC540 80115E40 AC2212B8 */ sw $v0, %lo(gCurrentCustomModelGfxBuildersPtr)($at) /* AC544 80115E44 3C028015 */ lui $v0, %hi(D_80152218) /* AC548 80115E48 24422218 */ addiu $v0, $v0, %lo(D_80152218) -/* AC54C 80115E4C 3C018015 */ lui $at, %hi(D_801512FC) -/* AC550 80115E50 AC2212FC */ sw $v0, %lo(D_801512FC)($at) +/* AC54C 80115E4C 3C018015 */ lui $at, %hi(gCurrentModelTreeRoot) +/* AC550 80115E50 AC2212FC */ sw $v0, %lo(gCurrentModelTreeRoot)($at) /* AC554 80115E54 3C028015 */ lui $v0, %hi(D_801521D0) /* AC558 80115E58 244221D0 */ addiu $v0, $v0, %lo(D_801521D0) -/* AC55C 80115E5C 3C018015 */ lui $at, %hi(D_80152210) -/* AC560 80115E60 AC222210 */ sw $v0, %lo(D_80152210)($at) +/* AC55C 80115E5C 3C018015 */ lui $at, %hi(gCurrentModelLocalVtxBuffers) +/* AC560 80115E60 AC222210 */ sw $v0, %lo(gCurrentModelLocalVtxBuffers)($at) /* AC564 80115E64 3C028015 */ lui $v0, %hi(D_80152A20) /* AC568 80115E68 24422A20 */ addiu $v0, $v0, %lo(D_80152A20) -/* AC56C 80115E6C 3C01800A */ lui $at, %hi(D_8009A5F4) -/* AC570 80115E70 AC22A5F4 */ sw $v0, %lo(D_8009A5F4)($at) -/* AC574 80115E74 3C028015 */ lui $v0, %hi(D_80153221) -/* AC578 80115E78 24423221 */ addiu $v0, $v0, %lo(D_80153221) +/* AC56C 80115E6C 3C01800A */ lui $at, %hi(mdl_currentModelTreeNodeInfo) +/* AC570 80115E70 AC22A5F4 */ sw $v0, %lo(mdl_currentModelTreeNodeInfo)($at) +/* AC574 80115E74 3C028015 */ lui $v0, %hi(bBgRenderType) +/* AC578 80115E78 24423221 */ addiu $v0, $v0, %lo(bBgRenderType) /* AC57C 80115E7C 3C018015 */ lui $at, %hi(D_801512F0) /* AC580 80115E80 AC2212F0 */ sw $v0, %lo(D_801512F0)($at) -/* AC584 80115E84 3C028015 */ lui $v0, %hi(D_80153248) -/* AC588 80115E88 24423248 */ addiu $v0, $v0, %lo(D_80153248) +/* AC584 80115E84 3C028015 */ lui $v0, %hi(bFogSettings) +/* AC588 80115E88 24423248 */ addiu $v0, $v0, %lo(bFogSettings) .L80115E8C: -/* AC58C 80115E8C 3C018015 */ lui $at, %hi(wFog) -/* AC590 80115E90 AC223264 */ sw $v0, %lo(wFog)($at) -/* AC594 80115E94 3C028015 */ lui $v0, %hi(gCurrentModelListPtr) -/* AC598 80115E98 8C4212CC */ lw $v0, %lo(gCurrentModelListPtr)($v0) +/* AC58C 80115E8C 3C018015 */ lui $at, %hi(gCurrentFogSettings) +/* AC590 80115E90 AC223264 */ sw $v0, %lo(gCurrentFogSettings)($at) +/* AC594 80115E94 3C028015 */ lui $v0, %hi(gCurrentModels) +/* AC598 80115E98 8C4212CC */ lw $v0, %lo(gCurrentModels)($v0) /* AC59C 80115E9C 240400FF */ addiu $a0, $zero, 0xff /* AC5A0 80115EA0 244203FC */ addiu $v0, $v0, 0x3fc .L80115EA4: @@ -107,10 +107,10 @@ glabel clear_model_data /* AC5CC 80115ECC 0481FFFD */ bgez $a0, .L80115EC4 /* AC5D0 80115ED0 2442FFFC */ addiu $v0, $v0, -4 /* AC5D4 80115ED4 0000202D */ daddu $a0, $zero, $zero -/* AC5D8 80115ED8 3C058015 */ lui $a1, %hi(gCurrentCustomModelGfxBuilders) -/* AC5DC 80115EDC 8CA512B8 */ lw $a1, %lo(gCurrentCustomModelGfxBuilders)($a1) -/* AC5E0 80115EE0 3C038015 */ lui $v1, %hi(gCurrentModelSpecialDlsPtr) -/* AC5E4 80115EE4 8C6312E8 */ lw $v1, %lo(gCurrentModelSpecialDlsPtr)($v1) +/* AC5D8 80115ED8 3C058015 */ lui $a1, %hi(gCurrentCustomModelGfxBuildersPtr) +/* AC5DC 80115EDC 8CA512B8 */ lw $a1, %lo(gCurrentCustomModelGfxBuildersPtr)($a1) +/* AC5E0 80115EE0 3C038015 */ lui $v1, %hi(gCurrentCustomModelGfxPtr) +/* AC5E4 80115EE4 8C6312E8 */ lw $v1, %lo(gCurrentCustomModelGfxPtr)($v1) .L80115EE8: /* AC5E8 80115EE8 AC600000 */ sw $zero, ($v1) /* AC5EC 80115EEC ACA00000 */ sw $zero, ($a1) @@ -120,10 +120,10 @@ glabel clear_model_data /* AC5FC 80115EFC 1440FFFA */ bnez $v0, .L80115EE8 /* AC600 80115F00 24630004 */ addiu $v1, $v1, 4 /* AC604 80115F04 0000202D */ daddu $a0, $zero, $zero -/* AC608 80115F08 3C05800A */ lui $a1, %hi(D_8009A5F4) -/* AC60C 80115F0C 24A5A5F4 */ addiu $a1, $a1, %lo(D_8009A5F4) -/* AC610 80115F10 3C028015 */ lui $v0, %hi(D_801512FC) -/* AC614 80115F14 8C4212FC */ lw $v0, %lo(D_801512FC)($v0) +/* AC608 80115F08 3C05800A */ lui $a1, %hi(mdl_currentModelTreeNodeInfo) +/* AC60C 80115F0C 24A5A5F4 */ addiu $a1, $a1, %lo(mdl_currentModelTreeNodeInfo) +/* AC610 80115F10 3C028015 */ lui $v0, %hi(gCurrentModelTreeRoot) +/* AC614 80115F14 8C4212FC */ lw $v0, %lo(gCurrentModelTreeRoot)($v0) /* AC618 80115F18 240600FF */ addiu $a2, $zero, 0xff /* AC61C 80115F1C AC400000 */ sw $zero, ($v0) .L80115F20: @@ -152,8 +152,8 @@ glabel clear_model_data /* AC678 80115F78 3C058015 */ lui $a1, %hi(texPannerAuxV) /* AC67C 80115F7C 24A53328 */ addiu $a1, $a1, %lo(texPannerAuxV) /* AC680 80115F80 A0400000 */ sb $zero, ($v0) -/* AC684 80115F84 3C038015 */ lui $v1, %hi(wFog) -/* AC688 80115F88 8C633264 */ lw $v1, %lo(wFog)($v1) +/* AC684 80115F84 3C038015 */ lui $v1, %hi(gCurrentFogSettings) +/* AC688 80115F88 8C633264 */ lw $v1, %lo(gCurrentFogSettings)($v1) /* AC68C 80115F8C 2402000A */ addiu $v0, $zero, 0xa /* AC690 80115F90 AC620004 */ sw $v0, 4($v1) /* AC694 80115F94 AC620008 */ sw $v0, 8($v1) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_render_tasks.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_render_tasks.s deleted file mode 100644 index b9c384a1f7..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_render_tasks.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel clear_render_tasks -/* B3F90 8011D890 24040002 */ addiu $a0, $zero, 2 -/* B3F94 8011D894 3C038015 */ lui $v1, %hi(D_801533A8) -/* B3F98 8011D898 246333A8 */ addiu $v1, $v1, %lo(D_801533A8) -/* B3F9C 8011D89C 3C02802C */ lui $v0, %hi(D_802B9E00) -/* B3FA0 8011D8A0 24429E00 */ addiu $v0, $v0, %lo(D_802B9E00) -.L8011D8A4: -/* B3FA4 8011D8A4 AC620000 */ sw $v0, ($v1) -/* B3FA8 8011D8A8 2463FFFC */ addiu $v1, $v1, -4 -/* B3FAC 8011D8AC 2484FFFF */ addiu $a0, $a0, -1 -/* B3FB0 8011D8B0 0481FFFC */ bgez $a0, .L8011D8A4 -/* B3FB4 8011D8B4 2442F000 */ addiu $v0, $v0, -0x1000 -/* B3FB8 8011D8B8 3C018015 */ lui $at, %hi(D_801533AC) -/* B3FBC 8011D8BC AC2033AC */ sw $zero, %lo(D_801533AC)($at) -/* B3FC0 8011D8C0 3C018015 */ lui $at, %hi(D_801533B0) -/* B3FC4 8011D8C4 AC2033B0 */ sw $zero, %lo(D_801533B0)($at) -/* B3FC8 8011D8C8 03E00008 */ jr $ra -/* B3FCC 8011D8CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_render_tasks_alt.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_render_tasks_alt.s deleted file mode 100644 index 25075c8b13..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_render_tasks_alt.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel clear_render_tasks_alt -/* B3FD0 8011D8D0 24040002 */ addiu $a0, $zero, 2 -/* B3FD4 8011D8D4 3C038015 */ lui $v1, %hi(D_801533A8) -/* B3FD8 8011D8D8 246333A8 */ addiu $v1, $v1, %lo(D_801533A8) -/* B3FDC 8011D8DC 3C02802C */ lui $v0, %hi(D_802B9E00) -/* B3FE0 8011D8E0 24429E00 */ addiu $v0, $v0, %lo(D_802B9E00) -.L8011D8E4: -/* B3FE4 8011D8E4 AC620000 */ sw $v0, ($v1) -/* B3FE8 8011D8E8 2463FFFC */ addiu $v1, $v1, -4 -/* B3FEC 8011D8EC 2484FFFF */ addiu $a0, $a0, -1 -/* B3FF0 8011D8F0 0481FFFC */ bgez $a0, .L8011D8E4 -/* B3FF4 8011D8F4 2442F000 */ addiu $v0, $v0, -0x1000 -/* B3FF8 8011D8F8 3C018015 */ lui $at, %hi(D_801533AC) -/* B3FFC 8011D8FC AC2033AC */ sw $zero, %lo(D_801533AC)($at) -/* B4000 8011D900 3C018015 */ lui $at, %hi(D_801533B0) -/* B4004 8011D904 AC2033B0 */ sw $zero, %lo(D_801533B0)($at) -/* B4008 8011D908 03E00008 */ jr $ra -/* B400C 8011D90C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/create_shadow_from_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/create_shadow_from_data.s deleted file mode 100644 index 28b7d0b6c9..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/create_shadow_from_data.s +++ /dev/null @@ -1,99 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel create_shadow_from_data -/* A82D8 80111BD8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A82DC 80111BDC F7B40020 */ sdc1 $f20, 0x20($sp) -/* A82E0 80111BE0 4485A000 */ mtc1 $a1, $f20 -/* A82E4 80111BE4 F7B60028 */ sdc1 $f22, 0x28($sp) -/* A82E8 80111BE8 4486B000 */ mtc1 $a2, $f22 -/* A82EC 80111BEC F7B80030 */ sdc1 $f24, 0x30($sp) -/* A82F0 80111BF0 4487C000 */ mtc1 $a3, $f24 -/* A82F4 80111BF4 3C038015 */ lui $v1, %hi(gCurrentShadowListPtr) -/* A82F8 80111BF8 8C631658 */ lw $v1, %lo(gCurrentShadowListPtr)($v1) -/* A82FC 80111BFC AFB20018 */ sw $s2, 0x18($sp) -/* A8300 80111C00 0080902D */ daddu $s2, $a0, $zero -/* A8304 80111C04 AFB10014 */ sw $s1, 0x14($sp) -/* A8308 80111C08 0000882D */ daddu $s1, $zero, $zero -/* A830C 80111C0C AFBF001C */ sw $ra, 0x1c($sp) -/* A8310 80111C10 AFB00010 */ sw $s0, 0x10($sp) -.L80111C14: -/* A8314 80111C14 8C620000 */ lw $v0, ($v1) -/* A8318 80111C18 10400006 */ beqz $v0, .L80111C34 -/* A831C 80111C1C 2A22003C */ slti $v0, $s1, 0x3c -/* A8320 80111C20 26310001 */ addiu $s1, $s1, 1 -/* A8324 80111C24 2A22003C */ slti $v0, $s1, 0x3c -/* A8328 80111C28 1440FFFA */ bnez $v0, .L80111C14 -/* A832C 80111C2C 24630004 */ addiu $v1, $v1, 4 -/* A8330 80111C30 2A22003C */ slti $v0, $s1, 0x3c -.L80111C34: -/* A8334 80111C34 14400003 */ bnez $v0, .L80111C44 -/* A8338 80111C38 00000000 */ nop -.L80111C3C: -/* A833C 80111C3C 0804470F */ j .L80111C3C -/* A8340 80111C40 00000000 */ nop -.L80111C44: -/* A8344 80111C44 0C00AB39 */ jal heap_malloc -/* A8348 80111C48 24040078 */ addiu $a0, $zero, 0x78 -/* A834C 80111C4C 0040802D */ daddu $s0, $v0, $zero -/* A8350 80111C50 0200202D */ daddu $a0, $s0, $zero -/* A8354 80111C54 24050078 */ addiu $a1, $zero, 0x78 -/* A8358 80111C58 3C038015 */ lui $v1, %hi(gCurrentShadowListPtr) -/* A835C 80111C5C 8C631658 */ lw $v1, %lo(gCurrentShadowListPtr)($v1) -/* A8360 80111C60 00111080 */ sll $v0, $s1, 2 -/* A8364 80111C64 00431021 */ addu $v0, $v0, $v1 -/* A8368 80111C68 0C00A580 */ jal mem_clear -/* A836C 80111C6C AC500000 */ sw $s0, ($v0) -/* A8370 80111C70 A2110004 */ sb $s1, 4($s0) -/* A8374 80111C74 96430000 */ lhu $v1, ($s2) -/* A8378 80111C78 3C013F80 */ lui $at, 0x3f80 -/* A837C 80111C7C 44810000 */ mtc1 $at, $f0 -/* A8380 80111C80 24020080 */ addiu $v0, $zero, 0x80 -/* A8384 80111C84 A2020005 */ sb $v0, 5($s0) -/* A8388 80111C88 A2020006 */ sb $v0, 6($s0) -/* A838C 80111C8C 3C028000 */ lui $v0, 0x8000 -/* A8390 80111C90 E6140010 */ swc1 $f20, 0x10($s0) -/* A8394 80111C94 E6160014 */ swc1 $f22, 0x14($s0) -/* A8398 80111C98 E6180018 */ swc1 $f24, 0x18($s0) -/* A839C 80111C9C 00621825 */ or $v1, $v1, $v0 -/* A83A0 80111CA0 AE030000 */ sw $v1, ($s0) -/* A83A4 80111CA4 E600001C */ swc1 $f0, 0x1c($s0) -/* A83A8 80111CA8 E6000020 */ swc1 $f0, 0x20($s0) -/* A83AC 80111CAC E6000024 */ swc1 $f0, 0x24($s0) -/* A83B0 80111CB0 8E420008 */ lw $v0, 8($s2) -/* A83B4 80111CB4 1040000C */ beqz $v0, .L80111CE8 -/* A83B8 80111CB8 0060102D */ daddu $v0, $v1, $zero -/* A83BC 80111CBC 34420008 */ ori $v0, $v0, 8 -/* A83C0 80111CC0 AE020000 */ sw $v0, ($s0) -/* A83C4 80111CC4 0C04792E */ jal create_model_animator -/* A83C8 80111CC8 8E440004 */ lw $a0, 4($s2) -/* A83CC 80111CCC A6020008 */ sh $v0, 8($s0) -/* A83D0 80111CD0 00021400 */ sll $v0, $v0, 0x10 -/* A83D4 80111CD4 8E450008 */ lw $a1, 8($s2) -/* A83D8 80111CD8 0C0480EB */ jal load_model_animator_tree -/* A83DC 80111CDC 00022403 */ sra $a0, $v0, 0x10 -/* A83E0 80111CE0 0804473D */ j .L80111CF4 -/* A83E4 80111CE4 00000000 */ nop -.L80111CE8: -/* A83E8 80111CE8 0C048338 */ jal load_entity_model -/* A83EC 80111CEC 8E440004 */ lw $a0, 4($s2) -/* A83F0 80111CF0 A6020008 */ sh $v0, 8($s0) -.L80111CF4: -/* A83F4 80111CF4 8E42000C */ lw $v0, 0xc($s2) -/* A83F8 80111CF8 10400003 */ beqz $v0, .L80111D08 -/* A83FC 80111CFC 00000000 */ nop -/* A8400 80111D00 0040F809 */ jalr $v0 -/* A8404 80111D04 0200202D */ daddu $a0, $s0, $zero -.L80111D08: -/* A8408 80111D08 0C0440DD */ jal update_shadow_transform_matrix -/* A840C 80111D0C 0200202D */ daddu $a0, $s0, $zero -/* A8410 80111D10 92020004 */ lbu $v0, 4($s0) -/* A8414 80111D14 8FBF001C */ lw $ra, 0x1c($sp) -/* A8418 80111D18 8FB20018 */ lw $s2, 0x18($sp) -/* A841C 80111D1C 8FB10014 */ lw $s1, 0x14($sp) -/* A8420 80111D20 8FB00010 */ lw $s0, 0x10($sp) -/* A8424 80111D24 D7B80030 */ ldc1 $f24, 0x30($sp) -/* A8428 80111D28 D7B60028 */ ldc1 $f22, 0x28($sp) -/* A842C 80111D2C D7B40020 */ ldc1 $f20, 0x20($sp) -/* A8430 80111D30 03E00008 */ jr $ra -/* A8434 80111D34 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/disable_transform_group.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/disable_transform_group.s deleted file mode 100644 index 35761fa69d..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/disable_transform_group.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel disable_transform_group -/* B1D60 8011B660 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1D64 8011B664 3084FFFF */ andi $a0, $a0, 0xffff -/* B1D68 8011B668 AFBF0018 */ sw $ra, 0x18($sp) -/* B1D6C 8011B66C AFB10014 */ sw $s1, 0x14($sp) -/* B1D70 8011B670 0C046C24 */ jal get_transform_group_index -/* B1D74 8011B674 AFB00010 */ sw $s0, 0x10($sp) -/* B1D78 8011B678 0C046C70 */ jal get_transform_group -/* B1D7C 8011B67C 0040202D */ daddu $a0, $v0, $zero -/* B1D80 8011B680 0040882D */ daddu $s1, $v0, $zero -/* B1D84 8011B684 9230009C */ lbu $s0, 0x9c($s1) -/* B1D88 8011B688 96220000 */ lhu $v0, ($s1) -/* B1D8C 8011B68C 9223009D */ lbu $v1, 0x9d($s1) -/* B1D90 8011B690 34420004 */ ori $v0, $v0, 4 -/* B1D94 8011B694 0070182A */ slt $v1, $v1, $s0 -/* B1D98 8011B698 14600010 */ bnez $v1, .L8011B6DC -/* B1D9C 8011B69C A6220000 */ sh $v0, ($s1) -.L8011B6A0: -/* B1DA0 8011B6A0 0C046B4C */ jal get_model_from_list_index -/* B1DA4 8011B6A4 0200202D */ daddu $a0, $s0, $zero -/* B1DA8 8011B6A8 0040202D */ daddu $a0, $v0, $zero -/* B1DAC 8011B6AC 94820000 */ lhu $v0, ($a0) -/* B1DB0 8011B6B0 8C830004 */ lw $v1, 4($a0) -/* B1DB4 8011B6B4 3042FFF7 */ andi $v0, $v0, 0xfff7 -/* B1DB8 8011B6B8 10600003 */ beqz $v1, .L8011B6C8 -/* B1DBC 8011B6BC A4820000 */ sh $v0, ($a0) -/* B1DC0 8011B6C0 34421000 */ ori $v0, $v0, 0x1000 -/* B1DC4 8011B6C4 A4820000 */ sh $v0, ($a0) -.L8011B6C8: -/* B1DC8 8011B6C8 9222009D */ lbu $v0, 0x9d($s1) -/* B1DCC 8011B6CC 26100001 */ addiu $s0, $s0, 1 -/* B1DD0 8011B6D0 0050102A */ slt $v0, $v0, $s0 -/* B1DD4 8011B6D4 1040FFF2 */ beqz $v0, .L8011B6A0 -/* B1DD8 8011B6D8 00000000 */ nop -.L8011B6DC: -/* B1DDC 8011B6DC 8FBF0018 */ lw $ra, 0x18($sp) -/* B1DE0 8011B6E0 8FB10014 */ lw $s1, 0x14($sp) -/* B1DE4 8011B6E4 8FB00010 */ lw $s0, 0x10($sp) -/* B1DE8 8011B6E8 03E00008 */ jr $ra -/* B1DEC 8011B6EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/enable_transform_group.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/enable_transform_group.s deleted file mode 100644 index ac84c825eb..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/enable_transform_group.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel enable_transform_group -/* B1CD0 8011B5D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1CD4 8011B5D4 3084FFFF */ andi $a0, $a0, 0xffff -/* B1CD8 8011B5D8 AFBF0018 */ sw $ra, 0x18($sp) -/* B1CDC 8011B5DC AFB10014 */ sw $s1, 0x14($sp) -/* B1CE0 8011B5E0 0C046C24 */ jal get_transform_group_index -/* B1CE4 8011B5E4 AFB00010 */ sw $s0, 0x10($sp) -/* B1CE8 8011B5E8 0C046C70 */ jal get_transform_group -/* B1CEC 8011B5EC 0040202D */ daddu $a0, $v0, $zero -/* B1CF0 8011B5F0 0040882D */ daddu $s1, $v0, $zero -/* B1CF4 8011B5F4 9230009C */ lbu $s0, 0x9c($s1) -/* B1CF8 8011B5F8 96220000 */ lhu $v0, ($s1) -/* B1CFC 8011B5FC 9223009D */ lbu $v1, 0x9d($s1) -/* B1D00 8011B600 3042FFFB */ andi $v0, $v0, 0xfffb -/* B1D04 8011B604 0070182A */ slt $v1, $v1, $s0 -/* B1D08 8011B608 14600010 */ bnez $v1, .L8011B64C -/* B1D0C 8011B60C A6220000 */ sh $v0, ($s1) -.L8011B610: -/* B1D10 8011B610 0C046B4C */ jal get_model_from_list_index -/* B1D14 8011B614 0200202D */ daddu $a0, $s0, $zero -/* B1D18 8011B618 0040202D */ daddu $a0, $v0, $zero -/* B1D1C 8011B61C 94850000 */ lhu $a1, ($a0) -/* B1D20 8011B620 8C830004 */ lw $v1, 4($a0) -/* B1D24 8011B624 34A20008 */ ori $v0, $a1, 8 -/* B1D28 8011B628 10600003 */ beqz $v1, .L8011B638 -/* B1D2C 8011B62C A4820000 */ sh $v0, ($a0) -/* B1D30 8011B630 34A21008 */ ori $v0, $a1, 0x1008 -/* B1D34 8011B634 A4820000 */ sh $v0, ($a0) -.L8011B638: -/* B1D38 8011B638 9222009D */ lbu $v0, 0x9d($s1) -/* B1D3C 8011B63C 26100001 */ addiu $s0, $s0, 1 -/* B1D40 8011B640 0050102A */ slt $v0, $v0, $s0 -/* B1D44 8011B644 1040FFF2 */ beqz $v0, .L8011B610 -/* B1D48 8011B648 00000000 */ nop -.L8011B64C: -/* B1D4C 8011B64C 8FBF0018 */ lw $ra, 0x18($sp) -/* B1D50 8011B650 8FB10014 */ lw $s1, 0x14($sp) -/* B1D54 8011B654 8FB00010 */ lw $s0, 0x10($sp) -/* B1D58 8011B658 03E00008 */ jr $ra -/* B1D5C 8011B65C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_free_static_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_free_static_data.s index 9cc40a811a..a61c8a410e 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_free_static_data.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_free_static_data.s @@ -5,8 +5,8 @@ glabel entity_free_static_data /* A7EDC 801117DC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A7EE0 801117E0 0080382D */ daddu $a3, $a0, $zero /* A7EE4 801117E4 0000182D */ daddu $v1, $zero, $zero -/* A7EE8 801117E8 3C068015 */ lui $a2, %hi(D_80151668) -/* A7EEC 801117EC 24C61668 */ addiu $a2, $a2, %lo(D_80151668) +/* A7EE8 801117E8 3C068015 */ lui $a2, %hi(wStaticEntityData) +/* A7EEC 801117EC 24C61668 */ addiu $a2, $a2, %lo(wStaticEntityData) /* A7EF0 801117F0 00C0282D */ daddu $a1, $a2, $zero /* A7EF4 801117F4 AFBF0018 */ sw $ra, 0x18($sp) /* A7EF8 801117F8 AFB10014 */ sw $s1, 0x14($sp) @@ -53,8 +53,8 @@ glabel entity_free_static_data /* A7F8C 8011188C 00000000 */ nop /* A7F90 80111890 14400007 */ bnez $v0, .L801118B0 /* A7F94 80111894 00000000 */ nop -/* A7F98 80111898 3C038015 */ lui $v1, %hi(D_8015165C) -/* A7F9C 8011189C 2463165C */ addiu $v1, $v1, %lo(D_8015165C) +/* A7F98 80111898 3C038015 */ lui $v1, %hi(wStaticEntityDataSize) +/* A7F9C 8011189C 2463165C */ addiu $v1, $v1, %lo(wStaticEntityDataSize) /* A7FA0 801118A0 8C620000 */ lw $v0, ($v1) /* A7FA4 801118A4 AE200000 */ sw $zero, ($s1) /* A7FA8 801118A8 00501023 */ subu $v0, $v0, $s0 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_raycast_down.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_raycast_down.s deleted file mode 100644 index 8c4ad592a5..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_raycast_down.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_raycast_down -/* A8CE8 801125E8 27BDFF70 */ addiu $sp, $sp, -0x90 -/* A8CEC 801125EC AFBE0078 */ sw $fp, 0x78($sp) -/* A8CF0 801125F0 8FBE00A0 */ lw $fp, 0xa0($sp) -/* A8CF4 801125F4 AFB60070 */ sw $s6, 0x70($sp) -/* A8CF8 801125F8 8FB600A4 */ lw $s6, 0xa4($sp) -/* A8CFC 801125FC 3C0146FF */ lui $at, 0x46ff -/* A8D00 80112600 3421FE00 */ ori $at, $at, 0xfe00 -/* A8D04 80112604 44810000 */ mtc1 $at, $f0 -/* A8D08 80112608 AFB5006C */ sw $s5, 0x6c($sp) -/* A8D0C 8011260C 0080A82D */ daddu $s5, $a0, $zero -/* A8D10 80112610 AFB30064 */ sw $s3, 0x64($sp) -/* A8D14 80112614 00A0982D */ daddu $s3, $a1, $zero -/* A8D18 80112618 AFB40068 */ sw $s4, 0x68($sp) -/* A8D1C 8011261C 00C0A02D */ daddu $s4, $a2, $zero -/* A8D20 80112620 AFB70074 */ sw $s7, 0x74($sp) -/* A8D24 80112624 00E0B82D */ daddu $s7, $a3, $zero -/* A8D28 80112628 AFB1005C */ sw $s1, 0x5c($sp) -/* A8D2C 8011262C 2411FFFF */ addiu $s1, $zero, -1 -/* A8D30 80112630 F7B40080 */ sdc1 $f20, 0x80($sp) -/* A8D34 80112634 4480A000 */ mtc1 $zero, $f20 -/* A8D38 80112638 3C01BF80 */ lui $at, 0xbf80 -/* A8D3C 8011263C 44811000 */ mtc1 $at, $f2 -/* A8D40 80112640 27A20038 */ addiu $v0, $sp, 0x38 -/* A8D44 80112644 AFBF007C */ sw $ra, 0x7c($sp) -/* A8D48 80112648 AFB20060 */ sw $s2, 0x60($sp) -/* A8D4C 8011264C AFB00058 */ sw $s0, 0x58($sp) -/* A8D50 80112650 F7B60088 */ sdc1 $f22, 0x88($sp) -/* A8D54 80112654 E7A00044 */ swc1 $f0, 0x44($sp) -/* A8D58 80112658 E6C00000 */ swc1 $f0, ($s6) -/* A8D5C 8011265C AFA20018 */ sw $v0, 0x18($sp) -/* A8D60 80112660 27A2003C */ addiu $v0, $sp, 0x3c -/* A8D64 80112664 AFA2001C */ sw $v0, 0x1c($sp) -/* A8D68 80112668 27A20040 */ addiu $v0, $sp, 0x40 -/* A8D6C 8011266C AFA20020 */ sw $v0, 0x20($sp) -/* A8D70 80112670 27A20044 */ addiu $v0, $sp, 0x44 -/* A8D74 80112674 AFA20024 */ sw $v0, 0x24($sp) -/* A8D78 80112678 27A20048 */ addiu $v0, $sp, 0x48 -/* A8D7C 8011267C AFA20028 */ sw $v0, 0x28($sp) -/* A8D80 80112680 27A2004C */ addiu $v0, $sp, 0x4c -/* A8D84 80112684 AFA2002C */ sw $v0, 0x2c($sp) -/* A8D88 80112688 27A20050 */ addiu $v0, $sp, 0x50 -/* A8D8C 8011268C E7A20010 */ swc1 $f2, 0x10($sp) -/* A8D90 80112690 E7B40014 */ swc1 $f20, 0x14($sp) -/* A8D94 80112694 AFA20030 */ sw $v0, 0x30($sp) -/* A8D98 80112698 C6AC0000 */ lwc1 $f12, ($s5) -/* A8D9C 8011269C C66E0000 */ lwc1 $f14, ($s3) -/* A8DA0 801126A0 8E860000 */ lw $a2, ($s4) -/* A8DA4 801126A4 4407A000 */ mfc1 $a3, $f20 -/* A8DA8 801126A8 0C017512 */ jal test_ray_entities -/* A8DAC 801126AC 0000902D */ daddu $s2, $zero, $zero -/* A8DB0 801126B0 0040802D */ daddu $s0, $v0, $zero -/* A8DB4 801126B4 06000019 */ bltz $s0, .L8011271C -/* A8DB8 801126B8 00000000 */ nop -/* A8DBC 801126BC 0C0441A9 */ jal get_entity_type -/* A8DC0 801126C0 0200202D */ daddu $a0, $s0, $zero -/* A8DC4 801126C4 2403000C */ addiu $v1, $zero, 0xc -/* A8DC8 801126C8 54430014 */ bnel $v0, $v1, .L8011271C -/* A8DCC 801126CC 36114000 */ ori $s1, $s0, 0x4000 -/* A8DD0 801126D0 C7A00048 */ lwc1 $f0, 0x48($sp) -/* A8DD4 801126D4 46140032 */ c.eq.s $f0, $f20 -/* A8DD8 801126D8 00000000 */ nop -/* A8DDC 801126DC 4500000F */ bc1f .L8011271C -/* A8DE0 801126E0 00000000 */ nop -/* A8DE4 801126E4 C7A00050 */ lwc1 $f0, 0x50($sp) -/* A8DE8 801126E8 46140032 */ c.eq.s $f0, $f20 -/* A8DEC 801126EC 00000000 */ nop -/* A8DF0 801126F0 4500000A */ bc1f .L8011271C -/* A8DF4 801126F4 00000000 */ nop -/* A8DF8 801126F8 C7A0004C */ lwc1 $f0, 0x4c($sp) -/* A8DFC 801126FC 3C013FF0 */ lui $at, 0x3ff0 -/* A8E00 80112700 44811800 */ mtc1 $at, $f3 -/* A8E04 80112704 44801000 */ mtc1 $zero, $f2 -/* A8E08 80112708 46000021 */ cvt.d.s $f0, $f0 -/* A8E0C 8011270C 46220032 */ c.eq.d $f0, $f2 -/* A8E10 80112710 00000000 */ nop -/* A8E14 80112714 45030001 */ bc1tl .L8011271C -/* A8E18 80112718 36114000 */ ori $s1, $s0, 0x4000 -.L8011271C: -/* A8E1C 8011271C 3C01BF80 */ lui $at, 0xbf80 -/* A8E20 80112720 44810000 */ mtc1 $at, $f0 -/* A8E24 80112724 27A20038 */ addiu $v0, $sp, 0x38 -/* A8E28 80112728 AFA2001C */ sw $v0, 0x1c($sp) -/* A8E2C 8011272C 27A2003C */ addiu $v0, $sp, 0x3c -/* A8E30 80112730 AFA20020 */ sw $v0, 0x20($sp) -/* A8E34 80112734 27A20040 */ addiu $v0, $sp, 0x40 -/* A8E38 80112738 AFA20024 */ sw $v0, 0x24($sp) -/* A8E3C 8011273C 27A20044 */ addiu $v0, $sp, 0x44 -/* A8E40 80112740 AFA20028 */ sw $v0, 0x28($sp) -/* A8E44 80112744 27A20048 */ addiu $v0, $sp, 0x48 -/* A8E48 80112748 AFA2002C */ sw $v0, 0x2c($sp) -/* A8E4C 8011274C 27A2004C */ addiu $v0, $sp, 0x4c -/* A8E50 80112750 AFA20030 */ sw $v0, 0x30($sp) -/* A8E54 80112754 27A20050 */ addiu $v0, $sp, 0x50 -/* A8E58 80112758 AFA00010 */ sw $zero, 0x10($sp) -/* A8E5C 8011275C AFA00018 */ sw $zero, 0x18($sp) -/* A8E60 80112760 AFA20034 */ sw $v0, 0x34($sp) -/* A8E64 80112764 E7A00014 */ swc1 $f0, 0x14($sp) -/* A8E68 80112768 8E660000 */ lw $a2, ($s3) -/* A8E6C 8011276C 8E870000 */ lw $a3, ($s4) -/* A8E70 80112770 8EA50000 */ lw $a1, ($s5) -/* A8E74 80112774 0C017334 */ jal test_ray_colliders -/* A8E78 80112778 3C040001 */ lui $a0, 1 -/* A8E7C 8011277C 04430001 */ bgezl $v0, .L80112784 -/* A8E80 80112780 0040882D */ daddu $s1, $v0, $zero -.L80112784: -/* A8E84 80112784 06220025 */ bltzl $s1, .L8011281C -/* A8E88 80112788 AEE00000 */ sw $zero, ($s7) -/* A8E8C 8011278C C7A00044 */ lwc1 $f0, 0x44($sp) -/* A8E90 80112790 3C0142C8 */ lui $at, 0x42c8 -/* A8E94 80112794 4481A000 */ mtc1 $at, $f20 -/* A8E98 80112798 E6C00000 */ swc1 $f0, ($s6) -/* A8E9C 8011279C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* A8EA0 801127A0 E6600000 */ swc1 $f0, ($s3) -/* A8EA4 801127A4 C7A00050 */ lwc1 $f0, 0x50($sp) -/* A8EA8 801127A8 46140002 */ mul.s $f0, $f0, $f20 -/* A8EAC 801127AC 00000000 */ nop -/* A8EB0 801127B0 44060000 */ mfc1 $a2, $f0 -/* A8EB4 801127B4 C7A0004C */ lwc1 $f0, 0x4c($sp) -/* A8EB8 801127B8 46140002 */ mul.s $f0, $f0, $f20 -/* A8EBC 801127BC 00000000 */ nop -/* A8EC0 801127C0 4480B000 */ mtc1 $zero, $f22 -/* A8EC4 801127C4 00000000 */ nop -/* A8EC8 801127C8 4600B306 */ mov.s $f12, $f22 -/* A8ECC 801127CC 44070000 */ mfc1 $a3, $f0 -/* A8ED0 801127D0 0C00A720 */ jal atan2 -/* A8ED4 801127D4 4600B386 */ mov.s $f14, $f22 -/* A8ED8 801127D8 46000007 */ neg.s $f0, $f0 -/* A8EDC 801127DC E6E00000 */ swc1 $f0, ($s7) -/* A8EE0 801127E0 C7A00048 */ lwc1 $f0, 0x48($sp) -/* A8EE4 801127E4 46140002 */ mul.s $f0, $f0, $f20 -/* A8EE8 801127E8 00000000 */ nop -/* A8EEC 801127EC 44060000 */ mfc1 $a2, $f0 -/* A8EF0 801127F0 C7A0004C */ lwc1 $f0, 0x4c($sp) -/* A8EF4 801127F4 46140002 */ mul.s $f0, $f0, $f20 -/* A8EF8 801127F8 00000000 */ nop -/* A8EFC 801127FC 24120001 */ addiu $s2, $zero, 1 -/* A8F00 80112800 4600B306 */ mov.s $f12, $f22 -/* A8F04 80112804 44070000 */ mfc1 $a3, $f0 -/* A8F08 80112808 0C00A720 */ jal atan2 -/* A8F0C 8011280C 46006386 */ mov.s $f14, $f12 -/* A8F10 80112810 46000007 */ neg.s $f0, $f0 -/* A8F14 80112814 08044A08 */ j .L80112820 -/* A8F18 80112818 E7C00000 */ swc1 $f0, ($fp) -.L8011281C: -/* A8F1C 8011281C AFC00000 */ sw $zero, ($fp) -.L80112820: -/* A8F20 80112820 0240102D */ daddu $v0, $s2, $zero -/* A8F24 80112824 8FBF007C */ lw $ra, 0x7c($sp) -/* A8F28 80112828 8FBE0078 */ lw $fp, 0x78($sp) -/* A8F2C 8011282C 8FB70074 */ lw $s7, 0x74($sp) -/* A8F30 80112830 8FB60070 */ lw $s6, 0x70($sp) -/* A8F34 80112834 8FB5006C */ lw $s5, 0x6c($sp) -/* A8F38 80112838 8FB40068 */ lw $s4, 0x68($sp) -/* A8F3C 8011283C 8FB30064 */ lw $s3, 0x64($sp) -/* A8F40 80112840 8FB20060 */ lw $s2, 0x60($sp) -/* A8F44 80112844 8FB1005C */ lw $s1, 0x5c($sp) -/* A8F48 80112848 8FB00058 */ lw $s0, 0x58($sp) -/* A8F4C 8011284C D7B60088 */ ldc1 $f22, 0x88($sp) -/* A8F50 80112850 D7B40080 */ ldc1 $f20, 0x80($sp) -/* A8F54 80112854 03E00008 */ jr $ra -/* A8F58 80112858 27BD0090 */ addiu $sp, $sp, 0x90 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/execute_render_tasks.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/execute_render_tasks.s index 465058055f..63e1d7cd94 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/execute_render_tasks.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/execute_render_tasks.s @@ -3,8 +3,8 @@ glabel execute_render_tasks /* B40B8 8011D9B8 27BDFB88 */ addiu $sp, $sp, -0x478 -/* B40BC 8011D9BC 3C048015 */ lui $a0, %hi(D_801533B0) -/* B40C0 8011D9C0 248433B0 */ addiu $a0, $a0, %lo(D_801533B0) +/* B40BC 8011D9BC 3C048015 */ lui $a0, %hi(mdl_renderTaskCount) +/* B40C0 8011D9C0 248433B0 */ addiu $a0, $a0, %lo(mdl_renderTaskCount) /* B40C4 8011D9C4 AFBF0470 */ sw $ra, 0x470($sp) /* B40C8 8011D9C8 AFB7046C */ sw $s7, 0x46c($sp) /* B40CC 8011D9CC AFB60468 */ sw $s6, 0x468($sp) @@ -29,12 +29,12 @@ glabel execute_render_tasks /* B4114 8011DA14 1440FFFA */ bnez $v0, .L8011DA00 /* B4118 8011DA18 26B50001 */ addiu $s5, $s5, 1 .L8011DA1C: -/* B411C 8011DA1C 3C028015 */ lui $v0, %hi(D_801533AC) -/* B4120 8011DA20 8C4233AC */ lw $v0, %lo(D_801533AC)($v0) +/* B411C 8011DA1C 3C028015 */ lui $v0, %hi(mdl_renderTaskMode) +/* B4120 8011DA20 8C4233AC */ lw $v0, %lo(mdl_renderTaskMode)($v0) /* B4124 8011DA24 00021080 */ sll $v0, $v0, 2 -/* B4128 8011DA28 3C148015 */ lui $s4, %hi(D_801533A0) +/* B4128 8011DA28 3C148015 */ lui $s4, %hi(mdl_renderTaskLists) /* B412C 8011DA2C 0282A021 */ addu $s4, $s4, $v0 -/* B4130 8011DA30 8E9433A0 */ lw $s4, %lo(D_801533A0)($s4) +/* B4130 8011DA30 8E9433A0 */ lw $s4, %lo(mdl_renderTaskLists)($s4) /* B4134 8011DA34 26A2FFFF */ addiu $v0, $s5, -1 /* B4138 8011DA38 1840001F */ blez $v0, .L8011DAB8 /* B413C 8011DA3C 0000982D */ daddu $s3, $zero, $zero @@ -73,12 +73,12 @@ glabel execute_render_tasks /* B41B0 8011DAB0 1440FFE6 */ bnez $v0, .L8011DA4C /* B41B4 8011DAB4 254A0004 */ addiu $t2, $t2, 4 .L8011DAB8: -/* B41B8 8011DAB8 3C028015 */ lui $v0, %hi(D_801533AC) -/* B41BC 8011DABC 8C4233AC */ lw $v0, %lo(D_801533AC)($v0) +/* B41B8 8011DAB8 3C028015 */ lui $v0, %hi(mdl_renderTaskMode) +/* B41BC 8011DABC 8C4233AC */ lw $v0, %lo(mdl_renderTaskMode)($v0) /* B41C0 8011DAC0 00021080 */ sll $v0, $v0, 2 -/* B41C4 8011DAC4 3C148015 */ lui $s4, %hi(D_801533A0) +/* B41C4 8011DAC4 3C148015 */ lui $s4, %hi(mdl_renderTaskLists) /* B41C8 8011DAC8 0282A021 */ addu $s4, $s4, $v0 -/* B41CC 8011DACC 8E9433A0 */ lw $s4, %lo(D_801533A0)($s4) +/* B41CC 8011DACC 8E9433A0 */ lw $s4, %lo(mdl_renderTaskLists)($s4) /* B41D0 8011DAD0 26A2FFFF */ addiu $v0, $s5, -1 /* B41D4 8011DAD4 18400027 */ blez $v0, .L8011DB74 /* B41D8 8011DAD8 0000982D */ daddu $s3, $zero, $zero @@ -126,12 +126,12 @@ glabel execute_render_tasks /* B426C 8011DB6C 1440FFE0 */ bnez $v0, .L8011DAF0 /* B4270 8011DB70 254A0004 */ addiu $t2, $t2, 4 .L8011DB74: -/* B4274 8011DB74 3C028015 */ lui $v0, %hi(D_801533AC) -/* B4278 8011DB78 8C4233AC */ lw $v0, %lo(D_801533AC)($v0) +/* B4274 8011DB74 3C028015 */ lui $v0, %hi(mdl_renderTaskMode) +/* B4278 8011DB78 8C4233AC */ lw $v0, %lo(mdl_renderTaskMode)($v0) /* B427C 8011DB7C 00021080 */ sll $v0, $v0, 2 -/* B4280 8011DB80 3C148015 */ lui $s4, %hi(D_801533A0) +/* B4280 8011DB80 3C148015 */ lui $s4, %hi(mdl_renderTaskLists) /* B4284 8011DB84 0282A021 */ addu $s4, $s4, $v0 -/* B4288 8011DB88 8E9433A0 */ lw $s4, %lo(D_801533A0)($s4) +/* B4288 8011DB88 8E9433A0 */ lw $s4, %lo(mdl_renderTaskLists)($s4) /* B428C 8011DB8C 26A2FFFF */ addiu $v0, $s5, -1 /* B4290 8011DB90 1840002A */ blez $v0, .L8011DC3C /* B4294 8011DB94 0000982D */ daddu $s3, $zero, $zero @@ -182,17 +182,17 @@ glabel execute_render_tasks /* B4334 8011DC34 1440FFDD */ bnez $v0, .L8011DBAC /* B4338 8011DC38 254A0004 */ addiu $t2, $t2, 4 .L8011DC3C: -/* B433C 8011DC3C 3C038015 */ lui $v1, %hi(D_801533AC) -/* B4340 8011DC40 8C6333AC */ lw $v1, %lo(D_801533AC)($v1) +/* B433C 8011DC3C 3C038015 */ lui $v1, %hi(mdl_renderTaskMode) +/* B4340 8011DC40 8C6333AC */ lw $v1, %lo(mdl_renderTaskMode)($v1) /* B4344 8011DC44 3C02800A */ lui $v0, %hi(gOverrideFlags) /* B4348 8011DC48 8C42A650 */ lw $v0, %lo(gOverrideFlags)($v0) /* B434C 8011DC4C 3C018015 */ lui $at, %hi(D_8014B7F0) /* B4350 8011DC50 AC35B7F0 */ sw $s5, %lo(D_8014B7F0)($at) /* B4354 8011DC54 00031880 */ sll $v1, $v1, 2 /* B4358 8011DC58 30420080 */ andi $v0, $v0, 0x80 -/* B435C 8011DC5C 3C148015 */ lui $s4, %hi(D_801533A0) +/* B435C 8011DC5C 3C148015 */ lui $s4, %hi(mdl_renderTaskLists) /* B4360 8011DC60 0283A021 */ addu $s4, $s4, $v1 -/* B4364 8011DC64 8E9433A0 */ lw $s4, %lo(D_801533A0)($s4) +/* B4364 8011DC64 8E9433A0 */ lw $s4, %lo(mdl_renderTaskLists)($s4) /* B4368 8011DC68 10400061 */ beqz $v0, .L8011DDF0 /* B436C 8011DC6C 0000B02D */ daddu $s6, $zero, $zero /* B4370 8011DC70 27B00410 */ addiu $s0, $sp, 0x410 @@ -311,8 +311,8 @@ glabel execute_render_tasks /* B4520 8011DE20 1440FFF6 */ bnez $v0, .L8011DDFC /* B4524 8011DE24 00000000 */ nop .L8011DE28: -/* B4528 8011DE28 3C038015 */ lui $v1, %hi(D_801533AC) -/* B452C 8011DE2C 246333AC */ addiu $v1, $v1, %lo(D_801533AC) +/* B4528 8011DE28 3C038015 */ lui $v1, %hi(mdl_renderTaskMode) +/* B452C 8011DE2C 246333AC */ addiu $v1, $v1, %lo(mdl_renderTaskMode) /* B4530 8011DE30 8C620000 */ lw $v0, ($v1) /* B4534 8011DE34 24420001 */ addiu $v0, $v0, 1 /* B4538 8011DE38 AC620000 */ sw $v0, ($v1) @@ -320,8 +320,8 @@ glabel execute_render_tasks /* B4540 8011DE40 50400001 */ beql $v0, $zero, .L8011DE48 /* B4544 8011DE44 AC600000 */ sw $zero, ($v1) .L8011DE48: -/* B4548 8011DE48 3C018015 */ lui $at, %hi(D_801533B0) -/* B454C 8011DE4C AC2033B0 */ sw $zero, %lo(D_801533B0)($at) +/* B4548 8011DE48 3C018015 */ lui $at, %hi(mdl_renderTaskCount) +/* B454C 8011DE4C AC2033B0 */ sw $zero, %lo(mdl_renderTaskCount)($at) .L8011DE50: /* B4550 8011DE50 8FBF0470 */ lw $ra, 0x470($sp) /* B4554 8011DE54 8FB7046C */ lw $s7, 0x46c($sp) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110E58.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110E58.s index 0b532974e3..7220aeb7d6 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110E58.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110E58.s @@ -14,8 +14,8 @@ glabel func_80110E58 /* A757C 80110E7C 3C028025 */ lui $v0, 0x8025 /* A7580 80110E80 3C018015 */ lui $at, %hi(D_80151300) /* A7584 80110E84 AC221300 */ sw $v0, %lo(D_80151300)($at) -/* A7588 80110E88 3C018015 */ lui $at, %hi(D_801512C4) -/* A758C 80110E8C AC2312C4 */ sw $v1, %lo(D_801512C4)($at) +/* A7588 80110E88 3C018015 */ lui $at, %hi(gEntityHeapBase) +/* A758C 80110E8C AC2312C4 */ sw $v1, %lo(gEntityHeapBase)($at) /* A7590 80110E90 0C0443C4 */ jal func_80110F10 /* A7594 80110E94 00000000 */ nop /* A7598 80110E98 080443B5 */ j .L80110ED4 @@ -33,8 +33,8 @@ glabel func_80110E58 /* A75C0 80110EC0 3C018015 */ lui $at, %hi(D_80151300) /* A75C4 80110EC4 AC221300 */ sw $v0, %lo(D_80151300)($at) /* A75C8 80110EC8 24423000 */ addiu $v0, $v0, 0x3000 -/* A75CC 80110ECC 3C018015 */ lui $at, %hi(D_801512C4) -/* A75D0 80110ED0 AC2212C4 */ sw $v0, %lo(D_801512C4)($at) +/* A75CC 80110ECC 3C018015 */ lui $at, %hi(gEntityHeapBase) +/* A75D0 80110ED0 AC2212C4 */ sw $v0, %lo(gEntityHeapBase)($at) .L80110ED4: /* A75D4 80110ED4 0C044188 */ jal get_entity_list /* A75D8 80110ED8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110F10.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110F10.s index 9174e6cfef..6c396f9a28 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110F10.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110F10.s @@ -11,11 +11,11 @@ glabel func_80110F10 /* A7628 80110F28 3C168015 */ lui $s6, %hi(D_80151300) /* A762C 80110F2C 26D61300 */ addiu $s6, $s6, %lo(D_80151300) /* A7630 80110F30 AFB7002C */ sw $s7, 0x2c($sp) -/* A7634 80110F34 3C178015 */ lui $s7, %hi(D_801512C4) -/* A7638 80110F38 26F712C4 */ addiu $s7, $s7, %lo(D_801512C4) +/* A7634 80110F34 3C178015 */ lui $s7, %hi(gEntityHeapBase) +/* A7638 80110F38 26F712C4 */ addiu $s7, $s7, %lo(gEntityHeapBase) /* A763C 80110F3C AFB40020 */ sw $s4, 0x20($sp) -/* A7640 80110F40 3C148015 */ lui $s4, %hi(D_80151668) -/* A7644 80110F44 26941668 */ addiu $s4, $s4, %lo(D_80151668) +/* A7640 80110F40 3C148015 */ lui $s4, %hi(wStaticEntityData) +/* A7644 80110F44 26941668 */ addiu $s4, $s4, %lo(wStaticEntityData) /* A7648 80110F48 AFBF0030 */ sw $ra, 0x30($sp) /* A764C 80110F4C AFB20018 */ sw $s2, 0x18($sp) /* A7650 80110F50 AFB10014 */ sw $s1, 0x14($sp) @@ -30,8 +30,8 @@ glabel func_80110F10 /* A7670 80110F70 24030043 */ addiu $v1, $zero, 0x43 /* A7674 80110F74 8E25001C */ lw $a1, 0x1c($s1) /* A7678 80110F78 8E240018 */ lw $a0, 0x18($s1) -/* A767C 80110F7C 3C038015 */ lui $v1, %hi(D_801512C4) -/* A7680 80110F80 8C6312C4 */ lw $v1, %lo(D_801512C4)($v1) +/* A767C 80110F7C 3C038015 */ lui $v1, %hi(gEntityHeapBase) +/* A7680 80110F80 8C6312C4 */ lw $v1, %lo(gEntityHeapBase)($v1) /* A7684 80110F84 00A41023 */ subu $v0, $a1, $a0 /* A7688 80110F88 00023083 */ sra $a2, $v0, 2 /* A768C 80110F8C 00131080 */ sll $v0, $s3, 2 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80111790.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80111790.s deleted file mode 100644 index ce48582c4f..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80111790.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80111790 -/* A7E90 80111790 0000282D */ daddu $a1, $zero, $zero -/* A7E94 80111794 3C048015 */ lui $a0, %hi(gCurrentEntityListPtr) -/* A7E98 80111798 8C841470 */ lw $a0, %lo(gCurrentEntityListPtr)($a0) -.L8011179C: -/* A7E9C 8011179C 8C820000 */ lw $v0, ($a0) -/* A7EA0 801117A0 10400009 */ beqz $v0, .L801117C8 -/* A7EA4 801117A4 24A50001 */ addiu $a1, $a1, 1 -/* A7EA8 801117A8 8C430038 */ lw $v1, 0x38($v0) -/* A7EAC 801117AC 8C620018 */ lw $v0, 0x18($v1) -/* A7EB0 801117B0 10400005 */ beqz $v0, .L801117C8 -/* A7EB4 801117B4 00000000 */ nop -/* A7EB8 801117B8 14430004 */ bne $v0, $v1, .L801117CC -/* A7EBC 801117BC 28A2001E */ slti $v0, $a1, 0x1e -/* A7EC0 801117C0 03E00008 */ jr $ra -/* A7EC4 801117C4 24020001 */ addiu $v0, $zero, 1 -.L801117C8: -/* A7EC8 801117C8 28A2001E */ slti $v0, $a1, 0x1e -.L801117CC: -/* A7ECC 801117CC 1440FFF3 */ bnez $v0, .L8011179C -/* A7ED0 801117D0 24840004 */ addiu $a0, $a0, 4 -/* A7ED4 801117D4 03E00008 */ jr $ra -/* A7ED8 801117D8 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80114B58.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80114B58.s index bd546caf64..ad30e768a9 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80114B58.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80114B58.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80114B58 -/* AB258 80114B58 3C028015 */ lui $v0, %hi(D_80153368) -/* AB25C 80114B5C 8C423368 */ lw $v0, %lo(D_80153368)($v0) +/* AB258 80114B58 3C028015 */ lui $v0, %hi(mdl_nextTextureAddress) +/* AB25C 80114B5C 8C423368 */ lw $v0, %lo(mdl_nextTextureAddress)($v0) /* AB260 80114B60 27BDFFB0 */ addiu $sp, $sp, -0x50 /* AB264 80114B64 AFB1002C */ sw $s1, 0x2c($sp) /* AB268 80114B68 0080882D */ daddu $s1, $a0, $zero @@ -30,8 +30,8 @@ glabel func_80114B58 /* AB2B8 80114BB8 AE400038 */ sw $zero, 0x38($s2) .L80114BBC: /* AB2BC 80114BBC 0220202D */ daddu $a0, $s1, $zero -/* AB2C0 80114BC0 3C108015 */ lui $s0, %hi(D_80153368) -/* AB2C4 80114BC4 26103368 */ addiu $s0, $s0, %lo(D_80153368) +/* AB2C0 80114BC0 3C108015 */ lui $s0, %hi(mdl_nextTextureAddress) +/* AB2C4 80114BC4 26103368 */ addiu $s0, $s0, %lo(mdl_nextTextureAddress) /* AB2C8 80114BC8 02342821 */ addu $a1, $s1, $s4 /* AB2CC 80114BCC 8E060000 */ lw $a2, ($s0) /* AB2D0 80114BD0 0C00A5CF */ jal dma_copy @@ -51,8 +51,8 @@ glabel func_80114B58 /* AB304 80114C04 AE400040 */ sw $zero, 0x40($s2) .L80114C08: /* AB308 80114C08 0220202D */ daddu $a0, $s1, $zero -/* AB30C 80114C0C 3C108015 */ lui $s0, %hi(D_80153368) -/* AB310 80114C10 26103368 */ addiu $s0, $s0, %lo(D_80153368) +/* AB30C 80114C0C 3C108015 */ lui $s0, %hi(mdl_nextTextureAddress) +/* AB310 80114C10 26103368 */ addiu $s0, $s0, %lo(mdl_nextTextureAddress) /* AB314 80114C14 00952821 */ addu $a1, $a0, $s5 /* AB318 80114C18 8E060000 */ lw $a2, ($s0) /* AB31C 80114C1C 0C00A5CF */ jal dma_copy @@ -69,8 +69,8 @@ glabel func_80114B58 /* AB340 80114C40 26450004 */ addiu $a1, $s2, 4 /* AB344 80114C44 02E0202D */ daddu $a0, $s7, $zero /* AB348 80114C48 02E51025 */ or $v0, $s7, $a1 -/* AB34C 80114C4C 3C038015 */ lui $v1, %hi(D_80153368) -/* AB350 80114C50 8C633368 */ lw $v1, %lo(D_80153368)($v1) +/* AB34C 80114C4C 3C038015 */ lui $v1, %hi(mdl_nextTextureAddress) +/* AB350 80114C50 8C633368 */ lw $v1, %lo(mdl_nextTextureAddress)($v1) /* AB354 80114C54 30420003 */ andi $v0, $v0, 3 /* AB358 80114C58 10400017 */ beqz $v0, .L80114CB8 /* AB35C 80114C5C AE430000 */ sw $v1, ($s2) @@ -116,8 +116,8 @@ glabel func_80114B58 /* AB3EC 80114CEC 02E0202D */ daddu $a0, $s7, $zero /* AB3F0 80114CF0 AFA20010 */ sw $v0, 0x10($sp) /* AB3F4 80114CF4 8E420040 */ lw $v0, 0x40($s2) -/* AB3F8 80114CF8 3C108015 */ lui $s0, %hi(D_80153368) -/* AB3FC 80114CFC 26103368 */ addiu $s0, $s0, %lo(D_80153368) +/* AB3F8 80114CF8 3C108015 */ lui $s0, %hi(mdl_nextTextureAddress) +/* AB3FC 80114CFC 26103368 */ addiu $s0, $s0, %lo(mdl_nextTextureAddress) /* AB400 80114D00 AFA00018 */ sw $zero, 0x18($sp) /* AB404 80114D04 AFA0001C */ sw $zero, 0x1c($sp) /* AB408 80114D08 AFA00020 */ sw $zero, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80115498.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80115498.s index f467272804..82611ef76a 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80115498.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80115498.s @@ -438,8 +438,8 @@ glabel func_80115498 .L80115A84: /* AC184 80115A84 26D60044 */ addiu $s6, $s6, 0x44 /* AC188 80115A88 26A40030 */ addiu $a0, $s5, 0x30 -/* AC18C 80115A8C 3C058016 */ lui $a1, %hi(D_8015A590) -/* AC190 80115A90 24A5A590 */ addiu $a1, $a1, %lo(D_8015A590) +/* AC18C 80115A8C 3C058016 */ lui $a1, %hi(mdl_textureHandles) +/* AC190 80115A90 24A5A590 */ addiu $a1, $a1, %lo(mdl_textureHandles) /* AC194 80115A94 02C52821 */ addu $a1, $s6, $a1 /* AC198 80115A98 0260302D */ daddu $a2, $s3, $zero /* AC19C 80115A9C 0240382D */ daddu $a3, $s2, $zero diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80116674.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80116674.s index 24d6288d6c..f0f8dd1d88 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80116674.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80116674.s @@ -3,8 +3,8 @@ glabel func_80116674 /* ACD74 80116674 0000202D */ daddu $a0, $zero, $zero -/* ACD78 80116678 3C038015 */ lui $v1, %hi(gCurrentModelListPtr) -/* ACD7C 8011667C 8C6312CC */ lw $v1, %lo(gCurrentModelListPtr)($v1) +/* ACD78 80116678 3C038015 */ lui $v1, %hi(gCurrentModels) +/* ACD7C 8011667C 8C6312CC */ lw $v1, %lo(gCurrentModels)($v1) .L80116680: /* ACD80 80116680 24840001 */ addiu $a0, $a0, 1 /* ACD84 80116684 28820100 */ slti $v0, $a0, 0x100 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80116698.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80116698.s index e991a146ed..13da735c4f 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80116698.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80116698.s @@ -19,8 +19,8 @@ glabel func_80116698 /* ACDD0 801166D0 AFB100BC */ sw $s1, 0xbc($sp) /* ACDD4 801166D4 AFB000B8 */ sw $s0, 0xb8($sp) .L801166D8: -/* ACDD8 801166D8 3C038015 */ lui $v1, %hi(gCurrentModelListPtr) -/* ACDDC 801166DC 8C6312CC */ lw $v1, %lo(gCurrentModelListPtr)($v1) +/* ACDD8 801166D8 3C038015 */ lui $v1, %hi(gCurrentModels) +/* ACDDC 801166DC 8C6312CC */ lw $v1, %lo(gCurrentModels)($v1) /* ACDE0 801166E0 00121080 */ sll $v0, $s2, 2 /* ACDE4 801166E4 00431021 */ addu $v0, $v0, $v1 /* ACDE8 801166E8 8C500000 */ lw $s0, ($v0) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80117D00.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80117D00.s deleted file mode 100644 index ca0a9bfd01..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80117D00.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80117D00 -/* AE400 80117D00 27BDFF20 */ addiu $sp, $sp, -0xe0 -/* AE404 80117D04 AFBF00DC */ sw $ra, 0xdc($sp) -/* AE408 80117D08 AFB600D8 */ sw $s6, 0xd8($sp) -/* AE40C 80117D0C AFB500D4 */ sw $s5, 0xd4($sp) -/* AE410 80117D10 AFB400D0 */ sw $s4, 0xd0($sp) -/* AE414 80117D14 AFB300CC */ sw $s3, 0xcc($sp) -/* AE418 80117D18 AFB200C8 */ sw $s2, 0xc8($sp) -/* AE41C 80117D1C AFB100C4 */ sw $s1, 0xc4($sp) -/* AE420 80117D20 AFB000C0 */ sw $s0, 0xc0($sp) -/* AE424 80117D24 8C930008 */ lw $s3, 8($a0) -/* AE428 80117D28 8E630000 */ lw $v1, ($s3) -/* AE42C 80117D2C 24020002 */ addiu $v0, $zero, 2 -/* AE430 80117D30 10620044 */ beq $v1, $v0, .L80117E44 -/* AE434 80117D34 0080802D */ daddu $s0, $a0, $zero -/* AE438 80117D38 8E620010 */ lw $v0, 0x10($s3) -/* AE43C 80117D3C 10400043 */ beqz $v0, .L80117E4C -/* AE440 80117D40 00000000 */ nop -/* AE444 80117D44 8C52000C */ lw $s2, 0xc($v0) -/* AE448 80117D48 12400040 */ beqz $s2, .L80117E4C -/* AE44C 80117D4C 00000000 */ nop -/* AE450 80117D50 1A40003E */ blez $s2, .L80117E4C -/* AE454 80117D54 0000882D */ daddu $s1, $zero, $zero -/* AE458 80117D58 249500B0 */ addiu $s5, $a0, 0xb0 -/* AE45C 80117D5C 24160002 */ addiu $s6, $zero, 2 -/* AE460 80117D60 3C148015 */ lui $s4, %hi(D_80153224) -/* AE464 80117D64 26943224 */ addiu $s4, $s4, %lo(D_80153224) -/* AE468 80117D68 27A30010 */ addiu $v1, $sp, 0x10 -.L80117D6C: -/* AE46C 80117D6C 0200102D */ daddu $v0, $s0, $zero -.L80117D70: -/* AE470 80117D70 8C460000 */ lw $a2, ($v0) -/* AE474 80117D74 8C470004 */ lw $a3, 4($v0) -/* AE478 80117D78 8C480008 */ lw $t0, 8($v0) -/* AE47C 80117D7C 8C49000C */ lw $t1, 0xc($v0) -/* AE480 80117D80 AC660000 */ sw $a2, ($v1) -/* AE484 80117D84 AC670004 */ sw $a3, 4($v1) -/* AE488 80117D88 AC680008 */ sw $t0, 8($v1) -/* AE48C 80117D8C AC69000C */ sw $t1, 0xc($v1) -/* AE490 80117D90 24420010 */ addiu $v0, $v0, 0x10 -/* AE494 80117D94 1455FFF6 */ bne $v0, $s5, .L80117D70 -/* AE498 80117D98 24630010 */ addiu $v1, $v1, 0x10 -/* AE49C 80117D9C 96020000 */ lhu $v0, ($s0) -/* AE4A0 80117DA0 A7A20010 */ sh $v0, 0x10($sp) -/* AE4A4 80117DA4 8E020010 */ lw $v0, 0x10($s0) -/* AE4A8 80117DA8 AFA20020 */ sw $v0, 0x20($sp) -/* AE4AC 80117DAC 8E620010 */ lw $v0, 0x10($s3) -/* AE4B0 80117DB0 8C430010 */ lw $v1, 0x10($v0) -/* AE4B4 80117DB4 00111080 */ sll $v0, $s1, 2 -/* AE4B8 80117DB8 00431021 */ addu $v0, $v0, $v1 -/* AE4BC 80117DBC 8C440000 */ lw $a0, ($v0) -/* AE4C0 80117DC0 AFA40018 */ sw $a0, 0x18($sp) -/* AE4C4 80117DC4 920200A4 */ lbu $v0, 0xa4($s0) -/* AE4C8 80117DC8 A3A200B4 */ sb $v0, 0xb4($sp) -/* AE4CC 80117DCC 920200A5 */ lbu $v0, 0xa5($s0) -/* AE4D0 80117DD0 A3A200B5 */ sb $v0, 0xb5($sp) -/* AE4D4 80117DD4 8C820000 */ lw $v0, ($a0) -/* AE4D8 80117DD8 14560003 */ bne $v0, $s6, .L80117DE8 -/* AE4DC 80117DDC 0000102D */ daddu $v0, $zero, $zero -/* AE4E0 80117DE0 0C0456C3 */ jal get_model_property -/* AE4E4 80117DE4 2405005C */ addiu $a1, $zero, 0x5c -.L80117DE8: -/* AE4E8 80117DE8 50400003 */ beql $v0, $zero, .L80117DF8 -/* AE4EC 80117DEC A3A000B6 */ sb $zero, 0xb6($sp) -/* AE4F0 80117DF0 9042000B */ lbu $v0, 0xb($v0) -/* AE4F4 80117DF4 A3A200B6 */ sb $v0, 0xb6($sp) -.L80117DF8: -/* AE4F8 80117DF8 8E820000 */ lw $v0, ($s4) -/* AE4FC 80117DFC 3C03800A */ lui $v1, %hi(D_8009A5F4) -/* AE500 80117E00 8C63A5F4 */ lw $v1, %lo(D_8009A5F4)($v1) -/* AE504 80117E04 00021080 */ sll $v0, $v0, 2 -/* AE508 80117E08 00431021 */ addu $v0, $v0, $v1 -/* AE50C 80117E0C 90420002 */ lbu $v0, 2($v0) -/* AE510 80117E10 27A40010 */ addiu $a0, $sp, 0x10 -/* AE514 80117E14 A3A000B9 */ sb $zero, 0xb9($sp) -/* AE518 80117E18 0C045F40 */ jal func_80117D00 -/* AE51C 80117E1C A3A200B8 */ sb $v0, 0xb8($sp) -/* AE520 80117E20 8E820000 */ lw $v0, ($s4) -/* AE524 80117E24 26310001 */ addiu $s1, $s1, 1 -/* AE528 80117E28 24420001 */ addiu $v0, $v0, 1 -/* AE52C 80117E2C AE820000 */ sw $v0, ($s4) -/* AE530 80117E30 0232102A */ slt $v0, $s1, $s2 -/* AE534 80117E34 1440FFCD */ bnez $v0, .L80117D6C -/* AE538 80117E38 27A30010 */ addiu $v1, $sp, 0x10 -/* AE53C 80117E3C 08045F93 */ j .L80117E4C -/* AE540 80117E40 00000000 */ nop -.L80117E44: -/* AE544 80117E44 0C044C24 */ jal appendGfx_model -/* AE548 80117E48 0200202D */ daddu $a0, $s0, $zero -.L80117E4C: -/* AE54C 80117E4C 8FBF00DC */ lw $ra, 0xdc($sp) -/* AE550 80117E50 8FB600D8 */ lw $s6, 0xd8($sp) -/* AE554 80117E54 8FB500D4 */ lw $s5, 0xd4($sp) -/* AE558 80117E58 8FB400D0 */ lw $s4, 0xd0($sp) -/* AE55C 80117E5C 8FB300CC */ lw $s3, 0xcc($sp) -/* AE560 80117E60 8FB200C8 */ lw $s2, 0xc8($sp) -/* AE564 80117E64 8FB100C4 */ lw $s1, 0xc4($sp) -/* AE568 80117E68 8FB000C0 */ lw $s0, 0xc0($sp) -/* AE56C 80117E6C 03E00008 */ jr $ra -/* AE570 80117E70 27BD00E0 */ addiu $sp, $sp, 0xe0 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B1D8.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B1D8.s index 12856ac9d3..469ccec308 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B1D8.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B1D8.s @@ -35,8 +35,8 @@ glabel func_8011B1D8 /* B194C 8011B24C 00000000 */ nop /* B1950 8011B250 0C04572A */ jal mdl_get_child_count /* B1954 8011B254 02A0202D */ daddu $a0, $s5, $zero -/* B1958 8011B258 3C038015 */ lui $v1, %hi(D_80153224) -/* B195C 8011B25C 24633224 */ addiu $v1, $v1, %lo(D_80153224) +/* B1958 8011B258 3C038015 */ lui $v1, %hi(mdl_treeIterPos) +/* B195C 8011B25C 24633224 */ addiu $v1, $v1, %lo(mdl_treeIterPos) /* B1960 8011B260 8C640000 */ lw $a0, ($v1) /* B1964 8011B264 00822021 */ addu $a0, $a0, $v0 /* B1968 8011B268 AC640000 */ sw $a0, ($v1) @@ -60,8 +60,8 @@ glabel func_8011B1D8 /* B19A8 8011B2A8 00000000 */ nop /* B19AC 8011B2AC 1A600028 */ blez $s3, .L8011B350 /* B19B0 8011B2B0 0000882D */ daddu $s1, $zero, $zero -/* B19B4 8011B2B4 3C148015 */ lui $s4, %hi(D_80153224) -/* B19B8 8011B2B8 26943224 */ addiu $s4, $s4, %lo(D_80153224) +/* B19B4 8011B2B4 3C148015 */ lui $s4, %hi(mdl_treeIterPos) +/* B19B8 8011B2B8 26943224 */ addiu $s4, $s4, %lo(mdl_treeIterPos) /* B19BC 8011B2BC 24170005 */ addiu $s7, $zero, 5 /* B19C0 8011B2C0 3C168015 */ lui $s6, %hi(D_80153370) /* B19C4 8011B2C4 26D63370 */ addiu $s6, $s6, %lo(D_80153370) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B7C0.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B7C0.s index 426c458524..a3727c3157 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B7C0.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B7C0.s @@ -3,8 +3,8 @@ glabel func_8011B7C0 /* B1EC0 8011B7C0 3084FFFF */ andi $a0, $a0, 0xffff -/* B1EC4 8011B7C4 3C0A800A */ lui $t2, %hi(D_8009A5F4) -/* B1EC8 8011B7C8 8D4AA5F4 */ lw $t2, %lo(D_8009A5F4)($t2) +/* B1EC4 8011B7C4 3C0A800A */ lui $t2, %hi(mdl_currentModelTreeNodeInfo) +/* B1EC8 8011B7C8 8D4AA5F4 */ lw $t2, %lo(mdl_currentModelTreeNodeInfo)($t2) /* B1ECC 8011B7CC 00041080 */ sll $v0, $a0, 2 /* B1ED0 8011B7D0 004A3821 */ addu $a3, $v0, $t2 /* B1ED4 8011B7D4 90E30000 */ lbu $v1, ($a3) @@ -46,8 +46,8 @@ glabel func_8011B7C0 /* B1F4C 8011B84C 0104102A */ slt $v0, $t0, $a0 /* B1F50 8011B850 14400011 */ bnez $v0, .L8011B898 /* B1F54 8011B854 00054827 */ nor $t1, $zero, $a1 -/* B1F58 8011B858 3C038015 */ lui $v1, %hi(gCurrentModelListPtr) -/* B1F5C 8011B85C 8C6312CC */ lw $v1, %lo(gCurrentModelListPtr)($v1) +/* B1F58 8011B858 3C038015 */ lui $v1, %hi(gCurrentModels) +/* B1F5C 8011B85C 8C6312CC */ lw $v1, %lo(gCurrentModels)($v1) /* B1F60 8011B860 00041080 */ sll $v0, $a0, 2 /* B1F64 8011B864 00433821 */ addu $a3, $v0, $v1 .L8011B868: @@ -73,8 +73,8 @@ glabel func_8011B7C0 /* B1FA4 8011B8A4 0000202D */ daddu $a0, $zero, $zero /* B1FA8 8011B8A8 240B0003 */ addiu $t3, $zero, 3 /* B1FAC 8011B8AC 00055027 */ nor $t2, $zero, $a1 -/* B1FB0 8011B8B0 3C078015 */ lui $a3, %hi(gCurrentModelListPtr) -/* B1FB4 8011B8B4 8CE712CC */ lw $a3, %lo(gCurrentModelListPtr)($a3) +/* B1FB0 8011B8B0 3C078015 */ lui $a3, %hi(gCurrentModels) +/* B1FB4 8011B8B4 8CE712CC */ lw $a3, %lo(gCurrentModels)($a3) .L8011B8B8: /* B1FB8 8011B8B8 14CB0004 */ bne $a2, $t3, .L8011B8CC /* B1FBC 8011B8BC 8CE30000 */ lw $v1, ($a3) @@ -96,8 +96,8 @@ glabel func_8011B7C0 /* B1FF0 8011B8F0 1040FFE9 */ beqz $v0, .L8011B898 /* B1FF4 8011B8F4 24090003 */ addiu $t1, $zero, 3 /* B1FF8 8011B8F8 00054027 */ nor $t0, $zero, $a1 -/* B1FFC 8011B8FC 3C038015 */ lui $v1, %hi(gCurrentModelListPtr) -/* B2000 8011B900 8C6312CC */ lw $v1, %lo(gCurrentModelListPtr)($v1) +/* B1FFC 8011B8FC 3C038015 */ lui $v1, %hi(gCurrentModels) +/* B2000 8011B900 8C6312CC */ lw $v1, %lo(gCurrentModels)($v1) /* B2004 8011B904 00041080 */ sll $v0, $a0, 2 /* B2008 8011B908 00433821 */ addu $a3, $v0, $v1 .L8011B90C: diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B950.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B950.s index 320c1121c9..c4308e1fc4 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B950.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B950.s @@ -3,8 +3,8 @@ glabel func_8011B950 /* B2050 8011B950 3084FFFF */ andi $a0, $a0, 0xffff -/* B2054 8011B954 3C0A800A */ lui $t2, %hi(D_8009A5F4) -/* B2058 8011B958 8D4AA5F4 */ lw $t2, %lo(D_8009A5F4)($t2) +/* B2054 8011B954 3C0A800A */ lui $t2, %hi(mdl_currentModelTreeNodeInfo) +/* B2058 8011B958 8D4AA5F4 */ lw $t2, %lo(mdl_currentModelTreeNodeInfo)($t2) /* B205C 8011B95C 00041080 */ sll $v0, $a0, 2 /* B2060 8011B960 004A4021 */ addu $t0, $v0, $t2 /* B2064 8011B964 91030000 */ lbu $v1, ($t0) @@ -58,8 +58,8 @@ glabel func_8011B950 /* B2104 8011BA04 0124102A */ slt $v0, $t1, $a0 /* B2108 8011BA08 1440000F */ bnez $v0, .L8011BA48 /* B210C 8011BA0C 010A3021 */ addu $a2, $t0, $t2 -/* B2110 8011BA10 3C078015 */ lui $a3, %hi(gCurrentModelListPtr) -/* B2114 8011BA14 24E712CC */ addiu $a3, $a3, %lo(gCurrentModelListPtr) +/* B2110 8011BA10 3C078015 */ lui $a3, %hi(gCurrentModels) +/* B2114 8011BA14 24E712CC */ addiu $a3, $a3, %lo(gCurrentModels) .L8011BA18: /* B2118 8011BA18 8CE30000 */ lw $v1, ($a3) /* B211C 8011BA1C 00041080 */ sll $v0, $a0, 2 @@ -79,8 +79,8 @@ glabel func_8011B950 .L8011BA50: /* B2150 8011BA50 19600010 */ blez $t3, .L8011BA94 /* B2154 8011BA54 0000202D */ daddu $a0, $zero, $zero -/* B2158 8011BA58 3C078015 */ lui $a3, %hi(gCurrentModelListPtr) -/* B215C 8011BA5C 24E712CC */ addiu $a3, $a3, %lo(gCurrentModelListPtr) +/* B2158 8011BA58 3C078015 */ lui $a3, %hi(gCurrentModels) +/* B215C 8011BA5C 24E712CC */ addiu $a3, $a3, %lo(gCurrentModels) /* B2160 8011BA60 010A3021 */ addu $a2, $t0, $t2 .L8011BA64: /* B2164 8011BA64 8CE30000 */ lw $v1, ($a3) @@ -100,8 +100,8 @@ glabel func_8011B950 /* B2198 8011BA98 28820100 */ slti $v0, $a0, 0x100 /* B219C 8011BA9C 1040FFEA */ beqz $v0, .L8011BA48 /* B21A0 8011BAA0 010A3021 */ addu $a2, $t0, $t2 -/* B21A4 8011BAA4 3C078015 */ lui $a3, %hi(gCurrentModelListPtr) -/* B21A8 8011BAA8 24E712CC */ addiu $a3, $a3, %lo(gCurrentModelListPtr) +/* B21A4 8011BAA4 3C078015 */ lui $a3, %hi(gCurrentModels) +/* B21A8 8011BAA8 24E712CC */ addiu $a3, $a3, %lo(gCurrentModels) .L8011BAAC: /* B21AC 8011BAAC 8CE30000 */ lw $v1, ($a3) /* B21B0 8011BAB0 00041080 */ sll $v0, $a0, 2 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_center_and_size.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_center_and_size.s deleted file mode 100644 index a2aff81518..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_center_and_size.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_model_center_and_size -/* B17EC 8011B0EC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B17F0 8011B0F0 AFB3001C */ sw $s3, 0x1c($sp) -/* B17F4 8011B0F4 8FB30040 */ lw $s3, 0x40($sp) -/* B17F8 8011B0F8 AFB40020 */ sw $s4, 0x20($sp) -/* B17FC 8011B0FC 8FB40044 */ lw $s4, 0x44($sp) -/* B1800 8011B100 AFB00010 */ sw $s0, 0x10($sp) -/* B1804 8011B104 00A0802D */ daddu $s0, $a1, $zero -/* B1808 8011B108 AFB10014 */ sw $s1, 0x14($sp) -/* B180C 8011B10C 00C0882D */ daddu $s1, $a2, $zero -/* B1810 8011B110 AFB20018 */ sw $s2, 0x18($sp) -/* B1814 8011B114 00E0902D */ daddu $s2, $a3, $zero -/* B1818 8011B118 AFB50024 */ sw $s5, 0x24($sp) -/* B181C 8011B11C 8FB50048 */ lw $s5, 0x48($sp) -/* B1820 8011B120 AFBF0028 */ sw $ra, 0x28($sp) -/* B1824 8011B124 0C046C04 */ jal get_model_list_index_from_tree_index -/* B1828 8011B128 3084FFFF */ andi $a0, $a0, 0xffff -/* B182C 8011B12C 0C046B4C */ jal get_model_from_list_index -/* B1830 8011B130 0040202D */ daddu $a0, $v0, $zero -/* B1834 8011B134 C4400098 */ lwc1 $f0, 0x98($v0) -/* B1838 8011B138 8C440008 */ lw $a0, 8($v0) -/* B183C 8011B13C E6000000 */ swc1 $f0, ($s0) -/* B1840 8011B140 C440009C */ lwc1 $f0, 0x9c($v0) -/* B1844 8011B144 E6200000 */ swc1 $f0, ($s1) -/* B1848 8011B148 C44000A0 */ lwc1 $f0, 0xa0($v0) -/* B184C 8011B14C 24050061 */ addiu $a1, $zero, 0x61 -/* B1850 8011B150 0C0456C3 */ jal get_model_property -/* B1854 8011B154 E6400000 */ swc1 $f0, ($s2) -/* B1858 8011B158 1040000B */ beqz $v0, .L8011B188 -/* B185C 8011B15C 00000000 */ nop -/* B1860 8011B160 C4400004 */ lwc1 $f0, 4($v0) -/* B1864 8011B164 46800020 */ cvt.s.w $f0, $f0 -/* B1868 8011B168 E6600000 */ swc1 $f0, ($s3) -/* B186C 8011B16C C4400010 */ lwc1 $f0, 0x10($v0) -/* B1870 8011B170 46800020 */ cvt.s.w $f0, $f0 -/* B1874 8011B174 E6800000 */ swc1 $f0, ($s4) -/* B1878 8011B178 C440001C */ lwc1 $f0, 0x1c($v0) -/* B187C 8011B17C 46800020 */ cvt.s.w $f0, $f0 -/* B1880 8011B180 08046C67 */ j .L8011B19C -/* B1884 8011B184 E6A00000 */ swc1 $f0, ($s5) -.L8011B188: -/* B1888 8011B188 44800000 */ mtc1 $zero, $f0 -/* B188C 8011B18C 00000000 */ nop -/* B1890 8011B190 E6A00000 */ swc1 $f0, ($s5) -/* B1894 8011B194 E6800000 */ swc1 $f0, ($s4) -/* B1898 8011B198 E6600000 */ swc1 $f0, ($s3) -.L8011B19C: -/* B189C 8011B19C 8FBF0028 */ lw $ra, 0x28($sp) -/* B18A0 8011B1A0 8FB50024 */ lw $s5, 0x24($sp) -/* B18A4 8011B1A4 8FB40020 */ lw $s4, 0x20($sp) -/* B18A8 8011B1A8 8FB3001C */ lw $s3, 0x1c($sp) -/* B18AC 8011B1AC 8FB20018 */ lw $s2, 0x18($sp) -/* B18B0 8011B1B0 8FB10014 */ lw $s1, 0x14($sp) -/* B18B4 8011B1B4 8FB00010 */ lw $s0, 0x10($sp) -/* B18B8 8011B1B8 03E00008 */ jr $ra -/* B18BC 8011B1BC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_env_color_parameters.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_env_color_parameters.s deleted file mode 100644 index daa90f29a4..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_env_color_parameters.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_model_env_color_parameters -/* B26D4 8011BFD4 3C028015 */ lui $v0, %hi(D_8014B760) -/* B26D8 8011BFD8 9042B760 */ lbu $v0, %lo(D_8014B760)($v0) -/* B26DC 8011BFDC 8FA30010 */ lw $v1, 0x10($sp) -/* B26E0 8011BFE0 8FA80014 */ lw $t0, 0x14($sp) -/* B26E4 8011BFE4 A0820000 */ sb $v0, ($a0) -/* B26E8 8011BFE8 3C028015 */ lui $v0, %hi(D_8014B761) -/* B26EC 8011BFEC 9042B761 */ lbu $v0, %lo(D_8014B761)($v0) -/* B26F0 8011BFF0 A0A20000 */ sb $v0, ($a1) -/* B26F4 8011BFF4 3C028015 */ lui $v0, %hi(D_8014B762) -/* B26F8 8011BFF8 9042B762 */ lbu $v0, %lo(D_8014B762)($v0) -/* B26FC 8011BFFC A0C20000 */ sb $v0, ($a2) -/* B2700 8011C000 3C028015 */ lui $v0, %hi(D_8014B763) -/* B2704 8011C004 9042B763 */ lbu $v0, %lo(D_8014B763)($v0) -/* B2708 8011C008 A0E20000 */ sb $v0, ($a3) -/* B270C 8011C00C 3C028015 */ lui $v0, %hi(D_8014B764) -/* B2710 8011C010 9042B764 */ lbu $v0, %lo(D_8014B764)($v0) -/* B2714 8011C014 A0620000 */ sb $v0, ($v1) -/* B2718 8011C018 3C028015 */ lui $v0, %hi(D_8014B765) -/* B271C 8011C01C 9042B765 */ lbu $v0, %lo(D_8014B765)($v0) -/* B2720 8011C020 03E00008 */ jr $ra -/* B2724 8011C024 A1020000 */ sb $v0, ($t0) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_fog_color_parameters.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_fog_color_parameters.s deleted file mode 100644 index ec09176aef..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_fog_color_parameters.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_model_fog_color_parameters -/* B2614 8011BF14 3C028015 */ lui $v0, %hi(D_8014B750) -/* B2618 8011BF18 9042B750 */ lbu $v0, %lo(D_8014B750)($v0) -/* B261C 8011BF1C 8FA30010 */ lw $v1, 0x10($sp) -/* B2620 8011BF20 8FA80014 */ lw $t0, 0x14($sp) -/* B2624 8011BF24 8FA90018 */ lw $t1, 0x18($sp) -/* B2628 8011BF28 8FAA001C */ lw $t2, 0x1c($sp) -/* B262C 8011BF2C 8FAB0020 */ lw $t3, 0x20($sp) -/* B2630 8011BF30 A0820000 */ sb $v0, ($a0) -/* B2634 8011BF34 3C028015 */ lui $v0, %hi(D_8014B751) -/* B2638 8011BF38 9042B751 */ lbu $v0, %lo(D_8014B751)($v0) -/* B263C 8011BF3C A0A20000 */ sb $v0, ($a1) -/* B2640 8011BF40 3C028015 */ lui $v0, %hi(D_8014B752) -/* B2644 8011BF44 9042B752 */ lbu $v0, %lo(D_8014B752)($v0) -/* B2648 8011BF48 A0C20000 */ sb $v0, ($a2) -/* B264C 8011BF4C 3C028015 */ lui $v0, %hi(D_8014B753) -/* B2650 8011BF50 9042B753 */ lbu $v0, %lo(D_8014B753)($v0) -/* B2654 8011BF54 A0E20000 */ sb $v0, ($a3) -/* B2658 8011BF58 3C028015 */ lui $v0, %hi(D_8014B754) -/* B265C 8011BF5C 9042B754 */ lbu $v0, %lo(D_8014B754)($v0) -/* B2660 8011BF60 A0620000 */ sb $v0, ($v1) -/* B2664 8011BF64 3C028015 */ lui $v0, %hi(D_8014B755) -/* B2668 8011BF68 9042B755 */ lbu $v0, %lo(D_8014B755)($v0) -/* B266C 8011BF6C A1020000 */ sb $v0, ($t0) -/* B2670 8011BF70 3C028015 */ lui $v0, %hi(D_8014B756) -/* B2674 8011BF74 9042B756 */ lbu $v0, %lo(D_8014B756)($v0) -/* B2678 8011BF78 A1220000 */ sb $v0, ($t1) -/* B267C 8011BF7C 3C028015 */ lui $v0, %hi(D_8014B758) -/* B2680 8011BF80 8C42B758 */ lw $v0, %lo(D_8014B758)($v0) -/* B2684 8011BF84 AD420000 */ sw $v0, ($t2) -/* B2688 8011BF88 3C028015 */ lui $v0, %hi(D_8014B75C) -/* B268C 8011BF8C 8C42B75C */ lw $v0, %lo(D_8014B75C)($v0) -/* B2690 8011BF90 03E00008 */ jr $ra -/* B2694 8011BF94 AD620000 */ sw $v0, ($t3) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_list_index_from_tree_index.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_list_index_from_tree_index.s deleted file mode 100644 index ab1f0f1c72..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_list_index_from_tree_index.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_model_list_index_from_tree_index -/* B1710 8011B010 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1714 8011B014 AFB10014 */ sw $s1, 0x14($sp) -/* B1718 8011B018 0080882D */ daddu $s1, $a0, $zero -/* B171C 8011B01C 2A220100 */ slti $v0, $s1, 0x100 -/* B1720 8011B020 AFBF0018 */ sw $ra, 0x18($sp) -/* B1724 8011B024 10400009 */ beqz $v0, .L8011B04C -/* B1728 8011B028 AFB00010 */ sw $s0, 0x10($sp) -/* B172C 8011B02C 3C02800A */ lui $v0, %hi(D_8009A5F4) -/* B1730 8011B030 8C42A5F4 */ lw $v0, %lo(D_8009A5F4)($v0) -/* B1734 8011B034 00111880 */ sll $v1, $s1, 2 -/* B1738 8011B038 00621821 */ addu $v1, $v1, $v0 -/* B173C 8011B03C 90630000 */ lbu $v1, ($v1) -/* B1740 8011B040 240200FF */ addiu $v0, $zero, 0xff -/* B1744 8011B044 1462000D */ bne $v1, $v0, .L8011B07C -/* B1748 8011B048 0060102D */ daddu $v0, $v1, $zero -.L8011B04C: -/* B174C 8011B04C 0000802D */ daddu $s0, $zero, $zero -.L8011B050: -/* B1750 8011B050 0C046B4C */ jal get_model_from_list_index -/* B1754 8011B054 0200202D */ daddu $a0, $s0, $zero -/* B1758 8011B058 50400005 */ beql $v0, $zero, .L8011B070 -/* B175C 8011B05C 26100001 */ addiu $s0, $s0, 1 -/* B1760 8011B060 94420002 */ lhu $v0, 2($v0) -/* B1764 8011B064 10510005 */ beq $v0, $s1, .L8011B07C -/* B1768 8011B068 0200102D */ daddu $v0, $s0, $zero -/* B176C 8011B06C 26100001 */ addiu $s0, $s0, 1 -.L8011B070: -/* B1770 8011B070 2A020100 */ slti $v0, $s0, 0x100 -/* B1774 8011B074 1440FFF6 */ bnez $v0, .L8011B050 -/* B1778 8011B078 0000102D */ daddu $v0, $zero, $zero -.L8011B07C: -/* B177C 8011B07C 8FBF0018 */ lw $ra, 0x18($sp) -/* B1780 8011B080 8FB10014 */ lw $s1, 0x14($sp) -/* B1784 8011B084 8FB00010 */ lw $s0, 0x10($sp) -/* B1788 8011B088 03E00008 */ jr $ra -/* B178C 8011B08C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_property.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_property.s deleted file mode 100644 index 87dd050599..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_property.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_model_property -/* AC20C 80115B0C 8C870008 */ lw $a3, 8($a0) -/* AC210 80115B10 8C83000C */ lw $v1, 0xc($a0) -/* AC214 80115B14 18E00009 */ blez $a3, .L80115B3C -/* AC218 80115B18 0000302D */ daddu $a2, $zero, $zero -.L80115B1C: -/* AC21C 80115B1C 8C620000 */ lw $v0, ($v1) -/* AC220 80115B20 14450003 */ bne $v0, $a1, .L80115B30 -/* AC224 80115B24 24C60001 */ addiu $a2, $a2, 1 -/* AC228 80115B28 03E00008 */ jr $ra -/* AC22C 80115B2C 0060102D */ daddu $v0, $v1, $zero -.L80115B30: -/* AC230 80115B30 00C7102A */ slt $v0, $a2, $a3 -/* AC234 80115B34 1440FFF9 */ bnez $v0, .L80115B1C -/* AC238 80115B38 2463000C */ addiu $v1, $v1, 0xc -.L80115B3C: -/* AC23C 80115B3C 03E00008 */ jr $ra -/* AC240 80115B40 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_transform_group_index.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_transform_group_index.s deleted file mode 100644 index d001c9c93f..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_transform_group_index.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_transform_group_index -/* B1790 8011B090 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1794 8011B094 AFB10014 */ sw $s1, 0x14($sp) -/* B1798 8011B098 0080882D */ daddu $s1, $a0, $zero -/* B179C 8011B09C AFB00010 */ sw $s0, 0x10($sp) -/* B17A0 8011B0A0 0000802D */ daddu $s0, $zero, $zero -/* B17A4 8011B0A4 AFBF0018 */ sw $ra, 0x18($sp) -.L8011B0A8: -/* B17A8 8011B0A8 0C046C70 */ jal get_transform_group -/* B17AC 8011B0AC 0200202D */ daddu $a0, $s0, $zero -/* B17B0 8011B0B0 50400006 */ beql $v0, $zero, .L8011B0CC -/* B17B4 8011B0B4 26100001 */ addiu $s0, $s0, 1 -/* B17B8 8011B0B8 94420002 */ lhu $v0, 2($v0) -/* B17BC 8011B0BC 54510003 */ bnel $v0, $s1, .L8011B0CC -/* B17C0 8011B0C0 26100001 */ addiu $s0, $s0, 1 -/* B17C4 8011B0C4 08046C36 */ j .L8011B0D8 -/* B17C8 8011B0C8 0200102D */ daddu $v0, $s0, $zero -.L8011B0CC: -/* B17CC 8011B0CC 2A020004 */ slti $v0, $s0, 4 -/* B17D0 8011B0D0 1440FFF5 */ bnez $v0, .L8011B0A8 -/* B17D4 8011B0D4 2402FFFF */ addiu $v0, $zero, -1 -.L8011B0D8: -/* B17D8 8011B0D8 8FBF0018 */ lw $ra, 0x18($sp) -/* B17DC 8011B0DC 8FB10014 */ lw $s1, 0x14($sp) -/* B17E0 8011B0E0 8FB00010 */ lw $s0, 0x10($sp) -/* B17E4 8011B0E4 03E00008 */ jr $ra -/* B17E8 8011B0E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/init_model_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/init_model_data.s deleted file mode 100644 index 32380f2176..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/init_model_data.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel init_model_data -/* AC6E8 80115FE8 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* AC6EC 80115FEC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* AC6F0 80115FF0 80420070 */ lb $v0, 0x70($v0) -/* AC6F4 80115FF4 14400027 */ bnez $v0, .L80116094 -/* AC6F8 80115FF8 00000000 */ nop -/* AC6FC 80115FFC 3C028015 */ lui $v0, %hi(gWorldModelList) -/* AC700 80116000 24421770 */ addiu $v0, $v0, %lo(gWorldModelList) -/* AC704 80116004 3C018015 */ lui $at, %hi(gCurrentModelListPtr) -/* AC708 80116008 AC2212CC */ sw $v0, %lo(gCurrentModelListPtr)($at) -/* AC70C 8011600C 3C028015 */ lui $v0, %hi(D_80151F70) -/* AC710 80116010 24421F70 */ addiu $v0, $v0, %lo(D_80151F70) -/* AC714 80116014 3C018015 */ lui $at, %hi(gCurrentTransformGroups) -/* AC718 80116018 AC2212E0 */ sw $v0, %lo(gCurrentTransformGroups)($at) -/* AC71C 8011601C 3C028015 */ lui $v0, %hi(gWorldModelSpecialDls) -/* AC720 80116020 24421F90 */ addiu $v0, $v0, %lo(gWorldModelSpecialDls) -/* AC724 80116024 3C018015 */ lui $at, %hi(gCurrentModelSpecialDlsPtr) -/* AC728 80116028 AC2212E8 */ sw $v0, %lo(gCurrentModelSpecialDlsPtr)($at) -/* AC72C 8011602C 3C028015 */ lui $v0, %hi(D_80152090) -/* AC730 80116030 24422090 */ addiu $v0, $v0, %lo(D_80152090) -/* AC734 80116034 3C018015 */ lui $at, %hi(gCurrentCustomModelGfxBuilders) -/* AC738 80116038 AC2212B8 */ sw $v0, %lo(gCurrentCustomModelGfxBuilders)($at) -/* AC73C 8011603C 3C028015 */ lui $v0, %hi(D_80152214) -/* AC740 80116040 24422214 */ addiu $v0, $v0, %lo(D_80152214) -/* AC744 80116044 3C018015 */ lui $at, %hi(D_801512FC) -/* AC748 80116048 AC2212FC */ sw $v0, %lo(D_801512FC)($at) -/* AC74C 8011604C 3C028015 */ lui $v0, %hi(D_80152190) -/* AC750 80116050 24422190 */ addiu $v0, $v0, %lo(D_80152190) -/* AC754 80116054 3C018015 */ lui $at, %hi(D_80152210) -/* AC758 80116058 AC222210 */ sw $v0, %lo(D_80152210)($at) -/* AC75C 8011605C 3C028015 */ lui $v0, %hi(D_80152220) -/* AC760 80116060 24422220 */ addiu $v0, $v0, %lo(D_80152220) -/* AC764 80116064 3C01800A */ lui $at, %hi(D_8009A5F4) -/* AC768 80116068 AC22A5F4 */ sw $v0, %lo(D_8009A5F4)($at) -/* AC76C 8011606C 3C028015 */ lui $v0, %hi(D_80153220) -/* AC770 80116070 24423220 */ addiu $v0, $v0, %lo(D_80153220) -/* AC774 80116074 3C018015 */ lui $at, %hi(D_801512F0) -/* AC778 80116078 AC2212F0 */ sw $v0, %lo(D_801512F0)($at) -/* AC77C 8011607C 3C028015 */ lui $v0, %hi(D_80153228) -/* AC780 80116080 24423228 */ addiu $v0, $v0, %lo(D_80153228) -/* AC784 80116084 3C018015 */ lui $at, %hi(wFog) -/* AC788 80116088 AC223264 */ sw $v0, %lo(wFog)($at) -/* AC78C 8011608C 03E00008 */ jr $ra -/* AC790 80116090 00000000 */ nop -.L80116094: -/* AC794 80116094 3C028015 */ lui $v0, %hi(gBattleModelList) -/* AC798 80116098 24421B70 */ addiu $v0, $v0, %lo(gBattleModelList) -/* AC79C 8011609C 3C018015 */ lui $at, %hi(gCurrentModelListPtr) -/* AC7A0 801160A0 AC2212CC */ sw $v0, %lo(gCurrentModelListPtr)($at) -/* AC7A4 801160A4 3C028015 */ lui $v0, %hi(D_80151F80) -/* AC7A8 801160A8 24421F80 */ addiu $v0, $v0, %lo(D_80151F80) -/* AC7AC 801160AC 3C018015 */ lui $at, %hi(gCurrentTransformGroups) -/* AC7B0 801160B0 AC2212E0 */ sw $v0, %lo(gCurrentTransformGroups)($at) -/* AC7B4 801160B4 3C028015 */ lui $v0, %hi(gBattleModelSpecialDls) -/* AC7B8 801160B8 24422010 */ addiu $v0, $v0, %lo(gBattleModelSpecialDls) -/* AC7BC 801160BC 3C018015 */ lui $at, %hi(gCurrentModelSpecialDlsPtr) -/* AC7C0 801160C0 AC2212E8 */ sw $v0, %lo(gCurrentModelSpecialDlsPtr)($at) -/* AC7C4 801160C4 3C028015 */ lui $v0, %hi(D_80152110) -/* AC7C8 801160C8 24422110 */ addiu $v0, $v0, %lo(D_80152110) -/* AC7CC 801160CC 3C018015 */ lui $at, %hi(gCurrentCustomModelGfxBuilders) -/* AC7D0 801160D0 AC2212B8 */ sw $v0, %lo(gCurrentCustomModelGfxBuilders)($at) -/* AC7D4 801160D4 3C028015 */ lui $v0, %hi(D_80152218) -/* AC7D8 801160D8 24422218 */ addiu $v0, $v0, %lo(D_80152218) -/* AC7DC 801160DC 3C018015 */ lui $at, %hi(D_801512FC) -/* AC7E0 801160E0 AC2212FC */ sw $v0, %lo(D_801512FC)($at) -/* AC7E4 801160E4 3C028015 */ lui $v0, %hi(D_801521D0) -/* AC7E8 801160E8 244221D0 */ addiu $v0, $v0, %lo(D_801521D0) -/* AC7EC 801160EC 3C018015 */ lui $at, %hi(D_80152210) -/* AC7F0 801160F0 AC222210 */ sw $v0, %lo(D_80152210)($at) -/* AC7F4 801160F4 3C028015 */ lui $v0, %hi(D_80152A20) -/* AC7F8 801160F8 24422A20 */ addiu $v0, $v0, %lo(D_80152A20) -/* AC7FC 801160FC 3C01800A */ lui $at, %hi(D_8009A5F4) -/* AC800 80116100 AC22A5F4 */ sw $v0, %lo(D_8009A5F4)($at) -/* AC804 80116104 3C028015 */ lui $v0, %hi(D_80153221) -/* AC808 80116108 24423221 */ addiu $v0, $v0, %lo(D_80153221) -/* AC80C 8011610C 3C018015 */ lui $at, %hi(D_801512F0) -/* AC810 80116110 AC2212F0 */ sw $v0, %lo(D_801512F0)($at) -/* AC814 80116114 3C028015 */ lui $v0, %hi(D_80153248) -/* AC818 80116118 24423248 */ addiu $v0, $v0, %lo(D_80153248) -/* AC81C 8011611C 3C018015 */ lui $at, %hi(wFog) -/* AC820 80116120 AC223264 */ sw $v0, %lo(wFog)($at) -/* AC824 80116124 03E00008 */ jr $ra -/* AC828 80116128 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_entity_data_loaded.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_entity_data_loaded.s index 6e79875699..85bbabd86c 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_entity_data_loaded.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_entity_data_loaded.s @@ -7,12 +7,12 @@ glabel is_entity_data_loaded /* A7864 80111164 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* A7868 80111168 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* A786C 8011116C 80420070 */ lb $v0, 0x70($v0) -/* A7870 80111170 3C098015 */ lui $t1, %hi(D_801516E8) -/* A7874 80111174 252916E8 */ addiu $t1, $t1, %lo(D_801516E8) +/* A7870 80111170 3C098015 */ lui $t1, %hi(bStaticEntityData) +/* A7874 80111174 252916E8 */ addiu $t1, $t1, %lo(bStaticEntityData) /* A7878 80111178 14400003 */ bnez $v0, .L80111188 /* A787C 8011117C 0000582D */ daddu $t3, $zero, $zero -/* A7880 80111180 3C098015 */ lui $t1, %hi(D_80151668) -/* A7884 80111184 25291668 */ addiu $t1, $t1, %lo(D_80151668) +/* A7880 80111180 3C098015 */ lui $t1, %hi(wStaticEntityData) +/* A7884 80111184 25291668 */ addiu $t1, $t1, %lo(wStaticEntityData) .L80111188: /* A7888 80111188 0000502D */ daddu $t2, $zero, $zero .L8011118C: diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_identity_fixed_mtx.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_identity_fixed_mtx.s deleted file mode 100644 index cab09cb145..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_identity_fixed_mtx.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel is_identity_fixed_mtx -/* B2514 8011BE14 14800005 */ bnez $a0, .L8011BE2C -/* B2518 8011BE18 0000282D */ daddu $a1, $zero, $zero -/* B251C 8011BE1C 03E00008 */ jr $ra -/* B2520 8011BE20 24020001 */ addiu $v0, $zero, 1 -.L8011BE24: -/* B2524 8011BE24 03E00008 */ jr $ra -/* B2528 8011BE28 0000102D */ daddu $v0, $zero, $zero -.L8011BE2C: -/* B252C 8011BE2C 3C068015 */ lui $a2, %hi(D_8014B768) -/* B2530 8011BE30 24C6B768 */ addiu $a2, $a2, %lo(D_8014B768) -.L8011BE34: -/* B2534 8011BE34 8C830000 */ lw $v1, ($a0) -/* B2538 8011BE38 8CC20000 */ lw $v0, ($a2) -/* B253C 8011BE3C 1462FFF9 */ bne $v1, $v0, .L8011BE24 -/* B2540 8011BE40 24A50001 */ addiu $a1, $a1, 1 -/* B2544 8011BE44 24840004 */ addiu $a0, $a0, 4 -/* B2548 8011BE48 28A20010 */ slti $v0, $a1, 0x10 -/* B254C 8011BE4C 1440FFF9 */ bnez $v0, .L8011BE34 -/* B2550 8011BE50 24C60004 */ addiu $a2, $a2, 4 -/* B2554 8011BE54 03E00008 */ jr $ra -/* B2558 8011BE58 24020001 */ addiu $v0, $zero, 1 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_data_for_models.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_data_for_models.s deleted file mode 100644 index 66a1e63ddf..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_data_for_models.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel load_data_for_models -/* B1448 8011AD48 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B144C 8011AD4C AFB00050 */ sw $s0, 0x50($sp) -/* B1450 8011AD50 0080802D */ daddu $s0, $a0, $zero -/* B1454 8011AD54 AFB10054 */ sw $s1, 0x54($sp) -/* B1458 8011AD58 00A0882D */ daddu $s1, $a1, $zero -/* B145C 8011AD5C AFB20058 */ sw $s2, 0x58($sp) -/* B1460 8011AD60 00C0902D */ daddu $s2, $a2, $zero -/* B1464 8011AD64 AFBF005C */ sw $ra, 0x5c($sp) -/* B1468 8011AD68 0C019D28 */ jal guMtxIdentF -/* B146C 8011AD6C 27A40010 */ addiu $a0, $sp, 0x10 -/* B1470 8011AD70 12200004 */ beqz $s1, .L8011AD84 -/* B1474 8011AD74 0200202D */ daddu $a0, $s0, $zero -/* B1478 8011AD78 0220282D */ daddu $a1, $s1, $zero -/* B147C 8011AD7C 0C045709 */ jal load_model_textures -/* B1480 8011AD80 0240302D */ daddu $a2, $s2, $zero -.L8011AD84: -/* B1484 8011AD84 3C028015 */ lui $v0, %hi(D_801512FC) -/* B1488 8011AD88 8C4212FC */ lw $v0, %lo(D_801512FC)($v0) -/* B148C 8011AD8C AC500000 */ sw $s0, ($v0) -/* B1490 8011AD90 3C018015 */ lui $at, %hi(D_80153224) -/* B1494 8011AD94 AC203224 */ sw $zero, %lo(D_80153224)($at) -/* B1498 8011AD98 12000005 */ beqz $s0, .L8011ADB0 -/* B149C 8011AD9C 0200202D */ daddu $a0, $s0, $zero -/* B14A0 8011ADA0 0000282D */ daddu $a1, $zero, $zero -/* B14A4 8011ADA4 27A60010 */ addiu $a2, $sp, 0x10 -/* B14A8 8011ADA8 0C046B72 */ jal load_model_transforms -/* B14AC 8011ADAC 00A0382D */ daddu $a3, $a1, $zero -.L8011ADB0: -/* B14B0 8011ADB0 8FBF005C */ lw $ra, 0x5c($sp) -/* B14B4 8011ADB4 8FB20058 */ lw $s2, 0x58($sp) -/* B14B8 8011ADB8 8FB10054 */ lw $s1, 0x54($sp) -/* B14BC 8011ADBC 8FB00050 */ lw $s0, 0x50($sp) -/* B14C0 8011ADC0 03E00008 */ jr $ra -/* B14C4 8011ADC4 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_model_textures.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_model_textures.s index a98a276282..fa2b9efb2f 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_model_textures.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_model_textures.s @@ -7,13 +7,13 @@ glabel load_model_textures /* AC32C 80115C2C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AC330 80115C30 AFBF0010 */ sw $ra, 0x10($sp) /* AC334 80115C34 80420070 */ lb $v0, 0x70($v0) -/* AC338 80115C38 3C038015 */ lui $v1, %hi(D_8014B748) -/* AC33C 80115C3C 8C63B748 */ lw $v1, %lo(D_8014B748)($v1) +/* AC338 80115C38 3C038015 */ lui $v1, %hi(mdl_textureBaseAddress) +/* AC33C 80115C3C 8C63B748 */ lw $v1, %lo(mdl_textureBaseAddress)($v1) /* AC340 80115C40 0002102B */ sltu $v0, $zero, $v0 /* AC344 80115C44 00021440 */ sll $v0, $v0, 0x11 /* AC348 80115C48 00621821 */ addu $v1, $v1, $v0 -/* AC34C 80115C4C 3C018015 */ lui $at, %hi(D_80153368) -/* AC350 80115C50 AC233368 */ sw $v1, %lo(D_80153368)($at) +/* AC34C 80115C4C 3C018015 */ lui $at, %hi(mdl_nextTextureAddress) +/* AC350 80115C50 AC233368 */ sw $v1, %lo(mdl_nextTextureAddress)($at) /* AC354 80115C54 10800011 */ beqz $a0, .L80115C9C /* AC358 80115C58 00000000 */ nop /* AC35C 80115C5C 10A0000F */ beqz $a1, .L80115C9C @@ -27,8 +27,8 @@ glabel load_model_textures /* AC378 80115C78 2463FFFF */ addiu $v1, $v1, -1 /* AC37C 80115C7C 0461FFFD */ bgez $v1, .L80115C74 /* AC380 80115C80 2442FFBC */ addiu $v0, $v0, -0x44 -/* AC384 80115C84 3C018015 */ lui $at, %hi(D_80153224) -/* AC388 80115C88 AC203224 */ sw $zero, %lo(D_80153224)($at) +/* AC384 80115C84 3C018015 */ lui $at, %hi(mdl_treeIterPos) +/* AC388 80115C88 AC203224 */ sw $zero, %lo(mdl_treeIterPos)($at) /* AC38C 80115C8C 10800003 */ beqz $a0, .L80115C9C /* AC390 80115C90 00000000 */ nop /* AC394 80115C94 0C0456D1 */ jal _load_model_textures diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_model_transforms.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_model_transforms.s index f94311a20b..07c4f5ffdf 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_model_transforms.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_model_transforms.s @@ -68,10 +68,10 @@ glabel load_model_transforms /* B15B0 8011AEB0 1440FFF1 */ bnez $v0, .L8011AE78 /* B15B4 8011AEB4 0260302D */ daddu $a2, $s3, $zero .L8011AEB8: -/* B15B8 8011AEB8 3C048015 */ lui $a0, %hi(D_80153224) -/* B15BC 8011AEBC 24843224 */ addiu $a0, $a0, %lo(D_80153224) -/* B15C0 8011AEC0 3C05800A */ lui $a1, %hi(D_8009A5F4) -/* B15C4 8011AEC4 24A5A5F4 */ addiu $a1, $a1, %lo(D_8009A5F4) +/* B15B8 8011AEB8 3C048015 */ lui $a0, %hi(mdl_treeIterPos) +/* B15BC 8011AEBC 24843224 */ addiu $a0, $a0, %lo(mdl_treeIterPos) +/* B15C0 8011AEC0 3C05800A */ lui $a1, %hi(mdl_currentModelTreeNodeInfo) +/* B15C4 8011AEC4 24A5A5F4 */ addiu $a1, $a1, %lo(mdl_currentModelTreeNodeInfo) /* B15C8 8011AEC8 8C820000 */ lw $v0, ($a0) /* B15CC 8011AECC 8CA30000 */ lw $v1, ($a1) /* B15D0 8011AED0 00021080 */ sll $v0, $v0, 2 @@ -104,16 +104,16 @@ glabel load_model_transforms /* B1634 8011AF34 0240202D */ daddu $a0, $s2, $zero /* B1638 8011AF38 0C04572A */ jal mdl_get_child_count /* B163C 8011AF3C 0220202D */ daddu $a0, $s1, $zero -/* B1640 8011AF40 3C078015 */ lui $a3, %hi(D_80153224) -/* B1644 8011AF44 24E73224 */ addiu $a3, $a3, %lo(D_80153224) +/* B1640 8011AF40 3C078015 */ lui $a3, %hi(mdl_treeIterPos) +/* B1644 8011AF44 24E73224 */ addiu $a3, $a3, %lo(mdl_treeIterPos) /* B1648 8011AF48 8CF00000 */ lw $s0, ($a3) /* B164C 8011AF4C 0040202D */ daddu $a0, $v0, $zero /* B1650 8011AF50 02041021 */ addu $v0, $s0, $a0 /* B1654 8011AF54 0202102A */ slt $v0, $s0, $v0 /* B1658 8011AF58 10400011 */ beqz $v0, .L8011AFA0 /* B165C 8011AF5C 240800FF */ addiu $t0, $zero, 0xff -/* B1660 8011AF60 3C05800A */ lui $a1, %hi(D_8009A5F4) -/* B1664 8011AF64 24A5A5F4 */ addiu $a1, $a1, %lo(D_8009A5F4) +/* B1660 8011AF60 3C05800A */ lui $a1, %hi(mdl_currentModelTreeNodeInfo) +/* B1664 8011AF64 24A5A5F4 */ addiu $a1, $a1, %lo(mdl_currentModelTreeNodeInfo) /* B1668 8011AF68 26860001 */ addiu $a2, $s4, 1 .L8011AF6C: /* B166C 8011AF6C 8CA20000 */ lw $v0, ($a1) @@ -130,8 +130,8 @@ glabel load_model_transforms /* B1698 8011AF98 1440FFF4 */ bnez $v0, .L8011AF6C /* B169C 8011AF9C 00000000 */ nop .L8011AFA0: -/* B16A0 8011AFA0 3C038015 */ lui $v1, %hi(D_80153224) -/* B16A4 8011AFA4 24633224 */ addiu $v1, $v1, %lo(D_80153224) +/* B16A0 8011AFA0 3C038015 */ lui $v1, %hi(mdl_treeIterPos) +/* B16A4 8011AFA4 24633224 */ addiu $v1, $v1, %lo(mdl_treeIterPos) /* B16A8 8011AFA8 8C620000 */ lw $v0, ($v1) /* B16AC 8011AFAC 00441021 */ addu $v0, $v0, $a0 /* B16B0 8011AFB0 AC620000 */ sw $v0, ($v1) @@ -139,11 +139,11 @@ glabel load_model_transforms .L8011AFB8: /* B16B8 8011AFB8 0C045883 */ jal mdl_create_model /* B16BC 8011AFBC 24050004 */ addiu $a1, $zero, 4 -/* B16C0 8011AFC0 3C038015 */ lui $v1, %hi(D_80153224) -/* B16C4 8011AFC4 24633224 */ addiu $v1, $v1, %lo(D_80153224) +/* B16C0 8011AFC0 3C038015 */ lui $v1, %hi(mdl_treeIterPos) +/* B16C4 8011AFC4 24633224 */ addiu $v1, $v1, %lo(mdl_treeIterPos) /* B16C8 8011AFC8 8C620000 */ lw $v0, ($v1) -/* B16CC 8011AFCC 3C04800A */ lui $a0, %hi(D_8009A5F4) -/* B16D0 8011AFD0 8C84A5F4 */ lw $a0, %lo(D_8009A5F4)($a0) +/* B16CC 8011AFCC 3C04800A */ lui $a0, %hi(mdl_currentModelTreeNodeInfo) +/* B16D0 8011AFD0 8C84A5F4 */ lw $a0, %lo(mdl_currentModelTreeNodeInfo)($a0) /* B16D4 8011AFD4 00021080 */ sll $v0, $v0, 2 /* B16D8 8011AFD8 00441021 */ addu $v0, $v0, $a0 /* B16DC 8011AFDC A0540001 */ sb $s4, 1($v0) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_simple_entity_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_simple_entity_data.s deleted file mode 100644 index 73e4f23255..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_simple_entity_data.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel load_simple_entity_data -/* A79A4 801112A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A79A8 801112A8 AFB20020 */ sw $s2, 0x20($sp) -/* A79AC 801112AC 0080902D */ daddu $s2, $a0, $zero -/* A79B0 801112B0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A79B4 801112B4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A79B8 801112B8 2403000A */ addiu $v1, $zero, 0xa -/* A79BC 801112BC AFBF0024 */ sw $ra, 0x24($sp) -/* A79C0 801112C0 AFB1001C */ sw $s1, 0x1c($sp) -/* A79C4 801112C4 AFB00018 */ sw $s0, 0x18($sp) -/* A79C8 801112C8 A6430012 */ sh $v1, 0x12($s2) -/* A79CC 801112CC 80420070 */ lb $v0, 0x70($v0) -/* A79D0 801112D0 14400005 */ bnez $v0, .L801112E8 -/* A79D4 801112D4 00A0882D */ daddu $s1, $a1, $zero -/* A79D8 801112D8 3C108015 */ lui $s0, %hi(D_8015165C) -/* A79DC 801112DC 8E10165C */ lw $s0, %lo(D_8015165C)($s0) -/* A79E0 801112E0 080444BD */ j .L801112F4 -/* A79E4 801112E4 0240202D */ daddu $a0, $s2, $zero -.L801112E8: -/* A79E8 801112E8 3C108015 */ lui $s0, %hi(D_80151660) -/* A79EC 801112EC 8E101660 */ lw $s0, %lo(D_80151660)($s0) -/* A79F0 801112F0 0240202D */ daddu $a0, $s2, $zero -.L801112F4: -/* A79F4 801112F4 0220282D */ daddu $a1, $s1, $zero -/* A79F8 801112F8 27A60010 */ addiu $a2, $sp, 0x10 -/* A79FC 801112FC 0C044457 */ jal is_entity_data_loaded -/* A7A00 80111300 27A70014 */ addiu $a3, $sp, 0x14 -/* A7A04 80111304 10400020 */ beqz $v0, .L80111388 -/* A7A08 80111308 00000000 */ nop -/* A7A0C 8011130C 8E22001C */ lw $v0, 0x1c($s1) -/* A7A10 80111310 8E230018 */ lw $v1, 0x18($s1) -/* A7A14 80111314 00431023 */ subu $v0, $v0, $v1 -/* A7A18 80111318 00021083 */ sra $v0, $v0, 2 -/* A7A1C 8011131C 02021021 */ addu $v0, $s0, $v0 -/* A7A20 80111320 2C425FFD */ sltiu $v0, $v0, 0x5ffd -/* A7A24 80111324 14400007 */ bnez $v0, .L80111344 -/* A7A28 80111328 00000000 */ nop -/* A7A2C 8011132C 0C0441A9 */ jal get_entity_type -/* A7A30 80111330 92440004 */ lbu $a0, 4($s2) -/* A7A34 80111334 0C0441A9 */ jal get_entity_type -/* A7A38 80111338 92440004 */ lbu $a0, 4($s2) -.L8011133C: -/* A7A3C 8011133C 080444CF */ j .L8011133C -/* A7A40 80111340 00000000 */ nop -.L80111344: -/* A7A44 80111344 8E22001C */ lw $v0, 0x1c($s1) -/* A7A48 80111348 3C068015 */ lui $a2, %hi(D_801512C4) -/* A7A4C 8011134C 8CC612C4 */ lw $a2, %lo(D_801512C4)($a2) -/* A7A50 80111350 00431023 */ subu $v0, $v0, $v1 -/* A7A54 80111354 00022883 */ sra $a1, $v0, 2 -/* A7A58 80111358 00101080 */ sll $v0, $s0, 2 -/* A7A5C 8011135C 00C23023 */ subu $a2, $a2, $v0 -/* A7A60 80111360 00051080 */ sll $v0, $a1, 2 -/* A7A64 80111364 00C23023 */ subu $a2, $a2, $v0 -/* A7A68 80111368 AE460044 */ sw $a2, 0x44($s2) -/* A7A6C 8011136C 8E240018 */ lw $a0, 0x18($s1) -/* A7A70 80111370 0C00A5CF */ jal dma_copy -/* A7A74 80111374 8E25001C */ lw $a1, 0x1c($s1) -/* A7A78 80111378 00021082 */ srl $v0, $v0, 2 -/* A7A7C 8011137C 92440004 */ lbu $a0, 4($s2) -/* A7A80 80111380 080444EF */ j .L801113BC -/* A7A84 80111384 02028021 */ addu $s0, $s0, $v0 -.L80111388: -/* A7A88 80111388 8E22001C */ lw $v0, 0x1c($s1) -/* A7A8C 8011138C 8E230018 */ lw $v1, 0x18($s1) -/* A7A90 80111390 92440004 */ lbu $a0, 4($s2) -/* A7A94 80111394 00431023 */ subu $v0, $v0, $v1 -/* A7A98 80111398 00022883 */ sra $a1, $v0, 2 -/* A7A9C 8011139C 8FA20010 */ lw $v0, 0x10($sp) -/* A7AA0 801113A0 3C038015 */ lui $v1, %hi(D_801512C4) -/* A7AA4 801113A4 8C6312C4 */ lw $v1, %lo(D_801512C4)($v1) -/* A7AA8 801113A8 00021080 */ sll $v0, $v0, 2 -/* A7AAC 801113AC 00621823 */ subu $v1, $v1, $v0 -/* A7AB0 801113B0 00051080 */ sll $v0, $a1, 2 -/* A7AB4 801113B4 00621823 */ subu $v1, $v1, $v0 -/* A7AB8 801113B8 AE430044 */ sw $v1, 0x44($s2) -.L801113BC: -/* A7ABC 801113BC 0C0441A9 */ jal get_entity_type -/* A7AC0 801113C0 00000000 */ nop -/* A7AC4 801113C4 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A7AC8 801113C8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A7ACC 801113CC 80420070 */ lb $v0, 0x70($v0) -/* A7AD0 801113D0 14400005 */ bnez $v0, .L801113E8 -/* A7AD4 801113D4 00000000 */ nop -/* A7AD8 801113D8 3C018015 */ lui $at, %hi(D_8015165C) -/* A7ADC 801113DC AC30165C */ sw $s0, %lo(D_8015165C)($at) -/* A7AE0 801113E0 080444FC */ j .L801113F0 -/* A7AE4 801113E4 00000000 */ nop -.L801113E8: -/* A7AE8 801113E8 3C018015 */ lui $at, %hi(D_80151660) -/* A7AEC 801113EC AC301660 */ sw $s0, %lo(D_80151660)($at) -.L801113F0: -/* A7AF0 801113F0 8FBF0024 */ lw $ra, 0x24($sp) -/* A7AF4 801113F4 8FB20020 */ lw $s2, 0x20($sp) -/* A7AF8 801113F8 8FB1001C */ lw $s1, 0x1c($sp) -/* A7AFC 801113FC 8FB00018 */ lw $s0, 0x18($sp) -/* A7B00 80111400 03E00008 */ jr $ra -/* A7B04 80111404 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_split_entity_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_split_entity_data.s index 8d309d947e..0d799a5886 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_split_entity_data.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_split_entity_data.s @@ -93,13 +93,13 @@ glabel L80111480_A7B80 /* A7C34 80111534 80420070 */ lb $v0, 0x70($v0) /* A7C38 80111538 14400005 */ bnez $v0, .L80111550 /* A7C3C 8011153C 00000000 */ nop -/* A7C40 80111540 3C128015 */ lui $s2, %hi(D_8015165C) -/* A7C44 80111544 8E52165C */ lw $s2, %lo(D_8015165C)($s2) +/* A7C40 80111540 3C128015 */ lui $s2, %hi(wStaticEntityDataSize) +/* A7C44 80111544 8E52165C */ lw $s2, %lo(wStaticEntityDataSize)($s2) /* A7C48 80111548 08044556 */ j .L80111558 /* A7C4C 8011154C 00000000 */ nop .L80111550: -/* A7C50 80111550 3C128015 */ lui $s2, %hi(D_80151660) -/* A7C54 80111554 8E521660 */ lw $s2, %lo(D_80151660)($s2) +/* A7C50 80111550 3C128015 */ lui $s2, %hi(bStaticEntityDataSize) +/* A7C54 80111554 8E521660 */ lw $s2, %lo(bStaticEntityDataSize)($s2) .L80111558: /* A7C58 80111558 8E620004 */ lw $v0, 4($s3) /* A7C5C 8011155C 8E630000 */ lw $v1, ($s3) @@ -130,8 +130,8 @@ glabel L80111480_A7B80 /* A7CB4 801115B4 0804456D */ j .L801115B4 /* A7CB8 801115B8 00000000 */ nop .L801115BC: -/* A7CBC 801115BC 3C118015 */ lui $s1, %hi(D_801512C4) -/* A7CC0 801115C0 263112C4 */ addiu $s1, $s1, %lo(D_801512C4) +/* A7CBC 801115BC 3C118015 */ lui $s1, %hi(gEntityHeapBase) +/* A7CC0 801115C0 263112C4 */ addiu $s1, $s1, %lo(gEntityHeapBase) /* A7CC4 801115C4 8E640000 */ lw $a0, ($s3) /* A7CC8 801115C8 8E260000 */ lw $a2, ($s1) /* A7CCC 801115CC 8E650004 */ lw $a1, 4($s3) @@ -170,20 +170,20 @@ glabel L80111480_A7B80 /* A7D50 80111650 80420070 */ lb $v0, 0x70($v0) /* A7D54 80111654 14400005 */ bnez $v0, .L8011166C /* A7D58 80111658 24150001 */ addiu $s5, $zero, 1 -/* A7D5C 8011165C 3C018015 */ lui $at, %hi(D_8015165C) -/* A7D60 80111660 AC32165C */ sw $s2, %lo(D_8015165C)($at) +/* A7D5C 8011165C 3C018015 */ lui $at, %hi(wStaticEntityDataSize) +/* A7D60 80111660 AC32165C */ sw $s2, %lo(wStaticEntityDataSize)($at) /* A7D64 80111664 080445C4 */ j .L80111710 /* A7D68 80111668 00000000 */ nop .L8011166C: -/* A7D6C 8011166C 3C018015 */ lui $at, %hi(D_80151660) -/* A7D70 80111670 AC321660 */ sw $s2, %lo(D_80151660)($at) +/* A7D6C 8011166C 3C018015 */ lui $at, %hi(bStaticEntityDataSize) +/* A7D70 80111670 AC321660 */ sw $s2, %lo(bStaticEntityDataSize)($at) /* A7D74 80111674 080445C4 */ j .L80111710 /* A7D78 80111678 00000000 */ nop .L8011167C: /* A7D7C 8011167C 8E620004 */ lw $v0, 4($s3) /* A7D80 80111680 8E630000 */ lw $v1, ($s3) -/* A7D84 80111684 3C058015 */ lui $a1, %hi(D_801512C4) -/* A7D88 80111688 8CA512C4 */ lw $a1, %lo(D_801512C4)($a1) +/* A7D84 80111684 3C058015 */ lui $a1, %hi(gEntityHeapBase) +/* A7D88 80111688 8CA512C4 */ lw $a1, %lo(gEntityHeapBase)($a1) /* A7D8C 8011168C 00431023 */ subu $v0, $v0, $v1 /* A7D90 80111690 00021883 */ sra $v1, $v0, 2 /* A7D94 80111694 8FA20010 */ lw $v0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_tile_header.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_tile_header.s index e9c7ae625c..78f2aebdb4 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_tile_header.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_tile_header.s @@ -24,12 +24,12 @@ glabel load_tile_header /* AB4B8 80114DB8 03C2102B */ sltu $v0, $fp, $v0 /* AB4BC 80114DBC 10400171 */ beqz $v0, .L80115384 /* AB4C0 80114DC0 24160001 */ addiu $s6, $zero, 1 -/* AB4C4 80114DC4 3C128015 */ lui $s2, %hi(D_80151740) -/* AB4C8 80114DC8 26521740 */ addiu $s2, $s2, %lo(D_80151740) +/* AB4C4 80114DC4 3C128015 */ lui $s2, %hi(gCurrentTileDescriptor) +/* AB4C8 80114DC8 26521740 */ addiu $s2, $s2, %lo(gCurrentTileDescriptor) /* AB4CC 80114DCC 0280202D */ daddu $a0, $s4, $zero .L80114DD0: -/* AB4D0 80114DD0 3C068015 */ lui $a2, %hi(D_80151740) -/* AB4D4 80114DD4 24C61740 */ addiu $a2, $a2, %lo(D_80151740) +/* AB4D0 80114DD0 3C068015 */ lui $a2, %hi(gCurrentTileDescriptor) +/* AB4D4 80114DD4 24C61740 */ addiu $a2, $a2, %lo(gCurrentTileDescriptor) /* AB4D8 80114DD8 0C00A5CF */ jal dma_copy /* AB4DC 80114DDC 26850030 */ addiu $a1, $s4, 0x30 /* AB4E0 80114DE0 96430022 */ lhu $v1, 0x22($s2) @@ -454,19 +454,19 @@ glabel load_tile_header /* ABA90 80115390 14400009 */ bnez $v0, .L801153B8 /* ABA94 80115394 00000000 */ nop .L80115398: -/* ABA98 80115398 3C028015 */ lui $v0, %hi(D_80153224) -/* ABA9C 8011539C 8C423224 */ lw $v0, %lo(D_80153224)($v0) -/* ABAA0 801153A0 3C03800A */ lui $v1, %hi(D_8009A5F4) -/* ABAA4 801153A4 8C63A5F4 */ lw $v1, %lo(D_8009A5F4)($v1) +/* ABA98 80115398 3C028015 */ lui $v0, %hi(mdl_treeIterPos) +/* ABA9C 8011539C 8C423224 */ lw $v0, %lo(mdl_treeIterPos)($v0) +/* ABAA0 801153A0 3C03800A */ lui $v1, %hi(mdl_currentModelTreeNodeInfo) +/* ABAA4 801153A4 8C63A5F4 */ lw $v1, %lo(mdl_currentModelTreeNodeInfo)($v1) /* ABAA8 801153A8 00021080 */ sll $v0, $v0, 2 /* ABAAC 801153AC 00431021 */ addu $v0, $v0, $v1 /* ABAB0 801153B0 0804551A */ j .L80115468 /* ABAB4 801153B4 A0400002 */ sb $zero, 2($v0) .L801153B8: -/* ABAB8 801153B8 3C168015 */ lui $s6, %hi(D_80153224) -/* ABABC 801153BC 26D63224 */ addiu $s6, $s6, %lo(D_80153224) -/* ABAC0 801153C0 3C17800A */ lui $s7, %hi(D_8009A5F4) -/* ABAC4 801153C4 26F7A5F4 */ addiu $s7, $s7, %lo(D_8009A5F4) +/* ABAB8 801153B8 3C168015 */ lui $s6, %hi(mdl_treeIterPos) +/* ABABC 801153BC 26D63224 */ addiu $s6, $s6, %lo(mdl_treeIterPos) +/* ABAC0 801153C0 3C17800A */ lui $s7, %hi(mdl_currentModelTreeNodeInfo) +/* ABAC4 801153C4 26F7A5F4 */ addiu $s7, $s7, %lo(mdl_currentModelTreeNodeInfo) /* ABAC8 801153C8 8EC20000 */ lw $v0, ($s6) /* ABACC 801153CC 8EE30000 */ lw $v1, ($s7) /* ABAD0 801153D0 8FA80020 */ lw $t0, 0x20($sp) @@ -479,8 +479,8 @@ glabel load_tile_header /* ABAEC 801153EC 00021080 */ sll $v0, $v0, 2 /* ABAF0 801153F0 00431021 */ addu $v0, $v0, $v1 /* ABAF4 801153F4 90430002 */ lbu $v1, 2($v0) -/* ABAF8 801153F8 3C048016 */ lui $a0, %hi(D_8015A590) -/* ABAFC 801153FC 2484A590 */ addiu $a0, $a0, %lo(D_8015A590) +/* ABAF8 801153F8 3C048016 */ lui $a0, %hi(mdl_textureHandles) +/* ABAFC 801153FC 2484A590 */ addiu $a0, $a0, %lo(mdl_textureHandles) /* ABB00 80115400 00031100 */ sll $v0, $v1, 4 /* ABB04 80115404 00431021 */ addu $v0, $v0, $v1 /* ABB08 80115408 00021080 */ sll $v0, $v0, 2 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/make_transform_group.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/make_transform_group.s deleted file mode 100644 index cd54c289a0..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/make_transform_group.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel make_transform_group -/* B1A7C 8011B37C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B1A80 8011B380 3C038015 */ lui $v1, %hi(D_801512FC) -/* B1A84 8011B384 8C6312FC */ lw $v1, %lo(D_801512FC)($v1) -/* B1A88 8011B388 0080102D */ daddu $v0, $a0, $zero -/* B1A8C 8011B38C AFB00030 */ sw $s0, 0x30($sp) -/* B1A90 8011B390 3C108015 */ lui $s0, %hi(D_80153370) -/* B1A94 8011B394 26103370 */ addiu $s0, $s0, %lo(D_80153370) -/* B1A98 8011B398 AFBF003C */ sw $ra, 0x3c($sp) -/* B1A9C 8011B39C AFB20038 */ sw $s2, 0x38($sp) -/* B1AA0 8011B3A0 AFB10034 */ sw $s1, 0x34($sp) -/* B1AA4 8011B3A4 3C018015 */ lui $at, %hi(D_80153224) -/* B1AA8 8011B3A8 AC203224 */ sw $zero, %lo(D_80153224)($at) -/* B1AAC 8011B3AC AE000000 */ sw $zero, ($s0) -/* B1AB0 8011B3B0 3C018015 */ lui $at, %hi(D_8015336E) -/* B1AB4 8011B3B4 A422336E */ sh $v0, %lo(D_8015336E)($at) -/* B1AB8 8011B3B8 3C018015 */ lui $at, %hi(D_80153376) -/* B1ABC 8011B3BC A4203376 */ sh $zero, %lo(D_80153376)($at) -/* B1AC0 8011B3C0 3C018015 */ lui $at, %hi(D_80153374) -/* B1AC4 8011B3C4 A4203374 */ sh $zero, %lo(D_80153374)($at) -/* B1AC8 8011B3C8 8C640000 */ lw $a0, ($v1) -/* B1ACC 8011B3CC 0C046C76 */ jal func_8011B1D8 -/* B1AD0 8011B3D0 0040902D */ daddu $s2, $v0, $zero -/* B1AD4 8011B3D4 8E020000 */ lw $v0, ($s0) -/* B1AD8 8011B3D8 10400077 */ beqz $v0, .L8011B5B8 -/* B1ADC 8011B3DC 0000802D */ daddu $s0, $zero, $zero -/* B1AE0 8011B3E0 3C118015 */ lui $s1, %hi(gCurrentTransformGroups) -/* B1AE4 8011B3E4 263112E0 */ addiu $s1, $s1, %lo(gCurrentTransformGroups) -/* B1AE8 8011B3E8 8E230000 */ lw $v1, ($s1) -.L8011B3EC: -/* B1AEC 8011B3EC 8C620000 */ lw $v0, ($v1) -/* B1AF0 8011B3F0 10400005 */ beqz $v0, .L8011B408 -/* B1AF4 8011B3F4 00000000 */ nop -/* B1AF8 8011B3F8 26100001 */ addiu $s0, $s0, 1 -/* B1AFC 8011B3FC 2A020004 */ slti $v0, $s0, 4 -/* B1B00 8011B400 1440FFFA */ bnez $v0, .L8011B3EC -/* B1B04 8011B404 24630004 */ addiu $v1, $v1, 4 -.L8011B408: -/* B1B08 8011B408 0C00AB39 */ jal heap_malloc -/* B1B0C 8011B40C 240400A0 */ addiu $a0, $zero, 0xa0 -/* B1B10 8011B410 00101880 */ sll $v1, $s0, 2 -/* B1B14 8011B414 0040802D */ daddu $s0, $v0, $zero -/* B1B18 8011B418 24020001 */ addiu $v0, $zero, 1 -/* B1B1C 8011B41C 8E250000 */ lw $a1, ($s1) -/* B1B20 8011B420 3C048015 */ lui $a0, %hi(D_80153374) -/* B1B24 8011B424 94843374 */ lhu $a0, %lo(D_80153374)($a0) -/* B1B28 8011B428 00651821 */ addu $v1, $v1, $a1 -/* B1B2C 8011B42C AC700000 */ sw $s0, ($v1) -/* B1B30 8011B430 A6020000 */ sh $v0, ($s0) -/* B1B34 8011B434 0C046C04 */ jal get_model_list_index_from_tree_index -/* B1B38 8011B438 A6120002 */ sh $s2, 2($s0) -/* B1B3C 8011B43C A202009C */ sb $v0, 0x9c($s0) -/* B1B40 8011B440 3C048015 */ lui $a0, %hi(D_80153376) -/* B1B44 8011B444 94843376 */ lhu $a0, %lo(D_80153376)($a0) -/* B1B48 8011B448 0C046C04 */ jal get_model_list_index_from_tree_index -/* B1B4C 8011B44C 00000000 */ nop -/* B1B50 8011B450 A202009D */ sb $v0, 0x9d($s0) -/* B1B54 8011B454 A200009F */ sb $zero, 0x9f($s0) -/* B1B58 8011B458 3C028015 */ lui $v0, %hi(D_80153370) -/* B1B5C 8011B45C 8C423370 */ lw $v0, %lo(D_80153370)($v0) -/* B1B60 8011B460 26040010 */ addiu $a0, $s0, 0x10 -/* B1B64 8011B464 AE000004 */ sw $zero, 4($s0) -/* B1B68 8011B468 0C019D10 */ jal guMtxIdent -/* B1B6C 8011B46C AE020008 */ sw $v0, 8($s0) -/* B1B70 8011B470 96020000 */ lhu $v0, ($s0) -/* B1B74 8011B474 26040050 */ addiu $a0, $s0, 0x50 -/* B1B78 8011B478 34422000 */ ori $v0, $v0, 0x2000 -/* B1B7C 8011B47C 0C019D28 */ jal guMtxIdentF -/* B1B80 8011B480 A6020000 */ sh $v0, ($s0) -/* B1B84 8011B484 8E110008 */ lw $s1, 8($s0) -/* B1B88 8011B488 8E230000 */ lw $v1, ($s1) -/* B1B8C 8011B48C 24020005 */ addiu $v0, $zero, 5 -/* B1B90 8011B490 10620005 */ beq $v1, $v0, .L8011B4A8 -/* B1B94 8011B494 0220202D */ daddu $a0, $s1, $zero -/* B1B98 8011B498 0C0456C3 */ jal get_model_property -/* B1B9C 8011B49C 2405005C */ addiu $a1, $zero, 0x5c -/* B1BA0 8011B4A0 08046D2E */ j .L8011B4B8 -/* B1BA4 8011B4A4 00000000 */ nop -.L8011B4A8: -/* B1BA8 8011B4A8 0C0456C3 */ jal get_model_property -/* B1BAC 8011B4AC 24050060 */ addiu $a1, $zero, 0x60 -/* B1BB0 8011B4B0 10400006 */ beqz $v0, .L8011B4CC -/* B1BB4 8011B4B4 2442000C */ addiu $v0, $v0, 0xc -.L8011B4B8: -/* B1BB8 8011B4B8 50400005 */ beql $v0, $zero, .L8011B4D0 -/* B1BBC 8011B4BC 24020001 */ addiu $v0, $zero, 1 -/* B1BC0 8011B4C0 9042000B */ lbu $v0, 0xb($v0) -/* B1BC4 8011B4C4 08046D35 */ j .L8011B4D4 -/* B1BC8 8011B4C8 A202009E */ sb $v0, 0x9e($s0) -.L8011B4CC: -/* B1BCC 8011B4CC 24020001 */ addiu $v0, $zero, 1 -.L8011B4D0: -/* B1BD0 8011B4D0 A202009E */ sb $v0, 0x9e($s0) -.L8011B4D4: -/* B1BD4 8011B4D4 0220202D */ daddu $a0, $s1, $zero -/* B1BD8 8011B4D8 0C0456C3 */ jal get_model_property -/* B1BDC 8011B4DC 24050061 */ addiu $a1, $zero, 0x61 -/* B1BE0 8011B4E0 10400017 */ beqz $v0, .L8011B540 -/* B1BE4 8011B4E4 00000000 */ nop -/* B1BE8 8011B4E8 C4460008 */ lwc1 $f6, 8($v0) -/* B1BEC 8011B4EC C440002C */ lwc1 $f0, 0x2c($v0) -/* B1BF0 8011B4F0 46003180 */ add.s $f6, $f6, $f0 -/* B1BF4 8011B4F4 3C013F00 */ lui $at, 0x3f00 -/* B1BF8 8011B4F8 44814000 */ mtc1 $at, $f8 -/* B1BFC 8011B4FC 00000000 */ nop -/* B1C00 8011B500 46083182 */ mul.s $f6, $f6, $f8 -/* B1C04 8011B504 00000000 */ nop -/* B1C08 8011B508 C4440014 */ lwc1 $f4, 0x14($v0) -/* B1C0C 8011B50C C4400038 */ lwc1 $f0, 0x38($v0) -/* B1C10 8011B510 46002100 */ add.s $f4, $f4, $f0 -/* B1C14 8011B514 46082102 */ mul.s $f4, $f4, $f8 -/* B1C18 8011B518 00000000 */ nop -/* B1C1C 8011B51C C4420044 */ lwc1 $f2, 0x44($v0) -/* B1C20 8011B520 C4400020 */ lwc1 $f0, 0x20($v0) -/* B1C24 8011B524 46020000 */ add.s $f0, $f0, $f2 -/* B1C28 8011B528 46080002 */ mul.s $f0, $f0, $f8 -/* B1C2C 8011B52C 00000000 */ nop -/* B1C30 8011B530 E7A60020 */ swc1 $f6, 0x20($sp) -/* B1C34 8011B534 E7A40024 */ swc1 $f4, 0x24($sp) -/* B1C38 8011B538 08046D55 */ j .L8011B554 -/* B1C3C 8011B53C E7A00028 */ swc1 $f0, 0x28($sp) -.L8011B540: -/* B1C40 8011B540 44800000 */ mtc1 $zero, $f0 -/* B1C44 8011B544 00000000 */ nop -/* B1C48 8011B548 E7A00028 */ swc1 $f0, 0x28($sp) -/* B1C4C 8011B54C E7A00024 */ swc1 $f0, 0x24($sp) -/* B1C50 8011B550 E7A00020 */ swc1 $f0, 0x20($sp) -.L8011B554: -/* B1C54 8011B554 8E020004 */ lw $v0, 4($s0) -/* B1C58 8011B558 1040000F */ beqz $v0, .L8011B598 -/* B1C5C 8011B55C 27A20020 */ addiu $v0, $sp, 0x20 -/* B1C60 8011B560 C7A00020 */ lwc1 $f0, 0x20($sp) -/* B1C64 8011B564 C7A20024 */ lwc1 $f2, 0x24($sp) -/* B1C68 8011B568 C7A40028 */ lwc1 $f4, 0x28($sp) -/* B1C6C 8011B56C AFA20010 */ sw $v0, 0x10($sp) -/* B1C70 8011B570 27A20024 */ addiu $v0, $sp, 0x24 -/* B1C74 8011B574 AFA20014 */ sw $v0, 0x14($sp) -/* B1C78 8011B578 27A20028 */ addiu $v0, $sp, 0x28 -/* B1C7C 8011B57C AFA20018 */ sw $v0, 0x18($sp) -/* B1C80 8011B580 8E040004 */ lw $a0, 4($s0) -/* B1C84 8011B584 44050000 */ mfc1 $a1, $f0 -/* B1C88 8011B588 44061000 */ mfc1 $a2, $f2 -/* B1C8C 8011B58C 44072000 */ mfc1 $a3, $f4 -/* B1C90 8011B590 0C019E78 */ jal guMtxXFML -/* B1C94 8011B594 00000000 */ nop -.L8011B598: -/* B1C98 8011B598 C7A00020 */ lwc1 $f0, 0x20($sp) -/* B1C9C 8011B59C C7A20024 */ lwc1 $f2, 0x24($sp) -/* B1CA0 8011B5A0 C7A40028 */ lwc1 $f4, 0x28($sp) -/* B1CA4 8011B5A4 3244FFFF */ andi $a0, $s2, 0xffff -/* B1CA8 8011B5A8 E6000090 */ swc1 $f0, 0x90($s0) -/* B1CAC 8011B5AC E6020094 */ swc1 $f2, 0x94($s0) -/* B1CB0 8011B5B0 0C046D74 */ jal enable_transform_group -/* B1CB4 8011B5B4 E6040098 */ swc1 $f4, 0x98($s0) -.L8011B5B8: -/* B1CB8 8011B5B8 8FBF003C */ lw $ra, 0x3c($sp) -/* B1CBC 8011B5BC 8FB20038 */ lw $s2, 0x38($sp) -/* B1CC0 8011B5C0 8FB10034 */ lw $s1, 0x34($sp) -/* B1CC4 8011B5C4 8FB00030 */ lw $s0, 0x30($sp) -/* B1CC8 8011B5C8 03E00008 */ jr $ra -/* B1CCC 8011B5CC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_create_model.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_create_model.s index df33cd4c5e..ff09c0373c 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_create_model.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_create_model.s @@ -53,8 +53,8 @@ glabel mdl_create_model .L801162CC: /* AC9CC 801162CC 0000982D */ daddu $s3, $zero, $zero .L801162D0: -/* AC9D0 801162D0 3C108015 */ lui $s0, %hi(gCurrentModelListPtr) -/* AC9D4 801162D4 261012CC */ addiu $s0, $s0, %lo(gCurrentModelListPtr) +/* AC9D0 801162D0 3C108015 */ lui $s0, %hi(gCurrentModels) +/* AC9D4 801162D4 261012CC */ addiu $s0, $s0, %lo(gCurrentModels) /* AC9D8 801162D8 8E030000 */ lw $v1, ($s0) .L801162DC: /* AC9DC 801162DC 8C620000 */ lw $v0, ($v1) @@ -120,10 +120,10 @@ glabel mdl_create_model .L801163B8: /* ACAB8 801163B8 A22200A6 */ sb $v0, 0xa6($s1) .L801163BC: -/* ACABC 801163BC 3C028015 */ lui $v0, %hi(D_80153224) -/* ACAC0 801163C0 8C423224 */ lw $v0, %lo(D_80153224)($v0) -/* ACAC4 801163C4 3C03800A */ lui $v1, %hi(D_8009A5F4) -/* ACAC8 801163C8 8C63A5F4 */ lw $v1, %lo(D_8009A5F4)($v1) +/* ACABC 801163BC 3C028015 */ lui $v0, %hi(mdl_treeIterPos) +/* ACAC0 801163C0 8C423224 */ lw $v0, %lo(mdl_treeIterPos)($v0) +/* ACAC4 801163C4 3C03800A */ lui $v1, %hi(mdl_currentModelTreeNodeInfo) +/* ACAC8 801163C8 8C63A5F4 */ lw $v1, %lo(mdl_currentModelTreeNodeInfo)($v1) /* ACACC 801163CC 00021080 */ sll $v0, $v0, 2 /* ACAD0 801163D0 00431021 */ addu $v0, $v0, $v1 /* ACAD4 801163D4 90420002 */ lbu $v0, 2($v0) @@ -287,10 +287,10 @@ glabel mdl_create_model /* ACD30 80116630 34420200 */ ori $v0, $v0, 0x200 /* ACD34 80116634 A6220000 */ sh $v0, ($s1) .L80116638: -/* ACD38 80116638 3C028015 */ lui $v0, %hi(D_80153224) -/* ACD3C 8011663C 8C423224 */ lw $v0, %lo(D_80153224)($v0) -/* ACD40 80116640 3C03800A */ lui $v1, %hi(D_8009A5F4) -/* ACD44 80116644 8C63A5F4 */ lw $v1, %lo(D_8009A5F4)($v1) +/* ACD38 80116638 3C028015 */ lui $v0, %hi(mdl_treeIterPos) +/* ACD3C 8011663C 8C423224 */ lw $v0, %lo(mdl_treeIterPos)($v0) +/* ACD40 80116640 3C03800A */ lui $v1, %hi(mdl_currentModelTreeNodeInfo) +/* ACD44 80116644 8C63A5F4 */ lw $v1, %lo(mdl_currentModelTreeNodeInfo)($v1) /* ACD48 80116648 00021080 */ sll $v0, $v0, 2 /* ACD4C 8011664C 00431021 */ addu $v0, $v0, $v1 /* ACD50 80116650 A0530000 */ sb $s3, ($v0) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_child_count.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_child_count.s deleted file mode 100644 index 04d801e4b0..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_child_count.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel mdl_get_child_count -/* AC3A8 80115CA8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AC3AC 80115CAC AFB3001C */ sw $s3, 0x1c($sp) -/* AC3B0 80115CB0 0080982D */ daddu $s3, $a0, $zero -/* AC3B4 80115CB4 AFB10014 */ sw $s1, 0x14($sp) -/* AC3B8 80115CB8 AFBF0020 */ sw $ra, 0x20($sp) -/* AC3BC 80115CBC AFB20018 */ sw $s2, 0x18($sp) -/* AC3C0 80115CC0 AFB00010 */ sw $s0, 0x10($sp) -/* AC3C4 80115CC4 8E630000 */ lw $v1, ($s3) -/* AC3C8 80115CC8 24020002 */ addiu $v0, $zero, 2 -/* AC3CC 80115CCC 10620015 */ beq $v1, $v0, .L80115D24 -/* AC3D0 80115CD0 0000882D */ daddu $s1, $zero, $zero -/* AC3D4 80115CD4 8E620010 */ lw $v0, 0x10($s3) -/* AC3D8 80115CD8 50400013 */ beql $v0, $zero, .L80115D28 -/* AC3DC 80115CDC 0220102D */ daddu $v0, $s1, $zero -/* AC3E0 80115CE0 8C52000C */ lw $s2, 0xc($v0) -/* AC3E4 80115CE4 12400010 */ beqz $s2, .L80115D28 -/* AC3E8 80115CE8 0220102D */ daddu $v0, $s1, $zero -/* AC3EC 80115CEC 0240882D */ daddu $s1, $s2, $zero -/* AC3F0 80115CF0 1A20000C */ blez $s1, .L80115D24 -/* AC3F4 80115CF4 0000802D */ daddu $s0, $zero, $zero -.L80115CF8: -/* AC3F8 80115CF8 8E620010 */ lw $v0, 0x10($s3) -/* AC3FC 80115CFC 8C430010 */ lw $v1, 0x10($v0) -/* AC400 80115D00 00101080 */ sll $v0, $s0, 2 -/* AC404 80115D04 00431021 */ addu $v0, $v0, $v1 -/* AC408 80115D08 8C440000 */ lw $a0, ($v0) -/* AC40C 80115D0C 0C04572A */ jal mdl_get_child_count -/* AC410 80115D10 26100001 */ addiu $s0, $s0, 1 -/* AC414 80115D14 02228821 */ addu $s1, $s1, $v0 -/* AC418 80115D18 0212102A */ slt $v0, $s0, $s2 -/* AC41C 80115D1C 1440FFF6 */ bnez $v0, .L80115CF8 -/* AC420 80115D20 00000000 */ nop -.L80115D24: -/* AC424 80115D24 0220102D */ daddu $v0, $s1, $zero -.L80115D28: -/* AC428 80115D28 8FBF0020 */ lw $ra, 0x20($sp) -/* AC42C 80115D2C 8FB3001C */ lw $s3, 0x1c($sp) -/* AC430 80115D30 8FB20018 */ lw $s2, 0x18($sp) -/* AC434 80115D34 8FB10014 */ lw $s1, 0x14($sp) -/* AC438 80115D38 8FB00010 */ lw $s0, 0x10($sp) -/* AC43C 80115D3C 03E00008 */ jr $ra -/* AC440 80115D40 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_copied_gfx.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_copied_gfx.s deleted file mode 100644 index 2ee6892085..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_copied_gfx.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel mdl_get_copied_gfx -/* B29EC 8011C2EC 3C028015 */ lui $v0, %hi(D_80152210) -/* B29F0 8011C2F0 8C422210 */ lw $v0, %lo(D_80152210)($v0) -/* B29F4 8011C2F4 00042080 */ sll $a0, $a0, 2 -/* B29F8 8011C2F8 00822021 */ addu $a0, $a0, $v0 -/* B29FC 8011C2FC 8C840000 */ lw $a0, ($a0) -/* B2A00 8011C300 8C830018 */ lw $v1, 0x18($a0) -/* B2A04 8011C304 00031080 */ sll $v0, $v1, 2 -/* B2A08 8011C308 00821021 */ addu $v0, $a0, $v0 -/* B2A0C 8011C30C 8C420008 */ lw $v0, 8($v0) -/* B2A10 8011C310 24630001 */ addiu $v1, $v1, 1 -/* B2A14 8011C314 AC830018 */ sw $v1, 0x18($a0) -/* B2A18 8011C318 28630002 */ slti $v1, $v1, 2 -/* B2A1C 8011C31C 50600001 */ beql $v1, $zero, .L8011C324 -/* B2A20 8011C320 AC800018 */ sw $zero, 0x18($a0) -.L8011C324: -/* B2A24 8011C324 03E00008 */ jr $ra -/* B2A28 8011C328 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_copied_vertices.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_copied_vertices.s deleted file mode 100644 index ab8cdc4515..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_copied_vertices.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel mdl_get_copied_vertices -/* B29B0 8011C2B0 3C028015 */ lui $v0, %hi(D_80152210) -/* B29B4 8011C2B4 8C422210 */ lw $v0, %lo(D_80152210)($v0) -/* B29B8 8011C2B8 00042080 */ sll $a0, $a0, 2 -/* B29BC 8011C2BC 00822021 */ addu $a0, $a0, $v0 -/* B29C0 8011C2C0 8C830000 */ lw $v1, ($a0) -/* B29C4 8011C2C4 8C620018 */ lw $v0, 0x18($v1) -/* B29C8 8011C2C8 8C640004 */ lw $a0, 4($v1) -/* B29CC 8011C2CC 00021080 */ sll $v0, $v0, 2 -/* B29D0 8011C2D0 00621021 */ addu $v0, $v1, $v0 -/* B29D4 8011C2D4 ACA40000 */ sw $a0, ($a1) -/* B29D8 8011C2D8 8C420010 */ lw $v0, 0x10($v0) -/* B29DC 8011C2DC ACC20000 */ sw $v0, ($a2) -/* B29E0 8011C2E0 8C620000 */ lw $v0, ($v1) -/* B29E4 8011C2E4 03E00008 */ jr $ra -/* B29E8 8011C2E8 ACE20000 */ sw $v0, ($a3) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_next_texture_address.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_next_texture_address.s index efedddaa4d..4deb9b26d2 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_next_texture_address.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_next_texture_address.s @@ -3,10 +3,10 @@ glabel mdl_get_next_texture_address /* B3EE4 8011D7E4 3C030002 */ lui $v1, 2 -/* B3EE8 8011D7E8 3C028015 */ lui $v0, %hi(D_80153368) -/* B3EEC 8011D7EC 8C423368 */ lw $v0, %lo(D_80153368)($v0) -/* B3EF0 8011D7F0 3C058015 */ lui $a1, %hi(D_8014B748) -/* B3EF4 8011D7F4 8CA5B748 */ lw $a1, %lo(D_8014B748)($a1) +/* B3EE8 8011D7E8 3C028015 */ lui $v0, %hi(mdl_nextTextureAddress) +/* B3EEC 8011D7EC 8C423368 */ lw $v0, %lo(mdl_nextTextureAddress)($v0) +/* B3EF0 8011D7F0 3C058015 */ lui $a1, %hi(mdl_textureBaseAddress) +/* B3EF4 8011D7F4 8CA5B748 */ lw $a1, %lo(mdl_textureBaseAddress)($a1) /* B3EF8 8011D7F8 34638000 */ ori $v1, $v1, 0x8000 /* B3EFC 8011D7FC 00451023 */ subu $v0, $v0, $a1 /* B3F00 8011D800 2442003F */ addiu $v0, $v0, 0x3f diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_make_local_vertex_copy.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_make_local_vertex_copy.s index 4867c5eb75..4e5b021598 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_make_local_vertex_copy.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_make_local_vertex_copy.s @@ -28,8 +28,8 @@ glabel mdl_make_local_vertex_copy /* B28C0 8011C1C0 0C00AB39 */ jal heap_malloc /* B28C4 8011C1C4 2404001C */ addiu $a0, $zero, 0x1c /* B28C8 8011C1C8 00108080 */ sll $s0, $s0, 2 -/* B28CC 8011C1CC 3C038015 */ lui $v1, %hi(D_80152210) -/* B28D0 8011C1D0 8C632210 */ lw $v1, %lo(D_80152210)($v1) +/* B28CC 8011C1CC 3C038015 */ lui $v1, %hi(gCurrentModelLocalVtxBuffers) +/* B28D0 8011C1D0 8C632210 */ lw $v1, %lo(gCurrentModelLocalVtxBuffers)($v1) /* B28D4 8011C1D4 0040902D */ daddu $s2, $v0, $zero /* B28D8 8011C1D8 02038021 */ addu $s0, $s0, $v1 /* B28DC 8011C1DC 1220001C */ beqz $s1, .L8011C250 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_set_all_fog_mode.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_set_all_fog_mode.s index 40a22edfde..a2f1000fa2 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_set_all_fog_mode.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_set_all_fog_mode.s @@ -4,8 +4,8 @@ glabel mdl_set_all_fog_mode /* B3F2C 8011D82C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B3F30 8011D830 AFB10014 */ sw $s1, 0x14($sp) -/* B3F34 8011D834 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) -/* B3F38 8011D838 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) +/* B3F34 8011D834 3C118015 */ lui $s1, %hi(gCurrentModels) +/* B3F38 8011D838 8E3112CC */ lw $s1, %lo(gCurrentModels)($s1) /* B3F3C 8011D83C AFB20018 */ sw $s2, 0x18($sp) /* B3F40 8011D840 0080902D */ daddu $s2, $a0, $zero /* B3F44 8011D844 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_models.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_models.s index 01eab9a80f..c71a67af78 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_models.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_models.s @@ -64,8 +64,8 @@ glabel render_models /* AD37C 80116C7C C65A0110 */ lwc1 $f26, 0x110($s2) /* AD380 80116C80 E7BA0084 */ swc1 $f26, 0x84($sp) .L80116C84: -/* AD384 80116C84 3C038015 */ lui $v1, %hi(gCurrentModelListPtr) -/* AD388 80116C88 8C6312CC */ lw $v1, %lo(gCurrentModelListPtr)($v1) +/* AD384 80116C84 3C038015 */ lui $v1, %hi(gCurrentModels) +/* AD388 80116C88 8C6312CC */ lw $v1, %lo(gCurrentModels)($v1) /* AD38C 80116C8C 00131080 */ sll $v0, $s3, 2 /* AD390 80116C90 00431021 */ addu $v0, $v0, $v1 /* AD394 80116C94 8C500000 */ lw $s0, ($v0) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_transform_group.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_transform_group.s deleted file mode 100644 index a5ce2e3a34..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_transform_group.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel render_transform_group -/* AE70C 8011800C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AE710 80118010 0080282D */ daddu $a1, $a0, $zero -/* AE714 80118014 AFB10014 */ sw $s1, 0x14($sp) -/* AE718 80118018 00A0882D */ daddu $s1, $a1, $zero -/* AE71C 8011801C AFB00010 */ sw $s0, 0x10($sp) -/* AE720 80118020 3C10800A */ lui $s0, %hi(gMasterGfxPos) -/* AE724 80118024 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) -/* AE728 80118028 AFBF001C */ sw $ra, 0x1c($sp) -/* AE72C 8011802C AFB20018 */ sw $s2, 0x18($sp) -/* AE730 80118030 94A20000 */ lhu $v0, ($a1) -/* AE734 80118034 30420004 */ andi $v0, $v0, 4 -/* AE738 80118038 14400025 */ bnez $v0, .L801180D0 -/* AE73C 8011803C 0200902D */ daddu $s2, $s0, $zero -/* AE740 80118040 94A20000 */ lhu $v0, ($a1) -/* AE744 80118044 90A3009C */ lbu $v1, 0x9c($a1) -/* AE748 80118048 30422000 */ andi $v0, $v0, 0x2000 -/* AE74C 8011804C 3C018015 */ lui $at, %hi(D_8015336C) -/* AE750 80118050 A423336C */ sh $v1, %lo(D_8015336C)($at) -/* AE754 80118054 14400009 */ bnez $v0, .L8011807C -/* AE758 80118058 3C03DA38 */ lui $v1, 0xda38 -/* AE75C 8011805C 8E020000 */ lw $v0, ($s0) -/* AE760 80118060 34630002 */ ori $v1, $v1, 2 -/* AE764 80118064 0040202D */ daddu $a0, $v0, $zero -/* AE768 80118068 AC830000 */ sw $v1, ($a0) -/* AE76C 8011806C 8CA3000C */ lw $v1, 0xc($a1) -/* AE770 80118070 24420008 */ addiu $v0, $v0, 8 -/* AE774 80118074 AE020000 */ sw $v0, ($s0) -/* AE778 80118078 AC830004 */ sw $v1, 4($a0) -.L8011807C: -/* AE77C 8011807C 0C045F9D */ jal render_transform_group_node -/* AE780 80118080 8E240008 */ lw $a0, 8($s1) -/* AE784 80118084 96220000 */ lhu $v0, ($s1) -/* AE788 80118088 30422000 */ andi $v0, $v0, 0x2000 -/* AE78C 8011808C 14400009 */ bnez $v0, .L801180B4 -/* AE790 80118090 3C04D838 */ lui $a0, 0xd838 -/* AE794 80118094 8E020000 */ lw $v0, ($s0) -/* AE798 80118098 34840002 */ ori $a0, $a0, 2 -/* AE79C 8011809C 0040182D */ daddu $v1, $v0, $zero -/* AE7A0 801180A0 24420008 */ addiu $v0, $v0, 8 -/* AE7A4 801180A4 AE020000 */ sw $v0, ($s0) -/* AE7A8 801180A8 24020040 */ addiu $v0, $zero, 0x40 -/* AE7AC 801180AC AC640000 */ sw $a0, ($v1) -/* AE7B0 801180B0 AC620004 */ sw $v0, 4($v1) -.L801180B4: -/* AE7B4 801180B4 8E420000 */ lw $v0, ($s2) -/* AE7B8 801180B8 0040182D */ daddu $v1, $v0, $zero -/* AE7BC 801180BC 24420008 */ addiu $v0, $v0, 8 -/* AE7C0 801180C0 AE420000 */ sw $v0, ($s2) -/* AE7C4 801180C4 3C02E700 */ lui $v0, 0xe700 -/* AE7C8 801180C8 AC620000 */ sw $v0, ($v1) -/* AE7CC 801180CC AC600004 */ sw $zero, 4($v1) -.L801180D0: -/* AE7D0 801180D0 8FBF001C */ lw $ra, 0x1c($sp) -/* AE7D4 801180D4 8FB20018 */ lw $s2, 0x18($sp) -/* AE7D8 801180D8 8FB10014 */ lw $s1, 0x14($sp) -/* AE7DC 801180DC 8FB00010 */ lw $s0, 0x10($sp) -/* AE7E0 801180E0 03E00008 */ jr $ra -/* AE7E4 801180E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_transform_group_node.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_transform_group_node.s deleted file mode 100644 index 5b4162ba10..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_transform_group_node.s +++ /dev/null @@ -1,114 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel render_transform_group_node -/* AE574 80117E74 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AE578 80117E78 AFB20018 */ sw $s2, 0x18($sp) -/* AE57C 80117E7C 0080902D */ daddu $s2, $a0, $zero -/* AE580 80117E80 AFB3001C */ sw $s3, 0x1c($sp) -/* AE584 80117E84 3C13800A */ lui $s3, %hi(gMasterGfxPos) -/* AE588 80117E88 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) -/* AE58C 80117E8C AFBF0020 */ sw $ra, 0x20($sp) -/* AE590 80117E90 AFB10014 */ sw $s1, 0x14($sp) -/* AE594 80117E94 12400056 */ beqz $s2, .L80117FF0 -/* AE598 80117E98 AFB00010 */ sw $s0, 0x10($sp) -/* AE59C 80117E9C 8E430000 */ lw $v1, ($s2) -/* AE5A0 80117EA0 24020005 */ addiu $v0, $zero, 5 -/* AE5A4 80117EA4 14620017 */ bne $v1, $v0, .L80117F04 -/* AE5A8 80117EA8 24020002 */ addiu $v0, $zero, 2 -/* AE5AC 80117EAC 0C0456C3 */ jal get_model_property -/* AE5B0 80117EB0 24050060 */ addiu $a1, $zero, 0x60 -/* AE5B4 80117EB4 10400011 */ beqz $v0, .L80117EFC -/* AE5B8 80117EB8 00000000 */ nop -/* AE5BC 80117EBC 8C420008 */ lw $v0, 8($v0) -/* AE5C0 80117EC0 1040000E */ beqz $v0, .L80117EFC -/* AE5C4 80117EC4 00000000 */ nop -/* AE5C8 80117EC8 3C108015 */ lui $s0, %hi(D_8015336C) -/* AE5CC 80117ECC 2610336C */ addiu $s0, $s0, %lo(D_8015336C) -/* AE5D0 80117ED0 0C046B4C */ jal get_model_from_list_index -/* AE5D4 80117ED4 96040000 */ lhu $a0, ($s0) -/* AE5D8 80117ED8 0040202D */ daddu $a0, $v0, $zero -/* AE5DC 80117EDC 94820000 */ lhu $v0, ($a0) -/* AE5E0 80117EE0 30420002 */ andi $v0, $v0, 2 -/* AE5E4 80117EE4 1440003F */ bnez $v0, .L80117FE4 -/* AE5E8 80117EE8 00000000 */ nop -/* AE5EC 80117EEC 0C045F25 */ jal appendGfx_model_group -/* AE5F0 80117EF0 00000000 */ nop -/* AE5F4 80117EF4 08045FF9 */ j .L80117FE4 -/* AE5F8 80117EF8 00000000 */ nop -.L80117EFC: -/* AE5FC 80117EFC 8E430000 */ lw $v1, ($s2) -/* AE600 80117F00 24020002 */ addiu $v0, $zero, 2 -.L80117F04: -/* AE604 80117F04 1062002C */ beq $v1, $v0, .L80117FB8 -/* AE608 80117F08 00000000 */ nop -/* AE60C 80117F0C 8E420010 */ lw $v0, 0x10($s2) -/* AE610 80117F10 10400037 */ beqz $v0, .L80117FF0 -/* AE614 80117F14 00000000 */ nop -/* AE618 80117F18 8C420000 */ lw $v0, ($v0) -/* AE61C 80117F1C 10400009 */ beqz $v0, .L80117F44 -/* AE620 80117F20 3C02DA38 */ lui $v0, 0xda38 -/* AE624 80117F24 8E630000 */ lw $v1, ($s3) -/* AE628 80117F28 0060202D */ daddu $a0, $v1, $zero -/* AE62C 80117F2C AC820000 */ sw $v0, ($a0) -/* AE630 80117F30 8E420010 */ lw $v0, 0x10($s2) -/* AE634 80117F34 8C420000 */ lw $v0, ($v0) -/* AE638 80117F38 24630008 */ addiu $v1, $v1, 8 -/* AE63C 80117F3C AE630000 */ sw $v1, ($s3) -/* AE640 80117F40 AC820004 */ sw $v0, 4($a0) -.L80117F44: -/* AE644 80117F44 8E420010 */ lw $v0, 0x10($s2) -/* AE648 80117F48 8C51000C */ lw $s1, 0xc($v0) -/* AE64C 80117F4C 1220000E */ beqz $s1, .L80117F88 -/* AE650 80117F50 00000000 */ nop -/* AE654 80117F54 1A20000C */ blez $s1, .L80117F88 -/* AE658 80117F58 0000802D */ daddu $s0, $zero, $zero -.L80117F5C: -/* AE65C 80117F5C 8E420010 */ lw $v0, 0x10($s2) -/* AE660 80117F60 8C430010 */ lw $v1, 0x10($v0) -/* AE664 80117F64 00101080 */ sll $v0, $s0, 2 -/* AE668 80117F68 00431021 */ addu $v0, $v0, $v1 -/* AE66C 80117F6C 8C440000 */ lw $a0, ($v0) -/* AE670 80117F70 0C045F9D */ jal render_transform_group_node -/* AE674 80117F74 26100001 */ addiu $s0, $s0, 1 -/* AE678 80117F78 0211102A */ slt $v0, $s0, $s1 -/* AE67C 80117F7C 1440FFF7 */ bnez $v0, .L80117F5C -/* AE680 80117F80 00000000 */ nop -/* AE684 80117F84 8E420010 */ lw $v0, 0x10($s2) -.L80117F88: -/* AE688 80117F88 8C420000 */ lw $v0, ($v0) -/* AE68C 80117F8C 10400018 */ beqz $v0, .L80117FF0 -/* AE690 80117F90 3C04D838 */ lui $a0, 0xd838 -/* AE694 80117F94 8E620000 */ lw $v0, ($s3) -/* AE698 80117F98 34840002 */ ori $a0, $a0, 2 -/* AE69C 80117F9C 0040182D */ daddu $v1, $v0, $zero -/* AE6A0 80117FA0 24420008 */ addiu $v0, $v0, 8 -/* AE6A4 80117FA4 AE620000 */ sw $v0, ($s3) -/* AE6A8 80117FA8 24020040 */ addiu $v0, $zero, 0x40 -/* AE6AC 80117FAC AC640000 */ sw $a0, ($v1) -/* AE6B0 80117FB0 08045FFC */ j .L80117FF0 -/* AE6B4 80117FB4 AC620004 */ sw $v0, 4($v1) -.L80117FB8: -/* AE6B8 80117FB8 3C108015 */ lui $s0, %hi(D_8015336C) -/* AE6BC 80117FBC 2610336C */ addiu $s0, $s0, %lo(D_8015336C) -/* AE6C0 80117FC0 0C046B4C */ jal get_model_from_list_index -/* AE6C4 80117FC4 96040000 */ lhu $a0, ($s0) -/* AE6C8 80117FC8 0040202D */ daddu $a0, $v0, $zero -/* AE6CC 80117FCC 94820000 */ lhu $v0, ($a0) -/* AE6D0 80117FD0 30420002 */ andi $v0, $v0, 2 -/* AE6D4 80117FD4 14400003 */ bnez $v0, .L80117FE4 -/* AE6D8 80117FD8 00000000 */ nop -/* AE6DC 80117FDC 0C044C24 */ jal appendGfx_model -/* AE6E0 80117FE0 00000000 */ nop -.L80117FE4: -/* AE6E4 80117FE4 96020000 */ lhu $v0, ($s0) -/* AE6E8 80117FE8 24420001 */ addiu $v0, $v0, 1 -/* AE6EC 80117FEC A6020000 */ sh $v0, ($s0) -.L80117FF0: -/* AE6F0 80117FF0 8FBF0020 */ lw $ra, 0x20($sp) -/* AE6F4 80117FF4 8FB3001C */ lw $s3, 0x1c($sp) -/* AE6F8 80117FF8 8FB20018 */ lw $s2, 0x18($sp) -/* AE6FC 80117FFC 8FB10014 */ lw $s1, 0x14($sp) -/* AE700 80118000 8FB00010 */ lw $s0, 0x10($sp) -/* AE704 80118004 03E00008 */ jr $ra -/* AE708 80118008 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/set_mdl_custom_gfx_set.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/set_mdl_custom_gfx_set.s deleted file mode 100644 index e5b51559e0..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/set_mdl_custom_gfx_set.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_mdl_custom_gfx_set -/* B237C 8011BC7C 2403FFFF */ addiu $v1, $zero, -1 -/* B2380 8011BC80 14A30003 */ bne $a1, $v1, .L8011BC90 -/* B2384 8011BC84 00000000 */ nop -/* B2388 8011BC88 908200A5 */ lbu $v0, 0xa5($a0) -/* B238C 8011BC8C 3045000F */ andi $a1, $v0, 0xf -.L8011BC90: -/* B2390 8011BC90 14C30003 */ bne $a2, $v1, .L8011BCA0 -/* B2394 8011BC94 30A3000F */ andi $v1, $a1, 0xf -/* B2398 8011BC98 908200A5 */ lbu $v0, 0xa5($a0) -/* B239C 8011BC9C 00023102 */ srl $a2, $v0, 4 -.L8011BCA0: -/* B23A0 8011BCA0 30C2000F */ andi $v0, $a2, 0xf -/* B23A4 8011BCA4 00021100 */ sll $v0, $v0, 4 -/* B23A8 8011BCA8 00621821 */ addu $v1, $v1, $v0 -/* B23AC 8011BCAC 03E00008 */ jr $ra -/* B23B0 8011BCB0 A08300A5 */ sb $v1, 0xa5($a0) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/set_model_env_color_parameters.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/set_model_env_color_parameters.s deleted file mode 100644 index ec0df8d965..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/set_model_env_color_parameters.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_model_env_color_parameters -/* B2698 8011BF98 8FA20010 */ lw $v0, 0x10($sp) -/* B269C 8011BF9C 8FA30014 */ lw $v1, 0x14($sp) -/* B26A0 8011BFA0 3C018015 */ lui $at, %hi(D_8014B760) -/* B26A4 8011BFA4 A024B760 */ sb $a0, %lo(D_8014B760)($at) -/* B26A8 8011BFA8 3C018015 */ lui $at, %hi(D_8014B761) -/* B26AC 8011BFAC A025B761 */ sb $a1, %lo(D_8014B761)($at) -/* B26B0 8011BFB0 3C018015 */ lui $at, %hi(D_8014B762) -/* B26B4 8011BFB4 A026B762 */ sb $a2, %lo(D_8014B762)($at) -/* B26B8 8011BFB8 3C018015 */ lui $at, %hi(D_8014B763) -/* B26BC 8011BFBC A027B763 */ sb $a3, %lo(D_8014B763)($at) -/* B26C0 8011BFC0 3C018015 */ lui $at, %hi(D_8014B764) -/* B26C4 8011BFC4 A022B764 */ sb $v0, %lo(D_8014B764)($at) -/* B26C8 8011BFC8 3C018015 */ lui $at, %hi(D_8014B765) -/* B26CC 8011BFCC 03E00008 */ jr $ra -/* B26D0 8011BFD0 A023B765 */ sb $v1, %lo(D_8014B765)($at) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/set_model_fog_color_parameters.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/set_model_fog_color_parameters.s deleted file mode 100644 index 3672b6712a..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/set_model_fog_color_parameters.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_model_fog_color_parameters -/* B25B4 8011BEB4 8FA20010 */ lw $v0, 0x10($sp) -/* B25B8 8011BEB8 8FA30014 */ lw $v1, 0x14($sp) -/* B25BC 8011BEBC 8FA80018 */ lw $t0, 0x18($sp) -/* B25C0 8011BEC0 8FA9001C */ lw $t1, 0x1c($sp) -/* B25C4 8011BEC4 8FAA0020 */ lw $t2, 0x20($sp) -/* B25C8 8011BEC8 3C018015 */ lui $at, %hi(D_8014B750) -/* B25CC 8011BECC A024B750 */ sb $a0, %lo(D_8014B750)($at) -/* B25D0 8011BED0 3C018015 */ lui $at, %hi(D_8014B751) -/* B25D4 8011BED4 A025B751 */ sb $a1, %lo(D_8014B751)($at) -/* B25D8 8011BED8 3C018015 */ lui $at, %hi(D_8014B752) -/* B25DC 8011BEDC A026B752 */ sb $a2, %lo(D_8014B752)($at) -/* B25E0 8011BEE0 3C018015 */ lui $at, %hi(D_8014B753) -/* B25E4 8011BEE4 A027B753 */ sb $a3, %lo(D_8014B753)($at) -/* B25E8 8011BEE8 3C018015 */ lui $at, %hi(D_8014B754) -/* B25EC 8011BEEC A022B754 */ sb $v0, %lo(D_8014B754)($at) -/* B25F0 8011BEF0 3C018015 */ lui $at, %hi(D_8014B755) -/* B25F4 8011BEF4 A023B755 */ sb $v1, %lo(D_8014B755)($at) -/* B25F8 8011BEF8 3C018015 */ lui $at, %hi(D_8014B756) -/* B25FC 8011BEFC A028B756 */ sb $t0, %lo(D_8014B756)($at) -/* B2600 8011BF00 3C018015 */ lui $at, %hi(D_8014B758) -/* B2604 8011BF04 AC29B758 */ sw $t1, %lo(D_8014B758)($at) -/* B2608 8011BF08 3C018015 */ lui $at, %hi(D_8014B75C) -/* B260C 8011BF0C 03E00008 */ jr $ra -/* B2610 8011BF10 AC2AB75C */ sw $t2, %lo(D_8014B75C)($at) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/step_current_game_mode.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/step_current_game_mode.s deleted file mode 100644 index a68124a140..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/step_current_game_mode.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel step_current_game_mode -/* A9578 80112E78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A957C 80112E7C AFB00010 */ sw $s0, 0x10($sp) -/* A9580 80112E80 3C108015 */ lui $s0, %hi(gMainGameState) -/* A9584 80112E84 26101700 */ addiu $s0, $s0, %lo(gMainGameState) -/* A9588 80112E88 AFB10014 */ sw $s1, 0x14($sp) -/* A958C 80112E8C 0000882D */ daddu $s1, $zero, $zero -/* A9590 80112E90 AFBF0018 */ sw $ra, 0x18($sp) -.L80112E94: -/* A9594 80112E94 96040000 */ lhu $a0, ($s0) -/* A9598 80112E98 5080000C */ beql $a0, $zero, .L80112ECC -/* A959C 80112E9C 26310001 */ addiu $s1, $s1, 1 -/* A95A0 80112EA0 30820004 */ andi $v0, $a0, 4 -/* A95A4 80112EA4 54400009 */ bnel $v0, $zero, .L80112ECC -/* A95A8 80112EA8 26310001 */ addiu $s1, $s1, 1 -/* A95AC 80112EAC 30820008 */ andi $v0, $a0, 8 -/* A95B0 80112EB0 54400006 */ bnel $v0, $zero, .L80112ECC -/* A95B4 80112EB4 26310001 */ addiu $s1, $s1, 1 -/* A95B8 80112EB8 8E030008 */ lw $v1, 8($s0) -/* A95BC 80112EBC 3082FFFD */ andi $v0, $a0, 0xfffd -/* A95C0 80112EC0 0060F809 */ jalr $v1 -/* A95C4 80112EC4 A6020000 */ sh $v0, ($s0) -/* A95C8 80112EC8 26310001 */ addiu $s1, $s1, 1 -.L80112ECC: -/* A95CC 80112ECC 2A220002 */ slti $v0, $s1, 2 -/* A95D0 80112ED0 1440FFF0 */ bnez $v0, .L80112E94 -/* A95D4 80112ED4 26100018 */ addiu $s0, $s0, 0x18 -/* A95D8 80112ED8 8FBF0018 */ lw $ra, 0x18($sp) -/* A95DC 80112EDC 8FB10014 */ lw $s1, 0x14($sp) -/* A95E0 80112EE0 8FB00010 */ lw $s0, 0x10($sp) -/* A95E4 80112EE4 03E00008 */ jr $ra -/* A95E8 80112EE8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entity_shadow_position.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entity_shadow_position.s deleted file mode 100644 index 4506a29579..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entity_shadow_position.s +++ /dev/null @@ -1,193 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_8014F940 -.double 0.95 - -glabel D_8014F948 -.double 250.0 - -.section .text - -glabel update_entity_shadow_position -/* A8A44 80112344 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A8A48 80112348 AFB10034 */ sw $s1, 0x34($sp) -/* A8A4C 8011234C 0080882D */ daddu $s1, $a0, $zero -/* A8A50 80112350 AFBF0038 */ sw $ra, 0x38($sp) -/* A8A54 80112354 AFB00030 */ sw $s0, 0x30($sp) -/* A8A58 80112358 0C044181 */ jal get_shadow_by_index -/* A8A5C 8011235C 86240016 */ lh $a0, 0x16($s1) -/* A8A60 80112360 0040802D */ daddu $s0, $v0, $zero -/* A8A64 80112364 5200009B */ beql $s0, $zero, .L801125D4 -/* A8A68 80112368 AE20006C */ sw $zero, 0x6c($s1) -/* A8A6C 8011236C 9222000B */ lbu $v0, 0xb($s1) -/* A8A70 80112370 2C4200FF */ sltiu $v0, $v0, 0xff -/* A8A74 80112374 10400005 */ beqz $v0, .L8011238C -/* A8A78 80112378 3C030080 */ lui $v1, 0x80 -/* A8A7C 8011237C 9222000B */ lbu $v0, 0xb($s1) -/* A8A80 80112380 00021042 */ srl $v0, $v0, 1 -/* A8A84 80112384 080448E9 */ j .L801123A4 -/* A8A88 80112388 A2020005 */ sb $v0, 5($s0) -.L8011238C: -/* A8A8C 8011238C 8E020000 */ lw $v0, ($s0) -/* A8A90 80112390 00431024 */ and $v0, $v0, $v1 -/* A8A94 80112394 10400002 */ beqz $v0, .L801123A0 -/* A8A98 80112398 24040080 */ addiu $a0, $zero, 0x80 -/* A8A9C 8011239C 240400A0 */ addiu $a0, $zero, 0xa0 -.L801123A0: -/* A8AA0 801123A0 A2040005 */ sb $a0, 5($s0) -.L801123A4: -/* A8AA4 801123A4 8E220000 */ lw $v0, ($s1) -/* A8AA8 801123A8 30420004 */ andi $v0, $v0, 4 -/* A8AAC 801123AC 1440000A */ bnez $v0, .L801123D8 -/* A8AB0 801123B0 27A40018 */ addiu $a0, $sp, 0x18 -/* A8AB4 801123B4 8E030000 */ lw $v1, ($s0) -/* A8AB8 801123B8 3C020040 */ lui $v0, 0x40 -/* A8ABC 801123BC 00621024 */ and $v0, $v1, $v0 -/* A8AC0 801123C0 10400084 */ beqz $v0, .L801125D4 -/* A8AC4 801123C4 3C02FFBF */ lui $v0, 0xffbf -/* A8AC8 801123C8 3442FFFF */ ori $v0, $v0, 0xffff -/* A8ACC 801123CC 00621024 */ and $v0, $v1, $v0 -/* A8AD0 801123D0 AE020000 */ sw $v0, ($s0) -/* A8AD4 801123D4 27A40018 */ addiu $a0, $sp, 0x18 -.L801123D8: -/* A8AD8 801123D8 27A20028 */ addiu $v0, $sp, 0x28 -/* A8ADC 801123DC 27A5001C */ addiu $a1, $sp, 0x1c -/* A8AE0 801123E0 27A60020 */ addiu $a2, $sp, 0x20 -/* A8AE4 801123E4 C6200048 */ lwc1 $f0, 0x48($s1) -/* A8AE8 801123E8 C622004C */ lwc1 $f2, 0x4c($s1) -/* A8AEC 801123EC C6240050 */ lwc1 $f4, 0x50($s1) -/* A8AF0 801123F0 27A70024 */ addiu $a3, $sp, 0x24 -/* A8AF4 801123F4 E7A00018 */ swc1 $f0, 0x18($sp) -/* A8AF8 801123F8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* A8AFC 801123FC E7A40020 */ swc1 $f4, 0x20($sp) -/* A8B00 80112400 AFA20010 */ sw $v0, 0x10($sp) -/* A8B04 80112404 27A2002C */ addiu $v0, $sp, 0x2c -/* A8B08 80112408 0C04497A */ jal entity_raycast_down -/* A8B0C 8011240C AFA20014 */ sw $v0, 0x14($sp) -/* A8B10 80112410 1440000A */ bnez $v0, .L8011243C -/* A8B14 80112414 00000000 */ nop -/* A8B18 80112418 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* A8B1C 8011241C 3C0146FF */ lui $at, 0x46ff -/* A8B20 80112420 3421FE00 */ ori $at, $at, 0xfe00 -/* A8B24 80112424 44810000 */ mtc1 $at, $f0 -/* A8B28 80112428 00000000 */ nop -/* A8B2C 8011242C 46001032 */ c.eq.s $f2, $f0 -/* A8B30 80112430 00000000 */ nop -/* A8B34 80112434 45030001 */ bc1tl .L8011243C -/* A8B38 80112438 AFA0002C */ sw $zero, 0x2c($sp) -.L8011243C: -/* A8B3C 8011243C 8E020000 */ lw $v0, ($s0) -/* A8B40 80112440 C7A8002C */ lwc1 $f8, 0x2c($sp) -/* A8B44 80112444 30420200 */ andi $v0, $v0, 0x200 -/* A8B48 80112448 10400012 */ beqz $v0, .L80112494 -/* A8B4C 8011244C 00000000 */ nop -/* A8B50 80112450 8622000C */ lh $v0, 0xc($s1) -/* A8B54 80112454 3C014354 */ lui $at, 0x4354 -/* A8B58 80112458 34218000 */ ori $at, $at, 0x8000 -/* A8B5C 8011245C 44811000 */ mtc1 $at, $f2 -/* A8B60 80112460 44820000 */ mtc1 $v0, $f0 -/* A8B64 80112464 00000000 */ nop -/* A8B68 80112468 46800020 */ cvt.s.w $f0, $f0 -/* A8B6C 8011246C 46020003 */ div.s $f0, $f0, $f2 -/* A8B70 80112470 E600001C */ swc1 $f0, 0x1c($s0) -/* A8B74 80112474 86220010 */ lh $v0, 0x10($s1) -/* A8B78 80112478 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A8B7C 8011247C 44820000 */ mtc1 $v0, $f0 -/* A8B80 80112480 00000000 */ nop -/* A8B84 80112484 46800020 */ cvt.s.w $f0, $f0 -/* A8B88 80112488 46020003 */ div.s $f0, $f0, $f2 -/* A8B8C 8011248C 08044944 */ j .L80112510 -/* A8B90 80112490 E6000024 */ swc1 $f0, 0x24($s0) -.L80112494: -/* A8B94 80112494 3C014316 */ lui $at, 0x4316 -/* A8B98 80112498 44810000 */ mtc1 $at, $f0 -/* A8B9C 8011249C 3C018015 */ lui $at, %hi(D_8014F940) -/* A8BA0 801124A0 D422F940 */ ldc1 $f2, %lo(D_8014F940)($at) -/* A8BA4 801124A4 46004003 */ div.s $f0, $f8, $f0 -/* A8BA8 801124A8 46000021 */ cvt.d.s $f0, $f0 -/* A8BAC 801124AC 46220000 */ add.d $f0, $f0, $f2 -/* A8BB0 801124B0 3C018015 */ lui $at, %hi(D_8014F948) -/* A8BB4 801124B4 D422F948 */ ldc1 $f2, %lo(D_8014F948)($at) -/* A8BB8 801124B8 46220002 */ mul.d $f0, $f0, $f2 -/* A8BBC 801124BC 00000000 */ nop -/* A8BC0 801124C0 8622000C */ lh $v0, 0xc($s1) -/* A8BC4 801124C4 C6240054 */ lwc1 $f4, 0x54($s1) -/* A8BC8 801124C8 44821000 */ mtc1 $v0, $f2 -/* A8BCC 801124CC 00000000 */ nop -/* A8BD0 801124D0 468010A0 */ cvt.s.w $f2, $f2 -/* A8BD4 801124D4 46200020 */ cvt.s.d $f0, $f0 -/* A8BD8 801124D8 46001083 */ div.s $f2, $f2, $f0 -/* A8BDC 801124DC 46041082 */ mul.s $f2, $f2, $f4 -/* A8BE0 801124E0 00000000 */ nop -/* A8BE4 801124E4 E602001C */ swc1 $f2, 0x1c($s0) -/* A8BE8 801124E8 86220010 */ lh $v0, 0x10($s1) -/* A8BEC 801124EC C624005C */ lwc1 $f4, 0x5c($s1) -/* A8BF0 801124F0 44821000 */ mtc1 $v0, $f2 -/* A8BF4 801124F4 00000000 */ nop -/* A8BF8 801124F8 468010A0 */ cvt.s.w $f2, $f2 -/* A8BFC 801124FC 46001083 */ div.s $f2, $f2, $f0 -/* A8C00 80112500 46041082 */ mul.s $f2, $f2, $f4 -/* A8C04 80112504 00000000 */ nop -/* A8C08 80112508 E7A0002C */ swc1 $f0, 0x2c($sp) -/* A8C0C 8011250C E6020024 */ swc1 $f2, 0x24($s0) -.L80112510: -/* A8C10 80112510 C6200048 */ lwc1 $f0, 0x48($s1) -/* A8C14 80112514 E6000010 */ swc1 $f0, 0x10($s0) -/* A8C18 80112518 C7A6001C */ lwc1 $f6, 0x1c($sp) -/* A8C1C 8011251C C6200050 */ lwc1 $f0, 0x50($s1) -/* A8C20 80112520 C7A20024 */ lwc1 $f2, 0x24($sp) -/* A8C24 80112524 C7A40028 */ lwc1 $f4, 0x28($sp) -/* A8C28 80112528 E6060014 */ swc1 $f6, 0x14($s0) -/* A8C2C 8011252C E6000018 */ swc1 $f0, 0x18($s0) -/* A8C30 80112530 E626006C */ swc1 $f6, 0x6c($s1) -/* A8C34 80112534 E6020028 */ swc1 $f2, 0x28($s0) -/* A8C38 80112538 E6040030 */ swc1 $f4, 0x30($s0) -/* A8C3C 8011253C C6200064 */ lwc1 $f0, 0x64($s1) -/* A8C40 80112540 E600002C */ swc1 $f0, 0x2c($s0) -/* A8C44 80112544 C620004C */ lwc1 $f0, 0x4c($s1) -/* A8C48 80112548 4606003C */ c.lt.s $f0, $f6 -/* A8C4C 8011254C 00000000 */ nop -/* A8C50 80112550 45000009 */ bc1f .L80112578 -/* A8C54 80112554 3C034000 */ lui $v1, 0x4000 -/* A8C58 80112558 3C014120 */ lui $at, 0x4120 -/* A8C5C 8011255C 44810000 */ mtc1 $at, $f0 -/* A8C60 80112560 8E020000 */ lw $v0, ($s0) -/* A8C64 80112564 46003000 */ add.s $f0, $f6, $f0 -/* A8C68 80112568 00431025 */ or $v0, $v0, $v1 -/* A8C6C 8011256C AE020000 */ sw $v0, ($s0) -/* A8C70 80112570 08044963 */ j .L8011258C -/* A8C74 80112574 E620004C */ swc1 $f0, 0x4c($s1) -.L80112578: -/* A8C78 80112578 3C03BFFF */ lui $v1, 0xbfff -/* A8C7C 8011257C 8E020000 */ lw $v0, ($s0) -/* A8C80 80112580 3463FFFF */ ori $v1, $v1, 0xffff -/* A8C84 80112584 00431024 */ and $v0, $v0, $v1 -/* A8C88 80112588 AE020000 */ sw $v0, ($s0) -.L8011258C: -/* A8C8C 8011258C 2404FFFE */ addiu $a0, $zero, -2 -/* A8C90 80112590 8E030000 */ lw $v1, ($s0) -/* A8C94 80112594 96220002 */ lhu $v0, 2($s1) -/* A8C98 80112598 00641824 */ and $v1, $v1, $a0 -/* A8C9C 8011259C 30420001 */ andi $v0, $v0, 1 -/* A8CA0 801125A0 00621825 */ or $v1, $v1, $v0 -/* A8CA4 801125A4 AE030000 */ sw $v1, ($s0) -/* A8CA8 801125A8 8E220000 */ lw $v0, ($s1) -/* A8CAC 801125AC 30420400 */ andi $v0, $v0, 0x400 -/* A8CB0 801125B0 14400008 */ bnez $v0, .L801125D4 -/* A8CB4 801125B4 00000000 */ nop -/* A8CB8 801125B8 44800000 */ mtc1 $zero, $f0 -/* A8CBC 801125BC 00000000 */ nop -/* A8CC0 801125C0 46004032 */ c.eq.s $f8, $f0 -/* A8CC4 801125C4 00000000 */ nop -/* A8CC8 801125C8 45000002 */ bc1f .L801125D4 -/* A8CCC 801125CC 34620001 */ ori $v0, $v1, 1 -/* A8CD0 801125D0 AE020000 */ sw $v0, ($s0) -.L801125D4: -/* A8CD4 801125D4 8FBF0038 */ lw $ra, 0x38($sp) -/* A8CD8 801125D8 8FB10034 */ lw $s1, 0x34($sp) -/* A8CDC 801125DC 8FB00030 */ lw $s0, 0x30($sp) -/* A8CE0 801125E0 03E00008 */ jr $ra -/* A8CE4 801125E4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/evt/map_api/apply_transform_to_children.s b/ver/us/asm/nonmatchings/evt/map_api/apply_transform_to_children.s index 53f716bff6..599d1ed477 100644 --- a/ver/us/asm/nonmatchings/evt/map_api/apply_transform_to_children.s +++ b/ver/us/asm/nonmatchings/evt/map_api/apply_transform_to_children.s @@ -17,8 +17,8 @@ glabel apply_transform_to_children /* EDF80 802C95D0 0C0B1EAF */ jal evt_get_variable /* EDF84 802C95D4 0260202D */ daddu $a0, $s3, $zero /* EDF88 802C95D8 0040282D */ daddu $a1, $v0, $zero -/* EDF8C 802C95DC 3C06800A */ lui $a2, %hi(D_8009A5F4) -/* EDF90 802C95E0 8CC6A5F4 */ lw $a2, %lo(D_8009A5F4)($a2) +/* EDF8C 802C95DC 3C06800A */ lui $a2, %hi(mdl_currentModelTreeNodeInfo) +/* EDF90 802C95E0 8CC6A5F4 */ lw $a2, %lo(mdl_currentModelTreeNodeInfo)($a2) /* EDF94 802C95E4 00051080 */ sll $v0, $a1, 2 /* EDF98 802C95E8 00462021 */ addu $a0, $v0, $a2 /* EDF9C 802C95EC 90830000 */ lbu $v1, ($a0) @@ -82,8 +82,8 @@ glabel apply_transform_to_children /* EE068 802C96B8 AE330000 */ sw $s3, ($s1) /* EE06C 802C96BC 27A40010 */ addiu $a0, $sp, 0x10 .L802C96C0: -/* EE070 802C96C0 3C038015 */ lui $v1, %hi(gCurrentModelListPtr) -/* EE074 802C96C4 8C6312CC */ lw $v1, %lo(gCurrentModelListPtr)($v1) +/* EE070 802C96C0 3C038015 */ lui $v1, %hi(gCurrentModels) +/* EE074 802C96C4 8C6312CC */ lw $v1, %lo(gCurrentModels)($v1) /* EE078 802C96C8 00101080 */ sll $v0, $s0, 2 /* EE07C 802C96CC 00431021 */ addu $v0, $v0, $v1 /* EE080 802C96D0 8C420000 */ lw $v0, ($v0) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s index fe8b9eaa1e..3dc5e57775 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s @@ -52,8 +52,8 @@ glabel func_802403F0_C6CD10 /* C6CDAC 8024048C 08090132 */ j .L802404C8 /* C6CDB0 80240490 00000000 */ nop .L80240494: -/* C6CDB4 80240494 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) -/* C6CDB8 80240498 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) +/* C6CDB4 80240494 3C118015 */ lui $s1, %hi(gCurrentModels) +/* C6CDB8 80240498 8E3112CC */ lw $s1, %lo(gCurrentModels)($s1) /* C6CDBC 8024049C 0000802D */ daddu $s0, $zero, $zero .L802404A0: /* C6CDC0 802404A0 8E240000 */ lw $a0, ($s1) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_80240738_C6D058.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_80240738_C6D058.s index fde1df4ae3..1a9a90b60e 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_80240738_C6D058.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_80240738_C6D058.s @@ -33,8 +33,8 @@ glabel func_80240738_C6D058 /* C6D0C4 802407A4 080901F8 */ j .L802407E0 /* C6D0C8 802407A8 00000000 */ nop .L802407AC: -/* C6D0CC 802407AC 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) -/* C6D0D0 802407B0 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) +/* C6D0CC 802407AC 3C118015 */ lui $s1, %hi(gCurrentModels) +/* C6D0D0 802407B0 8E3112CC */ lw $s1, %lo(gCurrentModels)($s1) /* C6D0D4 802407B4 0000802D */ daddu $s0, $zero, $zero .L802407B8: /* C6D0D8 802407B8 8E240000 */ lw $a0, ($s1) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s index f537975f21..c5cf98e0e0 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s @@ -52,8 +52,8 @@ glabel func_80240000_C6E330 /* C6E3CC 8024009C 08090036 */ j .L802400D8 /* C6E3D0 802400A0 00000000 */ nop .L802400A4: -/* C6E3D4 802400A4 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) -/* C6E3D8 802400A8 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) +/* C6E3D4 802400A4 3C118015 */ lui $s1, %hi(gCurrentModels) +/* C6E3D8 802400A8 8E3112CC */ lw $s1, %lo(gCurrentModels)($s1) /* C6E3DC 802400AC 0000802D */ daddu $s0, $zero, $zero .L802400B0: /* C6E3E0 802400B0 8E240000 */ lw $a0, ($s1) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240348_C6E678.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240348_C6E678.s index e7ce022a31..624e98740b 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240348_C6E678.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240348_C6E678.s @@ -33,8 +33,8 @@ glabel func_80240348_C6E678 /* C6E6E4 802403B4 080900FC */ j .L802403F0 /* C6E6E8 802403B8 00000000 */ nop .L802403BC: -/* C6E6EC 802403BC 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) -/* C6E6F0 802403C0 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) +/* C6E6EC 802403BC 3C118015 */ lui $s1, %hi(gCurrentModels) +/* C6E6F0 802403C0 8E3112CC */ lw $s1, %lo(gCurrentModels)($s1) /* C6E6F4 802403C4 0000802D */ daddu $s0, $zero, $zero .L802403C8: /* C6E6F8 802403C8 8E240000 */ lw $a0, ($s1) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s index eb57066f66..924943c505 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s @@ -52,8 +52,8 @@ glabel func_80240000_C71480 /* C7151C 8024009C 08090036 */ j .L802400D8 /* C71520 802400A0 00000000 */ nop .L802400A4: -/* C71524 802400A4 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) -/* C71528 802400A8 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) +/* C71524 802400A4 3C118015 */ lui $s1, %hi(gCurrentModels) +/* C71528 802400A8 8E3112CC */ lw $s1, %lo(gCurrentModels)($s1) /* C7152C 802400AC 0000802D */ daddu $s0, $zero, $zero .L802400B0: /* C71530 802400B0 8E240000 */ lw $a0, ($s1) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240348_C717C8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240348_C717C8.s index 517888ba78..407c9289e3 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240348_C717C8.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240348_C717C8.s @@ -33,8 +33,8 @@ glabel func_80240348_C717C8 /* C71834 802403B4 080900FC */ j .L802403F0 /* C71838 802403B8 00000000 */ nop .L802403BC: -/* C7183C 802403BC 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) -/* C71840 802403C0 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) +/* C7183C 802403BC 3C118015 */ lui $s1, %hi(gCurrentModels) +/* C71840 802403C0 8E3112CC */ lw $s1, %lo(gCurrentModels)($s1) /* C71844 802403C4 0000802D */ daddu $s0, $zero, $zero .L802403C8: /* C71848 802403C8 8E240000 */ lw $a0, ($s1) diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index eb33be902e..9b813ee41f 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -991,12 +991,13 @@ segments: start: 0x163400 vram: 0x80242BA0 subsegments: - - [0x163400, c] + - [0x163400, c, 163400] - [0x165490, c, 165490] - [0x167570, c, 167570] - [0x168590, c, 168590] - [0x169BE0, c] - - [0x16A3E0, data] + - [0x16A3E0, .data, 163400] + - [0x16A680, data] - [0x16C7D0, .rodata, 165490] - [0x16C848, .rodata, 167570] - [0x16C8C0, .rodata, 168590] diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 58f5732979..66258be791 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -1506,7 +1506,6 @@ D_80097E08 = 0x80097E08; // type:data rom:0x73208 D_80097E10 = 0x80097E10; // type:data rom:0x73210 D_80097E18 = 0x80097E18; // type:data rom:0x73218 D_80097E20 = 0x80097E20; // type:data rom:0x73220 -D_80097E30 = 0x80097E30; // type:data rom:0x73230 D_80098034 = 0x80098034; // type:data rom:0x73434 D_80098040 = 0x80098040; // type:data rom:0x73440 D_80098050 = 0x80098050; // type:data rom:0x73450 @@ -2479,30 +2478,30 @@ D_8014B0B8 = 0x8014B0B8; // type:data rom:0xE17B8 D_8014B0BC = 0x8014B0BC; // type:data rom:0xE17BC D_8014B400 = 0x8014B400; // type:data rom:0xE1B00 D_8014B404 = 0x8014B404; // type:data rom:0xE1B04 -D_8014B748 = 0x8014B748; // type:data rom:0xE1E48 -D_8014B74C = 0x8014B74C; // type:data rom:0xE1E4C -D_8014B74D = 0x8014B74D; // type:data rom:0xE1E4D -D_8014B74E = 0x8014B74E; // type:data rom:0xE1E4E -D_8014B74F = 0x8014B74F; // type:data rom:0xE1E4F -D_8014B750 = 0x8014B750; // type:data rom:0xE1E50 -D_8014B751 = 0x8014B751; // type:data rom:0xE1E51 -D_8014B752 = 0x8014B752; // type:data rom:0xE1E52 -D_8014B753 = 0x8014B753; // type:data rom:0xE1E53 -D_8014B754 = 0x8014B754; // type:data rom:0xE1E54 -D_8014B755 = 0x8014B755; // type:data rom:0xE1E55 -D_8014B756 = 0x8014B756; // type:data rom:0xE1E56 -D_8014B757 = 0x8014B757; // type:data rom:0xE1E57 -D_8014B758 = 0x8014B758; // type:data rom:0xE1E58 -D_8014B75C = 0x8014B75C; // type:data rom:0xE1E5C -D_8014B760 = 0x8014B760; // type:data rom:0xE1E60 -D_8014B761 = 0x8014B761; // type:data rom:0xE1E61 -D_8014B762 = 0x8014B762; // type:data rom:0xE1E62 -D_8014B763 = 0x8014B763; // type:data rom:0xE1E63 -D_8014B764 = 0x8014B764; // type:data rom:0xE1E64 -D_8014B765 = 0x8014B765; // type:data rom:0xE1E65 +mdl_textureBaseAddress = 0x8014B748; // type:data rom:0xE1E48 +mdl_bgMultiplyColorA = 0x8014B74C; // type:data rom:0xE1E4C +mdl_bgMultiplyColorR = 0x8014B74D; // type:data rom:0xE1E4D +mdl_bgMultiplyColorG = 0x8014B74E; // type:data rom:0xE1E4E +mdl_bgMultiplyColorB = 0x8014B74F; // type:data rom:0xE1E4F +mdl_renderModelFogPrimColorR = 0x8014B750; // type:data rom:0xE1E50 +mdl_renderModelFogPrimColorG = 0x8014B751; // type:data rom:0xE1E51 +mdl_renderModelFogPrimColorB = 0x8014B752; // type:data rom:0xE1E52 +mdl_renderModelFogPrimColorA = 0x8014B753; // type:data rom:0xE1E53 +mdl_renderModelFogColorR = 0x8014B754; // type:data rom:0xE1E54 +mdl_renderModelFogColorG = 0x8014B755; // type:data rom:0xE1E55 +mdl_renderModelFogColorB = 0x8014B756; // type:data rom:0xE1E56 +mdl_renderModelFogColorA = 0x8014B757; // type:data rom:0xE1E57 +mdl_renderModelFogStart = 0x8014B758; // type:data rom:0xE1E58 +mdl_renderModelFogEnd = 0x8014B75C; // type:data rom:0xE1E5C +gRenderModelPrimR = 0x8014B760; // type:data rom:0xE1E60 +gRenderModelPrimG = 0x8014B761; // type:data rom:0xE1E61 +gRenderModelPrimB = 0x8014B762; // type:data rom:0xE1E62 +gRenderModelEnvR = 0x8014B763; // type:data rom:0xE1E63 +gRenderModelEnvG = 0x8014B764; // type:data rom:0xE1E64 +gRenderModelEnvB = 0x8014B765; // type:data rom:0xE1E65 D_8014B766 = 0x8014B766; // type:data rom:0xE1E66 D_8014B767 = 0x8014B767; // type:data rom:0xE1E67 -D_8014B768 = 0x8014B768; // type:data rom:0xE1E68 +mdl_RDPIdentity = 0x8014B768; // type:data rom:0xE1E68 D_8014B7A8 = 0x8014B7A8; // type:data rom:0xE1EA8 D_8014B7F0 = 0x8014B7F0; // type:data rom:0xE1EF0 D_8014B7F8 = 0x8014B7F8; // type:data rom:0xE1EF8 @@ -18256,7 +18255,7 @@ D_8009A5E4 = 0x8009A5E4; // type:data D_8009A5E8 = 0x8009A5E8; // type:data D_8009A5EC = 0x8009A5EC; // type:data nuGfxCfbCounter = 0x8009A5F0; // type:data -D_8009A5F4 = 0x8009A5F4; // type:data +mdl_currentModelTreeNodeInfo = 0x8009A5F4; // type:data nuGfxDisplay = 0x8009A5F8; // D_8009A5FC = 0x8009A5FC; // type:data gGameState = 0x8009A600; // @@ -18313,7 +18312,7 @@ GfxTaskMgrThread = 0x8009C518; // type:data D_8009E6D0 = 0x8009E6D0; // type:data nuSiMesgBuf = 0x8009E6F0; // type:data siMgrThread = 0x8009E710; // type:data -D_800A08C0 = 0x800A08C0; // type:data +blendedCamSettings = 0x800A08C0; // type:data D_800A08DC = 0x800A08DC; // type:data D_800A08E0 = 0x800A08E0; // type:data D_800A08E4 = 0x800A08E4; // type:data @@ -18851,12 +18850,12 @@ D_8014F128 = 0x8014F128; // type:data B_801512B0 = 0x801512B0; // type:data D_801512B0 = 0x801512B0; // type:data D_801512B4 = 0x801512B4; // type:data -gCurrentCustomModelGfxBuilders = 0x801512B8; // type:data +gCurrentCustomModelGfxBuildersPtr = 0x801512B8; // type:data D_801512BC = 0x801512BC; // type:data D_801512C0 = 0x801512C0; // type:data -D_801512C4 = 0x801512C4; // type:data +gEntityHeapBase = 0x801512C4; // type:data D_801512C8 = 0x801512C8; // type:data -gCurrentModelListPtr = 0x801512CC; // +gCurrentModels = 0x801512CC; // D_801512D0 = 0x801512D0; // type:data D_801512D4 = 0x801512D4; // type:data gMsgBGScrollAmtX = 0x801512D8; // type:data @@ -18864,13 +18863,13 @@ D_801512DA = 0x801512DA; // type:data gCurrentTransformGroups = 0x801512E0; // type:data gMsgGlobalWaveCounter = 0x801512E4; // type:data D_801512E8 = 0x801512E8; // type:data -gCurrentModelSpecialDlsPtr = 0x801512E8; // +gCurrentCustomModelGfxPtr = 0x801512E8; // gLastCreatedEntityIndex = 0x801512EC; // B_801512F0 = 0x801512F0; // type:data D_801512F0 = 0x801512F0; // type:data gMsgVarImages = 0x801512F4; // type:data D_801512F8 = 0x801512F8; // type:data -D_801512FC = 0x801512FC; // type:data +gCurrentModelTreeRoot = 0x801512FC; // type:data D_80151300 = 0x80151300; // type:data D_80151304 = 0x80151304; // type:data D_80151308 = 0x80151308; // type:data @@ -18895,52 +18894,51 @@ gCurrentEntityListPtr = 0x80151470; // gWorldShadowList = 0x80151478; // gBattleShadowList = 0x80151568; // gCurrentShadowListPtr = 0x80151658; // -D_8015165C = 0x8015165C; // type:data -D_80151660 = 0x80151660; // type:data -D_80151668 = 0x80151668; // type:data +wStaticEntityDataSize = 0x8015165C; // type:data +bStaticEntityDataSize = 0x80151660; // type:data +wStaticEntityData = 0x80151668; // type:data D_801516DC = 0x801516DC; // type:data -D_801516E8 = 0x801516E8; // type:data +bStaticEntityData = 0x801516E8; // type:data D_801516F4 = 0x801516F4; // type:data D_801516FC = 0x801516FC; // type:data gMainGameState = 0x80151700; // -D_80151740 = 0x80151740; // type:data -gWorldModelList = 0x80151770; // -gBattleModelList = 0x80151B70; // -D_80151F70 = 0x80151F70; // type:data -D_80151F80 = 0x80151F80; // type:data -gWorldModelSpecialDls = 0x80151F90; // -gBattleModelSpecialDls = 0x80152010; // -D_80152090 = 0x80152090; // type:data -D_80152110 = 0x80152110; // type:data +gCurrentTileDescriptor = 0x80151740; // type:data +wModelList = 0x80151770; // +bModelList = 0x80151B70; // +wTransformGroups = 0x80151F70; // type:data +bTransformGroups = 0x80151F80; // type:data +wModelSpecialDls = 0x80151F90; // +bModelSpecialDls = 0x80152010; // +wCustomModelGfxBuilders = 0x80152090; // type:data +bCustomModelGfxBuilders = 0x80152110; // type:data D_80152190 = 0x80152190; // type:data D_801521D0 = 0x801521D0; // type:data -D_80152210 = 0x80152210; // type:data +gCurrentModelLocalVtxBuffers = 0x80152210; // type:data D_80152214 = 0x80152214; // type:data D_80152218 = 0x80152218; // type:data D_80152220 = 0x80152220; // type:data D_80152A20 = 0x80152A20; // type:data -D_80153220 = 0x80153220; // type:data -D_80153221 = 0x80153221; // type:data -D_80153224 = 0x80153224; // type:data +wBgRenderType = 0x80153220; // type:data +bBgRenderType = 0x80153221; // type:data +mdl_treeIterPos = 0x80153224; // type:data D_80153226 = 0x80153226; // type:data -D_80153228 = 0x80153228; // type:data -D_80153248 = 0x80153248; // type:data -wFog = 0x80153264; // type:data +wFogSettings = 0x80153228; // type:data +bFogSettings = 0x80153248; // type:data +gCurrentFogSettings = 0x80153264; // type:data texPannerMainU = 0x80153268; // type:data texPannerMainV = 0x801532A8; // type:data texPannerAuxU = 0x801532E8; // type:data texPannerAuxV = 0x80153328; // type:data -D_80153368 = 0x80153368; // type:data -D_8015336C = 0x8015336C; // type:data +mdl_nextTextureAddress = 0x80153368; // type:data +mdl_currentTransformGroupChildIndex = 0x8015336C; // type:data D_8015336E = 0x8015336E; // type:data D_80153370 = 0x80153370; // type:data D_80153374 = 0x80153374; // type:data D_80153376 = 0x80153376; // type:data D_80153380 = 0x80153380; // type:data -D_801533A0 = 0x801533A0; // type:data -D_801533A8 = 0x801533A8; // type:data -D_801533AC = 0x801533AC; // type:data -D_801533B0 = 0x801533B0; // type:data +mdl_renderTaskLists = 0x801533A0; // type:data +mdl_renderTaskMode = 0x801533AC; // type:data +mdl_renderTaskCount = 0x801533B0; // type:data D_801533C0 = 0x801533C0; // type:data D_801536B8 = 0x801536B8; // type:data D_801536C0 = 0x801536C0; // type:data @@ -19073,7 +19071,7 @@ D_8015A370 = 0x8015A370; // type:data gCollisionStatus = 0x8015A550; // size:0x28 D_8015A578 = 0x8015A578; // type:data D_8015A57A = 0x8015A57A; // type:data -D_8015A590 = 0x8015A590; // type:data +mdl_textureHandles = 0x8015A590; // type:data D_8015C74C = 0x8015C74C; // type:data D_8015C790 = 0x8015C790; // type:data D_8015C7A4 = 0x8015C7A4; // type:data @@ -19352,7 +19350,6 @@ flo_25_D_80245110 = 0x80245110; // type:data D_802451F0 = 0x802451F0; // type:data D_80245210 = 0x80245210; // type:data D_80245230 = 0x80245230; // type:data -D_80245278 = 0x80245278; // type:data D_8024527C = 0x8024527C; // type:data flo_17_pad_527C = 0x8024527C; // type:data flo_25_D_8024527C = 0x8024527C; // type:data @@ -19485,14 +19482,14 @@ D_8024BDF4 = 0x8024BDF4; // type:data D_8024BDF8 = 0x8024BDF8; // type:data D_8024BEA0 = 0x8024BEA0; // type:data D_8024C068 = 0x8024C068; // type:data -D_8024C080 = 0x8024C080; // type:data -D_8024C084 = 0x8024C084; // type:data +filemenu_iterFileIdx = 0x8024C080; // type:data +filemenu_pressedButtons = 0x8024C084; // type:data D_8024C088 = 0x8024C088; // type:data -D_8024C08C = 0x8024C08C; // type:data +filemenu_heldButtons = 0x8024C08C; // type:data D_8024C090 = 0x8024C090; // type:data -D_8024C094 = 0x8024C094; // type:data +filemenu_loadedFileIdx = 0x8024C094; // type:data D_8024C098 = 0x8024C098; // type:data -D_8024C0B0 = 0x8024C0B0; // type:data +filemenu_hudElemIDs = 0x8024C0B0; // type:data D_8024C100 = 0x8024C100; // type:data D_8024C108 = 0x8024C108; // type:data D_8024C110 = 0x8024C110; // type:data @@ -20076,37 +20073,22 @@ D_8029FBC0 = 0x8029FBC0; // type:data D_8029FBD0 = 0x8029FBD0; // type:data D_8029FBD4 = 0x8029FBD4; // type:data gActionCommandStatus = 0x8029FBE0; // type:data -D_8029FBE4 = 0x8029FBE4; // type:data D_8029FC2A = 0x8029FC2A; // type:data D_8029FC3E = 0x8029FC3E; // type:data D_8029FC4C = 0x8029FC4C; // type:data -D_802A18E0 = 0x802A18E0; // type:data D_802A19B0 = 0x802A19B0; // type:data D_802A19C0 = 0x802A19C0; // type:data D_802A1A60 = 0x802A1A60; // type:data battle_item_coconut_coconutDL = 0x802A1A60; // type:data D_802A1A90 = 0x802A1A90; // type:data -D_802A1AA0 = 0x802A1AA0; // type:data D_802A1AC0 = 0x802A1AC0; // type:data D_802A1B40 = 0x802A1B40; // type:data D_802A1C40 = 0x802A1C40; // type:data -D_802A1C90 = 0x802A1C90; // type:data -D_802A1CA0 = 0x802A1CA0; // type:data D_802A1CD0 = 0x802A1CD0; // type:data D_802A1CD4 = 0x802A1CD4; // type:data D_802A1D60 = 0x802A1D60; // type:data -D_802A1D70 = 0x802A1D70; // type:data -D_802A1E70 = 0x802A1E70; // type:data -D_802A1E80 = 0x802A1E80; // type:data -D_802A1EB0 = 0x802A1EB0; // type:data -D_802A1EE0 = 0x802A1EE0; // type:data -D_802A2120 = 0x802A2120; // type:data -D_802A21C0 = 0x802A21C0; // type:data D_802A21F0 = 0x802A21F0; // type:data D_802A2280 = 0x802A2280; // type:data -D_802A2410 = 0x802A2410; // type:data -D_802A24D0 = 0x802A24D0; // type:data -D_802A25C0 = 0x802A25C0; // type:data D_802A25C8 = 0x802A25C8; // type:data D_802A25E4 = 0x802A25E4; // type:data D_802A25E8 = 0x802A25E8; // type:data @@ -20115,11 +20097,9 @@ D_802A25F0 = 0x802A25F0; // type:data D_802A25F4 = 0x802A25F4; // type:data D_802A25F8 = 0x802A25F8; // type:data D_802A25FC = 0x802A25FC; // type:data -D_802A2890 = 0x802A2890; // type:data D_802A2C20 = 0x802A2C20; // type:data D_802A2C50 = 0x802A2C50; // type:data D_802A2CC0 = 0x802A2CC0; // type:data -D_802A2DD0 = 0x802A2DD0; // type:data D_802A2DD8 = 0x802A2DD8; // type:data D_802A2DEC = 0x802A2DEC; // type:data D_802A2DF0 = 0x802A2DF0; // type:data @@ -20132,7 +20112,6 @@ D_802A37F8 = 0x802A37F8; // type:data D_802A3818 = 0x802A3818; // type:data D_802A3834 = 0x802A3834; // type:data D_802A3838 = 0x802A3838; // type:data -D_802A3F50 = 0x802A3F50; // type:data D_802A3F58 = 0x802A3F58; // type:data D_802A3F88 = 0x802A3F88; // type:data D_802A4020 = 0x802A4020; // type:data @@ -20373,7 +20352,7 @@ D_802B6EF4 = 0x802B6EF4; // type:data D_802B7140 = 0x802B7140; // type:data func_802B71E8 = 0x802B71E8; // D_802B79A8 = 0x802B79A8; // type:data -D_802B9E00 = 0x802B9E00; // type:data +mdl_clearRenderTasks = 0x802B7E00; // type:data D_802BCE20 = 0x802BCE20; // type:data D_802BCE30 = 0x802BCE30; // type:data D_802BCE32 = 0x802BCE32; // type:data @@ -20476,7 +20455,6 @@ spr_allocateBtlComponentsOnWorldHeap = 0x802DF524; // type:data D_802DF530 = 0x802DF530; // type:data D_802DF540 = 0x802DF540; // type:data spr_playerSprites = 0x802DF548; // type:data -D_802DF578 = 0x802DF578; // type:data D_802DF57C = 0x802DF57C; // type:data spr_playerMaxComponents = 0x802DF580; // type:data spr_playerCurrentAnimInfo = 0x802DF588; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 49d663a9b0..85c1830f3b 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -39,7 +39,6 @@ paragoomba = 0x8021CD00; D_802C05CC = 0x802C05CC; gPauseMenuMsgs = 0x8026F778; D_802442D0 = 0x802442D0; -D_80097E30 = 0x80097E30; D_802AB513 = 0x802AB513; D_802E9904 = 0x802E9904; D_802E98E0 = 0x802E98E0; @@ -57,7 +56,6 @@ D_800FBBE0 = 0x800FBBE0; D_7012BC11 = 0x7012BC11; D_7012ACA1 = 0x7012ACA1; D_80200000 = 0x80200000; - D_80000000 = 0x80000000; osTvType = 0x80000300; D_80000308 = 0x80000308; @@ -76,24 +74,25 @@ D_80117848 = 0x80117848; D_80117852 = 0x80117852; D_801512B0 = 0x801512B0; D_801512B4 = 0x801512B4; -gCurrentCustomModelGfxBuilders = 0x801512B8; +D_800A08C0 = 0x800A08C0; +gCurrentCustomModelGfxBuildersPtr = 0x801512B8; D_801512BC = 0x801512BC; D_801512C0 = 0x801512C0; -D_801512C4 = 0x801512C4; +gEntityHeapBase = 0x801512C4; D_801512C8 = 0x801512C8; -gCurrentModelListPtr = 0x801512CC; +gCurrentModels = 0x801512CC; D_801512D0 = 0x801512D0; D_801512D4 = 0x801512D4; gMsgBGScrollAmtX = 0x801512D8; D_801512DA = 0x801512DA; gCurrentTransformGroups = 0x801512E0; gMsgGlobalWaveCounter = 0x801512E4; -gCurrentModelSpecialDlsPtr = 0x801512E8; +gCurrentCustomModelGfxPtr = 0x801512E8; gLastCreatedEntityIndex = 0x801512EC; D_801512F0 = 0x801512F0; gMsgVarImages = 0x801512F4; D_801512F8 = 0x801512F8; -D_801512FC = 0x801512FC; +gCurrentModelTreeRoot = 0x801512FC; D_80151300 = 0x80151300; D_80151304 = 0x80151304; D_80151308 = 0x80151308; @@ -118,52 +117,51 @@ gCurrentEntityListPtr = 0x80151470; gWorldShadowList = 0x80151478; gBattleShadowList = 0x80151568; gCurrentShadowListPtr = 0x80151658; -D_8015165C = 0x8015165C; -D_80151660 = 0x80151660; -D_80151668 = 0x80151668; +wStaticEntityDataSize = 0x8015165C; +bStaticEntityDataSize = 0x80151660; +wStaticEntityData = 0x80151668; D_801516DC = 0x801516DC; -D_801516E8 = 0x801516E8; +bStaticEntityData = 0x801516E8; D_801516F4 = 0x801516F4; D_801516FC = 0x801516FC; gMainGameState = 0x80151700; -D_80151740 = 0x80151740; -gWorldModelList = 0x80151770; -gBattleModelList = 0x80151B70; -D_80151F70 = 0x80151F70; -D_80151F80 = 0x80151F80; -gWorldModelSpecialDls = 0x80151F90; -gBattleModelSpecialDls = 0x80152010; -D_80152090 = 0x80152090; -D_80152110 = 0x80152110; +gCurrentTileDescriptor = 0x80151740; +wModelList = 0x80151770; +bModelList = 0x80151B70; +wTransformGroups = 0x80151F70; +bTransformGroups = 0x80151F80; +wModelSpecialDls = 0x80151F90; +bModelSpecialDls = 0x80152010; +wCustomModelGfxBuilders = 0x80152090; +bCustomModelGfxBuilders = 0x80152110; D_80152190 = 0x80152190; D_801521D0 = 0x801521D0; -D_80152210 = 0x80152210; +gCurrentModelLocalVtxBuffers = 0x80152210; D_80152214 = 0x80152214; D_80152218 = 0x80152218; D_80152220 = 0x80152220; D_80152A20 = 0x80152A20; -D_80153220 = 0x80153220; -D_80153221 = 0x80153221; -D_80153224 = 0x80153224; +wBgRenderType = 0x80153220; +bBgRenderType = 0x80153221; +mdl_treeIterPos = 0x80153224; D_80153226 = 0x80153226; -D_80153228 = 0x80153228; -D_80153248 = 0x80153248; -wFog = 0x80153264; +wFogSettings = 0x80153228; +bFogSettings = 0x80153248; +gCurrentFogSettings = 0x80153264; texPannerMainU = 0x80153268; texPannerMainV = 0x801532A8; texPannerAuxU = 0x801532E8; texPannerAuxV = 0x80153328; -D_80153368 = 0x80153368; -D_8015336C = 0x8015336C; +mdl_nextTextureAddress = 0x80153368; +mdl_currentTransformGroupChildIndex = 0x8015336C; D_8015336E = 0x8015336E; D_80153370 = 0x80153370; D_80153374 = 0x80153374; D_80153376 = 0x80153376; D_80153380 = 0x80153380; -D_801533A0 = 0x801533A0; -D_801533A8 = 0x801533A8; -D_801533AC = 0x801533AC; -D_801533B0 = 0x801533B0; +mdl_renderTaskLists = 0x801533A0; +mdl_renderTaskMode = 0x801533AC; +mdl_renderTaskCount = 0x801533B0; D_801533C0 = 0x801533C0; D_801536B8 = 0x801536B8; D_801536C0 = 0x801536C0; @@ -296,7 +294,7 @@ D_8015A370 = 0x8015A370; gCollisionStatus = 0x8015A550; D_8015A578 = 0x8015A578; D_8015A57A = 0x8015A57A; -D_8015A590 = 0x8015A590; +mdl_textureHandles = 0x8015A590; D_8015C74C = 0x8015C74C; D_8015C790 = 0x8015C790; D_8015C7A4 = 0x8015C7A4; @@ -420,7 +418,6 @@ D_80244C18 = 0x80244C18; D_80244D88 = 0x80244D88; D_802451F0 = 0x802451F0; D_80245230 = 0x80245230; -D_80245278 = 0x80245278; D_802453D8 = 0x802453D8; D_80245430 = 0x80245430; D_80245601 = 0x80245601; @@ -516,13 +513,8 @@ D_8024BDF4 = 0x8024BDF4; D_8024BDF8 = 0x8024BDF8; D_8024BEA0 = 0x8024BEA0; D_8024C068 = 0x8024C068; -D_8024C080 = 0x8024C080; -D_8024C084 = 0x8024C084; D_8024C088 = 0x8024C088; -D_8024C08C = 0x8024C08C; D_8024C090 = 0x8024C090; -D_8024C094 = 0x8024C094; -D_8024C0B0 = 0x8024C0B0; D_8024C108 = 0x8024C108; D_8024C110 = 0x8024C110; D_8024C117 = 0x8024C117; @@ -896,33 +888,18 @@ D_8029FBC0 = 0x8029FBC0; D_8029FBD0 = 0x8029FBD0; D_8029FBD4 = 0x8029FBD4; gActionCommandStatus = 0x8029FBE0; -D_8029FBE4 = 0x8029FBE4; D_8029FC2A = 0x8029FC2A; D_8029FC3E = 0x8029FC3E; D_8029FC4C = 0x8029FC4C; -D_802A18E0 = 0x802A18E0; D_802A19B0 = 0x802A19B0; D_802A19C0 = 0x802A19C0; D_802A1A90 = 0x802A1A90; -D_802A1AA0 = 0x802A1AA0; D_802A1AC0 = 0x802A1AC0; D_802A1B40 = 0x802A1B40; -D_802A1C90 = 0x802A1C90; -D_802A1CA0 = 0x802A1CA0; D_802A1CD0 = 0x802A1CD0; D_802A1CD4 = 0x802A1CD4; D_802A1D60 = 0x802A1D60; -D_802A1D70 = 0x802A1D70; -D_802A1E70 = 0x802A1E70; -D_802A1E80 = 0x802A1E80; -D_802A1EB0 = 0x802A1EB0; -D_802A1EE0 = 0x802A1EE0; -D_802A2120 = 0x802A2120; -D_802A21C0 = 0x802A21C0; D_802A21F0 = 0x802A21F0; -D_802A2410 = 0x802A2410; -D_802A24D0 = 0x802A24D0; -D_802A25C0 = 0x802A25C0; D_802A25C8 = 0x802A25C8; D_802A25E4 = 0x802A25E4; D_802A25E8 = 0x802A25E8; @@ -931,11 +908,9 @@ D_802A25F0 = 0x802A25F0; D_802A25F4 = 0x802A25F4; D_802A25F8 = 0x802A25F8; D_802A25FC = 0x802A25FC; -D_802A2890 = 0x802A2890; D_802A2C20 = 0x802A2C20; D_802A2C50 = 0x802A2C50; D_802A2CC0 = 0x802A2CC0; -D_802A2DD0 = 0x802A2DD0; D_802A2DD8 = 0x802A2DD8; D_802A2DEC = 0x802A2DEC; D_802A2DF0 = 0x802A2DF0; @@ -948,7 +923,6 @@ D_802A37F8 = 0x802A37F8; D_802A3818 = 0x802A3818; D_802A3834 = 0x802A3834; D_802A3838 = 0x802A3838; -D_802A3F50 = 0x802A3F50; D_802A3F58 = 0x802A3F58; D_802A3F88 = 0x802A3F88; D_802A4020 = 0x802A4020; @@ -1127,7 +1101,7 @@ D_802B6EE8 = 0x802B6EE8; D_802B6EEC = 0x802B6EEC; D_802B6EF0 = 0x802B6EF0; D_802B6EF4 = 0x802B6EF4; -D_802B9E00 = 0x802B9E00; +mdl_clearRenderTasks = 0x802B7E00; D_802BDF30 = 0x802BDF30; D_802BDF34 = 0x802BDF34; D_802BDF38 = 0x802BDF38; @@ -1221,7 +1195,6 @@ spr_allocateBtlComponentsOnWorldHeap = 0x802DF524; D_802DF530 = 0x802DF530; D_802DF540 = 0x802DF540; spr_playerSprites = 0x802DF548; -D_802DF578 = 0x802DF578; D_802DF57C = 0x802DF57C; spr_playerMaxComponents = 0x802DF580; spr_playerCurrentAnimInfo = 0x802DF588; @@ -1320,7 +1293,7 @@ D_8009A5E4 = 0x8009A5E4; D_8009A5E8 = 0x8009A5E8; D_8009A5EC = 0x8009A5EC; nuGfxCfbCounter = 0x8009A5F0; -D_8009A5F4 = 0x8009A5F4; +mdl_currentModelTreeNodeInfo = 0x8009A5F4; nuGfxDisplay = 0x8009A5F8; D_8009A5FC = 0x8009A5FC; gGameState = 0x8009A600; @@ -1377,7 +1350,7 @@ GfxTaskMgrThread = 0x8009C518; D_8009E6D0 = 0x8009E6D0; nuSiMesgBuf = 0x8009E6F0; siMgrThread = 0x8009E710; -D_800A08C0 = 0x800A08C0; +blendedCamSettings = 0x800A08C0; D_800A08DC = 0x800A08DC; D_800A08E0 = 0x800A08E0; D_800A08E4 = 0x800A08E4;