From 262f6c507ca59c75df52e23f93c701705ee22798 Mon Sep 17 00:00:00 2001 From: Roman971 <32455037+Roman971@users.noreply.github.com> Date: Thu, 16 Apr 2020 23:36:12 +0200 Subject: [PATCH] Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450 --- .../code/code_8006EA30/func_8006EA30.s | 2 +- .../code/code_8006EA30/func_8006ECF4.s | 2 +- .../code/speed_meter/func_800C99C4.s | 4 +- .../code/speed_meter/func_800C9E44.s | 4 +- ...{func_80058354.s => Camera_ChangeStatus.s} | 2 +- .../code/z_camera/func_80043F94.s | 2 +- .../code/z_camera/func_80044568.s | 2 +- .../code/z_camera/func_80046CB4.s | 2 +- .../code/z_camera/func_80046E20.s | 4 +- .../code/z_camera/func_80054478.s | 4 +- .../code/z_camera/func_800591EC.s | 6 +- .../code/z_construct/func_801109B0.s | 2 +- .../code/z_map_exp/Interface_DrawMinimap.s | 6 +- .../code/z_message_PAL/func_8010C358.s | 2 +- .../code/z_onepointdemo/func_8007C850.s | 2 +- .../code/z_onepointdemo/func_80080024.s | 2 +- .../code/z_onepointdemo/func_800800F8.s | 10 +- .../code/z_parameter/Interface_Draw.s | 2 +- .../code/z_parameter/Interface_Update.s | 2 +- .../z_parameter/Interface_UpdateMagicBar.s | 2 +- asm/non_matchings/code/z_play/Area_Spawn.s | 111 - .../{func_800BEDD8.s => Gameplay_Draw.s} | 8 +- .../{func_800BCA64.s => Gameplay_Init.s} | 28 +- .../{func_800BD314.s => Gameplay_Update.s} | 43 +- asm/non_matchings/code/z_play/func_800BC490.s | 71 - asm/non_matchings/code/z_play/func_800BC8EC.s | 99 - asm/non_matchings/code/z_play/func_800BED40.s | 44 - asm/non_matchings/code/z_play/func_800BFAE4.s | 138 -- asm/non_matchings/code/z_play/func_800BFE5C.s | 38 - asm/non_matchings/code/z_play/func_800BFEC4.s | 20 - asm/non_matchings/code/z_play/func_800C016C.s | 51 - asm/non_matchings/code/z_play/func_800C0230.s | 71 - asm/non_matchings/code/z_play/func_800C0314.s | 33 - asm/non_matchings/code/z_play/func_800C0384.s | 66 - asm/non_matchings/code/z_play/func_800C0438.s | 31 - asm/non_matchings/code/z_play/func_800C04A4.s | 17 - asm/non_matchings/code/z_play/func_800C04D8.s | 78 - asm/non_matchings/code/z_play/func_800C0744.s | 22 - asm/non_matchings/code/z_play/func_800C078C.s | 37 - asm/non_matchings/code/z_play/func_800C0808.s | 31 - asm/non_matchings/code/z_play/func_800C0874.s | 16 - asm/non_matchings/code/z_play/func_800C08AC.s | 126 -- asm/non_matchings/code/z_play/func_800C0A44.s | 19 - asm/non_matchings/code/z_play/func_800C0A88.s | 29 - asm/non_matchings/code/z_play/func_800C0AF4.s | 30 - asm/non_matchings/code/z_play/func_800C0CB8.s | 31 - asm/non_matchings/code/z_play/func_800C0D34.s | 40 - asm/non_matchings/code/z_play/func_800C0DB4.s | 49 - .../code/z_player_lib/func_8008EEAC.s | 4 +- asm/non_matchings/code/z_sample/Sample_Draw.s | 147 -- asm/non_matchings/code/z_view/func_800AA550.s | 185 -- asm/non_matchings/code/z_view/func_800AAA9C.s | 465 ---- asm/non_matchings/code/z_view/func_800AB2C4.s | 196 -- asm/non_matchings/code/z_view/func_800AB560.s | 288 --- asm/non_matchings/code/z_view/func_800AB9EC.s | 2 +- .../ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s | 2 +- .../actors/ovl_Bg_Haka/func_8087B7E8.s | 2 +- .../actors/ovl_Bg_Haka_Ship/func_8087F400.s | 2 +- .../actors/ovl_Bg_Haka_Ship/func_8087F6B4.s | 2 +- .../ovl_Bg_Relay_Objects/func_808A932C.s | 2 +- .../BgSpot00Hanebasi_Update.s | 2 +- .../BgSpot17Funen_Destroy.s | 4 - .../ovl_Bg_Spot17_Funen/BgSpot17Funen_Init.s | 25 - .../BgSpot17Funen_Update.s | 9 - .../ovl_Bg_Spot17_Funen/func_808B746C.s | 4 - .../ovl_Bg_Spot17_Funen/func_808B7478.s | 117 -- .../actors/ovl_Boss_Dodongo/func_808C1D00.s | 10 +- .../actors/ovl_Boss_Dodongo/func_808C5578.s | 12 +- .../actors/ovl_Boss_Fd/func_808CB718.s | 8 +- .../actors/ovl_Boss_Fd2/func_808D40C8.s | 8 +- .../actors/ovl_Boss_Ganon/func_808D7918.s | 8 +- .../actors/ovl_Boss_Ganon/func_808D933C.s | 14 +- .../actors/ovl_Boss_Ganon/func_808E3564.s | 2 +- .../actors/ovl_Boss_Ganon2/func_808FD5F4.s | 18 +- .../actors/ovl_Boss_Ganon2/func_80900890.s | 18 +- .../actors/ovl_Boss_Ganon2/func_8090120C.s | 14 +- .../actors/ovl_Boss_Ganondrof/func_80912D2C.s | 8 +- .../actors/ovl_Boss_Goma/func_80916AEC.s | 8 +- .../actors/ovl_Boss_Goma/func_80916C9C.s | 12 +- .../actors/ovl_Boss_Goma/func_80917D98.s | 14 +- .../actors/ovl_Boss_Mo/func_8091C538.s | 10 +- .../actors/ovl_Boss_Mo/func_8091F5A8.s | 10 +- .../actors/ovl_Boss_Mo/func_809206C4.s | 8 +- .../actors/ovl_Boss_Sst/func_8092CB0C.s | 6 +- .../actors/ovl_Boss_Sst/func_8092CC58.s | 6 +- .../actors/ovl_Boss_Sst/func_8092EF28.s | 6 +- .../actors/ovl_Boss_Sst/func_8092F8F0.s | 6 +- .../actors/ovl_Boss_Tw/func_8093C910.s | 8 +- .../actors/ovl_Boss_Tw/func_8093D5C0.s | 8 +- .../actors/ovl_Boss_Tw/func_8093F9E4.s | 10 +- .../overlays/actors/ovl_Boss_Va/BossVa_Init.s | 6 +- .../actors/ovl_Boss_Va/func_80950780.s | 16 +- .../actors/ovl_Boss_Va/func_809533F4.s | 12 +- .../actors/ovl_Boss_Va/func_8095A188.s | 2 +- .../actors/ovl_Demo_Im/func_80986A5C.s | 2 +- .../actors/ovl_Door_Shutter/func_80997220.s | 2 +- .../actors/ovl_Door_Shutter/func_809973E8.s | 2 +- .../actors/ovl_Door_Shutter/func_8099803C.s | 2 +- .../actors/ovl_Door_Warp1/func_80999EE0.s | 6 +- .../actors/ovl_Door_Warp1/func_80999FE4.s | 2 +- .../ovl_En_Bom_Bowl_Pit/func_809C4E8C.s | 6 +- .../ovl_En_Bom_Bowl_Pit/func_809C53F0.s | 4 +- .../ovl_En_Clear_Tag/EnClearTag_Update.s | 6 +- .../actors/ovl_En_Daiku/func_809E3710.s | 6 +- .../actors/ovl_En_Daiku/func_809E3954.s | 4 +- .../actors/ovl_En_Diving_Game/func_809EDB08.s | 2 +- .../actors/ovl_En_Diving_Game/func_809EE1F4.s | 6 +- .../actors/ovl_En_Diving_Game/func_809EE780.s | 4 +- .../actors/ovl_En_Dnt_Jiji/func_809F1CF4.s | 2 +- .../actors/ovl_En_Elf/func_80A053F0.s | 2 +- .../actors/ovl_En_Fhg_Fire/func_80A0F6F8.s | 2 +- .../actors/ovl_En_Go2/func_80A462D8.s | 6 +- .../actors/ovl_En_Go2/func_80A463D8.s | 4 +- .../overlays/actors/ovl_En_Gs/func_80A4E910.s | 2 +- .../actors/ovl_En_Heishi2/func_80A5372C.s | 6 +- .../actors/ovl_En_Heishi2/func_80A53850.s | 4 +- .../actors/ovl_En_Heishi2/func_80A53DF8.s | 6 +- .../actors/ovl_En_Heishi2/func_80A53F30.s | 4 +- .../overlays/actors/ovl_En_Ik/func_80A781CC.s | 2 +- .../overlays/actors/ovl_En_In/func_80A79C78.s | 6 +- .../overlays/actors/ovl_En_In/func_80A7AA40.s | 6 +- .../overlays/actors/ovl_En_In/func_80A7AE84.s | 4 +- .../overlays/actors/ovl_En_Kz/func_80A9D130.s | 6 +- .../overlays/actors/ovl_En_Kz/func_80A9D3C8.s | 4 +- .../actors/ovl_En_M_Thunder/func_80A9F408.s | 2 +- .../actors/ovl_En_M_Thunder/func_80A9F9B4.s | 2 +- .../actors/ovl_En_Owl/func_80ACC00C.s | 2 +- .../actors/ovl_En_Po_Desert/func_80AD30D0.s | 2 +- .../actors/ovl_En_Ru1/func_80AEC780.s | 2 +- .../overlays/actors/ovl_En_Sa/func_80AF683C.s | 2 +- .../overlays/actors/ovl_En_Ta/func_80B14E28.s | 6 +- .../overlays/actors/ovl_En_Ta/func_80B14EDC.s | 4 +- .../overlays/actors/ovl_En_Ta/func_80B154FC.s | 2 +- .../actors/ovl_En_Torch2/EnTorch2_Update.s | 2 +- .../ovl_En_Wonder_Talk2/func_80B3A4F8.s | 2 +- .../overlays/actors/ovl_En_Xc/func_80B3CA84.s | 2 +- .../overlays/actors/ovl_En_Xc/func_80B3CBA4.s | 2 +- .../overlays/actors/ovl_En_Xc/func_80B3CD98.s | 2 +- .../actors/ovl_En_Zl1/func_80B4B010.s | 6 +- .../actors/ovl_En_Zl1/func_80B4BF2C.s | 4 +- .../actors/ovl_En_Zl3/func_80B5764C.s | 2 +- .../actors/ovl_En_Zl3/func_80B57F84.s | 2 +- .../actors/ovl_En_Zl3/func_80B58014.s | 2 +- .../actors/ovl_En_Zl3/func_80B584B4.s | 4 +- .../actors/ovl_En_fHG/func_80B62B6C.s | 8 +- .../actors/ovl_Fishing/func_80B7825C.s | 32 +- .../actors/ovl_kaleido_scope/func_80826CB4.s | 8 +- .../actors/ovl_player_actor/func_80832440.s | 2 +- .../actors/ovl_player_actor/func_80834EB8.s | 2 +- .../actors/ovl_player_actor/func_80835E44.s | 2 +- .../actors/ovl_player_actor/func_80835EA4.s | 2 +- .../actors/ovl_player_actor/func_808382DC.s | 6 +- .../actors/ovl_player_actor/func_80838F5C.s | 2 +- .../actors/ovl_player_actor/func_80839034.s | 8 +- .../actors/ovl_player_actor/func_80839800.s | 2 +- .../actors/ovl_player_actor/func_8083AD4C.s | 2 +- .../actors/ovl_player_actor/func_8083B040.s | 2 +- .../actors/ovl_player_actor/func_8083B8F4.s | 2 +- .../actors/ovl_player_actor/func_8083E5A8.s | 2 +- .../actors/ovl_player_actor/func_8084279C.s | 2 +- .../actors/ovl_player_actor/func_808429B4.s | 2 +- .../actors/ovl_player_actor/func_80845C68.s | 2 +- .../actors/ovl_player_actor/func_80845CA4.s | 4 +- .../actors/ovl_player_actor/func_80845EF8.s | 4 +- .../actors/ovl_player_actor/func_808486A8.s | 10 +- .../actors/ovl_player_actor/func_8084B530.s | 2 +- .../actors/ovl_player_actor/func_8084D3E4.s | 2 +- .../actors/ovl_player_actor/func_8084DF6C.s | 2 +- .../actors/ovl_player_actor/func_8084E3C4.s | 2 +- .../actors/ovl_player_actor/func_8084EAC0.s | 2 +- .../actors/ovl_player_actor/func_8084ECA4.s | 2 +- .../actors/ovl_player_actor/func_8084EED8.s | 2 +- .../actors/ovl_player_actor/func_8084EFC0.s | 2 +- .../actors/ovl_player_actor/func_8084F104.s | 2 +- .../actors/ovl_player_actor/func_8084F88C.s | 6 +- .../actors/ovl_player_actor/func_8084FCAC.s | 2 +- .../actors/ovl_player_actor/func_8085063C.s | 2 +- .../actors/ovl_player_actor/func_808507F4.s | 4 +- .../ovl_Effect_Ss_Sibuki/func_809AB9DC.s | 2 +- .../ovl_file_choose/func_80811A20.s | 2 +- .../gamestates/ovl_select/func_80801AAC.s | 2 +- .../gamestates/ovl_select/func_80801BF0.s | 2 +- .../gamestates/ovl_select/func_80801D04.s | 2 +- .../gamestates/ovl_select/func_80801E44.s | 2 +- data/z_jpeg.data.s | 26 - data/z_play.bss.s | 38 - data/z_play.data.s | 14 - include/color.h | 14 +- include/functions.h | 251 ++- include/macros.h | 12 +- include/ultra64/gbi.h | 4 +- include/ultra64/types.h | 3 +- include/unk.h | 2 +- include/variables.h | 16 +- include/z64.h | 449 ++-- include/z64cutscene.h | 6 +- include/z64item.h | 28 + include/z64scene.h | 11 +- spec | 2 - src/code/code_80097A00.c | 4 +- src/code/code_800ACE70.c | 13 +- src/code/code_800FC620.c | 2 +- src/code/debug_malloc.c | 4 +- src/code/gfxprint.c | 8 +- src/code/graph.c | 7 +- src/code/main.c | 4 +- src/code/sys_matrix.c | 7 +- src/code/system_malloc.c | 4 +- src/code/z_actor.c | 98 +- src/code/z_camera.c | 33 +- src/code/z_collision_check.c | 2 +- src/code/z_common_data.c | 18 +- src/code/z_construct.c | 66 +- src/code/z_debug_display.c | 8 +- src/code/z_demo.c | 760 +++---- src/code/z_draw.c | 106 +- src/code/z_elf_message.c | 10 +- src/code/z_en_item00.c | 10 +- src/code/z_face_reaction.c | 2 +- src/code/z_game_dlftbls.c | 2 +- src/code/z_horse.c | 86 +- src/code/z_lifemeter.c | 12 +- src/code/z_malloc.c | 4 +- src/code/z_map_mark.c | 2 +- src/code/z_parameter.c | 1041 +++++---- src/code/z_play.c | 1864 ++++++++++++++++- src/code/z_player_lib.c | 32 +- src/code/z_quake.c | 7 +- src/code/z_rcp.c | 13 +- src/code/z_room.c | 12 +- src/code/z_sample.c | 39 +- src/code/z_scene.c | 98 +- src/code/z_scene_table.c | 1369 +++++++----- src/code/z_skelanime.c | 4 +- src/code/z_view.c | 569 ++--- .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 9 +- .../actors/ovl_Arrow_Ice/z_arrow_ice.c | 9 +- .../actors/ovl_Arrow_Light/z_arrow_light.c | 9 +- .../ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c | 22 +- .../actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c | 2 + .../actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h | 2 - .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c | 4 +- .../ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c | 10 +- .../z_bg_hidan_firewall.c | 3 +- .../ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c | 4 +- .../ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c | 4 +- .../ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c | 2 +- .../ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c | 6 +- .../z_bg_spot01_objects2.h | 4 +- .../ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c | 6 +- .../ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c | 2 +- .../ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c | 4 +- .../ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c | 8 +- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 16 +- src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c | 2 + src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h | 1 - src/overlays/actors/ovl_Door_Ana/z_door_ana.c | 14 +- .../actors/ovl_Door_Toki/z_door_toki.c | 2 +- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 16 +- .../ovl_En_Anubice_Tag/z_en_anubice_tag.c | 4 +- .../ovl_En_Anubice_Tag/z_en_anubice_tag.h | 2 +- src/overlays/actors/ovl_En_Dog/z_en_dog.c | 37 +- src/overlays/actors/ovl_En_Ds/z_en_ds.c | 6 +- src/overlays/actors/ovl_En_Eg/z_en_eg.c | 15 +- src/overlays/actors/ovl_En_Eg/z_en_eg.h | 1 - .../ovl_En_Ganon_Organ/z_en_ganon_organ.c | 3 +- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 4 +- .../z_en_okarina_effect.c | 44 +- src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 10 +- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 14 +- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 2 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 13 +- .../ovl_Obj_Makekinsuta/z_obj_makekinsuta.c | 2 + .../ovl_Obj_Makekinsuta/z_obj_makekinsuta.h | 1 - .../ovl_Obj_Roomtimer/z_obj_roomtimer.c | 10 +- .../gamestates/ovl_opening/z_opening.c | 20 +- src/overlays/gamestates/ovl_title/z_title.c | 29 +- undefined_syms.txt | 13 +- 278 files changed, 5139 insertions(+), 5939 deletions(-) rename asm/non_matchings/code/z_camera/{func_80058354.s => Camera_ChangeStatus.s} (99%) delete mode 100644 asm/non_matchings/code/z_play/Area_Spawn.s rename asm/non_matchings/code/z_play/{func_800BEDD8.s => Gameplay_Draw.s} (99%) rename asm/non_matchings/code/z_play/{func_800BCA64.s => Gameplay_Init.s} (97%) rename asm/non_matchings/code/z_play/{func_800BD314.s => Gameplay_Update.s} (98%) delete mode 100644 asm/non_matchings/code/z_play/func_800BC490.s delete mode 100644 asm/non_matchings/code/z_play/func_800BC8EC.s delete mode 100644 asm/non_matchings/code/z_play/func_800BED40.s delete mode 100644 asm/non_matchings/code/z_play/func_800BFAE4.s delete mode 100644 asm/non_matchings/code/z_play/func_800BFE5C.s delete mode 100644 asm/non_matchings/code/z_play/func_800BFEC4.s delete mode 100644 asm/non_matchings/code/z_play/func_800C016C.s delete mode 100644 asm/non_matchings/code/z_play/func_800C0230.s delete mode 100644 asm/non_matchings/code/z_play/func_800C0314.s delete mode 100644 asm/non_matchings/code/z_play/func_800C0384.s delete mode 100644 asm/non_matchings/code/z_play/func_800C0438.s delete mode 100644 asm/non_matchings/code/z_play/func_800C04A4.s delete mode 100644 asm/non_matchings/code/z_play/func_800C04D8.s delete mode 100644 asm/non_matchings/code/z_play/func_800C0744.s delete mode 100644 asm/non_matchings/code/z_play/func_800C078C.s delete mode 100644 asm/non_matchings/code/z_play/func_800C0808.s delete mode 100644 asm/non_matchings/code/z_play/func_800C0874.s delete mode 100644 asm/non_matchings/code/z_play/func_800C08AC.s delete mode 100644 asm/non_matchings/code/z_play/func_800C0A44.s delete mode 100644 asm/non_matchings/code/z_play/func_800C0A88.s delete mode 100644 asm/non_matchings/code/z_play/func_800C0AF4.s delete mode 100644 asm/non_matchings/code/z_play/func_800C0CB8.s delete mode 100644 asm/non_matchings/code/z_play/func_800C0D34.s delete mode 100644 asm/non_matchings/code/z_play/func_800C0DB4.s delete mode 100644 asm/non_matchings/code/z_sample/Sample_Draw.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA550.s delete mode 100644 asm/non_matchings/code/z_view/func_800AAA9C.s delete mode 100644 asm/non_matchings/code/z_view/func_800AB2C4.s delete mode 100644 asm/non_matchings/code/z_view/func_800AB560.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B746C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s delete mode 100644 data/z_jpeg.data.s delete mode 100644 data/z_play.bss.s delete mode 100644 data/z_play.data.s diff --git a/asm/non_matchings/code/code_8006EA30/func_8006EA30.s b/asm/non_matchings/code/code_8006EA30/func_8006EA30.s index eb63e19d33..12e8011c26 100644 --- a/asm/non_matchings/code/code_8006EA30/func_8006EA30.s +++ b/asm/non_matchings/code/code_8006EA30/func_8006EA30.s @@ -40,7 +40,7 @@ glabel func_8006EA30 /* AE5C4C 8006EAAC 8FBF0024 */ lw $ra, 0x24($sp) /* AE5C50 8006EAB0 AFA30028 */ sw $v1, 0x28($sp) /* AE5C54 8006EAB4 AFA40038 */ sw $a0, 0x38($sp) -/* AE5C58 8006EAB8 0C02FF21 */ jal func_800BFC84 +/* AE5C58 8006EAB8 0C02FF21 */ jal Gameplay_InCsMode /* AE5C5C 8006EABC AFA8002C */ sw $t0, 0x2c($sp) /* AE5C60 8006EAC0 3C068016 */ lui $a2, %hi(gSaveContext) # $a2, 0x8016 /* AE5C64 8006EAC4 24C6E660 */ addiu $a2, %lo(gSaveContext) # addiu $a2, $a2, -0x19a0 diff --git a/asm/non_matchings/code/code_8006EA30/func_8006ECF4.s b/asm/non_matchings/code/code_8006EA30/func_8006ECF4.s index b27758f41c..91c59ebeaf 100644 --- a/asm/non_matchings/code/code_8006EA30/func_8006ECF4.s +++ b/asm/non_matchings/code/code_8006EA30/func_8006ECF4.s @@ -78,7 +78,7 @@ glabel func_8006ECF4 /* AE5FC4 8006EE24 34210760 */ ori $at, (0x00010760 & 0xFFFF) # ori $at, $at, 0x760 /* AE5FC8 8006EE28 A45909AC */ sh $t9, 0x9ac($v0) /* AE5FCC 8006EE2C 8CC50000 */ lw $a1, ($a2) -/* AE5FD0 8006EE30 0C02A89E */ jal func_800AA278 +/* AE5FD0 8006EE30 0C02A89E */ jal View_Init /* AE5FD4 8006EE34 00812021 */ addu $a0, $a0, $at /* AE5FD8 8006EE38 8FBF0014 */ lw $ra, 0x14($sp) /* AE5FDC 8006EE3C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/code/speed_meter/func_800C99C4.s b/asm/non_matchings/code/speed_meter/func_800C99C4.s index 2a95df626f..79cc61cdc0 100644 --- a/asm/non_matchings/code/speed_meter/func_800C99C4.s +++ b/asm/non_matchings/code/speed_meter/func_800C99C4.s @@ -69,7 +69,7 @@ glabel func_800C99C4 /* B40C40 800C9AA0 AE2F0000 */ sw $t7, ($s1) /* B40C44 800C9AA4 27B000D8 */ addiu $s0, $sp, 0xd8 /* B40C48 800C9AA8 02002025 */ move $a0, $s0 -/* B40C4C 800C9AAC 0C02A89E */ jal func_800AA278 +/* B40C4C 800C9AAC 0C02A89E */ jal View_Init /* B40C50 800C9AB0 8FA50224 */ lw $a1, 0x224($sp) /* B40C54 800C9AB4 2409000A */ li $t1, 10 /* B40C58 800C9AB8 240A00F0 */ li $t2, 240 @@ -80,7 +80,7 @@ glabel func_800C99C4 /* B40C6C 800C9ACC AFA000A4 */ sw $zero, 0xa4($sp) /* B40C70 800C9AD0 AFA000AC */ sw $zero, 0xac($sp) /* B40C74 800C9AD4 02002025 */ move $a0, $s0 -/* B40C78 800C9AD8 0C02A93F */ jal func_800AA4FC +/* B40C78 800C9AD8 0C02A93F */ jal View_SetViewport /* B40C7C 800C9ADC 27A500A4 */ addiu $a1, $sp, 0xa4 /* B40C80 800C9AE0 8FAC0224 */ lw $t4, 0x224($sp) /* B40C84 800C9AE4 02002025 */ move $a0, $s0 diff --git a/asm/non_matchings/code/speed_meter/func_800C9E44.s b/asm/non_matchings/code/speed_meter/func_800C9E44.s index ad7f7a0adc..95421b82fb 100644 --- a/asm/non_matchings/code/speed_meter/func_800C9E44.s +++ b/asm/non_matchings/code/speed_meter/func_800C9E44.s @@ -56,7 +56,7 @@ glabel func_800C9E44 /* B41050 800C9EB0 0C031AB1 */ jal Graph_OpenDisps /* B41054 800C9EB4 2407013E */ li $a3, 318 /* B41058 800C9EB8 27A40080 */ addiu $a0, $sp, 0x80 -/* B4105C 800C9EBC 0C02A89E */ jal func_800AA278 +/* B4105C 800C9EBC 0C02A89E */ jal View_Init /* B41060 800C9EC0 8FA501B4 */ lw $a1, 0x1b4($sp) /* B41064 800C9EC4 240F000A */ li $t7, 10 /* B41068 800C9EC8 241800F0 */ li $t8, 240 @@ -67,7 +67,7 @@ glabel func_800C9E44 /* B4107C 800C9EDC AFA00058 */ sw $zero, 0x58($sp) /* B41080 800C9EE0 AFA00060 */ sw $zero, 0x60($sp) /* B41084 800C9EE4 27A40080 */ addiu $a0, $sp, 0x80 -/* B41088 800C9EE8 0C02A93F */ jal func_800AA4FC +/* B41088 800C9EE8 0C02A93F */ jal View_SetViewport /* B4108C 800C9EEC 27A50058 */ addiu $a1, $sp, 0x58 /* B41090 800C9EF0 8FA901B4 */ lw $t1, 0x1b4($sp) /* B41094 800C9EF4 27A40080 */ addiu $a0, $sp, 0x80 diff --git a/asm/non_matchings/code/z_camera/func_80058354.s b/asm/non_matchings/code/z_camera/Camera_ChangeStatus.s similarity index 99% rename from asm/non_matchings/code/z_camera/func_80058354.s rename to asm/non_matchings/code/z_camera/Camera_ChangeStatus.s index de586fff05..2d5ff1501b 100644 --- a/asm/non_matchings/code/z_camera/func_80058354.s +++ b/asm/non_matchings/code/z_camera/Camera_ChangeStatus.s @@ -12,7 +12,7 @@ glabel D_80139930 .balign 4 .text -glabel func_80058354 +glabel Camera_ChangeStatus /* ACF4F4 80058354 27BDFFD0 */ addiu $sp, $sp, -0x30 /* ACF4F8 80058358 AFB40024 */ sw $s4, 0x24($sp) /* ACF4FC 8005835C 3C148016 */ lui $s4, %hi(gGameInfo) # $s4, 0x8016 diff --git a/asm/non_matchings/code/z_camera/func_80043F94.s b/asm/non_matchings/code/z_camera/func_80043F94.s index 1efb18ae9b..54c0fd97b2 100644 --- a/asm/non_matchings/code/z_camera/func_80043F94.s +++ b/asm/non_matchings/code/z_camera/func_80043F94.s @@ -1,6 +1,6 @@ .late_rodata glabel D_80139DA8 - .float 0.00003051851 + .float 0.00003051851 # (1.0f / 32767.0f) glabel D_80139DAC .float -0.8 diff --git a/asm/non_matchings/code/z_camera/func_80044568.s b/asm/non_matchings/code/z_camera/func_80044568.s index e010fea368..5c8ac29222 100644 --- a/asm/non_matchings/code/z_camera/func_80044568.s +++ b/asm/non_matchings/code/z_camera/func_80044568.s @@ -5,7 +5,7 @@ glabel D_80139060 .late_rodata glabel D_80139DB4 - .float 0.00003051851 + .float 0.00003051851 # (1.0f / 32767.0f) .text glabel func_80044568 diff --git a/asm/non_matchings/code/z_camera/func_80046CB4.s b/asm/non_matchings/code/z_camera/func_80046CB4.s index ab7dd5b850..77eb8e9ec0 100644 --- a/asm/non_matchings/code/z_camera/func_80046CB4.s +++ b/asm/non_matchings/code/z_camera/func_80046CB4.s @@ -3,7 +3,7 @@ glabel D_80139E74 .float 0.001 glabel D_80139E78 - .float 0.00003051851 + .float 0.00003051851 # (1.0f / 32767.0f) glabel D_80139E7C .float 0.01 diff --git a/asm/non_matchings/code/z_camera/func_80046E20.s b/asm/non_matchings/code/z_camera/func_80046E20.s index 67d5a84f51..1766404171 100644 --- a/asm/non_matchings/code/z_camera/func_80046E20.s +++ b/asm/non_matchings/code/z_camera/func_80046E20.s @@ -285,7 +285,7 @@ glabel func_80046E20 /* ABE3D0 80047230 3C088016 */ lui $t0, %hi(gGameInfo) # $t0, 0x8016 /* ABE3D4 80047234 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) /* ABE3D8 80047238 8FAD0074 */ lw $t5, 0x74($sp) -/* ABE3DC 8004723C 3C048016 */ lui $a0, %hi(D_80163FFF) # $a0, 0x8016 +/* ABE3DC 8004723C 3C048016 */ lui $a0, %hi(D_8015CEA0) # $a0, 0x8016 /* ABE3E0 80047240 850901BE */ lh $t1, 0x1be($t0) /* ABE3E4 80047244 44895000 */ mtc1 $t1, $f10 /* ABE3E8 80047248 00000000 */ nop @@ -297,7 +297,7 @@ glabel func_80046E20 /* ABE400 80047260 8484CEA0 */ lh $a0, %lo(D_8015CEA0)($a0) /* ABE404 80047264 85AF0006 */ lh $t7, 6($t5) /* ABE408 80047268 E7A20050 */ swc1 $f2, 0x50($sp) -/* ABE40C 8004726C 24843FFF */ addiu $a0, %lo(D_80163FFF) # addiu $a0, $a0, 0x3fff +/* ABE40C 8004726C 24843FFF */ addiu $a0, $a0, 0x3fff /* ABE410 80047270 00042400 */ sll $a0, $a0, 0x10 /* ABE414 80047274 00042403 */ sra $a0, $a0, 0x10 /* ABE418 80047278 0C01DE1C */ jal Math_Sins diff --git a/asm/non_matchings/code/z_camera/func_80054478.s b/asm/non_matchings/code/z_camera/func_80054478.s index c6e6eceb6a..3ed765ddd2 100644 --- a/asm/non_matchings/code/z_camera/func_80054478.s +++ b/asm/non_matchings/code/z_camera/func_80054478.s @@ -1818,7 +1818,7 @@ glabel func_80054478 /* ACCE20 80055C80 00808025 */ move $s0, $a0 /* ACCE24 80055C84 AFBF0024 */ sw $ra, 0x24($sp) /* ACCE28 80055C88 8C84008C */ lw $a0, 0x8c($a0) -/* ACCE2C 80055C8C 0C030129 */ jal func_800C04A4 +/* ACCE2C 80055C8C 0C030129 */ jal Gameplay_GetCamera /* ACCE30 80055C90 00002825 */ move $a1, $zero /* ACCE34 80055C94 AFA20074 */ sw $v0, 0x74($sp) /* ACCE38 80055C98 8E0E00A8 */ lw $t6, 0xa8($s0) @@ -2041,7 +2041,7 @@ glabel func_80054478 /* ACD160 80055FC0 00808025 */ move $s0, $a0 /* ACD164 80055FC4 AFBF0024 */ sw $ra, 0x24($sp) /* ACD168 80055FC8 8C84008C */ lw $a0, 0x8c($a0) -/* ACD16C 80055FCC 0C030129 */ jal func_800C04A4 +/* ACD16C 80055FCC 0C030129 */ jal Gameplay_GetCamera /* ACD170 80055FD0 00002825 */ move $a1, $zero /* ACD174 80055FD4 244E0094 */ addiu $t6, $v0, 0x94 /* ACD178 80055FD8 AFAE0064 */ sw $t6, 0x64($sp) diff --git a/asm/non_matchings/code/z_camera/func_800591EC.s b/asm/non_matchings/code/z_camera/func_800591EC.s index 53c215eadf..f40a294dde 100644 --- a/asm/non_matchings/code/z_camera/func_800591EC.s +++ b/asm/non_matchings/code/z_camera/func_800591EC.s @@ -52,7 +52,7 @@ glabel D_8013A434 .float 0.01 glabel D_8013A438 - .float 0.00003051851 # (1.f / 32767) + .float 0.00003051851 # (1.0f / 32767.0f) glabel D_8013A43C .float 0.00549325 # (180 / 32767.5f) @@ -758,12 +758,12 @@ glabel func_800591EC /* AD0DB0 80059C10 00000000 */ nop /* AD0DB4 80059C14 45000005 */ bc1f .L80059C2C /* AD0DB8 80059C18 00000000 */ nop -/* AD0DBC 80059C1C 0C02A90F */ jal func_800AA43C +/* AD0DBC 80059C1C 0C02A90F */ jal View_SetScale /* AD0DC0 80059C20 24C400B8 */ addiu $a0, $a2, 0xb8 /* AD0DC4 80059C24 10000004 */ b .L80059C38 /* AD0DC8 80059C28 C7A800B8 */ lwc1 $f8, 0xb8($sp) .L80059C2C: -/* AD0DCC 80059C2C 0C02A90F */ jal func_800AA43C +/* AD0DCC 80059C2C 0C02A90F */ jal View_SetScale /* AD0DD0 80059C30 3C053F80 */ lui $a1, 0x3f80 /* AD0DD4 80059C34 C7A800B8 */ lwc1 $f8, 0xb8($sp) .L80059C38: diff --git a/asm/non_matchings/code/z_construct/func_801109B0.s b/asm/non_matchings/code/z_construct/func_801109B0.s index 83d1c6c7f7..9e2177c224 100644 --- a/asm/non_matchings/code/z_construct/func_801109B0.s +++ b/asm/non_matchings/code/z_construct/func_801109B0.s @@ -128,7 +128,7 @@ glabel func_801109B0 /* B87B80 801109E0 00818021 */ addu $s0, $a0, $at /* B87B84 801109E4 8CC50000 */ lw $a1, ($a2) /* B87B88 801109E8 AFA60058 */ sw $a2, 0x58($sp) -/* B87B8C 801109EC 0C02A89E */ jal func_800AA278 +/* B87B8C 801109EC 0C02A89E */ jal View_Init /* B87B90 801109F0 02002025 */ move $a0, $s0 /* B87B94 801109F4 A60001FC */ sh $zero, 0x1fc($s0) /* B87B98 801109F8 920201FD */ lbu $v0, 0x1fd($s0) diff --git a/asm/non_matchings/code/z_map_exp/Interface_DrawMinimap.s b/asm/non_matchings/code/z_map_exp/Interface_DrawMinimap.s index 830db67c18..3053dcd234 100644 --- a/asm/non_matchings/code/z_map_exp/Interface_DrawMinimap.s +++ b/asm/non_matchings/code/z_map_exp/Interface_DrawMinimap.s @@ -248,11 +248,11 @@ glabel L80081784 /* AF8B84 800819E4 03217827 */ nor $t7, $t9, $at /* AF8B88 800819E8 55E0020D */ bnezl $t7, .L80082220 /* AF8B8C 800819EC 8FAF0110 */ lw $t7, 0x110($sp) -/* AF8B90 800819F0 0C02FF21 */ jal func_800BFC84 +/* AF8B90 800819F0 0C02FF21 */ jal Gameplay_InCsMode /* AF8B94 800819F4 01C02025 */ move $a0, $t6 /* AF8B98 800819F8 54400209 */ bnezl $v0, .L80082220 /* AF8B9C 800819FC 8FAF0110 */ lw $t7, 0x110($sp) -/* AF8BA0 80081A00 0C02FF21 */ jal func_800BFC84 +/* AF8BA0 80081A00 0C02FF21 */ jal Gameplay_InCsMode /* AF8BA4 80081A04 8FA40110 */ lw $a0, 0x110($sp) /* AF8BA8 80081A08 3C048014 */ lui $a0, %hi(D_8013D968) # $a0, 0x8014 /* AF8BAC 80081A0C 2484D968 */ addiu $a0, %lo(D_8013D968) # addiu $a0, $a0, -0x2698 @@ -753,7 +753,7 @@ glabel L80081AA0 /* AF9320 80082180 01C17827 */ nor $t7, $t6, $at /* AF9324 80082184 55E00026 */ bnezl $t7, .L80082220 /* AF9328 80082188 8FAF0110 */ lw $t7, 0x110($sp) -/* AF932C 8008218C 0C02FF21 */ jal func_800BFC84 +/* AF932C 8008218C 0C02FF21 */ jal Gameplay_InCsMode /* AF9330 80082190 03202025 */ move $a0, $t9 /* AF9334 80082194 14400021 */ bnez $v0, .L8008221C /* AF9338 80082198 3C188016 */ lui $t8, %hi(gGameInfo) # $t8, 0x8016 diff --git a/asm/non_matchings/code/z_message_PAL/func_8010C358.s b/asm/non_matchings/code/z_message_PAL/func_8010C358.s index 180309d86d..5f6e10bd26 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010C358.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010C358.s @@ -8,7 +8,7 @@ glabel func_8010C358 /* B83510 8010C370 AFAE001C */ sw $t6, 0x1c($sp) /* B83514 8010C374 AFA00018 */ sw $zero, 0x18($sp) /* B83518 8010C378 AFA00020 */ sw $zero, 0x20($sp) -/* B8351C 8010C37C 0C02A93F */ jal func_800AA4FC +/* B8351C 8010C37C 0C02A93F */ jal View_SetViewport /* B83520 8010C380 27A50018 */ addiu $a1, $sp, 0x18 /* B83524 8010C384 0C02ACB1 */ jal func_800AB2C4 /* B83528 8010C388 8FA40028 */ lw $a0, 0x28($sp) diff --git a/asm/non_matchings/code/z_onepointdemo/func_8007C850.s b/asm/non_matchings/code/z_onepointdemo/func_8007C850.s index 34b5097e30..1f9ab8c2e4 100644 --- a/asm/non_matchings/code/z_onepointdemo/func_8007C850.s +++ b/asm/non_matchings/code/z_onepointdemo/func_8007C850.s @@ -1588,7 +1588,7 @@ glabel func_8007C850 .L8007D6EC: /* AF488C 8007D6EC 02402025 */ move $a0, $s2 /* AF4890 8007D6F0 00002825 */ move $a1, $zero -/* AF4894 8007D6F4 0C0300C5 */ jal func_800C0314 +/* AF4894 8007D6F4 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* AF4898 8007D6F8 24060003 */ li $a2, 3 /* AF489C 8007D6FC 00152C00 */ sll $a1, $s5, 0x10 /* AF48A0 8007D700 00052C03 */ sra $a1, $a1, 0x10 diff --git a/asm/non_matchings/code/z_onepointdemo/func_80080024.s b/asm/non_matchings/code/z_onepointdemo/func_80080024.s index 593b6d245e..4a71e0a474 100644 --- a/asm/non_matchings/code/z_onepointdemo/func_80080024.s +++ b/asm/non_matchings/code/z_onepointdemo/func_80080024.s @@ -48,7 +48,7 @@ glabel func_80080024 /* AF7270 800800D0 00062C00 */ sll $a1, $a2, 0x10 /* AF7274 800800D4 A459014E */ sh $t9, 0x14e($v0) /* AF7278 800800D8 AFA30018 */ sw $v1, 0x18($sp) -/* AF727C 800800DC 0C0300E1 */ jal func_800C0384 +/* AF727C 800800DC 0C0300E1 */ jal Gameplay_ClearCamera /* AF7280 800800E0 00052C03 */ sra $a1, $a1, 0x10 /* AF7284 800800E4 8FBF0014 */ lw $ra, 0x14($sp) /* AF7288 800800E8 8FA20018 */ lw $v0, 0x18($sp) diff --git a/asm/non_matchings/code/z_onepointdemo/func_800800F8.s b/asm/non_matchings/code/z_onepointdemo/func_800800F8.s index e56231c8a0..6ae913744e 100644 --- a/asm/non_matchings/code/z_onepointdemo/func_800800F8.s +++ b/asm/non_matchings/code/z_onepointdemo/func_800800F8.s @@ -32,7 +32,7 @@ glabel func_800800F8 /* AF72E8 80080148 AFA70054 */ sw $a3, 0x54($sp) /* AF72EC 8008014C 849107A0 */ lh $s1, 0x7a0($a0) .L80080150: -/* AF72F0 80080150 0C03008C */ jal func_800C0230 +/* AF72F0 80080150 0C03008C */ jal Gameplay_CreateSubCamera /* AF72F4 80080154 02602025 */ move $a0, $s3 /* AF72F8 80080158 14570007 */ bne $v0, $s7, .L80080178 /* AF72FC 8008015C A7A20042 */ sh $v0, 0x42($sp) @@ -94,12 +94,12 @@ glabel func_800800F8 /* AF73D0 80080230 E46400FC */ swc1 $f4, 0xfc($v1) /* AF73D4 80080234 00112C00 */ sll $a1, $s1, 0x10 /* AF73D8 80080238 00052C03 */ sra $a1, $a1, 0x10 -/* AF73DC 8008023C 0C0300C5 */ jal func_800C0314 +/* AF73DC 8008023C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* AF73E0 80080240 02602025 */ move $a0, $s3 /* AF73E4 80080244 10000004 */ b .L80080258 /* AF73E8 80080248 00143400 */ sll $a2, $s4, 0x10 .L8008024C: -/* AF73EC 8008024C 0C0300C5 */ jal func_800C0314 +/* AF73EC 8008024C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* AF73F0 80080250 24060001 */ li $a2, 1 /* AF73F4 80080254 00143400 */ sll $a2, $s4, 0x10 .L80080258: @@ -112,7 +112,7 @@ glabel func_800800F8 /* AF7410 80080270 00103400 */ sll $a2, $s0, 0x10 /* AF7414 80080274 00063403 */ sra $a2, $a2, 0x10 /* AF7418 80080278 02602025 */ move $a0, $s3 -/* AF741C 8008027C 0C0300C5 */ jal func_800C0314 +/* AF741C 8008027C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* AF7420 80080280 87A50042 */ lh $a1, 0x42($sp) /* AF7424 80080284 8ECE0790 */ lw $t6, 0x790($s6) /* AF7428 80080288 87B20042 */ lh $s2, 0x42($sp) @@ -180,7 +180,7 @@ glabel func_800800F8 /* AF750C 8008036C 00102C00 */ sll $a1, $s0, 0x10 /* AF7510 80080370 00052C03 */ sra $a1, $a1, 0x10 /* AF7514 80080374 02602025 */ move $a0, $s3 -/* AF7518 80080378 0C0300C5 */ jal func_800C0314 +/* AF7518 80080378 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* AF751C 8008037C 24060007 */ li $a2, 7 /* AF7520 80080380 1000000C */ b .L800803B4 /* AF7524 80080384 8E390790 */ lw $t9, 0x790($s1) diff --git a/asm/non_matchings/code/z_parameter/Interface_Draw.s b/asm/non_matchings/code/z_parameter/Interface_Draw.s index d64ce72794..b36db288bf 100644 --- a/asm/non_matchings/code/z_parameter/Interface_Draw.s +++ b/asm/non_matchings/code/z_parameter/Interface_Draw.s @@ -1905,7 +1905,7 @@ glabel L8008ABB0 /* B03718 8008C578 914E241B */ lbu $t6, 0x241b($t2) /* B0371C 8008C57C 55C003E6 */ bnezl $t6, .L8008D518 /* B03720 8008C580 8FB80068 */ lw $t8, 0x68($sp) -/* B03724 8008C584 0C02FF21 */ jal func_800BFC84 +/* B03724 8008C584 0C02FF21 */ jal Gameplay_InCsMode /* B03728 8008C588 02E02025 */ move $a0, $s7 /* B0372C 8008C58C 544003E2 */ bnezl $v0, .L8008D518 /* B03730 8008C590 8FB80068 */ lw $t8, 0x68($sp) diff --git a/asm/non_matchings/code/z_parameter/Interface_Update.s b/asm/non_matchings/code/z_parameter/Interface_Update.s index 93377ce59c..5c62a560ad 100644 --- a/asm/non_matchings/code/z_parameter/Interface_Update.s +++ b/asm/non_matchings/code/z_parameter/Interface_Update.s @@ -511,7 +511,7 @@ glabel L8008D93C /* B04D48 8008DBA8 9138241B */ lbu $t8, 0x241b($t1) /* B04D4C 8008DBAC 57000006 */ bnezl $t8, .L8008DBC8 /* B04D50 8008DBB0 850213CC */ lh $v0, 0x13cc($t0) -/* B04D54 8008DBB4 0C02FF21 */ jal func_800BFC84 +/* B04D54 8008DBB4 0C02FF21 */ jal Gameplay_InCsMode /* B04D58 8008DBB8 01E02025 */ move $a0, $t7 /* B04D5C 8008DBBC 3C088016 */ lui $t0, %hi(gSaveContext) # $t0, 0x8016 /* B04D60 8008DBC0 2508E660 */ addiu $t0, %lo(gSaveContext) # addiu $t0, $t0, -0x19a0 diff --git a/asm/non_matchings/code/z_parameter/Interface_UpdateMagicBar.s b/asm/non_matchings/code/z_parameter/Interface_UpdateMagicBar.s index c268a47df6..d04f83f869 100644 --- a/asm/non_matchings/code/z_parameter/Interface_UpdateMagicBar.s +++ b/asm/non_matchings/code/z_parameter/Interface_UpdateMagicBar.s @@ -355,7 +355,7 @@ glabel L80087E24 /* AFF010 80087E70 9058241B */ lbu $t8, 0x241b($v0) /* AFF014 80087E74 1700004E */ bnez $t8, .L80087FB0 /* AFF018 80087E78 00000000 */ nop -/* AFF01C 80087E7C 0C02FF21 */ jal func_800BFC84 +/* AFF01C 80087E7C 0C02FF21 */ jal Gameplay_InCsMode /* AFF020 80087E80 AFA40020 */ sw $a0, 0x20($sp) /* AFF024 80087E84 3C038016 */ lui $v1, %hi(gSaveContext) # $v1, 0x8016 /* AFF028 80087E88 14400049 */ bnez $v0, .L80087FB0 diff --git a/asm/non_matchings/code/z_play/Area_Spawn.s b/asm/non_matchings/code/z_play/Area_Spawn.s deleted file mode 100644 index db0e514ea8..0000000000 --- a/asm/non_matchings/code/z_play/Area_Spawn.s +++ /dev/null @@ -1,111 +0,0 @@ -.rdata -glabel D_80144798 - .asciz "\nSCENE SIZE %fK\n" - .balign 4 - -glabel D_801447AC - .incbin "baserom.z64", 0xBBB94C, 0x1C - -glabel D_801447C8 - .asciz "../z_play.c" - .balign 4 - -glabel D_801447D4 - .asciz "ROOM SIZE=%fK\n" - .balign 4 - -.text -glabel Area_Spawn -/* B371A8 800C0008 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B371AC 800C000C 00057080 */ sll $t6, $a1, 2 -/* B371B0 800C0010 01C57021 */ addu $t6, $t6, $a1 -/* B371B4 800C0014 3C0F8013 */ lui $t7, %hi(gSceneTable) # $t7, 0x8013 -/* B371B8 800C0018 AFB00014 */ sw $s0, 0x14($sp) -/* B371BC 800C001C 25EF9A10 */ addiu $t7, %lo(gSceneTable) # addiu $t7, $t7, -0x65f0 -/* B371C0 800C0020 000E7080 */ sll $t6, $t6, 2 -/* B371C4 800C0024 01CF8021 */ addu $s0, $t6, $t7 -/* B371C8 800C0028 3C010001 */ lui $at, 1 -/* B371CC 800C002C AFBF001C */ sw $ra, 0x1c($sp) -/* B371D0 800C0030 AFB10018 */ sw $s1, 0x18($sp) -/* B371D4 800C0034 AFA60028 */ sw $a2, 0x28($sp) -/* B371D8 800C0038 A2000013 */ sb $zero, 0x13($s0) -/* B371DC 800C003C 00240821 */ addu $at, $at, $a0 -/* B371E0 800C0040 AC30242C */ sw $s0, 0x242c($at) -/* B371E4 800C0044 A48500A4 */ sh $a1, 0xa4($a0) -/* B371E8 800C0048 92180011 */ lbu $t8, 0x11($s0) -/* B371EC 800C004C 00808825 */ move $s1, $a0 -/* B371F0 800C0050 3C014F80 */ lui $at, 0x4f80 -/* B371F4 800C0054 A09800A6 */ sb $t8, 0xa6($a0) -/* B371F8 800C0058 8E080000 */ lw $t0, ($s0) -/* B371FC 800C005C 8E190004 */ lw $t9, 4($s0) -/* B37200 800C0060 3C048014 */ lui $a0, %hi(D_80144798) -/* B37204 800C0064 24844798 */ addiu $a0, %lo(D_80144798) # addiu $a0, $a0, 0x4798 -/* B37208 800C0068 03284823 */ subu $t1, $t9, $t0 -/* B3720C 800C006C 44892000 */ mtc1 $t1, $f4 -/* B37210 800C0070 05210004 */ bgez $t1, .L800C0084 -/* B37214 800C0074 468021A0 */ cvt.s.w $f6, $f4 -/* B37218 800C0078 44814000 */ mtc1 $at, $f8 -/* B3721C 800C007C 00000000 */ nop -/* B37220 800C0080 46083180 */ add.s $f6, $f6, $f8 -.L800C0084: -/* B37224 800C0084 3C013A80 */ li $at, 0x3A800000 # 0.000000 -/* B37228 800C0088 44815000 */ mtc1 $at, $f10 -/* B3722C 800C008C 00000000 */ nop -/* B37230 800C0090 460A3402 */ mul.s $f16, $f6, $f10 -/* B37234 800C0094 460084A1 */ cvt.d.s $f18, $f16 -/* B37238 800C0098 44079000 */ mfc1 $a3, $f18 -/* B3723C 800C009C 44069800 */ mfc1 $a2, $f19 -/* B37240 800C00A0 0C00084C */ jal osSyncPrintf -/* B37244 800C00A4 00000000 */ nop -/* B37248 800C00A8 02202025 */ move $a0, $s1 -/* B3724C 800C00AC 0C02FF97 */ jal func_800BFE5C -/* B37250 800C00B0 02002825 */ move $a1, $s0 -/* B37254 800C00B4 AE2200B0 */ sw $v0, 0xb0($s1) -/* B37258 800C00B8 A2000013 */ sb $zero, 0x13($s0) -/* B3725C 800C00BC 8E2300B0 */ lw $v1, 0xb0($s1) -/* B37260 800C00C0 3C048014 */ lui $a0, %hi(D_801447AC) # $a0, 0x8014 -/* B37264 800C00C4 248447AC */ addiu $a0, %lo(D_801447AC) # addiu $a0, $a0, 0x47ac -/* B37268 800C00C8 14600005 */ bnez $v1, .L800C00E0 -/* B3726C 800C00CC 3C058014 */ lui $a1, %hi(D_801447C8) # $a1, 0x8014 -/* B37270 800C00D0 24A547C8 */ addiu $a1, %lo(D_801447C8) # addiu $a1, $a1, 0x47c8 -/* B37274 800C00D4 0C0007FC */ jal __assert -/* B37278 800C00D8 24061360 */ li $a2, 4960 -/* B3727C 800C00DC 8E2300B0 */ lw $v1, 0xb0($s1) -.L800C00E0: -/* B37280 800C00E0 3C018000 */ lui $at, 0x8000 -/* B37284 800C00E4 00615021 */ addu $t2, $v1, $at -/* B37288 800C00E8 3C018016 */ lui $at, %hi(gSegments+8) # $at, 0x8016 -/* B3728C 800C00EC AC2A6FB0 */ sw $t2, %lo(gSegments+8)($at) -/* B37290 800C00F0 02202025 */ move $a0, $s1 -/* B37294 800C00F4 0C02FFC3 */ jal func_800BFF0C -/* B37298 800C00F8 8FA50028 */ lw $a1, 0x28($sp) -/* B3729C 800C00FC 3C010001 */ li $at, 0x00010000 # 0.000000 -/* B372A0 800C0100 34211CBC */ ori $at, (0x00011CBC & 0xFFFF) # ori $at, $at, 0x1cbc -/* B372A4 800C0104 02212821 */ addu $a1, $s1, $at -/* B372A8 800C0108 0C025BFA */ jal func_80096FE8 -/* B372AC 800C010C 02202025 */ move $a0, $s1 -/* B372B0 800C0110 44822000 */ mtc1 $v0, $f4 -/* B372B4 800C0114 3C048014 */ lui $a0, %hi(D_801447D4) # $a0, 0x8014 -/* B372B8 800C0118 248447D4 */ addiu $a0, %lo(D_801447D4) # addiu $a0, $a0, 0x47d4 -/* B372BC 800C011C 04410005 */ bgez $v0, .L800C0134 -/* B372C0 800C0120 46802220 */ cvt.s.w $f8, $f4 -/* B372C4 800C0124 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B372C8 800C0128 44813000 */ mtc1 $at, $f6 -/* B372CC 800C012C 00000000 */ nop -/* B372D0 800C0130 46064200 */ add.s $f8, $f8, $f6 -.L800C0134: -/* B372D4 800C0134 3C013A80 */ li $at, 0x3A800000 # 0.000000 -/* B372D8 800C0138 44815000 */ mtc1 $at, $f10 -/* B372DC 800C013C 00000000 */ nop -/* B372E0 800C0140 460A4402 */ mul.s $f16, $f8, $f10 -/* B372E4 800C0144 460084A1 */ cvt.d.s $f18, $f16 -/* B372E8 800C0148 44079000 */ mfc1 $a3, $f18 -/* B372EC 800C014C 44069800 */ mfc1 $a2, $f19 -/* B372F0 800C0150 0C00084C */ jal osSyncPrintf -/* B372F4 800C0154 00000000 */ nop -/* B372F8 800C0158 8FBF001C */ lw $ra, 0x1c($sp) -/* B372FC 800C015C 8FB00014 */ lw $s0, 0x14($sp) -/* B37300 800C0160 8FB10018 */ lw $s1, 0x18($sp) -/* B37304 800C0164 03E00008 */ jr $ra -/* B37308 800C0168 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/non_matchings/code/z_play/func_800BEDD8.s b/asm/non_matchings/code/z_play/Gameplay_Draw.s similarity index 99% rename from asm/non_matchings/code/z_play/func_800BEDD8.s rename to asm/non_matchings/code/z_play/Gameplay_Draw.s index 1860ef8bc7..b4d9245d00 100644 --- a/asm/non_matchings/code/z_play/func_800BEDD8.s +++ b/asm/non_matchings/code/z_play/Gameplay_Draw.s @@ -12,7 +12,7 @@ glabel D_80144738 .balign 4 .text -glabel func_800BEDD8 +glabel Gameplay_Draw /* B35F78 800BEDD8 27BDFDD0 */ addiu $sp, $sp, -0x230 /* B35F7C 800BEDDC AFBF002C */ sw $ra, 0x2c($sp) /* B35F80 800BEDE0 AFB10028 */ sw $s1, 0x28($sp) @@ -281,7 +281,7 @@ glabel func_800BEDD8 /* B36394 800BF1F4 5420001B */ bnezl $at, .L800BF264 /* B36398 800BF1F8 3C010001 */ lui $at, 1 .L800BF1FC: -/* B3639C 800BF1FC 0C02A89E */ jal func_800AA278 +/* B3639C 800BF1FC 0C02A89E */ jal View_Init /* B363A0 800BF200 02202825 */ move $a1, $s1 /* B363A4 800BF204 240F000A */ li $t7, 10 /* B363A8 800BF208 241800F0 */ li $t8, 240 @@ -292,7 +292,7 @@ glabel func_800BEDD8 /* B363BC 800BF21C AFA00090 */ sw $zero, 0x90($sp) /* B363C0 800BF220 AFA00098 */ sw $zero, 0x98($sp) /* B363C4 800BF224 27A400A0 */ addiu $a0, $sp, 0xa0 -/* B363C8 800BF228 0C02A93F */ jal func_800AA4FC +/* B363C8 800BF228 0C02A93F */ jal View_SetViewport /* B363CC 800BF22C 27A50090 */ addiu $a1, $sp, 0x90 /* B363D0 800BF230 27A400A0 */ addiu $a0, $sp, 0xa0 /* B363D4 800BF234 2405000F */ li $a1, 15 @@ -852,7 +852,7 @@ glabel func_800BEDD8 /* B36BC0 800BFA20 51200004 */ beql $t1, $zero, .L800BFA34 /* B36BC4 800BFA24 8E1901DC */ lw $t9, 0x1dc($s0) .L800BFA28: -/* B36BC8 800BFA28 0C02FB50 */ jal func_800BED40 +/* B36BC8 800BFA28 0C02FB50 */ jal Gameplay_DrawOverlayElements /* B36BCC 800BFA2C 02002025 */ move $a0, $s0 .L800BFA30: /* B36BD0 800BFA30 8E1901DC */ lw $t9, 0x1dc($s0) diff --git a/asm/non_matchings/code/z_play/func_800BCA64.s b/asm/non_matchings/code/z_play/Gameplay_Init.s similarity index 97% rename from asm/non_matchings/code/z_play/func_800BCA64.s rename to asm/non_matchings/code/z_play/Gameplay_Init.s index 14b540a6fc..0b8681bdde 100644 --- a/asm/non_matchings/code/z_play/func_800BCA64.s +++ b/asm/non_matchings/code/z_play/Gameplay_Init.s @@ -5,12 +5,12 @@ glabel D_801441E8 glabel D_80144204 .asciz "エンディングはじまるよー\n" - # EUC-JP: エンディングはじまるよー | The ending starts? + # Translates to: "The ending starts?" .balign 4 glabel D_80144220 .asciz "出戻り？\n" - # EUC-JP: 出戻り | Return + # Translates to: "Return?" .balign 4 glabel D_8014422C @@ -23,7 +23,7 @@ glabel D_80144244 glabel D_80144250 .asciz "ゼルダヒープ %08x-%08x\n" - # EUC-JP: ゼルダヒープ | Zelda heap + # Translates to: "Zelda heap" .balign 4 glabel D_80144268 @@ -35,7 +35,7 @@ glabel D_80144294 .balign 4 .text -glabel func_800BCA64 +glabel Gameplay_Init /* B33C04 800BCA64 27BDFF70 */ addiu $sp, $sp, -0x90 /* B33C08 800BCA68 AFB20028 */ sw $s2, 0x28($sp) /* B33C0C 800BCA6C 3C128016 */ lui $s2, %hi(gSaveContext) # $s2, 0x8016 @@ -67,7 +67,7 @@ glabel func_800BCA64 /* B33C70 800BCAD0 02202025 */ move $a0, $s1 /* B33C74 800BCAD4 262400B8 */ addiu $a0, $s1, 0xb8 /* B33C78 800BCAD8 AFA4003C */ sw $a0, 0x3c($sp) -/* B33C7C 800BCADC 0C02A89E */ jal func_800AA278 +/* B33C7C 800BCADC 0C02A89E */ jal View_Init /* B33C80 800BCAE0 02002825 */ move $a1, $s0 /* B33C84 800BCAE4 0C03DA0A */ jal func_800F6828 /* B33C88 800BCAE8 00002025 */ move $a0, $zero @@ -89,7 +89,7 @@ glabel func_800BCA64 /* B33CC4 800BCB24 0C015F1B */ jal func_80057C6C /* B33CC8 800BCB28 02203825 */ move $a3, $s1 /* B33CCC 800BCB2C 8FA40038 */ lw $a0, 0x38($sp) -/* B33CD0 800BCB30 0C0160D5 */ jal func_80058354 +/* B33CD0 800BCB30 0C0160D5 */ jal Camera_ChangeStatus /* B33CD4 800BCB34 24050007 */ li $a1, 7 /* B33CD8 800BCB38 00004025 */ move $t0, $zero /* B33CDC 800BCB3C 2630034C */ addiu $s0, $s1, 0x34c @@ -101,7 +101,7 @@ glabel func_800BCA64 /* B33CF0 800BCB50 0C015F1B */ jal func_80057C6C /* B33CF4 800BCB54 AFA80044 */ sw $t0, 0x44($sp) /* B33CF8 800BCB58 02002025 */ move $a0, $s0 -/* B33CFC 800BCB5C 0C0160D5 */ jal func_80058354 +/* B33CFC 800BCB5C 0C0160D5 */ jal Camera_ChangeStatus /* B33D00 800BCB60 24050100 */ li $a1, 256 /* B33D04 800BCB64 8FA80044 */ lw $t0, 0x44($sp) /* B33D08 800BCB68 24010444 */ li $at, 1092 @@ -296,7 +296,7 @@ glabel func_800BCA64 /* B33FB8 800BCE18 01F81021 */ addu $v0, $t7, $t8 /* B33FBC 800BCE1C 80450000 */ lb $a1, ($v0) /* B33FC0 800BCE20 80460001 */ lb $a2, 1($v0) -/* B33FC4 800BCE24 0C030002 */ jal Area_Spawn +/* B33FC4 800BCE24 0C030002 */ jal Gameplay_SpawnScene /* B33FC8 800BCE28 02202025 */ move $a0, $s1 /* B33FCC 800BCE2C 3C048014 */ lui $a0, %hi(D_801441E8) # $a0, 0x8014 /* B33FD0 800BCE30 248441E8 */ addiu $a0, %lo(D_801441E8) # addiu $a0, $a0, 0x41e8 @@ -405,10 +405,10 @@ glabel func_800BCA64 /* B34158 800BCFB8 00602025 */ move $a0, $v1 /* B3415C 800BCFBC 0C034204 */ jal Matrix_Init /* B34160 800BCFC0 02202025 */ move $a0, $s1 -/* B34164 800BCFC4 3C0C800C */ lui $t4, %hi(func_800BFAE4) # $t4, 0x800c -/* B34168 800BCFC8 3C0D800C */ lui $t5, %hi(func_800BC8EC) # $t5, 0x800c -/* B3416C 800BCFCC 258CFAE4 */ addiu $t4, %lo(func_800BFAE4) # addiu $t4, $t4, -0x51c -/* B34170 800BCFD0 25ADC8EC */ addiu $t5, %lo(func_800BC8EC) # addiu $t5, $t5, -0x3714 +/* B34164 800BCFC4 3C0C800C */ lui $t4, %hi(Gameplay_Main) # $t4, 0x800c +/* B34168 800BCFC8 3C0D800C */ lui $t5, %hi(Gameplay_Destroy) # $t5, 0x800c +/* B3416C 800BCFCC 258CFAE4 */ addiu $t4, %lo(Gameplay_Main) # addiu $t4, $t4, -0x51c +/* B34170 800BCFD0 25ADC8EC */ addiu $t5, %lo(Gameplay_Destroy) # addiu $t5, $t5, -0x3714 /* B34174 800BCFD4 3C010001 */ lui $at, 1 /* B34178 800BCFD8 AE2C0004 */ sw $t4, 4($s1) /* B3417C 800BCFDC AE2D0008 */ sw $t5, 8($s1) @@ -477,8 +477,8 @@ glabel func_800BCA64 /* B3426C 800BD0CC 3C048016 */ lui $a0, %hi(D_80161498) # $a0, 0x8016 /* B34270 800BD0D0 0C02B400 */ jal func_800AD000 /* B34274 800BD0D4 24841498 */ addiu $a0, %lo(D_80161498) # addiu $a0, $a0, 0x1498 -/* B34278 800BD0D8 3C018016 */ lui $at, %hi(D_801614B3) # $at, 0x8016 -/* B3427C 800BD0DC A02014B3 */ sb $zero, %lo(D_801614B3)($at) +/* B34278 800BD0D8 3C018016 */ lui $at, %hi(D_801614B0+3) # $at, 0x8016 +/* B3427C 800BD0DC A02014B3 */ sb $zero, %lo(D_801614B0+3)($at) /* B34280 800BD0E0 0C01B0E8 */ jal func_8006C3A0 /* B34284 800BD0E4 02202025 */ move $a0, $s1 /* B34288 800BD0E8 26300074 */ addiu $s0, $s1, 0x74 diff --git a/asm/non_matchings/code/z_play/func_800BD314.s b/asm/non_matchings/code/z_play/Gameplay_Update.s similarity index 98% rename from asm/non_matchings/code/z_play/func_800BD314.s rename to asm/non_matchings/code/z_play/Gameplay_Update.s index 25170f5a22..3ed5dc5a86 100644 --- a/asm/non_matchings/code/z_play/func_800BD314.s +++ b/asm/non_matchings/code/z_play/Gameplay_Update.s @@ -17,18 +17,18 @@ glabel D_801442FC glabel D_80144300 .asciz "fbdemo_init呼出し失敗！\n" - # EUC-JP: 呼出し失敗！| Call failed! + # Translates to: "Call failed!" .balign 4 glabel D_8014431C - .incbin "baserom.z64", 0xBBB4BC, 0x24 - # .asciz "\n\n\nサウンドイニシャル来ました。111" - # EUC-JP: サウンドイニシャル来ました。| Sound initalized? + .asciz "\n\n\nサウンドイニシャル来ました。111" + # Translates to: "Sound initalized." + .balign 4 glabel D_80144340 - .incbin "baserom.z64", 0xBBB4E0, 0x24 - # .asciz "\n\n\nサウンドイニシャル来ました。222" - # EUC-JP: サウンドイニシャル来ました。| Sound initalized? + .asciz "\n\n\nサウンドイニシャル来ました。222" + # Translates to: "Sound initalized." + .balign 4 glabel D_80144364 .asciz "../z_play.c" @@ -36,11 +36,12 @@ glabel D_80144364 glabel D_80144370 .asciz "\"来た!!!!!!!!!!!!!!!!!!!!!\" = %s\n" - # EUC-JP: 来た | Was coming? + # Translates to: "It's here!!!" .balign 4 glabel D_80144394 .asciz "来た!!!!!!!!!!!!!!!!!!!!!" + # Translates to: "It's here!!!" .balign 4 glabel D_801443B0 @@ -217,12 +218,12 @@ glabel D_80144558 glabel D_80144560 .asciz "\x1b[36mカレイドスコープ中につき視点変更を禁止しております\n\x1b[m" - # EUC-JP: カレイドスコープ中につき視点変更を禁止しております | Changing viewpoint is prohibited during kaleidoscope + # Translates to: "Changing viewpoint is prohibited during kaleidoscope" .balign 4 glabel D_8014459C .asciz "\x1b[36mデモ中につき視点変更を禁止しております\n\x1b[m" - # EUC-JP: デモ中につき視点変更を禁止しております | Changing viewpoint is prohibited during the demo + # Translates to: "Changing viewpoint is prohibited during the demo" .balign 4 glabel D_801445CC @@ -379,7 +380,7 @@ glabel jtbl_801449D0 .word L800BE0F0 .text -glabel func_800BD314 +glabel Gameplay_Update /* B344B4 800BD314 27BDFF78 */ addiu $sp, $sp, -0x88 /* B344B8 800BD318 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 /* B344BC 800BD31C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) @@ -532,8 +533,8 @@ glabel func_800BD314 /* B346E4 800BD544 AC201490 */ sw $zero, %lo(D_80161490)($at) .L800BD548: /* B346E8 800BD548 258C59C0 */ addiu $t4, %lo(D_801759C0) # addiu $t4, $t4, 0x59c0 -/* B346EC 800BD54C 3C018016 */ lui $at, %hi(D_8016148C) # $at, 0x8016 -/* B346F0 800BD550 AC2C148C */ sw $t4, %lo(D_8016148C)($at) +/* B346EC 800BD54C 3C018016 */ lui $at, %hi(D_801613B0+0xdc) # $at, 0x8016 +/* B346F0 800BD550 AC2C148C */ sw $t4, %lo(D_801613B0+0xdc)($at) /* B346F4 800BD554 3C0F8016 */ lui $t7, %hi(gGameInfo) # $t7, 0x8016 /* B346F8 800BD558 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* B346FC 800BD55C 3C018016 */ lui $at, %hi(D_80161490) # $at, 0x8016 @@ -846,10 +847,10 @@ glabel func_800BD314 /* B34B58 800BD9B8 3C0D8081 */ lui $t5, %hi(func_80811A20) # $t5, 0x8081 /* B34B5C 800BD9BC 11E10012 */ beq $t7, $at, .L800BDA08 /* B34B60 800BD9C0 25AD1A20 */ addiu $t5, %lo(func_80811A20) # addiu $t5, $t5, 0x1a20 -/* B34B64 800BD9C4 3C18800C */ lui $t8, %hi(func_800BCA64) # $t8, 0x800c +/* B34B64 800BD9C4 3C18800C */ lui $t8, %hi(Gameplay_Init) # $t8, 0x800c /* B34B68 800BD9C8 3C090001 */ lui $t1, (0x00012518 >> 16) # lui $t1, 1 /* B34B6C 800BD9CC 35292518 */ ori $t1, (0x00012518 & 0xFFFF) # ori $t1, $t1, 0x2518 -/* B34B70 800BD9D0 2718CA64 */ addiu $t8, %lo(func_800BCA64) # addiu $t8, $t8, -0x359c +/* B34B70 800BD9D0 2718CA64 */ addiu $t8, %lo(Gameplay_Init) # addiu $t8, $t8, -0x359c /* B34B74 800BD9D4 AE18000C */ sw $t8, 0xc($s0) /* B34B78 800BD9D8 AE090010 */ sw $t1, 0x10($s0) /* B34B7C 800BD9DC 862A1E1A */ lh $t2, 0x1e1a($s1) @@ -1002,8 +1003,8 @@ glabel L800BDB30 /* B34D90 800BDBF0 28410014 */ slti $at, $v0, 0x14 /* B34D94 800BDBF4 14200010 */ bnez $at, .L800BDC38 /* B34D98 800BDBF8 244C0001 */ addiu $t4, $v0, 1 -/* B34D9C 800BDBFC 3C02800C */ lui $v0, %hi(func_800BCA64) # $v0, 0x800c -/* B34DA0 800BDC00 2442CA64 */ addiu $v0, %lo(func_800BCA64) # addiu $v0, $v0, -0x359c +/* B34D9C 800BDBFC 3C02800C */ lui $v0, %hi(Gameplay_Init) # $v0, 0x800c +/* B34DA0 800BDC00 2442CA64 */ addiu $v0, %lo(Gameplay_Init) # addiu $v0, $v0, -0x359c /* B34DA4 800BDC04 AE000098 */ sw $zero, 0x98($s0) /* B34DA8 800BDC08 AE02000C */ sw $v0, 0xc($s0) /* B34DAC 800BDC0C AE0A0010 */ sw $t2, 0x10($s0) @@ -1132,10 +1133,10 @@ glabel L800BDDCC /* B34F74 800BDDD4 240B0003 */ li $t3, 3 /* B34F78 800BDDD8 11210012 */ beq $t1, $at, .L800BDE24 /* B34F7C 800BDDDC 3C0C8016 */ lui $t4, %hi(gGameInfo) # $t4, 0x8016 -/* B34F80 800BDDE0 3C02800C */ lui $v0, %hi(func_800BCA64) # $v0, 0x800c +/* B34F80 800BDDE0 3C02800C */ lui $v0, %hi(Gameplay_Init) # $v0, 0x800c /* B34F84 800BDDE4 3C190001 */ lui $t9, (0x00012518 >> 16) # lui $t9, 1 /* B34F88 800BDDE8 37392518 */ ori $t9, (0x00012518 & 0xFFFF) # ori $t9, $t9, 0x2518 -/* B34F8C 800BDDEC 2442CA64 */ addiu $v0, %lo(func_800BCA64) # addiu $v0, $v0, -0x359c +/* B34F8C 800BDDEC 2442CA64 */ addiu $v0, %lo(Gameplay_Init) # addiu $v0, $v0, -0x359c /* B34F90 800BDDF0 AE000098 */ sw $zero, 0x98($s0) /* B34F94 800BDDF4 AE02000C */ sw $v0, 0xc($s0) /* B34F98 800BDDF8 AE190010 */ sw $t9, 0x10($s0) @@ -1236,9 +1237,9 @@ glabel L800BDEE0 /* B35100 800BDF60 92290B0C */ lbu $t1, 0xb0c($s1) .L800BDF64: /* B35104 800BDF64 240100FF */ li $at, 255 -/* B35108 800BDF68 3C02800C */ lui $v0, %hi(func_800BCA64) # $v0, 0x800c +/* B35108 800BDF68 3C02800C */ lui $v0, %hi(Gameplay_Init) # $v0, 0x800c /* B3510C 800BDF6C 15210076 */ bne $t1, $at, .L800BE148 -/* B35110 800BDF70 2442CA64 */ addiu $v0, %lo(func_800BCA64) # addiu $v0, $v0, -0x359c +/* B35110 800BDF70 2442CA64 */ addiu $v0, %lo(Gameplay_Init) # addiu $v0, $v0, -0x359c /* B35114 800BDF74 3C190001 */ lui $t9, (0x00012518 >> 16) # lui $t9, 1 /* B35118 800BDF78 37392518 */ ori $t9, (0x00012518 & 0xFFFF) # ori $t9, $t9, 0x2518 /* B3511C 800BDF7C AE000098 */ sw $zero, 0x98($s0) diff --git a/asm/non_matchings/code/z_play/func_800BC490.s b/asm/non_matchings/code/z_play/func_800BC490.s deleted file mode 100644 index dd024a59e3..0000000000 --- a/asm/non_matchings/code/z_play/func_800BC490.s +++ /dev/null @@ -1,71 +0,0 @@ -.rdata -glabel D_80144190 - .asciz "point == 1 || point == 2" - .balign 4 - -glabel D_801441AC - .asciz "../z_play.c" - .balign 4 - -.text -glabel func_800BC490 -/* B33630 800BC490 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B33634 800BC494 00053C00 */ sll $a3, $a1, 0x10 -/* B33638 800BC498 00073C03 */ sra $a3, $a3, 0x10 -/* B3363C 800BC49C 24010001 */ li $at, 1 -/* B33640 800BC4A0 AFBF001C */ sw $ra, 0x1c($sp) -/* B33644 800BC4A4 AFA40020 */ sw $a0, 0x20($sp) -/* B33648 800BC4A8 10E1000B */ beq $a3, $at, .L800BC4D8 -/* B3364C 800BC4AC AFA50024 */ sw $a1, 0x24($sp) -/* B33650 800BC4B0 24010002 */ li $at, 2 -/* B33654 800BC4B4 10E10008 */ beq $a3, $at, .L800BC4D8 -/* B33658 800BC4B8 3C048014 */ lui $a0, %hi(D_80144190) # $a0, 0x8014 -/* B3365C 800BC4BC 3C058014 */ lui $a1, %hi(D_801441AC) # $a1, 0x8014 -/* B33660 800BC4C0 24A541AC */ addiu $a1, %lo(D_801441AC) # addiu $a1, $a1, 0x41ac -/* B33664 800BC4C4 24844190 */ addiu $a0, %lo(D_80144190) # addiu $a0, $a0, 0x4190 -/* B33668 800BC4C8 24060870 */ li $a2, 2160 -/* B3366C 800BC4CC 0C0007FC */ jal __assert -/* B33670 800BC4D0 A7A70026 */ sh $a3, 0x26($sp) -/* B33674 800BC4D4 87A70026 */ lh $a3, 0x26($sp) -.L800BC4D8: -/* B33678 800BC4D8 8FAE0020 */ lw $t6, 0x20($sp) -/* B3367C 800BC4DC 3C010001 */ lui $at, 1 -/* B33680 800BC4E0 3C0F8016 */ lui $t7, %hi(gGameInfo) # $t7, 0x8016 -/* B33684 800BC4E4 002E0821 */ addu $at, $at, $t6 -/* B33688 800BC4E8 A027242B */ sb $a3, 0x242b($at) -/* B3368C 800BC4EC 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* B33690 800BC4F0 24010010 */ li $at, 16 -/* B33694 800BC4F4 3C198016 */ lui $t9, %hi(gSaveContext+8) # $t9, 0x8016 -/* B33698 800BC4F8 85F804B2 */ lh $t8, 0x4b2($t7) -/* B3369C 800BC4FC 13010015 */ beq $t8, $at, .L800BC554 -/* B336A0 800BC500 00000000 */ nop -/* B336A4 800BC504 8F39E668 */ lw $t9, %lo(gSaveContext+8)($t9) -/* B336A8 800BC508 3401FFF0 */ li $at, 65520 -/* B336AC 800BC50C 3C058013 */ lui $a1, %hi(D_801333D4) # $a1, 0x8013 -/* B336B0 800BC510 0321082A */ slt $at, $t9, $at -/* B336B4 800BC514 1020000F */ beqz $at, .L800BC554 -/* B336B8 800BC518 24A533D4 */ addiu $a1, %lo(D_801333D4) # addiu $a1, $a1, 0x33d4 -/* B336BC 800BC51C 24010001 */ li $at, 1 -/* B336C0 800BC520 14E10003 */ bne $a3, $at, .L800BC530 -/* B336C4 800BC524 24060004 */ li $a2, 4 -/* B336C8 800BC528 10000002 */ b .L800BC534 -/* B336CC 800BC52C 24024814 */ li $v0, 18452 -.L800BC530: -/* B336D0 800BC530 24024813 */ li $v0, 18451 -.L800BC534: -/* B336D4 800BC534 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* B336D8 800BC538 3C088013 */ lui $t0, %hi(D_801333E8) # $t0, 0x8013 -/* B336DC 800BC53C 250833E8 */ addiu $t0, %lo(D_801333E8) # addiu $t0, $t0, 0x33e8 -/* B336E0 800BC540 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* B336E4 800BC544 AFA70010 */ sw $a3, 0x10($sp) -/* B336E8 800BC548 AFA80014 */ sw $t0, 0x14($sp) -/* B336EC 800BC54C 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B336F0 800BC550 3044FFFF */ andi $a0, $v0, 0xffff -.L800BC554: -/* B336F4 800BC554 0C02F114 */ jal func_800BC450 -/* B336F8 800BC558 8FA40020 */ lw $a0, 0x20($sp) -/* B336FC 800BC55C 8FBF001C */ lw $ra, 0x1c($sp) -/* B33700 800BC560 27BD0020 */ addiu $sp, $sp, 0x20 -/* B33704 800BC564 03E00008 */ jr $ra -/* B33708 800BC568 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800BC8EC.s b/asm/non_matchings/code/z_play/func_800BC8EC.s deleted file mode 100644 index 46301e65bb..0000000000 --- a/asm/non_matchings/code/z_play/func_800BC8EC.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_800BC8EC -/* B33A8C 800BC8EC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B33A90 800BC8F0 AFBF001C */ sw $ra, 0x1c($sp) -/* B33A94 800BC8F4 AFB00018 */ sw $s0, 0x18($sp) -/* B33A98 800BC8F8 8C8E1C44 */ lw $t6, 0x1c44($a0) -/* B33A9C 800BC8FC 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B33AA0 800BC900 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B33AA4 800BC904 AFAE0028 */ sw $t6, 0x28($sp) -/* B33AA8 800BC908 8C8F0000 */ lw $t7, ($a0) -/* B33AAC 800BC90C 3C010001 */ lui $at, (0x00012124 >> 16) # lui $at, 1 -/* B33AB0 800BC910 00808025 */ move $s0, $a0 -/* B33AB4 800BC914 ADE002EC */ sw $zero, 0x2ec($t7) -/* B33AB8 800BC918 8C980000 */ lw $t8, ($a0) -/* B33ABC 800BC91C 34212124 */ ori $at, (0x00012124 & 0xFFFF) # ori $at, $at, 0x2124 -/* B33AC0 800BC920 00812021 */ addu $a0, $a0, $at -/* B33AC4 800BC924 AF0002F0 */ sw $zero, 0x2f0($t8) -/* B33AC8 800BC928 8C590000 */ lw $t9, ($v0) -/* B33ACC 800BC92C A720018A */ sh $zero, 0x18a($t9) -/* B33AD0 800BC930 8C480000 */ lw $t0, ($v0) -/* B33AD4 800BC934 0C0303C2 */ jal func_800C0F08 -/* B33AD8 800BC938 A5000190 */ sh $zero, 0x190($t0) -/* B33ADC 800BC93C 0C009C6A */ jal func_800271A8 -/* B33AE0 800BC940 02002025 */ move $a0, $s0 -/* B33AE4 800BC944 0C009D04 */ jal Effect_SS_Clear -/* B33AE8 800BC948 02002025 */ move $a0, $s0 -/* B33AEC 800BC94C 3C010001 */ lui $at, (0x00011E60 >> 16) # lui $at, 1 -/* B33AF0 800BC950 34211E60 */ ori $at, (0x00011E60 & 0xFFFF) # ori $at, $at, 0x1e60 -/* B33AF4 800BC954 02012821 */ addu $a1, $s0, $at -/* B33AF8 800BC958 0C017500 */ jal func_8005D400 -/* B33AFC 800BC95C 02002025 */ move $a0, $s0 -/* B33B00 800BC960 3C098016 */ lui $t1, %hi(D_80161490) # $t1, 0x8016 -/* B33B04 800BC964 8D291490 */ lw $t1, %lo(D_80161490)($t1) -/* B33B08 800BC968 24010003 */ li $at, 3 -/* B33B0C 800BC96C 15210005 */ bne $t1, $at, .L800BC984 -/* B33B10 800BC970 3C048016 */ lui $a0, %hi(D_801613B0) # $a0, 0x8016 -/* B33B14 800BC974 0C02C76F */ jal func_800B1DBC -/* B33B18 800BC978 248413B0 */ addiu $a0, %lo(D_801613B0) # addiu $a0, $a0, 0x13b0 -/* B33B1C 800BC97C 3C018016 */ lui $at, %hi(D_80161490) # $at, 0x8016 -/* B33B20 800BC980 AC201490 */ sw $zero, %lo(D_80161490)($at) -.L800BC984: -/* B33B24 800BC984 3C010001 */ lui $at, 1 -/* B33B28 800BC988 02015021 */ addu $t2, $s0, $at -/* B33B2C 800BC98C AFAA0024 */ sw $t2, 0x24($sp) -/* B33B30 800BC990 914C241B */ lbu $t4, 0x241b($t2) -/* B33B34 800BC994 24010003 */ li $at, 3 -/* B33B38 800BC998 1581000B */ bne $t4, $at, .L800BC9C8 -/* B33B3C 800BC99C 00000000 */ nop -/* B33B40 800BC9A0 8D5923F8 */ lw $t9, 0x23f8($t2) -/* B33B44 800BC9A4 3C010001 */ lui $at, (0x000121C8 >> 16) # lui $at, 1 -/* B33B48 800BC9A8 342121C8 */ ori $at, (0x000121C8 & 0xFFFF) # ori $at, $at, 0x21c8 -/* B33B4C 800BC9AC 0320F809 */ jalr $t9 -/* B33B50 800BC9B0 02012021 */ addu $a0, $s0, $at -/* B33B54 800BC9B4 0C02F223 */ jal func_800BC88C -/* B33B58 800BC9B8 02002025 */ move $a0, $s0 -/* B33B5C 800BC9BC 3C010001 */ lui $at, 1 -/* B33B60 800BC9C0 00300821 */ addu $at, $at, $s0 -/* B33B64 800BC9C4 A020241B */ sb $zero, 0x241b($at) -.L800BC9C8: -/* B33B68 800BC9C8 0C02CE5A */ jal func_800B3968 -/* B33B6C 800BC9CC 00000000 */ nop -/* B33B70 800BC9D0 3C010001 */ lui $at, (0x0001241C >> 16) # lui $at, 1 -/* B33B74 800BC9D4 3421241C */ ori $at, (0x0001241C & 0xFFFF) # ori $at, $at, 0x241c -/* B33B78 800BC9D8 0C02CD58 */ jal func_800B3560 -/* B33B7C 800BC9DC 02012021 */ addu $a0, $s0, $at -/* B33B80 800BC9E0 3C048016 */ lui $a0, %hi(D_80161498) # $a0, 0x8016 -/* B33B84 800BC9E4 0C02B415 */ jal func_800AD054 -/* B33B88 800BC9E8 24841498 */ addiu $a0, %lo(D_80161498) # addiu $a0, $a0, 0x1498 -/* B33B8C 800BC9EC 8FAE0024 */ lw $t6, 0x24($sp) -/* B33B90 800BC9F0 3C0D8016 */ lui $t5, %hi(gSaveContext+4) # $t5, 0x8016 -/* B33B94 800BC9F4 8DADE664 */ lw $t5, %lo(gSaveContext+4)($t5) -/* B33B98 800BC9F8 91CF1DE8 */ lbu $t7, 0x1de8($t6) -/* B33B9C 800BC9FC 51AF0007 */ beql $t5, $t7, .L800BCA1C -/* B33BA0 800BCA00 26041C24 */ addiu $a0, $s0, 0x1c24 -/* B33BA4 800BCA04 0C0211B8 */ jal Inventory_SwapAgeEquipment -/* B33BA8 800BCA08 00000000 */ nop -/* B33BAC 800BCA0C 02002025 */ move $a0, $s0 -/* B33BB0 800BCA10 0C023B2B */ jal func_8008ECAC -/* B33BB4 800BCA14 8FA50028 */ lw $a1, 0x28($sp) -/* B33BB8 800BCA18 26041C24 */ addiu $a0, $s0, 0x1c24 -.L800BCA1C: -/* B33BBC 800BCA1C 0C00C70F */ jal func_80031C3C -/* B33BC0 800BCA20 02002825 */ move $a1, $s0 -/* B33BC4 800BCA24 0C044264 */ jal func_80110990 -/* B33BC8 800BCA28 02002025 */ move $a0, $s0 -/* B33BCC 800BCA2C 0C02F04E */ jal KaleidoScopeCall_Destroy -/* B33BD0 800BCA30 02002025 */ move $a0, $s0 -/* B33BD4 800BCA34 0C02EFAC */ jal KaleidoManager_Destroy -/* B33BD8 800BCA38 00000000 */ nop -/* B33BDC 800BCA3C 0C01EC8F */ jal ZeldaArena_Cleanup -/* B33BE0 800BCA40 00000000 */ nop -/* B33BE4 800BCA44 3C048016 */ lui $a0, %hi(D_801614B8) # $a0, 0x8016 -/* B33BE8 800BCA48 0C0350B0 */ jal Fault_RemoveClient -/* B33BEC 800BCA4C 248414B8 */ addiu $a0, %lo(D_801614B8) # addiu $a0, $a0, 0x14b8 -/* B33BF0 800BCA50 8FBF001C */ lw $ra, 0x1c($sp) -/* B33BF4 800BCA54 8FB00018 */ lw $s0, 0x18($sp) -/* B33BF8 800BCA58 27BD0030 */ addiu $sp, $sp, 0x30 -/* B33BFC 800BCA5C 03E00008 */ jr $ra -/* B33C00 800BCA60 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800BED40.s b/asm/non_matchings/code/z_play/func_800BED40.s deleted file mode 100644 index 7235b6fe83..0000000000 --- a/asm/non_matchings/code/z_play/func_800BED40.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_800BED40 -/* B35EE0 800BED40 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B35EE4 800BED44 3C010001 */ lui $at, 1 -/* B35EE8 800BED48 AFBF001C */ sw $ra, 0x1c($sp) -/* B35EEC 800BED4C AFB00018 */ sw $s0, 0x18($sp) -/* B35EF0 800BED50 00811021 */ addu $v0, $a0, $at -/* B35EF4 800BED54 944E0934 */ lhu $t6, 0x934($v0) -/* B35EF8 800BED58 00808025 */ move $s0, $a0 -/* B35EFC 800BED5C 02002025 */ move $a0, $s0 -/* B35F00 800BED60 15C00004 */ bnez $t6, .L800BED74 -/* B35F04 800BED64 00000000 */ nop -/* B35F08 800BED68 944F0936 */ lhu $t7, 0x936($v0) -/* B35F0C 800BED6C 11E00004 */ beqz $t7, .L800BED80 -/* B35F10 800BED70 00000000 */ nop -.L800BED74: -/* B35F14 800BED74 0C02F0F4 */ jal KaleidoScopeCall_Draw -/* B35F18 800BED78 AFA20024 */ sw $v0, 0x24($sp) -/* B35F1C 800BED7C 8FA20024 */ lw $v0, 0x24($sp) -.L800BED80: -/* B35F20 800BED80 3C188016 */ lui $t8, %hi(gSaveContext+0x135c) # $t8, 0x8016 -/* B35F24 800BED84 8F18F9BC */ lw $t8, %lo(gSaveContext+0x135c)($t8) -/* B35F28 800BED88 02002025 */ move $a0, $s0 -/* B35F2C 800BED8C 57000005 */ bnezl $t8, .L800BEDA4 -/* B35F30 800BED90 02002025 */ move $a0, $s0 -/* B35F34 800BED94 0C022A76 */ jal Interface_Draw -/* B35F38 800BED98 AFA20024 */ sw $v0, 0x24($sp) -/* B35F3C 800BED9C 8FA20024 */ lw $v0, 0x24($sp) -/* B35F40 800BEDA0 02002025 */ move $a0, $s0 -.L800BEDA4: -/* B35F44 800BEDA4 0C043D63 */ jal func_8010F58C -/* B35F48 800BEDA8 AFA20024 */ sw $v0, 0x24($sp) -/* B35F4C 800BEDAC 8FA20024 */ lw $v0, 0x24($sp) -/* B35F50 800BEDB0 94590A20 */ lhu $t9, 0xa20($v0) -/* B35F54 800BEDB4 53200004 */ beql $t9, $zero, .L800BEDC8 -/* B35F58 800BEDB8 8FBF001C */ lw $ra, 0x1c($sp) -/* B35F5C 800BEDBC 0C044118 */ jal func_80110460 -/* B35F60 800BEDC0 02002025 */ move $a0, $s0 -/* B35F64 800BEDC4 8FBF001C */ lw $ra, 0x1c($sp) -.L800BEDC8: -/* B35F68 800BEDC8 8FB00018 */ lw $s0, 0x18($sp) -/* B35F6C 800BEDCC 27BD0028 */ addiu $sp, $sp, 0x28 -/* B35F70 800BEDD0 03E00008 */ jr $ra -/* B35F74 800BEDD4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800BFAE4.s b/asm/non_matchings/code/z_play/func_800BFAE4.s deleted file mode 100644 index 6582d8d2f4..0000000000 --- a/asm/non_matchings/code/z_play/func_800BFAE4.s +++ /dev/null @@ -1,138 +0,0 @@ -.rdata -glabel D_80144744 - .asciz "../z_play.c" - .balign 4 - -glabel D_80144750 - .asciz "1 = %d\n" - .balign 4 - -glabel D_80144758 - .asciz "../z_play.c" - .balign 4 - -glabel D_80144764 - .asciz "1 = %d\n" - .balign 4 - -glabel D_8014476C - .asciz "../z_play.c" - .balign 4 - -glabel D_80144778 - .asciz "1 = %d\n" - .balign 4 - -.text -glabel func_800BFAE4 -/* B36C84 800BFAE4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36C88 800BFAE8 AFBF0014 */ sw $ra, 0x14($sp) -/* B36C8C 800BFAEC 248F0014 */ addiu $t7, $a0, 0x14 -/* B36C90 800BFAF0 3C018013 */ lui $at, %hi(D_8012D1F8) # $at, 0x8013 -/* B36C94 800BFAF4 AFA40018 */ sw $a0, 0x18($sp) -/* B36C98 800BFAF8 0C018FA4 */ jal DebugDisplay_Init -/* B36C9C 800BFAFC AC2FD1F8 */ sw $t7, %lo(D_8012D1F8)($at) -/* B36CA0 800BFB00 3C068016 */ lui $a2, %hi(gGameInfo) # $a2, 0x8016 -/* B36CA4 800BFB04 24C6FA90 */ addiu $a2, %lo(gGameInfo) # addiu $a2, $a2, -0x570 -/* B36CA8 800BFB08 8CC30000 */ lw $v1, ($a2) -/* B36CAC 800BFB0C 3C048014 */ lui $a0, %hi(D_80144744) # $a0, 0x8014 -/* B36CB0 800BFB10 24844744 */ addiu $a0, %lo(D_80144744) # addiu $a0, $a0, 0x4744 -/* B36CB4 800BFB14 84781052 */ lh $t8, 0x1052($v1) -/* B36CB8 800BFB18 5300000B */ beql $t8, $zero, .L800BFB48 -/* B36CBC 800BFB1C 84641074 */ lh $a0, 0x1074($v1) -/* B36CC0 800BFB20 0C000B84 */ jal LogUtils_LogThreadId -/* B36CC4 800BFB24 240511CC */ li $a1, 4556 -/* B36CC8 800BFB28 3C048014 */ lui $a0, %hi(D_80144750) # $a0, 0x8014 -/* B36CCC 800BFB2C 24844750 */ addiu $a0, %lo(D_80144750) # addiu $a0, $a0, 0x4750 -/* B36CD0 800BFB30 0C00084C */ jal osSyncPrintf -/* B36CD4 800BFB34 24050001 */ li $a1, 1 -/* B36CD8 800BFB38 3C068016 */ lui $a2, %hi(gGameInfo) # $a2, 0x8016 -/* B36CDC 800BFB3C 24C6FA90 */ addiu $a2, %lo(gGameInfo) # addiu $a2, $a2, -0x570 -/* B36CE0 800BFB40 8CC30000 */ lw $v1, ($a2) -/* B36CE4 800BFB44 84641074 */ lh $a0, 0x1074($v1) -.L800BFB48: -/* B36CE8 800BFB48 2405000A */ li $a1, 10 -/* B36CEC 800BFB4C 14A40024 */ bne $a1, $a0, .L800BFBE0 -/* B36CF0 800BFB50 00000000 */ nop -/* B36CF4 800BFB54 84791090 */ lh $t9, 0x1090($v1) -/* B36CF8 800BFB58 24020001 */ li $v0, 1 -/* B36CFC 800BFB5C 10B90020 */ beq $a1, $t9, .L800BFBE0 -/* B36D00 800BFB60 00000000 */ nop -/* B36D04 800BFB64 A4621076 */ sh $v0, 0x1076($v1) -/* B36D08 800BFB68 8CC80000 */ lw $t0, ($a2) -/* B36D0C 800BFB6C 240A0003 */ li $t2, 3 -/* B36D10 800BFB70 2419000F */ li $t9, 15 -/* B36D14 800BFB74 A5021078 */ sh $v0, 0x1078($t0) -/* B36D18 800BFB78 8CC90000 */ lw $t1, ($a2) -/* B36D1C 800BFB7C A522107A */ sh $v0, 0x107a($t1) -/* B36D20 800BFB80 8CCB0000 */ lw $t3, ($a2) -/* B36D24 800BFB84 A56A107C */ sh $t2, 0x107c($t3) -/* B36D28 800BFB88 8CCC0000 */ lw $t4, ($a2) -/* B36D2C 800BFB8C A582107E */ sh $v0, 0x107e($t4) -/* B36D30 800BFB90 8CCD0000 */ lw $t5, ($a2) -/* B36D34 800BFB94 A5A21080 */ sh $v0, 0x1080($t5) -/* B36D38 800BFB98 8CCE0000 */ lw $t6, ($a2) -/* B36D3C 800BFB9C A5C21082 */ sh $v0, 0x1082($t6) -/* B36D40 800BFBA0 8CCF0000 */ lw $t7, ($a2) -/* B36D44 800BFBA4 A5E21084 */ sh $v0, 0x1084($t7) -/* B36D48 800BFBA8 8CD80000 */ lw $t8, ($a2) -/* B36D4C 800BFBAC A7021086 */ sh $v0, 0x1086($t8) -/* B36D50 800BFBB0 8CC80000 */ lw $t0, ($a2) -/* B36D54 800BFBB4 A5191088 */ sh $t9, 0x1088($t0) -/* B36D58 800BFBB8 8CC90000 */ lw $t1, ($a2) -/* B36D5C 800BFBBC A522108A */ sh $v0, 0x108a($t1) -/* B36D60 800BFBC0 8CCA0000 */ lw $t2, ($a2) -/* B36D64 800BFBC4 A542108C */ sh $v0, 0x108c($t2) -/* B36D68 800BFBC8 8CCB0000 */ lw $t3, ($a2) -/* B36D6C 800BFBCC A562108E */ sh $v0, 0x108e($t3) -/* B36D70 800BFBD0 8CCC0000 */ lw $t4, ($a2) -/* B36D74 800BFBD4 A5851090 */ sh $a1, 0x1090($t4) -/* B36D78 800BFBD8 8CC30000 */ lw $v1, ($a2) -/* B36D7C 800BFBDC 84641074 */ lh $a0, 0x1074($v1) -.L800BFBE0: -/* B36D80 800BFBE0 14A40004 */ bne $a1, $a0, .L800BFBF4 -/* B36D84 800BFBE4 00000000 */ nop -/* B36D88 800BFBE8 846D1076 */ lh $t5, 0x1076($v1) -/* B36D8C 800BFBEC 51A00007 */ beql $t5, $zero, .L800BFC0C -/* B36D90 800BFBF0 84621052 */ lh $v0, 0x1052($v1) -.L800BFBF4: -/* B36D94 800BFBF4 0C02F4C5 */ jal func_800BD314 -/* B36D98 800BFBF8 8FA40018 */ lw $a0, 0x18($sp) -/* B36D9C 800BFBFC 3C068016 */ lui $a2, %hi(gGameInfo) # $a2, 0x8016 -/* B36DA0 800BFC00 24C6FA90 */ addiu $a2, %lo(gGameInfo) # addiu $a2, $a2, -0x570 -/* B36DA4 800BFC04 8CC30000 */ lw $v1, ($a2) -/* B36DA8 800BFC08 84621052 */ lh $v0, 0x1052($v1) -.L800BFC0C: -/* B36DAC 800BFC0C 3C048014 */ lui $a0, %hi(D_80144758) # $a0, 0x8014 -/* B36DB0 800BFC10 24844758 */ addiu $a0, %lo(D_80144758) # addiu $a0, $a0, 0x4758 -/* B36DB4 800BFC14 10400007 */ beqz $v0, .L800BFC34 -/* B36DB8 800BFC18 00000000 */ nop -/* B36DBC 800BFC1C 0C000B84 */ jal LogUtils_LogThreadId -/* B36DC0 800BFC20 240511E7 */ li $a1, 4583 -/* B36DC4 800BFC24 3C048014 */ lui $a0, %hi(D_80144764) # $a0, 0x8014 -/* B36DC8 800BFC28 24844764 */ addiu $a0, %lo(D_80144764) # addiu $a0, $a0, 0x4764 -/* B36DCC 800BFC2C 0C00084C */ jal osSyncPrintf -/* B36DD0 800BFC30 24050001 */ li $a1, 1 -.L800BFC34: -/* B36DD4 800BFC34 0C02FB76 */ jal func_800BEDD8 -/* B36DD8 800BFC38 8FA40018 */ lw $a0, 0x18($sp) -/* B36DDC 800BFC3C 3C068016 */ lui $a2, %hi(gGameInfo) # $a2, 0x8016 -/* B36DE0 800BFC40 24C6FA90 */ addiu $a2, %lo(gGameInfo) # addiu $a2, $a2, -0x570 -/* B36DE4 800BFC44 8CCE0000 */ lw $t6, ($a2) -/* B36DE8 800BFC48 3C048014 */ lui $a0, %hi(D_8014476C) # $a0, 0x8014 -/* B36DEC 800BFC4C 2484476C */ addiu $a0, %lo(D_8014476C) # addiu $a0, $a0, 0x476c -/* B36DF0 800BFC50 85CF1052 */ lh $t7, 0x1052($t6) -/* B36DF4 800BFC54 51E00008 */ beql $t7, $zero, .L800BFC78 -/* B36DF8 800BFC58 8FBF0014 */ lw $ra, 0x14($sp) -/* B36DFC 800BFC5C 0C000B84 */ jal LogUtils_LogThreadId -/* B36E00 800BFC60 240511EB */ li $a1, 4587 -/* B36E04 800BFC64 3C048014 */ lui $a0, %hi(D_80144778) # $a0, 0x8014 -/* B36E08 800BFC68 24844778 */ addiu $a0, %lo(D_80144778) # addiu $a0, $a0, 0x4778 -/* B36E0C 800BFC6C 0C00084C */ jal osSyncPrintf -/* B36E10 800BFC70 24050001 */ li $a1, 1 -/* B36E14 800BFC74 8FBF0014 */ lw $ra, 0x14($sp) -.L800BFC78: -/* B36E18 800BFC78 27BD0018 */ addiu $sp, $sp, 0x18 -/* B36E1C 800BFC7C 03E00008 */ jr $ra -/* B36E20 800BFC80 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800BFE5C.s b/asm/non_matchings/code/z_play/func_800BFE5C.s deleted file mode 100644 index 13cf00c4b4..0000000000 --- a/asm/non_matchings/code/z_play/func_800BFE5C.s +++ /dev/null @@ -1,38 +0,0 @@ -.rdata -glabel D_80144780 - .asciz "../z_play.c" - .balign 4 - -glabel D_8014478C - .asciz "../z_play.c" - .balign 4 - -.text -glabel func_800BFE5C -/* B36FFC 800BFE5C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B37000 800BFE60 AFBF001C */ sw $ra, 0x1c($sp) -/* B37004 800BFE64 AFA5002C */ sw $a1, 0x2c($sp) -/* B37008 800BFE68 8CB80000 */ lw $t8, ($a1) -/* B3700C 800BFE6C 8CAF0004 */ lw $t7, 4($a1) -/* B37010 800BFE70 3C068014 */ lui $a2, %hi(D_80144780) # $a2, 0x8014 -/* B37014 800BFE74 24C64780 */ addiu $a2, %lo(D_80144780) # addiu $a2, $a2, 0x4780 -/* B37018 800BFE78 01F82823 */ subu $a1, $t7, $t8 -/* B3701C 800BFE7C AFA50024 */ sw $a1, 0x24($sp) -/* B37020 800BFE80 0C031521 */ jal Game_Alloc -/* B37024 800BFE84 24071254 */ li $a3, 4692 -/* B37028 800BFE88 8FB9002C */ lw $t9, 0x2c($sp) -/* B3702C 800BFE8C AFA20020 */ sw $v0, 0x20($sp) -/* B37030 800BFE90 3C078014 */ lui $a3, %hi(D_8014478C) # $a3, 0x8014 -/* B37034 800BFE94 24081256 */ li $t0, 4694 -/* B37038 800BFE98 8F250000 */ lw $a1, ($t9) -/* B3703C 800BFE9C AFA80010 */ sw $t0, 0x10($sp) -/* B37040 800BFEA0 24E7478C */ addiu $a3, %lo(D_8014478C) # addiu $a3, $a3, 0x478c -/* B37044 800BFEA4 00402025 */ move $a0, $v0 -/* B37048 800BFEA8 0C0006A8 */ jal DmaMgr_SendRequest1 -/* B3704C 800BFEAC 8FA60024 */ lw $a2, 0x24($sp) -/* B37050 800BFEB0 8FBF001C */ lw $ra, 0x1c($sp) -/* B37054 800BFEB4 8FA20020 */ lw $v0, 0x20($sp) -/* B37058 800BFEB8 27BD0028 */ addiu $sp, $sp, 0x28 -/* B3705C 800BFEBC 03E00008 */ jr $ra -/* B37060 800BFEC0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800BFEC4.s b/asm/non_matchings/code/z_play/func_800BFEC4.s deleted file mode 100644 index 2a300cc139..0000000000 --- a/asm/non_matchings/code/z_play/func_800BFEC4.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_800BFEC4 -/* B37064 800BFEC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B37068 800BFEC8 AFBF0014 */ sw $ra, 0x14($sp) -/* B3706C 800BFECC AFA5001C */ sw $a1, 0x1c($sp) -/* B37070 800BFED0 00053400 */ sll $a2, $a1, 0x10 -/* B37074 800BFED4 00063403 */ sra $a2, $a2, 0x10 -/* B37078 800BFED8 24851F78 */ addiu $a1, $a0, 0x1f78 -/* B3707C 800BFEDC 0C02C394 */ jal func_800B0E50 -/* B37080 800BFEE0 AFA40018 */ sw $a0, 0x18($sp) -/* B37084 800BFEE4 8FA40018 */ lw $a0, 0x18($sp) -/* B37088 800BFEE8 3C010001 */ lui $at, (0x00010A24 >> 16) # lui $at, 1 -/* B3708C 800BFEEC 34210A24 */ ori $at, (0x00010A24 & 0xFFFF) # ori $at, $at, 0xa24 -/* B37090 800BFEF0 00003025 */ move $a2, $zero -/* B37094 800BFEF4 0C01BC50 */ jal func_8006F140 -/* B37098 800BFEF8 00812821 */ addu $a1, $a0, $at -/* B3709C 800BFEFC 8FBF0014 */ lw $ra, 0x14($sp) -/* B370A0 800BFF00 27BD0018 */ addiu $sp, $sp, 0x18 -/* B370A4 800BFF04 03E00008 */ jr $ra -/* B370A8 800BFF08 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800C016C.s b/asm/non_matchings/code/z_play/func_800C016C.s deleted file mode 100644 index f60be1854c..0000000000 --- a/asm/non_matchings/code/z_play/func_800C016C.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_800C016C -/* B3730C 800C016C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B37310 800C0170 3C010001 */ lui $at, (0x00011D60 >> 16) # lui $at, 1 -/* B37314 800C0174 AFBF0014 */ sw $ra, 0x14($sp) -/* B37318 800C0178 AFA40018 */ sw $a0, 0x18($sp) -/* B3731C 800C017C AFA5001C */ sw $a1, 0x1c($sp) -/* B37320 800C0180 34211D60 */ ori $at, (0x00011D60 & 0xFFFF) # ori $at, $at, 0x1d60 -/* B37324 800C0184 00812021 */ addu $a0, $a0, $at -/* B37328 800C0188 00002825 */ move $a1, $zero -/* B3732C 800C018C 0C03424C */ jal Matrix_Mult -/* B37330 800C0190 AFA60020 */ sw $a2, 0x20($sp) -/* B37334 800C0194 8FA4001C */ lw $a0, 0x1c($sp) -/* B37338 800C0198 0C0346BD */ jal Matrix_MultVec3f -/* B3733C 800C019C 8FA50020 */ lw $a1, 0x20($sp) -/* B37340 800C01A0 3C014320 */ li $at, 0x43200000 # 0.000000 -/* B37344 800C01A4 44811000 */ mtc1 $at, $f2 -/* B37348 800C01A8 8FA20018 */ lw $v0, 0x18($sp) -/* B3734C 800C01AC 3C0142F0 */ li $at, 0x42F00000 # 0.000000 -/* B37350 800C01B0 44816000 */ mtc1 $at, $f12 -/* B37354 800C01B4 8FA4001C */ lw $a0, 0x1c($sp) -/* B37358 800C01B8 3C010001 */ lui $at, 1 -/* B3735C 800C01BC 00411021 */ addu $v0, $v0, $at -/* B37360 800C01C0 C4441D6C */ lwc1 $f4, 0x1d6c($v0) -/* B37364 800C01C4 C4860000 */ lwc1 $f6, ($a0) -/* B37368 800C01C8 C44A1D7C */ lwc1 $f10, 0x1d7c($v0) -/* B3736C 800C01CC C4900004 */ lwc1 $f16, 4($a0) -/* B37370 800C01D0 46062202 */ mul.s $f8, $f4, $f6 -/* B37374 800C01D4 C4461D8C */ lwc1 $f6, 0x1d8c($v0) -/* B37378 800C01D8 8FA60020 */ lw $a2, 0x20($sp) -/* B3737C 800C01DC 46105482 */ mul.s $f18, $f10, $f16 -/* B37380 800C01E0 C48A0008 */ lwc1 $f10, 8($a0) -/* B37384 800C01E4 460A3402 */ mul.s $f16, $f6, $f10 -/* B37388 800C01E8 C4C60000 */ lwc1 $f6, ($a2) -/* B3738C 800C01EC 46124100 */ add.s $f4, $f8, $f18 -/* B37390 800C01F0 C4521D9C */ lwc1 $f18, 0x1d9c($v0) -/* B37394 800C01F4 46102200 */ add.s $f8, $f4, $f16 -/* B37398 800C01F8 46089000 */ add.s $f0, $f18, $f8 -/* B3739C 800C01FC C4D20004 */ lwc1 $f18, 4($a2) -/* B373A0 800C0200 46003283 */ div.s $f10, $f6, $f0 -/* B373A4 800C0204 46009203 */ div.s $f8, $f18, $f0 -/* B373A8 800C0208 46025102 */ mul.s $f4, $f10, $f2 -/* B373AC 800C020C 46022400 */ add.s $f16, $f4, $f2 -/* B373B0 800C0210 460C4182 */ mul.s $f6, $f8, $f12 -/* B373B4 800C0214 E4D00000 */ swc1 $f16, ($a2) -/* B373B8 800C0218 46066281 */ sub.s $f10, $f12, $f6 -/* B373BC 800C021C E4CA0004 */ swc1 $f10, 4($a2) -/* B373C0 800C0220 8FBF0014 */ lw $ra, 0x14($sp) -/* B373C4 800C0224 27BD0018 */ addiu $sp, $sp, 0x18 -/* B373C8 800C0228 03E00008 */ jr $ra -/* B373CC 800C022C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800C0230.s b/asm/non_matchings/code/z_play/func_800C0230.s deleted file mode 100644 index 482faf3831..0000000000 --- a/asm/non_matchings/code/z_play/func_800C0230.s +++ /dev/null @@ -1,71 +0,0 @@ -.rdata -glabel D_801447E4 - .asciz "\x1b[41;37mcamera control: error: fulled sub camera system area\n\x1b[m" - .balign 4 - -glabel D_80144828 - .asciz "camera control: \x1b[46m \x1b[47;34m create new sub camera [%d] \x1b[46m \x1b[m\n" - .balign 4 - -.text -glabel func_800C0230 -/* B373D0 800C0230 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B373D4 800C0234 AFB00018 */ sw $s0, 0x18($sp) -/* B373D8 800C0238 AFBF001C */ sw $ra, 0x1c($sp) -/* B373DC 800C023C 00803825 */ move $a3, $a0 -/* B373E0 800C0240 24100001 */ li $s0, 1 -/* B373E4 800C0244 00107080 */ sll $t6, $s0, 2 -.L800C0248: -/* B373E8 800C0248 00EE7821 */ addu $t7, $a3, $t6 -/* B373EC 800C024C 8DF80790 */ lw $t8, 0x790($t7) -/* B373F0 800C0250 53000008 */ beql $t8, $zero, .L800C0274 -/* B373F4 800C0254 24010004 */ li $at, 4 -/* B373F8 800C0258 26100001 */ addiu $s0, $s0, 1 -/* B373FC 800C025C 00108400 */ sll $s0, $s0, 0x10 -/* B37400 800C0260 00108403 */ sra $s0, $s0, 0x10 -/* B37404 800C0264 2A010004 */ slti $at, $s0, 4 -/* B37408 800C0268 5420FFF7 */ bnezl $at, .L800C0248 -/* B3740C 800C026C 00107080 */ sll $t6, $s0, 2 -/* B37410 800C0270 24010004 */ li $at, 4 -.L800C0274: -/* B37414 800C0274 16010006 */ bne $s0, $at, .L800C0290 -/* B37418 800C0278 3C048014 */ lui $a0, %hi(D_80144828) -/* B3741C 800C027C 3C048014 */ lui $a0, %hi(D_801447E4) # $a0, 0x8014 -/* B37420 800C0280 0C00084C */ jal osSyncPrintf -/* B37424 800C0284 248447E4 */ addiu $a0, %lo(D_801447E4) # addiu $a0, $a0, 0x47e4 -/* B37428 800C0288 1000001B */ b .L800C02F8 -/* B3742C 800C028C 2402FFFF */ li $v0, -1 -.L800C0290: -/* B37430 800C0290 0010C880 */ sll $t9, $s0, 2 -/* B37434 800C0294 00F94021 */ addu $t0, $a3, $t9 -/* B37438 800C0298 AFA80020 */ sw $t0, 0x20($sp) -/* B3743C 800C029C 24844828 */ addiu $a0, %lo(D_80144828) -/* B37440 800C02A0 02002825 */ move $a1, $s0 -/* B37444 800C02A4 0C00084C */ jal osSyncPrintf -/* B37448 800C02A8 AFA70028 */ sw $a3, 0x28($sp) -/* B3744C 800C02AC 00104880 */ sll $t1, $s0, 2 -/* B37450 800C02B0 01304823 */ subu $t1, $t1, $s0 -/* B37454 800C02B4 000948C0 */ sll $t1, $t1, 3 -/* B37458 800C02B8 01304823 */ subu $t1, $t1, $s0 -/* B3745C 800C02BC 8FA70028 */ lw $a3, 0x28($sp) -/* B37460 800C02C0 00094880 */ sll $t1, $t1, 2 -/* B37464 800C02C4 01304823 */ subu $t1, $t1, $s0 -/* B37468 800C02C8 00094880 */ sll $t1, $t1, 2 -/* B3746C 800C02CC 8FAA0020 */ lw $t2, 0x20($sp) -/* B37470 800C02D0 00E92021 */ addu $a0, $a3, $t1 -/* B37474 800C02D4 248401E0 */ addiu $a0, $a0, 0x1e0 -/* B37478 800C02D8 24E500B8 */ addiu $a1, $a3, 0xb8 -/* B3747C 800C02DC 24E607C0 */ addiu $a2, $a3, 0x7c0 -/* B37480 800C02E0 0C015F1B */ jal func_80057C6C -/* B37484 800C02E4 AD440790 */ sw $a0, 0x790($t2) -/* B37488 800C02E8 8FAB0020 */ lw $t3, 0x20($sp) -/* B3748C 800C02EC 02001025 */ move $v0, $s0 -/* B37490 800C02F0 8D6C0790 */ lw $t4, 0x790($t3) -/* B37494 800C02F4 A5900164 */ sh $s0, 0x164($t4) -.L800C02F8: -/* B37498 800C02F8 8FBF001C */ lw $ra, 0x1c($sp) -/* B3749C 800C02FC 8FB00018 */ lw $s0, 0x18($sp) -/* B374A0 800C0300 27BD0028 */ addiu $sp, $sp, 0x28 -/* B374A4 800C0304 03E00008 */ jr $ra -/* B374A8 800C0308 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800C0314.s b/asm/non_matchings/code/z_play/func_800C0314.s deleted file mode 100644 index 7557d7639f..0000000000 --- a/asm/non_matchings/code/z_play/func_800C0314.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_800C0314 -/* B374B4 800C0314 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B374B8 800C0318 AFA5001C */ sw $a1, 0x1c($sp) -/* B374BC 800C031C 00052C00 */ sll $a1, $a1, 0x10 -/* B374C0 800C0320 AFA60020 */ sw $a2, 0x20($sp) -/* B374C4 800C0324 00063400 */ sll $a2, $a2, 0x10 -/* B374C8 800C0328 00052C03 */ sra $a1, $a1, 0x10 -/* B374CC 800C032C 2401FFFF */ li $at, -1 -/* B374D0 800C0330 00063403 */ sra $a2, $a2, 0x10 -/* B374D4 800C0334 AFBF0014 */ sw $ra, 0x14($sp) -/* B374D8 800C0338 14A10003 */ bne $a1, $at, .L800C0348 -/* B374DC 800C033C 00803825 */ move $a3, $a0 -/* B374E0 800C0340 10000003 */ b .L800C0350 -/* B374E4 800C0344 848207A0 */ lh $v0, 0x7a0($a0) -.L800C0348: -/* B374E8 800C0348 00051400 */ sll $v0, $a1, 0x10 -/* B374EC 800C034C 00021403 */ sra $v0, $v0, 0x10 -.L800C0350: -/* B374F0 800C0350 24010007 */ li $at, 7 -/* B374F4 800C0354 14C10002 */ bne $a2, $at, .L800C0360 -/* B374F8 800C0358 00027080 */ sll $t6, $v0, 2 -/* B374FC 800C035C A4E207A0 */ sh $v0, 0x7a0($a3) -.L800C0360: -/* B37500 800C0360 00EE7821 */ addu $t7, $a3, $t6 -/* B37504 800C0364 00062C00 */ sll $a1, $a2, 0x10 -/* B37508 800C0368 00052C03 */ sra $a1, $a1, 0x10 -/* B3750C 800C036C 0C0160D5 */ jal func_80058354 -/* B37510 800C0370 8DE40790 */ lw $a0, 0x790($t7) -/* B37514 800C0374 8FBF0014 */ lw $ra, 0x14($sp) -/* B37518 800C0378 27BD0018 */ addiu $sp, $sp, 0x18 -/* B3751C 800C037C 03E00008 */ jr $ra -/* B37520 800C0380 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800C0384.s b/asm/non_matchings/code/z_play/func_800C0384.s deleted file mode 100644 index 0abd3908a4..0000000000 --- a/asm/non_matchings/code/z_play/func_800C0384.s +++ /dev/null @@ -1,66 +0,0 @@ -.rdata -glabel D_80144870 - .asciz "\x1b[41;37mcamera control: error: never clear camera !!\n\x1b[m" - .balign 4 - -glabel D_801448AC - .asciz "camera control: \x1b[46m \x1b[47;34m clear sub camera [%d] \x1b[46m \x1b[m\n" - .balign 4 - -glabel D_801448EC - .asciz "\x1b[41;37mcamera control: error: camera No.%d already cleared\n\x1b[m" - .balign 4 - -.text -glabel func_800C0384 -/* B37524 800C0384 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B37528 800C0388 AFA50024 */ sw $a1, 0x24($sp) -/* B3752C 800C038C 00052C00 */ sll $a1, $a1, 0x10 -/* B37530 800C0390 00052C03 */ sra $a1, $a1, 0x10 -/* B37534 800C0394 2401FFFF */ li $at, -1 -/* B37538 800C0398 AFBF0014 */ sw $ra, 0x14($sp) -/* B3753C 800C039C 14A10003 */ bne $a1, $at, .L800C03AC -/* B37540 800C03A0 00803825 */ move $a3, $a0 -/* B37544 800C03A4 10000003 */ b .L800C03B4 -/* B37548 800C03A8 848607A0 */ lh $a2, 0x7a0($a0) -.L800C03AC: -/* B3754C 800C03AC 00053400 */ sll $a2, $a1, 0x10 -/* B37550 800C03B0 00063403 */ sra $a2, $a2, 0x10 -.L800C03B4: -/* B37554 800C03B4 14C00007 */ bnez $a2, .L800C03D4 -/* B37558 800C03B8 3C048014 */ lui $a0, %hi(D_80144870) # $a0, 0x8014 -/* B3755C 800C03BC 24844870 */ addiu $a0, %lo(D_80144870) # addiu $a0, $a0, 0x4870 -/* B37560 800C03C0 A7A6001E */ sh $a2, 0x1e($sp) -/* B37564 800C03C4 0C00084C */ jal osSyncPrintf -/* B37568 800C03C8 AFA70020 */ sw $a3, 0x20($sp) -/* B3756C 800C03CC 87A6001E */ lh $a2, 0x1e($sp) -/* B37570 800C03D0 8FA70020 */ lw $a3, 0x20($sp) -.L800C03D4: -/* B37574 800C03D4 00067080 */ sll $t6, $a2, 2 -/* B37578 800C03D8 00EE1021 */ addu $v0, $a3, $t6 -/* B3757C 800C03DC 8C440790 */ lw $a0, 0x790($v0) -/* B37580 800C03E0 00C02825 */ move $a1, $a2 -/* B37584 800C03E4 1080000D */ beqz $a0, .L800C041C -/* B37588 800C03E8 00000000 */ nop -/* B3758C 800C03EC 24050100 */ li $a1, 256 -/* B37590 800C03F0 AFA20018 */ sw $v0, 0x18($sp) -/* B37594 800C03F4 0C0160D5 */ jal func_80058354 -/* B37598 800C03F8 A7A6001E */ sh $a2, 0x1e($sp) -/* B3759C 800C03FC 8FA20018 */ lw $v0, 0x18($sp) -/* B375A0 800C0400 87A5001E */ lh $a1, 0x1e($sp) -/* B375A4 800C0404 3C048014 */ lui $a0, %hi(D_801448AC) # $a0, 0x8014 -/* B375A8 800C0408 248448AC */ addiu $a0, %lo(D_801448AC) # addiu $a0, $a0, 0x48ac -/* B375AC 800C040C 0C00084C */ jal osSyncPrintf -/* B375B0 800C0410 AC400790 */ sw $zero, 0x790($v0) -/* B375B4 800C0414 10000005 */ b .L800C042C -/* B375B8 800C0418 8FBF0014 */ lw $ra, 0x14($sp) -.L800C041C: -/* B375BC 800C041C 3C048014 */ lui $a0, %hi(D_801448EC) # $a0, 0x8014 -/* B375C0 800C0420 0C00084C */ jal osSyncPrintf -/* B375C4 800C0424 248448EC */ addiu $a0, %lo(D_801448EC) # addiu $a0, $a0, 0x48ec -/* B375C8 800C0428 8FBF0014 */ lw $ra, 0x14($sp) -.L800C042C: -/* B375CC 800C042C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B375D0 800C0430 03E00008 */ jr $ra -/* B375D4 800C0434 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800C0438.s b/asm/non_matchings/code/z_play/func_800C0438.s deleted file mode 100644 index 16b7f8369b..0000000000 --- a/asm/non_matchings/code/z_play/func_800C0438.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_800C0438 -/* B375D8 800C0438 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B375DC 800C043C AFB10018 */ sw $s1, 0x18($sp) -/* B375E0 800C0440 AFB00014 */ sw $s0, 0x14($sp) -/* B375E4 800C0444 00808825 */ move $s1, $a0 -/* B375E8 800C0448 AFBF001C */ sw $ra, 0x1c($sp) -/* B375EC 800C044C 24100001 */ li $s0, 1 -/* B375F0 800C0450 00107080 */ sll $t6, $s0, 2 -.L800C0454: -/* B375F4 800C0454 022E7821 */ addu $t7, $s1, $t6 -/* B375F8 800C0458 8DF80790 */ lw $t8, 0x790($t7) -/* B375FC 800C045C 02202025 */ move $a0, $s1 -/* B37600 800C0460 00102C00 */ sll $a1, $s0, 0x10 -/* B37604 800C0464 53000004 */ beql $t8, $zero, .L800C0478 -/* B37608 800C0468 26100001 */ addiu $s0, $s0, 1 -/* B3760C 800C046C 0C0300E1 */ jal func_800C0384 -/* B37610 800C0470 00052C03 */ sra $a1, $a1, 0x10 -/* B37614 800C0474 26100001 */ addiu $s0, $s0, 1 -.L800C0478: -/* B37618 800C0478 00108400 */ sll $s0, $s0, 0x10 -/* B3761C 800C047C 00108403 */ sra $s0, $s0, 0x10 -/* B37620 800C0480 2A010004 */ slti $at, $s0, 4 -/* B37624 800C0484 5420FFF3 */ bnezl $at, .L800C0454 -/* B37628 800C0488 00107080 */ sll $t6, $s0, 2 -/* B3762C 800C048C A62007A0 */ sh $zero, 0x7a0($s1) -/* B37630 800C0490 8FBF001C */ lw $ra, 0x1c($sp) -/* B37634 800C0494 8FB10018 */ lw $s1, 0x18($sp) -/* B37638 800C0498 8FB00014 */ lw $s0, 0x14($sp) -/* B3763C 800C049C 03E00008 */ jr $ra -/* B37640 800C04A0 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/non_matchings/code/z_play/func_800C04A4.s b/asm/non_matchings/code/z_play/func_800C04A4.s deleted file mode 100644 index 709c0939af..0000000000 --- a/asm/non_matchings/code/z_play/func_800C04A4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_800C04A4 -/* B37644 800C04A4 AFA50004 */ sw $a1, 4($sp) -/* B37648 800C04A8 00052C00 */ sll $a1, $a1, 0x10 -/* B3764C 800C04AC 00052C03 */ sra $a1, $a1, 0x10 -/* B37650 800C04B0 2401FFFF */ li $at, -1 -/* B37654 800C04B4 14A10003 */ bne $a1, $at, .L800C04C4 -/* B37658 800C04B8 00051C00 */ sll $v1, $a1, 0x10 -/* B3765C 800C04BC 10000002 */ b .L800C04C8 -/* B37660 800C04C0 848307A0 */ lh $v1, 0x7a0($a0) -.L800C04C4: -/* B37664 800C04C4 00031C03 */ sra $v1, $v1, 0x10 -.L800C04C8: -/* B37668 800C04C8 00037080 */ sll $t6, $v1, 2 -/* B3766C 800C04CC 008E7821 */ addu $t7, $a0, $t6 -/* B37670 800C04D0 03E00008 */ jr $ra -/* B37674 800C04D4 8DE20790 */ lw $v0, 0x790($t7) - diff --git a/asm/non_matchings/code/z_play/func_800C04D8.s b/asm/non_matchings/code/z_play/func_800C04D8.s deleted file mode 100644 index 061ca9420a..0000000000 --- a/asm/non_matchings/code/z_play/func_800C04D8.s +++ /dev/null @@ -1,78 +0,0 @@ -.late_rodata -glabel D_80144A0C - .float 0.01 - -.text -glabel func_800C04D8 -/* B37678 800C04D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B3767C 800C04DC AFA5002C */ sw $a1, 0x2c($sp) -/* B37680 800C04E0 00052C00 */ sll $a1, $a1, 0x10 -/* B37684 800C04E4 00052C03 */ sra $a1, $a1, 0x10 -/* B37688 800C04E8 AFB10018 */ sw $s1, 0x18($sp) -/* B3768C 800C04EC 2401FFFF */ li $at, -1 -/* B37690 800C04F0 00C08825 */ move $s1, $a2 -/* B37694 800C04F4 AFBF001C */ sw $ra, 0x1c($sp) -/* B37698 800C04F8 AFB00014 */ sw $s0, 0x14($sp) -/* B3769C 800C04FC AFA40028 */ sw $a0, 0x28($sp) -/* B376A0 800C0500 14A10003 */ bne $a1, $at, .L800C0510 -/* B376A4 800C0504 AFA70034 */ sw $a3, 0x34($sp) -/* B376A8 800C0508 10000003 */ b .L800C0518 -/* B376AC 800C050C 848207A0 */ lh $v0, 0x7a0($a0) -.L800C0510: -/* B376B0 800C0510 00051400 */ sll $v0, $a1, 0x10 -/* B376B4 800C0514 00021403 */ sra $v0, $v0, 0x10 -.L800C0518: -/* B376B8 800C0518 8FAF0028 */ lw $t7, 0x28($sp) -/* B376BC 800C051C 0002C080 */ sll $t8, $v0, 2 -/* B376C0 800C0520 24050001 */ li $a1, 1 -/* B376C4 800C0524 01F8C821 */ addu $t9, $t7, $t8 -/* B376C8 800C0528 8F300790 */ lw $s0, 0x790($t9) -/* B376CC 800C052C 02203025 */ move $a2, $s1 -/* B376D0 800C0530 0C016AA4 */ jal func_8005AA90 -/* B376D4 800C0534 02002025 */ move $a0, $s0 -/* B376D8 800C0538 00021840 */ sll $v1, $v0, 1 -/* B376DC 800C053C AFA30024 */ sw $v1, 0x24($sp) -/* B376E0 800C0540 02002025 */ move $a0, $s0 -/* B376E4 800C0544 24050002 */ li $a1, 2 -/* B376E8 800C0548 0C016AA4 */ jal func_8005AA90 -/* B376EC 800C054C 8FA60034 */ lw $a2, 0x34($sp) -/* B376F0 800C0550 8FA30024 */ lw $v1, 0x24($sp) -/* B376F4 800C0554 02202025 */ move $a0, $s1 -/* B376F8 800C0558 8FA50034 */ lw $a1, 0x34($sp) -/* B376FC 800C055C 00621825 */ or $v1, $v1, $v0 -/* B37700 800C0560 0C032D9E */ jal func_800CB678 -/* B37704 800C0564 AFA30024 */ sw $v1, 0x24($sp) -/* B37708 800C0568 8E020090 */ lw $v0, 0x90($s0) -/* B3770C 800C056C 8FA30024 */ lw $v1, 0x24($sp) -/* B37710 800C0570 E60000DC */ swc1 $f0, 0xdc($s0) -/* B37714 800C0574 1040000E */ beqz $v0, .L800C05B0 -/* B37718 800C0578 3C018014 */ lui $at, %hi(D_80144A0C) -/* B3771C 800C057C C6240000 */ lwc1 $f4, ($s1) -/* B37720 800C0580 C4460024 */ lwc1 $f6, 0x24($v0) -/* B37724 800C0584 46062201 */ sub.s $f8, $f4, $f6 -/* B37728 800C0588 E60800E4 */ swc1 $f8, 0xe4($s0) -/* B3772C 800C058C C4500028 */ lwc1 $f16, 0x28($v0) -/* B37730 800C0590 C62A0004 */ lwc1 $f10, 4($s1) -/* B37734 800C0594 46105481 */ sub.s $f18, $f10, $f16 -/* B37738 800C0598 E61200E8 */ swc1 $f18, 0xe8($s0) -/* B3773C 800C059C C446002C */ lwc1 $f6, 0x2c($v0) -/* B37740 800C05A0 C6240008 */ lwc1 $f4, 8($s1) -/* B37744 800C05A4 46062201 */ sub.s $f8, $f4, $f6 -/* B37748 800C05A8 10000006 */ b .L800C05C4 -/* B3774C 800C05AC E60800EC */ swc1 $f8, 0xec($s0) -.L800C05B0: -/* B37750 800C05B0 44800000 */ mtc1 $zero, $f0 -/* B37754 800C05B4 00000000 */ nop -/* B37758 800C05B8 E60000EC */ swc1 $f0, 0xec($s0) -/* B3775C 800C05BC E60000E8 */ swc1 $f0, 0xe8($s0) -/* B37760 800C05C0 E60000E4 */ swc1 $f0, 0xe4($s0) -.L800C05C4: -/* B37764 800C05C4 C42A4A0C */ lwc1 $f10, %lo(D_80144A0C)($at) -/* B37768 800C05C8 00601025 */ move $v0, $v1 -/* B3776C 800C05CC E60A0100 */ swc1 $f10, 0x100($s0) -/* B37770 800C05D0 8FBF001C */ lw $ra, 0x1c($sp) -/* B37774 800C05D4 8FB10018 */ lw $s1, 0x18($sp) -/* B37778 800C05D8 8FB00014 */ lw $s0, 0x14($sp) -/* B3777C 800C05DC 03E00008 */ jr $ra -/* B37780 800C05E0 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/z_play/func_800C0744.s b/asm/non_matchings/code/z_play/func_800C0744.s deleted file mode 100644 index 382b85a4ff..0000000000 --- a/asm/non_matchings/code/z_play/func_800C0744.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_800C0744 -/* B378E4 800C0744 AFA50004 */ sw $a1, 4($sp) -/* B378E8 800C0748 00052C00 */ sll $a1, $a1, 0x10 -/* B378EC 800C074C AFA60008 */ sw $a2, 8($sp) -/* B378F0 800C0750 00063400 */ sll $a2, $a2, 0x10 -/* B378F4 800C0754 00052C03 */ sra $a1, $a1, 0x10 -/* B378F8 800C0758 2401FFFF */ li $at, -1 -/* B378FC 800C075C 14A10003 */ bne $a1, $at, .L800C076C -/* B37900 800C0760 00063403 */ sra $a2, $a2, 0x10 -/* B37904 800C0764 10000003 */ b .L800C0774 -/* B37908 800C0768 848307A0 */ lh $v1, 0x7a0($a0) -.L800C076C: -/* B3790C 800C076C 00051C00 */ sll $v1, $a1, 0x10 -/* B37910 800C0770 00031C03 */ sra $v1, $v1, 0x10 -.L800C0774: -/* B37914 800C0774 00037080 */ sll $t6, $v1, 2 -/* B37918 800C0778 008E7821 */ addu $t7, $a0, $t6 -/* B3791C 800C077C 8DE50790 */ lw $a1, 0x790($t7) -/* B37920 800C0780 24020001 */ li $v0, 1 -/* B37924 800C0784 03E00008 */ jr $ra -/* B37928 800C0788 A4A6015A */ sh $a2, 0x15a($a1) - diff --git a/asm/non_matchings/code/z_play/func_800C078C.s b/asm/non_matchings/code/z_play/func_800C078C.s deleted file mode 100644 index bb3fabbfa4..0000000000 --- a/asm/non_matchings/code/z_play/func_800C078C.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_800C078C -/* B3792C 800C078C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B37930 800C0790 AFA60020 */ sw $a2, 0x20($sp) -/* B37934 800C0794 00063400 */ sll $a2, $a2, 0x10 -/* B37938 800C0798 AFA5001C */ sw $a1, 0x1c($sp) -/* B3793C 800C079C 00052C00 */ sll $a1, $a1, 0x10 -/* B37940 800C07A0 00063403 */ sra $a2, $a2, 0x10 -/* B37944 800C07A4 2402FFFF */ li $v0, -1 -/* B37948 800C07A8 00052C03 */ sra $a1, $a1, 0x10 -/* B3794C 800C07AC AFBF0014 */ sw $ra, 0x14($sp) -/* B37950 800C07B0 14C20003 */ bne $a2, $v0, .L800C07C0 -/* B37954 800C07B4 00803825 */ move $a3, $a0 -/* B37958 800C07B8 10000003 */ b .L800C07C8 -/* B3795C 800C07BC 848307A0 */ lh $v1, 0x7a0($a0) -.L800C07C0: -/* B37960 800C07C0 00061C00 */ sll $v1, $a2, 0x10 -/* B37964 800C07C4 00031C03 */ sra $v1, $v1, 0x10 -.L800C07C8: -/* B37968 800C07C8 14A20003 */ bne $a1, $v0, .L800C07D8 -/* B3796C 800C07CC 0003C080 */ sll $t8, $v1, 2 -/* B37970 800C07D0 10000003 */ b .L800C07E0 -/* B37974 800C07D4 84E207A0 */ lh $v0, 0x7a0($a3) -.L800C07D8: -/* B37978 800C07D8 00051400 */ sll $v0, $a1, 0x10 -/* B3797C 800C07DC 00021403 */ sra $v0, $v0, 0x10 -.L800C07E0: -/* B37980 800C07E0 00027080 */ sll $t6, $v0, 2 -/* B37984 800C07E4 00EE7821 */ addu $t7, $a3, $t6 -/* B37988 800C07E8 00F8C821 */ addu $t9, $a3, $t8 -/* B3798C 800C07EC 8F250790 */ lw $a1, 0x790($t9) -/* B37990 800C07F0 0C016B99 */ jal func_8005AE64 -/* B37994 800C07F4 8DE40790 */ lw $a0, 0x790($t7) -/* B37998 800C07F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B3799C 800C07FC 27BD0018 */ addiu $sp, $sp, 0x18 -/* B379A0 800C0800 03E00008 */ jr $ra -/* B379A4 800C0804 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800C0808.s b/asm/non_matchings/code/z_play/func_800C0808.s deleted file mode 100644 index d7a342d158..0000000000 --- a/asm/non_matchings/code/z_play/func_800C0808.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_800C0808 -/* B379A8 800C0808 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B379AC 800C080C AFA50024 */ sw $a1, 0x24($sp) -/* B379B0 800C0810 00052C00 */ sll $a1, $a1, 0x10 -/* B379B4 800C0814 00052C03 */ sra $a1, $a1, 0x10 -/* B379B8 800C0818 2401FFFF */ li $at, -1 -/* B379BC 800C081C AFBF0014 */ sw $ra, 0x14($sp) -/* B379C0 800C0820 AFA40020 */ sw $a0, 0x20($sp) -/* B379C4 800C0824 14A10003 */ bne $a1, $at, .L800C0834 -/* B379C8 800C0828 AFA7002C */ sw $a3, 0x2c($sp) -/* B379CC 800C082C 10000003 */ b .L800C083C -/* B379D0 800C0830 848207A0 */ lh $v0, 0x7a0($a0) -.L800C0834: -/* B379D4 800C0834 00051400 */ sll $v0, $a1, 0x10 -/* B379D8 800C0838 00021403 */ sra $v0, $v0, 0x10 -.L800C083C: -/* B379DC 800C083C 8FAF0020 */ lw $t7, 0x20($sp) -/* B379E0 800C0840 0002C080 */ sll $t8, $v0, 2 -/* B379E4 800C0844 00C02825 */ move $a1, $a2 -/* B379E8 800C0848 01F8C821 */ addu $t9, $t7, $t8 -/* B379EC 800C084C 8F240790 */ lw $a0, 0x790($t9) -/* B379F0 800C0850 0C016052 */ jal func_80058148 -/* B379F4 800C0854 AFA4001C */ sw $a0, 0x1c($sp) -/* B379F8 800C0858 8FA4001C */ lw $a0, 0x1c($sp) -/* B379FC 800C085C 0C0169DF */ jal func_8005A77C -/* B37A00 800C0860 87A5002E */ lh $a1, 0x2e($sp) -/* B37A04 800C0864 8FBF0014 */ lw $ra, 0x14($sp) -/* B37A08 800C0868 27BD0020 */ addiu $sp, $sp, 0x20 -/* B37A0C 800C086C 03E00008 */ jr $ra -/* B37A10 800C0870 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800C0874.s b/asm/non_matchings/code/z_play/func_800C0874.s deleted file mode 100644 index 86a1773833..0000000000 --- a/asm/non_matchings/code/z_play/func_800C0874.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800C0874 -/* B37A14 800C0874 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B37A18 800C0878 AFA5001C */ sw $a1, 0x1c($sp) -/* B37A1C 800C087C 00052C00 */ sll $a1, $a1, 0x10 -/* B37A20 800C0880 AFBF0014 */ sw $ra, 0x14($sp) -/* B37A24 800C0884 00052C03 */ sra $a1, $a1, 0x10 -/* B37A28 800C0888 0C030129 */ jal func_800C04A4 -/* B37A2C 800C088C AFA60020 */ sw $a2, 0x20($sp) -/* B37A30 800C0890 00402025 */ move $a0, $v0 -/* B37A34 800C0894 0C0169DF */ jal func_8005A77C -/* B37A38 800C0898 87A50022 */ lh $a1, 0x22($sp) -/* B37A3C 800C089C 8FBF0014 */ lw $ra, 0x14($sp) -/* B37A40 800C08A0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B37A44 800C08A4 03E00008 */ jr $ra -/* B37A48 800C08A8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800C08AC.s b/asm/non_matchings/code/z_play/func_800C08AC.s deleted file mode 100644 index c50233e249..0000000000 --- a/asm/non_matchings/code/z_play/func_800C08AC.s +++ /dev/null @@ -1,126 +0,0 @@ -.rdata -glabel D_8014492C - .asciz "\x1b[41;37mcamera control: error: return to main, other camera left. %d cleared!!\n\x1b[m" - .balign 4 - -.text -glabel func_800C08AC -/* B37A4C 800C08AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B37A50 800C08B0 00053C00 */ sll $a3, $a1, 0x10 -/* B37A54 800C08B4 00073C03 */ sra $a3, $a3, 0x10 -/* B37A58 800C08B8 AFB10024 */ sw $s1, 0x24($sp) -/* B37A5C 800C08BC 2401FFFF */ li $at, -1 -/* B37A60 800C08C0 00808825 */ move $s1, $a0 -/* B37A64 800C08C4 AFBF002C */ sw $ra, 0x2c($sp) -/* B37A68 800C08C8 AFB20028 */ sw $s2, 0x28($sp) -/* B37A6C 800C08CC AFB00020 */ sw $s0, 0x20($sp) -/* B37A70 800C08D0 AFA50034 */ sw $a1, 0x34($sp) -/* B37A74 800C08D4 14E10003 */ bne $a3, $at, .L800C08E4 -/* B37A78 800C08D8 AFA60038 */ sw $a2, 0x38($sp) -/* B37A7C 800C08DC 10000003 */ b .L800C08EC -/* B37A80 800C08E0 848507A0 */ lh $a1, 0x7a0($a0) -.L800C08E4: -/* B37A84 800C08E4 00072C00 */ sll $a1, $a3, 0x10 -/* B37A88 800C08E8 00052C03 */ sra $a1, $a1, 0x10 -.L800C08EC: -/* B37A8C 800C08EC 0C0300E1 */ jal func_800C0384 -/* B37A90 800C08F0 02202025 */ move $a0, $s1 -/* B37A94 800C08F4 3C128014 */ lui $s2, %hi(D_8014492C) # $s2, 0x8014 -/* B37A98 800C08F8 2652492C */ addiu $s2, %lo(D_8014492C) # addiu $s2, $s2, 0x492c -/* B37A9C 800C08FC 24100001 */ li $s0, 1 -/* B37AA0 800C0900 00107080 */ sll $t6, $s0, 2 -.L800C0904: -/* B37AA4 800C0904 022E7821 */ addu $t7, $s1, $t6 -/* B37AA8 800C0908 8DF80790 */ lw $t8, 0x790($t7) -/* B37AAC 800C090C 02402025 */ move $a0, $s2 -/* B37AB0 800C0910 53000008 */ beql $t8, $zero, .L800C0934 -/* B37AB4 800C0914 26100001 */ addiu $s0, $s0, 1 -/* B37AB8 800C0918 0C00084C */ jal osSyncPrintf -/* B37ABC 800C091C 02002825 */ move $a1, $s0 -/* B37AC0 800C0920 00102C00 */ sll $a1, $s0, 0x10 -/* B37AC4 800C0924 00052C03 */ sra $a1, $a1, 0x10 -/* B37AC8 800C0928 0C0300E1 */ jal func_800C0384 -/* B37ACC 800C092C 02202025 */ move $a0, $s1 -/* B37AD0 800C0930 26100001 */ addiu $s0, $s0, 1 -.L800C0934: -/* B37AD4 800C0934 00108400 */ sll $s0, $s0, 0x10 -/* B37AD8 800C0938 00108403 */ sra $s0, $s0, 0x10 -/* B37ADC 800C093C 2A010004 */ slti $at, $s0, 4 -/* B37AE0 800C0940 5420FFF0 */ bnezl $at, .L800C0904 -/* B37AE4 800C0944 00107080 */ sll $t6, $s0, 2 -/* B37AE8 800C0948 87A6003A */ lh $a2, 0x3a($sp) -/* B37AEC 800C094C 02202025 */ move $a0, $s1 -/* B37AF0 800C0950 240503FC */ li $a1, 1020 -/* B37AF4 800C0954 1CC0000B */ bgtz $a2, .L800C0984 -/* B37AF8 800C0958 00003825 */ move $a3, $zero -/* B37AFC 800C095C 02202025 */ move $a0, $s1 -/* B37B00 800C0960 00002825 */ move $a1, $zero -/* B37B04 800C0964 0C0300C5 */ jal func_800C0314 -/* B37B08 800C0968 24060007 */ li $a2, 7 -/* B37B0C 800C096C 8E390790 */ lw $t9, 0x790($s1) -/* B37B10 800C0970 A7200162 */ sh $zero, 0x162($t9) -/* B37B14 800C0974 8E220790 */ lw $v0, 0x790($s1) -/* B37B18 800C0978 84480162 */ lh $t0, 0x162($v0) -/* B37B1C 800C097C 10000003 */ b .L800C098C -/* B37B20 800C0980 A448014E */ sh $t0, 0x14e($v0) -.L800C0984: -/* B37B24 800C0984 0C02003E */ jal func_800800F8 -/* B37B28 800C0988 AFA00010 */ sw $zero, 0x10($sp) -.L800C098C: -/* B37B2C 800C098C 8FBF002C */ lw $ra, 0x2c($sp) -/* B37B30 800C0990 8FB00020 */ lw $s0, 0x20($sp) -/* B37B34 800C0994 8FB10024 */ lw $s1, 0x24($sp) -/* B37B38 800C0998 8FB20028 */ lw $s2, 0x28($sp) -/* B37B3C 800C099C 03E00008 */ jr $ra -/* B37B40 800C09A0 27BD0030 */ addiu $sp, $sp, 0x30 - -/* B37B44 800C09A4 AFA50004 */ sw $a1, 4($sp) -/* B37B48 800C09A8 00052C00 */ sll $a1, $a1, 0x10 -/* B37B4C 800C09AC 00052C03 */ sra $a1, $a1, 0x10 -/* B37B50 800C09B0 00057080 */ sll $t6, $a1, 2 -/* B37B54 800C09B4 008E7821 */ addu $t7, $a0, $t6 -/* B37B58 800C09B8 8DE30790 */ lw $v1, 0x790($t7) -/* B37B5C 800C09BC 2402FFFF */ li $v0, -1 -/* B37B60 800C09C0 10600003 */ beqz $v1, .L800C09D0 -/* B37B64 800C09C4 00000000 */ nop -/* B37B68 800C09C8 03E00008 */ jr $ra -/* B37B6C 800C09CC 84620130 */ lh $v0, 0x130($v1) - -.L800C09D0: -/* B37B70 800C09D0 03E00008 */ jr $ra -/* B37B74 800C09D4 00000000 */ nop - -/* B37B78 800C09D8 AFA50004 */ sw $a1, 4($sp) -/* B37B7C 800C09DC 00052C00 */ sll $a1, $a1, 0x10 -/* B37B80 800C09E0 00052C03 */ sra $a1, $a1, 0x10 -/* B37B84 800C09E4 00057080 */ sll $t6, $a1, 2 -/* B37B88 800C09E8 AFA60008 */ sw $a2, 8($sp) -/* B37B8C 800C09EC 008E7821 */ addu $t7, $a0, $t6 -/* B37B90 800C09F0 8DE20790 */ lw $v0, 0x790($t7) -/* B37B94 800C09F4 00063400 */ sll $a2, $a2, 0x10 -/* B37B98 800C09F8 00063403 */ sra $a2, $a2, 0x10 -/* B37B9C 800C09FC 50400004 */ beql $v0, $zero, .L800C0A10 -/* B37BA0 800C0A00 84580130 */ lh $t8, 0x130($v0) -/* B37BA4 800C0A04 03E00008 */ jr $ra -/* B37BA8 800C0A08 00001025 */ move $v0, $zero - -/* B37BAC 800C0A0C 84580130 */ lh $t8, 0x130($v0) -.L800C0A10: -/* B37BB0 800C0A10 50D80004 */ beql $a2, $t8, .L800C0A24 -/* B37BB4 800C0A14 84590140 */ lh $t9, 0x140($v0) -/* B37BB8 800C0A18 03E00008 */ jr $ra -/* B37BBC 800C0A1C 00001025 */ move $v0, $zero - -/* B37BC0 800C0A20 84590140 */ lh $t9, 0x140($v0) -.L800C0A24: -/* B37BC4 800C0A24 24010007 */ li $at, 7 -/* B37BC8 800C0A28 24020001 */ li $v0, 1 -/* B37BCC 800C0A2C 13210003 */ beq $t9, $at, .L800C0A3C -/* B37BD0 800C0A30 00000000 */ nop -/* B37BD4 800C0A34 03E00008 */ jr $ra -/* B37BD8 800C0A38 24020002 */ li $v0, 2 - -.L800C0A3C: -/* B37BDC 800C0A3C 03E00008 */ jr $ra -/* B37BE0 800C0A40 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800C0A44.s b/asm/non_matchings/code/z_play/func_800C0A44.s deleted file mode 100644 index 022e9a7499..0000000000 --- a/asm/non_matchings/code/z_play/func_800C0A44.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800C0A44 -/* B37BE4 800C0A44 848E00A4 */ lh $t6, 0xa4($a0) -/* B37BE8 800C0A48 8C881D38 */ lw $t0, 0x1d38($a0) -/* B37BEC 800C0A4C 3C198016 */ lui $t9, %hi(gSaveContext) # $t9, 0x8016 -/* B37BF0 800C0A50 000E78C0 */ sll $t7, $t6, 3 -/* B37BF4 800C0A54 01EE7823 */ subu $t7, $t7, $t6 -/* B37BF8 800C0A58 000F7880 */ sll $t7, $t7, 2 -/* B37BFC 800C0A5C 25F800D4 */ addiu $t8, $t7, 0xd4 -/* B37C00 800C0A60 2739E660 */ addiu $t9, %lo(gSaveContext) # addiu $t9, $t9, -0x19a0 -/* B37C04 800C0A64 03191021 */ addu $v0, $t8, $t9 -/* B37C08 800C0A68 AC480000 */ sw $t0, ($v0) -/* B37C0C 800C0A6C 8C891D28 */ lw $t1, 0x1d28($a0) -/* B37C10 800C0A70 AC490004 */ sw $t1, 4($v0) -/* B37C14 800C0A74 8C8A1D3C */ lw $t2, 0x1d3c($a0) -/* B37C18 800C0A78 AC4A0008 */ sw $t2, 8($v0) -/* B37C1C 800C0A7C 8C8B1D44 */ lw $t3, 0x1d44($a0) -/* B37C20 800C0A80 03E00008 */ jr $ra -/* B37C24 800C0A84 AC4B000C */ sw $t3, 0xc($v0) - diff --git a/asm/non_matchings/code/z_play/func_800C0A88.s b/asm/non_matchings/code/z_play/func_800C0A88.s deleted file mode 100644 index 9cbdf14107..0000000000 --- a/asm/non_matchings/code/z_play/func_800C0A88.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_800C0A88 -/* B37C28 800C0A88 000570C0 */ sll $t6, $a1, 3 -/* B37C2C 800C0A8C 01C57023 */ subu $t6, $t6, $a1 -/* B37C30 800C0A90 3C0F8016 */ lui $t7, %hi(gSaveContext) # $t7, 0x8016 -/* B37C34 800C0A94 AFA60008 */ sw $a2, 8($sp) -/* B37C38 800C0A98 25EFE660 */ addiu $t7, %lo(gSaveContext) # addiu $t7, $t7, -0x19a0 -/* B37C3C 800C0A9C 000E7080 */ sll $t6, $t6, 2 -/* B37C40 800C0AA0 8FB80014 */ lw $t8, 0x14($sp) -/* B37C44 800C0AA4 00063400 */ sll $a2, $a2, 0x10 -/* B37C48 800C0AA8 01CF1021 */ addu $v0, $t6, $t7 -/* B37C4C 800C0AAC 00063403 */ sra $a2, $a2, 0x10 -/* B37C50 800C0AB0 A4461378 */ sh $a2, 0x1378($v0) -/* B37C54 800C0AB4 A047137A */ sb $a3, 0x137a($v0) -/* B37C58 800C0AB8 8F080000 */ lw $t0, ($t8) -/* B37C5C 800C0ABC 87A9001A */ lh $t1, 0x1a($sp) -/* B37C60 800C0AC0 8FAA0010 */ lw $t2, 0x10($sp) -/* B37C64 800C0AC4 AC481368 */ sw $t0, 0x1368($v0) -/* B37C68 800C0AC8 8F190004 */ lw $t9, 4($t8) -/* B37C6C 800C0ACC AC59136C */ sw $t9, 0x136c($v0) -/* B37C70 800C0AD0 8F080008 */ lw $t0, 8($t8) -/* B37C74 800C0AD4 A4491374 */ sh $t1, 0x1374($v0) -/* B37C78 800C0AD8 A44A1376 */ sh $t2, 0x1376($v0) -/* B37C7C 800C0ADC AC481370 */ sw $t0, 0x1370($v0) -/* B37C80 800C0AE0 8C8B1D2C */ lw $t3, 0x1d2c($a0) -/* B37C84 800C0AE4 AC4B137C */ sw $t3, 0x137c($v0) -/* B37C88 800C0AE8 8C8C1D48 */ lw $t4, 0x1d48($a0) -/* B37C8C 800C0AEC 03E00008 */ jr $ra -/* B37C90 800C0AF0 AC4C1380 */ sw $t4, 0x1380($v0) - diff --git a/asm/non_matchings/code/z_play/func_800C0AF4.s b/asm/non_matchings/code/z_play/func_800C0AF4.s deleted file mode 100644 index 081af2a6a9..0000000000 --- a/asm/non_matchings/code/z_play/func_800C0AF4.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800C0AF4 -/* B37C94 800C0AF4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B37C98 800C0AF8 AFBF0024 */ sw $ra, 0x24($sp) -/* B37C9C 800C0AFC AFA60030 */ sw $a2, 0x30($sp) -/* B37CA0 800C0B00 848200A4 */ lh $v0, 0xa4($a0) -/* B37CA4 800C0B04 2401003C */ li $at, 60 -/* B37CA8 800C0B08 8C831C44 */ lw $v1, 0x1c44($a0) -/* B37CAC 800C0B0C 10410010 */ beq $v0, $at, .L800C0B50 -/* B37CB0 800C0B10 2401003E */ li $at, 62 -/* B37CB4 800C0B14 1041000E */ beq $v0, $at, .L800C0B50 -/* B37CB8 800C0B18 3C070001 */ lui $a3, 1 -/* B37CBC 800C0B1C 8FAE0030 */ lw $t6, 0x30($sp) -/* B37CC0 800C0B20 00E43821 */ addu $a3, $a3, $a0 -/* B37CC4 800C0B24 80E71CBC */ lb $a3, 0x1cbc($a3) -/* B37CC8 800C0B28 3C028016 */ lui $v0, %hi(gSaveContext) # $v0, 0x8016 -/* B37CCC 800C0B2C 8C42E660 */ lw $v0, %lo(gSaveContext)($v0) -/* B37CD0 800C0B30 246F0024 */ addiu $t7, $v1, 0x24 -/* B37CD4 800C0B34 AFAF0014 */ sw $t7, 0x14($sp) -/* B37CD8 800C0B38 AFAE0010 */ sw $t6, 0x10($sp) -/* B37CDC 800C0B3C 847800B6 */ lh $t8, 0xb6($v1) -/* B37CE0 800C0B40 00023400 */ sll $a2, $v0, 0x10 -/* B37CE4 800C0B44 00063403 */ sra $a2, $a2, 0x10 -/* B37CE8 800C0B48 0C0302A2 */ jal func_800C0A88 -/* B37CEC 800C0B4C AFB80018 */ sw $t8, 0x18($sp) -.L800C0B50: -/* B37CF0 800C0B50 8FBF0024 */ lw $ra, 0x24($sp) -/* B37CF4 800C0B54 27BD0028 */ addiu $sp, $sp, 0x28 -/* B37CF8 800C0B58 03E00008 */ jr $ra -/* B37CFC 800C0B5C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800C0CB8.s b/asm/non_matchings/code/z_play/func_800C0CB8.s deleted file mode 100644 index 80ce779ea0..0000000000 --- a/asm/non_matchings/code/z_play/func_800C0CB8.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_800C0CB8 -/* B37E58 800C0CB8 3C0E0001 */ lui $t6, 1 -/* B37E5C 800C0CBC 01C47021 */ addu $t6, $t6, $a0 -/* B37E60 800C0CC0 8DCE1CC4 */ lw $t6, 0x1cc4($t6) -/* B37E64 800C0CC4 3C0F8016 */ lui $t7, %hi(gGameInfo) # $t7, 0x8016 -/* B37E68 800C0CC8 91C20000 */ lbu $v0, ($t6) -/* B37E6C 800C0CCC 38420001 */ xori $v0, $v0, 1 -/* B37E70 800C0CD0 0002102B */ sltu $v0, $zero, $v0 -/* B37E74 800C0CD4 10400012 */ beqz $v0, .L800C0D20 -/* B37E78 800C0CD8 00000000 */ nop -/* B37E7C 800C0CDC 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* B37E80 800C0CE0 85E304B2 */ lh $v1, 0x4b2($t7) -/* B37E84 800C0CE4 38620020 */ xori $v0, $v1, 0x20 -/* B37E88 800C0CE8 0002102B */ sltu $v0, $zero, $v0 -/* B37E8C 800C0CEC 1040000C */ beqz $v0, .L800C0D20 -/* B37E90 800C0CF0 00000000 */ nop -/* B37E94 800C0CF4 38620030 */ xori $v0, $v1, 0x30 -/* B37E98 800C0CF8 0002102B */ sltu $v0, $zero, $v0 -/* B37E9C 800C0CFC 10400008 */ beqz $v0, .L800C0D20 -/* B37EA0 800C0D00 00000000 */ nop -/* B37EA4 800C0D04 38620040 */ xori $v0, $v1, 0x40 -/* B37EA8 800C0D08 0002102B */ sltu $v0, $zero, $v0 -/* B37EAC 800C0D0C 10400004 */ beqz $v0, .L800C0D20 -/* B37EB0 800C0D10 00000000 */ nop -/* B37EB4 800C0D14 848200A4 */ lh $v0, 0xa4($a0) -/* B37EB8 800C0D18 38420045 */ xori $v0, $v0, 0x45 -/* B37EBC 800C0D1C 0002102B */ sltu $v0, $zero, $v0 -.L800C0D20: -/* B37EC0 800C0D20 03E00008 */ jr $ra -/* B37EC4 800C0D24 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800C0D34.s b/asm/non_matchings/code/z_play/func_800C0D34.s deleted file mode 100644 index 38c38a184b..0000000000 --- a/asm/non_matchings/code/z_play/func_800C0D34.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_800C0D34 -/* B37ED4 800C0D34 90AE0002 */ lbu $t6, 2($a1) -/* B37ED8 800C0D38 2401000A */ li $at, 10 -/* B37EDC 800C0D3C 3C0F0001 */ lui $t7, 1 -/* B37EE0 800C0D40 51C10004 */ beql $t6, $at, .L800C0D54 -/* B37EE4 800C0D44 94B8001C */ lhu $t8, 0x1c($a1) -/* B37EE8 800C0D48 03E00008 */ jr $ra -/* B37EEC 800C0D4C 00001025 */ move $v0, $zero - -/* B37EF0 800C0D50 94B8001C */ lhu $t8, 0x1c($a1) -.L800C0D54: -/* B37EF4 800C0D54 01E47821 */ addu $t7, $t7, $a0 -/* B37EF8 800C0D58 8DEF1D38 */ lw $t7, 0x1d38($t7) -/* B37EFC 800C0D5C 0018CA83 */ sra $t9, $t8, 0xa -/* B37F00 800C0D60 00194100 */ sll $t0, $t9, 4 -/* B37F04 800C0D64 01E81021 */ addu $v0, $t7, $t0 -/* B37F08 800C0D68 80430000 */ lb $v1, ($v0) -/* B37F0C 800C0D6C 80490002 */ lb $t1, 2($v0) -/* B37F10 800C0D70 24020001 */ li $v0, 1 -/* B37F14 800C0D74 54690004 */ bnel $v1, $t1, .L800C0D88 -/* B37F18 800C0D78 80AA0003 */ lb $t2, 3($a1) -/* B37F1C 800C0D7C 03E00008 */ jr $ra -/* B37F20 800C0D80 00001025 */ move $v0, $zero - -/* B37F24 800C0D84 80AA0003 */ lb $t2, 3($a1) -.L800C0D88: -/* B37F28 800C0D88 546A0005 */ bnel $v1, $t2, .L800C0DA0 -/* B37F2C 800C0D8C 84AC00B6 */ lh $t4, 0xb6($a1) -/* B37F30 800C0D90 84AB00B6 */ lh $t3, 0xb6($a1) -/* B37F34 800C0D94 10000005 */ b .L800C0DAC -/* B37F38 800C0D98 A4CB0000 */ sh $t3, ($a2) -/* B37F3C 800C0D9C 84AC00B6 */ lh $t4, 0xb6($a1) -.L800C0DA0: -/* B37F40 800C0DA0 34018000 */ li $at, 32768 -/* B37F44 800C0DA4 01816821 */ addu $t5, $t4, $at -/* B37F48 800C0DA8 A4CD0000 */ sh $t5, ($a2) -.L800C0DAC: -/* B37F4C 800C0DAC 03E00008 */ jr $ra -/* B37F50 800C0DB0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_play/func_800C0DB4.s b/asm/non_matchings/code/z_play/func_800C0DB4.s deleted file mode 100644 index c0dca07638..0000000000 --- a/asm/non_matchings/code/z_play/func_800C0DB4.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_800C0DB4 -/* B37F54 800C0DB4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B37F58 800C0DB8 AFBF001C */ sw $ra, 0x1c($sp) -/* B37F5C 800C0DBC AFA50044 */ sw $a1, 0x44($sp) -/* B37F60 800C0DC0 8CB90000 */ lw $t9, ($a1) -/* B37F64 800C0DC4 27AE002C */ addiu $t6, $sp, 0x2c -/* B37F68 800C0DC8 27A80030 */ addiu $t0, $sp, 0x30 -/* B37F6C 800C0DCC ADD90000 */ sw $t9, ($t6) -/* B37F70 800C0DD0 8CB80004 */ lw $t8, 4($a1) -/* B37F74 800C0DD4 27A9003C */ addiu $t1, $sp, 0x3c -/* B37F78 800C0DD8 ADD80004 */ sw $t8, 4($t6) -/* B37F7C 800C0DDC 8CB90008 */ lw $t9, 8($a1) -/* B37F80 800C0DE0 248507C0 */ addiu $a1, $a0, 0x7c0 -/* B37F84 800C0DE4 ADD90008 */ sw $t9, 8($t6) -/* B37F88 800C0DE8 AFA50024 */ sw $a1, 0x24($sp) -/* B37F8C 800C0DEC AFA90014 */ sw $t1, 0x14($sp) -/* B37F90 800C0DF0 AFA80010 */ sw $t0, 0x10($sp) -/* B37F94 800C0DF4 8FA70034 */ lw $a3, 0x34($sp) -/* B37F98 800C0DF8 0C01084F */ jal func_8004213C -/* B37F9C 800C0DFC 8FA6002C */ lw $a2, 0x2c($sp) -/* B37FA0 800C0E00 24010001 */ li $at, 1 -/* B37FA4 800C0E04 14410014 */ bne $v0, $at, .L800C0E58 -/* B37FA8 800C0E08 8FAA0044 */ lw $t2, 0x44($sp) -/* B37FAC 800C0E0C C5440004 */ lwc1 $f4, 4($t2) -/* B37FB0 800C0E10 C7A60030 */ lwc1 $f6, 0x30($sp) -/* B37FB4 800C0E14 8FA40024 */ lw $a0, 0x24($sp) -/* B37FB8 800C0E18 27A50038 */ addiu $a1, $sp, 0x38 -/* B37FBC 800C0E1C 4606203C */ c.lt.s $f4, $f6 -/* B37FC0 800C0E20 27A60028 */ addiu $a2, $sp, 0x28 -/* B37FC4 800C0E24 4502000D */ bc1fl .L800C0E5C -/* B37FC8 800C0E28 00001025 */ move $v0, $zero -/* B37FCC 800C0E2C 0C00F250 */ jal func_8003C940 -/* B37FD0 800C0E30 27A7002C */ addiu $a3, $sp, 0x2c -/* B37FD4 800C0E34 3C01C6FA */ li $at, 0xC6FA0000 # 0.000000 -/* B37FD8 800C0E38 44814000 */ mtc1 $at, $f8 -/* B37FDC 800C0E3C 00000000 */ nop -/* B37FE0 800C0E40 46080032 */ c.eq.s $f0, $f8 -/* B37FE4 800C0E44 00000000 */ nop -/* B37FE8 800C0E48 45030004 */ bc1tl .L800C0E5C -/* B37FEC 800C0E4C 00001025 */ move $v0, $zero -/* B37FF0 800C0E50 10000002 */ b .L800C0E5C -/* B37FF4 800C0E54 24020001 */ li $v0, 1 -.L800C0E58: -/* B37FF8 800C0E58 00001025 */ move $v0, $zero -.L800C0E5C: -/* B37FFC 800C0E5C 8FBF001C */ lw $ra, 0x1c($sp) -/* B38000 800C0E60 27BD0040 */ addiu $sp, $sp, 0x40 -/* B38004 800C0E64 03E00008 */ jr $ra -/* B38008 800C0E68 00000000 */ nop diff --git a/asm/non_matchings/code/z_player_lib/func_8008EEAC.s b/asm/non_matchings/code/z_player_lib/func_8008EEAC.s index de2a02a614..9ae2412a94 100644 --- a/asm/non_matchings/code/z_player_lib/func_8008EEAC.s +++ b/asm/non_matchings/code/z_player_lib/func_8008EEAC.s @@ -16,14 +16,14 @@ glabel func_8008EEAC /* B06084 8008EEE4 01E1C025 */ or $t8, $t7, $at /* B06088 8008EEE8 ACD8067C */ sw $t8, 0x67c($a2) /* B0608C 8008EEEC 8FA40020 */ lw $a0, 0x20($sp) -/* B06090 8008EEF0 0C030129 */ jal func_800C04A4 +/* B06090 8008EEF0 0C030129 */ jal Gameplay_GetCamera /* B06094 8008EEF4 00002825 */ move $a1, $zero /* B06098 8008EEF8 00402025 */ move $a0, $v0 /* B0609C 8008EEFC 24050008 */ li $a1, 8 /* B060A0 8008EF00 0C016AA4 */ jal func_8005AA90 /* B060A4 8008EF04 8FA60024 */ lw $a2, 0x24($sp) /* B060A8 8008EF08 8FA40020 */ lw $a0, 0x20($sp) -/* B060AC 8008EF0C 0C030129 */ jal func_800C04A4 +/* B060AC 8008EF0C 0C030129 */ jal Gameplay_GetCamera /* B060B0 8008EF10 00002825 */ move $a1, $zero /* B060B4 8008EF14 00402025 */ move $a0, $v0 /* B060B8 8008EF18 0C016911 */ jal func_8005A444 diff --git a/asm/non_matchings/code/z_sample/Sample_Draw.s b/asm/non_matchings/code/z_sample/Sample_Draw.s deleted file mode 100644 index b3c4c8e967..0000000000 --- a/asm/non_matchings/code/z_sample/Sample_Draw.s +++ /dev/null @@ -1,147 +0,0 @@ -.rdata -glabel D_8013F2C0 - .asciz "../z_sample.c" - .balign 4 - -glabel D_8013F2D0 - .asciz "../z_sample.c" - .balign 4 - -.text -glabel Sample_Draw -/* B0E7A4 80097604 27BDFF90 */ addiu $sp, $sp, -0x70 -/* B0E7A8 80097608 AFBF002C */ sw $ra, 0x2c($sp) -/* B0E7AC 8009760C AFB00028 */ sw $s0, 0x28($sp) -/* B0E7B0 80097610 AFA40070 */ sw $a0, 0x70($sp) -/* B0E7B4 80097614 8C900000 */ lw $s0, ($a0) -/* B0E7B8 80097618 3C068014 */ lui $a2, %hi(D_8013F2C0) # $a2, 0x8014 -/* B0E7BC 8009761C 24C6F2C0 */ addiu $a2, %lo(D_8013F2C0) # addiu $a2, $a2, -0xd40 -/* B0E7C0 80097620 27A40054 */ addiu $a0, $sp, 0x54 -/* B0E7C4 80097624 2407003E */ li $a3, 62 -/* B0E7C8 80097628 0C031AB1 */ jal Graph_OpenDisps -/* B0E7CC 8009762C 02002825 */ move $a1, $s0 -/* B0E7D0 80097630 8E0202C0 */ lw $v0, 0x2c0($s0) -/* B0E7D4 80097634 3C18DB06 */ lui $t8, 0xdb06 -/* B0E7D8 80097638 3C08DB06 */ lui $t0, (0xDB060004 >> 16) # lui $t0, 0xdb06 -/* B0E7DC 8009763C 244F0008 */ addiu $t7, $v0, 8 -/* B0E7E0 80097640 AE0F02C0 */ sw $t7, 0x2c0($s0) -/* B0E7E4 80097644 AC400004 */ sw $zero, 4($v0) -/* B0E7E8 80097648 AC580000 */ sw $t8, ($v0) -/* B0E7EC 8009764C 8E0202C0 */ lw $v0, 0x2c0($s0) -/* B0E7F0 80097650 35080004 */ ori $t0, (0xDB060004 & 0xFFFF) # ori $t0, $t0, 4 -/* B0E7F4 80097654 02002025 */ move $a0, $s0 -/* B0E7F8 80097658 24590008 */ addiu $t9, $v0, 8 -/* B0E7FC 8009765C AE1902C0 */ sw $t9, 0x2c0($s0) -/* B0E800 80097660 AC480000 */ sw $t0, ($v0) -/* B0E804 80097664 8FA90070 */ lw $t1, 0x70($sp) -/* B0E808 80097668 00002825 */ move $a1, $zero -/* B0E80C 8009766C 00003025 */ move $a2, $zero -/* B0E810 80097670 8D2A00A4 */ lw $t2, 0xa4($t1) -/* B0E814 80097674 00003825 */ move $a3, $zero -/* B0E818 80097678 0C025492 */ jal func_80095248 -/* B0E81C 8009767C AC4A0004 */ sw $t2, 4($v0) -/* B0E820 80097680 8FA40070 */ lw $a0, 0x70($sp) -/* B0E824 80097684 240B0007 */ li $t3, 7 -/* B0E828 80097688 2405000F */ li $a1, 15 -/* B0E82C 8009768C AC8B01C8 */ sw $t3, 0x1c8($a0) -/* B0E830 80097690 0C02AA94 */ jal func_800AAA50 -/* B0E834 80097694 248400A8 */ addiu $a0, $a0, 0xa8 -/* B0E838 80097698 02002025 */ move $a0, $s0 -/* B0E83C 8009769C 0C031A73 */ jal Graph_Alloc -/* B0E840 800976A0 24050040 */ li $a1, 64 -/* B0E844 800976A4 3C038016 */ lui $v1, %hi(gGameInfo) # $v1, 0x8016 -/* B0E848 800976A8 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -/* B0E84C 800976AC AFA20048 */ sw $v0, 0x48($sp) -/* B0E850 800976B0 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B0E854 800976B4 44815000 */ mtc1 $at, $f10 -/* B0E858 800976B8 846E0122 */ lh $t6, 0x122($v1) -/* B0E85C 800976BC 846D0120 */ lh $t5, 0x120($v1) -/* B0E860 800976C0 846C011E */ lh $t4, 0x11e($v1) -/* B0E864 800976C4 E7AA0010 */ swc1 $f10, 0x10($sp) -/* B0E868 800976C8 846F0124 */ lh $t7, 0x124($v1) -/* B0E86C 800976CC 448C2000 */ mtc1 $t4, $f4 -/* B0E870 800976D0 448D3000 */ mtc1 $t5, $f6 -/* B0E874 800976D4 448F8000 */ mtc1 $t7, $f16 -/* B0E878 800976D8 46802120 */ cvt.s.w $f4, $f4 -/* B0E87C 800976DC 448E4000 */ mtc1 $t6, $f8 -/* B0E880 800976E0 00402025 */ move $a0, $v0 -/* B0E884 800976E4 468084A0 */ cvt.s.w $f18, $f16 -/* B0E888 800976E8 44052000 */ mfc1 $a1, $f4 -/* B0E88C 800976EC 468031A0 */ cvt.s.w $f6, $f6 -/* B0E890 800976F0 E7B20014 */ swc1 $f18, 0x14($sp) -/* B0E894 800976F4 84780126 */ lh $t8, 0x126($v1) -/* B0E898 800976F8 44982000 */ mtc1 $t8, $f4 -/* B0E89C 800976FC 44063000 */ mfc1 $a2, $f6 -/* B0E8A0 80097700 46804220 */ cvt.s.w $f8, $f8 -/* B0E8A4 80097704 468021A0 */ cvt.s.w $f6, $f4 -/* B0E8A8 80097708 44074000 */ mfc1 $a3, $f8 -/* B0E8AC 8009770C E7A60018 */ swc1 $f6, 0x18($sp) -/* B0E8B0 80097710 84790128 */ lh $t9, 0x128($v1) -/* B0E8B4 80097714 44994000 */ mtc1 $t9, $f8 -/* B0E8B8 80097718 00000000 */ nop -/* B0E8BC 8009771C 468042A0 */ cvt.s.w $f10, $f8 -/* B0E8C0 80097720 0C040F56 */ jal func_80103D58 -/* B0E8C4 80097724 E7AA001C */ swc1 $f10, 0x1c($sp) -/* B0E8C8 80097728 8E0202C0 */ lw $v0, 0x2c0($s0) -/* B0E8CC 8009772C 3C09DA38 */ lui $t1, (0xDA380003 >> 16) # lui $t1, 0xda38 -/* B0E8D0 80097730 35290003 */ ori $t1, (0xDA380003 & 0xFFFF) # ori $t1, $t1, 3 -/* B0E8D4 80097734 24480008 */ addiu $t0, $v0, 8 -/* B0E8D8 80097738 AE0802C0 */ sw $t0, 0x2c0($s0) -/* B0E8DC 8009773C AC490000 */ sw $t1, ($v0) -/* B0E8E0 80097740 8FAA0048 */ lw $t2, 0x48($sp) -/* B0E8E4 80097744 240500FF */ li $a1, 255 -/* B0E8E8 80097748 240600FF */ li $a2, 255 -/* B0E8EC 8009774C AC4A0004 */ sw $t2, 4($v0) -/* B0E8F0 80097750 8E0402C0 */ lw $a0, 0x2c0($s0) -/* B0E8F4 80097754 AFA00018 */ sw $zero, 0x18($sp) -/* B0E8F8 80097758 AFA00014 */ sw $zero, 0x14($sp) -/* B0E8FC 8009775C AFA00010 */ sw $zero, 0x10($sp) -/* B0E900 80097760 0C024DC2 */ jal Gfx_SetFog2 -/* B0E904 80097764 240700FF */ li $a3, 255 -/* B0E908 80097768 AE0202C0 */ sw $v0, 0x2c0($s0) -/* B0E90C 8009776C 0C024F46 */ jal func_80093D18 -/* B0E910 80097770 02002025 */ move $a0, $s0 -/* B0E914 80097774 8E0202C0 */ lw $v0, 0x2c0($s0) -/* B0E918 80097778 3C0CE300 */ lui $t4, (0xE3000A01 >> 16) # lui $t4, 0xe300 -/* B0E91C 8009777C 358C0A01 */ ori $t4, (0xE3000A01 & 0xFFFF) # ori $t4, $t4, 0xa01 -/* B0E920 80097780 244B0008 */ addiu $t3, $v0, 8 -/* B0E924 80097784 AE0B02C0 */ sw $t3, 0x2c0($s0) -/* B0E928 80097788 AC400004 */ sw $zero, 4($v0) -/* B0E92C 8009778C AC4C0000 */ sw $t4, ($v0) -/* B0E930 80097790 8E0202C0 */ lw $v0, 0x2c0($s0) -/* B0E934 80097794 3C0EE200 */ lui $t6, (0xE200001C >> 16) # lui $t6, 0xe200 -/* B0E938 80097798 3C0F0055 */ lui $t7, (0x00552078 >> 16) # lui $t7, 0x55 -/* B0E93C 8009779C 244D0008 */ addiu $t5, $v0, 8 -/* B0E940 800977A0 AE0D02C0 */ sw $t5, 0x2c0($s0) -/* B0E944 800977A4 35EF2078 */ ori $t7, (0x00552078 & 0xFFFF) # ori $t7, $t7, 0x2078 -/* B0E948 800977A8 35CE001C */ ori $t6, (0xE200001C & 0xFFFF) # ori $t6, $t6, 0x1c -/* B0E94C 800977AC AC4E0000 */ sw $t6, ($v0) -/* B0E950 800977B0 AC4F0004 */ sw $t7, 4($v0) -/* B0E954 800977B4 8E0202C0 */ lw $v0, 0x2c0($s0) -/* B0E958 800977B8 3C19FCFF */ lui $t9, (0xFCFFFFFF >> 16) # lui $t9, 0xfcff -/* B0E95C 800977BC 3C08FFFD */ lui $t0, (0xFFFDF6FB >> 16) # lui $t0, 0xfffd -/* B0E960 800977C0 24580008 */ addiu $t8, $v0, 8 -/* B0E964 800977C4 AE1802C0 */ sw $t8, 0x2c0($s0) -/* B0E968 800977C8 3508F6FB */ ori $t0, (0xFFFDF6FB & 0xFFFF) # ori $t0, $t0, 0xf6fb -/* B0E96C 800977CC 3739FFFF */ ori $t9, (0xFCFFFFFF & 0xFFFF) # ori $t9, $t9, 0xffff -/* B0E970 800977D0 AC590000 */ sw $t9, ($v0) -/* B0E974 800977D4 AC480004 */ sw $t0, 4($v0) -/* B0E978 800977D8 8E0202C0 */ lw $v0, 0x2c0($s0) -/* B0E97C 800977DC 3C0BFFFF */ lui $t3, 0xffff -/* B0E980 800977E0 3C0AFA00 */ lui $t2, 0xfa00 -/* B0E984 800977E4 24490008 */ addiu $t1, $v0, 8 -/* B0E988 800977E8 AE0902C0 */ sw $t1, 0x2c0($s0) -/* B0E98C 800977EC 3C068014 */ lui $a2, %hi(D_8013F2D0) # $a2, 0x8014 -/* B0E990 800977F0 24C6F2D0 */ addiu $a2, %lo(D_8013F2D0) # addiu $a2, $a2, -0xd30 -/* B0E994 800977F4 27A40054 */ addiu $a0, $sp, 0x54 -/* B0E998 800977F8 02002825 */ move $a1, $s0 -/* B0E99C 800977FC 2407006F */ li $a3, 111 -/* B0E9A0 80097800 AC4B0004 */ sw $t3, 4($v0) -/* B0E9A4 80097804 0C031AD5 */ jal Graph_CloseDisps -/* B0E9A8 80097808 AC4A0000 */ sw $t2, ($v0) -/* B0E9AC 8009780C 8FBF002C */ lw $ra, 0x2c($sp) -/* B0E9B0 80097810 8FB00028 */ lw $s0, 0x28($sp) -/* B0E9B4 80097814 27BD0070 */ addiu $sp, $sp, 0x70 -/* B0E9B8 80097818 03E00008 */ jr $ra -/* B0E9BC 8009781C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_view/func_800AA550.s b/asm/non_matchings/code/z_view/func_800AA550.s deleted file mode 100644 index 88a5f063e2..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA550.s +++ /dev/null @@ -1,185 +0,0 @@ -.rdata -glabel D_801410A0 - .asciz "ulx >= 0" - .balign 4 - -glabel D_801410AC - .asciz "../z_view.c" - .balign 4 - -glabel D_801410B8 - .asciz "uly >= 0" - .balign 4 - -glabel D_801410C4 - .asciz "../z_view.c" - .balign 4 - -glabel D_801410D0 - .asciz "lrx <= SCREEN_WD" - .balign 4 - -glabel D_801410E4 - .asciz "../z_view.c" - .balign 4 - -glabel D_801410F0 - .asciz "lry <= SCREEN_HT" - .balign 4 - -glabel D_80141104 - .asciz "../z_view.c" - .balign 4 - -glabel D_80141110 - .asciz "../z_view.c" - .balign 4 - -glabel D_8014111C - .asciz "../z_view.c" - .balign 4 - -.text -glabel func_800AA550 -/* B216F0 800AA550 27BDFF90 */ addiu $sp, $sp, -0x70 -/* B216F4 800AA554 AFBF001C */ sw $ra, 0x1c($sp) -/* B216F8 800AA558 AFB00018 */ sw $s0, 0x18($sp) -/* B216FC 800AA55C 8C900004 */ lw $s0, 4($a0) -/* B21700 800AA560 0C02CE3F */ jal func_800B38FC -/* B21704 800AA564 AFA40070 */ sw $a0, 0x70($sp) -/* B21708 800AA568 8FA50070 */ lw $a1, 0x70($sp) -/* B2170C 800AA56C 00401825 */ move $v1, $v0 -/* B21710 800AA570 04410002 */ bgez $v0, .L800AA57C -/* B21714 800AA574 00002025 */ move $a0, $zero -/* B21718 800AA578 00001825 */ move $v1, $zero -.L800AA57C: -/* B2171C 800AA57C 28610079 */ slti $at, $v1, 0x79 -/* B21720 800AA580 14200002 */ bnez $at, .L800AA58C -/* B21724 800AA584 240601C6 */ li $a2, 454 -/* B21728 800AA588 24030078 */ li $v1, 120 -.L800AA58C: -/* B2172C 800AA58C 8CAE0010 */ lw $t6, 0x10($a1) -/* B21730 800AA590 01C47821 */ addu $t7, $t6, $a0 -/* B21734 800AA594 AFAF0060 */ sw $t7, 0x60($sp) -/* B21738 800AA598 8CB80008 */ lw $t8, 8($a1) -/* B2173C 800AA59C 0303C821 */ addu $t9, $t8, $v1 -/* B21740 800AA5A0 AFB9005C */ sw $t9, 0x5c($sp) -/* B21744 800AA5A4 8CA80014 */ lw $t0, 0x14($a1) -/* B21748 800AA5A8 01044823 */ subu $t1, $t0, $a0 -/* B2174C 800AA5AC AFA90058 */ sw $t1, 0x58($sp) -/* B21750 800AA5B0 8CAA000C */ lw $t2, 0xc($a1) -/* B21754 800AA5B4 3C048014 */ lui $a0, %hi(D_801410A0) # $a0, 0x8014 -/* B21758 800AA5B8 248410A0 */ addiu $a0, %lo(D_801410A0) # addiu $a0, $a0, 0x10a0 -/* B2175C 800AA5BC 01435823 */ subu $t3, $t2, $v1 -/* B21760 800AA5C0 05E10004 */ bgez $t7, .L800AA5D4 -/* B21764 800AA5C4 AFAB0054 */ sw $t3, 0x54($sp) -/* B21768 800AA5C8 3C058014 */ lui $a1, %hi(D_801410AC) # $a1, 0x8014 -/* B2176C 800AA5CC 0C0007FC */ jal __assert -/* B21770 800AA5D0 24A510AC */ addiu $a1, %lo(D_801410AC) # addiu $a1, $a1, 0x10ac -.L800AA5D4: -/* B21774 800AA5D4 8FAD005C */ lw $t5, 0x5c($sp) -/* B21778 800AA5D8 3C048014 */ lui $a0, %hi(D_801410B8) # $a0, 0x8014 -/* B2177C 800AA5DC 248410B8 */ addiu $a0, %lo(D_801410B8) # addiu $a0, $a0, 0x10b8 -/* B21780 800AA5E0 05A10004 */ bgez $t5, .L800AA5F4 -/* B21784 800AA5E4 3C058014 */ lui $a1, %hi(D_801410C4) # $a1, 0x8014 -/* B21788 800AA5E8 24A510C4 */ addiu $a1, %lo(D_801410C4) # addiu $a1, $a1, 0x10c4 -/* B2178C 800AA5EC 0C0007FC */ jal __assert -/* B21790 800AA5F0 240601C7 */ li $a2, 455 -.L800AA5F4: -/* B21794 800AA5F4 8FAE0058 */ lw $t6, 0x58($sp) -/* B21798 800AA5F8 3C048014 */ lui $a0, %hi(D_801410D0) # $a0, 0x8014 -/* B2179C 800AA5FC 248410D0 */ addiu $a0, %lo(D_801410D0) # addiu $a0, $a0, 0x10d0 -/* B217A0 800AA600 29C10141 */ slti $at, $t6, 0x141 -/* B217A4 800AA604 14200004 */ bnez $at, .L800AA618 -/* B217A8 800AA608 3C058014 */ lui $a1, %hi(D_801410E4) # $a1, 0x8014 -/* B217AC 800AA60C 24A510E4 */ addiu $a1, %lo(D_801410E4) # addiu $a1, $a1, 0x10e4 -/* B217B0 800AA610 0C0007FC */ jal __assert -/* B217B4 800AA614 240601C8 */ li $a2, 456 -.L800AA618: -/* B217B8 800AA618 8FAF0054 */ lw $t7, 0x54($sp) -/* B217BC 800AA61C 3C048014 */ lui $a0, %hi(D_801410F0) # $a0, 0x8014 -/* B217C0 800AA620 248410F0 */ addiu $a0, %lo(D_801410F0) # addiu $a0, $a0, 0x10f0 -/* B217C4 800AA624 29E100F1 */ slti $at, $t7, 0xf1 -/* B217C8 800AA628 14200004 */ bnez $at, .L800AA63C -/* B217CC 800AA62C 3C058014 */ lui $a1, %hi(D_80141104) # $a1, 0x8014 -/* B217D0 800AA630 24A51104 */ addiu $a1, %lo(D_80141104) # addiu $a1, $a1, 0x1104 -/* B217D4 800AA634 0C0007FC */ jal __assert -/* B217D8 800AA638 240601C9 */ li $a2, 457 -.L800AA63C: -/* B217DC 800AA63C 3C068014 */ lui $a2, %hi(D_80141110) # $a2, 0x8014 -/* B217E0 800AA640 24C61110 */ addiu $a2, %lo(D_80141110) # addiu $a2, $a2, 0x1110 -/* B217E4 800AA644 27A4003C */ addiu $a0, $sp, 0x3c -/* B217E8 800AA648 02002825 */ move $a1, $s0 -/* B217EC 800AA64C 0C031AB1 */ jal Graph_OpenDisps -/* B217F0 800AA650 240701CB */ li $a3, 459 -/* B217F4 800AA654 8E0302C0 */ lw $v1, 0x2c0($s0) -/* B217F8 800AA658 3C06E700 */ lui $a2, 0xe700 -/* B217FC 800AA65C 3C014080 */ li $at, 0x40800000 # 0.000000 -/* B21800 800AA660 24780008 */ addiu $t8, $v1, 8 -/* B21804 800AA664 AE1802C0 */ sw $t8, 0x2c0($s0) -/* B21808 800AA668 AC600004 */ sw $zero, 4($v1) -/* B2180C 800AA66C AC660000 */ sw $a2, ($v1) -/* B21810 800AA670 8E0302C0 */ lw $v1, 0x2c0($s0) -/* B21814 800AA674 44810000 */ mtc1 $at, $f0 -/* B21818 800AA678 3C01ED00 */ lui $at, 0xed00 -/* B2181C 800AA67C 24790008 */ addiu $t9, $v1, 8 -/* B21820 800AA680 AE1902C0 */ sw $t9, 0x2c0($s0) -/* B21824 800AA684 8FA80060 */ lw $t0, 0x60($sp) -/* B21828 800AA688 8FAE005C */ lw $t6, 0x5c($sp) -/* B2182C 800AA68C 240701D8 */ li $a3, 472 -/* B21830 800AA690 44882000 */ mtc1 $t0, $f4 -/* B21834 800AA694 448E8000 */ mtc1 $t6, $f16 -/* B21838 800AA698 468021A0 */ cvt.s.w $f6, $f4 -/* B2183C 800AA69C 468084A0 */ cvt.s.w $f18, $f16 -/* B21840 800AA6A0 46003202 */ mul.s $f8, $f6, $f0 -/* B21844 800AA6A4 00000000 */ nop -/* B21848 800AA6A8 46009102 */ mul.s $f4, $f18, $f0 -/* B2184C 800AA6AC 4600428D */ trunc.w.s $f10, $f8 -/* B21850 800AA6B0 4600218D */ trunc.w.s $f6, $f4 -/* B21854 800AA6B4 440A5000 */ mfc1 $t2, $f10 -/* B21858 800AA6B8 44183000 */ mfc1 $t8, $f6 -/* B2185C 800AA6BC 314B0FFF */ andi $t3, $t2, 0xfff -/* B21860 800AA6C0 000B6300 */ sll $t4, $t3, 0xc -/* B21864 800AA6C4 01816825 */ or $t5, $t4, $at -/* B21868 800AA6C8 33190FFF */ andi $t9, $t8, 0xfff -/* B2186C 800AA6CC 01B92025 */ or $a0, $t5, $t9 -/* B21870 800AA6D0 AC640000 */ sw $a0, ($v1) -/* B21874 800AA6D4 8FA80058 */ lw $t0, 0x58($sp) -/* B21878 800AA6D8 8FAE0054 */ lw $t6, 0x54($sp) -/* B2187C 800AA6DC 44884000 */ mtc1 $t0, $f8 -/* B21880 800AA6E0 448E2000 */ mtc1 $t6, $f4 -/* B21884 800AA6E4 468042A0 */ cvt.s.w $f10, $f8 -/* B21888 800AA6E8 468021A0 */ cvt.s.w $f6, $f4 -/* B2188C 800AA6EC 46005402 */ mul.s $f16, $f10, $f0 -/* B21890 800AA6F0 00000000 */ nop -/* B21894 800AA6F4 46003202 */ mul.s $f8, $f6, $f0 -/* B21898 800AA6F8 4600848D */ trunc.w.s $f18, $f16 -/* B2189C 800AA6FC 4600428D */ trunc.w.s $f10, $f8 -/* B218A0 800AA700 440A9000 */ mfc1 $t2, $f18 -/* B218A4 800AA704 44185000 */ mfc1 $t8, $f10 -/* B218A8 800AA708 314B0FFF */ andi $t3, $t2, 0xfff -/* B218AC 800AA70C 000B6300 */ sll $t4, $t3, 0xc -/* B218B0 800AA710 330D0FFF */ andi $t5, $t8, 0xfff -/* B218B4 800AA714 018D2825 */ or $a1, $t4, $t5 -/* B218B8 800AA718 AC650004 */ sw $a1, 4($v1) -/* B218BC 800AA71C 8E0302D0 */ lw $v1, 0x2d0($s0) -/* B218C0 800AA720 24790008 */ addiu $t9, $v1, 8 -/* B218C4 800AA724 AE1902D0 */ sw $t9, 0x2d0($s0) -/* B218C8 800AA728 AC600004 */ sw $zero, 4($v1) -/* B218CC 800AA72C AC660000 */ sw $a2, ($v1) -/* B218D0 800AA730 8E0302D0 */ lw $v1, 0x2d0($s0) -/* B218D4 800AA734 3C068014 */ lui $a2, %hi(D_8014111C) # $a2, 0x8014 -/* B218D8 800AA738 24C6111C */ addiu $a2, %lo(D_8014111C) # addiu $a2, $a2, 0x111c -/* B218DC 800AA73C 24680008 */ addiu $t0, $v1, 8 -/* B218E0 800AA740 AE0802D0 */ sw $t0, 0x2d0($s0) -/* B218E4 800AA744 AC650004 */ sw $a1, 4($v1) -/* B218E8 800AA748 AC640000 */ sw $a0, ($v1) -/* B218EC 800AA74C 27A4003C */ addiu $a0, $sp, 0x3c -/* B218F0 800AA750 0C031AD5 */ jal Graph_CloseDisps -/* B218F4 800AA754 02002825 */ move $a1, $s0 -/* B218F8 800AA758 8FBF001C */ lw $ra, 0x1c($sp) -/* B218FC 800AA75C 8FB00018 */ lw $s0, 0x18($sp) -/* B21900 800AA760 27BD0070 */ addiu $sp, $sp, 0x70 -/* B21904 800AA764 03E00008 */ jr $ra -/* B21908 800AA768 00000000 */ nop - diff --git a/asm/non_matchings/code/z_view/func_800AAA9C.s b/asm/non_matchings/code/z_view/func_800AAA9C.s deleted file mode 100644 index 08af43396b..0000000000 --- a/asm/non_matchings/code/z_view/func_800AAA9C.s +++ /dev/null @@ -1,465 +0,0 @@ -.rdata -glabel D_80141134 - .asciz "../z_view.c" - .balign 4 - -glabel D_80141140 - .asciz "vp" - .balign 4 - -glabel D_80141144 - .asciz "../z_view.c" - .balign 4 - -glabel D_80141150 - .asciz "projection" - .balign 4 - -glabel D_8014115C - .asciz "../z_view.c" - .balign 4 - -glabel D_80141168 - .asciz "fovy %f near %f far %f scale %f aspect %f normal %08x\n" - .balign 4 - -glabel D_801411A0 - .asciz "projection\n" - .balign 4 - -glabel D_801411AC - .asciz " %f %f %f %f\n" - .balign 4 - -glabel D_801411BC - .asciz "\n" - .balign 4 - -glabel D_801411C0 - .asciz "viewing" - .balign 4 - -glabel D_801411C8 - .asciz "../z_view.c" - .balign 4 - -glabel D_801411D4 - .asciz "viewing\n" - .balign 4 - -glabel D_801411E0 - .asciz " %f %f %f %f\n" - .balign 4 - -glabel D_801411F0 - .asciz "\n" - .balign 4 - -glabel D_801411F4 - .asciz "../z_view.c" - .balign 4 - -.late_rodata -glabel D_80141388 - .float 10000 - -.text -glabel func_800AAA9C -/* B21C3C 800AAA9C 27BDFEC8 */ addiu $sp, $sp, -0x138 -/* B21C40 800AAAA0 AFBF004C */ sw $ra, 0x4c($sp) -/* B21C44 800AAAA4 AFB20048 */ sw $s2, 0x48($sp) -/* B21C48 800AAAA8 AFB10044 */ sw $s1, 0x44($sp) -/* B21C4C 800AAAAC AFB00040 */ sw $s0, 0x40($sp) -/* B21C50 800AAAB0 8C920004 */ lw $s2, 4($a0) -/* B21C54 800AAAB4 00808825 */ move $s1, $a0 -/* B21C58 800AAAB8 3C068014 */ lui $a2, %hi(D_80141134) # $a2, 0x8014 -/* B21C5C 800AAABC 24C61134 */ addiu $a2, %lo(D_80141134) # addiu $a2, $a2, 0x1134 -/* B21C60 800AAAC0 27A40108 */ addiu $a0, $sp, 0x108 -/* B21C64 800AAAC4 24070254 */ li $a3, 596 -/* B21C68 800AAAC8 0C031AB1 */ jal Graph_OpenDisps -/* B21C6C 800AAACC 02402825 */ move $a1, $s2 -/* B21C70 800AAAD0 02402025 */ move $a0, $s2 -/* B21C74 800AAAD4 0C031A73 */ jal Graph_Alloc -/* B21C78 800AAAD8 24050010 */ li $a1, 16 -/* B21C7C 800AAADC 3C048014 */ lui $a0, %hi(D_80141140) # $a0, 0x8014 -/* B21C80 800AAAE0 3C068014 */ lui $a2, %hi(D_80141144) # $a2, 0x8014 -/* B21C84 800AAAE4 00408025 */ move $s0, $v0 -/* B21C88 800AAAE8 24C61144 */ addiu $a2, %lo(D_80141144) # addiu $a2, $a2, 0x1144 -/* B21C8C 800AAAEC 24841140 */ addiu $a0, %lo(D_80141140) # addiu $a0, $a0, 0x1140 -/* B21C90 800AAAF0 00402825 */ move $a1, $v0 -/* B21C94 800AAAF4 0C000B58 */ jal LogUtils_CheckNullPointer -/* B21C98 800AAAF8 24070259 */ li $a3, 601 -/* B21C9C 800AAAFC 02002025 */ move $a0, $s0 -/* B21CA0 800AAB00 0C02A864 */ jal func_800AA190 -/* B21CA4 800AAB04 26250008 */ addiu $a1, $s1, 8 -/* B21CA8 800AAB08 8E0F0000 */ lw $t7, ($s0) -/* B21CAC 800AAB0C 02202025 */ move $a0, $s1 -/* B21CB0 800AAB10 AE2F0050 */ sw $t7, 0x50($s1) -/* B21CB4 800AAB14 8E0E0004 */ lw $t6, 4($s0) -/* B21CB8 800AAB18 AE2E0054 */ sw $t6, 0x54($s1) -/* B21CBC 800AAB1C 8E0F0008 */ lw $t7, 8($s0) -/* B21CC0 800AAB20 AE2F0058 */ sw $t7, 0x58($s1) -/* B21CC4 800AAB24 8E0E000C */ lw $t6, 0xc($s0) -/* B21CC8 800AAB28 0C02A954 */ jal func_800AA550 -/* B21CCC 800AAB2C AE2E005C */ sw $t6, 0x5c($s1) -/* B21CD0 800AAB30 8E4202C0 */ lw $v0, 0x2c0($s2) -/* B21CD4 800AAB34 3C04DC08 */ lui $a0, (0xDC080008 >> 16) # lui $a0, 0xdc08 -/* B21CD8 800AAB38 34840008 */ ori $a0, (0xDC080008 & 0xFFFF) # ori $a0, $a0, 8 -/* B21CDC 800AAB3C 24580008 */ addiu $t8, $v0, 8 -/* B21CE0 800AAB40 AE5802C0 */ sw $t8, 0x2c0($s2) -/* B21CE4 800AAB44 AC500004 */ sw $s0, 4($v0) -/* B21CE8 800AAB48 AC440000 */ sw $a0, ($v0) -/* B21CEC 800AAB4C 8E4202D0 */ lw $v0, 0x2d0($s2) -/* B21CF0 800AAB50 24050040 */ li $a1, 64 -/* B21CF4 800AAB54 24590008 */ addiu $t9, $v0, 8 -/* B21CF8 800AAB58 AE5902D0 */ sw $t9, 0x2d0($s2) -/* B21CFC 800AAB5C AC440000 */ sw $a0, ($v0) -/* B21D00 800AAB60 02402025 */ move $a0, $s2 -/* B21D04 800AAB64 0C031A73 */ jal Graph_Alloc -/* B21D08 800AAB68 AC500004 */ sw $s0, 4($v0) -/* B21D0C 800AAB6C 3C048014 */ lui $a0, %hi(D_80141150) # $a0, 0x8014 -/* B21D10 800AAB70 3C068014 */ lui $a2, %hi(D_8014115C) # $a2, 0x8014 -/* B21D14 800AAB74 AFA20124 */ sw $v0, 0x124($sp) -/* B21D18 800AAB78 24C6115C */ addiu $a2, %lo(D_8014115C) # addiu $a2, $a2, 0x115c -/* B21D1C 800AAB7C 24841150 */ addiu $a0, %lo(D_80141150) # addiu $a0, $a0, 0x1150 -/* B21D20 800AAB80 00402825 */ move $a1, $v0 -/* B21D24 800AAB84 0C000B58 */ jal LogUtils_CheckNullPointer -/* B21D28 800AAB88 24070268 */ li $a3, 616 -/* B21D2C 800AAB8C 8FA40124 */ lw $a0, 0x124($sp) -/* B21D30 800AAB90 8E2B000C */ lw $t3, 0xc($s1) -/* B21D34 800AAB94 8E2C0008 */ lw $t4, 8($s1) -/* B21D38 800AAB98 3C088016 */ lui $t0, %hi(gGameInfo) # $t0, 0x8016 -/* B21D3C 800AAB9C 2508FA90 */ addiu $t0, %lo(gGameInfo) # addiu $t0, $t0, -0x570 -/* B21D40 800AABA0 AE2400E0 */ sw $a0, 0xe0($s1) -/* B21D44 800AABA4 8D020000 */ lw $v0, ($t0) -/* B21D48 800AABA8 8E290014 */ lw $t1, 0x14($s1) -/* B21D4C 800AABAC 8E2A0010 */ lw $t2, 0x10($s1) -/* B21D50 800AABB0 016C6823 */ subu $t5, $t3, $t4 -/* B21D54 800AABB4 AFAD012C */ sw $t5, 0x12c($sp) -/* B21D58 800AABB8 844E1074 */ lh $t6, 0x1074($v0) -/* B21D5C 800AABBC 2403000B */ li $v1, 11 -/* B21D60 800AABC0 012A8023 */ subu $s0, $t1, $t2 -/* B21D64 800AABC4 546E0035 */ bnel $v1, $t6, .L800AAC9C -/* B21D68 800AABC8 8FAD012C */ lw $t5, 0x12c($sp) -/* B21D6C 800AABCC 844F1090 */ lh $t7, 0x1090($v0) -/* B21D70 800AABD0 506F0013 */ beql $v1, $t7, .L800AAC20 -/* B21D74 800AABD4 8459107A */ lh $t9, 0x107a($v0) -/* B21D78 800AABD8 A4431090 */ sh $v1, 0x1090($v0) -/* B21D7C 800AABDC 8D190000 */ lw $t9, ($t0) -/* B21D80 800AABE0 2418003C */ li $t8, 60 -/* B21D84 800AABE4 24093415 */ li $t1, 13333 -/* B21D88 800AABE8 A738107A */ sh $t8, 0x107a($t9) -/* B21D8C 800AABEC 8D0A0000 */ lw $t2, ($t0) -/* B21D90 800AABF0 240B000A */ li $t3, 10 -/* B21D94 800AABF4 240D3200 */ li $t5, 12800 -/* B21D98 800AABF8 A549107C */ sh $t1, 0x107c($t2) -/* B21D9C 800AABFC 8D0C0000 */ lw $t4, ($t0) -/* B21DA0 800AAC00 240F0064 */ li $t7, 100 -/* B21DA4 800AAC04 A58B107E */ sh $t3, 0x107e($t4) -/* B21DA8 800AAC08 8D0E0000 */ lw $t6, ($t0) -/* B21DAC 800AAC0C A5CD1080 */ sh $t5, 0x1080($t6) -/* B21DB0 800AAC10 8D180000 */ lw $t8, ($t0) -/* B21DB4 800AAC14 A70F1082 */ sh $t7, 0x1082($t8) -/* B21DB8 800AAC18 8D020000 */ lw $v0, ($t0) -/* B21DBC 800AAC1C 8459107A */ lh $t9, 0x107a($v0) -.L800AAC20: -/* B21DC0 800AAC20 8449107C */ lh $t1, 0x107c($v0) -/* B21DC4 800AAC24 844A107E */ lh $t2, 0x107e($v0) -/* B21DC8 800AAC28 44992000 */ mtc1 $t9, $f4 -/* B21DCC 800AAC2C 44893000 */ mtc1 $t1, $f6 -/* B21DD0 800AAC30 448A9000 */ mtc1 $t2, $f18 -/* B21DD4 800AAC34 46802120 */ cvt.s.w $f4, $f4 -/* B21DD8 800AAC38 3C018014 */ lui $at, %hi(D_80141388) -/* B21DDC 800AAC3C C42A1388 */ lwc1 $f10, %lo(D_80141388)($at) -/* B21DE0 800AAC40 3C0142C8 */ li $at, 0x42C80000 # 0.000000 -/* B21DE4 800AAC44 2625011C */ addiu $a1, $s1, 0x11c -/* B21DE8 800AAC48 46803220 */ cvt.s.w $f8, $f6 -/* B21DEC 800AAC4C 44062000 */ mfc1 $a2, $f4 -/* B21DF0 800AAC50 46809120 */ cvt.s.w $f4, $f18 -/* B21DF4 800AAC54 44819000 */ mtc1 $at, $f18 -/* B21DF8 800AAC58 460A4403 */ div.s $f16, $f8, $f10 -/* B21DFC 800AAC5C E7A40010 */ swc1 $f4, 0x10($sp) -/* B21E00 800AAC60 844B1080 */ lh $t3, 0x1080($v0) -/* B21E04 800AAC64 448B3000 */ mtc1 $t3, $f6 -/* B21E08 800AAC68 00000000 */ nop -/* B21E0C 800AAC6C 46803220 */ cvt.s.w $f8, $f6 -/* B21E10 800AAC70 E7A80014 */ swc1 $f8, 0x14($sp) -/* B21E14 800AAC74 844C1082 */ lh $t4, 0x1082($v0) -/* B21E18 800AAC78 448C5000 */ mtc1 $t4, $f10 -/* B21E1C 800AAC7C 44078000 */ mfc1 $a3, $f16 -/* B21E20 800AAC80 46805420 */ cvt.s.w $f16, $f10 -/* B21E24 800AAC84 46128103 */ div.s $f4, $f16, $f18 -/* B21E28 800AAC88 0C0404C0 */ jal guPerspective -/* B21E2C 800AAC8C E7A40018 */ swc1 $f4, 0x18($sp) -/* B21E30 800AAC90 10000012 */ b .L800AACDC -/* B21E34 800AAC94 00000000 */ nop -/* B21E38 800AAC98 8FAD012C */ lw $t5, 0x12c($sp) -.L800AAC9C: -/* B21E3C 800AAC9C 44903000 */ mtc1 $s0, $f6 -/* B21E40 800AACA0 C624001C */ lwc1 $f4, 0x1c($s1) -/* B21E44 800AACA4 448D5000 */ mtc1 $t5, $f10 -/* B21E48 800AACA8 46803220 */ cvt.s.w $f8, $f6 -/* B21E4C 800AACAC 8E260018 */ lw $a2, 0x18($s1) -/* B21E50 800AACB0 E7A40010 */ swc1 $f4, 0x10($sp) -/* B21E54 800AACB4 C6260020 */ lwc1 $f6, 0x20($s1) -/* B21E58 800AACB8 2625011C */ addiu $a1, $s1, 0x11c -/* B21E5C 800AACBC 46805420 */ cvt.s.w $f16, $f10 -/* B21E60 800AACC0 E7A60014 */ swc1 $f6, 0x14($sp) -/* B21E64 800AACC4 C62A0024 */ lwc1 $f10, 0x24($s1) -/* B21E68 800AACC8 E7AA0018 */ swc1 $f10, 0x18($sp) -/* B21E6C 800AACCC 46104483 */ div.s $f18, $f8, $f16 -/* B21E70 800AACD0 44079000 */ mfc1 $a3, $f18 -/* B21E74 800AACD4 0C0404C0 */ jal guPerspective -/* B21E78 800AACD8 00000000 */ nop -.L800AACDC: -/* B21E7C 800AACDC 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* B21E80 800AACE0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B21E84 800AACE4 85CF03C4 */ lh $t7, 0x3c4($t6) -/* B21E88 800AACE8 31F80001 */ andi $t8, $t7, 1 -/* B21E8C 800AACEC 5300003A */ beql $t8, $zero, .L800AADD8 -/* B21E90 800AACF0 8FA50124 */ lw $a1, 0x124($sp) -/* B21E94 800AACF4 C632001C */ lwc1 $f18, 0x1c($s1) -/* B21E98 800AACF8 C6280018 */ lwc1 $f8, 0x18($s1) -/* B21E9C 800AACFC 8FB9012C */ lw $t9, 0x12c($sp) -/* B21EA0 800AAD00 46009121 */ cvt.d.s $f4, $f18 -/* B21EA4 800AAD04 44909000 */ mtc1 $s0, $f18 -/* B21EA8 800AAD08 F7A40010 */ sdc1 $f4, 0x10($sp) -/* B21EAC 800AAD0C C6260020 */ lwc1 $f6, 0x20($s1) -/* B21EB0 800AAD10 46809120 */ cvt.s.w $f4, $f18 -/* B21EB4 800AAD14 3C048014 */ lui $a0, %hi(D_80141168) -/* B21EB8 800AAD18 24841168 */ addiu $a0, %lo(D_80141168) # addiu $a0, $a0, 0x1168 -/* B21EBC 800AAD1C 460032A1 */ cvt.d.s $f10, $f6 -/* B21EC0 800AAD20 44993000 */ mtc1 $t9, $f6 -/* B21EC4 800AAD24 F7AA0018 */ sdc1 $f10, 0x18($sp) -/* B21EC8 800AAD28 46004421 */ cvt.d.s $f16, $f8 -/* B21ECC 800AAD2C 468032A0 */ cvt.s.w $f10, $f6 -/* B21ED0 800AAD30 C6280024 */ lwc1 $f8, 0x24($s1) -/* B21ED4 800AAD34 44078000 */ mfc1 $a3, $f16 -/* B21ED8 800AAD38 44068800 */ mfc1 $a2, $f17 -/* B21EDC 800AAD3C 46004421 */ cvt.d.s $f16, $f8 -/* B21EE0 800AAD40 460A2203 */ div.s $f8, $f4, $f10 -/* B21EE4 800AAD44 F7B00020 */ sdc1 $f16, 0x20($sp) -/* B21EE8 800AAD48 46004421 */ cvt.d.s $f16, $f8 -/* B21EEC 800AAD4C F7B00028 */ sdc1 $f16, 0x28($sp) -/* B21EF0 800AAD50 9629011C */ lhu $t1, 0x11c($s1) -/* B21EF4 800AAD54 0C00084C */ jal osSyncPrintf -/* B21EF8 800AAD58 AFA90030 */ sw $t1, 0x30($sp) -/* B21EFC 800AAD5C 8FA40124 */ lw $a0, 0x124($sp) -/* B21F00 800AAD60 0C03472B */ jal Matrix_MtxToMtxF -/* B21F04 800AAD64 27A500BC */ addiu $a1, $sp, 0xbc -/* B21F08 800AAD68 3C048014 */ lui $a0, %hi(D_801411A0) # $a0, 0x8014 -/* B21F0C 800AAD6C 0C00084C */ jal osSyncPrintf -/* B21F10 800AAD70 248411A0 */ addiu $a0, %lo(D_801411A0) # addiu $a0, $a0, 0x11a0 -/* B21F14 800AAD74 27B000BC */ addiu $s0, $sp, 0xbc -/* B21F18 800AAD78 C6040004 */ lwc1 $f4, 4($s0) -.L800AAD7C: -/* B21F1C 800AAD7C C6120000 */ lwc1 $f18, ($s0) -/* B21F20 800AAD80 3C048014 */ lui $a0, %hi(D_801411AC) # $a0, 0x8014 -/* B21F24 800AAD84 460022A1 */ cvt.d.s $f10, $f4 -/* B21F28 800AAD88 460091A1 */ cvt.d.s $f6, $f18 -/* B21F2C 800AAD8C F7AA0010 */ sdc1 $f10, 0x10($sp) -/* B21F30 800AAD90 C6080008 */ lwc1 $f8, 8($s0) -/* B21F34 800AAD94 44073000 */ mfc1 $a3, $f6 -/* B21F38 800AAD98 44063800 */ mfc1 $a2, $f7 -/* B21F3C 800AAD9C 46004421 */ cvt.d.s $f16, $f8 -/* B21F40 800AADA0 248411AC */ addiu $a0, %lo(D_801411AC) # addiu $a0, $a0, 0x11ac -/* B21F44 800AADA4 F7B00018 */ sdc1 $f16, 0x18($sp) -/* B21F48 800AADA8 C612000C */ lwc1 $f18, 0xc($s0) -/* B21F4C 800AADAC 460091A1 */ cvt.d.s $f6, $f18 -/* B21F50 800AADB0 0C00084C */ jal osSyncPrintf -/* B21F54 800AADB4 F7A60020 */ sdc1 $f6, 0x20($sp) -/* B21F58 800AADB8 26100010 */ addiu $s0, $s0, 0x10 -/* B21F5C 800AADBC 27AA00FC */ addiu $t2, $sp, 0xfc -/* B21F60 800AADC0 560AFFEE */ bnel $s0, $t2, .L800AAD7C -/* B21F64 800AADC4 C6040004 */ lwc1 $f4, 4($s0) -/* B21F68 800AADC8 3C048014 */ lui $a0, %hi(D_801411BC) # $a0, 0x8014 -/* B21F6C 800AADCC 0C00084C */ jal osSyncPrintf -/* B21F70 800AADD0 248411BC */ addiu $a0, %lo(D_801411BC) # addiu $a0, $a0, 0x11bc -/* B21F74 800AADD4 8FA50124 */ lw $a1, 0x124($sp) -.L800AADD8: -/* B21F78 800AADD8 02207025 */ move $t6, $s1 -/* B21F7C 800AADDC 00A06825 */ move $t5, $a1 -/* B21F80 800AADE0 24AF003C */ addiu $t7, $a1, 0x3c -.L800AADE4: -/* B21F84 800AADE4 8DAC0000 */ lw $t4, ($t5) -/* B21F88 800AADE8 25AD000C */ addiu $t5, $t5, 0xc -/* B21F8C 800AADEC 25CE000C */ addiu $t6, $t6, 0xc -/* B21F90 800AADF0 ADCC0054 */ sw $t4, 0x54($t6) -/* B21F94 800AADF4 8DABFFF8 */ lw $t3, -8($t5) -/* B21F98 800AADF8 ADCB0058 */ sw $t3, 0x58($t6) -/* B21F9C 800AADFC 8DACFFFC */ lw $t4, -4($t5) -/* B21FA0 800AAE00 15AFFFF8 */ bne $t5, $t7, .L800AADE4 -/* B21FA4 800AAE04 ADCC005C */ sw $t4, 0x5c($t6) -/* B21FA8 800AAE08 8DAC0000 */ lw $t4, ($t5) -/* B21FAC 800AAE0C 02202025 */ move $a0, $s1 -/* B21FB0 800AAE10 0C02AA24 */ jal func_800AA890 -/* B21FB4 800AAE14 ADCC0060 */ sw $t4, 0x60($t6) -/* B21FB8 800AAE18 8E4202C0 */ lw $v0, 0x2c0($s2) -/* B21FBC 800AAE1C 3C04DB0E */ lui $a0, 0xdb0e -/* B21FC0 800AAE20 3C05DA38 */ lui $a1, (0xDA380007 >> 16) # lui $a1, 0xda38 -/* B21FC4 800AAE24 24580008 */ addiu $t8, $v0, 8 -/* B21FC8 800AAE28 AE5802C0 */ sw $t8, 0x2c0($s2) -/* B21FCC 800AAE2C AC440000 */ sw $a0, ($v0) -/* B21FD0 800AAE30 9639011C */ lhu $t9, 0x11c($s1) -/* B21FD4 800AAE34 34A50007 */ ori $a1, (0xDA380007 & 0xFFFF) # ori $a1, $a1, 7 -/* B21FD8 800AAE38 AC590004 */ sw $t9, 4($v0) -/* B21FDC 800AAE3C 8E4202C0 */ lw $v0, 0x2c0($s2) -/* B21FE0 800AAE40 24490008 */ addiu $t1, $v0, 8 -/* B21FE4 800AAE44 AE4902C0 */ sw $t1, 0x2c0($s2) -/* B21FE8 800AAE48 AC450000 */ sw $a1, ($v0) -/* B21FEC 800AAE4C 8FAA0124 */ lw $t2, 0x124($sp) -/* B21FF0 800AAE50 AC4A0004 */ sw $t2, 4($v0) -/* B21FF4 800AAE54 8E4202D0 */ lw $v0, 0x2d0($s2) -/* B21FF8 800AAE58 244F0008 */ addiu $t7, $v0, 8 -/* B21FFC 800AAE5C AE4F02D0 */ sw $t7, 0x2d0($s2) -/* B22000 800AAE60 AC440000 */ sw $a0, ($v0) -/* B22004 800AAE64 962D011C */ lhu $t5, 0x11c($s1) -/* B22008 800AAE68 02402025 */ move $a0, $s2 -/* B2200C 800AAE6C AC4D0004 */ sw $t5, 4($v0) -/* B22010 800AAE70 8E4202D0 */ lw $v0, 0x2d0($s2) -/* B22014 800AAE74 244E0008 */ addiu $t6, $v0, 8 -/* B22018 800AAE78 AE4E02D0 */ sw $t6, 0x2d0($s2) -/* B2201C 800AAE7C AC450000 */ sw $a1, ($v0) -/* B22020 800AAE80 8FAB0124 */ lw $t3, 0x124($sp) -/* B22024 800AAE84 24050040 */ li $a1, 64 -/* B22028 800AAE88 0C031A73 */ jal Graph_Alloc -/* B2202C 800AAE8C AC4B0004 */ sw $t3, 4($v0) -/* B22030 800AAE90 3C048014 */ lui $a0, %hi(D_801411C0) # $a0, 0x8014 -/* B22034 800AAE94 3C068014 */ lui $a2, %hi(D_801411C8) # $a2, 0x8014 -/* B22038 800AAE98 AFA20120 */ sw $v0, 0x120($sp) -/* B2203C 800AAE9C 24C611C8 */ addiu $a2, %lo(D_801411C8) # addiu $a2, $a2, 0x11c8 -/* B22040 800AAEA0 248411C0 */ addiu $a0, %lo(D_801411C0) # addiu $a0, $a0, 0x11c0 -/* B22044 800AAEA4 00402825 */ move $a1, $v0 -/* B22048 800AAEA8 0C000B58 */ jal LogUtils_CheckNullPointer -/* B2204C 800AAEAC 2407029B */ li $a3, 667 -/* B22050 800AAEB0 C62C0028 */ lwc1 $f12, 0x28($s1) -/* B22054 800AAEB4 C6240034 */ lwc1 $f4, 0x34($s1) -/* B22058 800AAEB8 8FAC0120 */ lw $t4, 0x120($sp) -/* B2205C 800AAEBC 460C2032 */ c.eq.s $f4, $f12 -/* B22060 800AAEC0 AE2C00E4 */ sw $t4, 0xe4($s1) -/* B22064 800AAEC4 45020018 */ bc1fl .L800AAF28 -/* B22068 800AAEC8 C62E002C */ lwc1 $f14, 0x2c($s1) -/* B2206C 800AAECC C622002C */ lwc1 $f2, 0x2c($s1) -/* B22070 800AAED0 C62A0038 */ lwc1 $f10, 0x38($s1) -/* B22074 800AAED4 46025032 */ c.eq.s $f10, $f2 -/* B22078 800AAED8 00000000 */ nop -/* B2207C 800AAEDC 45020012 */ bc1fl .L800AAF28 -/* B22080 800AAEE0 C62E002C */ lwc1 $f14, 0x2c($s1) -/* B22084 800AAEE4 C62E0030 */ lwc1 $f14, 0x30($s1) -/* B22088 800AAEE8 C628003C */ lwc1 $f8, 0x3c($s1) -/* B2208C 800AAEEC 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B22090 800AAEF0 460E4032 */ c.eq.s $f8, $f14 -/* B22094 800AAEF4 00000000 */ nop -/* B22098 800AAEF8 4502000B */ bc1fl .L800AAF28 -/* B2209C 800AAEFC C62E002C */ lwc1 $f14, 0x2c($s1) -/* B220A0 800AAF00 44810000 */ mtc1 $at, $f0 -/* B220A4 800AAF04 00000000 */ nop -/* B220A8 800AAF08 46006400 */ add.s $f16, $f12, $f0 -/* B220AC 800AAF0C 46001480 */ add.s $f18, $f2, $f0 -/* B220B0 800AAF10 E6300028 */ swc1 $f16, 0x28($s1) -/* B220B4 800AAF14 C62C0028 */ lwc1 $f12, 0x28($s1) -/* B220B8 800AAF18 46007180 */ add.s $f6, $f14, $f0 -/* B220BC 800AAF1C E632002C */ swc1 $f18, 0x2c($s1) -/* B220C0 800AAF20 E6260030 */ swc1 $f6, 0x30($s1) -/* B220C4 800AAF24 C62E002C */ lwc1 $f14, 0x2c($s1) -.L800AAF28: -/* B220C8 800AAF28 0C02AF9D */ jal func_800ABE74 -/* B220CC 800AAF2C 8E260030 */ lw $a2, 0x30($s1) -/* B220D0 800AAF30 C6240034 */ lwc1 $f4, 0x34($s1) -/* B220D4 800AAF34 8E250028 */ lw $a1, 0x28($s1) -/* B220D8 800AAF38 8E26002C */ lw $a2, 0x2c($s1) -/* B220DC 800AAF3C 8E270030 */ lw $a3, 0x30($s1) -/* B220E0 800AAF40 E7A40010 */ swc1 $f4, 0x10($sp) -/* B220E4 800AAF44 C62A0038 */ lwc1 $f10, 0x38($s1) -/* B220E8 800AAF48 8FA40120 */ lw $a0, 0x120($sp) -/* B220EC 800AAF4C E7AA0014 */ swc1 $f10, 0x14($sp) -/* B220F0 800AAF50 C628003C */ lwc1 $f8, 0x3c($s1) -/* B220F4 800AAF54 E7A80018 */ swc1 $f8, 0x18($sp) -/* B220F8 800AAF58 C6300040 */ lwc1 $f16, 0x40($s1) -/* B220FC 800AAF5C E7B0001C */ swc1 $f16, 0x1c($sp) -/* B22100 800AAF60 C6320044 */ lwc1 $f18, 0x44($s1) -/* B22104 800AAF64 E7B20020 */ swc1 $f18, 0x20($sp) -/* B22108 800AAF68 C6260048 */ lwc1 $f6, 0x48($s1) -/* B2210C 800AAF6C 0C04078D */ jal func_80101E34 -/* B22110 800AAF70 E7A60024 */ swc1 $f6, 0x24($sp) -/* B22114 800AAF74 8FA60120 */ lw $a2, 0x120($sp) -/* B22118 800AAF78 02205025 */ move $t2, $s1 -/* B2211C 800AAF7C 27A50068 */ addiu $a1, $sp, 0x68 -/* B22120 800AAF80 00C04825 */ move $t1, $a2 -/* B22124 800AAF84 24CF003C */ addiu $t7, $a2, 0x3c -.L800AAF88: -/* B22128 800AAF88 8D390000 */ lw $t9, ($t1) -/* B2212C 800AAF8C 2529000C */ addiu $t1, $t1, 0xc -/* B22130 800AAF90 254A000C */ addiu $t2, $t2, 0xc -/* B22134 800AAF94 AD590094 */ sw $t9, 0x94($t2) -/* B22138 800AAF98 8D38FFF8 */ lw $t8, -8($t1) -/* B2213C 800AAF9C AD580098 */ sw $t8, 0x98($t2) -/* B22140 800AAFA0 8D39FFFC */ lw $t9, -4($t1) -/* B22144 800AAFA4 152FFFF8 */ bne $t1, $t7, .L800AAF88 -/* B22148 800AAFA8 AD59009C */ sw $t9, 0x9c($t2) -/* B2214C 800AAFAC 8D390000 */ lw $t9, ($t1) -/* B22150 800AAFB0 3C0D8016 */ lui $t5, %hi(gGameInfo) # $t5, 0x8016 -/* B22154 800AAFB4 AD5900A0 */ sw $t9, 0xa0($t2) -/* B22158 800AAFB8 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5) -/* B2215C 800AAFBC 85AE03C4 */ lh $t6, 0x3c4($t5) -/* B22160 800AAFC0 31CB0002 */ andi $t3, $t6, 2 -/* B22164 800AAFC4 51600020 */ beql $t3, $zero, .L800AB048 -/* B22168 800AAFC8 8E4202C0 */ lw $v0, 0x2c0($s2) -/* B2216C 800AAFCC 0C03472B */ jal Matrix_MtxToMtxF -/* B22170 800AAFD0 8E2400E4 */ lw $a0, 0xe4($s1) -/* B22174 800AAFD4 3C048014 */ lui $a0, %hi(D_801411D4) # $a0, 0x8014 -/* B22178 800AAFD8 0C00084C */ jal osSyncPrintf -/* B2217C 800AAFDC 248411D4 */ addiu $a0, %lo(D_801411D4) # addiu $a0, $a0, 0x11d4 -/* B22180 800AAFE0 27B00068 */ addiu $s0, $sp, 0x68 -/* B22184 800AAFE4 C6080004 */ lwc1 $f8, 4($s0) -.L800AAFE8: -/* B22188 800AAFE8 C6040000 */ lwc1 $f4, ($s0) -/* B2218C 800AAFEC 3C048014 */ lui $a0, %hi(D_801411E0) # $a0, 0x8014 -/* B22190 800AAFF0 46004421 */ cvt.d.s $f16, $f8 -/* B22194 800AAFF4 460022A1 */ cvt.d.s $f10, $f4 -/* B22198 800AAFF8 F7B00010 */ sdc1 $f16, 0x10($sp) -/* B2219C 800AAFFC C6120008 */ lwc1 $f18, 8($s0) -/* B221A0 800AB000 44075000 */ mfc1 $a3, $f10 -/* B221A4 800AB004 44065800 */ mfc1 $a2, $f11 -/* B221A8 800AB008 460091A1 */ cvt.d.s $f6, $f18 -/* B221AC 800AB00C 248411E0 */ addiu $a0, %lo(D_801411E0) # addiu $a0, $a0, 0x11e0 -/* B221B0 800AB010 F7A60018 */ sdc1 $f6, 0x18($sp) -/* B221B4 800AB014 C604000C */ lwc1 $f4, 0xc($s0) -/* B221B8 800AB018 460022A1 */ cvt.d.s $f10, $f4 -/* B221BC 800AB01C 0C00084C */ jal osSyncPrintf -/* B221C0 800AB020 F7AA0020 */ sdc1 $f10, 0x20($sp) -/* B221C4 800AB024 26100010 */ addiu $s0, $s0, 0x10 -/* B221C8 800AB028 27AC00A8 */ addiu $t4, $sp, 0xa8 -/* B221CC 800AB02C 560CFFEE */ bnel $s0, $t4, .L800AAFE8 -/* B221D0 800AB030 C6080004 */ lwc1 $f8, 4($s0) -/* B221D4 800AB034 3C048014 */ lui $a0, %hi(D_801411F0) # $a0, 0x8014 -/* B221D8 800AB038 0C00084C */ jal osSyncPrintf -/* B221DC 800AB03C 248411F0 */ addiu $a0, %lo(D_801411F0) # addiu $a0, $a0, 0x11f0 -/* B221E0 800AB040 8FA60120 */ lw $a2, 0x120($sp) -/* B221E4 800AB044 8E4202C0 */ lw $v0, 0x2c0($s2) -.L800AB048: -/* B221E8 800AB048 3C04DA38 */ lui $a0, (0xDA380005 >> 16) # lui $a0, 0xda38 -/* B221EC 800AB04C 34840005 */ ori $a0, (0xDA380005 & 0xFFFF) # ori $a0, $a0, 5 -/* B221F0 800AB050 244F0008 */ addiu $t7, $v0, 8 -/* B221F4 800AB054 AE4F02C0 */ sw $t7, 0x2c0($s2) -/* B221F8 800AB058 AC460004 */ sw $a2, 4($v0) -/* B221FC 800AB05C AC440000 */ sw $a0, ($v0) -/* B22200 800AB060 8E4202D0 */ lw $v0, 0x2d0($s2) -/* B22204 800AB064 02402825 */ move $a1, $s2 -/* B22208 800AB068 240702C7 */ li $a3, 711 -/* B2220C 800AB06C 24490008 */ addiu $t1, $v0, 8 -/* B22210 800AB070 AE4902D0 */ sw $t1, 0x2d0($s2) -/* B22214 800AB074 AC460004 */ sw $a2, 4($v0) -/* B22218 800AB078 3C068014 */ lui $a2, %hi(D_801411F4) # $a2, 0x8014 -/* B2221C 800AB07C AC440000 */ sw $a0, ($v0) -/* B22220 800AB080 27A40108 */ addiu $a0, $sp, 0x108 -/* B22224 800AB084 0C031AD5 */ jal Graph_CloseDisps -/* B22228 800AB088 24C611F4 */ addiu $a2, %lo(D_801411F4) # addiu $a2, $a2, 0x11f4 -/* B2222C 800AB08C 8FBF004C */ lw $ra, 0x4c($sp) -/* B22230 800AB090 8FB00040 */ lw $s0, 0x40($sp) -/* B22234 800AB094 8FB10044 */ lw $s1, 0x44($sp) -/* B22238 800AB098 8FB20048 */ lw $s2, 0x48($sp) -/* B2223C 800AB09C 27BD0138 */ addiu $sp, $sp, 0x138 -/* B22240 800AB0A0 03E00008 */ jr $ra -/* B22244 800AB0A4 24020001 */ li $v0, 1 - diff --git a/asm/non_matchings/code/z_view/func_800AB2C4.s b/asm/non_matchings/code/z_view/func_800AB2C4.s deleted file mode 100644 index 3b5574356c..0000000000 --- a/asm/non_matchings/code/z_view/func_800AB2C4.s +++ /dev/null @@ -1,196 +0,0 @@ -.rdata -glabel D_80141240 - .asciz "../z_view.c" - .balign 4 - -glabel D_8014124C - .asciz "vp" - .balign 4 - -glabel D_80141250 - .asciz "../z_view.c" - .balign 4 - -glabel D_8014125C - .asciz "projection" - .balign 4 - -glabel D_80141268 - .asciz "../z_view.c" - .balign 4 - -glabel D_80141274 - .asciz "../z_view.c" - .balign 4 - -.text -glabel func_800AB2C4 -/* B22464 800AB2C4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* B22468 800AB2C8 AFBF0034 */ sw $ra, 0x34($sp) -/* B2246C 800AB2CC AFB20030 */ sw $s2, 0x30($sp) -/* B22470 800AB2D0 AFB1002C */ sw $s1, 0x2c($sp) -/* B22474 800AB2D4 AFB00028 */ sw $s0, 0x28($sp) -/* B22478 800AB2D8 8C900004 */ lw $s0, 4($a0) -/* B2247C 800AB2DC 00809025 */ move $s2, $a0 -/* B22480 800AB2E0 3C068014 */ lui $a2, %hi(D_80141240) # $a2, 0x8014 -/* B22484 800AB2E4 24C61240 */ addiu $a2, %lo(D_80141240) # addiu $a2, $a2, 0x1240 -/* B22488 800AB2E8 27A40050 */ addiu $a0, $sp, 0x50 -/* B2248C 800AB2EC 24070309 */ li $a3, 777 -/* B22490 800AB2F0 0C031AB1 */ jal Graph_OpenDisps -/* B22494 800AB2F4 02002825 */ move $a1, $s0 -/* B22498 800AB2F8 02002025 */ move $a0, $s0 -/* B2249C 800AB2FC 0C031A73 */ jal Graph_Alloc -/* B224A0 800AB300 24050010 */ li $a1, 16 -/* B224A4 800AB304 3C048014 */ lui $a0, %hi(D_8014124C) # $a0, 0x8014 -/* B224A8 800AB308 3C068014 */ lui $a2, %hi(D_80141250) # $a2, 0x8014 -/* B224AC 800AB30C 00408825 */ move $s1, $v0 -/* B224B0 800AB310 24C61250 */ addiu $a2, %lo(D_80141250) # addiu $a2, $a2, 0x1250 -/* B224B4 800AB314 2484124C */ addiu $a0, %lo(D_8014124C) # addiu $a0, $a0, 0x124c -/* B224B8 800AB318 00402825 */ move $a1, $v0 -/* B224BC 800AB31C 0C000B58 */ jal LogUtils_CheckNullPointer -/* B224C0 800AB320 2407030D */ li $a3, 781 -/* B224C4 800AB324 02202025 */ move $a0, $s1 -/* B224C8 800AB328 0C02A864 */ jal func_800AA190 -/* B224CC 800AB32C 26450008 */ addiu $a1, $s2, 8 -/* B224D0 800AB330 8E2F0000 */ lw $t7, ($s1) -/* B224D4 800AB334 3C19E700 */ lui $t9, 0xe700 -/* B224D8 800AB338 3C014080 */ li $at, 0x40800000 # 0.000000 -/* B224DC 800AB33C AE4F0050 */ sw $t7, 0x50($s2) -/* B224E0 800AB340 8E2E0004 */ lw $t6, 4($s1) -/* B224E4 800AB344 44810000 */ mtc1 $at, $f0 -/* B224E8 800AB348 3C01ED00 */ lui $at, 0xed00 -/* B224EC 800AB34C AE4E0054 */ sw $t6, 0x54($s2) -/* B224F0 800AB350 8E2F0008 */ lw $t7, 8($s1) -/* B224F4 800AB354 02002025 */ move $a0, $s0 -/* B224F8 800AB358 24050040 */ li $a1, 64 -/* B224FC 800AB35C AE4F0058 */ sw $t7, 0x58($s2) -/* B22500 800AB360 8E2E000C */ lw $t6, 0xc($s1) -/* B22504 800AB364 AE4E005C */ sw $t6, 0x5c($s2) -/* B22508 800AB368 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B2250C 800AB36C 24580008 */ addiu $t8, $v0, 8 -/* B22510 800AB370 AE1802B0 */ sw $t8, 0x2b0($s0) -/* B22514 800AB374 AC400004 */ sw $zero, 4($v0) -/* B22518 800AB378 AC590000 */ sw $t9, ($v0) -/* B2251C 800AB37C 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B22520 800AB380 24480008 */ addiu $t0, $v0, 8 -/* B22524 800AB384 AE0802B0 */ sw $t0, 0x2b0($s0) -/* B22528 800AB388 8E490010 */ lw $t1, 0x10($s2) -/* B2252C 800AB38C 8E4F0008 */ lw $t7, 8($s2) -/* B22530 800AB390 44892000 */ mtc1 $t1, $f4 -/* B22534 800AB394 448F8000 */ mtc1 $t7, $f16 -/* B22538 800AB398 468021A0 */ cvt.s.w $f6, $f4 -/* B2253C 800AB39C 468084A0 */ cvt.s.w $f18, $f16 -/* B22540 800AB3A0 46003202 */ mul.s $f8, $f6, $f0 -/* B22544 800AB3A4 00000000 */ nop -/* B22548 800AB3A8 46009102 */ mul.s $f4, $f18, $f0 -/* B2254C 800AB3AC 4600428D */ trunc.w.s $f10, $f8 -/* B22550 800AB3B0 4600218D */ trunc.w.s $f6, $f4 -/* B22554 800AB3B4 440B5000 */ mfc1 $t3, $f10 -/* B22558 800AB3B8 44193000 */ mfc1 $t9, $f6 -/* B2255C 800AB3BC 316C0FFF */ andi $t4, $t3, 0xfff -/* B22560 800AB3C0 000C6B00 */ sll $t5, $t4, 0xc -/* B22564 800AB3C4 01A17025 */ or $t6, $t5, $at -/* B22568 800AB3C8 33280FFF */ andi $t0, $t9, 0xfff -/* B2256C 800AB3CC 01C84825 */ or $t1, $t6, $t0 -/* B22570 800AB3D0 AC490000 */ sw $t1, ($v0) -/* B22574 800AB3D4 8E4A0014 */ lw $t2, 0x14($s2) -/* B22578 800AB3D8 8E58000C */ lw $t8, 0xc($s2) -/* B2257C 800AB3DC 3C0BDC08 */ li $t3, 0xDC080000 # 0.000000 -/* B22580 800AB3E0 448A4000 */ mtc1 $t2, $f8 -/* B22584 800AB3E4 44982000 */ mtc1 $t8, $f4 -/* B22588 800AB3E8 356B0008 */ ori $t3, $t3, 8 -/* B2258C 800AB3EC 468042A0 */ cvt.s.w $f10, $f8 -/* B22590 800AB3F0 468021A0 */ cvt.s.w $f6, $f4 -/* B22594 800AB3F4 46005402 */ mul.s $f16, $f10, $f0 -/* B22598 800AB3F8 00000000 */ nop -/* B2259C 800AB3FC 46003202 */ mul.s $f8, $f6, $f0 -/* B225A0 800AB400 4600848D */ trunc.w.s $f18, $f16 -/* B225A4 800AB404 4600428D */ trunc.w.s $f10, $f8 -/* B225A8 800AB408 440C9000 */ mfc1 $t4, $f18 -/* B225AC 800AB40C 440E5000 */ mfc1 $t6, $f10 -/* B225B0 800AB410 318D0FFF */ andi $t5, $t4, 0xfff -/* B225B4 800AB414 000D7B00 */ sll $t7, $t5, 0xc -/* B225B8 800AB418 31C80FFF */ andi $t0, $t6, 0xfff -/* B225BC 800AB41C 01E84825 */ or $t1, $t7, $t0 -/* B225C0 800AB420 AC490004 */ sw $t1, 4($v0) -/* B225C4 800AB424 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B225C8 800AB428 244A0008 */ addiu $t2, $v0, 8 -/* B225CC 800AB42C AE0A02B0 */ sw $t2, 0x2b0($s0) -/* B225D0 800AB430 AC510004 */ sw $s1, 4($v0) -/* B225D4 800AB434 0C031A73 */ jal Graph_Alloc -/* B225D8 800AB438 AC4B0000 */ sw $t3, ($v0) -/* B225DC 800AB43C 3C048014 */ lui $a0, %hi(D_8014125C) # $a0, 0x8014 -/* B225E0 800AB440 3C068014 */ lui $a2, %hi(D_80141268) # $a2, 0x8014 -/* B225E4 800AB444 00408825 */ move $s1, $v0 -/* B225E8 800AB448 24C61268 */ addiu $a2, %lo(D_80141268) # addiu $a2, $a2, 0x1268 -/* B225EC 800AB44C 2484125C */ addiu $a0, %lo(D_8014125C) # addiu $a0, $a0, 0x125c -/* B225F0 800AB450 00402825 */ move $a1, $v0 -/* B225F4 800AB454 0C000B58 */ jal LogUtils_CheckNullPointer -/* B225F8 800AB458 24070317 */ li $a3, 791 -/* B225FC 800AB45C AE5100E0 */ sw $s1, 0xe0($s2) -/* B22600 800AB460 3C0C8013 */ lui $t4, %hi(gScreenWidth) -/* B22604 800AB464 8D8CD270 */ lw $t4, %lo(gScreenWidth)($t4) -/* B22608 800AB468 3C0D8013 */ lui $t5, %hi(gScreenHeight) -/* B2260C 800AB46C 8DADD274 */ lw $t5, %lo(gScreenHeight)($t5) -/* B22610 800AB470 448C8000 */ mtc1 $t4, $f16 -/* B22614 800AB474 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B22618 800AB478 448D4000 */ mtc1 $t5, $f8 -/* B2261C 800AB47C 46808020 */ cvt.s.w $f0, $f16 -/* B22620 800AB480 44816000 */ mtc1 $at, $f12 -/* B22624 800AB484 02202025 */ move $a0, $s1 -/* B22628 800AB488 468040A0 */ cvt.s.w $f2, $f8 -/* B2262C 800AB48C 46000487 */ neg.s $f18, $f0 -/* B22630 800AB490 46001287 */ neg.s $f10, $f2 -/* B22634 800AB494 460C9102 */ mul.s $f4, $f18, $f12 -/* B22638 800AB498 00000000 */ nop -/* B2263C 800AB49C 460C0182 */ mul.s $f6, $f0, $f12 -/* B22640 800AB4A0 00000000 */ nop -/* B22644 800AB4A4 460C5402 */ mul.s $f16, $f10, $f12 -/* B22648 800AB4A8 44052000 */ mfc1 $a1, $f4 -/* B2264C 800AB4AC 460C1482 */ mul.s $f18, $f2, $f12 -/* B22650 800AB4B0 44063000 */ mfc1 $a2, $f6 -/* B22654 800AB4B4 44078000 */ mfc1 $a3, $f16 -/* B22658 800AB4B8 E7B20010 */ swc1 $f18, 0x10($sp) -/* B2265C 800AB4BC C644001C */ lwc1 $f4, 0x1c($s2) -/* B22660 800AB4C0 E7A40014 */ swc1 $f4, 0x14($sp) -/* B22664 800AB4C4 C6460020 */ lwc1 $f6, 0x20($s2) -/* B22668 800AB4C8 E7A60018 */ swc1 $f6, 0x18($sp) -/* B2266C 800AB4CC C6480024 */ lwc1 $f8, 0x24($s2) -/* B22670 800AB4D0 0C041169 */ jal func_801045A4 -/* B22674 800AB4D4 E7A8001C */ swc1 $f8, 0x1c($sp) -/* B22678 800AB4D8 02207025 */ move $t6, $s1 -/* B2267C 800AB4DC 02407825 */ move $t7, $s2 -/* B22680 800AB4E0 2628003C */ addiu $t0, $s1, 0x3c -.L800AB4E4: -/* B22684 800AB4E4 8DD90000 */ lw $t9, ($t6) -/* B22688 800AB4E8 25CE000C */ addiu $t6, $t6, 0xc -/* B2268C 800AB4EC 25EF000C */ addiu $t7, $t7, 0xc -/* B22690 800AB4F0 ADF90054 */ sw $t9, 0x54($t7) -/* B22694 800AB4F4 8DD8FFF8 */ lw $t8, -8($t6) -/* B22698 800AB4F8 ADF80058 */ sw $t8, 0x58($t7) -/* B2269C 800AB4FC 8DD9FFFC */ lw $t9, -4($t6) -/* B226A0 800AB500 15C8FFF8 */ bne $t6, $t0, .L800AB4E4 -/* B226A4 800AB504 ADF9005C */ sw $t9, 0x5c($t7) -/* B226A8 800AB508 8DD90000 */ lw $t9, ($t6) -/* B226AC 800AB50C 3C0ADA38 */ lui $t2, (0xDA380007 >> 16) # lui $t2, 0xda38 -/* B226B0 800AB510 354A0007 */ ori $t2, (0xDA380007 & 0xFFFF) # ori $t2, $t2, 7 -/* B226B4 800AB514 ADF90060 */ sw $t9, 0x60($t7) -/* B226B8 800AB518 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B226BC 800AB51C 3C068014 */ lui $a2, %hi(D_80141274) # $a2, 0x8014 -/* B226C0 800AB520 24C61274 */ addiu $a2, %lo(D_80141274) # addiu $a2, $a2, 0x1274 -/* B226C4 800AB524 24490008 */ addiu $t1, $v0, 8 -/* B226C8 800AB528 AE0902B0 */ sw $t1, 0x2b0($s0) -/* B226CC 800AB52C 27A40050 */ addiu $a0, $sp, 0x50 -/* B226D0 800AB530 02002825 */ move $a1, $s0 -/* B226D4 800AB534 24070321 */ li $a3, 801 -/* B226D8 800AB538 AC510004 */ sw $s1, 4($v0) -/* B226DC 800AB53C 0C031AD5 */ jal Graph_CloseDisps -/* B226E0 800AB540 AC4A0000 */ sw $t2, ($v0) -/* B226E4 800AB544 8FBF0034 */ lw $ra, 0x34($sp) -/* B226E8 800AB548 8FB00028 */ lw $s0, 0x28($sp) -/* B226EC 800AB54C 8FB1002C */ lw $s1, 0x2c($sp) -/* B226F0 800AB550 8FB20030 */ lw $s2, 0x30($sp) -/* B226F4 800AB554 27BD0070 */ addiu $sp, $sp, 0x70 -/* B226F8 800AB558 03E00008 */ jr $ra -/* B226FC 800AB55C 24020001 */ li $v0, 1 - diff --git a/asm/non_matchings/code/z_view/func_800AB560.s b/asm/non_matchings/code/z_view/func_800AB560.s deleted file mode 100644 index 445bb178dc..0000000000 --- a/asm/non_matchings/code/z_view/func_800AB560.s +++ /dev/null @@ -1,288 +0,0 @@ -.rdata -glabel D_80141280 - .asciz "../z_view.c" - .balign 4 - -glabel D_8014128C - .asciz "vp" - .balign 4 - -glabel D_80141290 - .asciz "../z_view.c" - .balign 4 - -glabel D_8014129C - .asciz "projection" - .balign 4 - -glabel D_801412A8 - .asciz "../z_view.c" - .balign 4 - -glabel D_801412B4 - .asciz "viewing" - .balign 4 - -glabel D_801412BC - .asciz "../z_view.c" - .balign 4 - -glabel D_801412C8 - .asciz "../z_view.c" - .balign 4 - -.text -glabel func_800AB560 -/* B22700 800AB560 27BDFF68 */ addiu $sp, $sp, -0x98 -/* B22704 800AB564 AFBF0034 */ sw $ra, 0x34($sp) -/* B22708 800AB568 AFB10030 */ sw $s1, 0x30($sp) -/* B2270C 800AB56C AFB0002C */ sw $s0, 0x2c($sp) -/* B22710 800AB570 8C910004 */ lw $s1, 4($a0) -/* B22714 800AB574 00808025 */ move $s0, $a0 -/* B22718 800AB578 3C068014 */ lui $a2, %hi(D_80141280) # $a2, 0x8014 -/* B2271C 800AB57C 24C61280 */ addiu $a2, %lo(D_80141280) # addiu $a2, $a2, 0x1280 -/* B22720 800AB580 27A40060 */ addiu $a0, $sp, 0x60 -/* B22724 800AB584 24070330 */ li $a3, 816 -/* B22728 800AB588 0C031AB1 */ jal Graph_OpenDisps -/* B2272C 800AB58C 02202825 */ move $a1, $s1 -/* B22730 800AB590 02202025 */ move $a0, $s1 -/* B22734 800AB594 0C031A73 */ jal Graph_Alloc -/* B22738 800AB598 24050010 */ li $a1, 16 -/* B2273C 800AB59C 3C048014 */ lui $a0, %hi(D_8014128C) # $a0, 0x8014 -/* B22740 800AB5A0 3C068014 */ lui $a2, %hi(D_80141290) # $a2, 0x8014 -/* B22744 800AB5A4 AFA20080 */ sw $v0, 0x80($sp) -/* B22748 800AB5A8 24C61290 */ addiu $a2, %lo(D_80141290) # addiu $a2, $a2, 0x1290 -/* B2274C 800AB5AC 2484128C */ addiu $a0, %lo(D_8014128C) # addiu $a0, $a0, 0x128c -/* B22750 800AB5B0 00402825 */ move $a1, $v0 -/* B22754 800AB5B4 0C000B58 */ jal LogUtils_CheckNullPointer -/* B22758 800AB5B8 24070335 */ li $a3, 821 -/* B2275C 800AB5BC 8FA40080 */ lw $a0, 0x80($sp) -/* B22760 800AB5C0 0C02A864 */ jal func_800AA190 -/* B22764 800AB5C4 26050008 */ addiu $a1, $s0, 8 -/* B22768 800AB5C8 8FA40080 */ lw $a0, 0x80($sp) -/* B2276C 800AB5CC 3C19E700 */ lui $t9, 0xe700 -/* B22770 800AB5D0 3C014080 */ li $at, 0x40800000 # 0.000000 -/* B22774 800AB5D4 8C8F0000 */ lw $t7, ($a0) -/* B22778 800AB5D8 44810000 */ mtc1 $at, $f0 -/* B2277C 800AB5DC 3C01ED00 */ lui $at, 0xed00 -/* B22780 800AB5E0 AE0F0050 */ sw $t7, 0x50($s0) -/* B22784 800AB5E4 8C8E0004 */ lw $t6, 4($a0) -/* B22788 800AB5E8 24050040 */ li $a1, 64 -/* B2278C 800AB5EC AE0E0054 */ sw $t6, 0x54($s0) -/* B22790 800AB5F0 8C8F0008 */ lw $t7, 8($a0) -/* B22794 800AB5F4 AE0F0058 */ sw $t7, 0x58($s0) -/* B22798 800AB5F8 8C8E000C */ lw $t6, 0xc($a0) -/* B2279C 800AB5FC AE0E005C */ sw $t6, 0x5c($s0) -/* B227A0 800AB600 8E2202B0 */ lw $v0, 0x2b0($s1) -/* B227A4 800AB604 24580008 */ addiu $t8, $v0, 8 -/* B227A8 800AB608 AE3802B0 */ sw $t8, 0x2b0($s1) -/* B227AC 800AB60C AC400004 */ sw $zero, 4($v0) -/* B227B0 800AB610 AC590000 */ sw $t9, ($v0) -/* B227B4 800AB614 8E2202B0 */ lw $v0, 0x2b0($s1) -/* B227B8 800AB618 24480008 */ addiu $t0, $v0, 8 -/* B227BC 800AB61C AE2802B0 */ sw $t0, 0x2b0($s1) -/* B227C0 800AB620 8E090010 */ lw $t1, 0x10($s0) -/* B227C4 800AB624 8E0F0008 */ lw $t7, 8($s0) -/* B227C8 800AB628 44892000 */ mtc1 $t1, $f4 -/* B227CC 800AB62C 448F8000 */ mtc1 $t7, $f16 -/* B227D0 800AB630 468021A0 */ cvt.s.w $f6, $f4 -/* B227D4 800AB634 468084A0 */ cvt.s.w $f18, $f16 -/* B227D8 800AB638 46003202 */ mul.s $f8, $f6, $f0 -/* B227DC 800AB63C 00000000 */ nop -/* B227E0 800AB640 46009102 */ mul.s $f4, $f18, $f0 -/* B227E4 800AB644 4600428D */ trunc.w.s $f10, $f8 -/* B227E8 800AB648 4600218D */ trunc.w.s $f6, $f4 -/* B227EC 800AB64C 440B5000 */ mfc1 $t3, $f10 -/* B227F0 800AB650 44193000 */ mfc1 $t9, $f6 -/* B227F4 800AB654 316C0FFF */ andi $t4, $t3, 0xfff -/* B227F8 800AB658 000C6B00 */ sll $t5, $t4, 0xc -/* B227FC 800AB65C 01A17025 */ or $t6, $t5, $at -/* B22800 800AB660 33280FFF */ andi $t0, $t9, 0xfff -/* B22804 800AB664 01C84825 */ or $t1, $t6, $t0 -/* B22808 800AB668 AC490000 */ sw $t1, ($v0) -/* B2280C 800AB66C 8E0A0014 */ lw $t2, 0x14($s0) -/* B22810 800AB670 8E18000C */ lw $t8, 0xc($s0) -/* B22814 800AB674 3C0BDC08 */ li $t3, 0xDC080000 # 0.000000 -/* B22818 800AB678 448A4000 */ mtc1 $t2, $f8 -/* B2281C 800AB67C 44982000 */ mtc1 $t8, $f4 -/* B22820 800AB680 356B0008 */ ori $t3, $t3, 8 -/* B22824 800AB684 468042A0 */ cvt.s.w $f10, $f8 -/* B22828 800AB688 468021A0 */ cvt.s.w $f6, $f4 -/* B2282C 800AB68C 46005402 */ mul.s $f16, $f10, $f0 -/* B22830 800AB690 00000000 */ nop -/* B22834 800AB694 46003202 */ mul.s $f8, $f6, $f0 -/* B22838 800AB698 4600848D */ trunc.w.s $f18, $f16 -/* B2283C 800AB69C 4600428D */ trunc.w.s $f10, $f8 -/* B22840 800AB6A0 440C9000 */ mfc1 $t4, $f18 -/* B22844 800AB6A4 440E5000 */ mfc1 $t6, $f10 -/* B22848 800AB6A8 318D0FFF */ andi $t5, $t4, 0xfff -/* B2284C 800AB6AC 000D7B00 */ sll $t7, $t5, 0xc -/* B22850 800AB6B0 31C80FFF */ andi $t0, $t6, 0xfff -/* B22854 800AB6B4 01E84825 */ or $t1, $t7, $t0 -/* B22858 800AB6B8 AC490004 */ sw $t1, 4($v0) -/* B2285C 800AB6BC 8E2202B0 */ lw $v0, 0x2b0($s1) -/* B22860 800AB6C0 244A0008 */ addiu $t2, $v0, 8 -/* B22864 800AB6C4 AE2A02B0 */ sw $t2, 0x2b0($s1) -/* B22868 800AB6C8 AC440004 */ sw $a0, 4($v0) -/* B2286C 800AB6CC 02202025 */ move $a0, $s1 -/* B22870 800AB6D0 0C031A73 */ jal Graph_Alloc -/* B22874 800AB6D4 AC4B0000 */ sw $t3, ($v0) -/* B22878 800AB6D8 3C048014 */ lui $a0, %hi(D_8014129C) # $a0, 0x8014 -/* B2287C 800AB6DC 3C068014 */ lui $a2, %hi(D_801412A8) # $a2, 0x8014 -/* B22880 800AB6E0 AFA2007C */ sw $v0, 0x7c($sp) -/* B22884 800AB6E4 24C612A8 */ addiu $a2, %lo(D_801412A8) # addiu $a2, $a2, 0x12a8 -/* B22888 800AB6E8 2484129C */ addiu $a0, %lo(D_8014129C) # addiu $a0, $a0, 0x129c -/* B2288C 800AB6EC 00402825 */ move $a1, $v0 -/* B22890 800AB6F0 0C000B58 */ jal LogUtils_CheckNullPointer -/* B22894 800AB6F4 24070341 */ li $a3, 833 -/* B22898 800AB6F8 8E0C0014 */ lw $t4, 0x14($s0) -/* B2289C 800AB6FC 8E0D0010 */ lw $t5, 0x10($s0) -/* B228A0 800AB700 8E18000C */ lw $t8, 0xc($s0) -/* B228A4 800AB704 8E190008 */ lw $t9, 8($s0) -/* B228A8 800AB708 018D1023 */ subu $v0, $t4, $t5 -/* B228AC 800AB70C 44828000 */ mtc1 $v0, $f16 -/* B228B0 800AB710 03191823 */ subu $v1, $t8, $t9 -/* B228B4 800AB714 44832000 */ mtc1 $v1, $f4 -/* B228B8 800AB718 468084A0 */ cvt.s.w $f18, $f16 -/* B228BC 800AB71C 8FA4007C */ lw $a0, 0x7c($sp) -/* B228C0 800AB720 C60A001C */ lwc1 $f10, 0x1c($s0) -/* B228C4 800AB724 8E060018 */ lw $a2, 0x18($s0) -/* B228C8 800AB728 AE0400E0 */ sw $a0, 0xe0($s0) -/* B228CC 800AB72C 468021A0 */ cvt.s.w $f6, $f4 -/* B228D0 800AB730 E7AA0010 */ swc1 $f10, 0x10($sp) -/* B228D4 800AB734 C6100020 */ lwc1 $f16, 0x20($s0) -/* B228D8 800AB738 2605011C */ addiu $a1, $s0, 0x11c -/* B228DC 800AB73C E7B00014 */ swc1 $f16, 0x14($sp) -/* B228E0 800AB740 46069203 */ div.s $f8, $f18, $f6 -/* B228E4 800AB744 C6040024 */ lwc1 $f4, 0x24($s0) -/* B228E8 800AB748 E7A40018 */ swc1 $f4, 0x18($sp) -/* B228EC 800AB74C 44074000 */ mfc1 $a3, $f8 -/* B228F0 800AB750 0C0404C0 */ jal guPerspective -/* B228F4 800AB754 00000000 */ nop -/* B228F8 800AB758 8FA4007C */ lw $a0, 0x7c($sp) -/* B228FC 800AB75C 02004825 */ move $t1, $s0 -/* B22900 800AB760 00804025 */ move $t0, $a0 -/* B22904 800AB764 248A003C */ addiu $t2, $a0, 0x3c -.L800AB768: -/* B22908 800AB768 8D0F0000 */ lw $t7, ($t0) -/* B2290C 800AB76C 2508000C */ addiu $t0, $t0, 0xc -/* B22910 800AB770 2529000C */ addiu $t1, $t1, 0xc -/* B22914 800AB774 AD2F0054 */ sw $t7, 0x54($t1) -/* B22918 800AB778 8D0EFFF8 */ lw $t6, -8($t0) -/* B2291C 800AB77C AD2E0058 */ sw $t6, 0x58($t1) -/* B22920 800AB780 8D0FFFFC */ lw $t7, -4($t0) -/* B22924 800AB784 150AFFF8 */ bne $t0, $t2, .L800AB768 -/* B22928 800AB788 AD2F005C */ sw $t7, 0x5c($t1) -/* B2292C 800AB78C 8D0F0000 */ lw $t7, ($t0) -/* B22930 800AB790 3C0CDB0E */ lui $t4, 0xdb0e -/* B22934 800AB794 3C19DA38 */ lui $t9, (0xDA380007 >> 16) # lui $t9, 0xda38 -/* B22938 800AB798 AD2F0060 */ sw $t7, 0x60($t1) -/* B2293C 800AB79C 8E2202B0 */ lw $v0, 0x2b0($s1) -/* B22940 800AB7A0 37390007 */ ori $t9, (0xDA380007 & 0xFFFF) # ori $t9, $t9, 7 -/* B22944 800AB7A4 24050040 */ li $a1, 64 -/* B22948 800AB7A8 244B0008 */ addiu $t3, $v0, 8 -/* B2294C 800AB7AC AE2B02B0 */ sw $t3, 0x2b0($s1) -/* B22950 800AB7B0 AC4C0000 */ sw $t4, ($v0) -/* B22954 800AB7B4 960D011C */ lhu $t5, 0x11c($s0) -/* B22958 800AB7B8 AC4D0004 */ sw $t5, 4($v0) -/* B2295C 800AB7BC 8E2202B0 */ lw $v0, 0x2b0($s1) -/* B22960 800AB7C0 24580008 */ addiu $t8, $v0, 8 -/* B22964 800AB7C4 AE3802B0 */ sw $t8, 0x2b0($s1) -/* B22968 800AB7C8 AC440004 */ sw $a0, 4($v0) -/* B2296C 800AB7CC 02202025 */ move $a0, $s1 -/* B22970 800AB7D0 0C031A73 */ jal Graph_Alloc -/* B22974 800AB7D4 AC590000 */ sw $t9, ($v0) -/* B22978 800AB7D8 3C048014 */ lui $a0, %hi(D_801412B4) # $a0, 0x8014 -/* B2297C 800AB7DC 3C068014 */ lui $a2, %hi(D_801412BC) # $a2, 0x8014 -/* B22980 800AB7E0 AFA20078 */ sw $v0, 0x78($sp) -/* B22984 800AB7E4 24C612BC */ addiu $a2, %lo(D_801412BC) # addiu $a2, $a2, 0x12bc -/* B22988 800AB7E8 248412B4 */ addiu $a0, %lo(D_801412B4) # addiu $a0, $a0, 0x12b4 -/* B2298C 800AB7EC 00402825 */ move $a1, $v0 -/* B22990 800AB7F0 0C000B58 */ jal LogUtils_CheckNullPointer -/* B22994 800AB7F4 24070350 */ li $a3, 848 -/* B22998 800AB7F8 C60C0028 */ lwc1 $f12, 0x28($s0) -/* B2299C 800AB7FC C6120034 */ lwc1 $f18, 0x34($s0) -/* B229A0 800AB800 8FAA0078 */ lw $t2, 0x78($sp) -/* B229A4 800AB804 460C9032 */ c.eq.s $f18, $f12 -/* B229A8 800AB808 AE0A00E4 */ sw $t2, 0xe4($s0) -/* B229AC 800AB80C 45020018 */ bc1fl .L800AB870 -/* B229B0 800AB810 C60E002C */ lwc1 $f14, 0x2c($s0) -/* B229B4 800AB814 C602002C */ lwc1 $f2, 0x2c($s0) -/* B229B8 800AB818 C6060038 */ lwc1 $f6, 0x38($s0) -/* B229BC 800AB81C 46023032 */ c.eq.s $f6, $f2 -/* B229C0 800AB820 00000000 */ nop -/* B229C4 800AB824 45020012 */ bc1fl .L800AB870 -/* B229C8 800AB828 C60E002C */ lwc1 $f14, 0x2c($s0) -/* B229CC 800AB82C C60E0030 */ lwc1 $f14, 0x30($s0) -/* B229D0 800AB830 C608003C */ lwc1 $f8, 0x3c($s0) -/* B229D4 800AB834 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B229D8 800AB838 460E4032 */ c.eq.s $f8, $f14 -/* B229DC 800AB83C 00000000 */ nop -/* B229E0 800AB840 4502000B */ bc1fl .L800AB870 -/* B229E4 800AB844 C60E002C */ lwc1 $f14, 0x2c($s0) -/* B229E8 800AB848 44810000 */ mtc1 $at, $f0 -/* B229EC 800AB84C 00000000 */ nop -/* B229F0 800AB850 46006280 */ add.s $f10, $f12, $f0 -/* B229F4 800AB854 46001400 */ add.s $f16, $f2, $f0 -/* B229F8 800AB858 E60A0028 */ swc1 $f10, 0x28($s0) -/* B229FC 800AB85C C60C0028 */ lwc1 $f12, 0x28($s0) -/* B22A00 800AB860 46007100 */ add.s $f4, $f14, $f0 -/* B22A04 800AB864 E610002C */ swc1 $f16, 0x2c($s0) -/* B22A08 800AB868 E6040030 */ swc1 $f4, 0x30($s0) -/* B22A0C 800AB86C C60E002C */ lwc1 $f14, 0x2c($s0) -.L800AB870: -/* B22A10 800AB870 0C02AF9D */ jal func_800ABE74 -/* B22A14 800AB874 8E060030 */ lw $a2, 0x30($s0) -/* B22A18 800AB878 C6120034 */ lwc1 $f18, 0x34($s0) -/* B22A1C 800AB87C 8E050028 */ lw $a1, 0x28($s0) -/* B22A20 800AB880 8E06002C */ lw $a2, 0x2c($s0) -/* B22A24 800AB884 8E070030 */ lw $a3, 0x30($s0) -/* B22A28 800AB888 E7B20010 */ swc1 $f18, 0x10($sp) -/* B22A2C 800AB88C C6060038 */ lwc1 $f6, 0x38($s0) -/* B22A30 800AB890 8FA40078 */ lw $a0, 0x78($sp) -/* B22A34 800AB894 E7A60014 */ swc1 $f6, 0x14($sp) -/* B22A38 800AB898 C608003C */ lwc1 $f8, 0x3c($s0) -/* B22A3C 800AB89C E7A80018 */ swc1 $f8, 0x18($sp) -/* B22A40 800AB8A0 C60A0040 */ lwc1 $f10, 0x40($s0) -/* B22A44 800AB8A4 E7AA001C */ swc1 $f10, 0x1c($sp) -/* B22A48 800AB8A8 C6100044 */ lwc1 $f16, 0x44($s0) -/* B22A4C 800AB8AC E7B00020 */ swc1 $f16, 0x20($sp) -/* B22A50 800AB8B0 C6040048 */ lwc1 $f4, 0x48($s0) -/* B22A54 800AB8B4 0C04078D */ jal func_80101E34 -/* B22A58 800AB8B8 E7A40024 */ swc1 $f4, 0x24($sp) -/* B22A5C 800AB8BC 8FA40078 */ lw $a0, 0x78($sp) -/* B22A60 800AB8C0 02007825 */ move $t7, $s0 -/* B22A64 800AB8C4 3C0DDA38 */ lui $t5, (0xDA380005 >> 16) # lui $t5, 0xda38 -/* B22A68 800AB8C8 00807025 */ move $t6, $a0 -/* B22A6C 800AB8CC 248B003C */ addiu $t3, $a0, 0x3c -.L800AB8D0: -/* B22A70 800AB8D0 8DC90000 */ lw $t1, ($t6) -/* B22A74 800AB8D4 25CE000C */ addiu $t6, $t6, 0xc -/* B22A78 800AB8D8 25EF000C */ addiu $t7, $t7, 0xc -/* B22A7C 800AB8DC ADE90094 */ sw $t1, 0x94($t7) -/* B22A80 800AB8E0 8DC8FFF8 */ lw $t0, -8($t6) -/* B22A84 800AB8E4 ADE80098 */ sw $t0, 0x98($t7) -/* B22A88 800AB8E8 8DC9FFFC */ lw $t1, -4($t6) -/* B22A8C 800AB8EC 15CBFFF8 */ bne $t6, $t3, .L800AB8D0 -/* B22A90 800AB8F0 ADE9009C */ sw $t1, 0x9c($t7) -/* B22A94 800AB8F4 8DC90000 */ lw $t1, ($t6) -/* B22A98 800AB8F8 35AD0005 */ ori $t5, (0xDA380005 & 0xFFFF) # ori $t5, $t5, 5 -/* B22A9C 800AB8FC 3C068014 */ lui $a2, %hi(D_801412C8) # $a2, 0x8014 -/* B22AA0 800AB900 ADE900A0 */ sw $t1, 0xa0($t7) -/* B22AA4 800AB904 8E2202B0 */ lw $v0, 0x2b0($s1) -/* B22AA8 800AB908 24C612C8 */ addiu $a2, %lo(D_801412C8) # addiu $a2, $a2, 0x12c8 -/* B22AAC 800AB90C 02202825 */ move $a1, $s1 -/* B22AB0 800AB910 244C0008 */ addiu $t4, $v0, 8 -/* B22AB4 800AB914 AE2C02B0 */ sw $t4, 0x2b0($s1) -/* B22AB8 800AB918 AC440004 */ sw $a0, 4($v0) -/* B22ABC 800AB91C 27A40060 */ addiu $a0, $sp, 0x60 -/* B22AC0 800AB920 24070367 */ li $a3, 871 -/* B22AC4 800AB924 0C031AD5 */ jal Graph_CloseDisps -/* B22AC8 800AB928 AC4D0000 */ sw $t5, ($v0) -/* B22ACC 800AB92C 8FBF0034 */ lw $ra, 0x34($sp) -/* B22AD0 800AB930 8FB0002C */ lw $s0, 0x2c($sp) -/* B22AD4 800AB934 8FB10030 */ lw $s1, 0x30($sp) -/* B22AD8 800AB938 27BD0098 */ addiu $sp, $sp, 0x98 -/* B22ADC 800AB93C 03E00008 */ jr $ra -/* B22AE0 800AB940 24020001 */ li $v0, 1 - diff --git a/asm/non_matchings/code/z_view/func_800AB9EC.s b/asm/non_matchings/code/z_view/func_800AB9EC.s index 0702052102..e381a718fe 100644 --- a/asm/non_matchings/code/z_view/func_800AB9EC.s +++ b/asm/non_matchings/code/z_view/func_800AB9EC.s @@ -63,7 +63,7 @@ glabel func_800AB9EC /* B22BF8 800ABA58 0C000B58 */ jal LogUtils_CheckNullPointer /* B22BFC 800ABA5C 2407038E */ li $a3, 910 /* B22C00 800ABA60 02402025 */ move $a0, $s2 -/* B22C04 800ABA64 0C02A864 */ jal func_800AA190 +/* B22C04 800ABA64 0C02A864 */ jal View_ViewportToVp /* B22C08 800ABA68 26050008 */ addiu $a1, $s0, 8 /* B22C0C 800ABA6C 8E4D0000 */ lw $t5, ($s2) /* B22C10 800ABA70 02201025 */ move $v0, $s1 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s index 8196f82c0d..29f74389eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s @@ -47,7 +47,7 @@ glabel BgGanonOtyuka_Draw /* 00844 80876164 AFB00048 */ sw $s0, 0x0048($sp) /* 00848 80876168 F7B60040 */ sdc1 $f22, 0x0040($sp) /* 0084C 8087616C F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 00850 80876170 0C030129 */ jal func_800C04A4 +/* 00850 80876170 0C030129 */ jal Gameplay_GetCamera /* 00854 80876174 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00858 80876178 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 /* 0085C 8087617C 44812000 */ mtc1 $at, $f4 ## $f4 = -30.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B7E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B7E8.s index 44b4195db9..89d266fd35 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B7E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/func_8087B7E8.s @@ -28,7 +28,7 @@ glabel func_8087B7E8 /* 001A0 8087B850 0301C824 */ and $t9, $t8, $at /* 001A4 8087B854 AE190680 */ sw $t9, 0x0680($s0) ## 00000680 /* 001A8 8087B858 AFA70020 */ sw $a3, 0x0020($sp) -/* 001AC 8087B85C 0C02FF21 */ jal func_800BFC84 +/* 001AC 8087B85C 0C02FF21 */ jal Gameplay_InCsMode /* 001B0 8087B860 AFA50024 */ sw $a1, 0x0024($sp) /* 001B4 8087B864 1440002C */ bne $v0, $zero, .L8087B918 /* 001B8 8087B868 8FA70020 */ lw $a3, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F400.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F400.s index 67dc2d1228..44d88c0a79 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F400.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F400.s @@ -70,7 +70,7 @@ glabel func_8087F400 /* 003B8 8087F4B8 00000000 */ nop /* 003BC 8087F4BC 45020011 */ bc1fl .L8087F504 /* 003C0 8087F4C0 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 003C4 8087F4C4 0C02FF21 */ jal func_800BFC84 +/* 003C4 8087F4C4 0C02FF21 */ jal Gameplay_InCsMode /* 003C8 8087F4C8 8FA40024 */ lw $a0, 0x0024($sp) /* 003CC 8087F4CC 1440000C */ bne $v0, $zero, .L8087F500 /* 003D0 8087F4D0 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F6B4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F6B4.s index 83b15ac404..4ad7e64990 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F6B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F6B4.s @@ -45,7 +45,7 @@ glabel func_8087F6B4 /* 00650 8087F750 00000000 */ nop /* 00654 8087F754 50400004 */ beql $v0, $zero, .L8087F768 /* 00658 8087F758 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0065C 8087F75C 0C0302D8 */ jal func_800C0B60 +/* 0065C 8087F75C 0C0302D8 */ jal Gameplay_TriggerVoidOut /* 00660 8087F760 8FA4001C */ lw $a0, 0x001C($sp) /* 00664 8087F764 8FBF0014 */ lw $ra, 0x0014($sp) .L8087F768: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A932C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A932C.s index c2b73c9f2c..49b05a5e4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A932C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A932C.s @@ -18,7 +18,7 @@ glabel func_808A932C /* 00518 808A9368 24045801 */ addiu $a0, $zero, 0x5801 ## $a0 = 00005801 /* 0051C 808A936C 0C01E221 */ jal func_80078884 /* 00520 808A9370 AFA60018 */ sw $a2, 0x0018($sp) -/* 00524 808A9374 0C030322 */ jal func_800C0C88 +/* 00524 808A9374 0C030322 */ jal Gameplay_TriggerRespawn /* 00528 808A9378 8FA4001C */ lw $a0, 0x001C($sp) /* 0052C 808A937C 8FA60018 */ lw $a2, 0x0018($sp) /* 00530 808A9380 3C0F808B */ lui $t7, %hi(func_808A9320) ## $t7 = 808B0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s index 921c89618f..b645c3d6ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s @@ -76,7 +76,7 @@ glabel BgSpot00Hanebasi_Update /* 00938 808AA0B8 4502002A */ bc1fl .L808AA164 /* 0093C 808AA0BC 3C05453B */ lui $a1, 0x453B ## $a1 = 453B0000 /* 00940 808AA0C0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00944 808AA0C4 0C02FF21 */ jal func_800BFC84 +/* 00944 808AA0C4 0C02FF21 */ jal Gameplay_InCsMode /* 00948 808AA0C8 AFA70030 */ sw $a3, 0x0030($sp) /* 0094C 808AA0CC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 00950 808AA0D0 2508E660 */ addiu $t0, $t0, 0xE660 ## $t0 = 8015E660 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Destroy.s deleted file mode 100644 index 3de1881222..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Destroy.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel BgSpot17Funen_Destroy -/* 00040 808B7440 AFA40000 */ sw $a0, 0x0000($sp) -/* 00044 808B7444 03E00008 */ jr $ra -/* 00048 808B7448 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Init.s deleted file mode 100644 index e24921f8cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Init.s +++ /dev/null @@ -1,25 +0,0 @@ -.rdata -glabel D_808B7630 - .asciz "spot17 obj. 噴煙 (arg_data 0x%04x)\n" - .balign 4 - -.text -glabel BgSpot17Funen_Init -/* 00000 808B7400 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 808B7404 AFA5001C */ sw $a1, 0x001C($sp) -/* 00008 808B7408 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0000C 808B740C 3C05808B */ lui $a1, %hi(D_808B7620) ## $a1 = 808B0000 -/* 00010 808B7410 AFA40018 */ sw $a0, 0x0018($sp) -/* 00014 808B7414 0C01E037 */ jal Actor_ProcessInitChain - -/* 00018 808B7418 24A57620 */ addiu $a1, $a1, %lo(D_808B7620) ## $a1 = 808B7620 -/* 0001C 808B741C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00020 808B7420 3C04808B */ lui $a0, %hi(D_808B7630) ## $a0 = 808B0000 -/* 00024 808B7424 24847630 */ addiu $a0, $a0, %lo(D_808B7630) ## $a0 = 808B7630 -/* 00028 808B7428 0C00084C */ jal osSyncPrintf - -/* 0002C 808B742C 85C5001C */ lh $a1, 0x001C($t6) ## 0000001C -/* 00030 808B7430 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00034 808B7434 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00038 808B7438 03E00008 */ jr $ra -/* 0003C 808B743C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Update.s deleted file mode 100644 index abf93ac811..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/BgSpot17Funen_Update.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel BgSpot17Funen_Update -/* 0004C 808B744C 3C0E808B */ lui $t6, %hi(func_808B7478) ## $t6 = 808B0000 -/* 00050 808B7450 3C0F808B */ lui $t7, %hi(func_808B746C) ## $t7 = 808B0000 -/* 00054 808B7454 AFA50004 */ sw $a1, 0x0004($sp) -/* 00058 808B7458 25CE7478 */ addiu $t6, $t6, %lo(func_808B7478) ## $t6 = 808B7478 -/* 0005C 808B745C 25EF746C */ addiu $t7, $t7, %lo(func_808B746C) ## $t7 = 808B746C -/* 00060 808B7460 AC8E0134 */ sw $t6, 0x0134($a0) ## 00000134 -/* 00064 808B7464 03E00008 */ jr $ra -/* 00068 808B7468 AC8F0130 */ sw $t7, 0x0130($a0) ## 00000130 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B746C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B746C.s deleted file mode 100644 index 9f256e66c5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B746C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_808B746C -/* 0006C 808B746C AFA40000 */ sw $a0, 0x0000($sp) -/* 00070 808B7470 03E00008 */ jr $ra -/* 00074 808B7474 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s deleted file mode 100644 index 1ec1e14887..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s +++ /dev/null @@ -1,117 +0,0 @@ -.rdata -glabel D_808B7654 - .asciz "../z_bg_spot17_funen.c" - .balign 4 - -glabel D_808B766C - .asciz "../z_bg_spot17_funen.c" - .balign 4 - -glabel D_808B7684 - .asciz "../z_bg_spot17_funen.c" - .balign 4 - -.late_rodata -glabel D_808B769C - .float 9.58738E-5 - -.text -glabel func_808B7478 -/* 00078 808B7478 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 0007C 808B747C AFB10038 */ sw $s1, 0x0038($sp) -/* 00080 808B7480 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00084 808B7484 AFBF003C */ sw $ra, 0x003C($sp) -/* 00088 808B7488 AFB00034 */ sw $s0, 0x0034($sp) -/* 0008C 808B748C AFA40070 */ sw $a0, 0x0070($sp) -/* 00090 808B7490 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00094 808B7494 3C06808B */ lui $a2, %hi(D_808B7654) ## $a2 = 808B0000 -/* 00098 808B7498 24C67654 */ addiu $a2, $a2, %lo(D_808B7654) ## $a2 = 808B7654 -/* 0009C 808B749C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 000A0 808B74A0 24070099 */ addiu $a3, $zero, 0x0099 ## $a3 = 00000099 -/* 000A4 808B74A4 0C031AB1 */ jal Graph_OpenDisps -/* 000A8 808B74A8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 000AC 808B74AC 0C024F61 */ jal func_80093D84 -/* 000B0 808B74B0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 000B4 808B74B4 862E07A0 */ lh $t6, 0x07A0($s1) ## 000007A0 -/* 000B8 808B74B8 000E7880 */ sll $t7, $t6, 2 -/* 000BC 808B74BC 022FC021 */ addu $t8, $s1, $t7 -/* 000C0 808B74C0 0C016A7D */ jal func_8005A9F4 -/* 000C4 808B74C4 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 -/* 000C8 808B74C8 8FB90070 */ lw $t9, 0x0070($sp) -/* 000CC 808B74CC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 000D0 808B74D0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 000D4 808B74D4 872800B6 */ lh $t0, 0x00B6($t9) ## 000000B6 -/* 000D8 808B74D8 00484823 */ subu $t1, $v0, $t0 -/* 000DC 808B74DC 01215021 */ addu $t2, $t1, $at -/* 000E0 808B74E0 000A5C00 */ sll $t3, $t2, 16 -/* 000E4 808B74E4 000B6403 */ sra $t4, $t3, 16 -/* 000E8 808B74E8 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 000EC 808B74EC 3C01808B */ lui $at, %hi(D_808B769C) ## $at = 808B0000 -/* 000F0 808B74F0 C428769C */ lwc1 $f8, %lo(D_808B769C)($at) -/* 000F4 808B74F4 468021A0 */ cvt.s.w $f6, $f4 -/* 000F8 808B74F8 46083302 */ mul.s $f12, $f6, $f8 -/* 000FC 808B74FC 0C034348 */ jal Matrix_RotateY -/* 00100 808B7500 00000000 */ nop -/* 00104 808B7504 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00108 808B7508 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 -/* 0010C 808B750C 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 -/* 00110 808B7510 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 00114 808B7514 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00118 808B7518 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0011C 808B751C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00120 808B7520 3C05808B */ lui $a1, %hi(D_808B766C) ## $a1 = 808B0000 -/* 00124 808B7524 24A5766C */ addiu $a1, $a1, %lo(D_808B766C) ## $a1 = 808B766C -/* 00128 808B7528 240600A1 */ addiu $a2, $zero, 0x00A1 ## $a2 = 000000A1 -/* 0012C 808B752C 0C0346A2 */ jal Matrix_NewMtx -/* 00130 808B7530 AFA20054 */ sw $v0, 0x0054($sp) -/* 00134 808B7534 8FA30054 */ lw $v1, 0x0054($sp) -/* 00138 808B7538 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 0013C 808B753C 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 00140 808B7540 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00144 808B7544 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00148 808B7548 3C070001 */ lui $a3, 0x0001 ## $a3 = 00010000 -/* 0014C 808B754C 00F13821 */ addu $a3, $a3, $s1 -/* 00150 808B7550 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00154 808B7554 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00158 808B7558 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0015C 808B755C 8CE71DE4 */ lw $a3, 0x1DE4($a3) ## 00011DE4 -/* 00160 808B7560 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00164 808B7564 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 00168 808B7568 00073823 */ subu $a3, $zero, $a3 -/* 0016C 808B756C 30E7007F */ andi $a3, $a3, 0x007F ## $a3 = 00000000 -/* 00170 808B7570 24080020 */ addiu $t0, $zero, 0x0020 ## $t0 = 00000020 -/* 00174 808B7574 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00178 808B7578 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 0017C 808B757C 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 00180 808B7580 AFAB0028 */ sw $t3, 0x0028($sp) -/* 00184 808B7584 AFAA0024 */ sw $t2, 0x0024($sp) -/* 00188 808B7588 AFA90018 */ sw $t1, 0x0018($sp) -/* 0018C 808B758C AFA80014 */ sw $t0, 0x0014($sp) -/* 00190 808B7590 AFA70020 */ sw $a3, 0x0020($sp) -/* 00194 808B7594 AFB90010 */ sw $t9, 0x0010($sp) -/* 00198 808B7598 AFA0001C */ sw $zero, 0x001C($sp) -/* 0019C 808B759C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 001A0 808B75A0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 001A4 808B75A4 0C0253D0 */ jal Gfx_TwoTexScroll -/* 001A8 808B75A8 AFA20050 */ sw $v0, 0x0050($sp) -/* 001AC 808B75AC 8FA30050 */ lw $v1, 0x0050($sp) -/* 001B0 808B75B0 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 001B4 808B75B4 25CE0B40 */ addiu $t6, $t6, 0x0B40 ## $t6 = 06000B40 -/* 001B8 808B75B8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 001BC 808B75BC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 001C0 808B75C0 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 001C4 808B75C4 3C06808B */ lui $a2, %hi(D_808B7684) ## $a2 = 808B0000 -/* 001C8 808B75C8 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 001CC 808B75CC AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 001D0 808B75D0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 001D4 808B75D4 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 001D8 808B75D8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 001DC 808B75DC 24C67684 */ addiu $a2, $a2, %lo(D_808B7684) ## $a2 = 808B7684 -/* 001E0 808B75E0 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 001E4 808B75E4 0C031AD5 */ jal Graph_CloseDisps -/* 001E8 808B75E8 240700B0 */ addiu $a3, $zero, 0x00B0 ## $a3 = 000000B0 -/* 001EC 808B75EC 8FBF003C */ lw $ra, 0x003C($sp) -/* 001F0 808B75F0 8FB00034 */ lw $s0, 0x0034($sp) -/* 001F4 808B75F4 8FB10038 */ lw $s1, 0x0038($sp) -/* 001F8 808B75F8 03E00008 */ jr $ra -/* 001FC 808B75FC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s index 207c63ad0b..fa21599ebf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s @@ -48,7 +48,7 @@ glabel func_808C1D00 /* 00B88 808C1D18 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00B8C 808C1D1C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00B90 808C1D20 AFA6007C */ sw $a2, 0x007C($sp) -/* 00B94 808C1D24 0C030129 */ jal func_800C04A4 +/* 00B94 808C1D24 0C030129 */ jal Gameplay_GetCamera /* 00B98 808C1D28 AFAE006C */ sw $t6, 0x006C($sp) /* 00B9C 808C1D2C AFA20070 */ sw $v0, 0x0070($sp) /* 00BA0 808C1D30 86030196 */ lh $v1, 0x0196($s0) ## 00000196 @@ -102,18 +102,18 @@ glabel L808C1DCC /* 00C4C 808C1DDC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00C50 808C1DE0 0C00B7D5 */ jal func_8002DF54 /* 00C54 808C1DE4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00C58 808C1DE8 0C03010E */ jal func_800C0438 +/* 00C58 808C1DE8 0C03010E */ jal Gameplay_ClearAllSubCameras /* 00C5C 808C1DEC 8FA4007C */ lw $a0, 0x007C($sp) -/* 00C60 808C1DF0 0C03008C */ jal func_800C0230 +/* 00C60 808C1DF0 0C03008C */ jal Gameplay_CreateSubCamera /* 00C64 808C1DF4 8FA4007C */ lw $a0, 0x007C($sp) /* 00C68 808C1DF8 A60201B4 */ sh $v0, 0x01B4($s0) ## 000001B4 /* 00C6C 808C1DFC 8FA4007C */ lw $a0, 0x007C($sp) /* 00C70 808C1E00 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00C74 808C1E04 0C0300C5 */ jal func_800C0314 +/* 00C74 808C1E04 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00C78 808C1E08 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00C7C 808C1E0C 8FA4007C */ lw $a0, 0x007C($sp) /* 00C80 808C1E10 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 -/* 00C84 808C1E14 0C0300C5 */ jal func_800C0314 +/* 00C84 808C1E14 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00C88 808C1E18 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00C8C 808C1E1C 3C01808D */ lui $at, %hi(D_808CA688) ## $at = 808D0000 /* 00C90 808C1E20 C420A688 */ lwc1 $f0, %lo(D_808CA688)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s index 4d777726cf..5ee9c25d55 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s @@ -123,19 +123,19 @@ glabel L808C55E0 /* 04468 808C55F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0446C 808C55FC 0C00B7D5 */ jal func_8002DF54 /* 04470 808C5600 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04474 808C5604 0C03008C */ jal func_800C0230 +/* 04474 808C5604 0C03008C */ jal Gameplay_CreateSubCamera /* 04478 808C5608 8FA401A4 */ lw $a0, 0x01A4($sp) /* 0447C 808C560C A60201B4 */ sh $v0, 0x01B4($s0) ## 000001B4 /* 04480 808C5610 8FA401A4 */ lw $a0, 0x01A4($sp) /* 04484 808C5614 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04488 808C5618 0C0300C5 */ jal func_800C0314 +/* 04488 808C5618 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0448C 808C561C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 04490 808C5620 8FA401A4 */ lw $a0, 0x01A4($sp) /* 04494 808C5624 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 -/* 04498 808C5628 0C0300C5 */ jal func_800C0314 +/* 04498 808C5628 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0449C 808C562C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 044A0 808C5630 8FA401A4 */ lw $a0, 0x01A4($sp) -/* 044A4 808C5634 0C030129 */ jal func_800C04A4 +/* 044A4 808C5634 0C030129 */ jal Gameplay_GetCamera /* 044A8 808C5638 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 044AC 808C563C C444005C */ lwc1 $f4, 0x005C($v0) ## 0000005C /* 044B0 808C5640 E6040428 */ swc1 $f4, 0x0428($s0) ## 00000428 @@ -1568,7 +1568,7 @@ glabel L808C5FE4 /* 058F8 808C6A88 8FA401A4 */ lw $a0, 0x01A4($sp) /* 058FC 808C6A8C 248E1C24 */ addiu $t6, $a0, 0x1C24 ## $t6 = 00001C24 /* 05900 808C6A90 AFAE0044 */ sw $t6, 0x0044($sp) -/* 05904 808C6A94 0C030129 */ jal func_800C04A4 +/* 05904 808C6A94 0C030129 */ jal Gameplay_GetCamera /* 05908 808C6A98 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0590C 808C6A9C 8FA8004C */ lw $t0, 0x004C($sp) /* 05910 808C6AA0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 @@ -1601,7 +1601,7 @@ glabel L808C5FE4 /* 0597C 808C6B0C A60E019C */ sh $t6, 0x019C($s0) ## 0000019C /* 05980 808C6B10 8FA401A4 */ lw $a0, 0x01A4($sp) /* 05984 808C6B14 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 05988 808C6B18 0C0300C5 */ jal func_800C0314 +/* 05988 808C6B18 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0598C 808C6B1C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 05990 808C6B20 8FA401A4 */ lw $a0, 0x01A4($sp) /* 05994 808C6B24 0C01914D */ jal func_80064534 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s index 7d30c83bc2..cb4840da9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s @@ -321,7 +321,7 @@ glabel func_808CB718 /* 00B88 808CB948 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00B8C 808CB94C 8FA401D4 */ lw $a0, 0x01D4($sp) /* 00B90 808CB950 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00B94 808CB954 0C030129 */ jal func_800C04A4 +/* 00B94 808CB954 0C030129 */ jal Gameplay_GetCamera /* 00B98 808CB958 8C901C44 */ lw $s0, 0x1C44($a0) ## 00001C44 /* 00B9C 808CB95C 86CA1402 */ lh $t2, 0x1402($s6) ## 00001402 /* 00BA0 808CB960 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 @@ -377,16 +377,16 @@ glabel L808CB988 /* 00C64 808CBA24 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 /* 00C68 808CBA28 0C00B7D5 */ jal func_8002DF54 /* 00C6C 808CBA2C 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00C70 808CBA30 0C03008C */ jal func_800C0230 +/* 00C70 808CBA30 0C03008C */ jal Gameplay_CreateSubCamera /* 00C74 808CBA34 8FA401D4 */ lw $a0, 0x01D4($sp) /* 00C78 808CBA38 A6C21404 */ sh $v0, 0x1404($s6) ## 00001404 /* 00C7C 808CBA3C 8FA401D4 */ lw $a0, 0x01D4($sp) /* 00C80 808CBA40 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00C84 808CBA44 0C0300C5 */ jal func_800C0314 +/* 00C84 808CBA44 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00C88 808CBA48 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00C8C 808CBA4C 8FA401D4 */ lw $a0, 0x01D4($sp) /* 00C90 808CBA50 86C51404 */ lh $a1, 0x1404($s6) ## 00001404 -/* 00C94 808CBA54 0C0300C5 */ jal func_800C0314 +/* 00C94 808CBA54 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00C98 808CBA58 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00C9C 808CBA5C 3C0143BE */ lui $at, 0x43BE ## $at = 43BE0000 /* 00CA0 808CBA60 44810000 */ mtc1 $at, $f0 ## $f0 = 380.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s index 72d9bb13a2..845fbdd936 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s @@ -34,7 +34,7 @@ glabel func_808D40C8 /* 01A6C 808D40DC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01A70 808D40E0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01A74 808D40E4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01A78 808D40E8 0C030129 */ jal func_800C04A4 +/* 01A78 808D40E8 0C030129 */ jal Gameplay_GetCamera /* 01A7C 808D40EC AFAE0060 */ sw $t6, 0x0060($sp) /* 01A80 808D40F0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01A84 808D40F4 AFA2005C */ sw $v0, 0x005C($sp) @@ -60,16 +60,16 @@ glabel L808D4124 /* 01ACC 808D413C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01AD0 808D4140 0C00B7D5 */ jal func_8002DF54 /* 01AD4 808D4144 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01AD8 808D4148 0C03008C */ jal func_800C0230 +/* 01AD8 808D4148 0C03008C */ jal Gameplay_CreateSubCamera /* 01ADC 808D414C 8FA40084 */ lw $a0, 0x0084($sp) /* 01AE0 808D4150 A6021392 */ sh $v0, 0x1392($s0) ## 00001392 /* 01AE4 808D4154 8FA40084 */ lw $a0, 0x0084($sp) /* 01AE8 808D4158 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01AEC 808D415C 0C0300C5 */ jal func_800C0314 +/* 01AEC 808D415C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01AF0 808D4160 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01AF4 808D4164 8FA40084 */ lw $a0, 0x0084($sp) /* 01AF8 808D4168 86051392 */ lh $a1, 0x1392($s0) ## 00001392 -/* 01AFC 808D416C 0C0300C5 */ jal func_800C0314 +/* 01AFC 808D416C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01B00 808D4170 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 01B04 808D4174 8FA3005C */ lw $v1, 0x005C($sp) /* 01B08 808D4178 3C01808D */ lui $at, %hi(D_808D64A4) ## $at = 808D0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s index 10c742d29d..059ed968e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s @@ -78,16 +78,16 @@ glabel L808D79E8 /* 011D0 808D7A40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 011D4 808D7A44 0C00B7D5 */ jal func_8002DF54 /* 011D8 808D7A48 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 011DC 808D7A4C 0C03008C */ jal func_800C0230 +/* 011DC 808D7A4C 0C03008C */ jal Gameplay_CreateSubCamera /* 011E0 808D7A50 8FA40074 */ lw $a0, 0x0074($sp) /* 011E4 808D7A54 A602067A */ sh $v0, 0x067A($s0) ## 0000067A /* 011E8 808D7A58 8FA40074 */ lw $a0, 0x0074($sp) /* 011EC 808D7A5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 011F0 808D7A60 0C0300C5 */ jal func_800C0314 +/* 011F0 808D7A60 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 011F4 808D7A64 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 011F8 808D7A68 8FA40074 */ lw $a0, 0x0074($sp) /* 011FC 808D7A6C 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 01200 808D7A70 0C0300C5 */ jal func_800C0314 +/* 01200 808D7A70 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01204 808D7A74 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 01208 808D7A78 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0120C 808D7A7C 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 @@ -1453,7 +1453,7 @@ glabel L808D8A98 /* 02588 808D8DF8 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 /* 0258C 808D8DFC 15410028 */ bne $t2, $at, .L808D8EA0 /* 02590 808D8E00 00000000 */ nop -/* 02594 808D8E04 0C030129 */ jal func_800C04A4 +/* 02594 808D8E04 0C030129 */ jal Gameplay_GetCamera /* 02598 808D8E08 8FA40074 */ lw $a0, 0x0074($sp) /* 0259C 808D8E0C 26030680 */ addiu $v1, $s0, 0x0680 ## $v1 = 00000680 /* 025A0 808D8E10 8C6C0000 */ lw $t4, 0x0000($v1) ## 00000680 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s index 54d36bdc10..35cb2613c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s @@ -74,16 +74,16 @@ glabel L808D9438 /* 02BD8 808D9448 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02BDC 808D944C 0C00B7D5 */ jal func_8002DF54 /* 02BE0 808D9450 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 02BE4 808D9454 0C03008C */ jal func_800C0230 +/* 02BE4 808D9454 0C03008C */ jal Gameplay_CreateSubCamera /* 02BE8 808D9458 8FA400B4 */ lw $a0, 0x00B4($sp) /* 02BEC 808D945C A602067A */ sh $v0, 0x067A($s0) ## 0000067A /* 02BF0 808D9460 8FA400B4 */ lw $a0, 0x00B4($sp) /* 02BF4 808D9464 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02BF8 808D9468 0C0300C5 */ jal func_800C0314 +/* 02BF8 808D9468 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 02BFC 808D946C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 02C00 808D9470 8FA400B4 */ lw $a0, 0x00B4($sp) /* 02C04 808D9474 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 02C08 808D9478 0C0300C5 */ jal func_800C0314 +/* 02C08 808D9478 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 02C0C 808D947C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 02C10 808D9480 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 02C14 808D9484 44812000 */ mtc1 $at, $f4 ## $f4 = 70.00 @@ -793,16 +793,16 @@ glabel L808D9E8C /* 0362C 808D9E9C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 03630 808D9EA0 0C00B7D5 */ jal func_8002DF54 /* 03634 808D9EA4 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 03638 808D9EA8 0C03008C */ jal func_800C0230 +/* 03638 808D9EA8 0C03008C */ jal Gameplay_CreateSubCamera /* 0363C 808D9EAC 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03640 808D9EB0 A602067A */ sh $v0, 0x067A($s0) ## 0000067A /* 03644 808D9EB4 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03648 808D9EB8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0364C 808D9EBC 0C0300C5 */ jal func_800C0314 +/* 0364C 808D9EBC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 03650 808D9EC0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03654 808D9EC4 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03658 808D9EC8 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 0365C 808D9ECC 0C0300C5 */ jal func_800C0314 +/* 0365C 808D9ECC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 03660 808D9ED0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 03664 808D9ED4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03668 808D9ED8 24A5ADDC */ addiu $a1, $a1, 0xADDC ## $a1 = 0600ADDC @@ -1624,7 +1624,7 @@ glabel L808DA9F0 /* 04244 808DAAB4 46128100 */ add.s $f4, $f16, $f18 /* 04248 808DAAB8 14200027 */ bne $at, $zero, .L808DAB58 /* 0424C 808DAABC E6040694 */ swc1 $f4, 0x0694($s0) ## 00000694 -/* 04250 808DAAC0 0C030129 */ jal func_800C04A4 +/* 04250 808DAAC0 0C030129 */ jal Gameplay_GetCamera /* 04254 808DAAC4 8FA400B4 */ lw $a0, 0x00B4($sp) /* 04258 808DAAC8 26030680 */ addiu $v1, $s0, 0x0680 ## $v1 = 00000680 /* 0425C 808DAACC 8C6B0000 */ lw $t3, 0x0000($v1) ## 00000680 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s index a08fc4122e..b129f313e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s @@ -334,7 +334,7 @@ glabel func_808E3564 /* 0D1BC 808E3A2C 00000000 */ nop /* 0D1C0 808E3A30 4500000F */ bc1f .L808E3A70 /* 0D1C4 808E3A34 00000000 */ nop -/* 0D1C8 808E3A38 0C030129 */ jal func_800C04A4 +/* 0D1C8 808E3A38 0C030129 */ jal Gameplay_GetCamera /* 0D1CC 808E3A3C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0D1D0 808E3A40 0C016A52 */ jal func_8005A948 /* 0D1D4 808E3A44 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s index 0d0d72c3ce..c9d392ecf8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s @@ -139,16 +139,16 @@ glabel L808FD644 /* 00748 808FD688 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0074C 808FD68C 0C00B7D5 */ jal func_8002DF54 /* 00750 808FD690 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00754 808FD694 0C03008C */ jal func_800C0230 +/* 00754 808FD694 0C03008C */ jal Gameplay_CreateSubCamera /* 00758 808FD698 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0075C 808FD69C A602039E */ sh $v0, 0x039E($s0) ## 0000039E /* 00760 808FD6A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00764 808FD6A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00768 808FD6A8 0C0300C5 */ jal func_800C0314 +/* 00768 808FD6A8 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0076C 808FD6AC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00770 808FD6B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00774 808FD6B4 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 00778 808FD6B8 0C0300C5 */ jal func_800C0314 +/* 00778 808FD6B8 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0077C 808FD6BC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00780 808FD6C0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00784 808FD6C4 A619039C */ sh $t9, 0x039C($s0) ## 0000039C @@ -565,7 +565,7 @@ glabel L808FDC48 /* 00D90 808FDCD0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00D94 808FDCD4 55C106CF */ bnel $t6, $at, .L808FF814 /* 00D98 808FDCD8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00D9C 808FDCDC 0C030129 */ jal func_800C04A4 +/* 00D9C 808FDCDC 0C030129 */ jal Gameplay_GetCamera /* 00DA0 808FDCE0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00DA4 808FDCE4 8FAF004C */ lw $t7, 0x004C($sp) /* 00DA8 808FDCE8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 @@ -621,16 +621,16 @@ glabel L808FDD74 /* 00E6C 808FDDAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E70 808FDDB0 0C019148 */ jal func_80064520 /* 00E74 808FDDB4 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 -/* 00E78 808FDDB8 0C03008C */ jal func_800C0230 +/* 00E78 808FDDB8 0C03008C */ jal Gameplay_CreateSubCamera /* 00E7C 808FDDBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E80 808FDDC0 A602039E */ sh $v0, 0x039E($s0) ## 0000039E /* 00E84 808FDDC4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E88 808FDDC8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00E8C 808FDDCC 0C0300C5 */ jal func_800C0314 +/* 00E8C 808FDDCC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00E90 808FDDD0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00E94 808FDDD4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E98 808FDDD8 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 00E9C 808FDDDC 0C0300C5 */ jal func_800C0314 +/* 00E9C 808FDDDC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00EA0 808FDDE0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00EA4 808FDDE4 8FA90088 */ lw $t1, 0x0088($sp) glabel L808FDDE8 @@ -1333,7 +1333,7 @@ glabel L808FE63C /* 018BC 808FE7FC 2C61003C */ sltiu $at, $v1, 0x003C /* 018C0 808FE800 14200403 */ bne $at, $zero, .L808FF810 /* 018C4 808FE804 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 018C8 808FE808 0C030129 */ jal func_800C04A4 +/* 018C8 808FE808 0C030129 */ jal Gameplay_GetCamera /* 018CC 808FE80C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 018D0 808FE810 8FA3004C */ lw $v1, 0x004C($sp) /* 018D4 808FE814 240D0011 */ addiu $t5, $zero, 0x0011 ## $t5 = 00000011 @@ -2368,7 +2368,7 @@ glabel L808FF678 /* 02804 808FF744 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 /* 02808 808FF748 10400031 */ beq $v0, $zero, .L808FF810 /* 0280C 808FF74C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02810 808FF750 0C030129 */ jal func_800C04A4 +/* 02810 808FF750 0C030129 */ jal Gameplay_GetCamera /* 02814 808FF754 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02818 808FF758 260303A4 */ addiu $v1, $s0, 0x03A4 ## $v1 = 000003A4 /* 0281C 808FF75C 8C6F0000 */ lw $t7, 0x0000($v1) ## 000003A4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s index 3132930221..afbf817e39 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s @@ -27,7 +27,7 @@ glabel func_80900890 /* 03960 809008A0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 03964 809008A4 AFBF001C */ sw $ra, 0x001C($sp) /* 03968 809008A8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0396C 809008AC 0C030129 */ jal func_800C04A4 +/* 0396C 809008AC 0C030129 */ jal Gameplay_GetCamera /* 03970 809008B0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03974 809008B4 AFA2004C */ sw $v0, 0x004C($sp) /* 03978 809008B8 8E2E1C44 */ lw $t6, 0x1C44($s1) ## 00001C44 @@ -54,16 +54,16 @@ glabel L80900904 /* 039C4 80900904 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 039C8 80900908 0C019148 */ jal func_80064520 /* 039CC 8090090C 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 -/* 039D0 80900910 0C03008C */ jal func_800C0230 +/* 039D0 80900910 0C03008C */ jal Gameplay_CreateSubCamera /* 039D4 80900914 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 039D8 80900918 A602039E */ sh $v0, 0x039E($s0) ## 0000039E /* 039DC 8090091C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 039E0 80900920 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 039E4 80900924 0C0300C5 */ jal func_800C0314 +/* 039E4 80900924 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 039E8 80900928 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 039EC 8090092C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 039F0 80900930 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 039F4 80900934 0C0300C5 */ jal func_800C0314 +/* 039F4 80900934 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 039F8 80900938 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 039FC 8090093C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03A00 80900940 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 @@ -252,7 +252,7 @@ glabel L80900AFC /* 03CAC 80900BEC 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 /* 03CB0 80900BF0 14400096 */ bne $v0, $zero, .L80900E4C /* 03CB4 80900BF4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03CB8 80900BF8 0C030129 */ jal func_800C04A4 +/* 03CB8 80900BF8 0C030129 */ jal Gameplay_GetCamera /* 03CBC 80900BFC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03CC0 80900C00 260303A4 */ addiu $v1, $s0, 0x03A4 ## $v1 = 000003A4 /* 03CC4 80900C04 8C6B0000 */ lw $t3, 0x0000($v1) ## 000003A4 @@ -292,16 +292,16 @@ glabel L80900C88 /* 03D48 80900C88 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03D4C 80900C8C 0C019148 */ jal func_80064520 /* 03D50 80900C90 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 -/* 03D54 80900C94 0C03008C */ jal func_800C0230 +/* 03D54 80900C94 0C03008C */ jal Gameplay_CreateSubCamera /* 03D58 80900C98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03D5C 80900C9C A602039E */ sh $v0, 0x039E($s0) ## 0000039E /* 03D60 80900CA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03D64 80900CA4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03D68 80900CA8 0C0300C5 */ jal func_800C0314 +/* 03D68 80900CA8 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 03D6C 80900CAC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03D70 80900CB0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03D74 80900CB4 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 03D78 80900CB8 0C0300C5 */ jal func_800C0314 +/* 03D78 80900CB8 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 03D7C 80900CBC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 03D80 80900CC0 2419000B */ addiu $t9, $zero, 0x000B ## $t9 = 0000000B /* 03D84 80900CC4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 @@ -368,7 +368,7 @@ glabel L80900CE4 /* 03E74 80900DB4 C470002C */ lwc1 $f16, 0x002C($v1) ## 0000002C /* 03E78 80900DB8 15810024 */ bne $t4, $at, .L80900E4C /* 03E7C 80900DBC E61003B8 */ swc1 $f16, 0x03B8($s0) ## 000003B8 -/* 03E80 80900DC0 0C030129 */ jal func_800C04A4 +/* 03E80 80900DC0 0C030129 */ jal Gameplay_GetCamera /* 03E84 80900DC4 AFAD0028 */ sw $t5, 0x0028($sp) /* 03E88 80900DC8 260303A4 */ addiu $v1, $s0, 0x03A4 ## $v1 = 000003A4 /* 03E8C 80900DCC 8C6F0000 */ lw $t7, 0x0000($v1) ## 000003A4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s index 7f245adb9f..158b957449 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s @@ -83,16 +83,16 @@ glabel L8090129C /* 0435C 8090129C 8FA40054 */ lw $a0, 0x0054($sp) /* 04360 809012A0 0C019148 */ jal func_80064520 /* 04364 809012A4 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 04368 809012A8 0C03008C */ jal func_800C0230 +/* 04368 809012A8 0C03008C */ jal Gameplay_CreateSubCamera /* 0436C 809012AC 8FA40054 */ lw $a0, 0x0054($sp) /* 04370 809012B0 A602039E */ sh $v0, 0x039E($s0) ## 0000039E /* 04374 809012B4 8FA40054 */ lw $a0, 0x0054($sp) /* 04378 809012B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0437C 809012BC 0C0300C5 */ jal func_800C0314 +/* 0437C 809012BC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 04380 809012C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 04384 809012C4 8FA40054 */ lw $a0, 0x0054($sp) /* 04388 809012C8 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 0438C 809012CC 0C0300C5 */ jal func_800C0314 +/* 0438C 809012CC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 04390 809012D0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 04394 809012D4 8FA40054 */ lw $a0, 0x0054($sp) /* 04398 809012D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 @@ -514,7 +514,7 @@ glabel L809017B4 /* 0498C 809018CC C452002C */ lwc1 $f18, 0x002C($v0) ## 0000002C /* 04990 809018D0 1701026F */ bne $t8, $at, .L80902290 /* 04994 809018D4 E61203B8 */ swc1 $f18, 0x03B8($s0) ## 000003B8 -/* 04998 809018D8 0C030129 */ jal func_800C04A4 +/* 04998 809018D8 0C030129 */ jal Gameplay_GetCamera /* 0499C 809018DC 8FA40054 */ lw $a0, 0x0054($sp) /* 049A0 809018E0 260303A4 */ addiu $v1, $s0, 0x03A4 ## $v1 = 000003A4 /* 049A4 809018E4 8C680000 */ lw $t0, 0x0000($v1) ## 000003A4 @@ -599,16 +599,16 @@ glabel L80901968 /* 04AD4 80901A14 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 04AD8 80901A18 0C019148 */ jal func_80064520 /* 04ADC 80901A1C 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 04AE0 80901A20 0C03008C */ jal func_800C0230 +/* 04AE0 80901A20 0C03008C */ jal Gameplay_CreateSubCamera /* 04AE4 80901A24 8FA40054 */ lw $a0, 0x0054($sp) /* 04AE8 80901A28 A602039E */ sh $v0, 0x039E($s0) ## 0000039E /* 04AEC 80901A2C 8FA40054 */ lw $a0, 0x0054($sp) /* 04AF0 80901A30 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04AF4 80901A34 0C0300C5 */ jal func_800C0314 +/* 04AF4 80901A34 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 04AF8 80901A38 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 04AFC 80901A3C 8FA40054 */ lw $a0, 0x0054($sp) /* 04B00 80901A40 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 04B04 80901A44 0C0300C5 */ jal func_800C0314 +/* 04B04 80901A44 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 04B08 80901A48 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 04B0C 80901A4C 24090007 */ addiu $t1, $zero, 0x0007 ## $t1 = 00000007 /* 04B10 80901A50 A609039C */ sh $t1, 0x039C($s0) ## 0000039C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s index 01027e6252..7fc9cce714 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s @@ -12,7 +12,7 @@ glabel func_80912D2C /* 02714 80912D54 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 /* 02718 80912D58 8CB31C44 */ lw $s3, 0x1C44($a1) ## 00001C44 /* 0271C 80912D5C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02720 80912D60 0C030129 */ jal func_800C04A4 +/* 02720 80912D60 0C030129 */ jal Gameplay_GetCamera /* 02724 80912D64 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02728 80912D68 C6640080 */ lwc1 $f4, 0x0080($s3) ## 00000080 /* 0272C 80912D6C 3C048091 */ lui $a0, %hi(D_809152F8) ## $a0 = 80910000 @@ -67,12 +67,12 @@ glabel L80912E00 /* 027D0 80912E10 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 027D4 80912E14 0C00B7D5 */ jal func_8002DF54 /* 027D8 80912E18 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 027DC 80912E1C 0C03008C */ jal func_800C0230 +/* 027DC 80912E1C 0C03008C */ jal Gameplay_CreateSubCamera /* 027E0 80912E20 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 027E4 80912E24 A642035C */ sh $v0, 0x035C($s2) ## 0000035C /* 027E8 80912E28 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 027EC 80912E2C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 027F0 80912E30 0C0300C5 */ jal func_800C0314 +/* 027F0 80912E30 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 027F4 80912E34 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 027F8 80912E38 3C048091 */ lui $a0, %hi(D_80915300) ## $a0 = 80910000 /* 027FC 80912E3C 0C00084C */ jal osSyncPrintf @@ -80,7 +80,7 @@ glabel L80912E00 /* 02800 80912E40 24845300 */ addiu $a0, $a0, %lo(D_80915300) ## $a0 = 80915300 /* 02804 80912E44 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 02808 80912E48 8645035C */ lh $a1, 0x035C($s2) ## 0000035C -/* 0280C 80912E4C 0C0300C5 */ jal func_800C0314 +/* 0280C 80912E4C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 02810 80912E50 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 02814 80912E54 3C048091 */ lui $a0, %hi(D_80915304) ## $a0 = 80910000 /* 02818 80912E58 0C00084C */ jal osSyncPrintf diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916AEC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916AEC.s index 80fad8a3b5..f4392be072 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916AEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916AEC.s @@ -7,7 +7,7 @@ glabel func_80916AEC /* 010F0 80916B00 AFBF0034 */ sw $ra, 0x0034($sp) /* 010F4 80916B04 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 010F8 80916B08 AFB20030 */ sw $s2, 0x0030($sp) -/* 010FC 80916B0C 0C030129 */ jal func_800C04A4 +/* 010FC 80916B0C 0C030129 */ jal Gameplay_GetCamera /* 01100 80916B10 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01104 80916B14 AFA20038 */ sw $v0, 0x0038($sp) /* 01108 80916B18 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 @@ -23,16 +23,16 @@ glabel func_80916AEC /* 01130 80916B40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01134 80916B44 0C00B7D5 */ jal func_8002DF54 /* 01138 80916B48 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0113C 80916B4C 0C03008C */ jal func_800C0230 +/* 0113C 80916B4C 0C03008C */ jal Gameplay_CreateSubCamera /* 01140 80916B50 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01144 80916B54 A60201BC */ sh $v0, 0x01BC($s0) ## 000001BC /* 01148 80916B58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0114C 80916B5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01150 80916B60 0C0300C5 */ jal func_800C0314 +/* 01150 80916B60 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01154 80916B64 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 01158 80916B68 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0115C 80916B6C 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC -/* 01160 80916B70 0C0300C5 */ jal func_800C0314 +/* 01160 80916B70 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01164 80916B74 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 01168 80916B78 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0116C 80916B7C 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s index 0e40158192..4ab1e2c5e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s @@ -146,7 +146,7 @@ glabel L80916E18 /* 01408 80916E18 8FA4006C */ lw $a0, 0x006C($sp) /* 0140C 80916E1C 0C019148 */ jal func_80064520 /* 01410 80916E20 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 01414 80916E24 0C03008C */ jal func_800C0230 +/* 01414 80916E24 0C03008C */ jal Gameplay_CreateSubCamera /* 01418 80916E28 8FA4006C */ lw $a0, 0x006C($sp) /* 0141C 80916E2C 3C048092 */ lui $a0, %hi(D_8091B430) ## $a0 = 80920000 /* 01420 80916E30 A60201BC */ sh $v0, 0x01BC($s0) ## 000001BC @@ -155,11 +155,11 @@ glabel L80916E18 /* 01428 80916E38 2484B430 */ addiu $a0, $a0, %lo(D_8091B430) ## $a0 = 8091B430 /* 0142C 80916E3C 8FA4006C */ lw $a0, 0x006C($sp) /* 01430 80916E40 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01434 80916E44 0C0300C5 */ jal func_800C0314 +/* 01434 80916E44 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01438 80916E48 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0143C 80916E4C 8FA4006C */ lw $a0, 0x006C($sp) /* 01440 80916E50 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC -/* 01444 80916E54 0C0300C5 */ jal func_800C0314 +/* 01444 80916E54 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01448 80916E58 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 0144C 80916E5C 3C01C3AF */ lui $at, 0xC3AF ## $at = C3AF0000 /* 01450 80916E60 44810000 */ mtc1 $at, $f0 ## $f0 = -350.00 @@ -367,7 +367,7 @@ glabel L80916F0C /* 01748 80917158 8FA4006C */ lw $a0, 0x006C($sp) /* 0174C 8091715C 248D1D64 */ addiu $t5, $a0, 0x1D64 ## $t5 = 00001D64 /* 01750 80917160 AFAD0048 */ sw $t5, 0x0048($sp) -/* 01754 80917164 0C030129 */ jal func_800C04A4 +/* 01754 80917164 0C030129 */ jal Gameplay_GetCamera /* 01758 80917168 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0175C 8091716C 8FAE0044 */ lw $t6, 0x0044($sp) /* 01760 80917170 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 @@ -1114,7 +1114,7 @@ glabel L80917738 /* 021EC 80917BFC A60F01D2 */ sh $t7, 0x01D2($s0) ## 000001D2 /* 021F0 80917C00 A61801D0 */ sh $t8, 0x01D0($s0) ## 000001D0 /* 021F4 80917C04 8FA4006C */ lw $a0, 0x006C($sp) -/* 021F8 80917C08 0C0300C5 */ jal func_800C0314 +/* 021F8 80917C08 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 021FC 80917C0C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 02200 80917C10 10000056 */ beq $zero, $zero, .L80917D6C /* 02204 80917C14 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC @@ -1169,7 +1169,7 @@ glabel L80917738 /* 022B4 80917CC4 8FA4006C */ lw $a0, 0x006C($sp) /* 022B8 80917CC8 57200028 */ bnel $t9, $zero, .L80917D6C /* 022BC 80917CCC 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC -/* 022C0 80917CD0 0C030129 */ jal func_800C04A4 +/* 022C0 80917CD0 0C030129 */ jal Gameplay_GetCamera /* 022C4 80917CD4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 022C8 80917CD8 8FA30044 */ lw $v1, 0x0044($sp) /* 022CC 80917CDC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s index 044d2c6bae..20bef3301f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s @@ -359,19 +359,19 @@ glabel func_80917D98 /* 027F4 80918204 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 027F8 80918208 0C00B7D5 */ jal func_8002DF54 /* 027FC 8091820C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02800 80918210 0C03008C */ jal func_800C0230 +/* 02800 80918210 0C03008C */ jal Gameplay_CreateSubCamera /* 02804 80918214 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 02808 80918218 A64201BC */ sh $v0, 0x01BC($s2) ## 000001BC /* 0280C 8091821C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 02810 80918220 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02814 80918224 0C0300C5 */ jal func_800C0314 +/* 02814 80918224 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 02818 80918228 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 0281C 8091822C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 02820 80918230 864501BC */ lh $a1, 0x01BC($s2) ## 000001BC -/* 02824 80918234 0C0300C5 */ jal func_800C0314 +/* 02824 80918234 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 02828 80918238 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 0282C 8091823C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 02830 80918240 0C030129 */ jal func_800C04A4 +/* 02830 80918240 0C030129 */ jal Gameplay_GetCamera /* 02834 80918244 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02838 80918248 C446005C */ lwc1 $f6, 0x005C($v0) ## 0000005C /* 0283C 8091824C E6460290 */ swc1 $f6, 0x0290($s2) ## 00000290 @@ -592,7 +592,7 @@ glabel func_80917D98 /* 02B44 80918554 A64B01D0 */ sh $t3, 0x01D0($s2) ## 000001D0 /* 02B48 80918558 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 02B4C 8091855C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02B50 80918560 0C0300C5 */ jal func_800C0314 +/* 02B50 80918560 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 02B54 80918564 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 02B58 80918568 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 02B5C 8091856C C6520028 */ lwc1 $f18, 0x0028($s2) ## 00000028 @@ -618,7 +618,7 @@ glabel func_80917D98 /* 02BA4 809185B4 10000122 */ beq $zero, $zero, .L80918A40 /* 02BA8 809185B8 02611821 */ addu $v1, $s3, $at .L809185BC: -/* 02BAC 809185BC 0C030129 */ jal func_800C04A4 +/* 02BAC 809185BC 0C030129 */ jal Gameplay_GetCamera /* 02BB0 809185C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02BB4 809185C4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02BB8 809185C8 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 @@ -890,7 +890,7 @@ glabel func_80917D98 /* 02F84 80918994 00000000 */ nop /* 02F88 80918998 45020025 */ bc1fl .L80918A30 /* 02F8C 8091899C C6400054 */ lwc1 $f0, 0x0054($s2) ## 00000054 -/* 02F90 809189A0 0C030129 */ jal func_800C04A4 +/* 02F90 809189A0 0C030129 */ jal Gameplay_GetCamera /* 02F94 809189A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02F98 809189A8 26430290 */ addiu $v1, $s2, 0x0290 ## $v1 = 00000290 /* 02F9C 809189AC 8C6E0000 */ lw $t6, 0x0000($v1) ## 00000290 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s index 8c5952d77f..c6db1e2696 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s @@ -1557,7 +1557,7 @@ glabel L8091D430 /* 01D30 8091D830 8FA401BC */ lw $a0, 0x01BC($sp) /* 01D34 8091D834 15800036 */ bne $t4, $zero, .L8091D910 /* 01D38 8091D838 00000000 */ nop -/* 01D3C 8091D83C 0C030129 */ jal func_800C04A4 +/* 01D3C 8091D83C 0C030129 */ jal Gameplay_GetCamera /* 01D40 8091D840 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01D44 8091D844 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 /* 01D48 8091D848 240F0096 */ addiu $t7, $zero, 0x0096 ## $t7 = 00000096 @@ -1577,16 +1577,16 @@ glabel L8091D430 /* 01D80 8091D880 8FA401BC */ lw $a0, 0x01BC($sp) /* 01D84 8091D884 0C019148 */ jal func_80064520 /* 01D88 8091D888 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 01D8C 8091D88C 0C03008C */ jal func_800C0230 +/* 01D8C 8091D88C 0C03008C */ jal Gameplay_CreateSubCamera /* 01D90 8091D890 8FA401BC */ lw $a0, 0x01BC($sp) /* 01D94 8091D894 A6420F62 */ sh $v0, 0x0F62($s2) ## 00000F62 /* 01D98 8091D898 8FA401BC */ lw $a0, 0x01BC($sp) /* 01D9C 8091D89C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01DA0 8091D8A0 0C0300C5 */ jal func_800C0314 +/* 01DA0 8091D8A0 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01DA4 8091D8A4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01DA8 8091D8A8 8FA401BC */ lw $a0, 0x01BC($sp) /* 01DAC 8091D8AC 86450F62 */ lh $a1, 0x0F62($s2) ## 00000F62 -/* 01DB0 8091D8B0 0C0300C5 */ jal func_800C0314 +/* 01DB0 8091D8B0 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01DB4 8091D8B4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 01DB8 8091D8B8 8E18005C */ lw $t8, 0x005C($s0) ## 0000005C /* 01DBC 8091D8BC C64A0024 */ lwc1 $f10, 0x0024($s2) ## 00000024 @@ -2120,7 +2120,7 @@ glabel L8091D918 /* 0253C 8091E03C 00000000 */ nop /* 02540 8091E040 4502001E */ bc1fl .L8091E0BC /* 02544 8091E044 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 02548 8091E048 0C030129 */ jal func_800C04A4 +/* 02548 8091E048 0C030129 */ jal Gameplay_GetCamera /* 0254C 8091E04C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02550 8091E050 8E0A0000 */ lw $t2, 0x0000($s0) ## 00000F68 /* 02554 8091E054 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s index 6d057913b0..dbd7c0c2a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s @@ -73,7 +73,7 @@ glabel func_8091F5A8 /* 03AC4 8091F5C4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 03AC8 8091F5C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03ACC 8091F5CC AFA600A4 */ sw $a2, 0x00A4($sp) -/* 03AD0 8091F5D0 0C030129 */ jal func_800C04A4 +/* 03AD0 8091F5D0 0C030129 */ jal Gameplay_GetCamera /* 03AD4 8091F5D4 AFAE0074 */ sw $t6, 0x0074($sp) /* 03AD8 8091F5D8 AFA20070 */ sw $v0, 0x0070($sp) /* 03ADC 8091F5DC 86030F60 */ lh $v1, 0x0F60($s0) ## 00000F60 @@ -175,16 +175,16 @@ glabel L8091F61C /* 03C3C 8091F73C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 03C40 8091F740 0C00B7D5 */ jal func_8002DF54 /* 03C44 8091F744 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 03C48 8091F748 0C03008C */ jal func_800C0230 +/* 03C48 8091F748 0C03008C */ jal Gameplay_CreateSubCamera /* 03C4C 8091F74C 8FA400A4 */ lw $a0, 0x00A4($sp) /* 03C50 8091F750 A6020F62 */ sh $v0, 0x0F62($s0) ## 00000F62 /* 03C54 8091F754 8FA400A4 */ lw $a0, 0x00A4($sp) /* 03C58 8091F758 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03C5C 8091F75C 0C0300C5 */ jal func_800C0314 +/* 03C5C 8091F75C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 03C60 8091F760 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03C64 8091F764 8FA400A4 */ lw $a0, 0x00A4($sp) /* 03C68 8091F768 86050F62 */ lh $a1, 0x0F62($s0) ## 00000F62 -/* 03C6C 8091F76C 0C0300C5 */ jal func_800C0314 +/* 03C6C 8091F76C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 03C70 8091F770 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 03C74 8091F774 A600015A */ sh $zero, 0x015A($s0) ## 0000015A /* 03C78 8091F778 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -976,7 +976,7 @@ glabel L80920280 /* 04800 80920300 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 04804 80920304 14410024 */ bne $v0, $at, .L80920398 /* 04808 80920308 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 0480C 8092030C 0C030129 */ jal func_800C04A4 +/* 0480C 8092030C 0C030129 */ jal Gameplay_GetCamera /* 04810 80920310 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04814 80920314 26030F68 */ addiu $v1, $s0, 0x0F68 ## $v1 = 00000F68 /* 04818 80920318 8C6E0000 */ lw $t6, 0x0000($v1) ## 00000F68 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s index 88dd146ff6..93fa4a3044 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s @@ -56,7 +56,7 @@ glabel func_809206C4 /* 04BD4 809206D4 AFA50094 */ sw $a1, 0x0094($sp) /* 04BD8 809206D8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 04BDC 809206DC AFB0001C */ sw $s0, 0x001C($sp) -/* 04BE0 809206E0 0C030129 */ jal func_800C04A4 +/* 04BE0 809206E0 0C030129 */ jal Gameplay_GetCamera /* 04BE4 809206E4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04BE8 809206E8 AFA20060 */ sw $v0, 0x0060($sp) /* 04BEC 809206EC 86240F60 */ lh $a0, 0x0F60($s1) ## 00000F60 @@ -86,16 +86,16 @@ glabel L80920734 /* 04C44 80920744 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 04C48 80920748 0C00B7D5 */ jal func_8002DF54 /* 04C4C 8092074C 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 04C50 80920750 0C03008C */ jal func_800C0230 +/* 04C50 80920750 0C03008C */ jal Gameplay_CreateSubCamera /* 04C54 80920754 8FA40094 */ lw $a0, 0x0094($sp) /* 04C58 80920758 A6220F62 */ sh $v0, 0x0F62($s1) ## 00000F62 /* 04C5C 8092075C 8FA40094 */ lw $a0, 0x0094($sp) /* 04C60 80920760 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04C64 80920764 0C0300C5 */ jal func_800C0314 +/* 04C64 80920764 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 04C68 80920768 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 04C6C 8092076C 8FA40094 */ lw $a0, 0x0094($sp) /* 04C70 80920770 86250F62 */ lh $a1, 0x0F62($s1) ## 00000F62 -/* 04C74 80920774 0C0300C5 */ jal func_800C0314 +/* 04C74 80920774 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 04C78 80920778 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 04C7C 8092077C 24180096 */ addiu $t8, $zero, 0x0096 ## $t8 = 00000096 /* 04C80 80920780 A6380F60 */ sh $t8, 0x0F60($s1) ## 00000F60 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s index e1e073891d..f2a63605ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s @@ -37,18 +37,18 @@ glabel func_8092CB0C /* 005C8 8092CB98 8FA50020 */ lw $a1, 0x0020($sp) /* 005CC 8092CB9C 0C00B7D5 */ jal func_8002DF54 /* 005D0 8092CBA0 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 005D4 8092CBA4 0C03008C */ jal func_800C0230 +/* 005D4 8092CBA4 0C03008C */ jal Gameplay_CreateSubCamera /* 005D8 8092CBA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 005DC 8092CBAC 3C018094 */ lui $at, %hi(D_80938CC4) ## $at = 80940000 /* 005E0 8092CBB0 A4228CC4 */ sh $v0, %lo(D_80938CC4)($at) /* 005E4 8092CBB4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 005E8 8092CBB8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005EC 8092CBBC 0C0300C5 */ jal func_800C0314 +/* 005EC 8092CBBC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 005F0 8092CBC0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 005F4 8092CBC4 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 /* 005F8 8092CBC8 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) /* 005FC 8092CBCC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00600 8092CBD0 0C0300C5 */ jal func_800C0314 +/* 00600 8092CBD0 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00604 8092CBD4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00608 8092CBD8 3C048093 */ lui $a0, %hi(D_8093734C) ## $a0 = 80930000 /* 0060C 8092CBDC 2484734C */ addiu $a0, $a0, %lo(D_8093734C) ## $a0 = 8093734C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s index f976e34c2d..69dc9a0a93 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s @@ -88,15 +88,15 @@ glabel func_8092CC58 /* 007B0 8092CD80 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 /* 007B4 8092CD84 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) /* 007B8 8092CD88 8FA40054 */ lw $a0, 0x0054($sp) -/* 007BC 8092CD8C 0C0300C5 */ jal func_800C0314 +/* 007BC 8092CD8C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 007C0 8092CD90 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 007C4 8092CD94 8FA40054 */ lw $a0, 0x0054($sp) /* 007C8 8092CD98 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 007CC 8092CD9C 0C0300C5 */ jal func_800C0314 +/* 007CC 8092CD9C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 007D0 8092CDA0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 007D4 8092CDA4 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 /* 007D8 8092CDA8 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 007DC 8092CDAC 0C0300E1 */ jal func_800C0384 +/* 007DC 8092CDAC 0C0300E1 */ jal Gameplay_ClearCamera /* 007E0 8092CDB0 8FA40054 */ lw $a0, 0x0054($sp) /* 007E4 8092CDB4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 007E8 8092CDB8 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s index 0a3077a1ce..d0d039a507 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s @@ -60,18 +60,18 @@ glabel func_8092EF28 /* 02A40 8092F010 0C03E803 */ jal Audio_SetBGM /* 02A44 8092F014 A07803E6 */ sb $t8, 0x03E6($v1) ## 000003E6 -/* 02A48 8092F018 0C03008C */ jal func_800C0230 +/* 02A48 8092F018 0C03008C */ jal Gameplay_CreateSubCamera /* 02A4C 8092F01C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02A50 8092F020 3C018094 */ lui $at, %hi(D_80938CC4) ## $at = 80940000 /* 02A54 8092F024 A4228CC4 */ sh $v0, %lo(D_80938CC4)($at) /* 02A58 8092F028 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02A5C 8092F02C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02A60 8092F030 0C0300C5 */ jal func_800C0314 +/* 02A60 8092F030 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 02A64 8092F034 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 02A68 8092F038 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 /* 02A6C 8092F03C 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) /* 02A70 8092F040 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A74 8092F044 0C0300C5 */ jal func_800C0314 +/* 02A74 8092F044 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 02A78 8092F048 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 02A7C 8092F04C 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 /* 02A80 8092F050 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s index b595e224f7..a431fdd881 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s @@ -32,14 +32,14 @@ glabel func_8092F8F0 /* 03398 8092F968 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0339C 8092F96C 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 033A0 8092F970 86250000 */ lh $a1, 0x0000($s1) ## 80938CC4 -/* 033A4 8092F974 0C0300C5 */ jal func_800C0314 +/* 033A4 8092F974 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 033A8 8092F978 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 033AC 8092F97C 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 033B0 8092F980 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 033B4 8092F984 0C0300C5 */ jal func_800C0314 +/* 033B4 8092F984 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 033B8 8092F988 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 033BC 8092F98C 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 033C0 8092F990 0C0300E1 */ jal func_800C0384 +/* 033C0 8092F990 0C0300E1 */ jal Gameplay_ClearCamera /* 033C4 8092F994 86250000 */ lh $a1, 0x0000($s1) ## 80938CC4 /* 033C8 8092F998 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 033CC 8092F99C 8EC51C44 */ lw $a1, 0x1C44($s6) ## 00001C44 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s index dbe8a9850a..08598a1cfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s @@ -54,16 +54,16 @@ glabel func_8093C910 /* 03CB0 8093C980 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 03CB4 8093C984 0C00B7D5 */ jal func_8002DF54 /* 03CB8 8093C988 24060039 */ addiu $a2, $zero, 0x0039 ## $a2 = 00000039 -/* 03CBC 8093C98C 0C03008C */ jal func_800C0230 +/* 03CBC 8093C98C 0C03008C */ jal Gameplay_CreateSubCamera /* 03CC0 8093C990 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03CC4 8093C994 A62205FC */ sh $v0, 0x05FC($s1) ## 000005FC /* 03CC8 8093C998 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03CCC 8093C99C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03CD0 8093C9A0 0C0300C5 */ jal func_800C0314 +/* 03CD0 8093C9A0 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 03CD4 8093C9A4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03CD8 8093C9A8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03CDC 8093C9AC 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC -/* 03CE0 8093C9B0 0C0300C5 */ jal func_800C0314 +/* 03CE0 8093C9B0 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 03CE4 8093C9B4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 03CE8 8093C9B8 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 03CEC 8093C9BC 44812000 */ mtc1 $at, $f4 ## $f4 = 800.00 @@ -710,7 +710,7 @@ glabel func_8093C910 /* 04620 8093D2F0 2638060C */ addiu $t8, $s1, 0x060C ## $t8 = 0000060C /* 04624 8093D2F4 AFB80048 */ sw $t8, 0x0048($sp) /* 04628 8093D2F8 AFAF004C */ sw $t7, 0x004C($sp) -/* 0462C 8093D2FC 0C030129 */ jal func_800C04A4 +/* 0462C 8093D2FC 0C030129 */ jal Gameplay_GetCamera /* 04630 8093D300 26300600 */ addiu $s0, $s1, 0x0600 ## $s0 = 00000600 /* 04634 8093D304 8E080000 */ lw $t0, 0x0000($s0) ## 00000600 /* 04638 8093D308 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s index d6f98abe4e..3b2854791f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s @@ -148,16 +148,16 @@ glabel L8093D670 /* 049F4 8093D6C4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 049F8 8093D6C8 0C00B7D5 */ jal func_8002DF54 /* 049FC 8093D6CC 24060039 */ addiu $a2, $zero, 0x0039 ## $a2 = 00000039 -/* 04A00 8093D6D0 0C03008C */ jal func_800C0230 +/* 04A00 8093D6D0 0C03008C */ jal Gameplay_CreateSubCamera /* 04A04 8093D6D4 8FA400A4 */ lw $a0, 0x00A4($sp) /* 04A08 8093D6D8 A62205FC */ sh $v0, 0x05FC($s1) ## 000005FC /* 04A0C 8093D6DC 8FA400A4 */ lw $a0, 0x00A4($sp) /* 04A10 8093D6E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04A14 8093D6E4 0C0300C5 */ jal func_800C0314 +/* 04A14 8093D6E4 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 04A18 8093D6E8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 04A1C 8093D6EC 8FA400A4 */ lw $a0, 0x00A4($sp) /* 04A20 8093D6F0 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC -/* 04A24 8093D6F4 0C0300C5 */ jal func_800C0314 +/* 04A24 8093D6F4 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 04A28 8093D6F8 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 04A2C 8093D6FC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 04A30 8093D700 3C0143E1 */ lui $at, 0x43E1 ## $at = 43E10000 @@ -1643,7 +1643,7 @@ glabel L8093E854 /* 05F7C 8093EC4C 24010104 */ addiu $at, $zero, 0x0104 ## $at = 00000104 /* 05F80 8093EC50 14610026 */ bne $v1, $at, .L8093ECEC /* 05F84 8093EC54 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 05F88 8093EC58 0C030129 */ jal func_800C04A4 +/* 05F88 8093EC58 0C030129 */ jal Gameplay_GetCamera /* 05F8C 8093EC5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 05F90 8093EC60 8E0F0000 */ lw $t7, 0x0000($s0) ## 00000600 /* 05F94 8093EC64 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s index ee2a7fdcfc..f4eadf1dcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s @@ -25,7 +25,7 @@ glabel func_8093F9E4 /* 06D38 8093FA08 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 06D3C 8093FA0C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 06D40 8093FA10 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 06D44 8093FA14 0C030129 */ jal func_800C04A4 +/* 06D44 8093FA14 0C030129 */ jal Gameplay_GetCamera /* 06D48 8093FA18 AFAE00CC */ sw $t6, 0x00CC($sp) /* 06D4C 8093FA1C 26500568 */ addiu $s0, $s2, 0x0568 ## $s0 = 00000568 /* 06D50 8093FA20 AFA200C8 */ sw $v0, 0x00C8($sp) @@ -294,16 +294,16 @@ glabel L8093FDC0 /* 07108 8093FDD8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 0710C 8093FDDC 0C00B7D5 */ jal func_8002DF54 /* 07110 8093FDE0 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 07114 8093FDE4 0C03008C */ jal func_800C0230 +/* 07114 8093FDE4 0C03008C */ jal Gameplay_CreateSubCamera /* 07118 8093FDE8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 0711C 8093FDEC A64205FC */ sh $v0, 0x05FC($s2) ## 000005FC /* 07120 8093FDF0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 07124 8093FDF4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 07128 8093FDF8 0C0300C5 */ jal func_800C0314 +/* 07128 8093FDF8 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0712C 8093FDFC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 07130 8093FE00 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 07134 8093FE04 864505FC */ lh $a1, 0x05FC($s2) ## 000005FC -/* 07138 8093FE08 0C0300C5 */ jal func_800C0314 +/* 07138 8093FE08 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0713C 8093FE0C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 07140 8093FE10 8FA300C8 */ lw $v1, 0x00C8($sp) /* 07144 8093FE14 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 @@ -800,7 +800,7 @@ glabel L809402FC /* 0784C 8094051C 298103FC */ slti $at, $t4, 0x03FC /* 07850 80940520 5420005E */ bnel $at, $zero, .L8094069C /* 07854 80940524 864505FC */ lh $a1, 0x05FC($s2) ## 000005FC -/* 07858 80940528 0C030129 */ jal func_800C04A4 +/* 07858 80940528 0C030129 */ jal Gameplay_GetCamera /* 0785C 8094052C 26701C24 */ addiu $s0, $s3, 0x1C24 ## $s0 = 00001C24 /* 07860 80940530 26510600 */ addiu $s1, $s2, 0x0600 ## $s1 = 00000600 /* 07864 80940534 8E390000 */ lw $t9, 0x0000($s1) ## 00000600 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s index b68595d72e..35a978a9ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s @@ -278,18 +278,18 @@ glabel L80950024 /* 00EE0 809501A0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00EE4 809501A4 0C019148 */ jal func_80064520 /* 00EE8 809501A8 26851D64 */ addiu $a1, $s4, 0x1D64 ## $a1 = 00001D64 -/* 00EEC 809501AC 0C03008C */ jal func_800C0230 +/* 00EEC 809501AC 0C03008C */ jal Gameplay_CreateSubCamera /* 00EF0 809501B0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00EF4 809501B4 3C108096 */ lui $s0, %hi(D_8095C23C) ## $s0 = 80960000 /* 00EF8 809501B8 2610C23C */ addiu $s0, $s0, %lo(D_8095C23C) ## $s0 = 8095C23C /* 00EFC 809501BC A6020000 */ sh $v0, 0x0000($s0) ## 8095C23C /* 00F00 809501C0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00F04 809501C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00F08 809501C8 0C0300C5 */ jal func_800C0314 +/* 00F08 809501C8 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00F0C 809501CC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00F10 809501D0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00F14 809501D4 86050000 */ lh $a1, 0x0000($s0) ## 8095C23C -/* 00F18 809501D8 0C0300C5 */ jal func_800C0314 +/* 00F18 809501D8 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00F1C 809501DC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00F20 809501E0 3C01430C */ lui $at, 0x430C ## $at = 430C0000 /* 00F24 809501E4 44819000 */ mtc1 $at, $f18 ## $f18 = 140.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s index dc280185f6..1b1f9c3657 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s @@ -148,19 +148,19 @@ glabel L809508B0 /* 01600 809508C0 85EFC23C */ lh $t7, %lo(D_8095C23C)($t7) /* 01604 809508C4 55E00006 */ bnel $t7, $zero, .L809508E0 /* 01608 809508C8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0160C 809508CC 0C03008C */ jal func_800C0230 +/* 0160C 809508CC 0C03008C */ jal Gameplay_CreateSubCamera /* 01610 809508D0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01614 809508D4 3C018096 */ lui $at, %hi(D_8095C23C) ## $at = 80960000 /* 01618 809508D8 A422C23C */ sh $v0, %lo(D_8095C23C)($at) /* 0161C 809508DC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 .L809508E0: /* 01620 809508E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01624 809508E4 0C0300C5 */ jal func_800C0314 +/* 01624 809508E4 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01628 809508E8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0162C 809508EC 3C058096 */ lui $a1, %hi(D_8095C23C) ## $a1 = 80960000 /* 01630 809508F0 84A5C23C */ lh $a1, %lo(D_8095C23C)($a1) /* 01634 809508F4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01638 809508F8 0C0300C5 */ jal func_800C0314 +/* 01638 809508F8 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0163C 809508FC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 01640 80950900 3C014150 */ lui $at, 0x4150 ## $at = 41500000 /* 01644 80950904 44813000 */ mtc1 $at, $f6 ## $f6 = 13.00 @@ -290,19 +290,19 @@ glabel L80950AC0 /* 01810 80950AD0 85ADC23C */ lh $t5, %lo(D_8095C23C)($t5) /* 01814 80950AD4 55A00006 */ bnel $t5, $zero, .L80950AF0 /* 01818 80950AD8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0181C 80950ADC 0C03008C */ jal func_800C0230 +/* 0181C 80950ADC 0C03008C */ jal Gameplay_CreateSubCamera /* 01820 80950AE0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01824 80950AE4 3C018096 */ lui $at, %hi(D_8095C23C) ## $at = 80960000 /* 01828 80950AE8 A422C23C */ sh $v0, %lo(D_8095C23C)($at) /* 0182C 80950AEC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 .L80950AF0: /* 01830 80950AF0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01834 80950AF4 0C0300C5 */ jal func_800C0314 +/* 01834 80950AF4 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01838 80950AF8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0183C 80950AFC 3C058096 */ lui $a1, %hi(D_8095C23C) ## $a1 = 80960000 /* 01840 80950B00 84A5C23C */ lh $a1, %lo(D_8095C23C)($a1) /* 01844 80950B04 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01848 80950B08 0C0300C5 */ jal func_800C0314 +/* 01848 80950B08 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0184C 80950B0C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 01850 80950B10 3C014150 */ lui $at, 0x4150 ## $at = 41500000 /* 01854 80950B14 44819000 */ mtc1 $at, $f18 ## $f18 = 13.00 @@ -976,7 +976,7 @@ glabel L809514D0 /* 0221C 809514DC 2719FFFF */ addiu $t9, $t8, 0xFFFF ## $t9 = FFFFFFFF /* 02220 809514E0 17200020 */ bne $t9, $zero, .L80951564 /* 02224 809514E4 AE390198 */ sw $t9, 0x0198($s1) ## 00000198 -/* 02228 809514E8 0C0300E1 */ jal func_800C0384 +/* 02228 809514E8 0C0300E1 */ jal Gameplay_ClearCamera /* 0222C 809514EC 84A5C23C */ lh $a1, %lo(D_8095C23C)($a1) /* 02230 809514F0 3C018096 */ lui $at, %hi(D_8095C23C) ## $at = 80960000 /* 02234 809514F4 A420C23C */ sh $zero, %lo(D_8095C23C)($at) @@ -985,7 +985,7 @@ glabel L809514D0 /* 02240 80951500 26451D64 */ addiu $a1, $s2, 0x1D64 ## $a1 = 00001D64 /* 02244 80951504 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 02248 80951508 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0224C 8095150C 0C0300C5 */ jal func_800C0314 +/* 0224C 8095150C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 02250 80951510 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 02254 80951514 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 02258 80951518 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s index 18fdfee125..e51095f691 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s @@ -59,7 +59,7 @@ glabel func_809533F4 /* 04154 80953414 AFB1003C */ sw $s1, 0x003C($sp) /* 04158 80953418 AFB00038 */ sw $s0, 0x0038($sp) /* 0415C 8095341C F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 04160 80953420 0C030129 */ jal func_800C04A4 +/* 04160 80953420 0C030129 */ jal Gameplay_GetCamera /* 04164 80953424 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04168 80953428 3C0F8096 */ lui $t7, %hi(D_809668D2) ## $t7 = 80960000 /* 0416C 8095342C 81EF68D2 */ lb $t7, %lo(D_809668D2)($t7) @@ -83,18 +83,18 @@ glabel L80953460 /* 041B0 80953470 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 041B4 80953474 0C019148 */ jal func_80064520 /* 041B8 80953478 26851D64 */ addiu $a1, $s4, 0x1D64 ## $a1 = 00001D64 -/* 041BC 8095347C 0C03008C */ jal func_800C0230 +/* 041BC 8095347C 0C03008C */ jal Gameplay_CreateSubCamera /* 041C0 80953480 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 041C4 80953484 3C018096 */ lui $at, %hi(D_8095C23C) ## $at = 80960000 /* 041C8 80953488 A422C23C */ sh $v0, %lo(D_8095C23C)($at) /* 041CC 8095348C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 041D0 80953490 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 041D4 80953494 0C0300C5 */ jal func_800C0314 +/* 041D4 80953494 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 041D8 80953498 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 041DC 8095349C 3C058096 */ lui $a1, %hi(D_8095C23C) ## $a1 = 80960000 /* 041E0 809534A0 84A5C23C */ lh $a1, %lo(D_8095C23C)($a1) /* 041E4 809534A4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 041E8 809534A8 0C0300C5 */ jal func_800C0314 +/* 041E8 809534A8 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 041EC 809534AC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 041F0 809534B0 C6640024 */ lwc1 $f4, 0x0024($s3) ## 00000024 /* 041F4 809534B4 3C058096 */ lui $a1, %hi(D_80966908) ## $a1 = 80960000 @@ -521,7 +521,7 @@ glabel L80953A84 /* 0483C 80953AFC 258DFFFF */ addiu $t5, $t4, 0xFFFF ## $t5 = FFFFFFFF /* 04840 80953B00 15A0006E */ bne $t5, $zero, .L80953CBC /* 04844 80953B04 AE6D0198 */ sw $t5, 0x0198($s3) ## 00000198 -/* 04848 80953B08 0C0300E1 */ jal func_800C0384 +/* 04848 80953B08 0C0300E1 */ jal Gameplay_ClearCamera /* 0484C 80953B0C 84A5C23C */ lh $a1, %lo(D_8095C23C)($a1) /* 04850 80953B10 3C018096 */ lui $at, %hi(D_8095C23C) ## $at = 80960000 /* 04854 80953B14 A420C23C */ sh $zero, %lo(D_8095C23C)($at) @@ -530,7 +530,7 @@ glabel L80953A84 /* 04860 80953B20 26851D64 */ addiu $a1, $s4, 0x1D64 ## $a1 = 00001D64 /* 04864 80953B24 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 04868 80953B28 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0486C 80953B2C 0C0300C5 */ jal func_800C0314 +/* 0486C 80953B2C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 04870 80953B30 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 04874 80953B34 3C0F8096 */ lui $t7, %hi(D_809668D8) ## $t7 = 80960000 /* 04878 80953B38 25EF68D8 */ addiu $t7, $t7, %lo(D_809668D8) ## $t7 = 809668D8 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s index 0cf508fa2f..f0a1fe71f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s @@ -94,7 +94,7 @@ glabel func_8095A188 /* 0AF08 8095A1C8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0AF0C 8095A1CC 3C058096 */ lui $a1, %hi(D_8095C23C) ## $a1 = 80960000 /* 0AF10 8095A1D0 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0AF14 8095A1D4 0C030129 */ jal func_800C04A4 +/* 0AF14 8095A1D4 0C030129 */ jal Gameplay_GetCamera /* 0AF18 8095A1D8 84A5C23C */ lh $a1, %lo(D_8095C23C)($a1) /* 0AF1C 8095A1DC 3C068096 */ lui $a2, %hi(D_8095C490) ## $a2 = 80960000 /* 0AF20 8095A1E0 AFA20134 */ sw $v0, 0x0134($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s index c2e6674d86..17f987754b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s @@ -17,7 +17,7 @@ glabel func_80986A5C /* 01EB8 80986A98 00000000 */ nop /* 01EBC 80986A9C 45020008 */ bc1fl .L80986AC0 /* 01EC0 80986AA0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01EC4 80986AA4 0C02FF21 */ jal func_800BFC84 +/* 01EC4 80986AA4 0C02FF21 */ jal Gameplay_InCsMode /* 01EC8 80986AA8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01ECC 80986AAC 54400004 */ bnel $v0, $zero, .L80986AC0 /* 01ED0 80986AB0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997220.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997220.s index 5332fe1c29..bc4aff6164 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997220.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997220.s @@ -88,7 +88,7 @@ glabel func_80997220 /* 010D0 80997370 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 010D4 80997374 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 010D8 80997378 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 010DC 8099737C 0C0302BD */ jal func_800C0AF4 +/* 010DC 8099737C 0C0302BD */ jal Gameplay_SetupRespawnPoint /* 010E0 80997380 24060EFF */ addiu $a2, $zero, 0x0EFF ## $a2 = 00000EFF .L80997384: /* 010E4 80997384 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s index e57e91861e..4a65d31b5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s @@ -51,7 +51,7 @@ glabel func_809973E8 /* 011FC 8099749C 2405281D */ addiu $a1, $zero, 0x281D ## $a1 = 0000281D /* 01200 809974A0 8FA4004C */ lw $a0, 0x004C($sp) -/* 01204 809974A4 0C030129 */ jal func_800C04A4 +/* 01204 809974A4 0C030129 */ jal Gameplay_GetCamera /* 01208 809974A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0120C 809974AC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 01210 809974B0 0C024BE2 */ jal Quake_Add diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s index 68db0d9eec..28d7855d01 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s @@ -7,7 +7,7 @@ glabel func_8099803C /* 01DB0 80998050 AFBF001C */ sw $ra, 0x001C($sp) /* 01DB4 80998054 00072C00 */ sll $a1, $a3, 16 /* 01DB8 80998058 AFA60030 */ sw $a2, 0x0030($sp) -/* 01DBC 8099805C 0C030129 */ jal func_800C04A4 +/* 01DBC 8099805C 0C030129 */ jal Gameplay_GetCamera /* 01DC0 80998060 00052C03 */ sra $a1, $a1, 16 /* 01DC4 80998064 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 01DC8 80998068 0C024BE2 */ jal Quake_Add diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999EE0.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999EE0.s index 3b6e5f1b37..071547fea0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999EE0.s @@ -12,16 +12,16 @@ glabel func_80999EE0 /* 01788 80999F08 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0178C 80999F0C 15E10030 */ bne $t7, $at, .L80999FD0 /* 01790 80999F10 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01794 80999F14 0C0300C5 */ jal func_800C0314 +/* 01794 80999F14 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01798 80999F18 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0179C 80999F1C 0C03008C */ jal func_800C0230 +/* 0179C 80999F1C 0C03008C */ jal Gameplay_CreateSubCamera /* 017A0 80999F20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 017A4 80999F24 3C03809A */ lui $v1, %hi(D_8099CCA2) ## $v1 = 809A0000 /* 017A8 80999F28 2463CCA2 */ addiu $v1, $v1, %lo(D_8099CCA2) ## $v1 = 8099CCA2 /* 017AC 80999F2C A4620000 */ sh $v0, 0x0000($v1) ## 8099CCA2 /* 017B0 80999F30 84650000 */ lh $a1, 0x0000($v1) ## 8099CCA2 /* 017B4 80999F34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017B8 80999F38 0C0300C5 */ jal func_800C0314 +/* 017B8 80999F38 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 017BC 80999F3C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 017C0 80999F40 3C014244 */ lui $at, 0x4244 ## $at = 42440000 /* 017C4 80999F44 C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999FE4.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999FE4.s index 08cb145ff9..fbaf1c499f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999FE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999FE4.s @@ -32,7 +32,7 @@ glabel func_80999FE4 /* 018D8 8099A058 3C05809A */ lui $a1, %hi(D_8099CCA2) ## $a1 = 809A0000 /* 018DC 8099A05C 84A5CCA2 */ lh $a1, %lo(D_8099CCA2)($a1) /* 018E0 8099A060 8FA40024 */ lw $a0, 0x0024($sp) -/* 018E4 8099A064 0C0300C5 */ jal func_800C0314 +/* 018E4 8099A064 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 018E8 8099A068 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 018EC 8099A06C 8FB80020 */ lw $t8, 0x0020($sp) /* 018F0 8099A070 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E8C.s index 373237d95b..dfbaba0126 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C4E8C.s @@ -85,16 +85,16 @@ glabel func_809C4E8C /* 00154 809C4F94 8FA30024 */ lw $v1, 0x0024($sp) /* 00158 809C4F98 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 0015C 809C4F9C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00160 809C4FA0 0C03008C */ jal func_800C0230 +/* 00160 809C4FA0 0C03008C */ jal Gameplay_CreateSubCamera /* 00164 809C4FA4 A46D0150 */ sh $t5, 0x0150($v1) ## 00000150 /* 00168 809C4FA8 A6020152 */ sh $v0, 0x0152($s0) ## 00000152 /* 0016C 809C4FAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00170 809C4FB0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00174 809C4FB4 0C0300C5 */ jal func_800C0314 +/* 00174 809C4FB4 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00178 809C4FB8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0017C 809C4FBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00180 809C4FC0 86050152 */ lh $a1, 0x0152($s0) ## 00000152 -/* 00184 809C4FC4 0C0300C5 */ jal func_800C0314 +/* 00184 809C4FC4 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00188 809C4FC8 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 0018C 809C4FCC 3C01809C */ lui $at, %hi(D_809C5778) ## $at = 809C0000 /* 00190 809C4FD0 C4225778 */ lwc1 $f2, %lo(D_809C5778)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C53F0.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C53F0.s index 2ec884241f..cdf1c41d46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C53F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C53F0.s @@ -31,11 +31,11 @@ glabel func_809C53F0 /* 00618 809C5458 84C50152 */ lh $a1, 0x0152($a2) ## 00000152 .L809C545C: /* 0061C 809C545C AFA60018 */ sw $a2, 0x0018($sp) -/* 00620 809C5460 0C0300E1 */ jal func_800C0384 +/* 00620 809C5460 0C0300E1 */ jal Gameplay_ClearCamera /* 00624 809C5464 8FA4001C */ lw $a0, 0x001C($sp) /* 00628 809C5468 8FA4001C */ lw $a0, 0x001C($sp) /* 0062C 809C546C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00630 809C5470 0C0300C5 */ jal func_800C0314 +/* 00630 809C5470 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00634 809C5474 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00638 809C5478 8FA4001C */ lw $a0, 0x001C($sp) /* 0063C 809C547C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s index 9733dfc789..3a0ead27cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s @@ -754,16 +754,16 @@ glabel EnClearTag_Update /* 01088 809D4638 8FA400CC */ lw $a0, 0x00CC($sp) /* 0108C 809D463C 0C019148 */ jal func_80064520 /* 01090 809D4640 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 01094 809D4644 0C03008C */ jal func_800C0230 +/* 01094 809D4644 0C03008C */ jal Gameplay_CreateSubCamera /* 01098 809D4648 8FA400CC */ lw $a0, 0x00CC($sp) /* 0109C 809D464C A62201E2 */ sh $v0, 0x01E2($s1) ## 000001E2 /* 010A0 809D4650 8FA400CC */ lw $a0, 0x00CC($sp) /* 010A4 809D4654 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 010A8 809D4658 0C0300C5 */ jal func_800C0314 +/* 010A8 809D4658 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 010AC 809D465C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 010B0 809D4660 8FA400CC */ lw $a0, 0x00CC($sp) /* 010B4 809D4664 862501E2 */ lh $a1, 0x01E2($s1) ## 000001E2 -/* 010B8 809D4668 0C0300C5 */ jal func_800C0314 +/* 010B8 809D4668 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 010BC 809D466C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 010C0 809D4670 9230017C */ lbu $s0, 0x017C($s1) ## 0000017C .L809D4674: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3710.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3710.s index 49d8da199a..84a8751711 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3710.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3710.s @@ -74,16 +74,16 @@ glabel func_809E3710 /* 00CEC 809E381C E600021C */ swc1 $f0, 0x021C($s0) ## 0000021C /* 00CF0 809E3820 C600002C */ lwc1 $f0, 0x002C($s0) ## 0000002C /* 00CF4 809E3824 E6000238 */ swc1 $f0, 0x0238($s0) ## 00000238 -/* 00CF8 809E3828 0C03008C */ jal func_800C0230 +/* 00CF8 809E3828 0C03008C */ jal Gameplay_CreateSubCamera /* 00CFC 809E382C E6000220 */ swc1 $f0, 0x0220($s0) ## 00000220 /* 00D00 809E3830 AE020204 */ sw $v0, 0x0204($s0) ## 00000204 /* 00D04 809E3834 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00D08 809E3838 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00D0C 809E383C 0C0300C5 */ jal func_800C0314 +/* 00D0C 809E383C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00D10 809E3840 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00D14 809E3844 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00D18 809E3848 86050206 */ lh $a1, 0x0206($s0) ## 00000206 -/* 00D1C 809E384C 0C0300C5 */ jal func_800C0314 +/* 00D1C 809E384C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00D20 809E3850 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00D24 809E3854 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00D28 809E3858 86050206 */ lh $a1, 0x0206($s0) ## 00000206 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s index 8d2337b87f..0b6fc77546 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s @@ -14,11 +14,11 @@ glabel func_809E3954 /* 00E34 809E3964 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00E38 809E3968 AFBF0034 */ sw $ra, 0x0034($sp) /* 00E3C 809E396C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00E40 809E3970 0C0300E1 */ jal func_800C0384 +/* 00E40 809E3970 0C0300E1 */ jal Gameplay_ClearCamera /* 00E44 809E3974 86050206 */ lh $a1, 0x0206($s0) ## 00000206 /* 00E48 809E3978 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E4C 809E397C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00E50 809E3980 0C0300C5 */ jal func_800C0314 +/* 00E50 809E3980 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00E54 809E3984 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00E58 809E3988 AE0001FC */ sw $zero, 0x01FC($s0) ## 000001FC /* 00E5C 809E398C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s index 506adff521..53589606c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s @@ -9,7 +9,7 @@ glabel func_809EDB08 /* 002B4 809EDB24 AFBF001C */ sw $ra, 0x001C($sp) /* 002B8 809EDB28 15C10020 */ bne $t6, $at, .L809EDBAC /* 002BC 809EDB2C AFA50024 */ sw $a1, 0x0024($sp) -/* 002C0 809EDB30 0C02FF21 */ jal func_800BFC84 +/* 002C0 809EDB30 0C02FF21 */ jal Gameplay_InCsMode /* 002C4 809EDB34 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 002C8 809EDB38 1440001C */ bne $v0, $zero, .L809EDBAC /* 002CC 809EDB3C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s index 8e88721588..6adeac0d98 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s @@ -16,16 +16,16 @@ glabel func_809EE1F4 /* 0099C 809EE20C 0C02927F */ jal SkelAnime_FrameUpdateMatrix /* 009A0 809EE210 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 009A4 809EE214 0C03008C */ jal func_800C0230 +/* 009A4 809EE214 0C03008C */ jal Gameplay_CreateSubCamera /* 009A8 809EE218 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 009AC 809EE21C A60202A0 */ sh $v0, 0x02A0($s0) ## 000002A0 /* 009B0 809EE220 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 009B4 809EE224 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 009B8 809EE228 0C0300C5 */ jal func_800C0314 +/* 009B8 809EE228 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 009BC 809EE22C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 009C0 809EE230 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 009C4 809EE234 860502A0 */ lh $a1, 0x02A0($s0) ## 000002A0 -/* 009C8 809EE238 0C0300C5 */ jal func_800C0314 +/* 009C8 809EE238 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 009CC 809EE23C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 009D0 809EE240 3C01C352 */ lui $at, 0xC352 ## $at = C3520000 /* 009D4 809EE244 44812000 */ mtc1 $at, $f4 ## $f4 = -210.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE780.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE780.s index a4be7c97a5..557db281fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE780.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE780.s @@ -11,11 +11,11 @@ glabel func_809EE780 /* 00F30 809EE7A0 8FA40024 */ lw $a0, 0x0024($sp) /* 00F34 809EE7A4 55C00012 */ bnel $t6, $zero, .L809EE7F0 /* 00F38 809EE7A8 8FBF001C */ lw $ra, 0x001C($sp) -/* 00F3C 809EE7AC 0C0300E1 */ jal func_800C0384 +/* 00F3C 809EE7AC 0C0300E1 */ jal Gameplay_ClearCamera /* 00F40 809EE7B0 860502A0 */ lh $a1, 0x02A0($s0) ## 000002A0 /* 00F44 809EE7B4 8FA40024 */ lw $a0, 0x0024($sp) /* 00F48 809EE7B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00F4C 809EE7BC 0C0300C5 */ jal func_800C0314 +/* 00F4C 809EE7BC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00F50 809EE7C0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00F54 809EE7C4 240F405A */ addiu $t7, $zero, 0x405A ## $t7 = 0000405A /* 00F58 809EE7C8 A60F010E */ sh $t7, 0x010E($s0) ## 0000010E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1CF4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1CF4.s index 4b42133186..48102a478e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1CF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1CF4.s @@ -19,7 +19,7 @@ glabel func_809F1CF4 /* 00254 809F1D34 00000000 */ nop /* 00258 809F1D38 45020017 */ bc1fl .L809F1D98 /* 0025C 809F1D3C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00260 809F1D40 0C02FF21 */ jal func_800BFC84 +/* 00260 809F1D40 0C02FF21 */ jal Gameplay_InCsMode /* 00264 809F1D44 8FA40034 */ lw $a0, 0x0034($sp) /* 00268 809F1D48 14400012 */ bne $v0, $zero, .L809F1D94 /* 0026C 809F1D4C 8FB9002C */ lw $t9, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s index 25c440578f..66a38501e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s @@ -129,7 +129,7 @@ glabel func_80A053F0 /* 03998 80A055C8 248460E8 */ addiu $a0, $a0, %lo(D_80A060E8) ## $a0 = 80A060E8 .L80A055CC: -/* 0399C 80A055CC 0C02FF21 */ jal func_800BFC84 +/* 0399C 80A055CC 0C02FF21 */ jal Gameplay_InCsMode /* 039A0 80A055D0 8FA4003C */ lw $a0, 0x003C($sp) /* 039A4 80A055D4 1440000E */ bne $v0, $zero, .L80A05610 /* 039A8 80A055D8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F6F8.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F6F8.s index a2fd095578..8f4aa6c511 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F6F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F6F8.s @@ -15,7 +15,7 @@ glabel func_80A0F6F8 /* 004B8 80A0F718 AFB20048 */ sw $s2, 0x0048($sp) /* 004BC 80A0F71C AFB00040 */ sw $s0, 0x0040($sp) /* 004C0 80A0F720 F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 004C4 80A0F724 0C030129 */ jal func_800C04A4 +/* 004C4 80A0F724 0C030129 */ jal Gameplay_GetCamera /* 004C8 80A0F728 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 004CC 80A0F72C 86230158 */ lh $v1, 0x0158($s1) ## 00000158 /* 004D0 80A0F730 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s index a213d5e5a1..619738bc21 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s @@ -4,16 +4,16 @@ glabel func_80A462D8 /* 035B0 80A462E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 035B4 80A462E4 AFBF001C */ sw $ra, 0x001C($sp) /* 035B8 80A462E8 AFA5002C */ sw $a1, 0x002C($sp) -/* 035BC 80A462EC 0C03008C */ jal func_800C0230 +/* 035BC 80A462EC 0C03008C */ jal Gameplay_CreateSubCamera /* 035C0 80A462F0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 035C4 80A462F4 A602059A */ sh $v0, 0x059A($s0) ## 0000059A /* 035C8 80A462F8 8FA4002C */ lw $a0, 0x002C($sp) /* 035CC 80A462FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 035D0 80A46300 0C0300C5 */ jal func_800C0314 +/* 035D0 80A46300 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 035D4 80A46304 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 035D8 80A46308 8FA4002C */ lw $a0, 0x002C($sp) /* 035DC 80A4630C 8605059A */ lh $a1, 0x059A($s0) ## 0000059A -/* 035E0 80A46310 0C0300C5 */ jal func_800C0314 +/* 035E0 80A46310 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 035E4 80A46314 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 035E8 80A46318 8E040208 */ lw $a0, 0x0208($s0) ## 00000208 /* 035EC 80A4631C 260504AC */ addiu $a1, $s0, 0x04AC ## $a1 = 000004AC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A463D8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A463D8.s index 4655b042a1..64b45ac627 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A463D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A463D8.s @@ -5,11 +5,11 @@ glabel func_80A463D8 /* 036B4 80A463E4 AFA5001C */ sw $a1, 0x001C($sp) /* 036B8 80A463E8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 036BC 80A463EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 036C0 80A463F0 0C0300C5 */ jal func_800C0314 +/* 036C0 80A463F0 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 036C4 80A463F4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 036C8 80A463F8 8FAE0018 */ lw $t6, 0x0018($sp) /* 036CC 80A463FC 8FA4001C */ lw $a0, 0x001C($sp) -/* 036D0 80A46400 0C0300E1 */ jal func_800C0384 +/* 036D0 80A46400 0C0300E1 */ jal Gameplay_ClearCamera /* 036D4 80A46404 85C5059A */ lh $a1, 0x059A($t6) ## 0000059A /* 036D8 80A46408 8FBF0014 */ lw $ra, 0x0014($sp) /* 036DC 80A4640C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E910.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E910.s index a2cafe57ed..c4ea47b4ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E910.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/func_80A4E910.s @@ -57,7 +57,7 @@ glabel func_80A4E910 /* 0069C 80A4E9BC 00000000 */ nop /* 006A0 80A4E9C0 4502000D */ bc1fl .L80A4E9F8 /* 006A4 80A4E9C4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 006A8 80A4E9C8 0C02FF21 */ jal func_800BFC84 +/* 006A8 80A4E9C8 0C02FF21 */ jal Gameplay_InCsMode /* 006AC 80A4E9CC 8FA4003C */ lw $a0, 0x003C($sp) /* 006B0 80A4E9D0 14400004 */ bne $v0, $zero, .L80A4E9E4 /* 006B4 80A4E9D4 8FA4003C */ lw $a0, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s index b1c999633a..e534ab83b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s @@ -47,16 +47,16 @@ glabel func_80A5372C /* 008FC 80A5379C E7B00010 */ swc1 $f16, 0x0010($sp) /* 00900 80A537A0 240800C8 */ addiu $t0, $zero, 0x00C8 ## $t0 = 000000C8 /* 00904 80A537A4 A60802F2 */ sh $t0, 0x02F2($s0) ## 000002F2 -/* 00908 80A537A8 0C03008C */ jal func_800C0230 +/* 00908 80A537A8 0C03008C */ jal Gameplay_CreateSubCamera /* 0090C 80A537AC 8FA40034 */ lw $a0, 0x0034($sp) /* 00910 80A537B0 A6020310 */ sh $v0, 0x0310($s0) ## 00000310 /* 00914 80A537B4 8FA40034 */ lw $a0, 0x0034($sp) /* 00918 80A537B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0091C 80A537BC 0C0300C5 */ jal func_800C0314 +/* 0091C 80A537BC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00920 80A537C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00924 80A537C4 8FA40034 */ lw $a0, 0x0034($sp) /* 00928 80A537C8 86050310 */ lh $a1, 0x0310($s0) ## 00000310 -/* 0092C 80A537CC 0C0300C5 */ jal func_800C0314 +/* 0092C 80A537CC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00930 80A537D0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00934 80A537D4 3C0180A5 */ lui $at, %hi(D_80A552D0) ## $at = 80A50000 /* 00938 80A537D8 C42452D0 */ lwc1 $f4, %lo(D_80A552D0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53850.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53850.s index 5f4c673715..d0fe83201c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53850.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53850.s @@ -25,11 +25,11 @@ glabel func_80A53850 /* 00A08 80A538A8 57200013 */ bnel $t9, $zero, .L80A538F8 /* 00A0C 80A538AC 8FBF001C */ lw $ra, 0x001C($sp) .L80A538B0: -/* 00A10 80A538B0 0C0300E1 */ jal func_800C0384 +/* 00A10 80A538B0 0C0300E1 */ jal Gameplay_ClearCamera /* 00A14 80A538B4 86050310 */ lh $a1, 0x0310($s0) ## 00000310 /* 00A18 80A538B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A1C 80A538BC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00A20 80A538C0 0C0300C5 */ jal func_800C0314 +/* 00A20 80A538C0 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00A24 80A538C4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00A28 80A538C8 0C041B33 */ jal func_80106CCC /* 00A2C 80A538CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s index 3f2391efba..654834895d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s @@ -42,16 +42,16 @@ glabel func_80A53DF8 /* 00FC4 80A53E64 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00FC8 80A53E68 240800C8 */ addiu $t0, $zero, 0x00C8 ## $t0 = 000000C8 /* 00FCC 80A53E6C A60802F2 */ sh $t0, 0x02F2($s0) ## 000002F2 -/* 00FD0 80A53E70 0C03008C */ jal func_800C0230 +/* 00FD0 80A53E70 0C03008C */ jal Gameplay_CreateSubCamera /* 00FD4 80A53E74 8FA40034 */ lw $a0, 0x0034($sp) /* 00FD8 80A53E78 A6020310 */ sh $v0, 0x0310($s0) ## 00000310 /* 00FDC 80A53E7C 8FA40034 */ lw $a0, 0x0034($sp) /* 00FE0 80A53E80 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00FE4 80A53E84 0C0300C5 */ jal func_800C0314 +/* 00FE4 80A53E84 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00FE8 80A53E88 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00FEC 80A53E8C 8FA40034 */ lw $a0, 0x0034($sp) /* 00FF0 80A53E90 86050310 */ lh $a1, 0x0310($s0) ## 00000310 -/* 00FF4 80A53E94 0C0300C5 */ jal func_800C0314 +/* 00FF4 80A53E94 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00FF8 80A53E98 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00FFC 80A53E9C 3C01C28E */ lui $at, 0xC28E ## $at = C28E0000 /* 01000 80A53EA0 44810000 */ mtc1 $at, $f0 ## $f0 = -71.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53F30.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53F30.s index fec4dd051d..cd770612fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53F30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53F30.s @@ -22,11 +22,11 @@ glabel func_80A53F30 /* 010DC 80A53F7C 55E0002A */ bnel $t7, $zero, .L80A54028 /* 010E0 80A53F80 8FBF001C */ lw $ra, 0x001C($sp) .L80A53F84: -/* 010E4 80A53F84 0C0300E1 */ jal func_800C0384 +/* 010E4 80A53F84 0C0300E1 */ jal Gameplay_ClearCamera /* 010E8 80A53F88 86050310 */ lh $a1, 0x0310($s0) ## 00000310 /* 010EC 80A53F8C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 010F0 80A53F90 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 010F4 80A53F94 0C0300C5 */ jal func_800C0314 +/* 010F4 80A53F94 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 010F8 80A53F98 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 010FC 80A53F9C 9202030A */ lbu $v0, 0x030A($s0) ## 0000030A /* 01100 80A53FA0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A781CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A781CC.s index ddd97608dd..8009122b9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A781CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A781CC.s @@ -3,7 +3,7 @@ glabel func_80A781CC /* 03EC0 80A781D0 AFBF0014 */ sw $ra, 0x0014($sp) /* 03EC4 80A781D4 AFA40018 */ sw $a0, 0x0018($sp) /* 03EC8 80A781D8 AFA5001C */ sw $a1, 0x001C($sp) -/* 03ECC 80A781DC 0C02FF21 */ jal func_800BFC84 +/* 03ECC 80A781DC 0C02FF21 */ jal Gameplay_InCsMode /* 03ED0 80A781E0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 03ED4 80A781E4 1440001A */ bne $v0, $zero, .L80A78250 /* 03ED8 80A781E8 3C0E80A7 */ lui $t6, %hi(EnIk_Update) ## $t6 = 80A70000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s index 1cc61b351b..14c7e4ee63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s @@ -14,16 +14,16 @@ glabel func_80A79C78 /* 00CF8 80A79CA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00CFC 80A79CAC 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 00D00 80A79CB0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00D04 80A79CB4 0C03008C */ jal func_800C0230 +/* 00D04 80A79CB4 0C03008C */ jal Gameplay_CreateSubCamera /* 00D08 80A79CB8 A5D90004 */ sh $t9, 0x0004($t6) ## FFFFFFE0 /* 00D0C 80A79CBC A60201F0 */ sh $v0, 0x01F0($s0) ## 000001F0 /* 00D10 80A79CC0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00D14 80A79CC4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00D18 80A79CC8 0C0300C5 */ jal func_800C0314 +/* 00D18 80A79CC8 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00D1C 80A79CCC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00D20 80A79CD0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00D24 80A79CD4 860501F0 */ lh $a1, 0x01F0($s0) ## 000001F0 -/* 00D28 80A79CD8 0C0300C5 */ jal func_800C0314 +/* 00D28 80A79CD8 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00D2C 80A79CDC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00D30 80A79CE0 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 00D34 80A79CE4 3C014270 */ lui $at, 0x4270 ## $at = 42700000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s index e229891a9c..d72ad343a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s @@ -14,18 +14,18 @@ glabel func_80A7AA40 /* 01AC0 80A7AA70 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01AC4 80A7AA74 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01AC8 80A7AA78 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 01ACC 80A7AA7C 0C03008C */ jal func_800C0230 +/* 01ACC 80A7AA7C 0C03008C */ jal Gameplay_CreateSubCamera /* 01AD0 80A7AA80 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC /* 01AD4 80A7AA84 A60201F0 */ sh $v0, 0x01F0($s0) ## 000001F0 /* 01AD8 80A7AA88 862807A0 */ lh $t0, 0x07A0($s1) ## 000007A0 /* 01ADC 80A7AA8C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01AE0 80A7AA90 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01AE4 80A7AA94 A60801F2 */ sh $t0, 0x01F2($s0) ## 000001F2 -/* 01AE8 80A7AA98 0C0300C5 */ jal func_800C0314 +/* 01AE8 80A7AA98 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01AEC 80A7AA9C 860501F2 */ lh $a1, 0x01F2($s0) ## 000001F2 /* 01AF0 80A7AAA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01AF4 80A7AAA4 860501F0 */ lh $a1, 0x01F0($s0) ## 000001F0 -/* 01AF8 80A7AAA8 0C0300C5 */ jal func_800C0314 +/* 01AF8 80A7AAA8 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01AFC 80A7AAAC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 01B00 80A7AAB0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 01B04 80A7AAB4 44811000 */ mtc1 $at, $f2 ## $f2 = 50.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AE84.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AE84.s index d3842265be..098ba10043 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AE84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AE84.s @@ -6,11 +6,11 @@ glabel func_80A7AE84 /* 01EE4 80A7AE94 AFA5001C */ sw $a1, 0x001C($sp) /* 01EE8 80A7AE98 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01EEC 80A7AE9C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 01EF0 80A7AEA0 0C0300C5 */ jal func_800C0314 +/* 01EF0 80A7AEA0 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01EF4 80A7AEA4 85C501F2 */ lh $a1, 0x01F2($t6) ## 000001F2 /* 01EF8 80A7AEA8 8FAF0018 */ lw $t7, 0x0018($sp) /* 01EFC 80A7AEAC 8FA4001C */ lw $a0, 0x001C($sp) -/* 01F00 80A7AEB0 0C0300E1 */ jal func_800C0384 +/* 01F00 80A7AEB0 0C0300E1 */ jal Gameplay_ClearCamera /* 01F04 80A7AEB4 85E501F0 */ lh $a1, 0x01F0($t7) ## 000001F0 /* 01F08 80A7AEB8 8FA4001C */ lw $a0, 0x001C($sp) /* 01F0C 80A7AEBC 8FA50018 */ lw $a1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D130.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D130.s index 88d551c88e..fd1dbdda8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D130.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D130.s @@ -19,18 +19,18 @@ glabel func_80A9D130 /* 00C10 80A9D160 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00C14 80A9D164 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00C18 80A9D168 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 00C1C 80A9D16C 0C03008C */ jal func_800C0230 +/* 00C1C 80A9D16C 0C03008C */ jal Gameplay_CreateSubCamera /* 00C20 80A9D170 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC /* 00C24 80A9D174 A6020212 */ sh $v0, 0x0212($s0) ## 00000212 /* 00C28 80A9D178 862807A0 */ lh $t0, 0x07A0($s1) ## 000007A0 /* 00C2C 80A9D17C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00C30 80A9D180 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00C34 80A9D184 A6080214 */ sh $t0, 0x0214($s0) ## 00000214 -/* 00C38 80A9D188 0C0300C5 */ jal func_800C0314 +/* 00C38 80A9D188 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00C3C 80A9D18C 86050214 */ lh $a1, 0x0214($s0) ## 00000214 /* 00C40 80A9D190 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00C44 80A9D194 86050212 */ lh $a1, 0x0212($s0) ## 00000212 -/* 00C48 80A9D198 0C0300C5 */ jal func_800C0314 +/* 00C48 80A9D198 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00C4C 80A9D19C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00C50 80A9D1A0 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 /* 00C54 80A9D1A4 27A60030 */ addiu $a2, $sp, 0x0030 ## $a2 = FFFFFFE8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D3C8.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D3C8.s index 0566504714..798ac79dbe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D3C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D3C8.s @@ -6,11 +6,11 @@ glabel func_80A9D3C8 /* 00E88 80A9D3D8 AFA5001C */ sw $a1, 0x001C($sp) /* 00E8C 80A9D3DC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00E90 80A9D3E0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00E94 80A9D3E4 0C0300C5 */ jal func_800C0314 +/* 00E94 80A9D3E4 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00E98 80A9D3E8 85C50214 */ lh $a1, 0x0214($t6) ## 00000214 /* 00E9C 80A9D3EC 8FAF0018 */ lw $t7, 0x0018($sp) /* 00EA0 80A9D3F0 8FA4001C */ lw $a0, 0x001C($sp) -/* 00EA4 80A9D3F4 0C0300E1 */ jal func_800C0384 +/* 00EA4 80A9D3F4 0C0300E1 */ jal Gameplay_ClearCamera /* 00EA8 80A9D3F8 85E50212 */ lh $a1, 0x0212($t7) ## 00000212 /* 00EAC 80A9D3FC 8FA4001C */ lw $a0, 0x001C($sp) /* 00EB0 80A9D400 8FA50018 */ lw $a1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s index 19c9eae29a..930d0c883b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s @@ -379,7 +379,7 @@ glabel func_80A9F408 /* 00924 80A9F904 0C03D095 */ jal func_800F4254 /* 00928 80A9F908 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 .L80A9F90C: -/* 0092C 80A9F90C 0C02FF21 */ jal func_800BFC84 +/* 0092C 80A9F90C 0C02FF21 */ jal Gameplay_InCsMode /* 00930 80A9F910 8FA40054 */ lw $a0, 0x0054($sp) /* 00934 80A9F914 50400004 */ beql $v0, $zero, .L80A9F928 /* 00938 80A9F918 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s index 9b95b073df..3ab60f3dc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s @@ -97,7 +97,7 @@ glabel func_80A9F9B4 .L80A9FAE8: /* 00B08 80A9FAE8 0C2A7E4E */ jal func_80A9F938 /* 00B0C 80A9FAEC 8FA50034 */ lw $a1, 0x0034($sp) -/* 00B10 80A9FAF0 0C02FF21 */ jal func_800BFC84 +/* 00B10 80A9FAF0 0C02FF21 */ jal Gameplay_InCsMode /* 00B14 80A9FAF4 8FA40034 */ lw $a0, 0x0034($sp) /* 00B18 80A9FAF8 50400004 */ beql $v0, $zero, .L80A9FB0C /* 00B1C 80A9FAFC 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s index aefea655d4..001735e536 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s @@ -54,7 +54,7 @@ glabel func_80ACC00C /* 02130 80ACC050 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 /* 02134 80ACC054 45020060 */ bc1fl .L80ACC1D8 /* 02138 80ACC058 3C014214 */ lui $at, 0x4214 ## $at = 42140000 -/* 0213C 80ACC05C 0C02FF21 */ jal func_800BFC84 +/* 0213C 80ACC05C 0C02FF21 */ jal Gameplay_InCsMode /* 02140 80ACC060 8FA40034 */ lw $a0, 0x0034($sp) /* 02144 80ACC064 5440005C */ bnel $v0, $zero, .L80ACC1D8 /* 02148 80ACC068 3C014214 */ lui $at, 0x4214 ## $at = 42140000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD30D0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD30D0.s index f29287c480..85aadd313a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD30D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD30D0.s @@ -24,7 +24,7 @@ glabel func_80AD30D0 .L80AD3128: /* 00478 80AD3128 1462000F */ bne $v1, $v0, .L80AD3168 /* 0047C 80AD312C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00480 80AD3130 0C02FF21 */ jal func_800BFC84 +/* 00480 80AD3130 0C02FF21 */ jal Gameplay_InCsMode /* 00484 80AD3134 AFA70018 */ sw $a3, 0x0018($sp) /* 00488 80AD3138 10400005 */ beq $v0, $zero, .L80AD3150 /* 0048C 80AD313C 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC780.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC780.s index ca02fd9d41..5b562a0eed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC780.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC780.s @@ -9,7 +9,7 @@ glabel func_80AEC780 /* 01B8C 80AEC79C 1040001B */ beq $v0, $zero, .L80AEC80C /* 01B90 80AEC7A0 8FA30018 */ lw $v1, 0x0018($sp) /* 01B94 80AEC7A4 8FA40024 */ lw $a0, 0x0024($sp) -/* 01B98 80AEC7A8 0C02FF21 */ jal func_800BFC84 +/* 01B98 80AEC7A8 0C02FF21 */ jal Gameplay_InCsMode /* 01B9C 80AEC7AC AFA30018 */ sw $v1, 0x0018($sp) /* 01BA0 80AEC7B0 14400016 */ bne $v0, $zero, .L80AEC80C /* 01BA4 80AEC7B4 8FA30018 */ lw $v1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s index 158dfc0b26..e1fc4b7903 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s @@ -16,7 +16,7 @@ glabel func_80AF683C /* 01300 80AF6860 00000000 */ nop /* 01304 80AF6864 4503001C */ bc1tl .L80AF68D8 /* 01308 80AF6868 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0130C 80AF686C 0C02FF21 */ jal func_800BFC84 +/* 0130C 80AF686C 0C02FF21 */ jal Gameplay_InCsMode /* 01310 80AF6870 AFA5001C */ sw $a1, 0x001C($sp) /* 01314 80AF6874 14400017 */ bne $v0, $zero, .L80AF68D4 /* 01318 80AF6878 8FA5001C */ lw $a1, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14E28.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14E28.s index 08fb8581c0..0d43808ad2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14E28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14E28.s @@ -10,18 +10,18 @@ glabel func_80B14E28 /* 01394 80B14E34 AFBF001C */ sw $ra, 0x001C($sp) /* 01398 80B14E38 AFB00014 */ sw $s0, 0x0014($sp) /* 0139C 80B14E3C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 013A0 80B14E40 0C03008C */ jal func_800C0230 +/* 013A0 80B14E40 0C03008C */ jal Gameplay_CreateSubCamera /* 013A4 80B14E44 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 013A8 80B14E48 A62202D0 */ sh $v0, 0x02D0($s1) ## 000002D0 /* 013AC 80B14E4C 860E07A0 */ lh $t6, 0x07A0($s0) ## 000007A0 /* 013B0 80B14E50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 013B4 80B14E54 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 013B8 80B14E58 A62E02D2 */ sh $t6, 0x02D2($s1) ## 000002D2 -/* 013BC 80B14E5C 0C0300C5 */ jal func_800C0314 +/* 013BC 80B14E5C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 013C0 80B14E60 862502D2 */ lh $a1, 0x02D2($s1) ## 000002D2 /* 013C4 80B14E64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 013C8 80B14E68 862502D0 */ lh $a1, 0x02D0($s1) ## 000002D0 -/* 013CC 80B14E6C 0C0300C5 */ jal func_800C0314 +/* 013CC 80B14E6C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 013D0 80B14E70 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 013D4 80B14E74 3C0180B1 */ lui $at, %hi(D_80B16F54) ## $at = 80B10000 /* 013D8 80B14E78 C4206F54 */ lwc1 $f0, %lo(D_80B16F54)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14EDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14EDC.s index 6d3e9e1d24..7a36eed732 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14EDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14EDC.s @@ -6,11 +6,11 @@ glabel func_80B14EDC /* 0144C 80B14EEC AFA5001C */ sw $a1, 0x001C($sp) /* 01450 80B14EF0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01454 80B14EF4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 01458 80B14EF8 0C0300C5 */ jal func_800C0314 +/* 01458 80B14EF8 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0145C 80B14EFC 85C502D2 */ lh $a1, 0x02D2($t6) ## 000002D2 /* 01460 80B14F00 8FAF0018 */ lw $t7, 0x0018($sp) /* 01464 80B14F04 8FA4001C */ lw $a0, 0x001C($sp) -/* 01468 80B14F08 0C0300E1 */ jal func_800C0384 +/* 01468 80B14F08 0C0300E1 */ jal Gameplay_ClearCamera /* 0146C 80B14F0C 85E502D0 */ lh $a1, 0x02D0($t7) ## 000002D0 /* 01470 80B14F10 8FBF0014 */ lw $ra, 0x0014($sp) /* 01474 80B14F14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s index a5d47eae49..8ebc638d47 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s @@ -174,7 +174,7 @@ glabel func_80B154FC .L80B15760: /* 01CC0 80B15760 54400036 */ bnel $v0, $zero, .L80B1583C /* 01CC4 80B15764 963902E0 */ lhu $t9, 0x02E0($s1) ## 000002E0 -/* 01CC8 80B15768 0C02FF21 */ jal func_800BFC84 +/* 01CC8 80B15768 0C02FF21 */ jal Gameplay_InCsMode /* 01CCC 80B1576C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01CD0 80B15770 14400031 */ bne $v0, $zero, .L80B15838 /* 01CD4 80B15774 3C041000 */ lui $a0, 0x1000 ## $a0 = 10000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s index 4fe3a008b8..5067d5da10 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s @@ -35,7 +35,7 @@ glabel EnTorch2_Update /* 0047C 80B1DDFC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00480 80B1DE00 A7A8005A */ sh $t0, 0x005A($sp) /* 00484 80B1DE04 AFA60084 */ sw $a2, 0x0084($sp) -/* 00488 80B1DE08 0C030129 */ jal func_800C04A4 +/* 00488 80B1DE08 0C030129 */ jal Gameplay_GetCamera /* 0048C 80B1DE0C AFA20078 */ sw $v0, 0x0078($sp) /* 00490 80B1DE10 AFA20068 */ sw $v0, 0x0068($sp) /* 00494 80B1DE14 8FA40084 */ lw $a0, 0x0084($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s index 2e25ac113c..bea2101727 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s @@ -130,7 +130,7 @@ glabel func_80B3A4F8 /* 00728 80B3A5F8 00000000 */ nop /* 0072C 80B3A5FC 45020057 */ bc1fl .L80B3A75C /* 00730 80B3A600 A6000156 */ sh $zero, 0x0156($s0) ## 00000156 -/* 00734 80B3A604 0C02FF21 */ jal func_800BFC84 +/* 00734 80B3A604 0C02FF21 */ jal Gameplay_InCsMode /* 00738 80B3A608 8FA4002C */ lw $a0, 0x002C($sp) /* 0073C 80B3A60C 54400053 */ bnel $v0, $zero, .L80B3A75C /* 00740 80B3A610 A6000156 */ sh $zero, 0x0156($s0) ## 00000156 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s index e224892ade..74b10ddaa2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s @@ -20,7 +20,7 @@ glabel func_80B3CA84 /* 008D8 80B3CAB8 00000000 */ nop /* 008DC 80B3CABC 45000020 */ bc1f .L80B3CB40 /* 008E0 80B3CAC0 00000000 */ nop -/* 008E4 80B3CAC4 0C02FF21 */ jal func_800BFC84 +/* 008E4 80B3CAC4 0C02FF21 */ jal Gameplay_InCsMode /* 008E8 80B3CAC8 AFA5001C */ sw $a1, 0x001C($sp) /* 008EC 80B3CACC 1440001C */ bne $v0, $zero, .L80B3CB40 /* 008F0 80B3CAD0 8FA6001C */ lw $a2, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s index 8ca393e97a..5be18078c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s @@ -56,7 +56,7 @@ glabel func_80B3CBA4 /* 00A80 80B3CC60 00000000 */ nop /* 00A84 80B3CC64 45000020 */ bc1f .L80B3CCE8 /* 00A88 80B3CC68 00000000 */ nop -/* 00A8C 80B3CC6C 0C02FF21 */ jal func_800BFC84 +/* 00A8C 80B3CC6C 0C02FF21 */ jal Gameplay_InCsMode /* 00A90 80B3CC70 AFA5001C */ sw $a1, 0x001C($sp) /* 00A94 80B3CC74 1440001C */ bne $v0, $zero, .L80B3CCE8 /* 00A98 80B3CC78 8FA6001C */ lw $a2, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s index f0da2fcbeb..3b436a3901 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s @@ -33,7 +33,7 @@ glabel func_80B3CD98 /* 00C10 80B3CDF0 00000000 */ nop /* 00C14 80B3CDF4 05800017 */ bltz $t4, .L80B3CE54 /* 00C18 80B3CDF8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00C1C 80B3CDFC 0C02FF21 */ jal func_800BFC84 +/* 00C1C 80B3CDFC 0C02FF21 */ jal Gameplay_InCsMode /* 00C20 80B3CE00 AFA5001C */ sw $a1, 0x001C($sp) /* 00C24 80B3CE04 14400013 */ bne $v0, $zero, .L80B3CE54 /* 00C28 80B3CE08 8FA4001C */ lw $a0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s index beeb9375cc..d1eb37ac01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s @@ -55,16 +55,16 @@ glabel func_80B4B010 /* 005A0 80B4B0E0 0C029468 */ jal SkelAnime_ChangeAnim /* 005A4 80B4B0E4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 005A8 80B4B0E8 0C03008C */ jal func_800C0230 +/* 005A8 80B4B0E8 0C03008C */ jal Gameplay_CreateSubCamera /* 005AC 80B4B0EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 005B0 80B4B0F0 A60201E8 */ sh $v0, 0x01E8($s0) ## 000001E8 /* 005B4 80B4B0F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 005B8 80B4B0F8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005BC 80B4B0FC 0C0300C5 */ jal func_800C0314 +/* 005BC 80B4B0FC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 005C0 80B4B100 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 005C4 80B4B104 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 005C8 80B4B108 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 -/* 005CC 80B4B10C 0C0300C5 */ jal func_800C0314 +/* 005CC 80B4B10C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 005D0 80B4B110 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 005D4 80B4B114 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 005D8 80B4B118 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BF2C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BF2C.s index 592104b526..5bf3aae701 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BF2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BF2C.s @@ -107,10 +107,10 @@ glabel L80B4C070 /* 01550 80B4C090 860601E8 */ lh $a2, 0x01E8($s0) ## 000001E8 /* 01554 80B4C094 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01558 80B4C098 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0155C 80B4C09C 0C0300C5 */ jal func_800C0314 +/* 0155C 80B4C09C 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 01560 80B4C0A0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 01564 80B4C0A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01568 80B4C0A8 0C0300E1 */ jal func_800C0384 +/* 01568 80B4C0A8 0C0300E1 */ jal Gameplay_ClearCamera /* 0156C 80B4C0AC 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 /* 01570 80B4C0B0 861801E2 */ lh $t8, 0x01E2($s0) ## 000001E2 /* 01574 80B4C0B4 AE000118 */ sw $zero, 0x0118($s0) ## 00000118 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5764C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5764C.s index e6ac419ddc..34fbcd96fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5764C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5764C.s @@ -17,7 +17,7 @@ glabel func_80B5764C /* 042D8 80B57688 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 /* 042DC 80B5768C 5441000B */ bnel $v0, $at, .L80B576BC /* 042E0 80B57690 8FBF001C */ lw $ra, 0x001C($sp) -/* 042E4 80B57694 0C02FF21 */ jal func_800BFC84 +/* 042E4 80B57694 0C02FF21 */ jal Gameplay_InCsMode /* 042E8 80B57698 8FA40024 */ lw $a0, 0x0024($sp) /* 042EC 80B5769C 14400006 */ bne $v0, $zero, .L80B576B8 /* 042F0 80B576A0 8FA40024 */ lw $a0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F84.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F84.s index 861c6bd531..5edb16d677 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F84.s @@ -11,7 +11,7 @@ glabel func_80B57F84 /* 04BF8 80B57FA8 8FA5002C */ lw $a1, 0x002C($sp) /* 04BFC 80B57FAC 50400014 */ beql $v0, $zero, .L80B58000 /* 04C00 80B57FB0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 04C04 80B57FB4 0C02FF21 */ jal func_800BFC84 +/* 04C04 80B57FB4 0C02FF21 */ jal Gameplay_InCsMode /* 04C08 80B57FB8 8FA4002C */ lw $a0, 0x002C($sp) /* 04C0C 80B57FBC 1440000F */ bne $v0, $zero, .L80B57FFC /* 04C10 80B57FC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58014.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58014.s index 26497d7ced..910a1cdfe3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58014.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58014.s @@ -50,7 +50,7 @@ glabel func_80B58014 /* 04D1C 80B580CC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 04D20 80B580D0 10400014 */ beq $v0, $zero, .L80B58124 /* 04D24 80B580D4 00000000 */ nop -/* 04D28 80B580D8 0C02FF21 */ jal func_800BFC84 +/* 04D28 80B580D8 0C02FF21 */ jal Gameplay_InCsMode /* 04D2C 80B580DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 04D30 80B580E0 14400010 */ bne $v0, $zero, .L80B58124 /* 04D34 80B580E4 2418001F */ addiu $t8, $zero, 0x001F ## $t8 = 0000001F diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B584B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B584B4.s index 31e84ca562..d004640ba2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B584B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B584B4.s @@ -23,7 +23,7 @@ glabel func_80B584B4 /* 05154 80B58504 00000000 */ nop /* 05158 80B58508 5440000F */ bnel $v0, $zero, .L80B58548 /* 0515C 80B5850C 83B9002F */ lb $t9, 0x002F($sp) -/* 05160 80B58510 0C02FF21 */ jal func_800BFC84 +/* 05160 80B58510 0C02FF21 */ jal Gameplay_InCsMode /* 05164 80B58514 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 05168 80B58518 1440000A */ bne $v0, $zero, .L80B58544 /* 0516C 80B5851C 24180021 */ addiu $t8, $zero, 0x0021 ## $t8 = 00000021 @@ -57,7 +57,7 @@ glabel func_80B584B4 .L80B58584: /* 051D4 80B58584 54400018 */ bnel $v0, $zero, .L80B585E8 /* 051D8 80B58588 83AA002F */ lb $t2, 0x002F($sp) -/* 051DC 80B5858C 0C02FF21 */ jal func_800BFC84 +/* 051DC 80B5858C 0C02FF21 */ jal Gameplay_InCsMode /* 051E0 80B58590 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 051E4 80B58594 14400013 */ bne $v0, $zero, .L80B585E4 /* 051E8 80B58598 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s index ea086f8d2d..f4b28d779d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s @@ -213,16 +213,16 @@ glabel L80B62CA4 /* 003CC 80B62D8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 003D0 80B62D90 0C00B7D5 */ jal func_8002DF54 /* 003D4 80B62D94 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 003D8 80B62D98 0C03008C */ jal func_800C0230 +/* 003D8 80B62D98 0C03008C */ jal Gameplay_CreateSubCamera /* 003DC 80B62D9C 8FA4006C */ lw $a0, 0x006C($sp) /* 003E0 80B62DA0 A60201CC */ sh $v0, 0x01CC($s0) ## 000001CC /* 003E4 80B62DA4 8FA4006C */ lw $a0, 0x006C($sp) /* 003E8 80B62DA8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003EC 80B62DAC 0C0300C5 */ jal func_800C0314 +/* 003EC 80B62DAC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 003F0 80B62DB0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 003F4 80B62DB4 8FA4006C */ lw $a0, 0x006C($sp) /* 003F8 80B62DB8 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC -/* 003FC 80B62DBC 0C0300C5 */ jal func_800C0314 +/* 003FC 80B62DBC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 00400 80B62DC0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00404 80B62DC4 3C01C220 */ lui $at, 0xC220 ## $at = C2200000 /* 00408 80B62DC8 44813000 */ mtc1 $at, $f6 ## $f6 = -40.00 @@ -1283,7 +1283,7 @@ glabel L80B63C0C /* 012F8 80B63CB8 8FA4006C */ lw $a0, 0x006C($sp) /* 012FC 80B63CBC 57200026 */ bnel $t9, $zero, .L80B63D58 /* 01300 80B63CC0 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC -/* 01304 80B63CC4 0C030129 */ jal func_800C04A4 +/* 01304 80B63CC4 0C030129 */ jal Gameplay_GetCamera /* 01308 80B63CC8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0130C 80B63CCC 26030150 */ addiu $v1, $s0, 0x0150 ## $v1 = 00000150 /* 01310 80B63CD0 8C690000 */ lw $t1, 0x0000($v1) ## 00000150 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s index ecbb563cf2..76cd092375 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s @@ -565,21 +565,21 @@ glabel func_80B7825C /* 0EEE8 80B78888 01200008 */ jr $t1 /* 0EEEC 80B7888C 00000000 */ nop glabel L80B78890 -/* 0EEF0 80B78890 0C03008C */ jal func_800C0230 +/* 0EEF0 80B78890 0C03008C */ jal Gameplay_CreateSubCamera /* 0EEF4 80B78894 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0EEF8 80B78898 3C0180B8 */ lui $at, %hi(D_80B7FEC4) ## $at = 80B80000 /* 0EEFC 80B7889C A422FEC4 */ sh $v0, %lo(D_80B7FEC4)($at) /* 0EF00 80B788A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0EF04 80B788A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0EF08 80B788A8 0C0300C5 */ jal func_800C0314 +/* 0EF08 80B788A8 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0EF0C 80B788AC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0EF10 80B788B0 3C0580B8 */ lui $a1, %hi(D_80B7FEC4) ## $a1 = 80B80000 /* 0EF14 80B788B4 84A5FEC4 */ lh $a1, %lo(D_80B7FEC4)($a1) /* 0EF18 80B788B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EF1C 80B788BC 0C0300C5 */ jal func_800C0314 +/* 0EF1C 80B788BC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0EF20 80B788C0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 0EF24 80B788C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EF28 80B788C8 0C030129 */ jal func_800C04A4 +/* 0EF28 80B788C8 0C030129 */ jal Gameplay_GetCamera /* 0EF2C 80B788CC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0EF30 80B788D0 C446005C */ lwc1 $f6, 0x005C($v0) ## 0000005C /* 0EF34 80B788D4 3C0180B8 */ lui $at, %hi(D_80B7FEA8) ## $at = 80B80000 @@ -933,7 +933,7 @@ glabel L80B78930 /* 0F444 80B78DE4 8FA800E4 */ lw $t0, 0x00E4($sp) glabel L80B78DE8 /* 0F448 80B78DE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F44C 80B78DEC 0C030129 */ jal func_800C04A4 +/* 0F44C 80B78DEC 0C030129 */ jal Gameplay_GetCamera /* 0F450 80B78DF0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0F454 80B78DF4 3C0E80B8 */ lui $t6, %hi(D_80B7FEA8) ## $t6 = 80B80000 /* 0F458 80B78DF8 25CEFEA8 */ addiu $t6, $t6, %lo(D_80B7FEA8) ## $t6 = 80B7FEA8 @@ -989,25 +989,25 @@ glabel L80B78EBC /* 0F51C 80B78EBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0F520 80B78EC0 0C019148 */ jal func_80064520 /* 0F524 80B78EC4 26051D64 */ addiu $a1, $s0, 0x1D64 ## $a1 = 00001D64 -/* 0F528 80B78EC8 0C03008C */ jal func_800C0230 +/* 0F528 80B78EC8 0C03008C */ jal Gameplay_CreateSubCamera /* 0F52C 80B78ECC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0F530 80B78ED0 3C0180B8 */ lui $at, %hi(D_80B7FEC4) ## $at = 80B80000 /* 0F534 80B78ED4 A422FEC4 */ sh $v0, %lo(D_80B7FEC4)($at) /* 0F538 80B78ED8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0F53C 80B78EDC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0F540 80B78EE0 0C0300C5 */ jal func_800C0314 +/* 0F540 80B78EE0 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0F544 80B78EE4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0F548 80B78EE8 3C0580B8 */ lui $a1, %hi(D_80B7FEC4) ## $a1 = 80B80000 /* 0F54C 80B78EEC 84A5FEC4 */ lh $a1, %lo(D_80B7FEC4)($a1) /* 0F550 80B78EF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F554 80B78EF4 0C0300C5 */ jal func_800C0314 +/* 0F554 80B78EF4 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0F558 80B78EF8 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 0F55C 80B78EFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0F560 80B78F00 8FA50128 */ lw $a1, 0x0128($sp) /* 0F564 80B78F04 0C00B7D5 */ jal func_8002DF54 /* 0F568 80B78F08 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 0F56C 80B78F0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F570 80B78F10 0C030129 */ jal func_800C04A4 +/* 0F570 80B78F10 0C030129 */ jal Gameplay_GetCamera /* 0F574 80B78F14 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0F578 80B78F18 C44A005C */ lwc1 $f10, 0x005C($v0) ## 0000005C /* 0F57C 80B78F1C 3C0180B8 */ lui $at, %hi(D_80B7FEA8) ## $at = 80B80000 @@ -1050,7 +1050,7 @@ glabel L80B78F8C /* 0F60C 80B78FAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0F610 80B78FB0 26191D64 */ addiu $t9, $s0, 0x1D64 ## $t9 = 00001D64 /* 0F614 80B78FB4 AFB90038 */ sw $t9, 0x0038($sp) -/* 0F618 80B78FB8 0C030129 */ jal func_800C04A4 +/* 0F618 80B78FB8 0C030129 */ jal Gameplay_GetCamera /* 0F61C 80B78FBC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0F620 80B78FC0 3C0380B8 */ lui $v1, %hi(D_80B7FEA8) ## $v1 = 80B80000 /* 0F624 80B78FC4 2463FEA8 */ addiu $v1, $v1, %lo(D_80B7FEA8) ## $v1 = 80B7FEA8 @@ -1106,25 +1106,25 @@ glabel L80B79084 /* 0F6E4 80B79084 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0F6E8 80B79088 0C019148 */ jal func_80064520 /* 0F6EC 80B7908C 26051D64 */ addiu $a1, $s0, 0x1D64 ## $a1 = 00001D64 -/* 0F6F0 80B79090 0C03008C */ jal func_800C0230 +/* 0F6F0 80B79090 0C03008C */ jal Gameplay_CreateSubCamera /* 0F6F4 80B79094 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0F6F8 80B79098 3C0180B8 */ lui $at, %hi(D_80B7FEC4) ## $at = 80B80000 /* 0F6FC 80B7909C A422FEC4 */ sh $v0, %lo(D_80B7FEC4)($at) /* 0F700 80B790A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0F704 80B790A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0F708 80B790A8 0C0300C5 */ jal func_800C0314 +/* 0F708 80B790A8 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0F70C 80B790AC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0F710 80B790B0 3C0580B8 */ lui $a1, %hi(D_80B7FEC4) ## $a1 = 80B80000 /* 0F714 80B790B4 84A5FEC4 */ lh $a1, %lo(D_80B7FEC4)($a1) /* 0F718 80B790B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F71C 80B790BC 0C0300C5 */ jal func_800C0314 +/* 0F71C 80B790BC 0C0300C5 */ jal Gameplay_ChangeCameraStatus /* 0F720 80B790C0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 0F724 80B790C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0F728 80B790C8 8FA50128 */ lw $a1, 0x0128($sp) /* 0F72C 80B790CC 0C00B7D5 */ jal func_8002DF54 /* 0F730 80B790D0 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 0F734 80B790D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F738 80B790D8 0C030129 */ jal func_800C04A4 +/* 0F738 80B790D8 0C030129 */ jal Gameplay_GetCamera /* 0F73C 80B790DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0F740 80B790E0 C44A005C */ lwc1 $f10, 0x005C($v0) ## 0000005C /* 0F744 80B790E4 3C0380B8 */ lui $v1, %hi(D_80B7FEA8) ## $v1 = 80B80000 @@ -1357,7 +1357,7 @@ glabel L80B791B0 /* 0FA98 80B79438 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0FA9C 80B7943C 10400046 */ beq $v0, $zero, .L80B79558 /* 0FAA0 80B79440 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FAA4 80B79444 0C030129 */ jal func_800C04A4 +/* 0FAA4 80B79444 0C030129 */ jal Gameplay_GetCamera /* 0FAA8 80B79448 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0FAAC 80B7944C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0FAB0 80B79450 0C041B33 */ jal func_80106CCC @@ -1986,7 +1986,7 @@ glabel L80B7955C /* 1039C 80B79D3C 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 000000FF /* 103A0 80B79D40 5B20009A */ blezl $t9, .L80B79FAC /* 103A4 80B79D44 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 103A8 80B79D48 0C030129 */ jal func_800C04A4 +/* 103A8 80B79D48 0C030129 */ jal Gameplay_GetCamera /* 103AC 80B79D4C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 103B0 80B79D50 3C0180B8 */ lui $at, %hi(D_80B7B8D8) ## $at = 80B80000 /* 103B4 80B79D54 C424B8D8 */ lwc1 $f4, %lo(D_80B7B8D8)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s index 6e9142c858..9a69319f98 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s @@ -1523,7 +1523,7 @@ glabel L80828198 /* 14A2C 8082824C 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 14A30 80828250 AFA70010 */ sw $a3, 0x0010($sp) -/* 14A34 80828254 0C030291 */ jal func_800C0A44 +/* 14A34 80828254 0C030291 */ jal Gameplay_SaveSceneFlags /* 14A38 80828258 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A3C 8082825C 862E00A4 */ lh $t6, 0x00A4($s1) ## 000000A4 /* 14A40 80828260 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 @@ -2592,7 +2592,7 @@ glabel L808290DC /* 15958 80829178 AFA70010 */ sw $a3, 0x0010($sp) /* 1595C 8082917C A6000262 */ sh $zero, 0x0262($s0) ## 00000262 -/* 15960 80829180 0C030291 */ jal func_800C0A44 +/* 15960 80829180 0C030291 */ jal Gameplay_SaveSceneFlags /* 15964 80829184 02202025 */ or $a0, $s1, $zero ## $a0 = 8082AB98 /* 15968 80829188 863900A4 */ lh $t9, 0x00A4($s1) ## 8082AC3C /* 1596C 8082918C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 @@ -2677,7 +2677,7 @@ glabel L80829264 /* 15A94 808292B4 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 15A98 808292B8 AFA70010 */ sw $a3, 0x0010($sp) -/* 15A9C 808292BC 0C030291 */ jal func_800C0A44 +/* 15A9C 808292BC 0C030291 */ jal Gameplay_SaveSceneFlags /* 15AA0 808292C0 02202025 */ or $a0, $s1, $zero ## $a0 = 8082AB98 /* 15AA4 808292C4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 15AA8 808292C8 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 @@ -2842,7 +2842,7 @@ glabel L80829484 /* 15CD0 808294F0 240E01D0 */ addiu $t6, $zero, 0x01D0 ## $t6 = 000001D0 /* 15CD4 808294F4 17200038 */ bne $t9, $zero, .L808295D8 /* 15CD8 808294F8 00000000 */ nop -/* 15CDC 808294FC 0C030322 */ jal func_800C0C88 +/* 15CDC 808294FC 0C030322 */ jal Gameplay_TriggerRespawn /* 15CE0 80829500 02202025 */ or $a0, $s1, $zero ## $a0 = 8082AB98 /* 15CE4 80829504 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 15CE8 80829508 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832440.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832440.s index 4ab0212e82..cad69d4f54 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832440.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832440.s @@ -33,7 +33,7 @@ glabel func_80832440 /* 002A8 808324B8 0C20C8D0 */ jal func_80832340 /* 002AC 808324BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 002B0 808324C0 8FA40020 */ lw $a0, 0x0020($sp) -/* 002B4 808324C4 0C030129 */ jal func_800C04A4 +/* 002B4 808324C4 0C030129 */ jal Gameplay_GetCamera /* 002B8 808324C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 002BC 808324CC 0C016C69 */ jal func_8005B1A4 /* 002C0 808324D0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834EB8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834EB8.s index 4ef513f78f..3135d5f592 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834EB8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834EB8.s @@ -13,7 +13,7 @@ glabel func_80834EB8 /* 02CD0 80834EE0 AFA40018 */ sw $a0, 0x0018($sp) /* 02CD4 80834EE4 14400008 */ bne $v0, $zero, .L80834F08 /* 02CD8 80834EE8 8FA4001C */ lw $a0, 0x001C($sp) -/* 02CDC 80834EEC 0C030129 */ jal func_800C04A4 +/* 02CDC 80834EEC 0C030129 */ jal Gameplay_GetCamera /* 02CE0 80834EF0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02CE4 80834EF4 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 02CE8 80834EF8 0C01691C */ jal func_8005A470 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835E44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835E44.s index a4b1867c01..9ec5462a53 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835E44.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835E44.s @@ -15,7 +15,7 @@ glabel func_80835E44 /* 03C68 80835E78 10000007 */ beq $zero, $zero, .L80835E98 /* 03C6C 80835E7C 8FBF0014 */ lw $ra, 0x0014($sp) .L80835E80: -/* 03C70 80835E80 0C030129 */ jal func_800C04A4 +/* 03C70 80835E80 0C030129 */ jal Gameplay_GetCamera /* 03C74 80835E84 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03C78 80835E88 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 03C7C 80835E8C 0C0169DF */ jal func_8005A77C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EA4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EA4.s index 80b13956c3..eeb3c0405a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EA4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EA4.s @@ -6,7 +6,7 @@ glabel func_80835EA4 /* 03CA4 80835EB4 0C20D791 */ jal func_80835E44 /* 03CA8 80835EB8 24050038 */ addiu $a1, $zero, 0x0038 ## $a1 = 00000038 /* 03CAC 80835EBC 8FA40028 */ lw $a0, 0x0028($sp) -/* 03CB0 80835EC0 0C030129 */ jal func_800C04A4 +/* 03CB0 80835EC0 0C030129 */ jal Gameplay_GetCamera /* 03CB4 80835EC4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03CB8 80835EC8 8FAE002C */ lw $t6, 0x002C($sp) /* 03CBC 80835ECC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s index 42ddee613c..3440d0ff26 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s @@ -56,7 +56,7 @@ glabel func_808382DC /* 06198 808383A8 8FA40074 */ lw $a0, 0x0074($sp) /* 0619C 808383AC 50400008 */ beql $v0, $zero, .L808383D0 /* 061A0 808383B0 848200A4 */ lh $v0, 0x00A4($a0) ## 000000A4 -/* 061A4 808383B4 0C030322 */ jal func_800C0C88 +/* 061A4 808383B4 0C030322 */ jal Gameplay_TriggerRespawn /* 061A8 808383B8 8FA40074 */ lw $a0, 0x0074($sp) /* 061AC 808383BC 0C026528 */ jal func_800994A0 /* 061B0 808383C0 8FA40074 */ lw $a0, 0x0074($sp) @@ -91,7 +91,7 @@ glabel func_808382DC /* 06214 80838424 244244E4 */ addiu $v0, $v0, %lo(D_808544E4) ## $v0 = 808544E4 .L80838428: /* 06218 80838428 24060DFF */ addiu $a2, $zero, 0x0DFF ## $a2 = 00000DFF -/* 0621C 8083842C 0C0302BD */ jal func_800C0AF4 +/* 0621C 8083842C 0C0302BD */ jal Gameplay_SetupRespawnPoint /* 06220 80838430 AFA20060 */ sw $v0, 0x0060($sp) /* 06224 80838434 8FA20060 */ lw $v0, 0x0060($sp) /* 06228 80838438 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 @@ -107,7 +107,7 @@ glabel func_808382DC /* 06250 80838460 8FA40074 */ lw $a0, 0x0074($sp) /* 06254 80838464 A42FF9D4 */ sh $t7, -0x062C($at) ## 8015F9D4 .L80838468: -/* 06258 80838468 0C0302D8 */ jal func_800C0B60 +/* 06258 80838468 0C0302D8 */ jal Gameplay_TriggerVoidOut /* 0625C 8083846C 00000000 */ nop /* 06260 80838470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80838474: diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F5C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F5C.s index b5dbebcf50..cc3d9dc43b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F5C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F5C.s @@ -13,7 +13,7 @@ glabel func_80838F5C /* 06D78 80838F88 8C6E067C */ lw $t6, 0x067C($v1) ## 0000067C /* 06D7C 80838F8C 01C17825 */ or $t7, $t6, $at ## $t7 = A0000000 /* 06D80 80838F90 AC6F067C */ sw $t7, 0x067C($v1) ## 0000067C -/* 06D84 80838F94 0C030129 */ jal func_800C04A4 +/* 06D84 80838F94 0C030129 */ jal Gameplay_GetCamera /* 06D88 80838F98 8FA40018 */ lw $a0, 0x0018($sp) /* 06D8C 80838F9C 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 06D90 80838FA0 0C0169DF */ jal func_8005A77C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s index 714e15f7f4..9639f6e456 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s @@ -79,7 +79,7 @@ glabel func_80839034 .L80839160: /* 06F50 80839160 54A00008 */ bnel $a1, $zero, .L80839184 /* 06F54 80839164 8C6B1E04 */ lw $t3, 0x1E04($v1) ## 00001E04 -/* 06F58 80839168 0C0302D8 */ jal func_800C0B60 +/* 06F58 80839168 0C0302D8 */ jal Gameplay_TriggerVoidOut /* 06F5C 8083916C 8FA40040 */ lw $a0, 0x0040($sp) /* 06F60 80839170 0C026528 */ jal func_800994A0 /* 06F64 80839174 8FA40040 */ lw $a0, 0x0040($sp) @@ -144,7 +144,7 @@ glabel func_80839034 /* 07044 80839254 846C1E1A */ lh $t4, 0x1E1A($v1) ## 00001E1A /* 07048 80839258 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 0704C 8083925C 8FA40040 */ lw $a0, 0x0040($sp) -/* 07050 80839260 0C0302D8 */ jal func_800C0B60 +/* 07050 80839260 0C0302D8 */ jal Gameplay_TriggerVoidOut /* 07054 80839264 A42CF9D8 */ sh $t4, -0x0628($at) ## 8015F9D8 /* 07058 80839268 240EFFFE */ addiu $t6, $zero, 0xFFFE ## $t6 = FFFFFFFE /* 0705C 8083926C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 @@ -347,12 +347,12 @@ glabel func_80839034 /* 07324 80839534 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 07328 80839538 15810005 */ bne $t4, $at, .L80839550 /* 0732C 8083953C 00000000 */ nop -/* 07330 80839540 0C030322 */ jal func_800C0C88 +/* 07330 80839540 0C030322 */ jal Gameplay_TriggerRespawn /* 07334 80839544 8FA40040 */ lw $a0, 0x0040($sp) /* 07338 80839548 10000004 */ beq $zero, $zero, .L8083955C /* 0733C 8083954C 8FAF0040 */ lw $t7, 0x0040($sp) .L80839550: -/* 07340 80839550 0C0302D8 */ jal func_800C0B60 +/* 07340 80839550 0C0302D8 */ jal Gameplay_TriggerVoidOut /* 07344 80839554 8FA40040 */ lw $a0, 0x0040($sp) /* 07348 80839558 8FAF0040 */ lw $t7, 0x0040($sp) .L8083955C: diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s index 3d502a6087..ca7718d309 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s @@ -360,7 +360,7 @@ glabel func_80839800 /* 07B00 80839D10 1000002C */ beq $zero, $zero, .L80839DC4 /* 07B04 80839D14 8203042C */ lb $v1, 0x042C($s0) ## 0000042C .L80839D18: -/* 07B08 80839D18 0C030129 */ jal func_800C04A4 +/* 07B08 80839D18 0C030129 */ jal Gameplay_GetCamera /* 07B0C 80839D1C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 07B10 80839D20 8FB9007C */ lw $t9, 0x007C($sp) /* 07B14 80839D24 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s index 3221f1fa6f..6fa1eccbd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s @@ -25,7 +25,7 @@ glabel func_8083AD4C .L8083ADA0: /* 08B90 8083ADA0 8FA40020 */ lw $a0, 0x0020($sp) /* 08B94 8083ADA4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 08B98 8083ADA8 0C030129 */ jal func_800C04A4 +/* 08B98 8083ADA8 0C030129 */ jal Gameplay_GetCamera /* 08B9C 8083ADAC AFA3001C */ sw $v1, 0x001C($sp) /* 08BA0 8083ADB0 8FA3001C */ lw $v1, 0x001C($sp) /* 08BA4 8083ADB4 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s index bea8f79bbd..777c2534c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s @@ -363,7 +363,7 @@ glabel func_8083B040 /* 09354 8083B564 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09358 8083B568 01014825 */ or $t1, $t0, $at ## $t1 = 02000000 /* 0935C 8083B56C AE090680 */ sw $t1, 0x0680($s0) ## 00000680 -/* 09360 8083B570 0C030129 */ jal func_800C04A4 +/* 09360 8083B570 0C030129 */ jal Gameplay_GetCamera /* 09364 8083B574 8FA40034 */ lw $a0, 0x0034($sp) /* 09368 8083B578 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 0936C 8083B57C 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B8F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B8F4.s index 72d0c9473d..6552ada5dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B8F4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B8F4.s @@ -9,7 +9,7 @@ glabel func_8083B8F4 /* 09700 8083B910 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 09704 8083B914 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 09708 8083B918 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0970C 8083B91C 0C030129 */ jal func_800C04A4 +/* 0970C 8083B91C 0C030129 */ jal Gameplay_GetCamera /* 09710 8083B920 AFA60018 */ sw $a2, 0x0018($sp) /* 09714 8083B924 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 09718 8083B928 0C01691C */ jal func_8005A470 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s index f7028c498c..356392061e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s @@ -239,7 +239,7 @@ glabel func_8083E5A8 /* 0C6F4 8083E904 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0C6F8 8083E908 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0C6FC 8083E90C A5EE01F4 */ sh $t6, 0x01F4($t7) ## 000001F4 -/* 0C700 8083E910 0C030129 */ jal func_800C04A4 +/* 0C700 8083E910 0C030129 */ jal Gameplay_GetCamera /* 0C704 8083E914 8FA4003C */ lw $a0, 0x003C($sp) /* 0C708 8083E918 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 0C70C 8083E91C 0C0169DF */ jal func_8005A77C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084279C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084279C.s index 2bd73d408c..ddd810b0d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084279C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084279C.s @@ -41,7 +41,7 @@ glabel func_8084279C /* 1061C 8084282C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 10620 80842830 01215024 */ and $t2, $t1, $at /* 10624 80842834 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 10628 80842838 0C030129 */ jal func_800C04A4 +/* 10628 80842838 0C030129 */ jal Gameplay_GetCamera /* 1062C 8084283C 8FA40024 */ lw $a0, 0x0024($sp) /* 10630 80842840 0C016C69 */ jal func_8005B1A4 /* 10634 80842844 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s index e8cadcb69c..249b465a03 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s @@ -4,7 +4,7 @@ glabel func_808429B4 /* 107AC 808429BC AFA50034 */ sw $a1, 0x0034($sp) /* 107B0 808429C0 AFA60038 */ sw $a2, 0x0038($sp) /* 107B4 808429C4 AFA7003C */ sw $a3, 0x003C($sp) -/* 107B8 808429C8 0C030129 */ jal func_800C04A4 +/* 107B8 808429C8 0C030129 */ jal Gameplay_GetCamera /* 107BC 808429CC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 107C0 808429D0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 107C4 808429D4 0C024BE2 */ jal Quake_Add diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s index 13a23a56f6..971cadb0ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s @@ -5,7 +5,7 @@ glabel func_80845C68 /* 13A64 80845C74 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 /* 13A68 80845C78 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 13A6C 80845C7C 24060DFF */ addiu $a2, $zero, 0x0DFF ## $a2 = 00000DFF -/* 13A70 80845C80 0C0302BD */ jal func_800C0AF4 +/* 13A70 80845C80 0C0302BD */ jal Gameplay_SetupRespawnPoint /* 13A74 80845C84 AFA7001C */ sw $a3, 0x001C($sp) /* 13A78 80845C88 8FA7001C */ lw $a3, 0x001C($sp) .L80845C8C: diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s index a0ca15cf9d..20ae2e56f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s @@ -127,7 +127,7 @@ glabel func_80845CA4 /* 13C54 80845E64 00000000 */ nop /* 13C58 80845E68 45020018 */ bc1fl .L80845ECC /* 13C5C 80845E6C 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 13C60 80845E70 0C030129 */ jal func_800C04A4 +/* 13C60 80845E70 0C030129 */ jal Gameplay_GetCamera /* 13C64 80845E74 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 13C68 80845E78 8458014C */ lh $t8, 0x014C($v0) ## 0000014C /* 13C6C 80845E7C 33190010 */ andi $t9, $t8, 0x0010 ## $t9 = 00000000 @@ -135,7 +135,7 @@ glabel func_80845CA4 /* 13C74 80845E84 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C /* 13C78 80845E88 8FA40044 */ lw $a0, 0x0044($sp) .L80845E8C: -/* 13C7C 80845E8C 0C030129 */ jal func_800C04A4 +/* 13C7C 80845E8C 0C030129 */ jal Gameplay_GetCamera /* 13C80 80845E90 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 13C84 80845E94 0C016C69 */ jal func_8005B1A4 /* 13C88 80845E98 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845EF8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845EF8.s index 43eb02e72d..65bfa1143c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845EF8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845EF8.s @@ -57,13 +57,13 @@ glabel func_80845EF8 /* 13DB8 80845FC8 02012821 */ addu $a1, $s0, $at .L80845FCC: /* 13DBC 80845FCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13DC0 80845FD0 0C030129 */ jal func_800C04A4 +/* 13DC0 80845FD0 0C030129 */ jal Gameplay_GetCamera /* 13DC4 80845FD4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 13DC8 80845FD8 0C016C69 */ jal func_8005B1A4 /* 13DCC 80845FDC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 13DD0 80845FE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 13DD4 80845FE4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 13DD8 80845FE8 0C0302BD */ jal func_800C0AF4 +/* 13DD8 80845FE8 0C0302BD */ jal Gameplay_SetupRespawnPoint /* 13DDC 80845FEC 24060DFF */ addiu $a2, $zero, 0x0DFF ## $a2 = 00000DFF /* 13DE0 80845FF0 10000013 */ beq $zero, $zero, .L80846040 /* 13DE4 80845FF4 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s index 475e4ba7e4..c2a43314cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s @@ -11,7 +11,7 @@ glabel func_808486A8 /* 164BC 808486CC 90AF0444 */ lbu $t7, 0x0444($a1) ## 00000444 /* 164C0 808486D0 51E00009 */ beql $t7, $zero, .L808486F8 /* 164C4 808486D4 8CE2067C */ lw $v0, 0x067C($a3) ## 0000067C -/* 164C8 808486D8 0C030129 */ jal func_800C04A4 +/* 164C8 808486D8 0C030129 */ jal Gameplay_GetCamera /* 164CC 808486DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 164D0 808486E0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 164D4 808486E4 0C016911 */ jal func_8005A444 @@ -34,7 +34,7 @@ glabel func_808486A8 /* 16514 80848724 1120000B */ beq $t1, $zero, .L80848754 /* 16518 80848728 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 1651C 8084872C AFA30018 */ sw $v1, 0x0018($sp) -/* 16520 80848730 0C030129 */ jal func_800C04A4 +/* 16520 80848730 0C030129 */ jal Gameplay_GetCamera /* 16524 80848734 AFA7002C */ sw $a3, 0x002C($sp) /* 16528 80848738 8FA7002C */ lw $a3, 0x002C($sp) /* 1652C 8084873C 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 @@ -86,7 +86,7 @@ glabel func_808486A8 /* 165CC 808487DC 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 .L808487E0: /* 165D0 808487E0 AFA30018 */ sw $v1, 0x0018($sp) -/* 165D4 808487E4 0C030129 */ jal func_800C04A4 +/* 165D4 808487E4 0C030129 */ jal Gameplay_GetCamera /* 165D8 808487E8 AFA6001C */ sw $a2, 0x001C($sp) /* 165DC 808487EC 8FA6001C */ lw $a2, 0x001C($sp) /* 165E0 808487F0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 @@ -106,7 +106,7 @@ glabel func_808486A8 /* 16610 80848820 AFA30018 */ sw $v1, 0x0018($sp) /* 16614 80848824 8FA40028 */ lw $a0, 0x0028($sp) /* 16618 80848828 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1661C 8084882C 0C030129 */ jal func_800C04A4 +/* 1661C 8084882C 0C030129 */ jal Gameplay_GetCamera /* 16620 80848830 AFA7002C */ sw $a3, 0x002C($sp) /* 16624 80848834 8FA7002C */ lw $a3, 0x002C($sp) /* 16628 80848838 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 @@ -210,7 +210,7 @@ glabel func_808486A8 /* 16774 80848984 8FA40028 */ lw $a0, 0x0028($sp) .L80848988: /* 16778 80848988 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1677C 8084898C 0C030129 */ jal func_800C04A4 +/* 1677C 8084898C 0C030129 */ jal Gameplay_GetCamera /* 16780 80848990 AFA30018 */ sw $v1, 0x0018($sp) /* 16784 80848994 8FA30018 */ lw $v1, 0x0018($sp) /* 16788 80848998 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B530.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B530.s index b066df8ee8..e38dee0b5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B530.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B530.s @@ -29,7 +29,7 @@ glabel func_8084B530 /* 1938C 8084B59C 01616024 */ and $t4, $t3, $at /* 19390 8084B5A0 AE0C0680 */ sw $t4, 0x0680($s0) ## 00000680 .L8084B5A4: -/* 19394 8084B5A4 0C030129 */ jal func_800C04A4 +/* 19394 8084B5A4 0C030129 */ jal Gameplay_GetCamera /* 19398 8084B5A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 1939C 8084B5AC 0C016C69 */ jal func_8005B1A4 /* 193A0 8084B5B0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s index 62fc070403..8360e3f576 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s @@ -62,7 +62,7 @@ glabel func_8084D3E4 /* 1B2BC 8084D4CC A4591350 */ sh $t9, 0x1350($v0) ## 8015F9B0 .L8084D4D0: /* 1B2C0 8084D4D0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1B2C4 8084D4D4 0C030129 */ jal func_800C04A4 +/* 1B2C4 8084D4D4 0C030129 */ jal Gameplay_GetCamera /* 1B2C8 8084D4D8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 1B2CC 8084D4DC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 1B2D0 8084D4E0 0C0169DF */ jal func_8005A77C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DF6C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DF6C.s index dc9ab8e9a4..70b2becfcb 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DF6C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DF6C.s @@ -7,7 +7,7 @@ glabel func_8084DF6C /* 1BD70 8084DF80 01C17824 */ and $t7, $t6, $at /* 1BD74 8084DF84 ACAF067C */ sw $t7, 0x067C($a1) ## 0000067C /* 1BD78 8084DF88 A0A00434 */ sb $zero, 0x0434($a1) ## 00000434 -/* 1BD7C 8084DF8C 0C030129 */ jal func_800C04A4 +/* 1BD7C 8084DF8C 0C030129 */ jal Gameplay_GetCamera /* 1BD80 8084DF90 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 1BD84 8084DF94 0C016C69 */ jal func_8005B1A4 /* 1BD88 8084DF98 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s index 1d66a75e50..31429f6681 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s @@ -41,7 +41,7 @@ glabel func_8084E3C4 /* 1C248 8084E458 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 1C24C 8084E45C 5461002C */ bnel $v1, $at, .L8084E510 /* 1C250 8084E460 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1C254 8084E464 0C030129 */ jal func_800C04A4 +/* 1C254 8084E464 0C030129 */ jal Gameplay_GetCamera /* 1C258 8084E468 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 1C25C 8084E46C 0C016C69 */ jal func_8005B1A4 /* 1C260 8084E470 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s index c651bacdc8..1bbcc60b1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s @@ -80,7 +80,7 @@ glabel func_8084EAC0 /* 1C9C4 8084EBD4 0C20F03A */ jal func_8083C0E8 /* 1C9C8 8084EBD8 8FA50034 */ lw $a1, 0x0034($sp) /* 1C9CC 8084EBDC 8FA40034 */ lw $a0, 0x0034($sp) -/* 1C9D0 8084EBE0 0C030129 */ jal func_800C04A4 +/* 1C9D0 8084EBE0 0C030129 */ jal Gameplay_GetCamera /* 1C9D4 8084EBE4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 1C9D8 8084EBE8 0C016C69 */ jal func_8005B1A4 /* 1C9DC 8084EBEC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ECA4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ECA4.s index 7d2fb450ee..68c2a59bc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ECA4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ECA4.s @@ -46,7 +46,7 @@ glabel func_8084ECA4 /* 1CB40 8084ED50 14410052 */ bne $v0, $at, .L8084EE9C /* 1CB44 8084ED54 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 1CB48 8084ED58 A200084F */ sb $zero, 0x084F($s0) ## 0000084F -/* 1CB4C 8084ED5C 0C030129 */ jal func_800C04A4 +/* 1CB4C 8084ED5C 0C030129 */ jal Gameplay_GetCamera /* 1CB50 8084ED60 8FA4002C */ lw $a0, 0x002C($sp) /* 1CB54 8084ED64 0C016C69 */ jal func_8005B1A4 /* 1CB58 8084ED68 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s index 397d3a1f16..be0a3d565c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s @@ -15,7 +15,7 @@ glabel func_8084EED8 /* 1CCFC 8084EF0C 0C20F03A */ jal func_8083C0E8 /* 1CD00 8084EF10 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 1CD04 8084EF14 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1CD08 8084EF18 0C030129 */ jal func_800C04A4 +/* 1CD08 8084EF18 0C030129 */ jal Gameplay_GetCamera /* 1CD0C 8084EF1C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 1CD10 8084EF20 0C016C69 */ jal func_8005B1A4 /* 1CD14 8084EF24 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EFC0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EFC0.s index f6b3e9ec8e..d3649261f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EFC0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EFC0.s @@ -17,7 +17,7 @@ glabel func_8084EFC0 /* 1CDEC 8084EFFC 0C20F03A */ jal func_8083C0E8 /* 1CDF0 8084F000 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 1CDF4 8084F004 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1CDF8 8084F008 0C030129 */ jal func_800C04A4 +/* 1CDF8 8084F008 0C030129 */ jal Gameplay_GetCamera /* 1CDFC 8084F00C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 1CE00 8084F010 0C016C69 */ jal func_8005B1A4 /* 1CE04 8084F014 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F104.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F104.s index fd63c63787..e958a55b64 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F104.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F104.s @@ -109,7 +109,7 @@ glabel func_8084F104 /* 1D07C 8084F28C 8FA50024 */ lw $a1, 0x0024($sp) .L8084F290: /* 1D080 8084F290 8FA40024 */ lw $a0, 0x0024($sp) -/* 1D084 8084F294 0C030129 */ jal func_800C04A4 +/* 1D084 8084F294 0C030129 */ jal Gameplay_GetCamera /* 1D088 8084F298 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 1D08C 8084F29C 0C016C69 */ jal func_8005B1A4 /* 1D090 8084F2A0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s index 40836aed09..f823195131 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s @@ -29,7 +29,7 @@ glabel func_8084F88C /* 1D6E8 8084F8F8 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 /* 1D6EC 8084F8FC 17010008 */ bne $t8, $at, .L8084F920 /* 1D6F0 8084F900 00000000 */ nop -/* 1D6F4 8084F904 0C030322 */ jal func_800C0C88 +/* 1D6F4 8084F904 0C030322 */ jal Gameplay_TriggerRespawn /* 1D6F8 8084F908 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1D6FC 8084F90C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 1D700 8084F910 00300821 */ addu $at, $at, $s0 @@ -39,12 +39,12 @@ glabel func_8084F88C .L8084F920: /* 1D710 8084F920 04410005 */ bgez $v0, .L8084F938 /* 1D714 8084F924 00000000 */ nop -/* 1D718 8084F928 0C030322 */ jal func_800C0C88 +/* 1D718 8084F928 0C030322 */ jal Gameplay_TriggerRespawn /* 1D71C 8084F92C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1D720 8084F930 10000004 */ beq $zero, $zero, .L8084F944 /* 1D724 8084F934 3C010001 */ lui $at, 0x0001 ## $at = 00010000 .L8084F938: -/* 1D728 8084F938 0C0302D8 */ jal func_800C0B60 +/* 1D728 8084F938 0C0302D8 */ jal Gameplay_TriggerVoidOut /* 1D72C 8084F93C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8084F940: /* 1D730 8084F940 3C010001 */ lui $at, 0x0001 ## $at = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FCAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FCAC.s index eb4a78b993..a1cadee34e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FCAC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FCAC.s @@ -41,7 +41,7 @@ glabel func_8084FCAC /* 1DB18 8084FD28 398D0001 */ xori $t5, $t4, 0x0001 ## $t5 = 00000001 /* 1DB1C 8084FD2C 11A00008 */ beq $t5, $zero, .L8084FD50 /* 1DB20 8084FD30 AC4D0000 */ sw $t5, 0x0000($v0) ## 808535D0 -/* 1DB24 8084FD34 0C030129 */ jal func_800C04A4 +/* 1DB24 8084FD34 0C030129 */ jal Gameplay_GetCamera /* 1DB28 8084FD38 8FA4002C */ lw $a0, 0x002C($sp) /* 1DB2C 8084FD3C 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 1DB30 8084FD40 0C016911 */ jal func_8005A444 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s index 436e6d0790..75839f13e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s @@ -69,7 +69,7 @@ glabel func_8085063C /* 1E52C 8085073C 0C214C20 */ jal func_80853080 /* 1E530 80850740 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1E534 80850744 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E538 80850748 0C030129 */ jal func_800C04A4 +/* 1E538 80850748 0C030129 */ jal Gameplay_GetCamera /* 1E53C 8085074C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 1E540 80850750 0C016C69 */ jal func_8005B1A4 /* 1E544 80850754 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s index 8ba64811e6..9018587ffc 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s @@ -25,7 +25,7 @@ glabel func_808507F4 /* 1E63C 8085084C 0C20E7FF */ jal func_80839FFC /* 1E640 80850850 8FA5002C */ lw $a1, 0x002C($sp) /* 1E644 80850854 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E648 80850858 0C030129 */ jal func_800C04A4 +/* 1E648 80850858 0C030129 */ jal Gameplay_GetCamera /* 1E64C 8085085C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 1E650 80850860 0C016C69 */ jal func_8005B1A4 /* 1E654 80850864 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 @@ -104,7 +104,7 @@ glabel func_808507F4 /* 1E75C 8085096C A04A13B3 */ sb $t2, 0x13B3($v0) ## 8015FA13 /* 1E760 80850970 8FA4002C */ lw $a0, 0x002C($sp) /* 1E764 80850974 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 1E768 80850978 0C0302BD */ jal func_800C0AF4 +/* 1E768 80850978 0C0302BD */ jal Gameplay_SetupRespawnPoint /* 1E76C 8085097C 240606FF */ addiu $a2, $zero, 0x06FF ## $a2 = 000006FF /* 1E770 80850980 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 1E774 80850984 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s index 0db0faa25e..6589b0042c 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s @@ -22,7 +22,7 @@ glabel func_809AB9DC /* 003F8 809ABA28 860F0050 */ lh $t7, 0x0050($s0) ## 00000050 /* 003FC 809ABA2C 55E0008E */ bnel $t7, $zero, .L809ABC68 /* 00400 809ABA30 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00404 809ABA34 0C030129 */ jal func_800C04A4 +/* 00404 809ABA34 0C030129 */ jal Gameplay_GetCamera /* 00408 809ABA38 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0040C 809ABA3C 0C016A52 */ jal func_8005A948 /* 00410 809ABA40 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s index ba0483b311..cfa4578cc8 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s @@ -77,7 +77,7 @@ glabel func_80811A20 /* 0DDF0 80811B30 0C034204 */ jal Matrix_Init /* 0DDF4 80811B34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0DDF8 80811B38 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 0DDFC 80811B3C 0C02A89E */ jal func_800AA278 +/* 0DDFC 80811B3C 0C02A89E */ jal View_Init /* 0DE00 80811B40 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 0DE04 80811B44 3C0A8081 */ lui $t2, %hi(func_80810DAC) ## $t2 = 80810000 /* 0DE08 80811B48 3C0B8081 */ lui $t3, %hi(func_80811A18) ## $t3 = 80810000 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s index 4fedc0cb0e..235e68d672 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s @@ -33,7 +33,7 @@ glabel func_80801AAC /* 00F98 80801B28 AFD80044 */ sw $t8, 0x0044($s8) ## FFFFFFD4 /* 00F9C 80801B2C AFC00040 */ sw $zero, 0x0040($s8) ## FFFFFFD0 /* 00FA0 80801B30 AFC00048 */ sw $zero, 0x0048($s8) ## FFFFFFD8 -/* 00FA4 80801B34 0C02A93F */ jal func_800AA4FC +/* 00FA4 80801B34 0C02A93F */ jal View_SetViewport /* 00FA8 80801B38 27C50040 */ addiu $a1, $s8, 0x0040 ## $a1 = FFFFFFD0 /* 00FAC 80801B3C 02002025 */ or $a0, $s0, $zero ## $a0 = 000000A8 /* 00FB0 80801B40 0C02AA94 */ jal func_800AAA50 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s index e17ca02081..3b95ca5022 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s @@ -33,7 +33,7 @@ glabel func_80801BF0 /* 010DC 80801C6C AFD90044 */ sw $t9, 0x0044($s8) ## FFFFFFD4 /* 010E0 80801C70 AFC00040 */ sw $zero, 0x0040($s8) ## FFFFFFD0 /* 010E4 80801C74 AFC00048 */ sw $zero, 0x0048($s8) ## FFFFFFD8 -/* 010E8 80801C78 0C02A93F */ jal func_800AA4FC +/* 010E8 80801C78 0C02A93F */ jal View_SetViewport /* 010EC 80801C7C 27C50040 */ addiu $a1, $s8, 0x0040 ## $a1 = FFFFFFD0 /* 010F0 80801C80 02002025 */ or $a0, $s0, $zero ## $a0 = 000000A8 /* 010F4 80801C84 0C02AA94 */ jal func_800AAA50 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s index baeda181f2..98240086a3 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s @@ -30,7 +30,7 @@ glabel func_80801D04 /* 011E4 80801D74 AFB80028 */ sw $t8, 0x0028($sp) /* 011E8 80801D78 AFA00024 */ sw $zero, 0x0024($sp) /* 011EC 80801D7C AFA0002C */ sw $zero, 0x002C($sp) -/* 011F0 80801D80 0C02A93F */ jal func_800AA4FC +/* 011F0 80801D80 0C02A93F */ jal View_SetViewport /* 011F4 80801D84 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFD4 /* 011F8 80801D88 8FA40020 */ lw $a0, 0x0020($sp) /* 011FC 80801D8C 0C02AA94 */ jal func_800AAA50 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s index aeab57eb8c..d2cfb17fe5 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s @@ -32,7 +32,7 @@ glabel func_80801E44 /* 0132C 80801EBC AC800208 */ sw $zero, 0x0208($a0) ## 00000208 /* 01330 80801EC0 AC8D01D0 */ sw $t5, 0x01D0($a0) ## 000001D0 /* 01334 80801EC4 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 01338 80801EC8 0C02A89E */ jal func_800AA278 +/* 01338 80801EC8 0C02A89E */ jal View_Init /* 0133C 80801ECC 248400A8 */ addiu $a0, $a0, 0x00A8 ## $a0 = 000000A8 /* 01340 80801ED0 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 /* 01344 80801ED4 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A diff --git a/data/z_jpeg.data.s b/data/z_jpeg.data.s deleted file mode 100644 index 35fbc6fa30..0000000000 --- a/data/z_jpeg.data.s +++ /dev/null @@ -1,26 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_8011FA60 - .incbin "baserom.z64", 0xB96C00, 0x4 - -glabel D_8011FA64 - .incbin "baserom.z64", 0xB96C04, 0x4 - -glabel D_8011FA68 - .incbin "baserom.z64", 0xB96C08, 0x4 - -glabel D_8011FA6C - .incbin "baserom.z64", 0xB96C0C, 0x24 - -glabel D_8011FA90 - .incbin "baserom.z64", 0xB96C30, 0x8 - -glabel D_8011FA98 - .incbin "baserom.z64", 0xB96C38, 0x8 diff --git a/data/z_play.bss.s b/data/z_play.bss.s deleted file mode 100644 index 54682d59e9..0000000000 --- a/data/z_play.bss.s +++ /dev/null @@ -1,38 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .bss - -glabel D_801613B0 - .space 0xDC - -glabel D_8016148C - .space 0x4 - -glabel D_80161490 - .space 0x8 - -glabel D_80161498 - .space 0x18 - -glabel D_801614B0 - .space 0x3 - -glabel D_801614B3 - .space 0x5 - -glabel D_801614B8 - .space 0x10 - -glabel D_801614C8 - .space 0x8 - -glabel D_801614D0 - .space 0x2B2F - -glabel D_80163FFF - .space 0x24D1 diff --git a/data/z_play.data.s b/data/z_play.data.s deleted file mode 100644 index bd136b46d5..0000000000 --- a/data/z_play.data.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_8012D1F0 - .incbin "baserom.z64", 0xBA4390, 0x8 - -glabel D_8012D1F8 - .incbin "baserom.z64", 0xBA4398, 0x8 diff --git a/include/color.h b/include/color.h index 94c3a20d12..d18fb9844a 100644 --- a/include/color.h +++ b/include/color.h @@ -1,12 +1,18 @@ #ifndef _COLOR_H_ #define _COLOR_H_ -typedef struct { - u8 r, g, b; +typedef union { + struct { + u8 r, g, b; + }; + u32 rgb; } Color_RGB8; -typedef struct { - u8 r, g, b, a; +typedef union { + struct { + u8 r, g, b, a; + }; + u32 rgba; } Color_RGBA8; typedef struct { diff --git a/include/functions.h b/include/functions.h index 7a9d895590..d33f385181 100644 --- a/include/functions.h +++ b/include/functions.h @@ -307,7 +307,7 @@ void func_8002DE04(GlobalContext* globalCtx, Actor* actorA, Actor* actorB); void func_8002DE74(GlobalContext* globalCtx, Player* player); void func_8002DECC(GlobalContext* globalCtx, Player* player, Actor* actor); s32 func_8002DEEC(Player* player); -void func_8002DF18(GlobalContext* globalCtx, ActorContext* actorCtx); +void func_8002DF18(GlobalContext* globalCtx, Player* player); u32 func_8002DF38(GlobalContext* globalCtx, Actor* actor, u8 newAction); s32 func_8002DF54(GlobalContext* globalCtx, Actor* actor, u8 arg2); void func_8002DF90(DynaPolyActor* dynaActor); @@ -362,6 +362,7 @@ void func_800304DC(GlobalContext* globalCtx, ActorContext* actorCtx, ActorEntry* void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx); s32 func_800314D4(GlobalContext* globalCtx, Actor* actorB, Vec3f* arg2, f32 arg3); void func_80031B14(GlobalContext* globalCtx, ActorContext* actorCtx); +void func_80031C3C(ActorContext* actorCtx, GlobalContext* globalCtx); Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId, f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params); Actor* Actor_SpawnAttached(ActorContext* actorCtx, Actor* attachedTo, GlobalContext* globalCtx, s16 actorId, f32 posX, @@ -475,10 +476,10 @@ void func_80038A28(CollisionPoly*, f32, f32, f32, MtxF*); // ? func_8003C55C(?); // ? func_8003C614(?); f32 func_8003C8EC(GlobalContext*, CollisionContext*, CollisionPoly**, Vec3f*); -// ? func_8003C940(?); +f32 func_8003C940(CollisionContext*, CollisionPoly**, s32*, Vec3f*); // ? func_8003C9A4(?); f32 func_8003CA0C(GlobalContext*, CollisionContext*, CollisionPoly**, u32*, Actor*, Vec3f*); -// ? func_8003CB30(?); +f32 func_8003CB30(GlobalContext*, CollisionContext*, PosRot*, MtxF*); f32 func_8003CCA4(CollisionContext*, CollisionPoly**, s32*, Vec3f*); // ? func_8003CDD4(?); s32 func_8003D52C(CollisionContext*, Vec3f*, Vec3f*, Vec3f*, f32, CollisionPoly**, u32*, Actor*, f32); @@ -631,14 +632,14 @@ f32 func_800437F0(f32, f32); // ? func_80057C6C(?); // ? func_80057FC4(?); // ? func_80058148(?); -// ? func_80058354(?); +void Camera_ChangeStatus(Camera* camera, s16 status); // ? func_800584E8(?); // ? func_800588B4(?); // ? func_80058CF8(?); // ? func_80058D34(?); // ? func_80058E8C(?); // ? func_800591EC(?); -// ? func_80059EC8(?); +void func_80059EC8(Camera* camera); // ? func_8005A02C(?); // ? func_8005A04C(?); // ? func_8005A444(?); @@ -646,9 +647,9 @@ f32 func_800437F0(f32, f32); // ? func_8005A77C(?); // ? func_8005A7A8(?); // ? func_8005A8C4(?); -s16 func_8005A970(u32 gl790); +s16 func_8005A970(Vec3s, Camera*); s16 func_8005A9F4(Camera* camera); -// ? func_8005AA90(?); +s32 func_8005AA90(Camera*, s32, Vec3f*); // ? func_8005AC48(?); // ? func_8005AC60(?); // ? func_8005AC6C(?); @@ -727,7 +728,7 @@ s32 func_8005D1E0(GlobalContext* globalCtx, ColliderCylinderMain* collision); // ? func_8005D334(?); // ? func_8005D3A4(?); // ? func_8005D3BC(?); -void func_8005D400(UNK_TYPE, UNK_TYPE); +void func_8005D400(GlobalContext*, SubGlobalContext11E60*); // ? func_8005D40C(?); // ? func_8005D4DC(?); // ? func_8005D62C(?); @@ -812,13 +813,13 @@ s32 func_8006C4A4(GlobalContext*, s32); // ? func_8006D0AC(?); // ? func_8006D0EC(?); // ? func_8006D684(?); -// ? func_8006DC68(?); +void func_8006DC68(GlobalContext* globalCtx, Player* player); u32 Jpeg_SendTask(JpegContext* ctx); void Jpeg_CopyToZbuffer(u16* src, u16* zbuffer, s32 x, s32 y); u16 Jpeg_GetU16(u8* ptr); void Jpeg_ParseMarkers(u8* ptr, JpegContext* ctx); s32 Jpeg_Decode(void* data, u16* zbuffer, JpegWork* workBuff, u32 workSize); -// ? func_8006EA30(?); +void func_8006EA30(GlobalContext* globalCtx); // ? func_8006ECF4(?); void func_8006EE48(UNK_TYPE); // ? func_8006EE50(?); @@ -828,7 +829,7 @@ void func_8006EE48(UNK_TYPE); // ? func_8006F0A0(?); // ? func_8006F0D4(?); // ? func_8006F0FC(?); -// ? func_8006F140(?); +u8 func_8006F140(GlobalContext*, EnvironmentContext*, UNK_TYPE); f32 func_8006F93C(u16, u16, u16); f32 func_8006F9BC(u16, u16, u16, u16, u16); // ? func_8006FB94(?); @@ -838,7 +839,7 @@ f32 func_8006F9BC(u16, u16, u16, u16, u16); // ? func_80070718(?); // ? func_80070C24(?); // ? func_800730DC(?); -// ? func_80073988(?); +void func_80073988(GlobalContext*, EnvironmentContext*, View*, GraphicsContext*, Vec3f, UNK_TYPE); // ? func_80073A5C(?); f32 func_800746DC(); // ? func_80074704(?); @@ -854,7 +855,7 @@ f32 func_800746DC(); // ? func_800760F4(?); // ? func_800763A8(?); // ? func_800766C4(?); -// ? func_8007672C(?); +void func_8007672C(GraphicsContext*, u8, u8, u8, u8, UNK_TYPE); // ? func_80076934(?); void func_800773A8(GlobalContext* globalCtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4); s32 func_800775CC(); @@ -963,7 +964,7 @@ f32 func_8007BF90(Vec3f*, Vec3f*); // ? func_8007C850(?); // ? func_8007FFE0(?); // ? func_80080024(?); -s16 func_800800F8(GlobalContext* globalCtx, u32 arg1, u32 arg2, Actor* actor, u32 arg4); +s16 func_800800F8(GlobalContext* globalCtx, s16 arg1, s16 arg2, Actor* actor, s16 arg4); // ? func_800803F0(?); // ? func_80080480(?); void func_80080788(UNK_TYPE, UNK_TYPE); @@ -1012,10 +1013,10 @@ void Path_CopyLastPoint(Path* path, Vec3f* dest); // ? func_8008E6A0(?); // ? func_8008E6AC(?); // ? func_8008E750(?); -UNK_TYPE func_8008E8DC(GlobalContext*, Player*); -UNK_TYPE func_8008E988(GlobalContext*); -UNK_TYPE func_8008E9C4(Player* player); -UNK_TYPE func_8008E9D0(Player* player); +s32 func_8008E8DC(GlobalContext*, Player*); +s32 func_8008E988(GlobalContext*); +s32 func_8008E9C4(Player* player); +s32 func_8008E9D0(Player* player); // ? func_8008E9F8(?); // ? func_8008EA40(?); // ? func_8008EB2C(?); @@ -1023,22 +1024,22 @@ UNK_TYPE func_8008E9D0(Player* player); void func_8008ECAC(GlobalContext*, Player* player); void func_8008EDF0(Player*); // ? func_8008EE08(?); -UNK_TYPE func_8008EF44(GlobalContext*, UNK_TYPE); +s32 func_8008EF44(GlobalContext*, s32); // ? func_8008F034(?); u8 func_8008F080(GlobalContext*); void func_8008F08C(GlobalContext*); -UNK_TYPE func_8008F098(GlobalContext*); -UNK_TYPE func_8008F0AC(GlobalContext*); -s32 func_8008F0D8(Player* player, UNK_TYPE); -UNK_TYPE func_8008F104(Player* player); -UNK_TYPE func_8008F128(Player* player); -s32 func_8008F158(UNK_TYPE); +s32 func_8008F098(GlobalContext*); +s32 func_8008F0AC(GlobalContext*); +s32 func_8008F0D8(Player* player, s32); +s32 func_8008F104(Player* player); +s32 func_8008F128(Player* player); +s32 func_8008F158(s32); void func_8008F180(Player* player); -UNK_TYPE func_8008F1A0(Player* player); +s32 func_8008F1A0(Player* player); // ? func_8008F1CC(?); -s32 func_8008F224(Player* player, UNK_TYPE); +s32 func_8008F224(Player* player, s32); void func_8008F250(Player* player); -s32 func_8008F270(Player* player, UNK_TYPE); +s32 func_8008F270(Player* player, s32); s32 func_8008F29C(Player* player); s32 func_8008F2F8(GlobalContext*); // ? func_8008F470(?); @@ -1114,7 +1115,7 @@ Gfx* Gfx_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1 u32 x2, u32 y2, s32 width2, s32 height2, s32 r, s32 g, s32 b, s32 a); void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b); void func_80095974(GraphicsContext* gfxCtx); -void func_80095AA0(GlobalContext* globalCtx, Room* room, UNK_TYPE arg2, UNK_TYPE arg3); +void func_80095AA0(GlobalContext* globalCtx, Room* room, Input* arg2, UNK_TYPE arg3); // ? func_8009638C(?); void func_80096FD4(GlobalContext* globalCtx, Room* room); u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx); @@ -1122,12 +1123,7 @@ s32 func_8009728C(GlobalContext* globalCtx, RoomContext* roomCtx, s32 roomNum); s32 func_800973FC(GlobalContext* globalCtx, RoomContext* roomCtx); void Room_Draw(GlobalContext* globalCtx, Room* room, u32 flags); void func_80097534(GlobalContext* globalCtx, RoomContext* roomCtx); -void Sample_Calc(SampleContext* this); -void Sample_Draw(SampleContext* this); -void Sample_Update(SampleContext* this); void Sample_Destroy(SampleContext* this); -void Sample_SetupView(SampleContext* this); -void Sample_LoadTitleStatic(SampleContext* this); void Sample_Init(SampleContext* this); void Inventory_ChangeEquipment(s16 equipment, u16 value); u8 Inventory_DeleteEquipment(GlobalContext* globalCtx, s16 equipment); @@ -1263,21 +1259,19 @@ u32 func_800AA148(); void func_800AA15C(); void func_800AA16C(); void func_800AA178(u32); -void func_800AA190(UnkViewStruct* arg0, Viewport* viewport); -View* func_800AA1F8(GraphicsContext* gfxCtx); -void func_800AA250(View* view); -void func_800AA278(View*, GraphicsContext*); -void func_800AA358(View* view, Vec3f* vec1, Vec3f* vec2, Vec3f* vec3); -void func_800AA3F0(View* view, Vec3f* vec1, Vec3f* vec2, Vec3f* vec3); -void func_800AA43C(View* view, f32 arg1); -void func_800AA454(View* view, f32* arg1); -void func_800AA460(View* view, f32 fieldOfView, f32 fogDistance, f32 zDepth); -void func_800AA48C(View* view, f32* fieldOfView, f32* fogDistance, f32* zDepth); -void func_800AA4A8(View* view, f32 fieldOfView, f32 fogDistance, f32 zDepth); -void func_800AA4E0(View* view, f32* fieldOfView, f32* fogDistance, f32* zDepth); -void func_800AA4FC(View* view, Viewport* viewport); -void func_800AA52C(View* view, Viewport* viewport); -void func_800AA550(View* view); +View* View_New(GraphicsContext* gfxCtx); +void View_Free(View* view); +void View_Init(View*, GraphicsContext*); +void func_800AA358(View* view, Vec3f* eye, Vec3f* vec2, Vec3f* vec3); +void func_800AA3F0(View* view, Vec3f* eye, Vec3f* vec2, Vec3f* vec3); +void View_SetScale(View* view, f32 scale); +void View_GetScale(View* view, f32* scale); +void func_800AA460(View* view, f32 fovy, f32 near, f32 far); +void func_800AA48C(View* view, f32* fovy, f32* near, f32* far); +void func_800AA4A8(View* view, f32 fovy, f32 near, f32 far); +void func_800AA4E0(View* view, f32* fovy, f32* near, f32* far); +void View_SetViewport(View* view, Viewport* viewport); +void View_GetViewport(View* view, Viewport* viewport); void func_800AA76C(View* view, f32 arg1, f32 arg2, f32 arg3); void func_800AA78C(View* view, f32 arg1, f32 arg2, f32 arg3); void func_800AA7AC(View* view, f32 arg1); @@ -1291,7 +1285,7 @@ s32 func_800AB0A8(View* view); s32 func_800AB2C4(View* view); s32 func_800AB560(View* view); s32 func_800AB944(View* view); -// ? func_800AB9EC(?); +s32 func_800AB9EC(View* view, s32 arg1, Gfx** p); s32 func_800ABE74(f32 eyeX, f32 eyeY, f32 eyeZ); // ? func_800AC030(?); // ? func_800AC2F4(?); @@ -1308,7 +1302,7 @@ s32 func_800ABE74(f32 eyeX, f32 eyeY, f32 eyeZ); // ? func_800AD054(?); // ? func_800AD080(?); // ? func_800AD394(?); -// ? func_800AD5C0(?); +void func_800AD5C0(UNK_PTR, Gfx**); // ? func_800AD920(?); // ? func_800AD950(?); // ? func_800AD958(?); @@ -1318,50 +1312,50 @@ s32 func_800ABE74(f32 eyeX, f32 eyeY, f32 eyeZ); // ? func_800AF178(?); // ? func_800AF218(?); // ? func_800B0E50(?); -// ? func_800B1030(?); -// ? func_800B10C4(?); +void func_800B1030(SkyboxContext*, f32, f32, f32); +void func_800B10C4(SkyboxContext*, GraphicsContext*, s16, s16, f32, f32, f32); // ? func_800B1744(?); void PlayerCall_InitFuncPtrs(); // ? func_800B18B0(?); // ? func_800B1CFC(?); -// ? func_800B1DBC(?); +void func_800B1DBC(TransitionStruct*); // ? func_800B1E84(?); // ? func_800B2074(?); -// ? func_800B2188(?); -// ? func_800B23E8(?); -// ? func_800B2400(?); -// ? func_800B2438(?); -// ? func_800B24D0(?); -// ? func_800B24D8(?); -// ? func_800B25EC(?); -// ? func_800B25F4(?); -// ? func_800B2604(?); -// ? func_800B2944(?); -// ? func_800B29D0(?); -// ? func_800B2A88(?); -// ? func_800B2AB0(?); -// ? func_800B2AB8(?); -// ? func_800B2B98(?); -// ? func_800B2DD4(?); -// ? func_800B2DDC(?); -// ? func_800B2E1C(?); -// ? func_800B2E30(?); -// ? func_800B301C(?); -// ? func_800B3044(?); -// ? func_800B304C(?); -// ? func_800B31D0(?); -// ? func_800B346C(?); -// ? func_800B3474(?); -// ? func_800B34CC(?); -// ? func_800B34D4(?); -// ? func_800B34E0(?); -// ? func_800B3538(?); -// ? func_800B3560(?); -// ? func_800B3568(?); -// ? func_800B3718(?); -// ? func_800B37DC(?); -// ? func_800B37E4(?); -// ? func_800B37EC(?); +void func_800B2188(TransitionStruct*, Gfx**); +void func_800B23E8(TransitionStruct*); +void func_800B2400(UNK_ARGS); +void func_800B2438(UNK_ARGS); +void func_800B24D0(UNK_ARGS); +void func_800B24D8(UNK_ARGS); +void func_800B25EC(UNK_ARGS); +void func_800B25F4(UNK_ARGS); +void func_800B2604(UNK_ARGS); +s32 func_800B2944(UNK_ARGS); +void func_800B29D0(UNK_ARGS); +void func_800B2A88(UNK_ARGS); +void func_800B2AB0(UNK_ARGS); +void func_800B2AB8(UNK_ARGS); +void func_800B2B98(UNK_ARGS); +s32 func_800B2DD4(UNK_ARGS); +void func_800B2DDC(UNK_ARGS); +void func_800B2E1C(UNK_ARGS); +void func_800B2E30(UNK_ARGS); +void func_800B301C(UNK_ARGS); +void func_800B3044(UNK_ARGS); +void func_800B304C(UNK_ARGS); +void func_800B31D0(UNK_ARGS); +s32 func_800B346C(UNK_ARGS); +void func_800B3474(UNK_ARGS); +void func_800B34CC(UNK_ARGS); +void func_800B34D4(UNK_ARGS); +void func_800B34E0(UNK_ARGS); +void func_800B3538(UNK_ARGS); +void func_800B3560(UNK_ARGS); +void func_800B3568(UNK_ARGS); +void func_800B3718(UNK_ARGS); +s32 func_800B37DC(UNK_ARGS); +void func_800B37E4(UNK_ARGS); +void func_800B37EC(UNK_ARGS); // ? func_800B3840(?); // ? func_800B3898(?); // ? func_800B38A4(?); @@ -1422,45 +1416,40 @@ void KaleidoScopeCall_Init(GlobalContext* globalCtx); void KaleidoScopeCall_Destroy(GlobalContext* globalCtx); void KaleidoScopeCall_Update(GlobalContext* globalCtx); void KaleidoScopeCall_Draw(GlobalContext* globalCtx); -// ? func_800BC450(?); -// ? func_800BC490(?); -s32 func_800BC56C(GlobalContext*, s16); -// ? func_800BC5E0(?); -void func_800BC88C(GlobalContext*); -Gfx* func_800BC8A0(GlobalContext* globalCtx, Gfx* a1); -void func_800BC8EC(GlobalContext*); -UNK_TYPE func_800BCA64(UNK_ARGS); -// ? func_800BD314(?); -// ? func_800BED40(?); -// ? func_800BEDD8(?); -// ? func_800BFAE4(?); -s32 func_800BFC84(GlobalContext* globalCtx); -f32 func_800BFCB8(GlobalContext* globalCtx, MtxF* a1, Vec3f* a2); -void* func_800BFE5C(GlobalContext* globalCtx, RomFile* file); -// ? func_800BFEC4(?); -// ? func_800BFF0C(?); -// ? Area_Spawn(?); -// ? func_800C016C(?); -// ? func_800C0230(?); -s16 func_800C030C(GlobalContext* globalCtx); -// ? func_800C0314(?); -// ? func_800C0384(?); -Camera* func_800C04A4(GlobalContext*, s16); -// ? func_800C04D8(?); -void func_800C0704(GlobalContext*, s16, f32); -// ? func_800C0744(?); -// ? func_800C078C(?); -// ? func_800C0808(?); -// ? func_800C0874(?); -void func_800C0C88(GlobalContext* globalCtx); -// ? func_800C0A44(?); -// ? func_800C0A88(?); -void func_800C0AF4(GlobalContext*, s8, s16); -void func_800C0B60(GlobalContext* globalCtx); -void func_800C0BB4(GlobalContext* globalCtx); -// ? func_800C0CB8(?); +void func_800BC490(GlobalContext* globalCtx, s16 point); +s32 func_800BC56C(GlobalContext* globalCtx, s16 arg1); +void func_800BC590(GlobalContext* globalCtx); +void func_800BC5E0(GlobalContext* globalCtx, s32 arg1); +Gfx* func_800BC8A0(GlobalContext* globalCtx, Gfx* gfx); +void Gameplay_Destroy(GlobalContext* globalCtx); +void Gameplay_Init(GlobalContext* globalCtx); +void Gameplay_Main(GlobalContext* globalCtx); +s32 Gameplay_InCsMode(GlobalContext* globalCtx); +f32 func_800BFCB8(GlobalContext* globalCtx, MtxF* mf, Vec3f* vec); +void* Gameplay_LoadFile(GlobalContext* globalCtx, RomFile* file); +void Gameplay_SpawnScene(GlobalContext* globalCtx, s32 sceneNum, s32 spawn); +void func_800C016C(GlobalContext* globalCtx, Vec3f* src, Vec3f* dest); +s16 Gameplay_CreateSubCamera(GlobalContext* globalCtx); +s16 Gameplay_GetActiveCamId(GlobalContext* globalCtx); +void Gameplay_ChangeCameraStatus(GlobalContext* globalCtx, s16 camId, s16 status); +void Gameplay_ClearCamera(GlobalContext* globalCtx, s16 camId); +void Gameplay_ClearAllSubCameras(GlobalContext* globalCtx); +Camera* Gameplay_GetCamera(GlobalContext* globalCtx, s16 camId); +s32 func_800C04D8(GlobalContext* globalCtx, s16 camId, Vec3f* arg2, Vec3f* arg3); +s32 func_800C05E4(GlobalContext* globalCtx, s16 camId, Vec3f* arg2, Vec3f* arg3, Vec3f* arg4); +s32 func_800C0704(GlobalContext* globalCtx, s16 camId, f32 arg2); +s32 func_800C0744(GlobalContext* globalCtx, s16 camId, s16 arg2); +void func_800C078C(GlobalContext* globalCtx, s16 camId1, s16 camId2); +void func_800C0808(GlobalContext* globalCtx, s16 camId, s32 arg2, s16 arg3); +void func_800C0874(GlobalContext* globalCtx, s16 camId, s16 arg2); +void func_800C08AC(GlobalContext* globalCtx, s16 camId, s16 arg2); +void Gameplay_SaveSceneFlags(GlobalContext* globalCtx); +void Gameplay_SetupRespawnPoint(GlobalContext* globalCtx, s32 respawnMode, s32 playerParams); +void Gameplay_TriggerVoidOut(GlobalContext* globalCtx); +void Gameplay_TriggerRespawn(GlobalContext* globalCtx); +s32 func_800C0CB8(GlobalContext* globalCtx); s32 func_800C0D28(GlobalContext* globalCtx); -// ? func_800C0D34(?); +s32 func_800C0D34(GlobalContext* globalCtx, Actor* actor, s16* yaw); // ? func_800C0E70(?); // ? func_800C0EA8(?); // ? func_800C0ED8(?); @@ -1623,7 +1612,7 @@ f32 func_800CA774(f32); // ? func_800CB600(?); // ? func_800CB628(?); // ? func_800CB650(?); -// ? func_800CB678(?); +f32 func_800CB678(Vec3f*, Vec3f*); // ? func_800CB698(?); // ? func_800CB7B4(?); // ? func_800CB824(?); @@ -2361,7 +2350,7 @@ s16 sins(u16); // ? func_80101AA4(?); // ? func_80101B40(?); // ? func_80101B90(?); -void func_80101E34(MtxF*, f32, f32, f32, f32, f32, f32, f32, f32, f32); +void func_80101E34(Mtx*, f32, f32, f32, f32, f32, f32, f32, f32, f32); // ? func_80101EB0(?); // ? func_801021E4(?); // ? osStopTimer(?); @@ -2415,7 +2404,7 @@ void func_80104D00(u8 a0); // ? func_80105CF0(?); // s32 osReadMempak(OSMesgQueue* ctrlrqueue, u32 ctrlridx, s16 addr, PIF_mempak_data_t* data) u8 osMempakAddrCRC(u16 addr); -u8 osMempakDataCRC(u8 *data); +u8 osMempakDataCRC(u8* data); u32 __osSpGetStatus(); void __osSpSetStatus(u32 status); // ? osWritebackDCacheAll(?); @@ -2432,7 +2421,7 @@ OSThread* __osGetCurrFaultedThread(); // ? func_80106760(?); // ? func_801067A0(?); f32 absf(f32); -// ? func_80106860(?); +void* func_80106860(void* ptr, s32 val, size_t size); // ? func_801068B0(?); // ? func_801069B0(?); u8 func_80106BC8(GlobalContext* globalCtx); diff --git a/include/macros.h b/include/macros.h index ecd8c5acf4..9e2eefcd09 100644 --- a/include/macros.h +++ b/include/macros.h @@ -13,14 +13,16 @@ #define SQ(x) ((x)*(x)) #define ABS(x) ((x) >= 0 ? (x) : -(x)) #define DECR(x) ((x) == 0 ? 0 : ((x) -= 1)) -#define CLAMP(x,min,max) ((x) < (min) ? (min) : (x) > (max) ? (max) : (x)) +#define CLAMP(x, min, max) ((x) < (min) ? (min) : (x) > (max) ? (max) : (x)) + +#define RGBA8(r, g, b, a) (((r & 0xFF) << 24) | ((g & 0xFF) << 16) | ((b & 0xFF) << 8) | ((a & 0xFF) << 0)) #define PLAYER ((Player*)globalCtx->actorCtx.actorList[ACTORTYPE_PLAYER].first) #define YEARS_CHILD 5 #define YEARS_ADULT 17 -#define LINK_IS_CHILD (gSaveContext.link_age != 0) -#define LINK_IS_ADULT (gSaveContext.link_age == 0) +#define LINK_IS_CHILD (gSaveContext.linkAge != 0) +#define LINK_IS_ADULT (gSaveContext.linkAge == 0) #define LINK_AGE_IN_YEARS (LINK_IS_CHILD ? YEARS_CHILD : YEARS_ADULT) #define SLOT(item) gItemSlots[item] @@ -35,6 +37,8 @@ #define CAPACITY(upg, value) gUpgradeCapacities[upg][value] #define CUR_CAPACITY(upg) CAPACITY(upg, CUR_UPG_VALUE(upg)) +#define CHECK_QUEST_ITEM(item) (gBitFlags[item] & gSaveContext.questItems) + #define SET_NEXT_GAMESTATE(curState, newInit, newStruct) \ (curState)->init = newInit; \ (curState)->size = sizeof(newStruct); @@ -43,8 +47,8 @@ LogUtils_LogThreadId(file, line); \ osSyncPrintf(exp " = " format "\n", value); -#define LOG_ADDRESS(exp, value, file, line) LOG(exp, value, "%08x", file, line) #define LOG_STRING(string, file, line) LOG(#string, string, "%s", file, line) +#define LOG_ADDRESS(exp, value, file, line) LOG(exp, value, "%08x", file, line) #define LOG_TIME(exp, value, file, line) LOG(exp, value, "%lld", file, line) #define LOG_NUM(exp, value, file, line) LOG(exp, value, "%d", file, line) diff --git a/include/ultra64/gbi.h b/include/ultra64/gbi.h index f3f797e818..a42277f462 100644 --- a/include/ultra64/gbi.h +++ b/include/ultra64/gbi.h @@ -4188,7 +4188,7 @@ _DW({ \ #endif /* _HW_VERSION_1 */ #define gDPSetScissor(pkt, mode, ulx, uly, lrx, lry) \ -{ \ +_DW({ \ Gfx *_g = (Gfx *)pkt; \ \ _g->words.w0 = _SHIFTL(G_SETSCISSOR, 24, 8) | \ @@ -4197,7 +4197,7 @@ _DW({ \ _g->words.w1 = _SHIFTL(mode, 24, 2) | \ _SHIFTL((int)((float)(lrx)*4.0F), 12, 12) | \ _SHIFTL((int)((float)(lry)*4.0F), 0, 12); \ -} +}) #define gDPSetScissorFrac(pkt, mode, ulx, uly, lrx, lry) \ diff --git a/include/ultra64/types.h b/include/ultra64/types.h index c793f8010a..ae8cecd6f1 100644 --- a/include/ultra64/types.h +++ b/include/ultra64/types.h @@ -32,8 +32,7 @@ typedef union { typedef float MtxF_t[4][4]; typedef union { MtxF_t mf; - struct - { + struct { float xx, xy, xz, xw, yx, yy, yz, yw, zx, zy, zz, zw, diff --git a/include/unk.h b/include/unk.h index c90f76e435..9a7c60978f 100644 --- a/include/unk.h +++ b/include/unk.h @@ -9,7 +9,7 @@ #define UNK_RET void #define UNK_FUN_ARG void(*)(void) #define UNK_FUN_PTR(name) void(*name)(void) -#define UNK_ARGS void +#define UNK_ARGS #define UNK_SIZE 1 #define UNK_LINE 1 diff --git a/include/variables.h b/include/variables.h index 42767d9631..022df54e8e 100644 --- a/include/variables.h +++ b/include/variables.h @@ -506,7 +506,6 @@ extern Scene gSceneTable[110]; //extern ? D_8012A71C; extern u8 gLetterTLUT[4][32]; // original name: "moji_tlut" extern u8 gFontFF[]; // original name: "font_ff" -//extern ? D_8012ABF0; //extern ? D_8012AC90; //extern ? D_8012ACA0; //extern ? D_8012AD20; @@ -619,7 +618,6 @@ extern u8 gFontFF[]; // original name: "font_ff" extern KaleidoManagerOvl gKaleidoMgrOverlayTable[KALEIDO_OVL_COUNT]; extern KaleidoManagerOvl* gKaleidoMgrCurOvl; extern void* D_8012D1F0; -//extern ? D_8012D1F8; //extern ? D_8012D200; //extern ? D_8012D207; //extern ? D_8012D210; @@ -627,8 +625,8 @@ extern void* D_8012D1F0; //extern ? D_8012D248; //extern ? D_8012D260; //extern ? D_8012D264; -extern u32 gScreenWidth; -extern u32 gScreenHeight; +extern s32 gScreenWidth; +extern s32 gScreenHeight; extern u32 gSystemHeapSize; extern volatile u32 D_8012D290; //extern ? D_8012D2A0; @@ -3488,15 +3486,8 @@ extern u8 D_801610DA; //extern ? D_801612F0; //extern ? D_80161358; //extern ? D_80161360; -//extern ? D_801613B0; -//extern ? D_8016148C; extern s32 D_80161490; -//extern ? D_80161498; extern Color_RGBA8 D_801614B0; -//extern ? D_801614B3; -//extern ? D_801614B8; -//extern ? D_801614C8; -//extern ? D_80163FFF; //extern ? D_801664D0; //extern ? D_801664F0; //extern ? D_80166500; @@ -3514,9 +3505,8 @@ extern Color_RGBA8 D_801614B0; extern PreNmiBuff* gAppNmiBufferPtr; //extern ? gSchedContext; //extern u8 gPadMgr[]; -extern u8 D_80166B68; //extern ? D_80166D28; -extern u32 gSegments[]; +extern u32 gSegments[NUM_SEGMENTS]; //extern ? D_8016A500; //extern ? D_8016A504; //extern ? D_8016A508; diff --git a/include/z64.h b/include/z64.h index 843a2ced6b..c2d25a56fe 100644 --- a/include/z64.h +++ b/include/z64.h @@ -45,8 +45,8 @@ typedef struct { } GameInfo; // size = 0x15D4 typedef struct { - /* 0x00 */ u8 button_items[4]; - /* 0x04 */ u8 c_button_slots[3]; + /* 0x00 */ u8 buttonItems[4]; + /* 0x04 */ u8 cButtonSlots[3]; /* 0x08 */ u16 equipment; } ItemEquips; // size = 0x0A @@ -56,8 +56,8 @@ typedef struct { /* 0x08 */ u32 clear; /* 0x0C */ u32 collect; /* 0x10 */ u32 unk; - /* 0x14 */ u32 rooms_1; - /* 0x18 */ u32 rooms_2; + /* 0x14 */ u32 rooms1; + /* 0x18 */ u32 rooms2; } SaveSceneFlags; // size = 0x1C typedef struct { @@ -69,12 +69,12 @@ typedef struct { typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ s16 yaw; - /* 0x0E */ s16 player_params; - /* 0x10 */ s16 entrance_index; - /* 0x12 */ u8 room_index; + /* 0x0E */ s16 playerParams; + /* 0x10 */ s16 entranceIndex; + /* 0x12 */ u8 roomIndex; /* 0x13 */ s8 data; - /* 0x14 */ u32 temp_swch_flags; - /* 0x18 */ u32 temp_collect_flags; + /* 0x14 */ u32 tempSwchFlags; + /* 0x18 */ u32 tempCollectFlags; } RespawnData; // size = 0x1C typedef enum { @@ -90,32 +90,31 @@ typedef enum { // Save Context (dbg ram start: 8015E660) typedef struct { - /* 0x0000 */ s32 entrance_index; - /* 0x0004 */ s32 link_age; // 0: Adult; 1: Child - /* 0x0008 */ s32 cutscene_index; - /* 0x000C */ u16 day_time; // "zelda_time" - /* 0x0010 */ s32 night_flag; + /* 0x0000 */ s32 entranceIndex; + /* 0x0004 */ s32 linkAge; // 0: Adult; 1: Child + /* 0x0008 */ s32 cutsceneIndex; + /* 0x000C */ u16 dayTime; // "zelda_time" + /* 0x0010 */ s32 nightFlag; /* 0x0014 */ s32 unk_14; /* 0x0018 */ s32 unk_18; /* 0x001C */ char newf[6]; // string "ZELDAZ" /* 0x0022 */ s16 deaths; - /* 0x0024 */ char player_name[8]; - /* 0x002C */ s16 n64dd_flag; - /* 0x002E */ s16 health_capacity; // "max_life" + /* 0x0024 */ char playerName[8]; + /* 0x002C */ s16 n64ddFlag; + /* 0x002E */ s16 healthCapacity; // "max_life" /* 0x0030 */ s16 health; // "now_life" - /* 0x0032 */ s8 magic_level; + /* 0x0032 */ s8 magicLevel; /* 0x0033 */ s8 magic; /* 0x0034 */ s16 rupees; - /* 0x0036 */ u16 bgs_hits_left; - /* 0x0038 */ u16 navi_timer; - /* 0x003A */ u8 magic_acquired; + /* 0x0036 */ u16 bgsHitsLeft; + /* 0x0038 */ u16 naviTimer; + /* 0x003A */ u8 magicAcquired; /* 0x003B */ char unk_3B[0x0001]; - /* 0x003C */ u8 double_magic; - /* 0x003D */ u8 double_defense; - /* 0x003E */ s8 bgs_flag; - /* 0x003F */ char unk_3F; - /* 0x0040 */ ItemEquips child_equips; - /* 0x004A */ ItemEquips adult_equips; + /* 0x003C */ u8 doubleMagic; + /* 0x003D */ u8 doubleDefense; + /* 0x003E */ s8 bgsFlag; + /* 0x0040 */ ItemEquips childEquips; + /* 0x004A */ ItemEquips adultEquips; /* 0x0054 */ char unk_54[0x0014]; /* 0x0068 */ ItemEquips equips; /* 0x0072 */ char unk_72[0x0002]; @@ -123,58 +122,56 @@ typedef struct { /* 0x008C */ s8 ammo[16]; /* 0x009C */ u16 equipment; /* 0x00A0 */ u32 upgrades; - /* 0x00A4 */ u32 quest_items; - /* 0x00A8 */ u8 dungeon_items[20]; - /* 0x00BC */ s8 dungeon_keys[19]; - /* 0x00CF */ s8 defense_hearts; - /* 0x00D0 */ s16 gs_tokens; - /* 0x00D4 */ SaveSceneFlags scene_flags[124]; + /* 0x00A4 */ u32 questItems; + /* 0x00A8 */ u8 dungeonItems[20]; + /* 0x00BC */ s8 dungeonKeys[19]; + /* 0x00CF */ s8 defenseHearts; + /* 0x00D0 */ s16 gsTokens; + /* 0x00D4 */ SaveSceneFlags sceneFlags[124]; struct { - /* 0x0E64 */ s32 pos_x; - /* 0x0E68 */ s32 pos_y; - /* 0x0E6C */ s32 pos_z; + /* 0x0E64 */ Vec3i pos; /* 0x0E70 */ s32 yaw; - /* 0x0E74 */ s32 player_params; - /* 0x0E78 */ s32 entrance_index; - /* 0x0E7C */ s32 room_index; + /* 0x0E74 */ s32 playerParams; + /* 0x0E78 */ s32 entranceIndex; + /* 0x0E7C */ s32 roomIndex; /* 0x0E80 */ s32 set; - /* 0x0E84 */ s32 temp_swch_flags; - /* 0x0E88 */ s32 temp_collect_flags; + /* 0x0E84 */ s32 tempSwchFlags; + /* 0x0E88 */ s32 tempCollectFlags; } fw; /* 0x0E8C */ char unk_E8C[0x0010]; - /* 0x0E9C */ u8 gs_flags[24]; + /* 0x0E9C */ u8 gsFlags[24]; /* 0x0EB4 */ char unk_EB4[0x0020]; - /* 0x0ED4 */ u16 event_chk_inf[14]; - /* 0x0EF0 */ u16 item_get_inf[4]; - /* 0x0EF8 */ u16 inf_table[30]; + /* 0x0ED4 */ u16 eventChkInf[14]; // "event_chk_inf" + /* 0x0EF0 */ u16 itemGetInf[4]; // "item_get_inf" + /* 0x0EF8 */ u16 infTable[30]; // "inf_table" /* 0x0F34 */ char unk_F34[0x0004]; - /* 0x0F38 */ u32 world_map_area_data; // "area_arrival" + /* 0x0F38 */ u32 worldMapAreaData; // "area_arrival" /* 0x0F3C */ char unk_F3C[0x040C]; - /* 0x1348 */ HorseData horse_data; + /* 0x1348 */ HorseData horseData; /* 0x1352 */ u16 checksum; // "check_sum" - /* 0x1354 */ s32 file_num; // "file_no" + /* 0x1354 */ s32 fileNum; // "file_no" /* 0x1358 */ char unk_1358[0x0004]; - /* 0x135C */ s32 game_mode; - /* 0x1360 */ s32 scene_setup_index; - /* 0x1364 */ s32 respawn_flag; // "restart_flag" + /* 0x135C */ s32 gameMode; + /* 0x1360 */ s32 sceneSetupIndex; + /* 0x1364 */ s32 respawnFlag; // "restart_flag" /* 0x1368 */ RespawnData respawn[3]; // "restart_data" /* 0x13BC */ char unk_13BC[0x0008]; /* 0x13C4 */ s16 dogParams; /* 0x13C6 */ char unk_13C6[0x0001]; /* 0x13C7 */ u8 unk_13C7; - /* 0x13C8 */ u16 nayrus_love_timer; + /* 0x13C8 */ u16 nayrusLoveTimer; /* 0x13CA */ char unk_13CA[0x0002]; - /* 0x13CC */ s16 rupee_accumulator; - /* 0x13CE */ s16 timer_1_state; - /* 0x13D0 */ s16 timer_1_value; - /* 0x13D2 */ s16 timer_2_state; - /* 0x13D4 */ s16 timer_2_value; - /* 0x13D6 */ s16 timer_x[2]; - /* 0x13DA */ s16 timer_y[2]; + /* 0x13CC */ s16 rupeeAccumulator; + /* 0x13CE */ s16 timer1State; + /* 0x13D0 */ s16 timer1Value; + /* 0x13D2 */ s16 timer2State; + /* 0x13D4 */ s16 timer2Value; + /* 0x13D6 */ s16 timerX[2]; + /* 0x13DA */ s16 timerY[2]; /* 0x13DE */ char unk_13DE[0x0002]; - /* 0x13E0 */ u8 seq_index; - /* 0x13E1 */ u8 night_sfx; - /* 0x13E2 */ u8 button_status[5]; + /* 0x13E0 */ u8 seqIndex; + /* 0x13E1 */ u8 nightSeqIndex; + /* 0x13E2 */ u8 buttonStatus[5]; /* 0x13E7 */ u8 unk_13E7; /* 0x13E8 */ u16 unk_13E8; // alpha type? /* 0x13EA */ u16 unk_13EA; // also alpha type? @@ -185,31 +182,31 @@ typedef struct { /* 0x13F4 */ s16 unk_13F4; /* 0x13F6 */ s16 unk_13F6; /* 0x13F8 */ s16 unk_13F8; - /* 0x13FA */ u16 event_inf[4]; - /* 0x1402 */ u16 dungeon_index; - /* 0x1404 */ u16 minigame_state; - /* 0x1406 */ u16 minigame_score; // "yabusame_total" + /* 0x13FA */ u16 eventInf[4]; // "event_inf" + /* 0x1402 */ u16 dungeonIndex; + /* 0x1404 */ u16 minigameState; + /* 0x1406 */ u16 minigameScore; // "yabusame_total" /* 0x1408 */ char unk_1408[0x0001]; /* 0x1409 */ u8 language; - /* 0x140A */ u8 audio_settings; + /* 0x140A */ u8 audioSetting; /* 0x140B */ char unk_140B[0x0001]; - /* 0x140C */ u8 z_targeting; + /* 0x140C */ u8 zTargetingSetting; // 0: Switch; 1: Hold /* 0x140E */ u16 unk_140E; // bgm related /* 0x1410 */ u8 unk_1410; /* 0x1411 */ u8 unk_1411; - /* 0x1412 */ u16 next_cutscene_index; - /* 0x1414 */ u8 cutscene_trigger; - /* 0x1415 */ u8 chamber_cutscene_num; - /* 0x1416 */ u16 next_day_time; // "next_zelda_time" - /* 0x1418 */ u8 fade_duration; + /* 0x1412 */ u16 nextCutsceneIndex; + /* 0x1414 */ u8 cutsceneTrigger; + /* 0x1415 */ u8 chamberCutsceneNum; + /* 0x1416 */ u16 nextDayTime; // "next_zelda_time" + /* 0x1418 */ u8 fadeDuration; /* 0x1419 */ u8 unk_1419; // transition related - /* 0x141A */ u16 environment_time; + /* 0x141A */ u16 environmentTime; /* 0x141C */ u8 dogIsLost; - /* 0x141D */ u8 transition_type; + /* 0x141D */ u8 nextTransition; /* 0x141E */ char unk_141E[0x0002]; - /* 0x1420 */ s16 world_map_area; + /* 0x1420 */ s16 worldMapArea; /* 0x1422 */ s16 unk_1422; // day time related - /* 0x1424 */ s16 health_accumulator; + /* 0x1424 */ s16 healthAccumulator; } SaveContext; // size = 0x1428 typedef struct { @@ -260,13 +257,13 @@ typedef struct GraphicsContext { /* 0x0078 */ OSScTask task; // size of OSScTask might be wrong /* 0x00D0 */ char unk_0D0[0xE0]; /* 0x01B0 */ Gfx* workBuffer; - /* 0x01B4 */ TwoHeadGfxArena work; + /* 0x01B4 */ TwoHeadGfxArena work; /* 0x01C4 */ char unk_01C4[0xC0]; /* 0x0284 */ OSViMode* viMode; /* 0x0288 */ char unk_0288[0x20]; - /* 0x02A8 */ TwoHeadGfxArena overlay; - /* 0x02B8 */ TwoHeadGfxArena polyOpa; - /* 0x02C8 */ TwoHeadGfxArena polyXlu; + /* 0x02A8 */ TwoHeadGfxArena overlay; + /* 0x02B8 */ TwoHeadGfxArena polyOpa; + /* 0x02C8 */ TwoHeadGfxArena polyXlu; /* 0x02D8 */ u32 gfxPoolIdx; /* 0x02DC */ u16* curFrameBuffer; /* 0x02E0 */ char unk_2E0[0x04]; @@ -329,7 +326,7 @@ typedef struct { /* 0x0290 */ PadState pads[4]; // 0x6 each = 0x18 total /* 0x02A8 */ volatile u8 validCtrlrsMask; /* 0x02A9 */ s8 ncontrollers; - /* 0x02AA */ u8 ctrlrIsConnected[4]; // Key_switch in original code + /* 0x02AA */ u8 ctrlrIsConnected[4]; // "Key_switch" originally /* 0x02AE */ u8 pakType[4]; // 1 if rumble pack, 2 if mempak? /* 0x02B2 */ volatile u8 rumbleEnable[4]; /* 0x02B6 */ u8 rumbleCounter[4]; // not clear exact meaning @@ -342,48 +339,35 @@ typedef struct { } PadMgr; // size = 0x468 typedef struct { - /* 0x0000 */ s16 unk_0; - /* 0x0002 */ s16 unk_2; - /* 0x0004 */ u16 unk_4; - /* 0x0004 */ u16 unk_6; - /* 0x0008 */ s16 unk_8; - /* 0x000A */ s16 unk_A; - /* 0x000C */ u16 unk_C; - /* 0x000E */ u16 unk_E; -} UnkViewStruct; // size = 0x10, probably a viewport in disguise - -typedef struct { - /* 0x0000 */ s32 topY; // uly (upper left y) - /* 0x0004 */ s32 bottomY; // lry (lower right y) - /* 0x0008 */ s32 leftX; // ulx (upper left x) - /* 0x000C */ s32 rightX; // lrx (lower right x) + /* 0x0000 */ s32 topY; // uly (upper left y) + /* 0x0004 */ s32 bottomY; // lry (lower right y) + /* 0x0008 */ s32 leftX; // ulx (upper left x) + /* 0x000C */ s32 rightX; // lrx (lower right x) } Viewport; // size = 0x10 typedef struct { /* 0x0000 */ s32 magic; // string literal "VIEW" / 0x56494557 /* 0x0004 */ GraphicsContext* gfxCtx; /* 0x0008 */ Viewport viewport; - /* 0x0018 */ f32 fieldOfView; // fovy - /* 0x001C */ f32 fogDistance; // near - /* 0x0020 */ f32 zDepth; // far - /* 0x0024 */ f32 unk_24; // scale + /* 0x0018 */ f32 fovy; // vertical field of view in degrees + /* 0x001C */ f32 near; // distance to near clipping plane + /* 0x0020 */ f32 far; // distance to far clipping plane + /* 0x0024 */ f32 scale; // scale for matrix elements /* 0x0028 */ Vec3f eye; /* 0x0034 */ Vec3f unk_34; /* 0x0040 */ Vec3f unk_40; - /* 0x004C */ char unk_4C[0x04]; - /* 0x0050 */ Viewport unk_50; - /* 0x0060 */ Mtx unk_60; - /* 0x00A0 */ MtxF unk_A0; - /* 0x00E0 */ Mtx* unk_E0; - /* 0x00E4 */ MtxF* unk_E4; + /* 0x0050 */ Vp vp; + /* 0x0060 */ Mtx projection; + /* 0x00A0 */ Mtx viewing; + /* 0x00E0 */ Mtx* projectionPtr; + /* 0x00E4 */ Mtx* viewingPtr; /* 0x00E8 */ Vec3f unk_E8; /* 0x00F4 */ Vec3f unk_F4; /* 0x0100 */ f32 unk_100; /* 0x0104 */ Vec3f unk_104; /* 0x0110 */ Vec3f unk_110; - /* 0x011C */ u16 unk_11C; // normal - /* 0x011E */ u16 unk_11E; - /* 0x0120 */ s32 unk_120; + /* 0x011C */ u16 normal; // used to normalize the projection matrix + /* 0x0120 */ u32 flags; /* 0x0124 */ s32 unk_124; } View; // size = 0x128 @@ -405,8 +389,8 @@ typedef struct { /* 0x0068 */ char unk_68[0x0C]; /* 0x0074 */ Vec3f unk_74; /* 0x0080 */ Vec3f unk_80; - /* 0x008C */ struct GlobalContext *globalCtx; - /* 0x0090 */ Player *player; + /* 0x008C */ struct GlobalContext* globalCtx; + /* 0x0090 */ Player* player; /* 0x0094 */ PosRot unk_94; /* 0x00A8 */ char unk_A8[0x18]; /* 0x00C0 */ Vec3f unk_C0; @@ -425,7 +409,8 @@ typedef struct { /* 0x0128 */ s32 unk_128; /* 0x012C */ s16 unk_12C; /* 0x012E */ s16 unk_12E; - /* 0x0130 */ char unk_130[0x10]; + /* 0x0130 */ s16 unk_130; + /* 0x0132 */ char unk_132[0x0E]; /* 0x0140 */ s16 unk_140; /* 0x0142 */ s16 unk_142; // related to door camera (see func_8005AD40) /* 0x0144 */ s16 unk_144; @@ -451,10 +436,10 @@ typedef struct { } Camera; // size = 0x16C typedef struct { - /* 0x0000 */ Camera activeCameras[4]; - /* 0x05B0 */ Camera* activeCameraPtrs[4]; - /* 0x05C0 */ s16 unk_5C0; - /* 0x05C2 */ s16 unk_5C2; + /* 0x0000 */ Camera cameras[4]; + /* 0x05B0 */ Camera* cameraPtrs[4]; + /* 0x05C0 */ s16 activeCamera; + /* 0x05C2 */ s16 nextCamera; } CameraContext; // size = 0x5C4 typedef struct { @@ -463,6 +448,11 @@ typedef struct { /* 0x02 */ char unk_02[0x2]; } SoundContext; // size = 0x4 +typedef struct { + /* 0x00 */ s32 unk_0; + /* 0x04 */ char unk_4[0x4]; +} SubGlobalContext7B8; // size = 0x8 + typedef struct { /* 0x00 */ char unk_00[0x2]; /* 0x02 */ s16 unk_02; @@ -575,22 +565,26 @@ typedef struct { /* 0x0C */ f32 unk_0C; /* 0x10 */ u16 frames; /* 0x12 */ u16 unk_12; - union { - /* 0x14 */ s32 unk_14_all; - struct { - s16 unk_14; - s16 unk_16; - }; - }; + /* 0x14 */ s32 unk_14; /* 0x18 */ u16 unk_18; /* 0x1A */ u8 unk_1A; /* 0x1B */ u8 unk_1B; /* 0x1C */ CutsceneCameraPoint* cameraFocus; /* 0x20 */ CutsceneCameraPoint* cameraPosition; /* 0x24 */ CsCmdActorAction* linkAction; - /* 0x28 */ CsCmdActorAction* actorActions[10]; + /* 0x28 */ CsCmdActorAction* actorActions[10]; // "npcdemopnt" } CutsceneContext; // size = 0x50 +typedef struct { + /* 0x00 */ char unk_0[0x4]; +} SubGlobalContext1F74; // size = 0x4 + +typedef struct { + /* 0x000 */ char unk_00[0x140]; + /* 0x140 */ s16 unk_140; + /* 0x142 */ char unk_142[0x0E]; +} SkyboxContext; // size = 0x150 + typedef struct { /* 0x0000 */ View view; /* 0x0128 */ char unk_128[0xE188]; @@ -631,7 +625,7 @@ typedef struct { /* 0x01A0 */ char unk_1A0[0x20]; /* 0x01C0 */ OSMesgQueue loadQueue; /* 0x01D8 */ OSMesg loadMsg; - /* 0x01DC */ s32 unk_1DC[4]; + /* 0x01DC */ Viewport viewport; /* 0x01EC */ s16 unk_1EC; /* 0x01EE */ u16 unk_1EE; /* 0x01F0 */ u16 unk_1F0; @@ -713,6 +707,61 @@ typedef struct { /* 0x025A */ char unk_25A[0x066]; } PauseContext; // size = 0x2C0 +typedef struct { + /* 0x00 */ char unk_00[0x02]; + /* 0x02 */ u16 unk_02; + /* 0x04 */ Vec3f unk_04; + /* 0x10 */ char unk_10[0x03]; + /* 0x13 */ u8 unk_13; + /* 0x14 */ char unk_14[0x01]; + /* 0x15 */ u8 skyDisabled; + /* 0x16 */ u8 sunMoonDisabled; + /* 0x17 */ u8 gloomySky; + /* 0x18 */ u8 unk_18; + /* 0x19 */ u8 unk_19; + /* 0x1A */ u16 unk_1A; + /* 0x1C */ char unk_1C[0x02]; + /* 0x1E */ u8 unk_1E; + /* 0x1F */ u8 unk_1F; + /* 0x20 */ u8 unk_20; + /* 0x21 */ u8 unk_21; + /* 0x22 */ u16 unk_22; + /* 0x24 */ u16 unk_24; + /* 0x26 */ char unk_26[0x04]; + /* 0x2A */ s8 unk_2A; + /* 0x2B */ s8 unk_2B; + /* 0x2C */ s8 unk_2C; + /* 0x2D */ char unk_2D[0x5E]; + /* 0x8C */ s16 unk_8C[6]; + /* 0x98 */ char unk_98[0x08]; + /* 0xA0 */ s16 unk_A0; + /* 0xA2 */ char unk_A2[0x06]; + /* 0xA8 */ s16 unk_A8; + /* 0xAA */ s16 unk_AA; + /* 0xAC */ s16 unk_AC; + /* 0xB0 */ f32 unk_B0; + /* 0xB4 */ u8 nbLightSettings; + /* 0xB8 */ UNK_PTR lightSettingsList; + /* 0xBC */ char unk_BC[0x03]; + /* 0xBF */ u8 unk_BF; + /* 0xC0 */ char unk_C0[0x18]; + /* 0xD8 */ f32 unk_D8; + /* 0xDC */ u8 unk_DC; + /* 0xDD */ u8 gloomySkyEvent; + /* 0xDE */ u8 unk_DE; + /* 0xDF */ u8 lightning; + /* 0xE0 */ u8 unk_E0; + /* 0xE1 */ u8 unk_E1; + /* 0xE2 */ u8 unk_E2[4]; + /* 0xE6 */ u8 unk_E6; + /* 0xE7 */ u8 unk_E7; + /* 0xE8 */ u8 unk_E8; + /* 0xE9 */ char unk_E9[0x05]; + /* 0xEE */ u8 unk_EE[4]; + /* 0xF2 */ u8 unk_F2[4]; + /* 0xF6 */ char unk_F6[0x06]; +} EnvironmentContext; // size = 0xFC + typedef struct { /* 0x00 */ s16 id; /* 0x04 */ void* segment; @@ -833,9 +882,41 @@ typedef struct { } RoomContext; // size = 0x74 typedef struct { - /* 0x00 */ char unk_00[0x028C]; + /* 0x00 */ char unk_00[0x028C]; } SubGlobalContext11E60; // size = 0x28C +typedef struct { + /* 0x00 */ char unk_00[0x10]; + /* 0x10 */ u16* unk_10; + /* 0x14 */ u16* unk_14; + /* 0x18 */ u16* unk_18; + /* 0x1C */ char unk_1C[0x87]; + /* 0xA3 */ s8 unk_A3; +} PreRenderContext; // size = 0xA4 + +typedef struct { + /* 0x00 */ char unk_00[0xDC]; + /* 0xDC */ u16* unk_DC; +} TransitionStruct; // size = 0xE0 + +typedef struct { + /* 0x000 */ char unk_00[0x228]; + /* 0x228 */ s32 unk_228; + /* 0x22C */ void (*unk_22C)(UNK_ARGS); + /* 0x230 */ void (*unk_230)(UNK_ARGS); + /* 0x234 */ void (*unk_234)(UNK_ARGS); + /* 0x238 */ void (*unk_238)(UNK_ARGS); + /* 0x23C */ void (*unk_23C)(UNK_ARGS); + /* 0x240 */ void (*unk_240)(UNK_ARGS); + /* 0x244 */ void (*unk_244)(UNK_ARGS); + /* 0x248 */ void (*unk_248)(UNK_ARGS); + /* 0x24C */ s32 (*unk_24C)(UNK_ARGS); +} TransitionContext; // size = 0x250 + +typedef struct { + /* 0x00 */ char unk_00[0x0C]; +} SubGlobalContext1241C; // size = 0xC + typedef struct { /* 0x00 */ s16 id; /* 0x02 */ Vec3s pos; @@ -859,11 +940,6 @@ typedef struct { /* 0x01 */ u8 room; } EntranceEntry; -typedef struct { - /* 0x00 */ u32 vromStart; - /* 0x04 */ u32 vromEnd; -} RomFile; // size = 0x8 - typedef struct { /* 0x00 */ void* read_buff; } Sram; // size = 0x4 @@ -887,7 +963,7 @@ typedef struct GameState { /* 0x0C */ void (*init)(struct GameState*); /* 0x10 */ u32 size; /* 0x14 */ Input input[4]; - /* 0x74 */ char tha[0x10]; + /* 0x74 */ TwoHeadArena tha; /* 0x84 */ GameAlloc alloc; /* 0x98 */ u32 running; /* 0x9C */ u32 frames; @@ -905,17 +981,16 @@ typedef struct { /* 0x01DA */ u16 visibleDuration; // not used in mq dbg /* 0x01DC */ s16 ult; /* 0x01DE */ s16 uls; - /* 0x01E0 */ char unk_1E0; + /* 0x01E0 */ char unk_1E0[0x01]; /* 0x01E1 */ u8 exit; - /* 0x01E2 */ char unk_1E2[6]; + /* 0x01E2 */ char unk_1E2[0x06]; } TitleContext; // size = 0x1E8 -typedef struct -{ +typedef struct { /* 0x0000 */ GameState state; /* 0x00A4 */ void* staticSegment; /* 0x00A8 */ View view; -} SampleContext; +} SampleContext; // size = 0x1D0 typedef struct { /* 0x00 */ u8 byte0; @@ -930,76 +1005,28 @@ typedef struct GlobalContext { /* 0x000A4 */ s16 sceneNum; /* 0x000A6 */ u8 sceneConfig; /* 0x000A7 */ char unk_A7[0x9]; - /* 0x000B0 */ SceneCmd* unk_B0; + /* 0x000B0 */ void* sceneSegment; /* 0x000B4 */ char unk_B4[0x4]; /* 0x000B8 */ View view; - /* 0x001E0 */ CameraContext cameraCtx; // "camera" + /* 0x001E0 */ Camera cameras[4]; + /* 0x00790 */ Camera* cameraPtrs[4]; + /* 0x007A0 */ s16 activeCamera; + /* 0x007A2 */ s16 nextCamera; /* 0x007A4 */ SoundContext soundCtx; /* 0x007A8 */ LightingContext lightCtx; - /* 0x007B8 */ s32 unk_7B8; - /* 0x007BC */ char unk7BC[0x4]; + /* 0x007B8 */ SubGlobalContext7B8 sub_7B8; /* 0x007C0 */ CollisionContext colCtx; /* 0x01C24 */ ActorContext actorCtx; /* 0x01D64 */ CutsceneContext csCtx; // "demo_play" - /* 0x01DB4 */ char unk_1DB4[0x1C4]; - /* 0x01F78 */ u16 unk_1F78; - /* 0x01F7A */ char unk_1F7A[0x15E]; + /* 0x01DB4 */ char unk_1DB4[0x1C0]; + /* 0x01F74 */ SubGlobalContext1F74 sub_1F74; + /* 0x01F78 */ SkyboxContext skyboxCtx; + /* 0x020C8 */ char unk_20C8[0x10]; /* 0x020D8 */ MessageContext msgCtx; // "message" /* 0x104F0 */ InterfaceContext interfaceCtx; // "parameter" /* 0x10760 */ PauseContext pauseCtx; /* 0x10A20 */ u16 unk_10A20; - /* 0x10A22 */ char unk_10A22[0x2]; - /* 0x10A24 */ u16 unk_10A24; - /* 0x10A26 */ u16 unk_10A26; - /* 0x10A28 */ f32 unk_10A28; - /* 0x10A2C */ f32 unk_10A2C; - /* 0x10A30 */ f32 unk_10A30; - /* 0x10A34 */ char unk_10A34[0x5]; - /* 0x10A39 */ u8 skyDisabled; - /* 0x10A3A */ u8 sunMoonDisabled; - /* 0x10A3B */ u8 gloomySky; - /* 0x10A3C */ u8 unk_10A3C; - /* 0x10A3D */ u8 unk_10A3D; - /* 0x10A3E */ u16 unk_10A3E; - /* 0x10A40 */ char unk_10A40[0x2]; - /* 0x10A42 */ u8 unk_10A42; - /* 0x10A43 */ u8 unk_10A43; - /* 0x10A44 */ u8 unk_10A44; - /* 0x10A45 */ u8 unk_10A45; - /* 0x10A46 */ u16 unk_10A46; - /* 0x10A48 */ u16 unk_10A48; - /* 0x10A4A */ char unk_10A4A[0x4]; - /* 0x10A4E */ s8 unk_10A4E; - /* 0x10A4F */ s8 unk_10A4F; - /* 0x10A50 */ s8 unk_10A50; - /* 0x10A51 */ char unk_10A51[0x5F]; - /* 0x10AB0 */ s16 unk_10AB0[6]; - /* 0x10ABC */ char unk_10ABC[0x8]; - /* 0x10AC4 */ s16 unk_10AC4; - /* 0x10AC6 */ char unk_10AC6[0x6]; - /* 0x10ACC */ s16 unk_10ACC; - /* 0x10ACE */ s16 unk_10ACE; - /* 0x10AD0 */ s16 unk_10AD0; - /* 0x10AD4 */ f32 unk_10AD4; - /* 0x10AD8 */ u8 nbLightSettings; - /* 0x10AD9 */ char unk_10AD9[0x3]; - /* 0x10ADC */ UNK_PTR lightSettingsList; - /* 0x10AE0 */ char unk_10AE0[0x3]; - /* 0x10AE3 */ u8 unk_10AE3; - /* 0x10AE4 */ char unk_10AE4[0x18]; - /* 0x10AFC */ f32 unk_10AFC; - /* 0x10B00 */ u8 unk_10B00; - /* 0x10B01 */ u8 gloomySkyEvent; - /* 0x10B02 */ u8 unk_10B02; - /* 0x10B03 */ u8 lightning; - /* 0x10B04 */ u8 unk_10B04; - /* 0x10B05 */ u8 unk_10B05; - /* 0x10B06 */ u8 unk_10B06[4]; - /* 0x10B0A */ u8 unk_10B0A; - /* 0x10B0B */ char unk_10B0B[0x7]; - /* 0x10B12 */ u8 unk_10B12[4]; - /* 0x10B16 */ u8 unk_10B16[4]; - /* 0x10B1A */ char unk_10B1A[0x6]; + /* 0x10A24 */ EnvironmentContext envCtx; /* 0x10B20 */ AnimationContext animationCtx; /* 0x117A4 */ ObjectContext objectCtx; /* 0x11CBC */ RoomContext roomCtx; @@ -1011,7 +1038,7 @@ typedef struct GlobalContext { /* 0x11D5C */ char unk_11D5C[0x4]; /* 0x11D60 */ MtxF mf_11D60; /* 0x11DA0 */ MtxF mf_11DA0; - /* 0x11DE0 */ char unk_11DE0[0x4]; + /* 0x11DE0 */ Mtx* unk_11DE0; /* 0x11DE4 */ u32 gameplayFrames; /* 0x11DE8 */ u8 linkAgeOnLoad; /* 0x11DE9 */ u8 unk_11DE9; @@ -1029,19 +1056,22 @@ typedef struct GlobalContext { /* 0x11E10 */ char unk_11E10[0x4]; /* 0x11E14 */ u8 skyboxId; /* 0x11E15 */ s8 sceneLoadFlag; // "fade_direction" - /* 0x11E16 */ char unk_11E16[0x4]; + /* 0x11E16 */ s16 unk_11E16; + /* 0x11E18 */ s16 unk_11E18; /* 0x11E1A */ s16 nextEntranceIndex; /* 0x11E1C */ char unk_11E1C[0x40]; /* 0x11E5C */ s8 unk_11E5C; /* 0x11E5D */ s8 bombchuBowlingAmmo; // "bombchu_game_flag" - /* 0x11E5E */ u8 fadeOutTransition; + /* 0x11E5E */ u8 fadeTransition; /* 0x11E5F */ char unk_11E5F[0x1]; /* 0x11E60 */ SubGlobalContext11E60 sub_11E60; - /* 0x120EC */ char unk_120EC[0x304]; - /* 0x123F0 */ s32 unk_123F0; - /* 0x123F4 */ char unk_123F4[0x27]; + /* 0x120EC */ char unk_120EC[0x38]; + /* 0x12124 */ PreRenderContext preRenderCtx; + /* 0x121C8 */ TransitionContext transitionCtx; + /* 0x12418 */ char unk_12418[0x3]; /* 0x1241B */ u8 unk_1241B; // "fbdemo_wipe_modem" - /* 0x1241C */ char unk_1241C[0xF]; + /* 0x1241C */ SubGlobalContext1241C sub_1241C; + /* 0x12428 */ char unk_12428[0x3]; /* 0x1242B */ u8 unk_1242B; /* 0x1242C */ Scene* loadedScene; /* 0x12430 */ char unk_12430[0xE8]; @@ -1111,10 +1141,7 @@ typedef struct { typedef struct { /* 0x00 */ s8 scene; /* 0x01 */ s8 spawn; - /* 0x02 */ u16 continueBgm : 1; - /* 0x02 */ u16 displayTitleCard : 1; - /* 0x02 */ u16 fadeInTransition : 7; - /* 0x02 */ u16 fadeOutTransition : 7; + /* 0x02 */ u16 field; } EntranceInfo; // size = 0x4 typedef struct { @@ -1527,4 +1554,10 @@ typedef struct { /* 0xB4 */ JpegWork* workBuf; } JpegContext; // size = 0xB8 +typedef struct { + /* 0x00 */ char unk_00[0x08]; + /* 0x08 */ Color_RGBA8 color; + /* 0x0C */ char unk_0C[0x0C]; +} VisMonoStruct; // size = 0x18 + #endif diff --git a/include/z64cutscene.h b/include/z64cutscene.h index 91be35f82e..0441fd9b6e 100644 --- a/include/z64cutscene.h +++ b/include/z64cutscene.h @@ -4,14 +4,14 @@ typedef struct { /* 0x00 */ u16 entrance; // entrance index upon which the cutscene should trigger /* 0x02 */ u8 ageRestriction; // 0 for adult only, 1 for child only, 2 for both ages - /* 0x03 */ u8 flag; // event_chk_inf flag bound to the entrance cutscene + /* 0x03 */ u8 flag; // eventChkInf flag bound to the entrance cutscene /* 0x04 */ u32 segAddr; // segment offset location of the cutscene } EntranceCutscene; // size = 0x8 typedef struct { /* 0x00 */ s8 continueFlag; /* 0x01 */ s8 cameraRoll; - /* 0x02 */ s16 nextPointFrame; + /* 0x02 */ u16 nextPointFrame; /* 0x04 */ f32 viewAngle; // in degrees /* 0x08 */ Vec3s pos; } CutsceneCameraPoint; // size = 0x10 @@ -69,7 +69,7 @@ typedef struct { } CsCmdTextbox; // size = 0xC typedef struct { - /* 0x00 */ u16 action; + /* 0x00 */ u16 action; // "dousa" /* 0x02 */ u16 startFrame; /* 0x04 */ u16 endFrame; /* 0x06 */ Vec3s rot; diff --git a/include/z64item.h b/include/z64item.h index 39a70b8037..7b28a910ea 100644 --- a/include/z64item.h +++ b/include/z64item.h @@ -19,6 +19,34 @@ typedef enum { /* 0x07 */ UPG_NUTS } UpgradeType; +typedef enum { + /* 0x00 */ QUEST_MEDALLION_FOREST, + /* 0x01 */ QUEST_MEDALLION_FIRE, + /* 0x02 */ QUEST_MEDALLION_WATER, + /* 0x03 */ QUEST_MEDALLION_SPIRIT, + /* 0x04 */ QUEST_MEDALLION_SHADOW, + /* 0x05 */ QUEST_MEDALLION_LIGHT, + /* 0x06 */ QUEST_SONG_MINUET, + /* 0x07 */ QUEST_SONG_BOLERO, + /* 0x08 */ QUEST_SONG_SERENADE, + /* 0x09 */ QUEST_SONG_REQUIEM, + /* 0x0A */ QUEST_SONG_NOCTURNE, + /* 0x0B */ QUEST_SONG_PRELUDE, + /* 0x0C */ QUEST_SONG_LULLABY, + /* 0x0D */ QUEST_SONG_EPONA, + /* 0x0E */ QUEST_SONG_SARIA, + /* 0x0F */ QUEST_SONG_SUN, + /* 0x10 */ QUEST_SONG_TIME, + /* 0x11 */ QUEST_SONG_STORMS, + /* 0x12 */ QUEST_KOKIRI_EMERALD, + /* 0x13 */ QUEST_GORON_RUBY, + /* 0x14 */ QUEST_ZORA_SAPPHIRE, + /* 0x15 */ QUEST_STONE_OF_AGONY, + /* 0x16 */ QUEST_GERUDO_CARD, + /* 0x17 */ QUEST_SKULL_TOKEN, + /* 0x18 */ QUEST_HEART_PIECE +} QuestItem; + typedef enum { /* 0x00 */ SLOT_STICK, /* 0x01 */ SLOT_NUT, diff --git a/include/z64scene.h b/include/z64scene.h index c808395878..470b0f849c 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -2,10 +2,13 @@ #define _Z64SCENE_H_ typedef struct { - /* 0x00 */ u32 sceneVromStart; - /* 0x04 */ u32 sceneVromEnd; - /* 0x08 */ u32 titleVromStart; - /* 0x0C */ u32 titleVromEnd; + /* 0x00 */ u32 vromStart; + /* 0x04 */ u32 vromEnd; +} RomFile; // size = 0x8 + +typedef struct { + /* 0x00 */ RomFile sceneFile; + /* 0x08 */ RomFile titleFile; /* 0x10 */ u8 unk_10; /* 0x11 */ u8 config; /* 0x12 */ u8 unk_12; diff --git a/spec b/spec index 0fa6c3fe6a..375412368b 100644 --- a/spec +++ b/spec @@ -409,8 +409,6 @@ beginseg include "build/src/code/z_kaleido_manager.o" include "build/src/code/z_kaleido_scope_call.o" include "build/src/code/z_play.o" - include "build/data/z_play.data.o" - include "build/data/z_play.bss.o" include "build/asm/PreRender.o" include "build/data/PreRender.rodata.o" include "build/src/code/TwoHeadArena.o" diff --git a/src/code/code_80097A00.c b/src/code/code_80097A00.c index d709fd8c92..cdf78e9d5e 100644 --- a/src/code/code_80097A00.c +++ b/src/code/code_80097A00.c @@ -93,8 +93,8 @@ u8 Inventory_DeleteEquipment(GlobalContext* globalCtx, s16 equipment) { } if (equipment == EQUIP_SWORD) { - gSaveContext.equips.button_items[0] = ITEM_NONE; - gSaveContext.inf_table[29] = 1; + gSaveContext.equips.buttonItems[0] = ITEM_NONE; + gSaveContext.infTable[29] = 1; } func_8008ECAC(globalCtx, player); diff --git a/src/code/code_800ACE70.c b/src/code/code_800ACE70.c index 31e93ad63b..f62d543352 100644 --- a/src/code/code_800ACE70.c +++ b/src/code/code_800ACE70.c @@ -3,10 +3,7 @@ typedef struct { /* 0x00 */ u32 type; /* 0x04 */ u32 setScissor; - /* 0x08 */ union { - Color_RGBA8 c; - u32 rgba; - } color; + /* 0x08 */ Color_RGBA8 color; /* 0x0C */ u32 unk_0C; } struct_801664F0; @@ -60,10 +57,10 @@ Gfx D_8012AC58[] = { void func_800ACE70(struct_801664F0* this) { this->type = 0; this->setScissor = false; - this->color.c.r = 0xFF; - this->color.c.g = 0xFF; - this->color.c.b = 0xFF; - this->color.c.a = 0xFF; + this->color.r = 0xFF; + this->color.g = 0xFF; + this->color.b = 0xFF; + this->color.a = 0xFF; } // Destroy func diff --git a/src/code/code_800FC620.c b/src/code/code_800FC620.c index b0b16b8b7d..c75135cd70 100644 --- a/src/code/code_800FC620.c +++ b/src/code/code_800FC620.c @@ -13,7 +13,7 @@ typedef struct InitFunc { // .data void* sInitFuncs = NULL; -char sNew[4] = { 'n', 'e', 'w' }; +char sNew[] = { 'n', 'e', 'w' }; char D_80134488[0x18] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x80, 0x00, 0x00, diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c index 789e382af6..69a4d93622 100644 --- a/src/code/debug_malloc.c +++ b/src/code/debug_malloc.c @@ -10,13 +10,13 @@ Arena sDebugArena; void DebugArena_CheckPointer(void* ptr, u32 size, const char* name, const char* action) { if (!ptr) { if (gDebugArenaLogSeverity >= LOG_SEVERITY_ERROR) { - //"%s: %u bytes %s failed\n" + // "%s: %u bytes %s failed\n" osSyncPrintf("%s: %u バイトの%sに失敗しました\n", name, size, action); __osDisplayArena(&sDebugArena); return; } } else if (gDebugArenaLogSeverity >= LOG_SEVERITY_VERBOSE) { - //"%s: %u bytes %s succeeded\n" + // "%s: %u bytes %s succeeded\n" osSyncPrintf("%s: %u バイトの%sに成功しました\n", name, size, action); } } diff --git a/src/code/gfxprint.c b/src/code/gfxprint.c index 0555e1cec0..57414bc2c9 100644 --- a/src/code/gfxprint.c +++ b/src/code/gfxprint.c @@ -174,7 +174,7 @@ void GfxPrint_InitDlist(GfxPrint* this) { gDPSetTileSize(this->dlist++, i * 2, 0, 0, 60, 1020); } - gDPSetPrimColorMod(this->dlist++, 0, 0, *(u32*)&this->color); + gDPSetPrimColorMod(this->dlist++, 0, 0, this->color.rgba); gDPSetTextureImage(this->dlist++, G_IM_FMT_CI, G_IM_SIZ_8b, 1, sGfxPrintUnkData); gDPSetTile(this->dlist++, G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 3, @@ -204,7 +204,7 @@ void GfxPrint_SetColor(GfxPrint* this, u32 r, u32 g, u32 b, u32 a) { this->color.b = b; this->color.a = a; gDPPipeSync(this->dlist++); - gDPSetPrimColorMod(this->dlist++, 0, 0, *(u32*)&this->color); + gDPSetPrimColorMod(this->dlist++, 0, 0, this->color.rgba); } void GfxPrint_SetPosPx(GfxPrint* this, s32 x, s32 y) { @@ -252,7 +252,7 @@ void GfxPrint_PrintCharImpl(GfxPrint* this, u8 c) { c * 2, (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 1024, 1024); } - gDPSetPrimColorMod(this->dlist++, 0, 0, *(u32*)&this->color); + gDPSetPrimColorMod(this->dlist++, 0, 0, this->color.rgba); } if (this->flag & GFXPRINT_FLAG64) { @@ -350,7 +350,7 @@ void GfxPrint_Ctor(GfxPrint* this) { this->posY = 0; this->baseX = 0; this->baseY = 0; - *(u32*)&this->color = 0; + this->color.rgba = 0; this->flag &= ~GFXPRINT_FLAG1; this->flag &= ~GFXPRINT_USE_RGBA16; diff --git a/src/code/graph.c b/src/code/graph.c index 600c2287f5..68fccaca6c 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -119,7 +119,7 @@ GameStateOverlay* Graph_GetNextGameState() { if (gameStateInitFunc == Title_Init) { return &gGameStateOverlayTable[2]; } - if (gameStateInitFunc == func_800BCA64) { + if (gameStateInitFunc == Gameplay_Init) { return &gGameStateOverlayTable[3]; } if (gameStateInitFunc == Opening_Init) { @@ -389,7 +389,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { if (D_8012DBC0 && (!~(gameState->input[0].press.in.button | ~Z_TRIG)) && (!~(gameState->input[0].cur.in.button | ~(L_TRIG | R_TRIG)))) { - gSaveContext.game_mode = 0; + gSaveContext.gameMode = 0; SET_NEXT_GAMESTATE(gameState, func_80801E44, char[0x240]); // TODO : SelectContext gameState->running = false; } @@ -438,8 +438,7 @@ void Graph_ThreadEntry(void* arg0) { } func_800C5080(gameState, ovl->init, &gfxCtx); // Game_Ct - while (func_800C547C(gameState)) // Game_IsGameStateRunning - { + while (func_800C547C(gameState)) { // Game_IsGameStateRunning Graph_Update(&gfxCtx, gameState); } diff --git a/src/code/main.c b/src/code/main.c index 8b797bbf9f..38949d73c5 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -2,8 +2,8 @@ #include #include -u32 gScreenWidth = SCREEN_WIDTH; -u32 gScreenHeight = SCREEN_HEIGHT; +s32 gScreenWidth = SCREEN_WIDTH; +s32 gScreenHeight = SCREEN_HEIGHT; u32 gSystemHeapSize = 0; PreNmiBuff* gAppNmiBufferPtr; diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index c320a32862..814b8fa2cf 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -898,8 +898,11 @@ MtxF* Matrix_CheckFloats(MtxF* mf, char* file, s32 line) { for (i = 0; i < 4; i++) { for (j = 0; j < 4; j++) { if (!(-32768.0f <= mf->mf[i][j]) || !(mf->mf[i][j] < 32768.0f)) { - osSyncPrintf("%s %d: [%s] =\n/ %12.6f %12.6f %12.6f %12.6f \\\n| %12.6f %12.6f %12.6f %12.6f |\n| " - "%12.6f %12.6f %12.6f %12.6f |\n\\ %12.6f %12.6f %12.6f %12.6f /\n", + osSyncPrintf("%s %d: [%s] =\n" + "/ %12.6f %12.6f %12.6f %12.6f \\\n" + "| %12.6f %12.6f %12.6f %12.6f |\n" + "| %12.6f %12.6f %12.6f %12.6f |\n" + "\\ %12.6f %12.6f %12.6f %12.6f /\n", file, line, "mf", mf->xx, mf->yx, mf->zx, mf->wx, mf->xy, mf->yy, mf->zy, mf->wy, mf->xz, mf->yz, mf->zz, mf->wz, mf->xw, mf->yw, mf->zw, mf->ww); Fault_AddHungupAndCrash(file, line); diff --git a/src/code/system_malloc.c b/src/code/system_malloc.c index 3c75b60654..a9141043d9 100644 --- a/src/code/system_malloc.c +++ b/src/code/system_malloc.c @@ -10,13 +10,13 @@ Arena gSystemArena; void SystemArena_CheckPointer(void* ptr, u32 size, const char* name, const char* action) { if (!ptr) { if (gSystemArenaLogSeverity >= LOG_SEVERITY_ERROR) { - //"%s: %u bytes %s failed\n" + // "%s: %u bytes %s failed\n" osSyncPrintf("%s: %u バイトの%sに失敗しました\n", name, size, action); __osDisplayArena(&gSystemArena); return; } } else if (gSystemArenaLogSeverity >= LOG_SEVERITY_VERBOSE) { - //"%s: %u bytes %s succeeded\n" + // "%s: %u bytes %s succeeded\n" osSyncPrintf("%s: %u バイトの%sに成功しました\n", name, size, action); } } diff --git a/src/code/z_actor.c b/src/code/z_actor.c index c6ca917213..02e5b4efbc 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -699,10 +699,10 @@ void TitleCard_InitBossName(GlobalContext* globalCtx, TitleCardContext* titleCtx void TitleCard_InitPlaceName(GlobalContext* globalCtx, TitleCardContext* titleCtx, u32 texture, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) { Scene* loadedScene = globalCtx->loadedScene; - u32 size = loadedScene->titleVromEnd - loadedScene->titleVromStart; + u32 size = loadedScene->titleFile.vromEnd - loadedScene->titleFile.vromStart; if ((size != 0) && (size <= 0x3000)) { - DmaMgr_SendRequest1(texture, loadedScene->titleVromStart, size, "../z_actor.c", 2765); + DmaMgr_SendRequest1(texture, loadedScene->titleFile.vromStart, size, "../z_actor.c", 2765); } titleCtx->texture = texture; @@ -1042,7 +1042,7 @@ void func_8002DE04(GlobalContext* globalCtx, Actor* actorA, Actor* actorB) { void func_8002DE74(GlobalContext* globalCtx, Player* player) { if ((globalCtx->roomCtx.curRoom.unk_03 != 4) && func_800C0CB8(globalCtx)) { - func_8005A77C(func_800C04A4(globalCtx, 0), 6); + func_8005A77C(Gameplay_GetCamera(globalCtx, 0), 6); } } @@ -1056,8 +1056,8 @@ s32 func_8002DEEC(Player* player) { return (player->stateFlags1 & 0x20000080) || player->action; } -void func_8002DF18(GlobalContext* globalCtx, ActorContext* actorCtx) { - func_8006DC68(globalCtx, actorCtx); +void func_8002DF18(GlobalContext* globalCtx, Player* player) { + func_8006DC68(globalCtx, player); } u32 func_8002DF38(GlobalContext* globalCtx, Actor* actor, u8 newAction) { @@ -1359,9 +1359,9 @@ void func_8002EBCC(Actor* actor, GlobalContext* globalCtx, s32 flag) { GraphicsContext* gfxCtx; Gfx* dispRefs[4]; - lightDir.x = globalCtx->unk_10A4E; - lightDir.y = globalCtx->unk_10A4F; - lightDir.z = globalCtx->unk_10A50; + lightDir.x = globalCtx->envCtx.unk_2A; + lightDir.y = globalCtx->envCtx.unk_2B; + lightDir.z = globalCtx->envCtx.unk_2C; if (HREG(80) == 6) { osSyncPrintf("z_actor.c 3637 game_play->view.eye=[%f(%f) %f %f]\n", (f64)globalCtx->view.eye.x, @@ -1393,9 +1393,9 @@ void func_8002ED80(Actor* actor, GlobalContext* globalCtx, s32 flag) { GraphicsContext* gfxCtx; Gfx* dispRefs[4]; - lightDir.x = globalCtx->unk_10A4E; - lightDir.y = globalCtx->unk_10A4F; - lightDir.z = globalCtx->unk_10A50; + lightDir.x = globalCtx->envCtx.unk_2A; + lightDir.y = globalCtx->envCtx.unk_2B; + lightDir.z = globalCtx->envCtx.unk_2C; hilite = func_8002EB44(&actor->posRot.pos, &globalCtx->view.eye, &lightDir, globalCtx->state.gfxCtx); @@ -1770,15 +1770,15 @@ void func_8002FA60(GlobalContext* globalCtx) { if (gSaveContext.fw.set) { gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0x28; - gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x = gSaveContext.fw.pos_x; - gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y = gSaveContext.fw.pos_y; - gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z = gSaveContext.fw.pos_z; + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x = gSaveContext.fw.pos.x; + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y = gSaveContext.fw.pos.y; + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z = gSaveContext.fw.pos.z; gSaveContext.respawn[RESPAWN_MODE_TOP].yaw = gSaveContext.fw.yaw; - gSaveContext.respawn[RESPAWN_MODE_TOP].player_params = gSaveContext.fw.player_params; - gSaveContext.respawn[RESPAWN_MODE_TOP].entrance_index = gSaveContext.fw.entrance_index; - gSaveContext.respawn[RESPAWN_MODE_TOP].room_index = gSaveContext.fw.room_index; - gSaveContext.respawn[RESPAWN_MODE_TOP].temp_swch_flags = gSaveContext.fw.temp_swch_flags; - gSaveContext.respawn[RESPAWN_MODE_TOP].temp_collect_flags = gSaveContext.fw.temp_collect_flags; + gSaveContext.respawn[RESPAWN_MODE_TOP].playerParams = gSaveContext.fw.playerParams; + gSaveContext.respawn[RESPAWN_MODE_TOP].entranceIndex = gSaveContext.fw.entranceIndex; + gSaveContext.respawn[RESPAWN_MODE_TOP].roomIndex = gSaveContext.fw.roomIndex; + gSaveContext.respawn[RESPAWN_MODE_TOP].tempSwchFlags = gSaveContext.fw.tempSwchFlags; + gSaveContext.respawn[RESPAWN_MODE_TOP].tempCollectFlags = gSaveContext.fw.tempCollectFlags; } else { gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0; gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x = 0.0f; @@ -1887,7 +1887,7 @@ void func_8002FBAC(GlobalContext* globalCtx) { if (D_8015BC18 == 0.0f) { gSaveContext.respawn[RESPAWN_MODE_TOP] = gSaveContext.respawn[RESPAWN_MODE_DOWN]; - gSaveContext.respawn[RESPAWN_MODE_TOP].player_params = 0x06FF; + gSaveContext.respawn[RESPAWN_MODE_TOP].playerParams = 0x06FF; gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0x28; } @@ -1924,8 +1924,8 @@ void func_8002FBAC(GlobalContext* globalCtx) { } if ((globalCtx->csCtx.state == 0) && - (gSaveContext.respawn[RESPAWN_MODE_TOP].entrance_index == gSaveContext.entrance_index) && - (globalCtx->roomCtx.curRoom.num == gSaveContext.respawn[RESPAWN_MODE_TOP].room_index)) { + (gSaveContext.respawn[RESPAWN_MODE_TOP].entranceIndex == gSaveContext.entranceIndex) && + (globalCtx->roomCtx.curRoom.num == gSaveContext.respawn[RESPAWN_MODE_TOP].roomIndex)) { gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x19); Matrix_Translate(gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x, @@ -1980,12 +1980,13 @@ void func_800304B0(GlobalContext* globalCtx) { } } +// Actor_InitContext void func_800304DC(GlobalContext* globalCtx, ActorContext* actorCtx, ActorEntry* actorEntry) { ActorOverlay* overlayEntry; SaveSceneFlags* saveSceneFlags; s32 i; - saveSceneFlags = &gSaveContext.scene_flags[globalCtx->sceneNum]; + saveSceneFlags = &gSaveContext.sceneFlags[globalCtx->sceneNum]; bzero(actorCtx, sizeof(*actorCtx)); @@ -2206,7 +2207,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) { func_80079EFC(lightMapper, globalCtx->state.gfxCtx); if (actor->flags & 0x1000) { - camera = &globalCtx->cameraCtx.activeCameras[0]; + camera = &globalCtx->cameras[0]; func_800D1694(actor->posRot.pos.x + camera->unk_80.x, actor->posRot.pos.y + (f32)((actor->shape.unk_08 * actor->scale.y) + camera->unk_80.y), actor->posRot.pos.z + camera->unk_80.z, &actor->shape.rot); @@ -2546,6 +2547,7 @@ void func_80031B14(GlobalContext* globalCtx, ActorContext* actorCtx) { globalCtx->msgCtx.unk_E3F4 = 0; } +// Actor_CleanupContext void func_80031C3C(ActorContext* actorCtx, GlobalContext* globalCtx) { Actor* actor; s32 i; @@ -2568,7 +2570,7 @@ void func_80031C3C(ActorContext* actorCtx, GlobalContext* globalCtx) { actorCtx->absoluteSpace = NULL; } - func_800C0A44(globalCtx); + Gameplay_SaveSceneFlags(globalCtx); func_80030488(globalCtx); ActorOverlayTable_Cleanup(); } @@ -2891,7 +2893,7 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, GlobalContext* globalC if ((player != NULL) && (actor == player->unk_664)) { func_8008EDF0(player); - func_8005A444(func_800C04A4(globalCtx, func_800C030C(globalCtx)), 0); + func_8005A444(Gameplay_GetCamera(globalCtx, Gameplay_GetActiveCamId(globalCtx)), 0); } if (actor == actorCtx->targetCtx.arrowPointedActor) { @@ -3516,14 +3518,14 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) } void func_80033DB8(GlobalContext* globalCtx, s16 arg1, s16 arg2) { - s16 var = Quake_Add(&globalCtx->cameraCtx.activeCameras[0], 3); + s16 var = Quake_Add(&globalCtx->cameras[0], 3); Quake_SetSpeed(var, 20000); Quake_SetQuakeValues(var, arg1, 0, 0, 0); Quake_SetCountdown(var, arg2); } void func_80033E1C(GlobalContext* globalCtx, s16 arg1, s16 arg2, s16 arg3) { - s16 var = Quake_Add(&globalCtx->cameraCtx.activeCameras[0], 3); + s16 var = Quake_Add(&globalCtx->cameras[0], 3); Quake_SetSpeed(var, arg3); Quake_SetQuakeValues(var, arg1, 0, 0, 0); Quake_SetCountdown(var, arg2); @@ -3557,7 +3559,7 @@ typedef struct { /* 0x18 */ u32 unk_18; } struct_801160DC; // size = 0x1C -struct_801160DC D_801160DC[3] = { +struct_801160DC D_801160DC[] = { { 0.54f, 6000.0f, 5000.0f, 1.0f, 0.0f, 0x050011F0, 0x05001100 }, { 0.644f, 12000.0f, 8000.0f, 1.0f, 0.0f, 0x06001530, 0x06001400 }, { 0.64000005f, 8500.0f, 8000.0f, 1.75f, 0.1f, 0x050011F0, 0x05001100 }, @@ -3634,9 +3636,9 @@ void func_8003426C(Actor* actor, s16 arg1, s16 arg2, s16 arg3, s16 arg4) { Hilite* func_800342EC(Vec3f* object, GlobalContext* globalCtx) { Vec3f lightDir; - lightDir.x = globalCtx->unk_10A4E; - lightDir.y = globalCtx->unk_10A4F; - lightDir.z = globalCtx->unk_10A50; + lightDir.x = globalCtx->envCtx.unk_2A; + lightDir.y = globalCtx->envCtx.unk_2B; + lightDir.z = globalCtx->envCtx.unk_2C; return func_8002EABC(object, &globalCtx->view.eye, &lightDir, globalCtx->state.gfxCtx); } @@ -3644,9 +3646,9 @@ Hilite* func_800342EC(Vec3f* object, GlobalContext* globalCtx) { Hilite* func_8003435C(Vec3f* object, GlobalContext* globalCtx) { Vec3f lightDir; - lightDir.x = globalCtx->unk_10A4E; - lightDir.y = globalCtx->unk_10A4F; - lightDir.z = globalCtx->unk_10A50; + lightDir.x = globalCtx->envCtx.unk_2A; + lightDir.y = globalCtx->envCtx.unk_2B; + lightDir.z = globalCtx->envCtx.unk_2C; return func_8002EB44(object, &globalCtx->view.eye, &lightDir, globalCtx->state.gfxCtx); } @@ -3712,7 +3714,7 @@ typedef struct { /* 0x14 */ s16 unk_14; } struct_80116130; // size = 0x18 -struct_80116130 D_80116130[13] = { +struct_80116130 D_80116130[] = { { { 0x2AA8, 0xF1C8, 0x18E2, 0x1554, 0x0000, 0x0000, 1 }, 170.0f, 0x3FFC }, { { 0x2AA8, 0xEAAC, 0x1554, 0x1554, 0xF8E4, 0x0E38, 1 }, 170.0f, 0x3FFC }, { { 0x31C4, 0xE390, 0x0E38, 0x0E38, 0xF1C8, 0x071C, 1 }, 170.0f, 0x3FFC }, @@ -4233,28 +4235,28 @@ void func_80035B18(GlobalContext* globalCtx, Actor* actor, u16 textId) { * Tests if event_chk_inf flag is set. */ s32 Flags_GetEventChkInf(s32 flag) { - return gSaveContext.event_chk_inf[flag >> 4] & (1 << (flag & 0xF)); + return gSaveContext.eventChkInf[flag >> 4] & (1 << (flag & 0xF)); } /** * Sets event_chk_inf flag. */ void Flags_SetEventChkInf(s32 flag) { - gSaveContext.event_chk_inf[flag >> 4] |= (1 << (flag & 0xF)); + gSaveContext.eventChkInf[flag >> 4] |= (1 << (flag & 0xF)); } /** - * Tests if inf_table flag is set. + * Tests if "inf_table flag is set. */ s32 Flags_GetInfTable(s32 flag) { - return gSaveContext.inf_table[flag >> 4] & (1 << (flag & 0xF)); + return gSaveContext.infTable[flag >> 4] & (1 << (flag & 0xF)); } /** - * Sets inf_table flag. + * Sets "inf_table" flag. */ void Flags_SetInfTable(s32 flag) { - gSaveContext.inf_table[flag >> 4] |= (1 << (flag & 0xF)); + gSaveContext.infTable[flag >> 4] |= (1 << (flag & 0xF)); } u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) { @@ -4551,7 +4553,7 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) { retTextId = 0x7002; } else if (Flags_GetInfTable(0x6A)) { retTextId = 0x7004; - } else if ((gSaveContext.day_time >= 0x4000) && (gSaveContext.day_time < 0xC556)) { + } else if ((gSaveContext.dayTime >= 0x4000) && (gSaveContext.dayTime < 0xC556)) { retTextId = 0x7002; } else { retTextId = 0x7003; @@ -4956,7 +4958,7 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) { } } else { if (!Flags_GetEventChkInf(0x18)) { - if (gSaveContext.night_flag) { + if (gSaveContext.nightFlag) { retTextId = 0x204E; } else if (Flags_GetInfTable(0x9A)) { retTextId = 0x2031; @@ -5569,7 +5571,7 @@ s32 func_80038154(GlobalContext* globalCtx, Actor* actor, Vec3s* arg2, Vec3s* ar actor->posRot2.pos = actor->posRot.pos; actor->posRot2.pos.y += arg4; - if (!(((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entrance_index == 0x00EE))) { + if (!(((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entranceIndex == 0x00EE))) { var = actor->rotTowardsLinkY - actor->shape.rot.y; abs_var = ABS(var); if (abs_var >= 0x4300) { @@ -5578,7 +5580,7 @@ s32 func_80038154(GlobalContext* globalCtx, Actor* actor, Vec3s* arg2, Vec3s* ar } } - if (((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entrance_index == 0x00EE)) { + if (((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entranceIndex == 0x00EE)) { sp2C = globalCtx->view.eye; } else { sp2C = player->actor.posRot2.pos; @@ -5598,7 +5600,7 @@ s32 func_80038290(GlobalContext* globalCtx, Actor* actor, Vec3s* arg2, Vec3s* ar actor->posRot2.pos = arg4; - if (!(((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entrance_index == 0x00EE))) { + if (!(((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entranceIndex == 0x00EE))) { var = actor->rotTowardsLinkY - actor->shape.rot.y; abs_var = ABS(var); if (abs_var >= 0x4300) { @@ -5607,7 +5609,7 @@ s32 func_80038290(GlobalContext* globalCtx, Actor* actor, Vec3s* arg2, Vec3s* ar } } - if (((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entrance_index == 0x00EE)) { + if (((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entranceIndex == 0x00EE)) { sp24 = globalCtx->view.eye; } else { sp24 = player->actor.posRot2.pos; diff --git a/src/code/z_camera.c b/src/code/z_camera.c index b48b58321a..6c8fa5ade9 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -234,7 +234,6 @@ s32 func_800443A0(Camera* camera, Vec3f* b, Vec3f* c) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800443A0.s") #endif -f32 func_8003C940(CollisionContext*, CollisionPoly**, s32*, Vec3f*); f32 func_80044434(Camera* camera, Vec3f* b, Vec3f* c, s32* d) { s32 sp2C; // unused CollisionPoly* sp28; @@ -739,7 +738,7 @@ s16 func_80046CB4(Camera* camera, s16 b, s16 c, f32 d, f32 e) { if (camera->unk_D8 > 0.001f) { temp = b - 0x7fff; // this is probably some kind of cast that I'm too stupid to know sp1C = c - temp; - phi_f14 = (s16)(sp1C - 0x7fff) * 0.00003051851f; + phi_f14 = (s16)(sp1C - 0x7fff) * (1.0f / 32767.0f); } else { temp = b - 0x7fff; sp1C = c - temp; @@ -804,7 +803,7 @@ void Camera_Vec3fCopy(Vec3f* src, Vec3f* dst) { s32 func_8005AD40(Camera* camera, s32 a, s16 b, f32 c, s16 d, s16 e, s16 f); void func_80057FC4(Camera* camera) { - if (camera != &camera->globalCtx->cameraCtx.activeCameras[0]) { + if (camera != &camera->globalCtx->cameras[0]) { camera->unk_154 = camera->unk_142 = 33; camera->unk_14C &= ~0x4; } else if (camera->globalCtx->roomCtx.curRoom.mesh->polygon.type != 1) { @@ -839,7 +838,7 @@ void Camera_Stub80058140(Camera* camera) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80058148.s") // 109 lines (unknown arrays) -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80058354.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ChangeStatus.s") // 261 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800584E8.s") @@ -867,11 +866,11 @@ s32 func_80058CF8(Camera* camera) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800591EC.s") void func_80059EC8(Camera* camera) { - Camera* sp24 = camera->globalCtx->cameraCtx.activeCameraPtrs[0]; + Camera* sp24 = camera->globalCtx->cameraPtrs[0]; Player* player = (Player*)camera->globalCtx->actorCtx.actorList[2].first; if (camera->unk_160 == 0) { - func_800C0314(camera->globalCtx, camera->unk_162, 7); + Gameplay_ChangeCameraStatus(camera->globalCtx, camera->unk_162, 7); if ((camera->unk_162 == 0) && (camera->unk_168 != 0)) { player->actor.freeze = 0; @@ -885,24 +884,24 @@ void func_80059EC8(Camera* camera) { sp24->unk_14C |= 8; } - if (camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_14E]->unk_162 == camera->unk_164) { - camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_14E]->unk_162 = camera->unk_162; + if (camera->globalCtx->cameraPtrs[camera->unk_14E]->unk_162 == camera->unk_164) { + camera->globalCtx->cameraPtrs[camera->unk_14E]->unk_162 = camera->unk_162; } - if (camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_162]->unk_14E == camera->unk_164) { - camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_162]->unk_14E = camera->unk_14E; + if (camera->globalCtx->cameraPtrs[camera->unk_162]->unk_14E == camera->unk_164) { + camera->globalCtx->cameraPtrs[camera->unk_162]->unk_14E = camera->unk_14E; } - if (camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_162]->unk_164 == 0) { - camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_162]->unk_15E = 0; + if (camera->globalCtx->cameraPtrs[camera->unk_162]->unk_164 == 0) { + camera->globalCtx->cameraPtrs[camera->unk_162]->unk_15E = 0; } camera->unk_162 = 0; camera->unk_14E = camera->unk_162; camera->unk_160 = -1; - camera->globalCtx->unk_10B05 = 0; + camera->globalCtx->envCtx.unk_E1 = 0; - func_800C0384(camera->globalCtx, camera->unk_164); + Gameplay_ClearCamera(camera->globalCtx, camera->unk_164); } } @@ -1128,9 +1127,9 @@ s32 func_8005B198() { s16 func_8005B1A4(Camera* camera) { camera->unk_14C |= 0x8; - if ((camera->unk_164 == 0) && (camera->globalCtx->cameraCtx.unk_5C0 != 0)) { - camera->globalCtx->cameraCtx.activeCameraPtrs[camera->globalCtx->cameraCtx.unk_5C0]->unk_14C |= 0x8; - return camera->globalCtx->cameraCtx.unk_5C0; + if ((camera->unk_164 == 0) && (camera->globalCtx->activeCamera != 0)) { + camera->globalCtx->cameraPtrs[camera->globalCtx->activeCamera]->unk_14C |= 0x8; + return camera->globalCtx->activeCamera; } return camera->unk_164; diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index b8a70550db..5b6561232f 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -298,7 +298,7 @@ s32 func_8005D1E0(GlobalContext* globalCtx, ColliderCylinderMain* collision) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D3BC.s") -void func_8005D400(UNK_TYPE arg0, UNK_TYPE arg1) { +void func_8005D400(GlobalContext* globalCtx, SubGlobalContext11E60* sub_11E60) { } #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D40C.s") diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c index cb57394771..798f95d8ee 100644 --- a/src/code/z_common_data.c +++ b/src/code/z_common_data.c @@ -5,15 +5,15 @@ void SaveContext_Init(void) { bzero(&gSaveContext, sizeof(gSaveContext)); D_8015FA88 = 0; D_8015FA8C = 0; - gSaveContext.seq_index = 0xFF; - gSaveContext.night_sfx = 0xFF; + gSaveContext.seqIndex = 0xFF; + gSaveContext.nightSeqIndex = 0xFF; gSaveContext.unk_140E = 0; - gSaveContext.next_cutscene_index = 0xFFEF; - gSaveContext.cutscene_trigger = 0; - gSaveContext.chamber_cutscene_num = 0; - gSaveContext.next_day_time = 0xFFFF; - gSaveContext.environment_time = 0; - gSaveContext.dogIsLost = 1; - gSaveContext.transition_type = 0xFF; + gSaveContext.nextCutsceneIndex = 0xFFEF; + gSaveContext.cutsceneTrigger = 0; + gSaveContext.chamberCutsceneNum = 0; + gSaveContext.nextDayTime = 0xFFFF; + gSaveContext.environmentTime = 0; + gSaveContext.dogIsLost = true; + gSaveContext.nextTransition = 0xFF; gSaveContext.unk_13EE = 50; } diff --git a/src/code/z_construct.c b/src/code/z_construct.c index d14e6ef8c3..75ac3d50ab 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -19,7 +19,7 @@ void func_801109B0(GlobalContext* globalCtx) { gSaveContext.unk_13EA = 0; gSaveContext.unk_13E8 = 0; - func_800AA278(&interfaceCtx->view, globalCtx->state.gfxCtx); + View_Init(&interfaceCtx->view, globalCtx->state.gfxCtx); interfaceCtx->unk_1EC = interfaceCtx->unk_1EE = 0; interfaceCtx->unk_1FA = interfaceCtx->unk_261 = interfaceCtx->unk_1FC = 0; @@ -94,71 +94,71 @@ void func_801109B0(GlobalContext* globalCtx) { __assert("parameter->icon_itemSegment != NULL", "../z_construct.c", 193); } - osSyncPrintf("Register_Item[%x, %x, %x, %x]\n", gSaveContext.equips.button_items[0], - gSaveContext.equips.button_items[1], gSaveContext.equips.button_items[2], - gSaveContext.equips.button_items[3]); + osSyncPrintf("Register_Item[%x, %x, %x, %x]\n", gSaveContext.equips.buttonItems[0], + gSaveContext.equips.buttonItems[1], gSaveContext.equips.buttonItems[2], + gSaveContext.equips.buttonItems[3]); - if (gSaveContext.equips.button_items[0] < 0xF0) { + if (gSaveContext.equips.buttonItems[0] < 0xF0) { DmaMgr_SendRequest1(interfaceCtx->icon_itemSegment, - _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[0] * 0x80, 0x1000, + _icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[0] * 0x80, 0x1000, "../z_construct.c", 198); - } else if (gSaveContext.equips.button_items[0] != 0xFF) { + } else if (gSaveContext.equips.buttonItems[0] != 0xFF) { DmaMgr_SendRequest1(interfaceCtx->icon_itemSegment, - _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[0] * 0x80, 0x1000, + _icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[0] * 0x80, 0x1000, "../z_construct.c", 203); } - if (gSaveContext.equips.button_items[1] < 0xF0) { + if (gSaveContext.equips.buttonItems[1] < 0xF0) { DmaMgr_SendRequest1((void*)((u32)interfaceCtx->icon_itemSegment + 0x1000), - _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[1] * 0x80, 0x1000, + _icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[1] * 0x80, 0x1000, "../z_construct.c", 209); } - if (gSaveContext.equips.button_items[2] < 0xF0) { + if (gSaveContext.equips.buttonItems[2] < 0xF0) { DmaMgr_SendRequest1((void*)((u32)interfaceCtx->icon_itemSegment + 0x2000), - _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[2] * 0x80, 0x1000, + _icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[2] * 0x80, 0x1000, "../z_construct.c", 214); } - if (gSaveContext.equips.button_items[3] < 0xF0) { + if (gSaveContext.equips.buttonItems[3] < 0xF0) { DmaMgr_SendRequest1((void*)((u32)interfaceCtx->icon_itemSegment + 0x3000), - _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[3] * 0x80, 0x1000, + _icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[3] * 0x80, 0x1000, "../z_construct.c", 219); } - osSyncPrintf("ＥＶＥＮＴ＝%d\n", gSaveContext.timer_1_state); + osSyncPrintf("ＥＶＥＮＴ＝%d\n", gSaveContext.timer1State); - if ((gSaveContext.timer_1_state == 4) || (gSaveContext.timer_1_state == 8) || (gSaveContext.timer_2_state == 4) || - (gSaveContext.timer_2_state == 10)) { - osSyncPrintf("restart_flag=%d\n", gSaveContext.respawn_flag); + if ((gSaveContext.timer1State == 4) || (gSaveContext.timer1State == 8) || (gSaveContext.timer2State == 4) || + (gSaveContext.timer2State == 10)) { + osSyncPrintf("restart_flag=%d\n", gSaveContext.respawnFlag); - if ((gSaveContext.respawn_flag == -1) || (gSaveContext.respawn_flag == 1)) { - if (gSaveContext.timer_1_state == 4) { - gSaveContext.timer_1_state = 1; - gSaveContext.timer_x[0] = 140; - gSaveContext.timer_y[0] = 80; + if ((gSaveContext.respawnFlag == -1) || (gSaveContext.respawnFlag == 1)) { + if (gSaveContext.timer1State == 4) { + gSaveContext.timer1State = 1; + gSaveContext.timerX[0] = 140; + gSaveContext.timerY[0] = 80; } } - if ((gSaveContext.timer_1_state == 4) || (gSaveContext.timer_1_state == 8)) { + if ((gSaveContext.timer1State == 4) || (gSaveContext.timer1State == 8)) { temp = 0; } else { temp = 1; } - gSaveContext.timer_x[temp] = 26; + gSaveContext.timerX[temp] = 26; - if (gSaveContext.health_capacity > 0xA0) { - gSaveContext.timer_y[temp] = 54; + if (gSaveContext.healthCapacity > 0xA0) { + gSaveContext.timerY[temp] = 54; } else { - gSaveContext.timer_y[temp] = 46; + gSaveContext.timerY[temp] = 46; } } - if ((gSaveContext.timer_1_state >= 11) && (gSaveContext.timer_1_state < 16)) { - gSaveContext.timer_1_state = 0; + if ((gSaveContext.timer1State >= 11) && (gSaveContext.timer1State < 16)) { + gSaveContext.timer1State = 0; // Translates to: "Timer Stop!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf("タイマー停止！！！！！！！！！！！！！！！！！！！！！ = %d\n", gSaveContext.timer_1_state); + osSyncPrintf("タイマー停止！！！！！！！！！！！！！！！！！！！！！ = %d\n", gSaveContext.timer1State); } // Translates to: "Parameter Area = %x" @@ -199,7 +199,7 @@ void func_80110F68(GlobalContext* globalCtx) { msgCtx->unk_E2F8 = msgCtx->unk_E3E4 = msgCtx->choiceIndex = msgCtx->unk_E3F0 = msgCtx->unk_E3D6 = 0; msgCtx->unk_E3E2 = 0xFF; - func_800AA278(&msgCtx->view, globalCtx->state.gfxCtx); + View_Init(&msgCtx->view, globalCtx->state.gfxCtx); msgCtx->textboxSegment = Game_Alloc(&globalCtx->state, 0x2200, "../z_construct.c", 349); @@ -532,7 +532,7 @@ void func_80111070(void) { WREG(94) = 3; WREG(95) = 6; - if (gSaveContext.game_mode == 0) { + if (gSaveContext.gameMode == 0) { VREG(0) = 0x34; VREG(1) = 0x24; VREG(2) = 0xD6; diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c index 914d70c890..29630f441f 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -8,8 +8,8 @@ typedef struct { typedef void (*DebugDispObject_DrawFunc)(DebugDispObject*, u32, GlobalContext*); -static void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, GlobalContext* globalCtx); -static void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, GlobalContext* globalCtx); +void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, GlobalContext* globalCtx); +void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, GlobalContext* globalCtx); static DebugDispObject_DrawFunc sDebugObjectDrawFuncTable[] = { DebugDisplay_DrawSpriteI8, @@ -70,7 +70,7 @@ void DebugDisplay_DrawObjects(GlobalContext* globalCtx) { } } -static void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, GlobalContext* globalCtx) { +void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[4]; @@ -95,7 +95,7 @@ static void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, Glo Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_debug_display.c", 192); } -static void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, GlobalContext* globalCtx) { +void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[4]; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 32939bf774..2a39229ac1 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -49,9 +49,9 @@ u16 D_8015FCC4; s16 D_8015FCC6; u8 D_8015FCC8; s16 D_8015FCCA; -u16 D_8015FCCC; // only written to, never read -s8 D_8015FCD0[20]; // unreferenced -u8 D_8015FCE4; // only written to, never read +u16 D_8015FCCC; // only written to, never read +char D_8015FCD0[20]; // unreferenced +u8 D_8015FCE4; // only written to, never read void func_80068ECC(GlobalContext* globalCtx, CutsceneContext* csCtx); @@ -91,7 +91,7 @@ void func_80064534(GlobalContext* globalCtx, CutsceneContext* csCtx) { } void func_80064558(GlobalContext* globalCtx, CutsceneContext* csCtx) { - if (gSaveContext.cutscene_index < 0xFFF0) { + if (gSaveContext.cutsceneIndex < 0xFFF0) { sCsStateHandlers1[csCtx->state](globalCtx, csCtx); } } @@ -99,32 +99,31 @@ void func_80064558(GlobalContext* globalCtx, CutsceneContext* csCtx) { void func_800645A0(GlobalContext* globalCtx, CutsceneContext* csCtx) { Input* pad1 = &globalCtx->state.input[0]; - if (!~(pad1->press.in.button | ~L_JPAD) && (csCtx->state == CS_STATE_IDLE) && - (gSaveContext.scene_setup_index >= 4)) { + if (!~(pad1->press.in.button | ~L_JPAD) && (csCtx->state == CS_STATE_IDLE) && (gSaveContext.sceneSetupIndex >= 4)) { D_8015FCC8 = 0; - gSaveContext.cutscene_index = 0xFFFD; - gSaveContext.cutscene_trigger = 1; + gSaveContext.cutsceneIndex = 0xFFFD; + gSaveContext.cutsceneTrigger = 1; } - if (!~(pad1->press.in.button | ~U_JPAD) && (csCtx->state == CS_STATE_IDLE) && - (gSaveContext.scene_setup_index >= 4) && (D_8011D394 == 0)) { + if (!~(pad1->press.in.button | ~U_JPAD) && (csCtx->state == CS_STATE_IDLE) && (gSaveContext.sceneSetupIndex >= 4) && + (D_8011D394 == 0)) { D_8015FCC8 = 1; - gSaveContext.cutscene_index = 0xFFFD; - gSaveContext.cutscene_trigger = 1; + gSaveContext.cutsceneIndex = 0xFFFD; + gSaveContext.cutsceneTrigger = 1; } - if ((gSaveContext.cutscene_trigger != 0) && (globalCtx->sceneLoadFlag == 0x14)) { - gSaveContext.cutscene_trigger = 0; + if ((gSaveContext.cutsceneTrigger != 0) && (globalCtx->sceneLoadFlag == 0x14)) { + gSaveContext.cutsceneTrigger = 0; } - if ((gSaveContext.cutscene_trigger != 0) && (csCtx->state == CS_STATE_IDLE)) { + if ((gSaveContext.cutsceneTrigger != 0) && (csCtx->state == CS_STATE_IDLE)) { // Translates to: "CUTSCENE START REQUEST ANNOUNCEMENT!" osSyncPrintf("\nデモ開始要求 発令！"); - gSaveContext.cutscene_index = 0xFFFD; - gSaveContext.cutscene_trigger = 1; + gSaveContext.cutsceneIndex = 0xFFFD; + gSaveContext.cutsceneTrigger = 1; } - if (gSaveContext.cutscene_index >= 0xFFF0) { + if (gSaveContext.cutsceneIndex >= 0xFFF0) { func_80068ECC(globalCtx, csCtx); sCsStateHandlers2[csCtx->state](globalCtx, csCtx); } @@ -181,7 +180,7 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* if (sp3F != 0) { func_800F6D58(0xE, 4, 0x3F); func_800F6D58(0xE, 1, 1); - globalCtx->unk_10B12[0] = 0x14; + globalCtx->envCtx.unk_EE[0] = 0x14; } break; case 2: @@ -195,26 +194,26 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* case 3: if (sp3F != 0) { func_8006C3D0(globalCtx, 0); - if (gSaveContext.entrance_index == 0x0053) { + if (gSaveContext.entranceIndex == 0x0053) { func_8006C3D0(globalCtx, 2); } } break; case 6: - if (globalCtx->unk_10AC4 < 0x3200) { - globalCtx->unk_10AC4 += 0x23; + if (globalCtx->envCtx.unk_A0 < 0x3200) { + globalCtx->envCtx.unk_A0 += 0x23; } break; case 7: if (sp3F != 0) { - globalCtx->unk_10A3D = 1; - globalCtx->gloomySky = 1; - globalCtx->unk_10A3C = 0; - globalCtx->unk_10A3E = 0x3C; - globalCtx->unk_10A45 = 1; - globalCtx->unk_10A43 = 0; - globalCtx->unk_10A44 = 1; - globalCtx->unk_10A46 = globalCtx->unk_10A48 = 0x3C; + globalCtx->envCtx.unk_19 = 1; + globalCtx->envCtx.gloomySky = 1; + globalCtx->envCtx.unk_18 = 0; + globalCtx->envCtx.unk_1A = 0x3C; + globalCtx->envCtx.unk_21 = 1; + globalCtx->envCtx.unk_1F = 0; + globalCtx->envCtx.unk_20 = 1; + globalCtx->envCtx.unk_22 = globalCtx->envCtx.unk_24 = 0x3C; } break; case 8: @@ -223,7 +222,7 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* } break; case 9: - globalCtx->unk_10B12[3] = 0x10; + globalCtx->envCtx.unk_EE[3] = 0x10; break; case 10: func_8006C3D0(globalCtx, 1); @@ -266,7 +265,7 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* break; case 16: if (sp3F != 0) { - D_8015FCCA = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 6); + D_8015FCCA = Quake_Add(globalCtx->cameraPtrs[globalCtx->activeCamera], 6); Quake_SetSpeed(D_8015FCCA, 0x7FFF); Quake_SetQuakeValues(D_8015FCCA, 4, 0, 1000, 0); Quake_SetCountdown(D_8015FCCA, 800); @@ -278,24 +277,24 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* } break; case 18: - globalCtx->unk_10B12[0] = 0; - globalCtx->gloomySkyEvent = 2; - if (gSaveContext.day_time < 0x4AAB) { - gSaveContext.day_time += 30; + globalCtx->envCtx.unk_EE[0] = 0; + globalCtx->envCtx.gloomySkyEvent = 2; + if (gSaveContext.dayTime < 0x4AAB) { + gSaveContext.dayTime += 30; } - if (globalCtx->unk_10B12[1] == 0) { + if (globalCtx->envCtx.unk_EE[1] == 0) { D_8011FB30 = 0; func_800F6D58(14, 1, 0); } break; case 19: - gSaveContext.event_chk_inf[6] |= 0x0020; + gSaveContext.eventChkInf[6] |= 0x0020; break; case 20: - gSaveContext.event_chk_inf[6] |= 0x0080; + gSaveContext.eventChkInf[6] |= 0x0080; break; case 21: - gSaveContext.event_chk_inf[6] |= 0x0200; + gSaveContext.eventChkInf[6] |= 0x0200; break; case 22: D_801614B0.r = 0xFF; @@ -313,34 +312,34 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* globalCtx->roomCtx.curRoom.segment = NULL; break; case 25: - gSaveContext.day_time += 30; - if ((gSaveContext.day_time) > 0xCAAA) { - gSaveContext.day_time = 0xCAAA; + gSaveContext.dayTime += 30; + if ((gSaveContext.dayTime) > 0xCAAA) { + gSaveContext.dayTime = 0xCAAA; } break; case 26: - if ((gSaveContext.day_time < 0x3000) || (gSaveContext.day_time >= 0x4555)) { - if ((gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time < 0xAAAB)) { - globalCtx->unk_10AE3 = 1; - } else if ((gSaveContext.day_time >= 0xAAAB) && (gSaveContext.day_time < 0xC556)) { - globalCtx->unk_10AE3 = 2; + if ((gSaveContext.dayTime < 0x3000) || (gSaveContext.dayTime >= 0x4555)) { + if ((gSaveContext.dayTime >= 0x4555) && (gSaveContext.dayTime < 0xAAAB)) { + globalCtx->envCtx.unk_BF = 1; + } else if ((gSaveContext.dayTime >= 0xAAAB) && (gSaveContext.dayTime < 0xC556)) { + globalCtx->envCtx.unk_BF = 2; } else { - globalCtx->unk_10AE3 = 3; + globalCtx->envCtx.unk_BF = 3; } } break; case 27: if (globalCtx->state.frames & 8) { - if (globalCtx->unk_10AB0[0] < 40) { - globalCtx->unk_10AB0[0] += 2; - globalCtx->unk_10AB0[4] -= 3; - globalCtx->unk_10AB0[5] -= 3; + if (globalCtx->envCtx.unk_8C[0] < 40) { + globalCtx->envCtx.unk_8C[0] += 2; + globalCtx->envCtx.unk_8C[4] -= 3; + globalCtx->envCtx.unk_8C[5] -= 3; } } else { - if (globalCtx->unk_10AB0[0] > 2) { - globalCtx->unk_10AB0[0] -= 2; - globalCtx->unk_10AB0[4] += 3; - globalCtx->unk_10AB0[5] += 3; + if (globalCtx->envCtx.unk_8C[0] > 2) { + globalCtx->envCtx.unk_8C[0] -= 2; + globalCtx->envCtx.unk_8C[4] += 3; + globalCtx->envCtx.unk_8C[5] += 3; } } break; @@ -358,7 +357,7 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* break; case 32: if (sp3F != 0) { - globalCtx->unk_10B0A = 1; + globalCtx->envCtx.unk_E6 = 1; } func_800788CC(0x20C0); break; @@ -366,10 +365,10 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* gSaveContext.unk_1422 = 1; break; case 34: - if (!gSaveContext.night_flag) { - gSaveContext.day_time -= D_8011FB40; + if (!gSaveContext.nightFlag) { + gSaveContext.dayTime -= D_8011FB40; } else { - gSaveContext.day_time -= D_8011FB40 * 2; + gSaveContext.dayTime -= D_8011FB40 * 2; } break; case 35: @@ -382,8 +381,8 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* // Command 4: Set Environment Lighting void Cutscene_Command_SetLighting(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdEnvLighting* cmd) { if (csCtx->frames == cmd->startFrame) { - globalCtx->unk_10AE3 = cmd->setting - 1; - globalCtx->unk_10AFC = 1.0f; + globalCtx->envCtx.unk_BF = cmd->setting - 1; + globalCtx->envCtx.unk_D8 = 1.0f; } } @@ -432,8 +431,8 @@ void func_80065134(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdDayTim temp1 = (cmd->hour * 60.0f) / 0.021972656f; temp2 = (cmd->minute + 1) / 0.021972656f; - gSaveContext.day_time = temp1 + temp2; - gSaveContext.environment_time = temp1 + temp2; + gSaveContext.dayTime = temp1 + temp2; + gSaveContext.environmentTime = temp1 + temp2; } } @@ -442,19 +441,19 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt Player* player = PLAYER; s32 temp = 0; - if ((gSaveContext.game_mode != 0) && (gSaveContext.game_mode != 3) && (globalCtx->sceneNum != SCENE_SPOT00) && + if ((gSaveContext.gameMode != 0) && (gSaveContext.gameMode != 3) && (globalCtx->sceneNum != SCENE_SPOT00) && (csCtx->frames > 20) && (!~(globalCtx->state.input[0].press.in.button | ~A_BUTTON) || !~(globalCtx->state.input[0].press.in.button | ~B_BUTTON) || !~(globalCtx->state.input[0].press.in.button | ~START_BUTTON)) && - (gSaveContext.file_num != 0xFEDC) && (globalCtx->sceneLoadFlag == 0)) { + (gSaveContext.fileNum != 0xFEDC) && (globalCtx->sceneLoadFlag == 0)) { Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); temp = 1; } if ((csCtx->frames == cmd->startFrame) || (temp != 0) || ((csCtx->frames > 20) && (!~(globalCtx->state.input[0].press.in.button | ~START_BUTTON)) && - (gSaveContext.file_num != 0xFEDC))) { + (gSaveContext.fileNum != 0xFEDC))) { csCtx->state = CS_STATE_UNSKIPPABLE_EXEC; func_800F68BC(0); gSaveContext.unk_1410 = 1; @@ -462,66 +461,66 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt // Translates to: "FUTURE FORK DESIGNATION=No. [%d]" osSyncPrintf("\n分岐先指定！！=[%d]番", cmd->base); - if ((gSaveContext.game_mode != 0) && (csCtx->frames != cmd->startFrame)) { + if ((gSaveContext.gameMode != 0) && (csCtx->frames != cmd->startFrame)) { gSaveContext.unk_13E7 = 1; } - gSaveContext.cutscene_index = 0; + gSaveContext.cutsceneIndex = 0; switch (cmd->base) { case 1: globalCtx->nextEntranceIndex = 0x00A0; - gSaveContext.cutscene_index = 0xFFF1; + gSaveContext.cutsceneIndex = 0xFFF1; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 2: globalCtx->nextEntranceIndex = 0x00A0; - gSaveContext.cutscene_index = 0xFFF0; + gSaveContext.cutsceneIndex = 0xFFF0; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 0xA; + globalCtx->fadeTransition = 10; break; case 3: globalCtx->nextEntranceIndex = 0x0117; - gSaveContext.cutscene_index = 0xFFF1; + gSaveContext.cutsceneIndex = 0xFFF1; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 0xA; + globalCtx->fadeTransition = 10; break; case 4: globalCtx->nextEntranceIndex = 0x013D; - gSaveContext.cutscene_index = 0xFFF0; + gSaveContext.cutsceneIndex = 0xFFF0; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 0xA; + globalCtx->fadeTransition = 10; break; case 5: globalCtx->nextEntranceIndex = 0x00EE; - gSaveContext.cutscene_index = 0xFFF0; + gSaveContext.cutsceneIndex = 0xFFF0; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 0xA; + globalCtx->fadeTransition = 10; break; case 6: globalCtx->nextEntranceIndex = 0x00A0; - gSaveContext.cutscene_index = 0xFFF2; + gSaveContext.cutsceneIndex = 0xFFF2; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 0xA; + globalCtx->fadeTransition = 10; break; case 7: globalCtx->nextEntranceIndex = 0x00EE; - gSaveContext.cutscene_index = 0xFFF2; + gSaveContext.cutsceneIndex = 0xFFF2; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 0xB; + globalCtx->fadeTransition = 11; break; case 8: gSaveContext.fw.set = 0; gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0; - if (!(gSaveContext.event_chk_inf[4] & 0x20)) { - gSaveContext.event_chk_inf[4] |= 0x20; + if (!(gSaveContext.eventChkInf[4] & 0x20)) { + gSaveContext.eventChkInf[4] |= 0x20; globalCtx->nextEntranceIndex = 0x00A0; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF3; - globalCtx->fadeOutTransition = 0xB; + gSaveContext.cutsceneIndex = 0xFFF3; + globalCtx->fadeTransition = 11; } else { - if (gSaveContext.scene_setup_index < 4) { + if (gSaveContext.sceneSetupIndex < 4) { if (LINK_IS_CHILD) { globalCtx->linkAgeOnLoad = 0; } else { @@ -530,358 +529,358 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt } globalCtx->nextEntranceIndex = 0x02CA; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; - gSaveContext.transition_type = 3; + globalCtx->fadeTransition = 3; + gSaveContext.nextTransition = 3; } break; case 9: globalCtx->nextEntranceIndex = 0x0117; - gSaveContext.cutscene_index = 0xFFF0; + gSaveContext.cutsceneIndex = 0xFFF0; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 0xc; + globalCtx->fadeTransition = 12; break; case 10: globalCtx->nextEntranceIndex = 0x00BB; - gSaveContext.cutscene_index = 0xFFF0; + gSaveContext.cutsceneIndex = 0xFFF0; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 11: globalCtx->nextEntranceIndex = 0x00EE; - gSaveContext.cutscene_index = 0xFFF3; + gSaveContext.cutsceneIndex = 0xFFF3; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; + globalCtx->fadeTransition = 3; break; case 12: globalCtx->nextEntranceIndex = 0x047A; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 13: globalCtx->nextEntranceIndex = 0x010E; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; - gSaveContext.transition_type = 2; + globalCtx->fadeTransition = 2; + gSaveContext.nextTransition = 2; break; case 14: globalCtx->nextEntranceIndex = 0x0457; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 15: globalCtx->nextEntranceIndex = 0x0053; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF4; - globalCtx->fadeOutTransition = 3; + gSaveContext.cutsceneIndex = 0xFFF4; + globalCtx->fadeTransition = 3; break; case 16: globalCtx->nextEntranceIndex = 0x0053; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF5; - globalCtx->fadeOutTransition = 3; + gSaveContext.cutsceneIndex = 0xFFF5; + globalCtx->fadeTransition = 3; break; case 17: globalCtx->nextEntranceIndex = 0x0053; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF6; - globalCtx->fadeOutTransition = 3; + gSaveContext.cutsceneIndex = 0xFFF6; + globalCtx->fadeTransition = 3; break; case 18: - gSaveContext.event_chk_inf[4] |= 0x8000; + gSaveContext.eventChkInf[4] |= 0x8000; globalCtx->nextEntranceIndex = 0x0324; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; - gSaveContext.transition_type = 2; + globalCtx->fadeTransition = 2; + gSaveContext.nextTransition = 2; break; case 19: globalCtx->nextEntranceIndex = 0x013D; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 4; - gSaveContext.cutscene_index = 0x8000; + globalCtx->fadeTransition = 4; + gSaveContext.cutsceneIndex = 0x8000; break; case 21: globalCtx->nextEntranceIndex = 0x0102; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF0; - globalCtx->fadeOutTransition = 3; + gSaveContext.cutsceneIndex = 0xFFF0; + globalCtx->fadeTransition = 3; break; case 22: Item_Give(globalCtx, ITEM_SONG_REQUIEM); globalCtx->nextEntranceIndex = 0x0123; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF0; - globalCtx->fadeOutTransition = 3; + gSaveContext.cutsceneIndex = 0xFFF0; + globalCtx->fadeTransition = 3; break; case 23: globalCtx->nextEntranceIndex = 0x00A0; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF8; - globalCtx->fadeOutTransition = 3; + gSaveContext.cutsceneIndex = 0xFFF8; + globalCtx->fadeTransition = 3; break; case 24: globalCtx->nextEntranceIndex = 0x0028; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 25: globalCtx->linkAgeOnLoad = 0; globalCtx->nextEntranceIndex = 0x006B; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF0; - globalCtx->fadeOutTransition = 3; + gSaveContext.cutsceneIndex = 0xFFF0; + globalCtx->fadeTransition = 3; break; case 26: globalCtx->nextEntranceIndex = 0x0053; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF4; - globalCtx->fadeOutTransition = 3; + gSaveContext.cutsceneIndex = 0xFFF4; + globalCtx->fadeTransition = 3; break; case 27: globalCtx->nextEntranceIndex = 0x0053; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF5; - globalCtx->fadeOutTransition = 3; + gSaveContext.cutsceneIndex = 0xFFF5; + globalCtx->fadeTransition = 3; break; case 28: globalCtx->nextEntranceIndex = 0x0053; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF6; - globalCtx->fadeOutTransition = 3; + gSaveContext.cutsceneIndex = 0xFFF6; + globalCtx->fadeTransition = 3; break; case 29: globalCtx->nextEntranceIndex = 0x006B; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.chamber_cutscene_num = 0; - globalCtx->fadeOutTransition = 3; + gSaveContext.chamberCutsceneNum = 0; + globalCtx->fadeTransition = 3; break; case 30: globalCtx->nextEntranceIndex = 0x006B; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; + globalCtx->fadeTransition = 3; Item_Give(globalCtx, ITEM_MEDALLION_FIRE); - gSaveContext.chamber_cutscene_num = 1; + gSaveContext.chamberCutsceneNum = 1; break; case 31: globalCtx->nextEntranceIndex = 0x006B; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; - gSaveContext.chamber_cutscene_num = 2; + globalCtx->fadeTransition = 3; + gSaveContext.chamberCutsceneNum = 2; break; case 32: globalCtx->linkAgeOnLoad = 1; globalCtx->nextEntranceIndex = 0x00CD; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF2; - globalCtx->fadeOutTransition = 0xb; + gSaveContext.cutsceneIndex = 0xFFF2; + globalCtx->fadeTransition = 11; break; case 33: globalCtx->nextEntranceIndex = 0x00CD; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; + globalCtx->fadeTransition = 3; break; case 34: globalCtx->nextEntranceIndex = 0x00A0; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF3; - globalCtx->fadeOutTransition = 3; + gSaveContext.cutsceneIndex = 0xFFF3; + globalCtx->fadeTransition = 3; break; case 35: globalCtx->nextEntranceIndex = 0x00CD; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF0; - globalCtx->fadeOutTransition = 4; + gSaveContext.cutsceneIndex = 0xFFF0; + globalCtx->fadeTransition = 4; break; case 38: globalCtx->nextEntranceIndex = 0x00A0; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF4; - globalCtx->fadeOutTransition = 4; + gSaveContext.cutsceneIndex = 0xFFF4; + globalCtx->fadeTransition = 4; break; case 39: globalCtx->nextEntranceIndex = 0x0053; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF9; - globalCtx->fadeOutTransition = 4; + gSaveContext.cutsceneIndex = 0xFFF9; + globalCtx->fadeTransition = 4; break; case 40: globalCtx->linkAgeOnLoad = 0; globalCtx->nextEntranceIndex = 0x0053; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFFA; - globalCtx->fadeOutTransition = 4; + gSaveContext.cutsceneIndex = 0xFFFA; + globalCtx->fadeTransition = 4; break; case 41: globalCtx->nextEntranceIndex = 0x04E6; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 42: globalCtx->nextEntranceIndex = 0x00DB; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF2; - globalCtx->fadeOutTransition = 4; + gSaveContext.cutsceneIndex = 0xFFF2; + globalCtx->fadeTransition = 4; break; case 43: globalCtx->nextEntranceIndex = 0x0503; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 4; + globalCtx->fadeTransition = 4; break; case 44: globalCtx->nextEntranceIndex = 0x0320; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 0x11; + globalCtx->fadeTransition = 17; break; case 46: - gSaveContext.event_chk_inf[4] |= 0x8000; + gSaveContext.eventChkInf[4] |= 0x8000; globalCtx->nextEntranceIndex = 0x0324; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 4; + globalCtx->fadeTransition = 4; break; case 47: Item_Give(globalCtx, ITEM_SONG_NOCTURNE); - gSaveContext.event_chk_inf[5] |= 0x10; + gSaveContext.eventChkInf[5] |= 0x10; globalCtx->nextEntranceIndex = 0x00DB; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF1; - globalCtx->fadeOutTransition = 4; + gSaveContext.cutsceneIndex = 0xFFF1; + globalCtx->fadeTransition = 4; break; case 48: globalCtx->nextEntranceIndex = 0x01ED; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 0xF; - gSaveContext.transition_type = 0xF; + globalCtx->fadeTransition = 15; + gSaveContext.nextTransition = 15; break; case 49: globalCtx->nextEntranceIndex = 0x058C; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 4; + globalCtx->fadeTransition = 4; break; case 50: globalCtx->nextEntranceIndex = 0x0513; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 0x11; + globalCtx->fadeTransition = 17; break; case 51: globalCtx->nextEntranceIndex = 0x00CD; - gSaveContext.cutscene_index = 0xFFF8; + gSaveContext.cutsceneIndex = 0xFFF8; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 0x29; + globalCtx->fadeTransition = 41; break; case 52: globalCtx->nextEntranceIndex = 0x0053; - gSaveContext.cutscene_index = 0xFFF7; + gSaveContext.cutsceneIndex = 0xFFF7; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 0xb; + globalCtx->fadeTransition = 11; break; case 53: globalCtx->nextEntranceIndex = 0x050F; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; + globalCtx->fadeTransition = 3; break; case 54: - gSaveContext.game_mode = 3; + gSaveContext.gameMode = 3; func_800F7260(0x6F); globalCtx->linkAgeOnLoad = 1; globalCtx->nextEntranceIndex = 0x0117; - gSaveContext.cutscene_index = 0xFFF2; + gSaveContext.cutsceneIndex = 0xFFF2; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 55: globalCtx->nextEntranceIndex = 0x0129; - gSaveContext.cutscene_index = 0xFFF1; + gSaveContext.cutsceneIndex = 0xFFF1; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 56: globalCtx->nextEntranceIndex = 0x00DB; - gSaveContext.cutscene_index = 0xFFF4; + gSaveContext.cutsceneIndex = 0xFFF4; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 57: globalCtx->nextEntranceIndex = 0x013D; - gSaveContext.cutscene_index = 0xFFF3; + gSaveContext.cutsceneIndex = 0xFFF3; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 58: globalCtx->nextEntranceIndex = 0x014D; - gSaveContext.cutscene_index = 0xFFF1; + gSaveContext.cutsceneIndex = 0xFFF1; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 59: globalCtx->nextEntranceIndex = 0x0102; - gSaveContext.cutscene_index = 0xFFF1; + gSaveContext.cutsceneIndex = 0xFFF1; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 60: globalCtx->nextEntranceIndex = 0x010E; - gSaveContext.cutscene_index = 0xFFF2; + gSaveContext.cutsceneIndex = 0xFFF2; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 61: globalCtx->nextEntranceIndex = 0x0108; - gSaveContext.cutscene_index = 0xFFF0; + gSaveContext.cutsceneIndex = 0xFFF0; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 62: globalCtx->linkAgeOnLoad = 0; globalCtx->nextEntranceIndex = 0x00EE; - gSaveContext.cutscene_index = 0xFFF6; + gSaveContext.cutsceneIndex = 0xFFF6; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 63: globalCtx->nextEntranceIndex = 0x00EE; - gSaveContext.cutscene_index = 0xFFF7; + gSaveContext.cutsceneIndex = 0xFFF7; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 64: globalCtx->nextEntranceIndex = 0x00CD; - gSaveContext.cutscene_index = 0xFFF5; + gSaveContext.cutsceneIndex = 0xFFF5; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 65: globalCtx->linkAgeOnLoad = 1; globalCtx->nextEntranceIndex = 0x0157; - gSaveContext.cutscene_index = 0xFFF2; + gSaveContext.cutsceneIndex = 0xFFF2; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 66: globalCtx->nextEntranceIndex = 0x0554; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 67: globalCtx->nextEntranceIndex = 0x027E; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 68: globalCtx->nextEntranceIndex = 0x00A0; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF5; - globalCtx->fadeOutTransition = 2; + gSaveContext.cutsceneIndex = 0xFFF5; + globalCtx->fadeTransition = 2; break; case 69: globalCtx->nextEntranceIndex = 0x05E8; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 70: globalCtx->nextEntranceIndex = 0x013D; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF4; - globalCtx->fadeOutTransition = 2; - gSaveContext.transition_type = 2; + gSaveContext.cutsceneIndex = 0xFFF4; + globalCtx->fadeTransition = 2; + gSaveContext.nextTransition = 2; break; case 71: gSaveContext.equips.equipment |= 0x0100; @@ -891,56 +890,56 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt globalCtx->linkAgeOnLoad = 1; globalCtx->nextEntranceIndex = 0x0053; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF1; - globalCtx->fadeOutTransition = 2; + gSaveContext.cutsceneIndex = 0xFFF1; + globalCtx->fadeTransition = 2; break; case 72: globalCtx->nextEntranceIndex = 0x0400; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF0; - globalCtx->fadeOutTransition = 2; - gSaveContext.transition_type = 2; + gSaveContext.cutsceneIndex = 0xFFF0; + globalCtx->fadeTransition = 2; + gSaveContext.nextTransition = 2; break; case 73: globalCtx->linkAgeOnLoad = 1; globalCtx->nextEntranceIndex = 0x0157; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF2; - globalCtx->fadeOutTransition = 2; + gSaveContext.cutsceneIndex = 0xFFF2; + globalCtx->fadeTransition = 2; break; case 74: globalCtx->nextEntranceIndex = 0x0157; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF3; - globalCtx->fadeOutTransition = 3; - gSaveContext.transition_type = 3; + gSaveContext.cutsceneIndex = 0xFFF3; + globalCtx->fadeTransition = 3; + gSaveContext.nextTransition = 3; break; case 75: globalCtx->linkAgeOnLoad = 1; globalCtx->nextEntranceIndex = 0x0157; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF4; - globalCtx->fadeOutTransition = 2; + gSaveContext.cutsceneIndex = 0xFFF4; + globalCtx->fadeTransition = 2; break; case 76: globalCtx->linkAgeOnLoad = 0; globalCtx->nextEntranceIndex = 0x0157; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF5; - globalCtx->fadeOutTransition = 2; + gSaveContext.cutsceneIndex = 0xFFF5; + globalCtx->fadeTransition = 2; break; case 77: globalCtx->linkAgeOnLoad = 1; globalCtx->nextEntranceIndex = 0x0157; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF6; - globalCtx->fadeOutTransition = 2; + gSaveContext.cutsceneIndex = 0xFFF6; + globalCtx->fadeTransition = 2; break; case 78: globalCtx->nextEntranceIndex = 0x0157; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF7; - globalCtx->fadeOutTransition = 2; + gSaveContext.cutsceneIndex = 0xFFF7; + globalCtx->fadeTransition = 2; break; case 79: case 80: @@ -959,124 +958,124 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt case 93: globalCtx->nextEntranceIndex = 0x0157; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 94: globalCtx->nextEntranceIndex = 0x02AE; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; + globalCtx->fadeTransition = 3; break; case 95: - if ((gSaveContext.event_chk_inf[4] & 0x100) && (gSaveContext.event_chk_inf[4] & 0x200) && - (gSaveContext.event_chk_inf[4] & 0x400)) { + if ((gSaveContext.eventChkInf[4] & 0x100) && (gSaveContext.eventChkInf[4] & 0x200) && + (gSaveContext.eventChkInf[4] & 0x400)) { globalCtx->nextEntranceIndex = 0x0053; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF3; - globalCtx->fadeOutTransition = 2; + gSaveContext.cutsceneIndex = 0xFFF3; + globalCtx->fadeTransition = 2; } else { - switch (gSaveContext.scene_setup_index) { + switch (gSaveContext.sceneSetupIndex) { case 8: globalCtx->nextEntranceIndex = 0x00FC; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 9: globalCtx->nextEntranceIndex = 0x0147; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 10: globalCtx->nextEntranceIndex = 0x0102; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF0; - globalCtx->fadeOutTransition = 3; + gSaveContext.cutsceneIndex = 0xFFF0; + globalCtx->fadeTransition = 3; break; } } break; case 96: - if (gBitFlags[4] & gSaveContext.quest_items) { + if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) { globalCtx->nextEntranceIndex = 0x006B; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF1; - globalCtx->fadeOutTransition = 5; + gSaveContext.cutsceneIndex = 0xFFF1; + globalCtx->fadeTransition = 5; } else { - gSaveContext.event_chk_inf[12] |= 0x100; + gSaveContext.eventChkInf[12] |= 0x100; globalCtx->nextEntranceIndex = 0x0610; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; - gSaveContext.transition_type = 3; + globalCtx->fadeTransition = 3; + gSaveContext.nextTransition = 3; } break; case 97: - if (gBitFlags[3] & gSaveContext.quest_items) { + if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT)) { globalCtx->nextEntranceIndex = 0x006B; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF1; - globalCtx->fadeOutTransition = 5; + gSaveContext.cutsceneIndex = 0xFFF1; + globalCtx->fadeTransition = 5; } else { globalCtx->nextEntranceIndex = 0x0580; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; - gSaveContext.transition_type = 3; + globalCtx->fadeTransition = 3; + gSaveContext.nextTransition = 3; } break; case 98: globalCtx->nextEntranceIndex = 0x0564; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; - gSaveContext.transition_type = 3; + globalCtx->fadeTransition = 3; + gSaveContext.nextTransition = 3; break; case 99: globalCtx->nextEntranceIndex = 0x0608; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; - gSaveContext.transition_type = 2; + globalCtx->fadeTransition = 2; + gSaveContext.nextTransition = 2; break; case 100: globalCtx->nextEntranceIndex = 0x00EE; - gSaveContext.cutscene_index = 0xFFF8; + gSaveContext.cutsceneIndex = 0xFFF8; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; - gSaveContext.transition_type = 3; + globalCtx->fadeTransition = 3; + gSaveContext.nextTransition = 3; break; case 101: globalCtx->nextEntranceIndex = 0x01F5; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 0xF; + globalCtx->fadeTransition = 15; break; case 102: globalCtx->nextEntranceIndex = 0x0590; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 103: globalCtx->nextEntranceIndex = 0x00CD; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF3; - globalCtx->fadeOutTransition = 2; + gSaveContext.cutsceneIndex = 0xFFF3; + globalCtx->fadeTransition = 2; break; case 104: switch (sTitleCsState) { case 0: globalCtx->nextEntranceIndex = 0x008D; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF2; - globalCtx->fadeOutTransition = 2; + gSaveContext.cutsceneIndex = 0xFFF2; + globalCtx->fadeTransition = 2; sTitleCsState++; break; case 1: globalCtx->nextEntranceIndex = 0x0147; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF1; - globalCtx->fadeOutTransition = 2; + gSaveContext.cutsceneIndex = 0xFFF1; + globalCtx->fadeTransition = 2; sTitleCsState++; break; case 2: globalCtx->nextEntranceIndex = 0x00A0; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF6; - globalCtx->fadeOutTransition = 2; + gSaveContext.cutsceneIndex = 0xFFF6; + globalCtx->fadeTransition = 2; sTitleCsState = 0; break; } @@ -1084,101 +1083,101 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt case 105: globalCtx->nextEntranceIndex = 0x00E4; globalCtx->sceneLoadFlag = 0x14; - gSaveContext.cutscene_index = 0xFFF1; - globalCtx->fadeOutTransition = 2; + gSaveContext.cutsceneIndex = 0xFFF1; + globalCtx->fadeTransition = 2; break; case 106: globalCtx->nextEntranceIndex = 0x0574; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 107: globalCtx->nextEntranceIndex = 0x0538; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 108: globalCtx->nextEntranceIndex = 0x053C; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 109: globalCtx->nextEntranceIndex = 0x0540; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 110: globalCtx->nextEntranceIndex = 0x0544; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 111: globalCtx->nextEntranceIndex = 0x0548; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 112: globalCtx->nextEntranceIndex = 0x054C; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 113: if (Flags_GetEventChkInf(0xBB) && Flags_GetEventChkInf(0xBC) && Flags_GetEventChkInf(0xBD) && Flags_GetEventChkInf(0xBE) && Flags_GetEventChkInf(0xBF) && Flags_GetEventChkInf(0xAD)) { globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&D_0201DA50); globalCtx->csCtx.frames = 0; - gSaveContext.cutscene_trigger = 1; - gSaveContext.cutscene_index = 0xFFFF; + gSaveContext.cutsceneTrigger = 1; + gSaveContext.cutsceneIndex = 0xFFFF; csCtx->state = CS_STATE_UNSKIPPABLE_INIT; } else { - gSaveContext.cutscene_index = 0xFFFF; + gSaveContext.cutsceneIndex = 0xFFFF; csCtx->state = CS_STATE_UNSKIPPABLE_INIT; } break; case 114: globalCtx->nextEntranceIndex = 0x0185; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; + globalCtx->fadeTransition = 2; break; case 115: globalCtx->nextEntranceIndex = 0x0594; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 2; - gSaveContext.transition_type = 2; + globalCtx->fadeTransition = 2; + gSaveContext.nextTransition = 2; break; case 116: - if (gSaveContext.event_chk_inf[12] & 0x100) { + if (gSaveContext.eventChkInf[12] & 0x100) { globalCtx->nextEntranceIndex = 0x0580; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; + globalCtx->fadeTransition = 3; } else { globalCtx->nextEntranceIndex = 0x0610; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; + globalCtx->fadeTransition = 3; } - gSaveContext.transition_type = 3; + gSaveContext.nextTransition = 3; break; case 117: - gSaveContext.game_mode = 3; + gSaveContext.gameMode = 3; func_800F7260(0x6F); globalCtx->linkAgeOnLoad = 0; globalCtx->nextEntranceIndex = 0x00CD; - gSaveContext.cutscene_index = 0xFFF7; + gSaveContext.cutsceneIndex = 0xFFF7; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; + globalCtx->fadeTransition = 3; break; case 118: - gSaveContext.respawn[RESPAWN_MODE_DOWN].entrance_index = 0x0517; - func_800C0B60(globalCtx); - gSaveContext.respawn_flag = -2; - gSaveContext.transition_type = 2; + gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex = 0x0517; + Gameplay_TriggerVoidOut(globalCtx); + gSaveContext.respawnFlag = -2; + gSaveContext.nextTransition = 2; break; case 119: - gSaveContext.day_time = 0x8000; - gSaveContext.environment_time = 0x8000; + gSaveContext.dayTime = 0x8000; + gSaveContext.environmentTime = 0x8000; globalCtx->nextEntranceIndex = 0x05F0; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; + globalCtx->fadeTransition = 3; break; } } @@ -1189,63 +1188,63 @@ void Cutscene_Command_TransitionFX(GlobalContext* globalCtx, CutsceneContext* cs f32 temp; if ((csCtx->frames >= cmd->startFrame) && (csCtx->frames <= cmd->endFrame)) { - globalCtx->unk_10B05 = 1; + globalCtx->envCtx.unk_E1 = 1; temp = func_8006F93C(cmd->endFrame, cmd->startFrame, csCtx->frames); switch (cmd->base) { case 1: case 5: - globalCtx->unk_10B06[0] = 0xA0; - globalCtx->unk_10B06[1] = 0xA0; - globalCtx->unk_10B06[2] = 0xA0; + globalCtx->envCtx.unk_E2[0] = 0xA0; + globalCtx->envCtx.unk_E2[1] = 0xA0; + globalCtx->envCtx.unk_E2[2] = 0xA0; if (cmd->base == 1) { - globalCtx->unk_10B06[3] = 255.0f * temp; - if ((temp == 0.0f) && (gSaveContext.entrance_index == 0x006B)) { + globalCtx->envCtx.unk_E2[3] = 255.0f * temp; + if ((temp == 0.0f) && (gSaveContext.entranceIndex == 0x006B)) { Audio_PlaySoundGeneral(NA_SE_SY_WHITE_OUT_S, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } else if ((temp == 0.0f) && - ((gSaveContext.entrance_index == 0x0053) || (gSaveContext.entrance_index == 0x0138) || - (gSaveContext.entrance_index == 0x0371))) { + ((gSaveContext.entranceIndex == 0x0053) || (gSaveContext.entranceIndex == 0x0138) || + (gSaveContext.entranceIndex == 0x0371))) { Audio_PlaySoundGeneral(NA_SE_EV_WHITE_OUT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } else if ((temp == 0.0f) && (globalCtx->sceneNum == SCENE_GANONTIKA)) { func_800788CC(NA_SE_EV_WHITE_OUT); } } else { - globalCtx->unk_10B06[3] = (1.0f - temp) * 255.0f; + globalCtx->envCtx.unk_E2[3] = (1.0f - temp) * 255.0f; } break; case 2: case 6: - globalCtx->unk_10B06[0] = 0; - globalCtx->unk_10B06[1] = 0; - globalCtx->unk_10B06[2] = 0xFF; + globalCtx->envCtx.unk_E2[0] = 0; + globalCtx->envCtx.unk_E2[1] = 0; + globalCtx->envCtx.unk_E2[2] = 0xFF; if (cmd->base == 2) { - globalCtx->unk_10B06[3] = 255.0f * temp; + globalCtx->envCtx.unk_E2[3] = 255.0f * temp; } else { - globalCtx->unk_10B06[3] = (1.0f - temp) * 255.0f; + globalCtx->envCtx.unk_E2[3] = (1.0f - temp) * 255.0f; } break; case 3: case 7: - globalCtx->unk_10B06[0] = 0xFF; - globalCtx->unk_10B06[1] = 0; - globalCtx->unk_10B06[2] = 0; + globalCtx->envCtx.unk_E2[0] = 0xFF; + globalCtx->envCtx.unk_E2[1] = 0; + globalCtx->envCtx.unk_E2[2] = 0; if (cmd->base == 3) { - globalCtx->unk_10B06[3] = (1.0f - temp) * 255.0f; + globalCtx->envCtx.unk_E2[3] = (1.0f - temp) * 255.0f; } else { - globalCtx->unk_10B06[3] = 255.0f * temp; + globalCtx->envCtx.unk_E2[3] = 255.0f * temp; } break; case 4: case 8: - globalCtx->unk_10B06[0] = 0; - globalCtx->unk_10B06[1] = 0xFF; - globalCtx->unk_10B06[2] = 0; + globalCtx->envCtx.unk_E2[0] = 0; + globalCtx->envCtx.unk_E2[1] = 0xFF; + globalCtx->envCtx.unk_E2[2] = 0; if (cmd->base == 4) { - globalCtx->unk_10B06[3] = (1.0f - temp) * 255.0f; + globalCtx->envCtx.unk_E2[3] = (1.0f - temp) * 255.0f; } else { - globalCtx->unk_10B06[3] = 255.0f * temp; + globalCtx->envCtx.unk_E2[3] = 255.0f * temp; } break; case 9: @@ -1253,23 +1252,23 @@ void Cutscene_Command_TransitionFX(GlobalContext* globalCtx, CutsceneContext* cs break; case 10: case 11: - globalCtx->unk_10B06[0] = 0; - globalCtx->unk_10B06[1] = 0; - globalCtx->unk_10B06[2] = 0; + globalCtx->envCtx.unk_E2[0] = 0; + globalCtx->envCtx.unk_E2[1] = 0; + globalCtx->envCtx.unk_E2[2] = 0; if (cmd->base == 10) { - globalCtx->unk_10B06[3] = (1.0f - temp) * 255.0f; + globalCtx->envCtx.unk_E2[3] = (1.0f - temp) * 255.0f; } else { - globalCtx->unk_10B06[3] = 255.0f * temp; + globalCtx->envCtx.unk_E2[3] = 255.0f * temp; } break; case 12: gSaveContext.unk_1410 = 255.0f - (155.0f * temp); break; case 13: - globalCtx->unk_10B06[0] = 0; - globalCtx->unk_10B06[1] = 0; - globalCtx->unk_10B06[2] = 0; - globalCtx->unk_10B06[3] = 255.0f - ((1.0f - temp) * 155.0f); + globalCtx->envCtx.unk_E2[0] = 0; + globalCtx->envCtx.unk_E2[1] = 0; + globalCtx->envCtx.unk_E2[2] = 0; + globalCtx->envCtx.unk_E2[3] = 255.0f - ((1.0f - temp) * 155.0f); break; } } @@ -1291,11 +1290,11 @@ s32 Cutscene_Command_CameraPositions(GlobalContext* globalCtx, CutsceneContext* if (csCtx->unk_1A != 0) { csCtx->unk_18 = cmdBase->startFrame; if (D_8015FCC8 != 0) { - func_800C0874(globalCtx, csCtx->unk_16, 0x25); - func_800C0314(globalCtx, D_8015FCC6, 1); - func_800C0314(globalCtx, csCtx->unk_16, 7); - func_8005AC60(func_800C04A4(globalCtx, csCtx->unk_16)); - func_8005AC6C(func_800C04A4(globalCtx, csCtx->unk_16), csCtx->cameraFocus, csCtx->cameraPosition, + func_800C0874(globalCtx, csCtx->unk_14, 0x25); + Gameplay_ChangeCameraStatus(globalCtx, D_8015FCC6, 1); + Gameplay_ChangeCameraStatus(globalCtx, csCtx->unk_14, 7); + func_8005AC60(Gameplay_GetCamera(globalCtx, csCtx->unk_14)); + func_8005AC6C(Gameplay_GetCamera(globalCtx, csCtx->unk_14), csCtx->cameraFocus, csCtx->cameraPosition, PLAYER, relativeToLink); } } @@ -1328,11 +1327,11 @@ s32 Cutscene_Command_CameraFocus(GlobalContext* globalCtx, CutsceneContext* csCt if (csCtx->unk_1B != 0) { D_8015FCC0 = cmdBase->startFrame; if (D_8015FCC8 != 0) { - func_800C0874(globalCtx, csCtx->unk_16, 0x25); - func_800C0314(globalCtx, D_8015FCC6, 1); - func_800C0314(globalCtx, csCtx->unk_16, 7); - func_8005AC60(func_800C04A4(globalCtx, csCtx->unk_16)); - func_8005AC6C(func_800C04A4(globalCtx, csCtx->unk_16), csCtx->cameraFocus, csCtx->cameraPosition, + func_800C0874(globalCtx, csCtx->unk_14, 0x25); + Gameplay_ChangeCameraStatus(globalCtx, D_8015FCC6, 1); + Gameplay_ChangeCameraStatus(globalCtx, csCtx->unk_14, 7); + func_8005AC60(Gameplay_GetCamera(globalCtx, csCtx->unk_14)); + func_8005AC6C(Gameplay_GetCamera(globalCtx, csCtx->unk_14), csCtx->cameraFocus, csCtx->cameraPosition, PLAYER, relativeToLink); } } @@ -1368,11 +1367,11 @@ s32 Cutscene_Command_07(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cm if (csCtx->unk_1A != 0) { D_8015FCC2 = cmdBase->startFrame; if (D_8015FCC8 != 0) { - sp2C = func_800C04A4(globalCtx, csCtx->unk_16); + sp2C = Gameplay_GetCamera(globalCtx, csCtx->unk_14); sp2C->player = NULL; - func_800C0314(globalCtx, 0, 1); - func_800C0314(globalCtx, csCtx->unk_16, 7); - func_800C0874(globalCtx, csCtx->unk_16, 0x21); + Gameplay_ChangeCameraStatus(globalCtx, 0, 1); + Gameplay_ChangeCameraStatus(globalCtx, csCtx->unk_14, 7); + func_800C0874(globalCtx, csCtx->unk_14, 0x21); sp28 = csCtx->cameraFocus->cameraRoll * 1.40625f; func_8005AA90(sp2C, 64, &sp28); sp3C.x = csCtx->cameraFocus->pos.x; @@ -1381,8 +1380,8 @@ s32 Cutscene_Command_07(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cm sp30.x = csCtx->cameraPosition->pos.x; sp30.y = csCtx->cameraPosition->pos.y; sp30.z = csCtx->cameraPosition->pos.z; - func_800C04D8(globalCtx, csCtx->unk_16, &sp3C, &sp30); - func_800C0704(globalCtx, csCtx->unk_16, csCtx->cameraPosition->viewAngle); + func_800C04D8(globalCtx, csCtx->unk_14, &sp3C, &sp30); + func_800C0704(globalCtx, csCtx->unk_14, csCtx->cameraPosition->viewAngle); } } } @@ -1411,19 +1410,19 @@ s32 Cutscene_Command_08(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cm if (csCtx->unk_1B != 0) { D_8015FCC4 = cmdBase->startFrame; if (D_8015FCC8 != 0) { - sp2C = func_800C04A4(globalCtx, csCtx->unk_16); + sp2C = Gameplay_GetCamera(globalCtx, csCtx->unk_14); sp2C->player = NULL; - func_800C0314(globalCtx, 0, 1); - func_800C0314(globalCtx, csCtx->unk_16, 7); - func_800C0874(globalCtx, csCtx->unk_16, 0x21); + Gameplay_ChangeCameraStatus(globalCtx, 0, 1); + Gameplay_ChangeCameraStatus(globalCtx, csCtx->unk_14, 7); + func_800C0874(globalCtx, csCtx->unk_14, 0x21); sp3C.x = csCtx->cameraFocus->pos.x; sp3C.y = csCtx->cameraFocus->pos.y; sp3C.z = csCtx->cameraFocus->pos.z; sp30.x = csCtx->cameraPosition->pos.x; sp30.y = csCtx->cameraPosition->pos.y; sp30.z = csCtx->cameraPosition->pos.z; - func_800C04D8(globalCtx, csCtx->unk_16, &sp3C, &sp30); - func_800C0704(globalCtx, csCtx->unk_16, csCtx->cameraPosition->viewAngle); + func_800C04D8(globalCtx, csCtx->unk_14, &sp3C, &sp30); + func_800C0704(globalCtx, csCtx->unk_14, csCtx->cameraPosition->viewAngle); } } } @@ -1442,9 +1441,9 @@ void Cutscene_Command_Textbox(GlobalContext* globalCtx, CutsceneContext* csCtx, if (cmd->type != 2) { if (D_8011E1C0 != cmd->base) { D_8011E1C0 = cmd->base; - if ((cmd->type == 3) && (gBitFlags[20] & gSaveContext.quest_items)) { + if ((cmd->type == 3) && CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) { func_8010B680(globalCtx, cmd->textId1, 0); - } else if ((cmd->type == 4) && (gBitFlags[19] & gSaveContext.quest_items)) { + } else if ((cmd->type == 4) && CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { func_8010B680(globalCtx, cmd->textId1, 0); } else { func_8010B680(globalCtx, cmd->base, 0); @@ -1860,7 +1859,7 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) { if (0) {} // Necessary to match - if (gSaveContext.cutscene_index >= 0xFFF0) { + if (gSaveContext.cutsceneIndex >= 0xFFF0) { if (0) {} // Also necessary to match if (BREG(0) != 0) { @@ -1906,21 +1905,21 @@ void func_80068DC0(GlobalContext* globalCtx, CutsceneContext* csCtx) { // Translates to: "RIGHT HERE, HUH" osSyncPrintf("\n\n\n\n\nやっぱりここかいな"); - gSaveContext.cutscene_index = 0; - gSaveContext.game_mode = 0; + gSaveContext.cutsceneIndex = 0; + gSaveContext.gameMode = 0; if (D_8015FCC8 != 0) { - switch (gSaveContext.entrance_index) { + switch (gSaveContext.entranceIndex) { case 0x028A: case 0x028E: case 0x0292: case 0x0476: - func_800C078C(globalCtx, D_8015FCC6, csCtx->unk_16); + func_800C078C(globalCtx, D_8015FCC6, csCtx->unk_14); } - func_800C0314(globalCtx, D_8015FCC6, 7); - func_800C0384(globalCtx, csCtx->unk_16); - func_8005B1A4(globalCtx->cameraCtx.activeCameraPtrs[D_8015FCC6]); + Gameplay_ChangeCameraStatus(globalCtx, D_8015FCC6, 7); + Gameplay_ClearCamera(globalCtx, csCtx->unk_14); + func_8005B1A4(globalCtx->cameraPtrs[D_8015FCC6]); } func_800F68BC(0); @@ -1931,11 +1930,11 @@ void func_80068DC0(GlobalContext* globalCtx, CutsceneContext* csCtx) { void func_80068ECC(GlobalContext* globalCtx, CutsceneContext* csCtx) { u8 i; - if ((gSaveContext.cutscene_trigger != 0) && (csCtx->state == CS_STATE_IDLE) && !func_8008E988(globalCtx)) { - gSaveContext.cutscene_index = 0xFFFD; + if ((gSaveContext.cutsceneTrigger != 0) && (csCtx->state == CS_STATE_IDLE) && !func_8008E988(globalCtx)) { + gSaveContext.cutsceneIndex = 0xFFFD; } - if ((gSaveContext.cutscene_index >= 0xFFF0) && (csCtx->state == CS_STATE_IDLE)) { + if ((gSaveContext.cutsceneIndex >= 0xFFF0) && (csCtx->state == CS_STATE_IDLE)) { func_8006C438(globalCtx, 0); D_8011E1C0 = 0; @@ -1959,13 +1958,13 @@ void func_80068ECC(GlobalContext* globalCtx, CutsceneContext* csCtx) { D_8015FCC4 = 0xFFFF; csCtx->unk_1A = 0; csCtx->unk_1B = 0; - D_8015FCC6 = globalCtx->cameraCtx.unk_5C0; + D_8015FCC6 = globalCtx->activeCamera; if (D_8015FCC8 != 0) { - csCtx->unk_14_all = func_800C0230(globalCtx); + csCtx->unk_14 = Gameplay_CreateSubCamera(globalCtx); } - if (gSaveContext.cutscene_trigger == 0) { + if (gSaveContext.cutsceneTrigger == 0) { Interface_ChangeAlpha(1); func_800B3840(0x20); func_800B38A4(0x20); @@ -1975,7 +1974,7 @@ void func_80068ECC(GlobalContext* globalCtx, CutsceneContext* csCtx) { func_80068C3C(globalCtx, csCtx); } - gSaveContext.cutscene_trigger = 0; + gSaveContext.cutsceneTrigger = 0; } } @@ -2005,16 +2004,16 @@ void Cutscene_HandleEntranceTriggers(GlobalContext* globalCtx) { requiredAge = entranceCutscene->ageRestriction; if (requiredAge == 2) { - requiredAge = gSaveContext.link_age; + requiredAge = gSaveContext.linkAge; } - if ((gSaveContext.entrance_index == entranceCutscene->entrance) && + if ((gSaveContext.entranceIndex == entranceCutscene->entrance) && (!Flags_GetEventChkInf(entranceCutscene->flag) || (entranceCutscene->flag == 0x18)) && - (gSaveContext.cutscene_index < 0xFFF0) && ((u8)gSaveContext.link_age == requiredAge) && - (gSaveContext.respawn_flag <= 0)) { + (gSaveContext.cutsceneIndex < 0xFFF0) && ((u8)gSaveContext.linkAge == requiredAge) && + (gSaveContext.respawnFlag <= 0)) { Flags_SetEventChkInf(entranceCutscene->flag); Cutscene_SetSegment(globalCtx, entranceCutscene->segAddr); - gSaveContext.cutscene_trigger = 2; + gSaveContext.cutsceneTrigger = 2; gSaveContext.unk_13C7 = 0; break; } @@ -2024,33 +2023,34 @@ void Cutscene_HandleEntranceTriggers(GlobalContext* globalCtx) { #ifdef NON_MATCHING // regalloc differences void Cutscene_HandleConditionalTriggers(GlobalContext* globalCtx) { - osSyncPrintf("\ngame_info.mode=[%d] restart_flag", gSaveContext.respawn_flag); + osSyncPrintf("\ngame_info.mode=[%d] restart_flag", gSaveContext.respawnFlag); - if ((gSaveContext.game_mode == 0) && (gSaveContext.respawn_flag <= 0) && (gSaveContext.cutscene_index < 0xFFF0)) { - if ((gSaveContext.entrance_index == 0x01E1) && !Flags_GetEventChkInf(0xAC)) { + if ((gSaveContext.gameMode == 0) && (gSaveContext.respawnFlag <= 0) && (gSaveContext.cutsceneIndex < 0xFFF0)) { + if ((gSaveContext.entranceIndex == 0x01E1) && !Flags_GetEventChkInf(0xAC)) { Flags_SetEventChkInf(0xAC); - gSaveContext.entrance_index = 0x0123; - gSaveContext.cutscene_index = 0xFFF0; - } else if ((gSaveContext.entrance_index == 0x00DB) && LINK_IS_ADULT && - (gSaveContext.event_chk_inf[4] & 0x0100) && (gSaveContext.event_chk_inf[4] & 0x0200) && - (gSaveContext.event_chk_inf[4] & 0x0400) && !Flags_GetEventChkInf(0xAA)) { + gSaveContext.entranceIndex = 0x0123; + gSaveContext.cutsceneIndex = 0xFFF0; + } else if ((gSaveContext.entranceIndex == 0x00DB) && LINK_IS_ADULT && (gSaveContext.eventChkInf[4] & 0x0100) && + (gSaveContext.eventChkInf[4] & 0x0200) && (gSaveContext.eventChkInf[4] & 0x0400) && + !Flags_GetEventChkInf(0xAA)) { Flags_SetEventChkInf(0xAA); - gSaveContext.cutscene_index = 0xFFF0; - } else if ((gSaveContext.entrance_index == 0x05E0) && !Flags_GetEventChkInf(0xC1)) { + gSaveContext.cutsceneIndex = 0xFFF0; + } else if ((gSaveContext.entranceIndex == 0x05E0) && !Flags_GetEventChkInf(0xC1)) { Flags_SetEventChkInf(0xC1); Item_Give(globalCtx, ITEM_OCARINA_FAIRY); - gSaveContext.entrance_index = 0x011E; - gSaveContext.cutscene_index = 0xFFF0; - } else if ((gBitFlags[3] & gSaveContext.quest_items) && (gBitFlags[4] & gSaveContext.quest_items) && + gSaveContext.entranceIndex = 0x011E; + gSaveContext.cutsceneIndex = 0xFFF0; + } else if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) && LINK_IS_ADULT && !Flags_GetEventChkInf(0xC4) && - (gEntranceTable[gSaveContext.entrance_index].scene == 67)) { + (gEntranceTable[gSaveContext.entranceIndex].scene == SCENE_TOKINOMA)) { Flags_SetEventChkInf(0xC4); - gSaveContext.entrance_index = 0x0053; - gSaveContext.cutscene_index = 0xFFF8; - } else if (!Flags_GetEventChkInf(0xC7) && (gEntranceTable[gSaveContext.entrance_index].scene == 79)) { + gSaveContext.entranceIndex = 0x0053; + gSaveContext.cutsceneIndex = 0xFFF8; + } else if (!Flags_GetEventChkInf(0xC7) && + (gEntranceTable[gSaveContext.entranceIndex].scene == SCENE_GANON_DEMO)) { Flags_SetEventChkInf(0xC7); - gSaveContext.entrance_index = 0x0517; - gSaveContext.cutscene_index = 0xFFF0; + gSaveContext.entranceIndex = 0x0517; + gSaveContext.cutsceneIndex = 0xFFF0; } } } diff --git a/src/code/z_draw.c b/src/code/z_draw.c index ce07d2b360..fc23c0f919 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -2,32 +2,32 @@ #include // "Get Item" Model Draw Functions -static void func_800694E4(GlobalContext* globalCtx, s16 drawId); -static void func_800695C0(GlobalContext* globalCtx, s16 drawId); -static void func_8006969C(GlobalContext* globalCtx, s16 drawId); -static void func_80069880(GlobalContext* globalCtx, s16 drawId); -static void func_80069AC8(GlobalContext* globalCtx, s16 drawId); -static void func_80069CF0(GlobalContext* globalCtx, s16 drawId); -static void func_80069EB0(GlobalContext* globalCtx, s16 drawId); -static void func_8006A060(GlobalContext* globalCtx, s16 drawId); -static void func_8006A158(GlobalContext* globalCtx, s16 drawId); -static void func_8006A2A0(GlobalContext* globalCtx, s16 drawId); -static void func_8006A4B0(GlobalContext* globalCtx, s16 drawId); -static void func_8006A5F0(GlobalContext* globalCtx, s16 drawId); -static void func_8006A73C(GlobalContext* globalCtx, s16 drawId); -static void func_8006A88C(GlobalContext* globalCtx, s16 drawId); -static void func_8006A9CC(GlobalContext* globalCtx, s16 drawId); -static void func_8006AAA8(GlobalContext* globalCtx, s16 drawId); -static void func_8006ABEC(GlobalContext* globalCtx, s16 drawId); -static void func_8006ACE4(GlobalContext* globalCtx, s16 drawId); -static void func_8006AE40(GlobalContext* globalCtx, s16 drawId); -static void func_8006AF9C(GlobalContext* globalCtx, s16 drawId); -static void func_8006B124(GlobalContext* globalCtx, s16 drawId); -static void func_8006B24C(GlobalContext* globalCtx, s16 drawId); -static void func_8006B3C0(GlobalContext* globalCtx, s16 drawId); -static void func_8006B54C(GlobalContext* globalCtx, s16 drawId); -static void func_8006B6E4(GlobalContext* globalCtx, s16 drawId); -static void func_8006B870(GlobalContext* globalCtx, s16 drawId); +void func_800694E4(GlobalContext* globalCtx, s16 drawId); +void func_800695C0(GlobalContext* globalCtx, s16 drawId); +void func_8006969C(GlobalContext* globalCtx, s16 drawId); +void func_80069880(GlobalContext* globalCtx, s16 drawId); +void func_80069AC8(GlobalContext* globalCtx, s16 drawId); +void func_80069CF0(GlobalContext* globalCtx, s16 drawId); +void func_80069EB0(GlobalContext* globalCtx, s16 drawId); +void func_8006A060(GlobalContext* globalCtx, s16 drawId); +void func_8006A158(GlobalContext* globalCtx, s16 drawId); +void func_8006A2A0(GlobalContext* globalCtx, s16 drawId); +void func_8006A4B0(GlobalContext* globalCtx, s16 drawId); +void func_8006A5F0(GlobalContext* globalCtx, s16 drawId); +void func_8006A73C(GlobalContext* globalCtx, s16 drawId); +void func_8006A88C(GlobalContext* globalCtx, s16 drawId); +void func_8006A9CC(GlobalContext* globalCtx, s16 drawId); +void func_8006AAA8(GlobalContext* globalCtx, s16 drawId); +void func_8006ABEC(GlobalContext* globalCtx, s16 drawId); +void func_8006ACE4(GlobalContext* globalCtx, s16 drawId); +void func_8006AE40(GlobalContext* globalCtx, s16 drawId); +void func_8006AF9C(GlobalContext* globalCtx, s16 drawId); +void func_8006B124(GlobalContext* globalCtx, s16 drawId); +void func_8006B24C(GlobalContext* globalCtx, s16 drawId); +void func_8006B3C0(GlobalContext* globalCtx, s16 drawId); +void func_8006B54C(GlobalContext* globalCtx, s16 drawId); +void func_8006B6E4(GlobalContext* globalCtx, s16 drawId); +void func_8006B870(GlobalContext* globalCtx, s16 drawId); typedef struct { /* 0x00 */ void (*drawFunc)(GlobalContext*, s16); @@ -35,7 +35,7 @@ typedef struct { } DrawItemTableEntry; // size = 0x24 // TODO: use symbols for these dlists once objects are in C -static DrawItemTableEntry sDrawItemTable[] = { +DrawItemTableEntry sDrawItemTable[] = { { func_8006AAA8, { 0x06000670, 0x06000750 } }, { func_8006A9CC, { 0x06000800 } }, { func_8006ABEC, { 0x06000A80, 0x06000AE0 } }, @@ -167,7 +167,7 @@ void func_800694A0(GlobalContext* globalCtx, s16 drawId) { // All remaining functions in this file are draw functions referenced in the table and called by the function above -static void func_800694E4(GlobalContext* globalCtx, s16 drawId) { +void func_800694E4(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -181,7 +181,7 @@ static void func_800694E4(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 565); } -static void func_800695C0(GlobalContext* globalCtx, s16 drawId) { +void func_800695C0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -195,7 +195,7 @@ static void func_800695C0(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 581); } -static void func_8006969C(GlobalContext* globalCtx, s16 drawId) { +void func_8006969C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -222,7 +222,7 @@ static void func_8006969C(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 621); } -static void func_80069880(GlobalContext* globalCtx, s16 drawId) { +void func_80069880(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -252,7 +252,7 @@ static void func_80069880(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 663); } -static void func_80069AC8(GlobalContext* globalCtx, s16 drawId) { +void func_80069AC8(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -281,7 +281,7 @@ static void func_80069AC8(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 704); } -static void func_80069CF0(GlobalContext* globalCtx, s16 drawId) { +void func_80069CF0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -305,7 +305,7 @@ static void func_80069CF0(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 735); } -static void func_80069EB0(GlobalContext* globalCtx, s16 drawId) { +void func_80069EB0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -328,7 +328,7 @@ static void func_80069EB0(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 765); } -static void func_8006A060(GlobalContext* globalCtx, s16 drawId) { +void func_8006A060(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -343,7 +343,7 @@ static void func_8006A060(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 783); } -static void func_8006A158(GlobalContext* globalCtx, s16 drawId) { +void func_8006A158(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -362,7 +362,7 @@ static void func_8006A158(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 827); } -static void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) { +void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -389,7 +389,7 @@ static void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 861); } -static void func_8006A4B0(GlobalContext* globalCtx, s16 drawId) { +void func_8006A4B0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -407,7 +407,7 @@ static void func_8006A4B0(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 883); } -static void func_8006A5F0(GlobalContext* globalCtx, s16 drawId) { +void func_8006A5F0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -425,7 +425,7 @@ static void func_8006A5F0(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 906); } -static void func_8006A73C(GlobalContext* globalCtx, s16 drawId) { +void func_8006A73C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -443,7 +443,7 @@ static void func_8006A73C(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 929); } -static void func_8006A88C(GlobalContext* globalCtx, s16 drawId) { +void func_8006A88C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -461,7 +461,7 @@ static void func_8006A88C(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 952); } -static void func_8006A9CC(GlobalContext* globalCtx, s16 drawId) { +void func_8006A9CC(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -475,7 +475,7 @@ static void func_8006A9CC(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 968); } -static void func_8006AAA8(GlobalContext* globalCtx, s16 drawId) { +void func_8006AAA8(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -494,7 +494,7 @@ static void func_8006AAA8(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 991); } -static void func_8006ABEC(GlobalContext* globalCtx, s16 drawId) { +void func_8006ABEC(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -507,7 +507,7 @@ static void func_8006ABEC(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1008); } -static void func_8006ACE4(GlobalContext* globalCtx, s16 drawId) { +void func_8006ACE4(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -527,7 +527,7 @@ static void func_8006ACE4(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1032); } -static void func_8006AE40(GlobalContext* globalCtx, s16 drawId) { +void func_8006AE40(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -547,7 +547,7 @@ static void func_8006AE40(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1056); } -static void func_8006AF9C(GlobalContext* globalCtx, s16 drawId) { +void func_8006AF9C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -567,7 +567,7 @@ static void func_8006AF9C(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1081); } -static void func_8006B124(GlobalContext* globalCtx, s16 drawId) { +void func_8006B124(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -584,7 +584,7 @@ static void func_8006B124(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1100); } -static void func_8006B24C(GlobalContext* globalCtx, s16 drawId) { +void func_8006B24C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -605,7 +605,7 @@ static void func_8006B24C(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1126); } -static void func_8006B3C0(GlobalContext* globalCtx, s16 drawId) { +void func_8006B3C0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -628,7 +628,7 @@ static void func_8006B3C0(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1154); } -static void func_8006B54C(GlobalContext* globalCtx, s16 drawId) { +void func_8006B54C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -649,7 +649,7 @@ static void func_8006B54C(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1181); } -static void func_8006B6E4(GlobalContext* globalCtx, s16 drawId) { +void func_8006B6E4(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; @@ -671,7 +671,7 @@ static void func_8006B6E4(GlobalContext* globalCtx, s16 drawId) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1207); } -static void func_8006B870(GlobalContext* globalCtx, s16 drawId) { +void func_8006B870(GlobalContext* globalCtx, s16 drawId) { u32 pad; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[4]; diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c index ad7ae66c6b..e37756c6d7 100644 --- a/src/code/z_elf_message.c +++ b/src/code/z_elf_message.c @@ -22,10 +22,10 @@ u32 ElfMessage_CheckCondition(ElfMessage* msg) { switch (msg->byte0 & 0x1E) { case 0: temp = 1 << (msg->byte1 & 0x0F); - return ((msg->byte0 & 1) == 1) == !!(gSaveContext.event_chk_inf[(msg->byte1 & 0xF0) >> 4] & temp); + return ((msg->byte0 & 1) == 1) == !!(gSaveContext.eventChkInf[(msg->byte1 & 0xF0) >> 4] & temp); case 2: return ((msg->byte0 & 1) == 1) == - !!(gBitFlags[msg->byte1 - ITEM_KEY_BOSS] & gSaveContext.dungeon_items[gSaveContext.dungeon_index]); + !!(gBitFlags[msg->byte1 - ITEM_KEY_BOSS] & gSaveContext.dungeonItems[gSaveContext.dungeonIndex]); case 4: return ((msg->byte0 & 1) == 1) == (msg->byte3 == INV_CONTENT(msg->byte1)); case 6: @@ -38,12 +38,12 @@ u32 ElfMessage_CheckCondition(ElfMessage* msg) { gSaveContext.equipment); case 0x20: return ((msg->byte0 & 1) == 1) == - !!(gBitFlags[msg->byte3 - ITEM_SONG_MINUET + 6] & gSaveContext.quest_items); + !!(CHECK_QUEST_ITEM(msg->byte3 - ITEM_SONG_MINUET + QUEST_SONG_MINUET)); case 0x30: return ((msg->byte0 & 1) == 1) == - !!(gBitFlags[msg->byte3 - ITEM_MEDALLION_FOREST] & gSaveContext.quest_items); + !!(CHECK_QUEST_ITEM(msg->byte3 - ITEM_MEDALLION_FOREST + QUEST_MEDALLION_FOREST)); case 0x40: - return ((msg->byte0 & 1) == 1) == !!gSaveContext.magic_acquired; + return ((msg->byte0 & 1) == 1) == !!gSaveContext.magicAcquired; } } diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 7d71802bb7..dde4f6535f 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -886,13 +886,13 @@ s16 func_8001F404(s16 dropId) { // clang-format off if (((dropId == DROP_BOMBS_A || dropId == DROP_BOMBS_SPECIAL || dropId == DROP_BOMBS_B) && INV_CONTENT(ITEM_BOMB) == ITEM_NONE) || ((dropId == DROP_ARROWS_SMALL || dropId == DROP_ARROWS_MEDIUM || dropId == DROP_ARROWS_LARGE) && INV_CONTENT(ITEM_BOW) == ITEM_NONE) || - ((dropId == DROP_MAGIC_LARGE || dropId == DROP_MAGIC_SMALL) && gSaveContext.magic_level == 0) || + ((dropId == DROP_MAGIC_LARGE || dropId == DROP_MAGIC_SMALL) && gSaveContext.magicLevel == 0) || ((dropId == DROP_SEEDS) && INV_CONTENT(ITEM_SLINGSHOT) == ITEM_NONE)) { return -1; } // clang-format on - if (dropId == DROP_HEART && gSaveContext.health_capacity == gSaveContext.health) { + if (dropId == DROP_HEART && gSaveContext.healthCapacity == gSaveContext.health) { return DROP_RUPEE_GREEN; } @@ -1038,12 +1038,12 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 params = 0xA * 0x10; dropTableIndex = 0x0; dropId = DROP_HEART; - } else if ((gSaveContext.magic_level != 0) && (gSaveContext.magic == 0)) { // Empty magic meter + } else if ((gSaveContext.magicLevel != 0) && (gSaveContext.magic == 0)) { // Empty magic meter params = 0xA * 0x10; dropTableIndex = 0x0; dropId = DROP_MAGIC_LARGE; - } else if ((gSaveContext.magic_level != 0) && - (gSaveContext.magic <= (gSaveContext.magic_level >> 1))) { // Half magic or less + } else if ((gSaveContext.magicLevel != 0) && + (gSaveContext.magic <= (gSaveContext.magicLevel >> 1))) { // Half magic or less params = 0xA * 0x10; dropTableIndex = 0x0; dropId = DROP_MAGIC_SMALL; diff --git a/src/code/z_face_reaction.c b/src/code/z_face_reaction.c index 1bfe18b7ca..906835e333 100644 --- a/src/code/z_face_reaction.c +++ b/src/code/z_face_reaction.c @@ -1,7 +1,7 @@ #include #include -u16 sReactionTextIds[60][9] = { +u16 sReactionTextIds[][9] = { { 0x0000, 0x7124, 0x7127, 0x7126, 0x7125, 0x7127, 0x7124, 0x7125, 0x7127 }, { 0x0000, 0x7128, 0x7129, 0x7128, 0x7128, 0x7128, 0x7128, 0x712A, 0x712B }, { 0x0000, 0x7128, 0x712B, 0x7128, 0x7128, 0x7129, 0x7128, 0x712B, 0x7128 }, diff --git a/src/code/z_game_dlftbls.c b/src/code/z_game_dlftbls.c index 025cdda6d1..03241b33f2 100644 --- a/src/code/z_game_dlftbls.c +++ b/src/code/z_game_dlftbls.c @@ -12,7 +12,7 @@ GameStateOverlay gGameStateOverlayTable[] = { GAMESTATE_OVERLAY_INTERNAL(TitleSetup_Init, TitleSetup_Destroy, sizeof(GameState)), GAMESTATE_OVERLAY(select, func_80801E44, func_80801E0C, 0x240), // TODO : sizeof(SelectContext) GAMESTATE_OVERLAY(title, Title_Init, Title_Destroy, sizeof(TitleContext)), - GAMESTATE_OVERLAY_INTERNAL(func_800BCA64, func_800BC8EC, sizeof(GlobalContext)), + GAMESTATE_OVERLAY_INTERNAL(Gameplay_Init, Gameplay_Destroy, sizeof(GlobalContext)), GAMESTATE_OVERLAY(opening, Opening_Init, Opening_Destroy, sizeof(OpeningContext)), GAMESTATE_OVERLAY(file_choose, func_80811A20, func_80811A18, 0x1CAE0), }; diff --git a/src/code/z_horse.c b/src/code/z_horse.c index 44612269b9..4f6b8d5faf 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -16,20 +16,20 @@ s32 func_8006CFC0(s32 scene) { } void func_8006D074(GlobalContext* globalCtx) { - gSaveContext.horse_data.scene = SCENE_SPOT00; - gSaveContext.horse_data.pos.x = -1840; - gSaveContext.horse_data.pos.y = 72; - gSaveContext.horse_data.pos.z = 5497; - gSaveContext.horse_data.angle = -27353; + gSaveContext.horseData.scene = SCENE_SPOT00; + gSaveContext.horseData.pos.x = -1840; + gSaveContext.horseData.pos.y = 72; + gSaveContext.horseData.pos.z = 5497; + gSaveContext.horseData.angle = -27353; } void func_8006D0AC(GlobalContext* globalCtx) { - if (gSaveContext.horse_data.scene == SCENE_SPOT06) { - gSaveContext.horse_data.scene = SCENE_SPOT06; - gSaveContext.horse_data.pos.x = -2065; - gSaveContext.horse_data.pos.y = -863; - gSaveContext.horse_data.pos.z = 1839; - gSaveContext.horse_data.angle = 0; + if (gSaveContext.horseData.scene == SCENE_SPOT06) { + gSaveContext.horseData.scene = SCENE_SPOT06; + gSaveContext.horseData.pos.x = -2065; + gSaveContext.horseData.pos.y = -863; + gSaveContext.horseData.pos.z = 1839; + gSaveContext.horseData.angle = 0; } } @@ -59,35 +59,35 @@ void func_8006D0EC(GlobalContext* globalCtx, Player* player) { func_8002DECC(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); - gSaveContext.horse_data.scene = globalCtx->sceneNum; + gSaveContext.horseData.scene = globalCtx->sceneNum; if (globalCtx->sceneNum == SCENE_SPOT12) { player->rideActor->room = -1; } - } else if ((globalCtx->sceneNum == SCENE_SPOT12) && (gSaveContext.minigame_state == 3)) { + } else if ((globalCtx->sceneNum == SCENE_SPOT12) && (gSaveContext.minigameState == 3)) { Actor* horseActor; - gSaveContext.minigame_state = 0; + gSaveContext.minigameState = 0; horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, 3586.0f, 1413.0f, -402.0f, 0, 0x4000, 0, 1); horseActor->room = -1; - } else if ((gSaveContext.entrance_index == 1230) && (gSaveContext.event_chk_inf[1] & 0x100)) { + } else if ((gSaveContext.entranceIndex == 1230) && (gSaveContext.eventChkInf[1] & 0x100)) { Actor* horseActor; horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, -25.0f, 0.0f, -1600.0f, 0, -0x4000, 0, 1); if (horseActor == NULL) { __assert("horse_actor != NULL", "../z_horse.c", 389); } - } else if ((globalCtx->sceneNum == gSaveContext.horse_data.scene) && + } else if ((globalCtx->sceneNum == gSaveContext.horseData.scene) && (Flags_GetEventChkInf(0x18) != 0 || DREG(1) != 0)) { // Translates to: "SET BY EXISTENCE OF HORSE %d %d %d" - osSyncPrintf("馬存在によるセット %d %d %d\n", gSaveContext.horse_data.scene, Flags_GetEventChkInf(0x18), + osSyncPrintf("馬存在によるセット %d %d %d\n", gSaveContext.horseData.scene, Flags_GetEventChkInf(0x18), DREG(1)); - if (func_8006CFC0(gSaveContext.horse_data.scene)) { + if (func_8006CFC0(gSaveContext.horseData.scene)) { Actor* horseActor; - horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, gSaveContext.horse_data.pos.x, - gSaveContext.horse_data.pos.y, gSaveContext.horse_data.pos.z, 0, - gSaveContext.horse_data.angle, 0, 1); + horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, gSaveContext.horseData.pos.x, + gSaveContext.horseData.pos.y, gSaveContext.horseData.pos.z, 0, + gSaveContext.horseData.angle, 0, 1); if (horseActor == NULL) { __assert("horse_actor != NULL", "../z_horse.c", 414); } @@ -98,7 +98,7 @@ void func_8006D0EC(GlobalContext* globalCtx, Player* player) { } else { osSyncPrintf(VT_COL(RED, WHITE)); // Translates to: "Horse_SetNormal():%d SET SPOT IS NO GOOD." - osSyncPrintf("Horse_SetNormal():%d セットスポットまずいです。\n", gSaveContext.horse_data.scene); + osSyncPrintf("Horse_SetNormal():%d セットスポットまずいです。\n", gSaveContext.horseData.scene); osSyncPrintf(VT_RST); func_8006D074(globalCtx); } @@ -128,7 +128,7 @@ void func_8006D0EC(GlobalContext* globalCtx, Player* player) { } } } else if (!Flags_GetEventChkInf(0x18)) { - if ((DREG(1) == 0) && (globalCtx->sceneNum == SCENE_SOUKO) && (gSaveContext.night_flag != 0)) { + if ((DREG(1) == 0) && (globalCtx->sceneNum == SCENE_SOUKO) && (gSaveContext.nightFlag != 0)) { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, 0.0f, 0.0f, -60.0f, 0, 0x7360, 0, 1); } } @@ -149,9 +149,9 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { s32 i; Vec3s spawnPos; - if ((gSaveContext.entrance_index == 0x028A || gSaveContext.entrance_index == 0x028E || - gSaveContext.entrance_index == 0x0292 || gSaveContext.entrance_index == 0x0476) && - (gSaveContext.respawn_flag == 0)) { + if ((gSaveContext.entranceIndex == 0x028A || gSaveContext.entranceIndex == 0x028E || + gSaveContext.entranceIndex == 0x0292 || gSaveContext.entranceIndex == 0x0476) && + (gSaveContext.respawnFlag == 0)) { Vec3s spawnPositions[] = { { 0xF46F, 0x0139, 0x1E14 }, { 0xF894, 0x0139, 0x1B67 }, @@ -159,11 +159,11 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { { 0xF6F7, 0x0139, 0x1766 }, }; - if (gSaveContext.entrance_index == 0x028A) { + if (gSaveContext.entranceIndex == 0x028A) { spawnPos = spawnPositions[0]; - } else if (gSaveContext.entrance_index == 0x028E) { + } else if (gSaveContext.entranceIndex == 0x028E) { spawnPos = spawnPositions[1]; - } else if (gSaveContext.entrance_index == 0x0292) { + } else if (gSaveContext.entranceIndex == 0x0292) { spawnPos = spawnPositions[2]; } else { spawnPos = spawnPositions[3]; @@ -177,8 +177,8 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { func_8002DECC(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); - gSaveContext.horse_data.scene = globalCtx->sceneNum; - } else if ((globalCtx->sceneNum == SCENE_SPOT20) && ((gSaveContext.event_inf[0] & 0xF) == 6) && + gSaveContext.horseData.scene = globalCtx->sceneNum; + } else if ((globalCtx->sceneNum == SCENE_SPOT20) && ((gSaveContext.eventInf[0] & 0xF) == 6) && (Flags_GetEventChkInf(0x18) == 0) && (DREG(1) == 0)) { player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, 894.0f, 0.0f, -2084.0f, 0, -0x7FFF, 0, 5); @@ -188,7 +188,7 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { func_8002DECC(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); - gSaveContext.horse_data.scene = globalCtx->sceneNum; + gSaveContext.horseData.scene = globalCtx->sceneNum; if (globalCtx->sceneNum == SCENE_SPOT12) { player->rideActor->room = -1; @@ -203,9 +203,9 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { for (i = 0; i < ARRAY_COUNT(D_8011F9B8); i++) { if ((globalCtx->sceneNum == D_8011F9B8[i].scene) && - (gSaveContext.cutscene_index == D_8011F9B8[i].cutsceneIndex)) { + (gSaveContext.cutsceneIndex == D_8011F9B8[i].cutsceneIndex)) { if (D_8011F9B8[i].type == 7) { - if ((globalCtx->sceneNum == 99) && (gSaveContext.cutscene_index == 0xFFF1)) { + if ((globalCtx->sceneNum == 99) && (gSaveContext.cutsceneIndex == 0xFFF1)) { D_8011F9B8[i].pos.x = player->actor.posRot.pos.x; D_8011F9B8[i].pos.y = player->actor.posRot.pos.y; D_8011F9B8[i].pos.z = player->actor.posRot.pos.z; @@ -226,7 +226,7 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { s32 pad2; temp = 0; - if (((gSaveContext.event_inf[0] & 0x10) >> 4) && D_8011F9B8[i].type == 6) { + if (((gSaveContext.eventInf[0] & 0x10) >> 4) && D_8011F9B8[i].type == 6) { temp = 0x8000; } @@ -250,7 +250,7 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { sp54.y = player->actor.posRot.pos.y + 100.0f; sp54.z = player->actor.posRot.pos.z; - func_800C04D8(globalCtx, globalCtx->cameraCtx.unk_5C0, &player->actor.posRot, &sp54); + func_800C04D8(globalCtx, globalCtx->activeCamera, &player->actor.posRot.pos, &sp54); } else { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y, D_8011F9B8[i].pos.z, 0, D_8011F9B8[i].angle, 0, @@ -279,20 +279,20 @@ struct_8011F9B8 D_8011F9B8[] = { void func_8006DC68(GlobalContext* globalCtx, Player* player) { if (LINK_IS_ADULT) { - if (!func_8006CFC0(gSaveContext.horse_data.scene)) { + if (!func_8006CFC0(gSaveContext.horseData.scene)) { osSyncPrintf(VT_COL(RED, WHITE)); // Translates to: "Horse_Set_Check():%d SET SPOT IS NO GOOD." - osSyncPrintf("Horse_Set_Check():%d セットスポットまずいです。\n", gSaveContext.horse_data.scene); + osSyncPrintf("Horse_Set_Check():%d セットスポットまずいです。\n", gSaveContext.horseData.scene); osSyncPrintf(VT_RST); func_8006D074(globalCtx); } if (func_8006CFC0(globalCtx->sceneNum)) { - if ((gSaveContext.scene_setup_index > 3) || - ((gSaveContext.entrance_index == 0x028A || gSaveContext.entrance_index == 0x028E || - gSaveContext.entrance_index == 0x0292 || gSaveContext.entrance_index == 0x0476) && - (gSaveContext.respawn_flag == 0)) || - ((globalCtx->sceneNum == SCENE_SPOT20) && ((gSaveContext.event_inf[0] & 0xF) == 6) && + if ((gSaveContext.sceneSetupIndex > 3) || + ((gSaveContext.entranceIndex == 0x028A || gSaveContext.entranceIndex == 0x028E || + gSaveContext.entranceIndex == 0x0292 || gSaveContext.entranceIndex == 0x0476) && + (gSaveContext.respawnFlag == 0)) || + ((globalCtx->sceneNum == SCENE_SPOT20) && ((gSaveContext.eventInf[0] & 0xF) == 6) && !Flags_GetEventChkInf(0x18) && (DREG(1) == 0))) { func_8006D684(globalCtx, player); } else { diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index cd430e55ae..9cc05db1c7 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -199,13 +199,13 @@ void Interface_DrawHealth(GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Vtx* sp154 = interfaceCtx->vtx_12C; s32 curHeartFraction = gSaveContext.health % 0x10; - s16 totalHeartCount = gSaveContext.health_capacity / 0x10; + s16 totalHeartCount = gSaveContext.healthCapacity / 0x10; s16 fullHeartCount = gSaveContext.health / 0x10; s32 pad2; f32 sp144 = interfaceCtx->unk_22A * 0.1f; s32 curCombineModeSet = 0; u8* curBgImgLoaded = NULL; - s32 ddHeartCountMinusOne = gSaveContext.defense_hearts - 1; + s32 ddHeartCountMinusOne = gSaveContext.defenseHearts - 1; Gfx* dispRefs[5]; Graph_OpenDisps(dispRefs, gfxCtx, "../z_lifemeter.c", 353); @@ -393,7 +393,7 @@ void Health_HandleCriticalAlarm(GlobalContext* globalCtx) { interfaceCtx->unk_22A = 0; interfaceCtx->unk_22C = 0; if (!func_8008E988(globalCtx) && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && - Health_IsCritical() && !func_800BFC84(globalCtx)) { + Health_IsCritical() && !Gameplay_InCsMode(globalCtx)) { func_80078884(NA_SE_SY_HITPOINT_ALARM); } } @@ -409,11 +409,11 @@ void Health_HandleCriticalAlarm(GlobalContext* globalCtx) { u32 Health_IsCritical(void) { s32 var; - if (gSaveContext.health_capacity <= 0x50) { + if (gSaveContext.healthCapacity <= 0x50) { var = 0x10; - } else if (gSaveContext.health_capacity <= 0xA0) { + } else if (gSaveContext.healthCapacity <= 0xA0) { var = 0x18; - } else if (gSaveContext.health_capacity <= 0xF0) { + } else if (gSaveContext.healthCapacity <= 0xF0) { var = 0x20; } else { var = 0x2C; diff --git a/src/code/z_malloc.c b/src/code/z_malloc.c index fd82cca8fa..ce9b1a5996 100644 --- a/src/code/z_malloc.c +++ b/src/code/z_malloc.c @@ -10,13 +10,13 @@ Arena sZeldaArena; void ZeldaArena_CheckPointer(void* ptr, u32 size, const char* name, const char* action) { if (!ptr) { if (gZeldaArenaLogSeverity >= LOG_SEVERITY_ERROR) { - //"%s: %u bytes %s failed\n" + // "%s: %u bytes %s failed\n" osSyncPrintf("%s: %u バイトの%sに失敗しました\n", name, size, action); __osDisplayArena(&sZeldaArena); return; } } else if (gZeldaArenaLogSeverity >= LOG_SEVERITY_VERBOSE) { - //"%s: %u bytes %s succeeded\n" + // "%s: %u bytes %s succeeded\n" osSyncPrintf("%s: %u バイトの%sに成功しました\n", name, size, action); } } diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 698715ffee..8fdef5d0c5 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -88,7 +88,7 @@ void MapMark_Draw(GlobalContext* globalCtx) { GraphicsContext* gfxCtx; Gfx* dispRefs[4]; - dungeonId = gSaveContext.dungeon_index; + dungeonId = gSaveContext.dungeonIndex; interfaceCtx = &globalCtx->interfaceCtx; if ((D_8015FFD0 != NULL) && (globalCtx->interfaceCtx.roomNum >= D_8015FFD0[7][dungeonId])) { diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 10e285b8b7..6b51e685cc 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -158,7 +158,7 @@ void Interface_ChangeAlpha(u16 alphaType) { void func_80082644(GlobalContext* globalCtx, s16 alpha) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; - if (gSaveContext.button_status[0] == BTN_DISABLED) { + if (gSaveContext.buttonStatus[0] == BTN_DISABLED) { if (interfaceCtx->bAlpha != 0x46) { interfaceCtx->bAlpha = 0x46; } @@ -168,7 +168,7 @@ void func_80082644(GlobalContext* globalCtx, s16 alpha) { } } - if (gSaveContext.button_status[1] == BTN_DISABLED) { + if (gSaveContext.buttonStatus[1] == BTN_DISABLED) { if (interfaceCtx->cLeftAlpha != 0x46) { interfaceCtx->cLeftAlpha = 0x46; } @@ -178,7 +178,7 @@ void func_80082644(GlobalContext* globalCtx, s16 alpha) { } } - if (gSaveContext.button_status[2] == BTN_DISABLED) { + if (gSaveContext.buttonStatus[2] == BTN_DISABLED) { if (interfaceCtx->cDownAlpha != 0x46) { interfaceCtx->cDownAlpha = 0x46; } @@ -188,7 +188,7 @@ void func_80082644(GlobalContext* globalCtx, s16 alpha) { } } - if (gSaveContext.button_status[3] == BTN_DISABLED) { + if (gSaveContext.buttonStatus[3] == BTN_DISABLED) { if (interfaceCtx->cRightAlpha != 0x46) { interfaceCtx->cRightAlpha = 0x46; } @@ -198,7 +198,7 @@ void func_80082644(GlobalContext* globalCtx, s16 alpha) { } } - if (gSaveContext.button_status[4] == BTN_DISABLED) { + if (gSaveContext.buttonStatus[4] == BTN_DISABLED) { if (interfaceCtx->aAlpha != 0x46) { interfaceCtx->aAlpha = 0x46; } @@ -606,54 +606,54 @@ void func_80083108(GlobalContext* globalCtx) { sp28 = 0; - if ((gSaveContext.cutscene_index < 0xFFF0) || - ((globalCtx->sceneNum == SCENE_SPOT20) && (gSaveContext.cutscene_index == 0xFFF0))) { + if ((gSaveContext.cutsceneIndex < 0xFFF0) || + ((globalCtx->sceneNum == SCENE_SPOT20) && (gSaveContext.cutsceneIndex == 0xFFF0))) { gSaveContext.unk_13E7 = 0; if ((player->stateFlags1 & 0x00800000) || (globalCtx->unk_11E5C >= 2) || ((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38))) { - if (gSaveContext.equips.button_items[0] != ITEM_NONE) { + if (gSaveContext.equips.buttonItems[0] != ITEM_NONE) { gSaveContext.unk_13E7 = 1; - if (gSaveContext.button_status[0] == BTN_DISABLED) { - gSaveContext.button_status[0] = gSaveContext.button_status[1] = gSaveContext.button_status[2] = - gSaveContext.button_status[3] = BTN_ENABLED; + if (gSaveContext.buttonStatus[0] == BTN_DISABLED) { + gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] = + gSaveContext.buttonStatus[3] = BTN_ENABLED; } - if ((gSaveContext.equips.button_items[0] != ITEM_SLINGSHOT) && - (gSaveContext.equips.button_items[0] != ITEM_BOW) && - (gSaveContext.equips.button_items[0] != ITEM_BOMBCHU) && - (gSaveContext.equips.button_items[0] != ITEM_NONE)) { - gSaveContext.button_status[0] = gSaveContext.equips.button_items[0]; + if ((gSaveContext.equips.buttonItems[0] != ITEM_SLINGSHOT) && + (gSaveContext.equips.buttonItems[0] != ITEM_BOW) && + (gSaveContext.equips.buttonItems[0] != ITEM_BOMBCHU) && + (gSaveContext.equips.buttonItems[0] != ITEM_NONE)) { + gSaveContext.buttonStatus[0] = gSaveContext.equips.buttonItems[0]; if ((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38)) { - gSaveContext.equips.button_items[0] = ITEM_BOMBCHU; + gSaveContext.equips.buttonItems[0] = ITEM_BOMBCHU; Interface_LoadItemIcon1(globalCtx, 0); } else { - gSaveContext.equips.button_items[0] = ITEM_BOW; + gSaveContext.equips.buttonItems[0] = ITEM_BOW; if (globalCtx->unk_11E5C >= 2) { if (LINK_AGE_IN_YEARS == YEARS_CHILD) { - gSaveContext.equips.button_items[0] = ITEM_SLINGSHOT; + gSaveContext.equips.buttonItems[0] = ITEM_SLINGSHOT; } Interface_LoadItemIcon1(globalCtx, 0); } else { if (gSaveContext.items[SLOT_BOW] == ITEM_NONE) { - gSaveContext.equips.button_items[0] = ITEM_NONE; + gSaveContext.equips.buttonItems[0] = ITEM_NONE; } else { Interface_LoadItemIcon1(globalCtx, 0); } } } - gSaveContext.button_status[1] = gSaveContext.button_status[2] = gSaveContext.button_status[3] = + gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] = gSaveContext.buttonStatus[3] = BTN_DISABLED; Interface_ChangeAlpha(6); } if (globalCtx->unk_1241B != 0) { Interface_ChangeAlpha(1); - } else if (gSaveContext.minigame_state == 1) { + } else if (gSaveContext.minigameState == 1) { Interface_ChangeAlpha(8); } else if (globalCtx->unk_11E5C >= 2) { Interface_ChangeAlpha(8); @@ -672,9 +672,9 @@ void func_80083108(GlobalContext* globalCtx) { } else if (globalCtx->sceneNum == SCENE_TURIBORI) { gSaveContext.unk_13E7 = 2; if (globalCtx->interfaceCtx.unk_260 != 0) { - if (gSaveContext.equips.button_items[0] != ITEM_FISHING_POLE) { - gSaveContext.button_status[0] = gSaveContext.equips.button_items[0]; - gSaveContext.equips.button_items[0] = ITEM_FISHING_POLE; + if (gSaveContext.equips.buttonItems[0] != ITEM_FISHING_POLE) { + gSaveContext.buttonStatus[0] = gSaveContext.equips.buttonItems[0]; + gSaveContext.equips.buttonItems[0] = ITEM_FISHING_POLE; gSaveContext.unk_13EA = 0; Interface_LoadItemIcon1(globalCtx, 0); Interface_ChangeAlpha(12); @@ -683,56 +683,56 @@ void func_80083108(GlobalContext* globalCtx) { if (gSaveContext.unk_13EA != 12) { Interface_ChangeAlpha(12); } - } else if (gSaveContext.equips.button_items[0] == ITEM_FISHING_POLE) { - gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; + } else if (gSaveContext.equips.buttonItems[0] == ITEM_FISHING_POLE) { + gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0]; gSaveContext.unk_13EA = 0; - if (gSaveContext.equips.button_items[0] != ITEM_NONE) { + if (gSaveContext.equips.buttonItems[0] != ITEM_NONE) { Interface_LoadItemIcon1(globalCtx, 0); } - gSaveContext.button_status[0] = gSaveContext.button_status[1] = gSaveContext.button_status[2] = - gSaveContext.button_status[3] = BTN_DISABLED; + gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] = + gSaveContext.buttonStatus[3] = BTN_DISABLED; Interface_ChangeAlpha(50); } else { - if (gSaveContext.button_status[0] == BTN_ENABLED) { + if (gSaveContext.buttonStatus[0] == BTN_ENABLED) { gSaveContext.unk_13EA = 0; } - gSaveContext.button_status[0] = gSaveContext.button_status[1] = gSaveContext.button_status[2] = - gSaveContext.button_status[3] = BTN_DISABLED; + gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] = + gSaveContext.buttonStatus[3] = BTN_DISABLED; Interface_ChangeAlpha(50); } } else if (msgCtx->msgMode == 0) { if ((func_8008F2F8(globalCtx) >= 2) && (func_8008F2F8(globalCtx) < 5)) { - if (gSaveContext.button_status[0] != BTN_DISABLED) { + if (gSaveContext.buttonStatus[0] != BTN_DISABLED) { sp28 = 1; } - gSaveContext.button_status[0] = BTN_DISABLED; + gSaveContext.buttonStatus[0] = BTN_DISABLED; for (i = 1; i < 4; i++) { if (func_8008F2F8(globalCtx) == 2) { - if ((gSaveContext.equips.button_items[i] != ITEM_HOOKSHOT) && - (gSaveContext.equips.button_items[i] != ITEM_LONGSHOT)) { - if (gSaveContext.button_status[i] == BTN_ENABLED) { + if ((gSaveContext.equips.buttonItems[i] != ITEM_HOOKSHOT) && + (gSaveContext.equips.buttonItems[i] != ITEM_LONGSHOT)) { + if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_DISABLED; + gSaveContext.buttonStatus[i] = BTN_DISABLED; } else { - if (gSaveContext.button_status[i] == BTN_DISABLED) { + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_ENABLED; + gSaveContext.buttonStatus[i] = BTN_ENABLED; } } else { - if (gSaveContext.button_status[i] == BTN_ENABLED) { + if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_DISABLED; + gSaveContext.buttonStatus[i] = BTN_DISABLED; } } @@ -742,22 +742,22 @@ void func_80083108(GlobalContext* globalCtx) { Interface_ChangeAlpha(50); } else if ((player->stateFlags1 & 0x00200000) || (player->stateFlags2 & 0x00040000)) { - if (gSaveContext.button_status[0] != BTN_DISABLED) { - gSaveContext.button_status[0] = BTN_DISABLED; - gSaveContext.button_status[1] = BTN_DISABLED; - gSaveContext.button_status[2] = BTN_DISABLED; - gSaveContext.button_status[3] = BTN_DISABLED; + if (gSaveContext.buttonStatus[0] != BTN_DISABLED) { + gSaveContext.buttonStatus[0] = BTN_DISABLED; + gSaveContext.buttonStatus[1] = BTN_DISABLED; + gSaveContext.buttonStatus[2] = BTN_DISABLED; + gSaveContext.buttonStatus[3] = BTN_DISABLED; gSaveContext.unk_13EA = 0; Interface_ChangeAlpha(50); } - } else if ((gSaveContext.event_inf[0] & 0xF) == 1) { + } else if ((gSaveContext.eventInf[0] & 0xF) == 1) { if (player->stateFlags1 & 0x00800000) { - if ((gSaveContext.equips.button_items[0] != ITEM_NONE) && - (gSaveContext.equips.button_items[0] != ITEM_BOW)) { + if ((gSaveContext.equips.buttonItems[0] != ITEM_NONE) && + (gSaveContext.equips.buttonItems[0] != ITEM_BOW)) { if (gSaveContext.items[SLOT_BOW] == ITEM_NONE) { - gSaveContext.equips.button_items[0] = ITEM_NONE; + gSaveContext.equips.buttonItems[0] = ITEM_NONE; } else { - gSaveContext.equips.button_items[0] = ITEM_BOW; + gSaveContext.equips.buttonItems[0] = ITEM_BOW; sp28 = 1; } } @@ -765,16 +765,16 @@ void func_80083108(GlobalContext* globalCtx) { do { sp28 = 1; - if ((gSaveContext.equips.button_items[0] == ITEM_NONE) || - (gSaveContext.equips.button_items[0] == ITEM_BOW)) { + if ((gSaveContext.equips.buttonItems[0] == ITEM_NONE) || + (gSaveContext.equips.buttonItems[0] == ITEM_BOW)) { - if ((gSaveContext.equips.button_items[0] != ITEM_SWORD_KOKIRI) && - (gSaveContext.equips.button_items[0] != ITEM_SWORD_MASTER) && - (gSaveContext.equips.button_items[0] != ITEM_SWORD_BGS) && - (gSaveContext.equips.button_items[0] != ITEM_SWORD_KNIFE)) { - gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; + if ((gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI) && + (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER) && + (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BGS) && + (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KNIFE)) { + gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0]; } else { - gSaveContext.button_status[0] = gSaveContext.equips.button_items[0]; + gSaveContext.buttonStatus[0] = gSaveContext.equips.buttonItems[0]; } } } while (0); // Necessary to match @@ -786,19 +786,19 @@ void func_80083108(GlobalContext* globalCtx) { } for (i = 1; i < 4; i++) { - if ((gSaveContext.equips.button_items[i] != ITEM_OCARINA_FAIRY) && - (gSaveContext.equips.button_items[i] != ITEM_OCARINA_TIME)) { - if (gSaveContext.button_status[i] == BTN_ENABLED) { + if ((gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_FAIRY) && + (gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_TIME)) { + if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_DISABLED; + gSaveContext.buttonStatus[i] = BTN_DISABLED; } else { - if (gSaveContext.button_status[i] == BTN_DISABLED) { + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_ENABLED; + gSaveContext.buttonStatus[i] = BTN_ENABLED; } } @@ -809,235 +809,235 @@ void func_80083108(GlobalContext* globalCtx) { Interface_ChangeAlpha(50); } else { if (interfaceCtx->restrictions.bButton == 0) { - if ((gSaveContext.equips.button_items[0] == ITEM_SLINGSHOT) || - (gSaveContext.equips.button_items[0] == ITEM_BOW) || - (gSaveContext.equips.button_items[0] == ITEM_BOMBCHU) || - (gSaveContext.equips.button_items[0] == ITEM_NONE)) { - if ((gSaveContext.equips.button_items[0] != ITEM_NONE) || (gSaveContext.inf_table[29] == 0)) { - gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; + if ((gSaveContext.equips.buttonItems[0] == ITEM_SLINGSHOT) || + (gSaveContext.equips.buttonItems[0] == ITEM_BOW) || + (gSaveContext.equips.buttonItems[0] == ITEM_BOMBCHU) || + (gSaveContext.equips.buttonItems[0] == ITEM_NONE)) { + if ((gSaveContext.equips.buttonItems[0] != ITEM_NONE) || (gSaveContext.infTable[29] == 0)) { + gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0]; sp28 = 1; - if (gSaveContext.equips.button_items[0] != ITEM_NONE) { + if (gSaveContext.equips.buttonItems[0] != ITEM_NONE) { Interface_LoadItemIcon1(globalCtx, 0); } } - } else if ((gSaveContext.button_status[0] & 0xFF) == BTN_DISABLED) { + } else if ((gSaveContext.buttonStatus[0] & 0xFF) == BTN_DISABLED) { sp28 = 1; - if (((gSaveContext.button_status[0] & 0xFF) == BTN_DISABLED) || - ((gSaveContext.button_status[0] & 0xFF) == BTN_ENABLED)) { - gSaveContext.button_status[0] = BTN_ENABLED; + if (((gSaveContext.buttonStatus[0] & 0xFF) == BTN_DISABLED) || + ((gSaveContext.buttonStatus[0] & 0xFF) == BTN_ENABLED)) { + gSaveContext.buttonStatus[0] = BTN_ENABLED; } else { - gSaveContext.equips.button_items[0] = gSaveContext.button_status[0] & 0xFF; + gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0] & 0xFF; } } } else if (interfaceCtx->restrictions.bButton == 1) { - if ((gSaveContext.equips.button_items[0] == ITEM_SLINGSHOT) || - (gSaveContext.equips.button_items[0] == ITEM_BOW) || - (gSaveContext.equips.button_items[0] == ITEM_BOMBCHU) || - (gSaveContext.equips.button_items[0] == ITEM_NONE)) { - if ((gSaveContext.equips.button_items[0] != ITEM_NONE) || (gSaveContext.inf_table[29] == 0)) { - gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; + if ((gSaveContext.equips.buttonItems[0] == ITEM_SLINGSHOT) || + (gSaveContext.equips.buttonItems[0] == ITEM_BOW) || + (gSaveContext.equips.buttonItems[0] == ITEM_BOMBCHU) || + (gSaveContext.equips.buttonItems[0] == ITEM_NONE)) { + if ((gSaveContext.equips.buttonItems[0] != ITEM_NONE) || (gSaveContext.infTable[29] == 0)) { + gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0]; sp28 = 1; - if (gSaveContext.equips.button_items[0] != ITEM_NONE) { + if (gSaveContext.equips.buttonItems[0] != ITEM_NONE) { Interface_LoadItemIcon1(globalCtx, 0); } } } else { - if (gSaveContext.button_status[0] == BTN_ENABLED) { + if (gSaveContext.buttonStatus[0] == BTN_ENABLED) { sp28 = 1; } - gSaveContext.button_status[0] = BTN_DISABLED; + gSaveContext.buttonStatus[0] = BTN_DISABLED; } } if (interfaceCtx->restrictions.bottles != 0) { for (i = 1; i < 4; i++) { - if ((gSaveContext.equips.button_items[i] >= ITEM_BOTTLE) && - (gSaveContext.equips.button_items[i] <= ITEM_POE)) { - if (gSaveContext.button_status[i] == BTN_ENABLED) { + if ((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) && + (gSaveContext.equips.buttonItems[i] <= ITEM_POE)) { + if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_DISABLED; + gSaveContext.buttonStatus[i] = BTN_DISABLED; } } } else if (interfaceCtx->restrictions.bottles == 0) { for (i = 1; i < 4; i++) { - if ((gSaveContext.equips.button_items[i] >= ITEM_BOTTLE) && - (gSaveContext.equips.button_items[i] <= ITEM_POE)) { - if (gSaveContext.button_status[i] == BTN_DISABLED) { + if ((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) && + (gSaveContext.equips.buttonItems[i] <= ITEM_POE)) { + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_ENABLED; + gSaveContext.buttonStatus[i] = BTN_ENABLED; } } } if (interfaceCtx->restrictions.tradeItems != 0) { for (i = 1; i < 4; i++) { - if ((gSaveContext.equips.button_items[i] >= ITEM_WEIRD_EGG) && - (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK)) { - if (gSaveContext.button_status[i] == BTN_ENABLED) { + if ((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) && + (gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK)) { + if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_DISABLED; + gSaveContext.buttonStatus[i] = BTN_DISABLED; } } } else if (interfaceCtx->restrictions.tradeItems == 0) { for (i = 1; i < 4; i++) { - if ((gSaveContext.equips.button_items[i] >= ITEM_WEIRD_EGG) && - (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK)) { - if (gSaveContext.button_status[i] == BTN_DISABLED) { + if ((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) && + (gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK)) { + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_ENABLED; + gSaveContext.buttonStatus[i] = BTN_ENABLED; } } } if (interfaceCtx->restrictions.hookshot != 0) { for (i = 1; i < 4; i++) { - if ((gSaveContext.equips.button_items[i] == ITEM_HOOKSHOT) || - (gSaveContext.equips.button_items[i] == ITEM_LONGSHOT)) { - if (gSaveContext.button_status[i] == BTN_ENABLED) { + if ((gSaveContext.equips.buttonItems[i] == ITEM_HOOKSHOT) || + (gSaveContext.equips.buttonItems[i] == ITEM_LONGSHOT)) { + if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_DISABLED; + gSaveContext.buttonStatus[i] = BTN_DISABLED; } } } else if (interfaceCtx->restrictions.hookshot == 0) { for (i = 1; i < 4; i++) { - if ((gSaveContext.equips.button_items[i] == ITEM_HOOKSHOT) || - (gSaveContext.equips.button_items[i] == ITEM_LONGSHOT)) { - if (gSaveContext.button_status[i] == BTN_DISABLED) { + if ((gSaveContext.equips.buttonItems[i] == ITEM_HOOKSHOT) || + (gSaveContext.equips.buttonItems[i] == ITEM_LONGSHOT)) { + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_ENABLED; + gSaveContext.buttonStatus[i] = BTN_ENABLED; } } } if (interfaceCtx->restrictions.ocarina != 0) { for (i = 1; i < 4; i++) { - if ((gSaveContext.equips.button_items[i] == ITEM_OCARINA_FAIRY) || - (gSaveContext.equips.button_items[i] == ITEM_OCARINA_TIME)) { - if (gSaveContext.button_status[i] == BTN_ENABLED) { + if ((gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_FAIRY) || + (gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_TIME)) { + if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_DISABLED; + gSaveContext.buttonStatus[i] = BTN_DISABLED; } } } else if (interfaceCtx->restrictions.ocarina == 0) { for (i = 1; i < 4; i++) { - if ((gSaveContext.equips.button_items[i] == ITEM_OCARINA_FAIRY) || - (gSaveContext.equips.button_items[i] == ITEM_OCARINA_TIME)) { - if (gSaveContext.button_status[i] == BTN_DISABLED) { + if ((gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_FAIRY) || + (gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_TIME)) { + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_ENABLED; + gSaveContext.buttonStatus[i] = BTN_ENABLED; } } } if (interfaceCtx->restrictions.farores != 0) { for (i = 1; i < 4; i++) { - if (gSaveContext.equips.button_items[i] == ITEM_FARORES_WIND) { - if (gSaveContext.button_status[i] == BTN_ENABLED) { + if (gSaveContext.equips.buttonItems[i] == ITEM_FARORES_WIND) { + if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_DISABLED; + gSaveContext.buttonStatus[i] = BTN_DISABLED; osSyncPrintf("***(i=%d)*** ", i); } } } else if (interfaceCtx->restrictions.farores == 0) { for (i = 1; i < 4; i++) { - if (gSaveContext.equips.button_items[i] == ITEM_FARORES_WIND) { - if (gSaveContext.button_status[i] == BTN_DISABLED) { + if (gSaveContext.equips.buttonItems[i] == ITEM_FARORES_WIND) { + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_ENABLED; + gSaveContext.buttonStatus[i] = BTN_ENABLED; } } } if (interfaceCtx->restrictions.dinsNayrus != 0) { for (i = 1; i < 4; i++) { - if ((gSaveContext.equips.button_items[i] == ITEM_DINS_FIRE) || - (gSaveContext.equips.button_items[i] == ITEM_NAYRUS_LOVE)) { - if (gSaveContext.button_status[i] == BTN_ENABLED) { + if ((gSaveContext.equips.buttonItems[i] == ITEM_DINS_FIRE) || + (gSaveContext.equips.buttonItems[i] == ITEM_NAYRUS_LOVE)) { + if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_DISABLED; + gSaveContext.buttonStatus[i] = BTN_DISABLED; } } } else if (interfaceCtx->restrictions.dinsNayrus == 0) { for (i = 1; i < 4; i++) { - if ((gSaveContext.equips.button_items[i] == ITEM_DINS_FIRE) || - (gSaveContext.equips.button_items[i] == ITEM_NAYRUS_LOVE)) { - if (gSaveContext.button_status[i] == BTN_DISABLED) { + if ((gSaveContext.equips.buttonItems[i] == ITEM_DINS_FIRE) || + (gSaveContext.equips.buttonItems[i] == ITEM_NAYRUS_LOVE)) { + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_ENABLED; + gSaveContext.buttonStatus[i] = BTN_ENABLED; } } } if (interfaceCtx->restrictions.all != 0) { for (i = 1; i < 4; i++) { - if ((gSaveContext.equips.button_items[i] != ITEM_OCARINA_FAIRY) && - (gSaveContext.equips.button_items[i] != ITEM_OCARINA_TIME) && - !((gSaveContext.equips.button_items[i] >= ITEM_BOTTLE) && - (gSaveContext.equips.button_items[i] <= ITEM_POE)) && - !((gSaveContext.equips.button_items[i] >= ITEM_WEIRD_EGG) && - (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK))) { + if ((gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_FAIRY) && + (gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_TIME) && + !((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) && + (gSaveContext.equips.buttonItems[i] <= ITEM_POE)) && + !((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) && + (gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) { if ((globalCtx->sceneNum != SCENE_TAKARAYA) || - (gSaveContext.equips.button_items[i] != ITEM_LENS)) { - if (gSaveContext.button_status[i] == BTN_ENABLED) { + (gSaveContext.equips.buttonItems[i] != ITEM_LENS)) { + if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_DISABLED; + gSaveContext.buttonStatus[i] = BTN_DISABLED; } else { - if (gSaveContext.button_status[i] == BTN_DISABLED) { + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_ENABLED; + gSaveContext.buttonStatus[i] = BTN_ENABLED; } } } } else if (interfaceCtx->restrictions.all == 0) { for (i = 1; i < 4; i++) { - if ((gSaveContext.equips.button_items[i] != ITEM_DINS_FIRE) && - (gSaveContext.equips.button_items[i] != ITEM_HOOKSHOT) && - (gSaveContext.equips.button_items[i] != ITEM_LONGSHOT) && - (gSaveContext.equips.button_items[i] != ITEM_FARORES_WIND) && - (gSaveContext.equips.button_items[i] != ITEM_NAYRUS_LOVE) && - (gSaveContext.equips.button_items[i] != ITEM_OCARINA_FAIRY) && - (gSaveContext.equips.button_items[i] != ITEM_OCARINA_TIME) && - !((gSaveContext.equips.button_items[i] >= ITEM_BOTTLE) && - (gSaveContext.equips.button_items[i] <= ITEM_POE)) && - !((gSaveContext.equips.button_items[i] >= ITEM_WEIRD_EGG) && - (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK))) { - if (gSaveContext.button_status[i] == BTN_DISABLED) { + if ((gSaveContext.equips.buttonItems[i] != ITEM_DINS_FIRE) && + (gSaveContext.equips.buttonItems[i] != ITEM_HOOKSHOT) && + (gSaveContext.equips.buttonItems[i] != ITEM_LONGSHOT) && + (gSaveContext.equips.buttonItems[i] != ITEM_FARORES_WIND) && + (gSaveContext.equips.buttonItems[i] != ITEM_NAYRUS_LOVE) && + (gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_FAIRY) && + (gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_TIME) && + !((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) && + (gSaveContext.equips.buttonItems[i] <= ITEM_POE)) && + !((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) && + (gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) { + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { sp28 = 1; } - gSaveContext.button_status[i] = BTN_ENABLED; + gSaveContext.buttonStatus[i] = BTN_ENABLED; } } } @@ -1143,82 +1143,82 @@ void Inventory_SwapAgeEquipment(void) { if (LINK_AGE_IN_YEARS == YEARS_CHILD) { for (i = 0; i < 4; i++) { if (i != 0) { - gSaveContext.child_equips.button_items[i] = gSaveContext.equips.button_items[i]; + gSaveContext.childEquips.buttonItems[i] = gSaveContext.equips.buttonItems[i]; } else { - gSaveContext.child_equips.button_items[i] = ITEM_SWORD_KOKIRI; + gSaveContext.childEquips.buttonItems[i] = ITEM_SWORD_KOKIRI; } if (i != 0) { - gSaveContext.child_equips.c_button_slots[i - 1] = gSaveContext.equips.c_button_slots[i - 1]; + gSaveContext.childEquips.cButtonSlots[i - 1] = gSaveContext.equips.cButtonSlots[i - 1]; } } - gSaveContext.child_equips.equipment = gSaveContext.equips.equipment; + gSaveContext.childEquips.equipment = gSaveContext.equips.equipment; - if (gSaveContext.adult_equips.button_items[0] == ITEM_NONE) { - gSaveContext.equips.button_items[0] = ITEM_SWORD_MASTER; + if (gSaveContext.adultEquips.buttonItems[0] == ITEM_NONE) { + gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER; if (gSaveContext.items[SLOT_NUT] != ITEM_NONE) { - gSaveContext.equips.button_items[1] = ITEM_NUT; - gSaveContext.equips.c_button_slots[0] = SLOT_NUT; + gSaveContext.equips.buttonItems[1] = ITEM_NUT; + gSaveContext.equips.cButtonSlots[0] = SLOT_NUT; } else { - gSaveContext.equips.c_button_slots[0] = SLOT_NONE; - gSaveContext.equips.button_items[1] = ITEM_NONE; + gSaveContext.equips.cButtonSlots[0] = SLOT_NONE; + gSaveContext.equips.buttonItems[1] = ITEM_NONE; } - gSaveContext.equips.button_items[2] = ITEM_BOMB; - gSaveContext.equips.c_button_slots[1] = SLOT_BOMB; - gSaveContext.equips.c_button_slots[2] = SLOT_OCARINA; + gSaveContext.equips.buttonItems[2] = ITEM_BOMB; + gSaveContext.equips.cButtonSlots[1] = SLOT_BOMB; + gSaveContext.equips.cButtonSlots[2] = SLOT_OCARINA; gSaveContext.equips.equipment = 0x1122; - gSaveContext.equips.button_items[3] = gSaveContext.items[SLOT_OCARINA]; + gSaveContext.equips.buttonItems[3] = gSaveContext.items[SLOT_OCARINA]; } else { for (i = 0; i < 4; i++) { - gSaveContext.equips.button_items[i] = gSaveContext.adult_equips.button_items[i]; + gSaveContext.equips.buttonItems[i] = gSaveContext.adultEquips.buttonItems[i]; if (i != 0) { - gSaveContext.equips.c_button_slots[i - 1] = gSaveContext.adult_equips.c_button_slots[i - 1]; + gSaveContext.equips.cButtonSlots[i - 1] = gSaveContext.adultEquips.cButtonSlots[i - 1]; } - if (((gSaveContext.equips.button_items[i] >= ITEM_BOTTLE) && - (gSaveContext.equips.button_items[i] <= ITEM_POE)) || - ((gSaveContext.equips.button_items[i] >= ITEM_WEIRD_EGG) && - (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK))) { - osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.equips.c_button_slots[i - 1]); - gSaveContext.equips.button_items[i] = gSaveContext.items[gSaveContext.equips.c_button_slots[i - 1]]; + if (((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) && + (gSaveContext.equips.buttonItems[i] <= ITEM_POE)) || + ((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) && + (gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) { + osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.equips.cButtonSlots[i - 1]); + gSaveContext.equips.buttonItems[i] = gSaveContext.items[gSaveContext.equips.cButtonSlots[i - 1]]; } } - gSaveContext.equips.equipment = gSaveContext.adult_equips.equipment; + gSaveContext.equips.equipment = gSaveContext.adultEquips.equipment; } } else { for (i = 0; i < 4; i++) { - gSaveContext.adult_equips.button_items[i] = gSaveContext.equips.button_items[i]; + gSaveContext.adultEquips.buttonItems[i] = gSaveContext.equips.buttonItems[i]; if (i != 0) { - gSaveContext.adult_equips.c_button_slots[i - 1] = gSaveContext.equips.c_button_slots[i - 1]; + gSaveContext.adultEquips.cButtonSlots[i - 1] = gSaveContext.equips.cButtonSlots[i - 1]; } } - gSaveContext.adult_equips.equipment = gSaveContext.equips.equipment; + gSaveContext.adultEquips.equipment = gSaveContext.equips.equipment; - if (gSaveContext.child_equips.button_items[0] != ITEM_NONE) { + if (gSaveContext.childEquips.buttonItems[0] != ITEM_NONE) { for (i = 0; i < 4; i++) { - gSaveContext.equips.button_items[i] = gSaveContext.child_equips.button_items[i]; + gSaveContext.equips.buttonItems[i] = gSaveContext.childEquips.buttonItems[i]; if (i != 0) { - gSaveContext.equips.c_button_slots[i - 1] = gSaveContext.child_equips.c_button_slots[i - 1]; + gSaveContext.equips.cButtonSlots[i - 1] = gSaveContext.childEquips.cButtonSlots[i - 1]; } - if (((gSaveContext.equips.button_items[i] >= ITEM_BOTTLE) && - (gSaveContext.equips.button_items[i] <= ITEM_POE)) || - ((gSaveContext.equips.button_items[i] >= ITEM_WEIRD_EGG) && - (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK))) { - osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.equips.c_button_slots[i - 1]); - gSaveContext.equips.button_items[i] = gSaveContext.items[gSaveContext.equips.c_button_slots[i - 1]]; + if (((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) && + (gSaveContext.equips.buttonItems[i] <= ITEM_POE)) || + ((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) && + (gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) { + osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.equips.cButtonSlots[i - 1]); + gSaveContext.equips.buttonItems[i] = gSaveContext.items[gSaveContext.equips.cButtonSlots[i - 1]]; } } - gSaveContext.equips.equipment = gSaveContext.child_equips.equipment; + gSaveContext.equips.equipment = gSaveContext.childEquips.equipment; gSaveContext.equips.equipment &= 0xFFF0; gSaveContext.equips.equipment |= 0x0001; } @@ -1239,9 +1239,9 @@ void Inventory_SwapAgeEquipment(void) { void Interface_InitHorsebackArchery(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; - gSaveContext.minigame_state = 1; + gSaveContext.minigameState = 1; interfaceCtx->unk_23C = interfaceCtx->unk_240 = interfaceCtx->unk_242 = 0; - gSaveContext.minigame_score = sHBAScoreTier = 0; + gSaveContext.minigameScore = sHBAScoreTier = 0; interfaceCtx->hbaAmmo = 20; } @@ -1250,9 +1250,9 @@ void func_800849EC(GlobalContext* globalCtx) { gSaveContext.equipment ^= 8 << gEquipShifts[0]; if (gBitFlags[3] & gSaveContext.equipment) { - gSaveContext.equips.button_items[0] = ITEM_SWORD_KNIFE; + gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KNIFE; } else { - gSaveContext.equips.button_items[0] = ITEM_SWORD_BGS; + gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BGS; } Interface_LoadItemIcon1(globalCtx, 0); @@ -1263,7 +1263,7 @@ void Interface_LoadItemIcon1(GlobalContext* globalCtx, u16 button) { osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK); DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160, (u32)interfaceCtx->icon_itemSegment + button * 0x1000, - (u32)_icon_item_staticSegmentRomStart + (gSaveContext.equips.button_items[button] * 0x1000), + (u32)_icon_item_staticSegmentRomStart + (gSaveContext.equips.buttonItems[button] * 0x1000), 0x1000, 0, &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 1171); osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK); } @@ -1273,38 +1273,37 @@ void Interface_LoadItemIcon2(GlobalContext* globalCtx, u16 button) { osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK); DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_180, (u32)interfaceCtx->icon_itemSegment + button * 0x1000, - (u32)_icon_item_staticSegmentRomStart + (gSaveContext.equips.button_items[button] * 0x1000), + (u32)_icon_item_staticSegmentRomStart + (gSaveContext.equips.buttonItems[button] * 0x1000), 0x1000, 0, &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 1193); osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK); } void func_80084BF4(GlobalContext* globalCtx, u16 flag) { if (flag) { - if ((gSaveContext.equips.button_items[0] == ITEM_SLINGSHOT) || - (gSaveContext.equips.button_items[0] == ITEM_BOW) || - (gSaveContext.equips.button_items[0] == ITEM_BOMBCHU) || - (gSaveContext.equips.button_items[0] == ITEM_FISHING_POLE) || - (gSaveContext.button_status[0] == BTN_DISABLED)) { - if ((gSaveContext.equips.button_items[0] == ITEM_SLINGSHOT) || - (gSaveContext.equips.button_items[0] == ITEM_BOW) || - (gSaveContext.equips.button_items[0] == ITEM_BOMBCHU) || - (gSaveContext.equips.button_items[0] == ITEM_FISHING_POLE)) { - gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; + if ((gSaveContext.equips.buttonItems[0] == ITEM_SLINGSHOT) || + (gSaveContext.equips.buttonItems[0] == ITEM_BOW) || (gSaveContext.equips.buttonItems[0] == ITEM_BOMBCHU) || + (gSaveContext.equips.buttonItems[0] == ITEM_FISHING_POLE) || + (gSaveContext.buttonStatus[0] == BTN_DISABLED)) { + if ((gSaveContext.equips.buttonItems[0] == ITEM_SLINGSHOT) || + (gSaveContext.equips.buttonItems[0] == ITEM_BOW) || + (gSaveContext.equips.buttonItems[0] == ITEM_BOMBCHU) || + (gSaveContext.equips.buttonItems[0] == ITEM_FISHING_POLE)) { + gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0]; Interface_LoadItemIcon1(globalCtx, 0); } - } else if (gSaveContext.equips.button_items[0] == ITEM_NONE) { - if ((gSaveContext.equips.button_items[0] != ITEM_NONE) || (gSaveContext.inf_table[29] == 0)) { - gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; + } else if (gSaveContext.equips.buttonItems[0] == ITEM_NONE) { + if ((gSaveContext.equips.buttonItems[0] != ITEM_NONE) || (gSaveContext.infTable[29] == 0)) { + gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0]; Interface_LoadItemIcon1(globalCtx, 0); } } - gSaveContext.button_status[0] = gSaveContext.button_status[1] = gSaveContext.button_status[2] = - gSaveContext.button_status[3] = BTN_ENABLED; + gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] = + gSaveContext.buttonStatus[3] = BTN_ENABLED; Interface_ChangeAlpha(7); } else { - gSaveContext.button_status[0] = gSaveContext.button_status[1] = gSaveContext.button_status[2] = - gSaveContext.button_status[3] = BTN_ENABLED; + gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] = + gSaveContext.buttonStatus[3] = BTN_ENABLED; func_80083108(globalCtx); } } @@ -1331,11 +1330,11 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { osSyncPrintf(VT_RST); if ((item >= ITEM_MEDALLION_FOREST) && (item <= ITEM_MEDALLION_LIGHT)) { - gSaveContext.quest_items |= gBitFlags[item - ITEM_MEDALLION_FOREST]; + gSaveContext.questItems |= gBitFlags[item - ITEM_MEDALLION_FOREST + QUEST_MEDALLION_FOREST]; osSyncPrintf(VT_FGCOL(YELLOW)); // Translates to: "Seals = %x" - osSyncPrintf("封印 = %x\n", gSaveContext.quest_items); + osSyncPrintf("封印 = %x\n", gSaveContext.questItems); osSyncPrintf(VT_RST); if (item == ITEM_MEDALLION_WATER) { @@ -1344,42 +1343,42 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { return ITEM_NONE; } else if ((item >= ITEM_SONG_MINUET) && (item <= ITEM_SONG_STORMS)) { - gSaveContext.quest_items |= gBitFlags[item - ITEM_SONG_MINUET + 6]; + gSaveContext.questItems |= gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET]; osSyncPrintf(VT_FGCOL(YELLOW)); // Translates to: "Musical scores = %x" - osSyncPrintf("楽譜 = %x\n", gSaveContext.quest_items); + osSyncPrintf("楽譜 = %x\n", gSaveContext.questItems); // Translates to: "Musical scores = %x (%x) (%x)" - osSyncPrintf("楽譜 = %x (%x) (%x)\n", gSaveContext.quest_items, gBitFlags[item - ITEM_SONG_MINUET + 6], - gBitFlags[item - ITEM_SONG_MINUET]); + osSyncPrintf("楽譜 = %x (%x) (%x)\n", gSaveContext.questItems, + gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET], gBitFlags[item - ITEM_SONG_MINUET]); osSyncPrintf(VT_RST); return ITEM_NONE; } else if ((item >= ITEM_KOKIRI_EMERALD) && (item <= ITEM_ZORA_SAPPHIRE)) { - gSaveContext.quest_items |= gBitFlags[item - ITEM_KOKIRI_EMERALD + 18]; + gSaveContext.questItems |= gBitFlags[item - ITEM_KOKIRI_EMERALD + QUEST_KOKIRI_EMERALD]; osSyncPrintf(VT_FGCOL(YELLOW)); // Translates to: "Spiritual Stones = %x" - osSyncPrintf("精霊石 = %x\n", gSaveContext.quest_items); + osSyncPrintf("精霊石 = %x\n", gSaveContext.questItems); osSyncPrintf(VT_RST); return ITEM_NONE; } else if ((item == ITEM_STONE_OF_AGONY) || (item == ITEM_GERUDO_CARD)) { - gSaveContext.quest_items |= gBitFlags[item - ITEM_STONE_OF_AGONY + 21]; + gSaveContext.questItems |= gBitFlags[item - ITEM_STONE_OF_AGONY + QUEST_STONE_OF_AGONY]; osSyncPrintf(VT_FGCOL(YELLOW)); // Translates to: "Items = %x" - osSyncPrintf("アイテム = %x\n", gSaveContext.quest_items); + osSyncPrintf("アイテム = %x\n", gSaveContext.questItems); osSyncPrintf(VT_RST); return ITEM_NONE; } else if (item == ITEM_SKULL_TOKEN) { - gSaveContext.quest_items |= gBitFlags[item - ITEM_SKULL_TOKEN + 23]; - gSaveContext.gs_tokens++; + gSaveContext.questItems |= gBitFlags[item - ITEM_SKULL_TOKEN + QUEST_SKULL_TOKEN]; + gSaveContext.gsTokens++; osSyncPrintf(VT_FGCOL(YELLOW)); // Translates to: "N Coins = %x(%d)" - osSyncPrintf("Ｎコイン = %x(%d)\n", gSaveContext.quest_items, gSaveContext.gs_tokens); + osSyncPrintf("Ｎコイン = %x(%d)\n", gSaveContext.questItems, gSaveContext.gsTokens); osSyncPrintf(VT_RST); return ITEM_NONE; @@ -1387,17 +1386,17 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { gSaveContext.equipment |= gBitFlags[item - ITEM_SWORD_KOKIRI] << gEquipShifts[EQUIP_SWORD]; if (item == ITEM_SWORD_BGS) { - gSaveContext.bgs_hits_left = 8; + gSaveContext.bgsHitsLeft = 8; if (ALL_EQUIP_VALUE(EQUIP_SWORD) == 0xF) { gSaveContext.equipment ^= 8 << gEquipShifts[EQUIP_SWORD]; - if (gSaveContext.equips.button_items[0] == ITEM_SWORD_KNIFE) { - gSaveContext.equips.button_items[0] = ITEM_SWORD_BGS; + if (gSaveContext.equips.buttonItems[0] == ITEM_SWORD_KNIFE) { + gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BGS; Interface_LoadItemIcon1(globalCtx, 0); } } } else if (item == ITEM_SWORD_MASTER) { - gSaveContext.equips.button_items[0] = ITEM_SWORD_MASTER; + gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER; gSaveContext.equips.equipment &= 0xFFF0; gSaveContext.equips.equipment |= 0x0002; Interface_LoadItemIcon1(globalCtx, 0); @@ -1414,14 +1413,14 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { gSaveContext.equipment |= (gBitFlags[item - ITEM_BOOTS_KOKIRI] << gEquipShifts[EQUIP_BOOTS]); return ITEM_NONE; } else if ((item == ITEM_KEY_BOSS) || (item == ITEM_COMPASS) || (item == ITEM_DUNGEON_MAP)) { - gSaveContext.dungeon_items[gSaveContext.dungeon_index] |= gBitFlags[item - ITEM_KEY_BOSS]; + gSaveContext.dungeonItems[gSaveContext.dungeonIndex] |= gBitFlags[item - ITEM_KEY_BOSS]; return ITEM_NONE; } else if (item == ITEM_KEY_SMALL) { - if (gSaveContext.dungeon_keys[gSaveContext.dungeon_index] < 0) { - gSaveContext.dungeon_keys[gSaveContext.dungeon_index] = 1; + if (gSaveContext.dungeonKeys[gSaveContext.dungeonIndex] < 0) { + gSaveContext.dungeonKeys[gSaveContext.dungeonIndex] = 1; return ITEM_NONE; } else { - gSaveContext.dungeon_keys[gSaveContext.dungeon_index]++; + gSaveContext.dungeonKeys[gSaveContext.dungeonIndex]++; return ITEM_NONE; } } else if ((item == ITEM_QUIVER_30) || (item == ITEM_BOW)) { @@ -1524,8 +1523,8 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { } else if (item == ITEM_LONGSHOT) { INV_CONTENT(item) = item; for (i = 1; i < 4; i++) { - if (gSaveContext.equips.button_items[i] == ITEM_HOOKSHOT) { - gSaveContext.equips.button_items[i] = ITEM_LONGSHOT; + if (gSaveContext.equips.buttonItems[i] == ITEM_HOOKSHOT) { + gSaveContext.equips.buttonItems[i] = ITEM_LONGSHOT; Interface_LoadItemIcon1(globalCtx, i); } } @@ -1637,8 +1636,8 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG); } - if (!(gSaveContext.item_get_inf[1] & 8)) { - gSaveContext.item_get_inf[1] |= 8; + if (!(gSaveContext.itemGetInf[1] & 8)) { + gSaveContext.itemGetInf[1] |= 8; return ITEM_NONE; } @@ -1650,8 +1649,8 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG); } - if (!(gSaveContext.item_get_inf[1] & 8)) { - gSaveContext.item_get_inf[1] |= 8; + if (!(gSaveContext.itemGetInf[1] & 8)) { + gSaveContext.itemGetInf[1] |= 8; return ITEM_NONE; } @@ -1662,8 +1661,8 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { } else if (item == ITEM_OCARINA_TIME) { INV_CONTENT(ITEM_OCARINA_TIME) = ITEM_OCARINA_TIME; for (i = 1; i < 4; i++) { - if (gSaveContext.equips.button_items[i] == ITEM_OCARINA_FAIRY) { - gSaveContext.equips.button_items[i] = ITEM_OCARINA_TIME; + if (gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_FAIRY) { + gSaveContext.equips.buttonItems[i] = ITEM_OCARINA_TIME; Interface_LoadItemIcon1(globalCtx, i); } } @@ -1679,10 +1678,10 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { } return ITEM_NONE; } else if ((item == ITEM_HEART_PIECE_2) || (item == ITEM_HEART_PIECE)) { - gSaveContext.quest_items += 0x10000000; + gSaveContext.questItems += (1 << QUEST_HEART_PIECE); return ITEM_NONE; } else if (item == ITEM_HEART_CONTAINER) { - gSaveContext.health_capacity += 0x10; + gSaveContext.healthCapacity += 0x10; gSaveContext.health += 0x10; return ITEM_NONE; } else if (item == ITEM_HEART) { @@ -1697,8 +1696,8 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { func_80087708(globalCtx, 12, 5); - if (!(gSaveContext.inf_table[25] & 0x100)) { - gSaveContext.inf_table[25] |= 0x100; + if (!(gSaveContext.infTable[25] & 0x100)) { + gSaveContext.infTable[25] |= 0x100; return ITEM_NONE; } @@ -1710,8 +1709,8 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { func_80087708(globalCtx, 24, 5); - if (!(gSaveContext.inf_table[25] & 0x100)) { - gSaveContext.inf_table[25] |= 0x100; + if (!(gSaveContext.infTable[25] & 0x100)) { + gSaveContext.infTable[25] |= 0x100; return ITEM_NONE; } @@ -1739,21 +1738,21 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { if (gSaveContext.items[bottleSlot + i] == ITEM_BOTTLE) { // Translates to: "Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d Empty Bottle=%d Content=%d" osSyncPrintf("Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d 空瓶=%d 中味=%d\n", - gSaveContext.equips.c_button_slots[0], gSaveContext.equips.c_button_slots[1], - gSaveContext.equips.c_button_slots[2], bottleSlot + i, item); + gSaveContext.equips.cButtonSlots[0], gSaveContext.equips.cButtonSlots[1], + gSaveContext.equips.cButtonSlots[2], bottleSlot + i, item); - if ((bottleSlot + i) == gSaveContext.equips.c_button_slots[0]) { - gSaveContext.equips.button_items[1] = item; + if ((bottleSlot + i) == gSaveContext.equips.cButtonSlots[0]) { + gSaveContext.equips.buttonItems[1] = item; Interface_LoadItemIcon2(globalCtx, 1); - gSaveContext.button_status[1] = BTN_ENABLED; - } else if ((bottleSlot + i) == gSaveContext.equips.c_button_slots[1]) { - gSaveContext.equips.button_items[2] = item; + gSaveContext.buttonStatus[1] = BTN_ENABLED; + } else if ((bottleSlot + i) == gSaveContext.equips.cButtonSlots[1]) { + gSaveContext.equips.buttonItems[2] = item; Interface_LoadItemIcon2(globalCtx, 2); - gSaveContext.button_status[2] = BTN_ENABLED; - } else if ((bottleSlot + i) == gSaveContext.equips.c_button_slots[2]) { - gSaveContext.equips.button_items[3] = item; + gSaveContext.buttonStatus[2] = BTN_ENABLED; + } else if ((bottleSlot + i) == gSaveContext.equips.cButtonSlots[2]) { + gSaveContext.equips.buttonItems[3] = item; Interface_LoadItemIcon1(globalCtx, 3); - gSaveContext.button_status[3] = BTN_ENABLED; + gSaveContext.buttonStatus[3] = BTN_ENABLED; } gSaveContext.items[bottleSlot + i] = item; @@ -1770,7 +1769,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { } } else if ((item >= ITEM_WEIRD_EGG) && (item <= ITEM_CLAIM_CHECK)) { if (item == ITEM_SAW) { - gSaveContext.item_get_inf[1] |= 0x8000; + gSaveContext.itemGetInf[1] |= 0x8000; } prevTradeItem = INV_CONTENT(item); @@ -1778,12 +1777,12 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { if (prevTradeItem != ITEM_NONE) { for (i = 1; i < 4; i++) { - if (prevTradeItem == gSaveContext.equips.button_items[i]) { + if (prevTradeItem == gSaveContext.equips.buttonItems[i]) { if (item != ITEM_SOLD_OUT) { - gSaveContext.equips.button_items[i] = item; + gSaveContext.equips.buttonItems[i] = item; Interface_LoadItemIcon1(globalCtx, i); } else { - gSaveContext.equips.button_items[i] = ITEM_NONE; + gSaveContext.equips.buttonItems[i] = ITEM_NONE; } return ITEM_NONE; } @@ -1878,7 +1877,7 @@ u8 Item_CheckObtainability(u8 item) { } else if (item == ITEM_LONGSHOT) { return ITEM_NONE; } else if ((item == ITEM_SEEDS) || (item == ITEM_SEEDS_30)) { - if (!(gSaveContext.item_get_inf[1] & 0x8)) { + if (!(gSaveContext.itemGetInf[1] & 0x8)) { return ITEM_NONE; } else { return ITEM_SEEDS; @@ -1893,8 +1892,8 @@ u8 Item_CheckObtainability(u8 item) { return ITEM_HEART; } else if ((item == ITEM_MAGIC_SMALL) || (item == ITEM_MAGIC_LARGE)) { // Translates to: "Magic Pot Get_Inf_Table( 25, 0x0100)=%d" - osSyncPrintf("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", gSaveContext.inf_table[25] & 0x100); - if (!(gSaveContext.inf_table[25] & 0x100)) { + osSyncPrintf("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", gSaveContext.infTable[25] & 0x100); + if (!(gSaveContext.infTable[25] & 0x100)) { return ITEM_NONE; } else { return item; @@ -1935,7 +1934,7 @@ void Inventory_DeleteItem(u16 item, u16 invSlot) { s16 i; if (item == ITEM_BEAN) { - BEANS_BOUGHT = 0; // Beans bought + BEANS_BOUGHT = 0; } gSaveContext.items[invSlot] = ITEM_NONE; @@ -1943,9 +1942,9 @@ void Inventory_DeleteItem(u16 item, u16 invSlot) { osSyncPrintf("\nItem_Register(%d)\n", invSlot, gSaveContext.items[invSlot]); for (i = 1; i < 4; i++) { - if (gSaveContext.equips.button_items[i] == item) { - gSaveContext.equips.button_items[i] = ITEM_NONE; - gSaveContext.equips.c_button_slots[i - 1] = SLOT_NONE; + if (gSaveContext.equips.buttonItems[i] == item) { + gSaveContext.equips.buttonItems[i] = ITEM_NONE; + gSaveContext.equips.cButtonSlots[i - 1] = SLOT_NONE; } } } @@ -1962,8 +1961,8 @@ s32 Inventory_ReplaceItem(GlobalContext* globalCtx, u16 oldItem, u16 newItem) { // Translates to: "Item Purge (%d)" osSyncPrintf("アイテム消去(%d)", i); for (j = 1; j < 4; j++) { - if (gSaveContext.equips.button_items[j] == oldItem) { - gSaveContext.equips.button_items[j] = newItem; + if (gSaveContext.equips.buttonItems[j] == oldItem) { + gSaveContext.equips.buttonItems[j] = newItem; Interface_LoadItemIcon1(globalCtx, j); break; } @@ -2014,24 +2013,24 @@ s32 Inventory_HasSpecificBottle(u8 bottleItem) { // save context pointer isn't reused after Interface_LoadItemIcon1 when it should be void Inventory_UpdateBottleItem(GlobalContext* globalCtx, u8 item, u8 cButton) { osSyncPrintf("item_no=%x, c_no=%x, Pt=%x Item_Register=%x\n", item, cButton, - gSaveContext.equips.c_button_slots[cButton - 1], - gSaveContext.items[gSaveContext.equips.c_button_slots[cButton - 1]]); + gSaveContext.equips.cButtonSlots[cButton - 1], + gSaveContext.items[gSaveContext.equips.cButtonSlots[cButton - 1]]); // Special case to only empty half of a Lon Lon Milk Bottle - if ((gSaveContext.items[gSaveContext.equips.c_button_slots[cButton - 1]] == ITEM_MILK_BOTTLE) && + if ((gSaveContext.items[gSaveContext.equips.cButtonSlots[cButton - 1]] == ITEM_MILK_BOTTLE) && (item == ITEM_BOTTLE)) { item = ITEM_MILK_HALF; } - gSaveContext.items[gSaveContext.equips.c_button_slots[cButton - 1]] = item; - gSaveContext.equips.button_items[cButton] = item; + gSaveContext.items[gSaveContext.equips.cButtonSlots[cButton - 1]] = item; + gSaveContext.equips.buttonItems[cButton] = item; if (1) {} // Improves codegen but may not be necessary Interface_LoadItemIcon1(globalCtx, cButton); globalCtx->pauseCtx.unk_23E = item; - gSaveContext.button_status[0] = BTN_ENABLED; + gSaveContext.buttonStatus[0] = BTN_ENABLED; } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Inventory_UpdateBottleItem.s") @@ -2049,10 +2048,10 @@ s32 Inventory_ConsumeFairy(GlobalContext* globalCtx) { for (i = 0; i < 4; i++) { if (gSaveContext.items[bottleSlot + i] == ITEM_FAIRY) { for (j = 1; j < 4; j++) { - if (gSaveContext.equips.button_items[j] == ITEM_FAIRY) { - gSaveContext.equips.button_items[j] = ITEM_BOTTLE; + if (gSaveContext.equips.buttonItems[j] == ITEM_FAIRY) { + gSaveContext.equips.buttonItems[j] = ITEM_BOTTLE; Interface_LoadItemIcon1(globalCtx, j); - bottleSlot = gSaveContext.equips.c_button_slots[j - 1]; + bottleSlot = gSaveContext.equips.cButtonSlots[j - 1]; break; } } @@ -2176,13 +2175,13 @@ s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange) { // Translates to: "＊＊＊＊＊ Fluctuation=%d (now=%d, max=%d) ＊＊＊" osSyncPrintf("＊＊＊＊＊ 増減=%d (now=%d, max=%d) ＊＊＊", healthChange, gSaveContext.health, - gSaveContext.health_capacity); + gSaveContext.healthCapacity); // clang-format off // NOLINTNEXTLINE if (healthChange > 0) Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - else if ((gSaveContext.double_defense != 0) && (healthChange < 0)) { + else if ((gSaveContext.doubleDefense != 0) && (healthChange < 0)) { healthChange >>= 1; // Translates to: "Heart decrease halved!!＝%d" osSyncPrintf("ハート減少半分！！＝%d\n", healthChange); @@ -2191,8 +2190,8 @@ s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange) { gSaveContext.health += healthChange; - if (gSaveContext.health > gSaveContext.health_capacity) { - gSaveContext.health = gSaveContext.health_capacity; + if (gSaveContext.health > gSaveContext.healthCapacity) { + gSaveContext.health = gSaveContext.healthCapacity; } heartCount = gSaveContext.health % 0x10; @@ -2220,11 +2219,11 @@ s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange) { } void Health_GiveHearts(s16 hearts) { - gSaveContext.health_capacity += hearts * 0x10; + gSaveContext.healthCapacity += hearts * 0x10; } void Rupees_ChangeBy(s16 rupeeChange) { - gSaveContext.rupee_accumulator += rupeeChange; + gSaveContext.rupeeAccumulator += rupeeChange; } void Inventory_ChangeAmmo(s16 item, s16 ammoChange) { @@ -2288,9 +2287,9 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) { } void func_80087680(GlobalContext* globalCtx) { - if (gSaveContext.magic_acquired) { + if (gSaveContext.magicAcquired) { gSaveContext.unk_13F2 = gSaveContext.unk_13F0; - gSaveContext.unk_13F6 = (gSaveContext.double_magic * 0x30) + 0x30; + gSaveContext.unk_13F6 = (gSaveContext.doubleMagic * 0x30) + 0x30; gSaveContext.unk_13F0 = 9; } } @@ -2305,7 +2304,7 @@ void func_800876C8(GlobalContext* globalCtx) { } s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2) { - if (!gSaveContext.magic_acquired) { + if (!gSaveContext.magicAcquired) { return 0; } @@ -2404,7 +2403,7 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { switch (gSaveContext.unk_13F0) { case 8: - maxMagic = gSaveContext.magic_level * 0x30; + maxMagic = gSaveContext.magicLevel * 0x30; if (gSaveContext.unk_13F4 != maxMagic) { if (gSaveContext.unk_13F4 < maxMagic) { gSaveContext.unk_13F4 += 8; @@ -2424,7 +2423,7 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { case 9: gSaveContext.magic += 4; - if (gSaveContext.game_mode == 0 && gSaveContext.scene_setup_index < 4) { + if (gSaveContext.gameMode == 0 && gSaveContext.sceneSetupIndex < 4) { Audio_PlaySoundGeneral(0x401F, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } @@ -2498,11 +2497,11 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { case 7: if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && (globalCtx->msgCtx.msgMode == 0) && (globalCtx->unk_10A20 == 0) && (globalCtx->sceneLoadFlag == 0) && - (globalCtx->unk_1241B == 0) && (func_800BFC84(globalCtx) == 0)) { + (globalCtx->unk_1241B == 0) && !Gameplay_InCsMode(globalCtx)) { if ((gSaveContext.magic == 0) || ((func_8008F2F8(globalCtx) >= 2) && (func_8008F2F8(globalCtx) < 5)) || - ((gSaveContext.equips.button_items[1] != ITEM_LENS) && - (gSaveContext.equips.button_items[2] != ITEM_LENS) && - (gSaveContext.equips.button_items[3] != ITEM_LENS)) || + ((gSaveContext.equips.buttonItems[1] != ITEM_LENS) && + (gSaveContext.equips.buttonItems[2] != ITEM_LENS) && + (gSaveContext.equips.buttonItems[3] != ITEM_LENS)) || (globalCtx->actorCtx.unk_03 == 0)) { globalCtx->actorCtx.unk_03 = 0; Audio_PlaySoundGeneral(NA_SE_SY_GLASSMODE_OFF, &D_801333D4, 4, &D_801333E0, &D_801333E0, @@ -2588,8 +2587,8 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 2650); - if (gSaveContext.magic_level != 0) { - if (gSaveContext.health_capacity > 0xA0) { + if (gSaveContext.magicLevel != 0) { + if (gSaveContext.healthCapacity > 0xA0) { magicBarY = R_MAGIC_BAR_LARGE_Y; } else { magicBarY = R_MAGIC_BAR_SMALL_Y; @@ -2665,38 +2664,38 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { } void func_80088AA0(s16 arg0) { - gSaveContext.timer_x[1] = 140; - gSaveContext.timer_y[1] = 80; + gSaveContext.timerX[1] = 140; + gSaveContext.timerY[1] = 80; D_80125A5C = 0; - gSaveContext.timer_2_value = arg0; + gSaveContext.timer2Value = arg0; if (arg0 != 0) { - gSaveContext.timer_2_state = 1; + gSaveContext.timer2State = 1; } else { - gSaveContext.timer_2_state = 7; + gSaveContext.timer2State = 7; } } void func_80088AF0(GlobalContext* globalCtx) { - if (gSaveContext.timer_2_state != 0) { - if (gSaveContext.event_inf[1] & 1) { - gSaveContext.timer_2_value = 239; + if (gSaveContext.timer2State != 0) { + if (gSaveContext.eventInf[1] & 1) { + gSaveContext.timer2Value = 239; } else { - gSaveContext.timer_2_value = 1; + gSaveContext.timer2Value = 1; } } } void func_80088B34(s16 arg0) { - gSaveContext.timer_x[0] = 140; - gSaveContext.timer_y[0] = 80; + gSaveContext.timerX[0] = 140; + gSaveContext.timerY[0] = 80; D_80125A5C = 0; - gSaveContext.timer_1_value = arg0; + gSaveContext.timer1Value = arg0; if (arg0 != 0) { - gSaveContext.timer_1_state = 5; + gSaveContext.timer1State = 5; } else { - gSaveContext.timer_1_state = 11; + gSaveContext.timer1State = 11; } } @@ -2862,7 +2861,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { // Empty C Button Arrows for (i = 1; i < 4; i++) { - if (gSaveContext.equips.button_items[i] > 0xF0) { + if (gSaveContext.equips.buttonItems[i] > 0xF0) { if (i == 1) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), interfaceCtx->cLeftAlpha); @@ -2915,7 +2914,7 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3105); - item = gSaveContext.equips.button_items[button]; + item = gSaveContext.equips.buttonItems[button]; if ((item == ITEM_STICK) || (item == ITEM_NUT) || (item == ITEM_BOMB) || (item == ITEM_BOW) || ((item >= ITEM_BOW_ARROW_FIRE) && (item <= ITEM_BOW_ARROW_LIGHT)) || (item == ITEM_SLINGSHOT) || @@ -2928,7 +2927,7 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { gDPPipeSync(gfxCtx->overlay.p++); - if ((button == 0) && (gSaveContext.minigame_state == 1)) { + if ((button == 0) && (gSaveContext.minigameState == 1)) { ammo = globalCtx->interfaceCtx.hbaAmmo; } else if ((button == 0) && (globalCtx->unk_11E5C >= 2)) { ammo = globalCtx->unk_11E5C - 1; @@ -3075,7 +3074,7 @@ void Interface_InitVertices(GlobalContext* globalCtx) { // clang-format on } -void func_8008A8B8(GlobalContext* globalCtx, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { +void func_8008A8B8(GlobalContext* globalCtx, s32 topY, s32 bottomY, s32 leftX, s32 rightX) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; Vec3f sp40; Vec3f sp34; @@ -3087,24 +3086,24 @@ void func_8008A8B8(GlobalContext* globalCtx, s32 arg1, s32 arg2, s32 arg3, s32 a sp28.x = sp28.z = 0.0f; sp28.y = 1.0f; func_800AA358(&interfaceCtx->view, &sp40, &sp34, &sp28); - interfaceCtx->unk_1DC[0] = arg1; - interfaceCtx->unk_1DC[1] = arg2; - interfaceCtx->unk_1DC[2] = arg3; - interfaceCtx->unk_1DC[3] = arg4; - func_800AA4FC(&interfaceCtx->view, interfaceCtx->unk_1DC); + interfaceCtx->viewport.topY = topY; + interfaceCtx->viewport.bottomY = bottomY; + interfaceCtx->viewport.leftX = leftX; + interfaceCtx->viewport.rightX = rightX; + View_SetViewport(&interfaceCtx->view, &interfaceCtx->viewport); func_800AA460(&interfaceCtx->view, 60.0f, 10.0f, 60.0f); func_800AB560(&interfaceCtx->view); } void func_8008A994(InterfaceContext* interfaceCtx) { - s32 sp18[4]; + Viewport viewport; // clang-format off - sp18[1] = SCREEN_HEIGHT; sp18[3] = SCREEN_WIDTH; - sp18[0] = 0; sp18[2] = 0; + viewport.bottomY = SCREEN_HEIGHT; viewport.rightX = SCREEN_WIDTH; + viewport.topY = 0; viewport.leftX = 0; // clang-format on - func_800AA4FC(&interfaceCtx->view, sp18); + View_SetViewport(&interfaceCtx->view, &viewport); func_800AB2C4(&interfaceCtx->view); } @@ -3186,7 +3185,7 @@ void Interface_Draw(GlobalContext* globalCtx) { case SCENE_GANON_SONOGO: case SCENE_GANONTIKA_SONOGO: case SCENE_TAKARAYA: - if (gSaveContext.dungeon_keys[gSaveContext.dungeon_index] >= 0) { + if (gSaveContext.dungeonKeys[gSaveContext.dungeonIndex] >= 0) { // Small Key Icon gDPPipeSync(gfxCtx->overlay.p++); gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xC8, 0xE6, 0xFF, interfaceCtx->magicAlpha); @@ -3201,7 +3200,7 @@ void Interface_Draw(GlobalContext* globalCtx) { PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); interfaceCtx->counterDigits[2] = 0; - interfaceCtx->counterDigits[3] = gSaveContext.dungeon_keys[gSaveContext.dungeon_index]; + interfaceCtx->counterDigits[3] = gSaveContext.dungeonKeys[gSaveContext.dungeonIndex]; while (interfaceCtx->counterDigits[3] >= 10) { interfaceCtx->counterDigits[2]++; @@ -3285,7 +3284,7 @@ void Interface_Draw(GlobalContext* globalCtx) { if (interfaceCtx->unk_1FA == 0) { // B Button Icon & possibly Ammo Count - if (gSaveContext.equips.button_items[0] != ITEM_NONE) { + if (gSaveContext.equips.buttonItems[0] != ITEM_NONE) { Interface_DrawItemIconTexture(globalCtx, (void*)(u32)interfaceCtx->icon_itemSegment, 0); if ((player->stateFlags1 & 0x00800000) || (globalCtx->unk_11E5C >= 2) || @@ -3327,7 +3326,7 @@ void Interface_Draw(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->overlay.p++); // C-Left Button Icon & Ammo Count - if (gSaveContext.equips.button_items[1] < 0xF0) { + if (gSaveContext.equips.buttonItems[1] < 0xF0) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->cLeftAlpha); gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); Interface_DrawItemIconTexture(globalCtx, (void*)((u32)interfaceCtx->icon_itemSegment + 0x1000), 1); @@ -3340,7 +3339,7 @@ void Interface_Draw(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->overlay.p++); // C-Down Button Icon & Ammo Count - if (gSaveContext.equips.button_items[2] < 0xF0) { + if (gSaveContext.equips.buttonItems[2] < 0xF0) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->cDownAlpha); gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); Interface_DrawItemIconTexture(globalCtx, (void*)((u32)interfaceCtx->icon_itemSegment + 0x2000), 2); @@ -3353,7 +3352,7 @@ void Interface_Draw(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->overlay.p++); // C-Right Button Icon & Ammo Count - if (gSaveContext.equips.button_items[3] < 0xF0) { + if (gSaveContext.equips.buttonItems[3] < 0xF0) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->cRightAlpha); gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); Interface_DrawItemIconTexture(globalCtx, (void*)((u32)interfaceCtx->icon_itemSegment + 0x3000), 3); @@ -3463,7 +3462,7 @@ void Interface_Draw(GlobalContext* globalCtx) { func_80094520(globalCtx->state.gfxCtx); if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0)) { - if (gSaveContext.minigame_state != 1) { + if (gSaveContext.minigameState != 1) { // Carrots rendering if the action corresponds to riding a horse if (interfaceCtx->unk_1EE == 8) { // Load Carrot Icon @@ -3536,36 +3535,36 @@ void Interface_Draw(GlobalContext* globalCtx) { } } - if ((gSaveContext.timer_2_state == 5) && (func_8010BDBC(&globalCtx->msgCtx) == 5)) { + if ((gSaveContext.timer2State == 5) && (func_8010BDBC(&globalCtx->msgCtx) == 5)) { // Trade quest timer reached 0 - gSaveContext.cutscene_index = 0; + gSaveContext.cutsceneIndex = 0; globalCtx->sceneLoadFlag = 0x14; - globalCtx->fadeOutTransition = 3; - gSaveContext.timer_2_state = 0; + globalCtx->fadeTransition = 3; + gSaveContext.timer2State = 0; D_8015FFE6 = 40; - if ((gSaveContext.equips.button_items[0] != ITEM_SWORD_KOKIRI) && - (gSaveContext.equips.button_items[0] != ITEM_SWORD_MASTER) && - (gSaveContext.equips.button_items[0] != ITEM_SWORD_BGS) && - (gSaveContext.equips.button_items[0] != ITEM_SWORD_KNIFE)) { - if (gSaveContext.button_status[0] != BTN_ENABLED) { - gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; + if ((gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI) && + (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER) && + (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BGS) && + (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KNIFE)) { + if (gSaveContext.buttonStatus[0] != BTN_ENABLED) { + gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0]; } else { - gSaveContext.equips.button_items[0] = ITEM_NONE; + gSaveContext.equips.buttonItems[0] = ITEM_NONE; } } // Revert any spoiling trade quest items for (phi_s3 = 0; phi_s3 < ARRAY_COUNT(gSpoilingItems); phi_s3++) { if (INV_CONTENT(ITEM_POCKET_EGG) == gSpoilingItems[phi_s3]) { - gSaveContext.event_inf[0] &= 0x7F80; - osSyncPrintf("EVENT_INF=%x\n", gSaveContext.event_inf[0]); + gSaveContext.eventInf[0] &= 0x7F80; + osSyncPrintf("EVENT_INF=%x\n", gSaveContext.eventInf[0]); globalCtx->nextEntranceIndex = sSpoilingItemEntrances[phi_s3]; INV_CONTENT(gSpoilingItemReverts[phi_s3]) = gSpoilingItemReverts[phi_s3]; for (phi_s0 = 1; phi_s0 < 4; phi_s0++) { - if (gSaveContext.equips.button_items[phi_s0] == gSpoilingItems[phi_s3]) { - gSaveContext.equips.button_items[phi_s0] = gSpoilingItemReverts[phi_s3]; + if (gSaveContext.equips.buttonItems[phi_s0] == gSpoilingItems[phi_s3]) { + gSaveContext.equips.buttonItems[phi_s0] = gSpoilingItemReverts[phi_s3]; Interface_LoadItemIcon1(globalCtx, phi_s0); } } @@ -3575,30 +3574,30 @@ void Interface_Draw(GlobalContext* globalCtx) { if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && (globalCtx->unk_10A20 == 0) && (msgCtx->msgMode == 0) && !(player->stateFlags2 & 0x01000000) && (globalCtx->sceneLoadFlag == 0) && - (globalCtx->unk_1241B == 0) && (func_800BFC84(globalCtx) == 0) && (gSaveContext.minigame_state != 1) && + (globalCtx->unk_1241B == 0) && !Gameplay_InCsMode(globalCtx) && (gSaveContext.minigameState != 1) && (globalCtx->unk_11E5C < 2) && !((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38))) { sp274 = 0; - switch (gSaveContext.timer_1_state) { + switch (gSaveContext.timer1State) { case 1: - gSaveContext.timer_1_state = 2; - gSaveContext.timer_1_value = gSaveContext.health >> 1; + gSaveContext.timer1State = 2; + gSaveContext.timer1Value = gSaveContext.health >> 1; D_8015FFE0 = D_8015FFE2 = 20; break; case 2: D_8015FFE2--; if (D_8015FFE2 == 0) { - gSaveContext.timer_1_state = 3; + gSaveContext.timer1State = 3; D_8015FFE2 = 20; } break; case 5: case 11: D_8015FFE0 = D_8015FFE2 = 20; - if (gSaveContext.timer_1_state == 5) { - gSaveContext.timer_1_state = 6; + if (gSaveContext.timer1State == 5) { + gSaveContext.timer1State = 6; } else { - gSaveContext.timer_1_state = 12; + gSaveContext.timer1State = 12; } break; case 6: @@ -3606,74 +3605,74 @@ void Interface_Draw(GlobalContext* globalCtx) { D_8015FFE2--; if (D_8015FFE2 == 0) { D_8015FFE2 = 20; - if (gSaveContext.timer_1_state == 6) { - gSaveContext.timer_1_state = 7; + if (gSaveContext.timer1State == 6) { + gSaveContext.timer1State = 7; } else { - gSaveContext.timer_1_state = 13; + gSaveContext.timer1State = 13; } } break; case 3: case 7: - phi_s3 = (gSaveContext.timer_x[0] - 26) / D_8015FFE2; - gSaveContext.timer_x[0] -= phi_s3; + phi_s3 = (gSaveContext.timerX[0] - 26) / D_8015FFE2; + gSaveContext.timerX[0] -= phi_s3; - if (gSaveContext.health_capacity > 0xA0) { - phi_s3 = (gSaveContext.timer_y[0] - 54) / D_8015FFE2; + if (gSaveContext.healthCapacity > 0xA0) { + phi_s3 = (gSaveContext.timerY[0] - 54) / D_8015FFE2; } else { - phi_s3 = (gSaveContext.timer_y[0] - 46) / D_8015FFE2; + phi_s3 = (gSaveContext.timerY[0] - 46) / D_8015FFE2; } - gSaveContext.timer_y[0] -= phi_s3; + gSaveContext.timerY[0] -= phi_s3; D_8015FFE2--; if (D_8015FFE2 == 0) { - gSaveContext.timer_x[0] = 26; + gSaveContext.timerX[0] = 26; D_8015FFE2 = 20; - if (gSaveContext.health_capacity > 0xA0) { - gSaveContext.timer_y[0] = 54; + if (gSaveContext.healthCapacity > 0xA0) { + gSaveContext.timerY[0] = 54; } else { - gSaveContext.timer_y[0] = 46; + gSaveContext.timerY[0] = 46; } - if (gSaveContext.timer_1_state == 3) { - gSaveContext.timer_1_state = 4; + if (gSaveContext.timer1State == 3) { + gSaveContext.timer1State = 4; } else { - gSaveContext.timer_1_state = 8; + gSaveContext.timer1State = 8; } } case 4: case 8: - if ((gSaveContext.timer_1_state == 4) || (gSaveContext.timer_1_state == 8)) { - if (gSaveContext.health_capacity > 0xA0) { - gSaveContext.timer_y[0] = 54; + if ((gSaveContext.timer1State == 4) || (gSaveContext.timer1State == 8)) { + if (gSaveContext.healthCapacity > 0xA0) { + gSaveContext.timerY[0] = 54; } else { - gSaveContext.timer_y[0] = 46; + gSaveContext.timerY[0] = 46; } } - if ((gSaveContext.timer_1_state >= 3) && (msgCtx->unk_E300 == 0)) { + if ((gSaveContext.timer1State >= 3) && (msgCtx->unk_E300 == 0)) { D_8015FFE0--; if (D_8015FFE0 == 0) { - if (gSaveContext.timer_1_value != 0) { - gSaveContext.timer_1_value--; + if (gSaveContext.timer1Value != 0) { + gSaveContext.timer1Value--; } D_8015FFE0 = 20; - if (gSaveContext.timer_1_value == 0) { - gSaveContext.timer_1_state = 10; + if (gSaveContext.timer1Value == 0) { + gSaveContext.timer1State = 10; if (D_80125A5C != 0) { gSaveContext.health = 0; globalCtx->unk_11D58(globalCtx, -(gSaveContext.health + 2)); } D_80125A5C = 0; - } else if (gSaveContext.timer_1_value > 60) { + } else if (gSaveContext.timer1Value > 60) { if (sTimerDigits[4] == 1) { Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } - } else if (gSaveContext.timer_1_value >= 11) { + } else if (gSaveContext.timer1Value >= 11) { if (sTimerDigits[4] & 1) { Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); @@ -3686,46 +3685,46 @@ void Interface_Draw(GlobalContext* globalCtx) { } break; case 13: - phi_s3 = (gSaveContext.timer_x[0] - 26) / D_8015FFE2; - gSaveContext.timer_x[0] -= phi_s3; + phi_s3 = (gSaveContext.timerX[0] - 26) / D_8015FFE2; + gSaveContext.timerX[0] -= phi_s3; - if (gSaveContext.health_capacity > 0xA0) { - phi_s3 = (gSaveContext.timer_y[0] - 54) / D_8015FFE2; + if (gSaveContext.healthCapacity > 0xA0) { + phi_s3 = (gSaveContext.timerY[0] - 54) / D_8015FFE2; } else { - phi_s3 = (gSaveContext.timer_y[0] - 46) / D_8015FFE2; + phi_s3 = (gSaveContext.timerY[0] - 46) / D_8015FFE2; } - gSaveContext.timer_y[0] -= phi_s3; + gSaveContext.timerY[0] -= phi_s3; D_8015FFE2--; if (D_8015FFE2 == 0) { - gSaveContext.timer_x[0] = 26; + gSaveContext.timerX[0] = 26; D_8015FFE2 = 20; - if (gSaveContext.health_capacity > 0xA0) { - gSaveContext.timer_y[0] = 54; + if (gSaveContext.healthCapacity > 0xA0) { + gSaveContext.timerY[0] = 54; } else { - gSaveContext.timer_y[0] = 46; + gSaveContext.timerY[0] = 46; } - gSaveContext.timer_1_state = 14; + gSaveContext.timer1State = 14; } case 14: - if (gSaveContext.timer_1_state == 14) { - if (gSaveContext.health_capacity > 0xA0) { - gSaveContext.timer_y[0] = 54; + if (gSaveContext.timer1State == 14) { + if (gSaveContext.healthCapacity > 0xA0) { + gSaveContext.timerY[0] = 54; } else { - gSaveContext.timer_y[0] = 46; + gSaveContext.timerY[0] = 46; } } - if (gSaveContext.timer_1_state >= 3) { + if (gSaveContext.timer1State >= 3) { D_8015FFE0--; if (D_8015FFE0 == 0) { - gSaveContext.timer_1_value++; + gSaveContext.timer1Value++; D_8015FFE0 = 20; - if (gSaveContext.timer_1_value == 3599) { - gSaveContext.timer_1_state = 15; + if (gSaveContext.timer1Value == 3599) { + gSaveContext.timer1State = 15; D_8015FFE2 = 40; } else { Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0, @@ -3735,36 +3734,36 @@ void Interface_Draw(GlobalContext* globalCtx) { } break; case 10: - if (gSaveContext.timer_2_state != 0) { - gSaveContext.timer_x[1] = 140; - gSaveContext.timer_y[1] = 80; + if (gSaveContext.timer2State != 0) { + gSaveContext.timerX[1] = 140; + gSaveContext.timerY[1] = 80; D_8015FFE4 = D_8015FFE6 = 20; - if (gSaveContext.timer_2_state < 7) { - gSaveContext.timer_2_state = 2; + if (gSaveContext.timer2State < 7) { + gSaveContext.timer2State = 2; } else { - gSaveContext.timer_2_state = 8; + gSaveContext.timer2State = 8; } - gSaveContext.timer_1_state = 0; + gSaveContext.timer1State = 0; } else { - gSaveContext.timer_1_state = 0; + gSaveContext.timer1State = 0; } break; case 15: break; default: sp274 = 1; - switch (gSaveContext.timer_2_state) { + switch (gSaveContext.timer2State) { case 1: case 7: - gSaveContext.timer_x[1] = 140; - gSaveContext.timer_y[1] = 80; + gSaveContext.timerX[1] = 140; + gSaveContext.timerY[1] = 80; D_8015FFE4 = D_8015FFE6 = 20; - if (gSaveContext.timer_2_state == 1) { - gSaveContext.timer_2_state = 2; + if (gSaveContext.timer2State == 1) { + gSaveContext.timer2State = 2; } else { - gSaveContext.timer_2_state = 8; + gSaveContext.timer2State = 8; } break; case 2: @@ -3772,85 +3771,85 @@ void Interface_Draw(GlobalContext* globalCtx) { D_8015FFE6--; if (D_8015FFE6 == 0) { D_8015FFE6 = 20; - if (gSaveContext.timer_2_state == 2) { - gSaveContext.timer_2_state = 3; + if (gSaveContext.timer2State == 2) { + gSaveContext.timer2State = 3; } else { - gSaveContext.timer_2_state = 9; + gSaveContext.timer2State = 9; } } break; case 3: case 9: - osSyncPrintf("event_xp[1]=%d, event_yp[1]=%d TOTAL_EVENT_TM=%d\n", - gSaveContext.timer_x[1], gSaveContext.timer_y[1], gSaveContext.timer_2_value); + osSyncPrintf("event_xp[1]=%d, event_yp[1]=%d TOTAL_EVENT_TM=%d\n", gSaveContext.timerX[1], + gSaveContext.timerY[1], gSaveContext.timer2Value); - phi_s3 = (gSaveContext.timer_x[1] - 26) / D_8015FFE2; - gSaveContext.timer_x[1] -= phi_s3; + phi_s3 = (gSaveContext.timerX[1] - 26) / D_8015FFE2; + gSaveContext.timerX[1] -= phi_s3; - if (gSaveContext.health_capacity > 0xA0) { - phi_s3 = (gSaveContext.timer_y[1] - 54) / D_8015FFE6; + if (gSaveContext.healthCapacity > 0xA0) { + phi_s3 = (gSaveContext.timerY[1] - 54) / D_8015FFE6; } else { - phi_s3 = (gSaveContext.timer_y[1] - 46) / D_8015FFE6; + phi_s3 = (gSaveContext.timerY[1] - 46) / D_8015FFE6; } - gSaveContext.timer_y[1] -= phi_s3; + gSaveContext.timerY[1] -= phi_s3; D_8015FFE6--; if (D_8015FFE6 == 0) { - gSaveContext.timer_x[1] = 26; + gSaveContext.timerX[1] = 26; D_8015FFE6 = 20; - if (gSaveContext.health_capacity > 0xA0) { - gSaveContext.timer_y[1] = 54; + if (gSaveContext.healthCapacity > 0xA0) { + gSaveContext.timerY[1] = 54; } else { - gSaveContext.timer_y[1] = 46; + gSaveContext.timerY[1] = 46; } - if (gSaveContext.timer_2_state == 3) { - gSaveContext.timer_2_state = 4; + if (gSaveContext.timer2State == 3) { + gSaveContext.timer2State = 4; } else { - gSaveContext.timer_2_state = 10; + gSaveContext.timer2State = 10; } } case 4: case 10: - if ((gSaveContext.timer_2_state == 4) || (gSaveContext.timer_2_state == 10)) { - if (gSaveContext.health_capacity > 0xA0) { - gSaveContext.timer_y[1] = 54; + if ((gSaveContext.timer2State == 4) || (gSaveContext.timer2State == 10)) { + if (gSaveContext.healthCapacity > 0xA0) { + gSaveContext.timerY[1] = 54; } else { - gSaveContext.timer_y[1] = 46; + gSaveContext.timerY[1] = 46; } } - if (gSaveContext.timer_2_state >= 3) { + if (gSaveContext.timer2State >= 3) { D_8015FFE4--; if (D_8015FFE4 == 0) { D_8015FFE4 = 20; - if (gSaveContext.timer_2_state == 4) { - gSaveContext.timer_2_value--; - osSyncPrintf("TOTAL_EVENT_TM=%d\n", gSaveContext.timer_2_value); + if (gSaveContext.timer2State == 4) { + gSaveContext.timer2Value--; + osSyncPrintf("TOTAL_EVENT_TM=%d\n", gSaveContext.timer2Value); - if (gSaveContext.timer_2_value <= 0) { + if (gSaveContext.timer2Value <= 0) { if (!Flags_GetSwitch(globalCtx, 0x37) || ((globalCtx->sceneNum != SCENE_GANON_DEMO) && (globalCtx->sceneNum != SCENE_GANON_FINAL) && (globalCtx->sceneNum != SCENE_GANON_SONOGO) && (globalCtx->sceneNum != SCENE_GANONTIKA_SONOGO))) { - gSaveContext.timer_2_state = 5; - gSaveContext.cutscene_index = 0; + gSaveContext.timer2State = 5; + gSaveContext.cutsceneIndex = 0; D_8015FFE6 = 40; func_8010B680(globalCtx, 0x71B0, 0); func_8002DF54(globalCtx, 0, 8); } else { - gSaveContext.timer_2_state = 6; + gSaveContext.timer2State = 6; D_8015FFE6 = 40; } } else { - if (gSaveContext.timer_2_value > 60) { + if (gSaveContext.timer2Value > 60) { if (sTimerDigits[4] == 1) { Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } - } else if (gSaveContext.timer_2_value > 10) { + } else if (gSaveContext.timer2Value > 10) { if (sTimerDigits[4] & 1) { Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); @@ -3861,17 +3860,17 @@ void Interface_Draw(GlobalContext* globalCtx) { } } } else { - gSaveContext.timer_2_value++; - if (gSaveContext.event_inf[1] & 1) { - if (gSaveContext.timer_2_value == 240) { + gSaveContext.timer2Value++; + if (gSaveContext.eventInf[1] & 1) { + if (gSaveContext.timer2Value == 240) { func_8010B680(globalCtx, 0x6083, 0); - gSaveContext.timer_2_state = 0; - gSaveContext.event_inf[1] &= ~1; + gSaveContext.timer2State = 0; + gSaveContext.eventInf[1] &= ~1; } } } - if ((gSaveContext.timer_2_value % 60) == 0) { + if ((gSaveContext.timer2Value % 60) == 0) { Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } @@ -3881,21 +3880,21 @@ void Interface_Draw(GlobalContext* globalCtx) { case 6: D_8015FFE6--; if (D_8015FFE6 == 0) { - gSaveContext.timer_2_state = 0; + gSaveContext.timer2State = 0; } break; } } - if (((gSaveContext.timer_1_state != 0) && (gSaveContext.timer_1_state != 10)) || - (gSaveContext.timer_2_state != 0)) { + if (((gSaveContext.timer1State != 0) && (gSaveContext.timer1State != 10)) || + (gSaveContext.timer2State != 0)) { sTimerDigits[0] = sTimerDigits[1] = sTimerDigits[3] = 0; sTimerDigits[2] = 10; // digit 10 is used as ':' (colon) - if (gSaveContext.timer_1_state != 0) { - sTimerDigits[4] = gSaveContext.timer_1_value; + if (gSaveContext.timer1State != 0) { + sTimerDigits[4] = gSaveContext.timer1Value; } else { - sTimerDigits[4] = gSaveContext.timer_2_value; + sTimerDigits[4] = gSaveContext.timer2Value; } while (sTimerDigits[4] >= 60) { @@ -3916,21 +3915,21 @@ void Interface_Draw(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->overlay.p++); gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF); gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0x00); - gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02002000, 16, 16, gSaveContext.timer_x[sp274], - gSaveContext.timer_y[sp274] + 2, 16, 16, 1024, 1024); + gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02002000, 16, 16, gSaveContext.timerX[sp274], + gSaveContext.timerY[sp274] + 2, 16, 16, 1024, 1024); // Timer Counter gDPPipeSync(gfxCtx->overlay.p++); gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - if (gSaveContext.timer_1_state != 0) { - if ((gSaveContext.timer_1_value < 10) && (gSaveContext.timer_1_state < 11)) { + if (gSaveContext.timer1State != 0) { + if ((gSaveContext.timer1Value < 10) && (gSaveContext.timer1State < 11)) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0x32, 0x00, 0xFF); } else { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF); } } else { - if ((gSaveContext.timer_2_value < 10) && (gSaveContext.timer_2_state < 6)) { + if ((gSaveContext.timer2Value < 10) && (gSaveContext.timer2State < 6)) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0x32, 0x00, 0xFF); } else { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0x00, 0xFF); @@ -3939,8 +3938,8 @@ void Interface_Draw(GlobalContext* globalCtx) { for (phi_s3 = 0; phi_s3 < 5; phi_s3++) { gfxCtx->overlay.p = Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[sTimerDigits[phi_s3]], 8, 16, - gSaveContext.timer_x[sp274] + sTimerDigitLeftPos[phi_s3], - gSaveContext.timer_y[sp274], sDigitWidth[phi_s3], VREG(42), + gSaveContext.timerX[sp274] + sTimerDigitLeftPos[phi_s3], + gSaveContext.timerY[sp274], sDigitWidth[phi_s3], VREG(42), VREG(43) * 2, VREG(43) * 2); } } @@ -3994,8 +3993,8 @@ void Interface_Update(GlobalContext* globalCtx) { } if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0)) { - if ((gSaveContext.minigame_state == 1) || (gSaveContext.scene_setup_index < 4) || - ((globalCtx->sceneNum == SCENE_SPOT20) && (gSaveContext.scene_setup_index == 4))) { + if ((gSaveContext.minigameState == 1) || (gSaveContext.sceneSetupIndex < 4) || + ((globalCtx->sceneNum == SCENE_SPOT20) && (gSaveContext.sceneSetupIndex == 4))) { if ((msgCtx->msgMode == 0) || ((msgCtx->msgMode != 0) && (globalCtx->sceneNum == SCENE_BOWLING))) { if (globalCtx->unk_10A20 == 0) { func_80083108(globalCtx); @@ -4102,21 +4101,21 @@ void Interface_Update(GlobalContext* globalCtx) { func_8008226C(globalCtx); - if (gSaveContext.health_accumulator != 0) { - gSaveContext.health_accumulator -= 4; + if (gSaveContext.healthAccumulator != 0) { + gSaveContext.healthAccumulator -= 4; gSaveContext.health += 4; if ((gSaveContext.health & 0xF) < 4) { Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } - osSyncPrintf("now_life=%d max_life=%d\n", gSaveContext.health, gSaveContext.health_capacity); + osSyncPrintf("now_life=%d max_life=%d\n", gSaveContext.health, gSaveContext.healthCapacity); - if (gSaveContext.health >= gSaveContext.health_capacity) { - gSaveContext.health = gSaveContext.health_capacity; + if (gSaveContext.health >= gSaveContext.healthCapacity) { + gSaveContext.health = gSaveContext.healthCapacity; osSyncPrintf("S_Private.now_life=%d S_Private.max_life=%d\n", gSaveContext.health, - gSaveContext.health_capacity); - gSaveContext.health_accumulator = 0; + gSaveContext.healthCapacity); + gSaveContext.healthAccumulator = 0; } } @@ -4135,25 +4134,25 @@ void Interface_Update(GlobalContext* globalCtx) { Health_UpdateData(globalCtx); - if ((gSaveContext.timer_1_state >= 3) && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && + if ((gSaveContext.timer1State >= 3) && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && (msgCtx->msgMode == 0) && !(player->stateFlags2 & 0x01000000) && (globalCtx->sceneLoadFlag == 0) && - (globalCtx->unk_1241B == 0) && (func_800BFC84(globalCtx) == 0)) {} + (globalCtx->unk_1241B == 0) && !Gameplay_InCsMode(globalCtx)) {} - if (gSaveContext.rupee_accumulator != 0) { - if (gSaveContext.rupee_accumulator > 0) { + if (gSaveContext.rupeeAccumulator != 0) { + if (gSaveContext.rupeeAccumulator > 0) { if (gSaveContext.rupees < CUR_CAPACITY(UPG_WALLET)) { - gSaveContext.rupee_accumulator--; + gSaveContext.rupeeAccumulator--; gSaveContext.rupees++; Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } else { // Translates to: "Rupee Amount MAX = %d" osSyncPrintf("ルピー数ＭＡＸ = %d\n", CUR_CAPACITY(UPG_WALLET)); gSaveContext.rupees = CUR_CAPACITY(UPG_WALLET); - gSaveContext.rupee_accumulator = 0; + gSaveContext.rupeeAccumulator = 0; } } else if (gSaveContext.rupees != 0) { - if (gSaveContext.rupee_accumulator <= -50) { - gSaveContext.rupee_accumulator += 10; + if (gSaveContext.rupeeAccumulator <= -50) { + gSaveContext.rupeeAccumulator += 10; gSaveContext.rupees -= 10; if (gSaveContext.rupees < 0) { @@ -4162,12 +4161,12 @@ void Interface_Update(GlobalContext* globalCtx) { Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } else { - gSaveContext.rupee_accumulator++; + gSaveContext.rupeeAccumulator++; gSaveContext.rupees--; Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } } else { - gSaveContext.rupee_accumulator = 0; + gSaveContext.rupeeAccumulator = 0; } } @@ -4218,14 +4217,14 @@ void Interface_Update(GlobalContext* globalCtx) { if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && (msgCtx->msgMode == 0) && (globalCtx->sceneLoadFlag == 0) && (globalCtx->unk_10A20 == 0) && (globalCtx->unk_1241B == 0) && - ((globalCtx->csCtx.state == 0) || (func_8008E988(globalCtx) == 0))) { - if ((gSaveContext.magic_acquired != 0) && (gSaveContext.magic_level == 0)) { - gSaveContext.magic_level = gSaveContext.double_magic + 1; + ((globalCtx->csCtx.state == 0) || !func_8008E988(globalCtx))) { + if ((gSaveContext.magicAcquired != 0) && (gSaveContext.magicLevel == 0)) { + gSaveContext.magicLevel = gSaveContext.doubleMagic + 1; gSaveContext.unk_13F0 = 8; osSyncPrintf(VT_FGCOL(YELLOW)); // Translates to: "Magic Start!!!!!!!!!" osSyncPrintf("魔法スター─────ト！！！！！！！！！\n"); - osSyncPrintf("MAGIC_MAX=%d\n", gSaveContext.magic_level); + osSyncPrintf("MAGIC_MAX=%d\n", gSaveContext.magicLevel); osSyncPrintf("MAGIC_NOW=%d\n", gSaveContext.magic); osSyncPrintf("Z_MAGIC_NOW_NOW=%d\n", gSaveContext.unk_13F6); osSyncPrintf("Z_MAGIC_NOW_MAX=%d\n", gSaveContext.unk_13F4); @@ -4235,29 +4234,29 @@ void Interface_Update(GlobalContext* globalCtx) { Interface_UpdateMagicBar(globalCtx); } - if (gSaveContext.timer_1_state == 0) { + if (gSaveContext.timer1State == 0) { if (((D_80125A58 == 1) || (D_80125A58 == 2) || (D_80125A58 == 4)) && ((gSaveContext.health >> 1) != 0)) { - gSaveContext.timer_1_state = 1; - gSaveContext.timer_x[0] = 140; - gSaveContext.timer_y[0] = 80; + gSaveContext.timer1State = 1; + gSaveContext.timerX[0] = 140; + gSaveContext.timerY[0] = 80; D_80125A5C = 1; } } else { - if (((D_80125A58 == 0) || (D_80125A58 == 3)) && (gSaveContext.timer_1_state < 5)) { - gSaveContext.timer_1_state = 0; + if (((D_80125A58 == 0) || (D_80125A58 == 3)) && (gSaveContext.timer1State < 5)) { + gSaveContext.timer1State = 0; } } - if (gSaveContext.minigame_state == 1) { - gSaveContext.minigame_score += interfaceCtx->unk_23C; + if (gSaveContext.minigameState == 1) { + gSaveContext.minigameScore += interfaceCtx->unk_23C; interfaceCtx->unk_23C = 0; if (sHBAScoreTier == 0) { - if (gSaveContext.minigame_score >= 1000) { + if (gSaveContext.minigameScore >= 1000) { sHBAScoreTier++; } } else if (sHBAScoreTier == 1) { - if (gSaveContext.minigame_score >= 1500) { + if (gSaveContext.minigameScore >= 1500) { sHBAScoreTier++; } } @@ -4265,7 +4264,7 @@ void Interface_Update(GlobalContext* globalCtx) { sHBAScoreDigits[1] = 0; sHBAScoreDigits[0] = 0; sHBAScoreDigits[2] = 0; - sHBAScoreDigits[3] = gSaveContext.minigame_score; + sHBAScoreDigits[3] = gSaveContext.minigameScore; while (sHBAScoreDigits[3] >= 1000) { sHBAScoreDigits[0]++; @@ -4288,50 +4287,50 @@ void Interface_Update(GlobalContext* globalCtx) { globalCtx->msgCtx.unk_E3EE = 4; } - if (globalCtx->unk_10A26 != 0) { + if (globalCtx->envCtx.unk_02 != 0) { if (gSaveContext.unk_1422 != 2) { D_80125B60 = 0; - if ((gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time <= 0xC001)) { + if ((gSaveContext.dayTime >= 0x4555) && (gSaveContext.dayTime <= 0xC001)) { D_80125B60 = 1; } gSaveContext.unk_1422 = 2; D_80125B64 = D_8011FB40; D_8011FB40 = 400; - } else if ((D_80125B60 == 0) && (gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time <= 0xC001)) { + } else if ((D_80125B60 == 0) && (gSaveContext.dayTime >= 0x4555) && (gSaveContext.dayTime <= 0xC001)) { gSaveContext.unk_1422 = 0; D_8011FB40 = D_80125B64; globalCtx->msgCtx.unk_E3EE = 4; - } else if (gSaveContext.day_time > 0xC001) { + } else if (gSaveContext.dayTime > 0xC001) { gSaveContext.unk_1422 = 0; D_8011FB40 = D_80125B64; globalCtx->msgCtx.unk_E3EE = 4; } } else if ((globalCtx->roomCtx.curRoom.unk_03 != 1) && (interfaceCtx->restrictions.sunsSong != 3)) { - if ((gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time < 0xC001)) { - gSaveContext.next_day_time = 0; - globalCtx->fadeOutTransition = 4; - gSaveContext.transition_type = 2; + if ((gSaveContext.dayTime >= 0x4555) && (gSaveContext.dayTime < 0xC001)) { + gSaveContext.nextDayTime = 0; + globalCtx->fadeTransition = 4; + gSaveContext.nextTransition = 2; globalCtx->unk_11DE9 = 1; } else { - gSaveContext.next_day_time = 0x8001; - globalCtx->fadeOutTransition = 5; - gSaveContext.transition_type = 3; + gSaveContext.nextDayTime = 0x8001; + globalCtx->fadeTransition = 5; + gSaveContext.nextTransition = 3; globalCtx->unk_11DE9 = 1; } if (globalCtx->sceneNum == SCENE_SPOT13) { - globalCtx->fadeOutTransition = 0xE; - gSaveContext.transition_type = 0xE; + globalCtx->fadeTransition = 14; + gSaveContext.nextTransition = 14; } - gSaveContext.respawn_flag = -2; - globalCtx->nextEntranceIndex = gSaveContext.entrance_index; + gSaveContext.respawnFlag = -2; + globalCtx->nextEntranceIndex = gSaveContext.entranceIndex; globalCtx->sceneLoadFlag = 0x14; gSaveContext.unk_1422 = 0; func_800F6964(30); - gSaveContext.seq_index = 0xFF; - gSaveContext.night_sfx = 0xFF; + gSaveContext.seqIndex = 0xFF; + gSaveContext.nightSeqIndex = 0xFF; } else { gSaveContext.unk_1422 = 3; } diff --git a/src/code/z_play.c b/src/code/z_play.c index 99d454e6fb..647a310d28 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1,59 +1,1464 @@ #include #include +#include + +void* D_8012D1F0 = NULL; +UNK_TYPE D_8012D1F4 = 0; // unused +Input* D_8012D1F8 = NULL; + +TransitionStruct D_801613B0; +s32 D_80161490; +VisMonoStruct D_80161498; +Color_RGBA8 D_801614B0; +FaultClient D_801614B8; +s16 D_801614C8; +u64 D_801614D0[0xA00]; void func_800BC450(GlobalContext* globalCtx) { - func_8005A7A8(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], globalCtx->unk_1242B - 1, - globalCtx); + func_8005A7A8(globalCtx->cameraPtrs[globalCtx->activeCamera], globalCtx->unk_1242B - 1); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BC490.s") +void func_800BC490(GlobalContext* globalCtx, s16 point) { + if (!(point == 1 || point == 2)) { + __assert("point == 1 || point == 2", "../z_play.c", 2160); + } + + globalCtx->unk_1242B = point; + + if ((YREG(15) != 0x10) && (gSaveContext.cutsceneIndex < 0xFFF0)) { + Audio_PlaySoundGeneral((point == 1) ? NA_SE_SY_CAMERA_ZOOM_DOWN : NA_SE_SY_CAMERA_ZOOM_UP, &D_801333D4, 4, + &D_801333E0, &D_801333E0, &D_801333E8); + } + + func_800BC450(globalCtx); +} s32 func_800BC56C(GlobalContext* globalCtx, s16 arg1) { - return arg1 == globalCtx->unk_1242B; + return (arg1 == globalCtx->unk_1242B); } +// original name: "Game_play_shop_pr_vr_switch_set" void func_800BC590(GlobalContext* globalCtx) { osSyncPrintf("Game_play_shop_pr_vr_switch_set()\n"); + if (YREG(15) == 0x10) { globalCtx->unk_1242B = 2; } } +#ifdef NON_MATCHING +// single minor ordering difference +void func_800BC5E0(GlobalContext* globalCtx, s32 arg1) { + TransitionContext* transitionCtx = &globalCtx->transitionCtx; + + bzero(transitionCtx, sizeof(TransitionContext)); + + transitionCtx->unk_228 = arg1; + + if ((transitionCtx->unk_228 >> 5) == 1) { + transitionCtx->unk_22C = func_800B301C; + transitionCtx->unk_230 = func_800B3044; + transitionCtx->unk_23C = func_800B2E30; + transitionCtx->unk_24C = func_800B346C; + transitionCtx->unk_238 = func_800B31D0; + transitionCtx->unk_234 = func_800B304C; + transitionCtx->unk_240 = func_800B3474; + transitionCtx->unk_244 = func_800B34CC; + transitionCtx->unk_248 = func_800B34D4; + return; + } + + switch (transitionCtx->unk_228) { + case 1: + transitionCtx->unk_22C = func_800B2438; + transitionCtx->unk_230 = func_800B24D0; + transitionCtx->unk_23C = func_800B2400; + transitionCtx->unk_24C = func_800B2944; + transitionCtx->unk_238 = func_800B2604; + transitionCtx->unk_234 = func_800B24D8; + transitionCtx->unk_240 = func_800B25F4; + transitionCtx->unk_244 = func_800B25EC; + transitionCtx->unk_248 = NULL; + return; + case 0: + case 8: + transitionCtx->unk_22C = func_800B2A88; + transitionCtx->unk_230 = func_800B2AB0; + transitionCtx->unk_23C = func_800B29D0; + transitionCtx->unk_24C = func_800B2DD4; + transitionCtx->unk_238 = func_800B2B98; + transitionCtx->unk_234 = func_800B2AB8; + transitionCtx->unk_240 = func_800B2DDC; + transitionCtx->unk_244 = func_800B2E1C; + transitionCtx->unk_248 = NULL; + return; + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 17: + case 18: + case 19: + transitionCtx->unk_22C = func_800B3538; + transitionCtx->unk_230 = func_800B3560; + transitionCtx->unk_23C = func_800B34E0; + transitionCtx->unk_24C = func_800B37DC; + transitionCtx->unk_238 = func_800B3718; + transitionCtx->unk_234 = func_800B3568; + transitionCtx->unk_240 = func_800B37EC; + transitionCtx->unk_244 = func_800B37E4; + transitionCtx->unk_248 = NULL; + return; + case 9: + case 10: + globalCtx->unk_1241B = 4; + return; + case 11: + globalCtx->unk_1241B = 10; + return; + case 12: + globalCtx->unk_1241B = 7; + return; + case 14: + globalCtx->unk_1241B = 12; + return; + case 15: + globalCtx->unk_1241B = 14; + return; + case 16: + globalCtx->unk_1241B = 16; + return; + } + + Fault_AddHungupAndCrash("../z_play.c", 2290); +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BC5E0.s") +#endif void func_800BC88C(GlobalContext* globalCtx) { - globalCtx->unk_123F0 = -1; + globalCtx->transitionCtx.unk_228 = -1; } -Gfx* func_800BC8A0(GlobalContext* globalCtx, Gfx* a1) { - Gfx_SetFog2(a1, globalCtx->lightCtx.unk_07, globalCtx->lightCtx.unk_08, globalCtx->lightCtx.unk_09, 0, +Gfx* func_800BC8A0(GlobalContext* globalCtx, Gfx* gfx) { + Gfx_SetFog2(gfx, globalCtx->lightCtx.unk_07, globalCtx->lightCtx.unk_08, globalCtx->lightCtx.unk_09, 0, globalCtx->lightCtx.unk_0A, 1000); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BC8EC.s") +void Gameplay_Destroy(GlobalContext* globalCtx) { + s32 pad; + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BCA64.s") + globalCtx->state.gfxCtx->callback = NULL; + globalCtx->state.gfxCtx->callbackParam = 0; + SREG(91) = 0; + R_PAUSE_MENU_MODE = 0; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BD314.s") + func_800C0F08(&globalCtx->preRenderCtx); + func_800271A8(globalCtx); + Effect_SS_Clear(globalCtx); + func_8005D400(globalCtx, &globalCtx->sub_11E60); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BED40.s") + if (D_80161490 == 3) { + func_800B1DBC(&D_801613B0); + D_80161490 = 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BEDD8.s") + if (globalCtx->unk_1241B == 3) { + globalCtx->transitionCtx.unk_230(&globalCtx->transitionCtx); + func_800BC88C(globalCtx); + globalCtx->unk_1241B = 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BFAE4.s") + func_800B3968(); + func_800B3560(&globalCtx->sub_1241C); + func_800AD054(&D_80161498); -s32 func_800BFC84(GlobalContext* globalCtx) { - return globalCtx->csCtx.state != 0 || func_8008E988(globalCtx) != 0; + if (gSaveContext.linkAge != globalCtx->linkAgeOnLoad) { + Inventory_SwapAgeEquipment(); + func_8008ECAC(globalCtx, player); + } + + func_80031C3C(&globalCtx->actorCtx, globalCtx); + func_80110990(globalCtx); + KaleidoScopeCall_Destroy(globalCtx); + KaleidoManager_Destroy(); + ZeldaArena_Cleanup(); + Fault_RemoveClient(&D_801614B8); } +#ifdef NON_MATCHING +// regalloc and stack usage differences +// also missing some extra duplicated instructions +void Gameplay_Init(GlobalContext* globalCtx) { + GraphicsContext* gfxCtx; + void* zAlloc; // 0x84 + void* zAllocAligned; + u32 zAllocSize; // 0x7C + Player* player; // 0x78 + EntranceInfo* spawnEntrance; + s32 playerStartCamId; + u8 tempSetupIndex; // 0x6F + s32 i; + + gfxCtx = globalCtx->state.gfxCtx; + + if (gSaveContext.entranceIndex == -1) { + gSaveContext.entranceIndex = 0; + globalCtx->state.running = false; + SET_NEXT_GAMESTATE(&globalCtx->state, Opening_Init, OpeningContext); + return; + } + + SystemArena_Display(); + func_800C4F20(globalCtx, 0x1D4790); + KaleidoManager_Init(globalCtx); + View_Init(&globalCtx->view, gfxCtx); + func_800F6828(0); + Quake_Init(); + + for (i = 0; i < 4; i++) { + globalCtx->cameraPtrs[i] = NULL; + } + + func_80057C6C(&globalCtx->cameras[0], &globalCtx->view, &globalCtx->colCtx, globalCtx); + Camera_ChangeStatus(&globalCtx->cameras[0], 7); + + for (i = 0; i < 3; i++) { + func_80057C6C(&globalCtx->cameras[i + 1], &globalCtx->view, &globalCtx->colCtx, globalCtx); + Camera_ChangeStatus(&globalCtx->cameras[i + 1], 0x100); + } + + globalCtx->cameraPtrs[0] = &globalCtx->cameras[0]; + globalCtx->cameraPtrs[0]->unk_130 = 0; + globalCtx->activeCamera = 0; + func_8005AC48(&globalCtx->cameras[0], 0xFF); + func_800A9D28(globalCtx, &globalCtx->sub_1F74); + func_80112098(globalCtx); + func_80110F68(globalCtx); + func_80110450(globalCtx); + func_8006BA00(globalCtx); + func_80026C2C(globalCtx); + func_800272B0(globalCtx, 0x55); + func_8005D3BC(globalCtx, &globalCtx->sub_11E60); + SkelAnime_AnimationCtxReset(&globalCtx->animationCtx); + func_8006450C(globalCtx, &globalCtx->csCtx); + + if (gSaveContext.nextCutsceneIndex != 0xFFEF) { + gSaveContext.cutsceneIndex = gSaveContext.nextCutsceneIndex; + gSaveContext.nextCutsceneIndex = 0xFFEF; + } + + if (gSaveContext.cutsceneIndex == 0xFFFD) { + gSaveContext.cutsceneIndex = 0; + } + + if (gSaveContext.nextDayTime != 0xFFFFU) { + gSaveContext.dayTime = gSaveContext.nextDayTime; + gSaveContext.environmentTime = gSaveContext.nextDayTime; + } + + if ((gSaveContext.dayTime >= 0xC001) || (gSaveContext.dayTime < 0x4555)) { + gSaveContext.nightFlag = 1; + } else { + gSaveContext.nightFlag = 0; + } + + Cutscene_HandleConditionalTriggers(globalCtx); + + if ((gSaveContext.gameMode != 0) || (gSaveContext.cutsceneIndex >= 0xFFF0)) { + gSaveContext.nayrusLoveTimer = 0; + func_800876C8(globalCtx); + gSaveContext.sceneSetupIndex = (gSaveContext.cutsceneIndex & 0xF) + 4; + } else if (LINK_IS_CHILD && (gSaveContext.nightFlag == 0)) { + gSaveContext.sceneSetupIndex = 0; + } else if (LINK_IS_CHILD && (gSaveContext.nightFlag != 0)) { + gSaveContext.sceneSetupIndex = 1; + } else if (LINK_IS_ADULT && (gSaveContext.nightFlag == 0)) { + gSaveContext.sceneSetupIndex = 2; + } else { + gSaveContext.sceneSetupIndex = 3; + } + + tempSetupIndex = gSaveContext.sceneSetupIndex; + if ((gEntranceTable[gSaveContext.entranceIndex].scene == SCENE_SPOT00) && LINK_IS_CHILD && + (gSaveContext.sceneSetupIndex < 4)) { + if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) && CHECK_QUEST_ITEM(QUEST_GORON_RUBY) && + CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) { + gSaveContext.sceneSetupIndex = 1; + } else { + gSaveContext.sceneSetupIndex = 0; + } + } else if ((gEntranceTable[gSaveContext.entranceIndex].scene == SCENE_SPOT04) && LINK_IS_ADULT && + (gSaveContext.sceneSetupIndex < 4)) { + if (gSaveContext.eventChkInf[4] & 0x100) { + gSaveContext.sceneSetupIndex = 3; + } else { + gSaveContext.sceneSetupIndex = 2; + } + } + + spawnEntrance = &gEntranceTable[gSaveContext.entranceIndex + gSaveContext.sceneSetupIndex]; + Gameplay_SpawnScene(globalCtx, spawnEntrance->scene, spawnEntrance->spawn); + osSyncPrintf("\nSCENE_NO=%d COUNTER=%d\n", gSaveContext.entranceIndex, gSaveContext.sceneSetupIndex); + + // When entering Gerudo Valley in the right setup, trigger the GC emulator to play the ending movie. + // The emulator constantly checks whether PC is 0x81000000, so this works even though it's not a valid address. + if ((gEntranceTable[gSaveContext.entranceIndex].scene == SCENE_SPOT09) && (gSaveContext.sceneSetupIndex == 6)) { + osSyncPrintf("エンディングはじまるよー\n"); // "The ending starts" + ((void (*)())0x81000000)(); + osSyncPrintf("出戻り？\n"); // "Return?" + } + + Cutscene_HandleEntranceTriggers(globalCtx); + KaleidoScopeCall_Init(globalCtx); + func_801109B0(globalCtx); + + if (gSaveContext.nextDayTime != 0xFFFF) { + if (gSaveContext.nextDayTime == 0x8001) { + gSaveContext.unk_14++; + gSaveContext.unk_18++; + gSaveContext.dogIsLost = true; + if (Inventory_ReplaceItem(globalCtx, ITEM_WEIRD_EGG, ITEM_CHICKEN) || + Inventory_ReplaceItem(globalCtx, ITEM_POCKET_EGG, ITEM_POCKET_CUCCO)) { + func_8010B680(globalCtx, 0x3066, 0); + } + gSaveContext.nextDayTime = 0xFFFE; + } else { + gSaveContext.nextDayTime = 0xFFFD; + } + } + + SREG(91) = -1; + R_PAUSE_MENU_MODE = 0; + func_800C0EA8(&globalCtx->preRenderCtx); + func_800C0E70(&globalCtx->preRenderCtx, 0x140, 0xF0, 0, 0, 0); + func_800C0ED8(&globalCtx->preRenderCtx, 0x140, 0xF0, 0, 0); + D_80161490 = 0; + globalCtx->unk_1241B = 0; + func_8008E6A0(&globalCtx->sub_7B8); + func_800FD9A0((u32)osGetTime()); + Matrix_Init(&globalCtx->state); + globalCtx->state.main = Gameplay_Main; + globalCtx->state.destroy = Gameplay_Destroy; + globalCtx->sceneLoadFlag = -0x14; + globalCtx->unk_11E16 = 0xFF; + globalCtx->unk_11E18 = 0; + globalCtx->unk_11DE9 = 0; + + if (gSaveContext.gameMode != 1) { + if (gSaveContext.nextTransition == 0xFF) { + globalCtx->fadeTransition = + (gEntranceTable[gSaveContext.entranceIndex + tempSetupIndex].field >> 7) & 0x7F; // Fade In + } else { + globalCtx->fadeTransition = gSaveContext.nextTransition; + gSaveContext.nextTransition = 0xFF; + } + } else { + globalCtx->fadeTransition = 6; + } + + func_800B3908(); + func_800B3538(&globalCtx->sub_1241C); + func_800B37EC(&globalCtx->sub_1241C, 3); + func_800B37E4(&globalCtx->sub_1241C, RGBA8(0xA0, 0xA0, 0xA0, 0xFF)); + func_800B34E0(&globalCtx->sub_1241C); + func_800AD000(&D_80161498); + D_801614B0.a = 0x00; + func_8006C3A0(globalCtx); + + osSyncPrintf("ZELDA ALLOC SIZE=%x\n", THA_GetSize(&globalCtx->state.tha)); + zAllocSize = THA_GetSize(&globalCtx->state.tha); + zAlloc = Game_Alloc(&globalCtx->state, zAllocSize, "../z_play.c", 2918); + zAllocAligned = (void*)(((u32)zAlloc + 8) & ~0xF); + ZeldaArena_Init(zAllocAligned, zAllocSize - (u32)zAllocAligned + (u32)zAlloc); + osSyncPrintf("ゼルダヒープ %08x-%08x\n", zAllocAligned, + (s32)((u32)zAllocAligned + zAllocSize) - (s32)((u32)zAllocAligned - (u32)zAlloc)); // "Zelda Heap" + + Fault_AddClient(&D_801614B8, ZeldaArena_Display, NULL, NULL); + func_800304DC(globalCtx, &globalCtx->actorCtx, globalCtx->linkActorEntry); + + while (!func_800973FC(globalCtx, &globalCtx->roomCtx)) { + ; // Empty Loop + } + + player = PLAYER; + func_80058148(&globalCtx->cameras[0], player); + func_8005A444(&globalCtx->cameras[0], 0); + + playerStartCamId = player->actor.params & 0xFF; + if (playerStartCamId != 0xFF) { + osSyncPrintf("player has start camera ID (" VT_FGCOL(BLUE) "%d" VT_RST ")\n", playerStartCamId); + func_8005A7A8(&globalCtx->cameras[0], playerStartCamId); + } + + if (YREG(15) == 0x20) { + globalCtx->unk_1242B = 2; + } else if (YREG(15) == 0x10) { + globalCtx->unk_1242B = 1; + } else { + globalCtx->unk_1242B = 0; + } + + Interface_SetSceneRestrictions(globalCtx); + func_800758AC(globalCtx); + gSaveContext.seqIndex = globalCtx->soundCtx.musicSeq; + gSaveContext.nightSeqIndex = globalCtx->soundCtx.nighttimeSFX; + func_8002DF18(globalCtx, PLAYER); + func_800A390C(globalCtx, &globalCtx->animationCtx); + gSaveContext.respawnFlag = 0; + + if (dREG(95) != 0) { + D_8012D1F0 = D_801614D0; + osSyncPrintf("\nkawauso_data=[%x]", D_8012D1F0); + DmaMgr_DMARomToRam(0x03FEB000, (u32)D_8012D1F0, 0x5000); + } +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/Gameplay_Init.s") +#endif + +#ifdef NON_MATCHING +// regalloc and stack usage differences +// also missing an extra move instruction +void Gameplay_Update(GlobalContext* globalCtx) { + s32 sp80; + Input* input; + u32 i; // 0x78 + s32 temp; + + input = globalCtx->state.input; + + if ((SREG(1) < 0) || (DREG(0) != 0)) { + SREG(1) = 0; + ZeldaArena_Display(); + } + + if ((HREG(80) == 18) && (HREG(81) < 0)) { + HREG(81) = 0; + osSyncPrintf("object_exchange_rom_address %u\n", gObjectTableSize); + osSyncPrintf("RomStart RomEnd Size\n"); + for (i = 0; i < gObjectTableSize; i++) { + s32 size = gObjectTable[i].vromEnd - gObjectTable[i].vromStart; + osSyncPrintf("%08x-%08x %08x(%8.3fKB)\n", gObjectTable[i].vromStart, gObjectTable[i].vromEnd, size, + size * 0.0009765625f); + } + osSyncPrintf("\n"); + } + + if ((HREG(81) == 18) && (HREG(82) < 0)) { + HREG(82) = 0; + ActorOverlayTable_LogPrint(); + } + + gSegments[4] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[globalCtx->objectCtx.mainKeepIndex].segment); + gSegments[5] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); + gSegments[2] = PHYSICAL_TO_VIRTUAL(globalCtx->sceneSegment); + + if (func_8008E6AC(&globalCtx->sub_7B8, &input[1]) != 0) { + if ((globalCtx->unk_1241B == 0) && (globalCtx->sceneLoadFlag != 0)) { + globalCtx->unk_1241B = 1; + } + + if (D_80161490 != 0) { + switch (D_80161490) { + case 2: + if (func_800B1E84(&D_801613B0, 10, 7) == 0) { + osSyncPrintf("fbdemo_init呼出し失敗！\n"); // "fbdemo_init call failed!" + D_80161490 = 0; + } else { + D_801613B0.unk_DC = gZBuffer; + D_80161490 = 3; + R_UPDATE_RATE = 1; + } + break; + case 3: + func_800B23E8(&D_801613B0); + break; + } + } + + if (globalCtx->unk_1241B != 0) { + switch (globalCtx->unk_1241B) { + case 1: + if (globalCtx->sceneLoadFlag != -0x14) { + s16 sp6E = 0; + Interface_ChangeAlpha(1); + + if (gSaveContext.cutsceneIndex >= 0xFFF0) { + sp6E = (gSaveContext.cutsceneIndex & 0xF) + 4; + } + + if (!(gEntranceTable[globalCtx->nextEntranceIndex + sp6E].field & 0x8000)) { // Continue BGM Off + osSyncPrintf("\n\n\nサウンドイニシャル来ました。111"); // "Sound initalized. 111" + if ((globalCtx->fadeTransition < 56) && (func_80077600() == 0)) { + osSyncPrintf("\n\n\nサウンドイニシャル来ました。222"); // "Sound initalized. 222" + func_800F6964(0x14); + gSaveContext.seqIndex = 0xFF; + gSaveContext.nightSeqIndex = 0xFF; + } + } + } + + if (CREG(11) == 0) { + func_800BC5E0(globalCtx, globalCtx->fadeTransition); + } else { + func_800BC5E0(globalCtx, CREG(12)); + } + + if (globalCtx->unk_1241B >= 4) { + break; + } + + case 2: + globalCtx->transitionCtx.unk_22C(&globalCtx->transitionCtx); + + if ((globalCtx->transitionCtx.unk_228 >> 5) == 1) { + globalCtx->transitionCtx.unk_240(&globalCtx->transitionCtx, + globalCtx->transitionCtx.unk_228 | 0x80); + } + + gSaveContext.unk_1419 = 14; + if ((globalCtx->transitionCtx.unk_228 == 8) || (globalCtx->transitionCtx.unk_228 == 9)) { + gSaveContext.unk_1419 = 28; + } + + gSaveContext.fadeDuration = 60; + if ((globalCtx->transitionCtx.unk_228 == 4) || (globalCtx->transitionCtx.unk_228 == 5)) { + gSaveContext.fadeDuration = 20; + } else if ((globalCtx->transitionCtx.unk_228 == 6) || (globalCtx->transitionCtx.unk_228 == 7)) { + gSaveContext.fadeDuration = 150; + } else if (globalCtx->transitionCtx.unk_228 == 17) { + gSaveContext.fadeDuration = 2; + } + + if ((globalCtx->transitionCtx.unk_228 == 3) || (globalCtx->transitionCtx.unk_228 == 5) || + (globalCtx->transitionCtx.unk_228 == 7) || (globalCtx->transitionCtx.unk_228 == 13) || + (globalCtx->transitionCtx.unk_228 == 17)) { + globalCtx->transitionCtx.unk_244(&globalCtx->transitionCtx, RGBA8(0xA0, 0xA0, 0xA0, 0xFF)); + if (globalCtx->transitionCtx.unk_248 != NULL) { + globalCtx->transitionCtx.unk_248(&globalCtx->transitionCtx, RGBA8(0xA0, 0xA0, 0xA0, 0xFF)); + } + } else if (globalCtx->transitionCtx.unk_228 == 18) { + globalCtx->transitionCtx.unk_244(&globalCtx->transitionCtx, RGBA8(0x8C, 0x8C, 0x64, 0xFF)); + if (globalCtx->transitionCtx.unk_248 != NULL) { + globalCtx->transitionCtx.unk_248(&globalCtx->transitionCtx, RGBA8(0x8C, 0x8C, 0x64, 0xFF)); + } + } else if (globalCtx->transitionCtx.unk_228 == 19) { + globalCtx->transitionCtx.unk_244(&globalCtx->transitionCtx, RGBA8(0x46, 0x64, 0x6E, 0xFF)); + if (globalCtx->transitionCtx.unk_248 != NULL) { + globalCtx->transitionCtx.unk_248(&globalCtx->transitionCtx, RGBA8(0x46, 0x64, 0x6E, 0xFF)); + } + } else { + globalCtx->transitionCtx.unk_244(&globalCtx->transitionCtx, RGBA8(0x00, 0x00, 0x00, 0x00)); + if (globalCtx->transitionCtx.unk_248 != NULL) { + globalCtx->transitionCtx.unk_248(&globalCtx->transitionCtx, RGBA8(0x00, 0x00, 0x00, 0x00)); + } + } + + if (globalCtx->sceneLoadFlag == -0x14) { + globalCtx->transitionCtx.unk_240(&globalCtx->transitionCtx, 1); + } else { + globalCtx->transitionCtx.unk_240(&globalCtx->transitionCtx, 2); + } + + globalCtx->transitionCtx.unk_23C(&globalCtx->transitionCtx); + + if (globalCtx->transitionCtx.unk_228 == 13) { + globalCtx->unk_1241B = 11; + } else { + globalCtx->unk_1241B = 3; + } + break; + + case 3: + if (globalCtx->transitionCtx.unk_24C(&globalCtx->transitionCtx) != 0) { + if (globalCtx->transitionCtx.unk_228 >= 56) { + if (globalCtx->sceneLoadFlag == -0x14) { + globalCtx->transitionCtx.unk_230(&globalCtx->transitionCtx); + func_800BC88C(globalCtx); + globalCtx->unk_1241B = 0; + } + } else if (globalCtx->sceneLoadFlag != -0x14) { + globalCtx->state.running = 0; + if (gSaveContext.gameMode != 2) { + SET_NEXT_GAMESTATE(&globalCtx->state, Gameplay_Init, GlobalContext); + gSaveContext.entranceIndex = globalCtx->nextEntranceIndex; + if (gSaveContext.minigameState == 1) { + gSaveContext.minigameState = 3; + } + } else { + SET_NEXT_GAMESTATE(&globalCtx->state, func_80811A20, char[0x1CAE0]); + } + } else { + globalCtx->transitionCtx.unk_230(&globalCtx->transitionCtx); + func_800BC88C(globalCtx); + globalCtx->unk_1241B = 0; + if (D_80161490 == 3) { + func_800B1DBC(&D_801613B0); + D_80161490 = 0; + R_UPDATE_RATE = 3; + } + } + globalCtx->sceneLoadFlag = 0; + } else { + globalCtx->transitionCtx.unk_234(&globalCtx->transitionCtx, R_UPDATE_RATE); + } + break; + } + + switch (globalCtx->unk_1241B) { + case 4: + D_801614C8 = 0; + globalCtx->envCtx.unk_E1 = 1; + globalCtx->envCtx.unk_E2[0] = 0xA0; + globalCtx->envCtx.unk_E2[1] = 0xA0; + globalCtx->envCtx.unk_E2[2] = 0xA0; + if (globalCtx->sceneLoadFlag != -0x14) { + globalCtx->envCtx.unk_E2[3] = 0; + globalCtx->unk_1241B = 5; + } else { + globalCtx->envCtx.unk_E2[3] = 0xFF; + globalCtx->unk_1241B = 6; + } + break; + + case 5: + globalCtx->envCtx.unk_E2[3] = (D_801614C8 / 20.0f) * 255.0f; + if (D_801614C8 >= 20 && 1) { + globalCtx->state.running = 0; + SET_NEXT_GAMESTATE(&globalCtx->state, Gameplay_Init, GlobalContext); + gSaveContext.entranceIndex = globalCtx->nextEntranceIndex; + globalCtx->sceneLoadFlag = 0; + globalCtx->unk_1241B = 0; + } else { + D_801614C8++; + } + break; + + case 6: + globalCtx->envCtx.unk_E2[3] = (1 - D_801614C8 / 20.0f) * 255.0f; + if (D_801614C8 >= 20 && 1) { + D_80161490 = 0; + R_UPDATE_RATE = 3; + globalCtx->sceneLoadFlag = 0; + globalCtx->unk_1241B = 0; + globalCtx->envCtx.unk_E1 = 0; + } else { + D_801614C8++; + } + break; + + case 7: + D_801614C8 = 0; + globalCtx->envCtx.unk_E1 = 1; + globalCtx->envCtx.unk_E2[0] = 0xAA; + globalCtx->envCtx.unk_E2[1] = 0xA0; + globalCtx->envCtx.unk_E2[2] = 0x96; + if (globalCtx->sceneLoadFlag != -0x14) { + globalCtx->envCtx.unk_E2[3] = 0; + globalCtx->unk_1241B = 5; + } else { + globalCtx->envCtx.unk_E2[3] = 0xFF; + globalCtx->unk_1241B = 6; + } + break; + + case 10: + if (0) {} // Improves codegen + if (globalCtx->sceneLoadFlag != -0x14) { + globalCtx->state.running = 0; + SET_NEXT_GAMESTATE(&globalCtx->state, Gameplay_Init, GlobalContext); + gSaveContext.entranceIndex = globalCtx->nextEntranceIndex; + globalCtx->sceneLoadFlag = 0; + globalCtx->unk_1241B = 0; + } else { + D_80161490 = 0; + R_UPDATE_RATE = 3; + globalCtx->sceneLoadFlag = 0; + globalCtx->unk_1241B = 0; + } + break; + + case 11: + if (gSaveContext.unk_1410 != 0) { + globalCtx->unk_1241B = 3; + } + break; + + case 12: + if (globalCtx->sceneLoadFlag != -0x14) { + globalCtx->envCtx.unk_E6 = 1; + globalCtx->unk_1241B = 13; + } else { + globalCtx->envCtx.unk_E6 = 2; + globalCtx->envCtx.unk_E7 = 0xFF; + globalCtx->envCtx.unk_E8 = 0xFF; + globalCtx->unk_1241B = 13; + } + break; + + case 13: + Audio_PlaySoundGeneral(0x20C0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + if (globalCtx->sceneLoadFlag == -0x14) { + if (globalCtx->envCtx.unk_E7 < 0x6E) { + D_80161490 = 0; + R_UPDATE_RATE = 3; + globalCtx->sceneLoadFlag = 0; + globalCtx->unk_1241B = 0; + } + } else { + if (globalCtx->envCtx.unk_E8 == 0xFF) { + if (0) {} // Improves codegen + globalCtx->state.running = 0; + SET_NEXT_GAMESTATE(&globalCtx->state, Gameplay_Init, GlobalContext); + gSaveContext.entranceIndex = globalCtx->nextEntranceIndex; + globalCtx->sceneLoadFlag = 0; + globalCtx->unk_1241B = 0; + } + } + break; + + case 14: + if (globalCtx->sceneLoadFlag == -0x14) { + globalCtx->envCtx.unk_E6 = 4; + globalCtx->envCtx.unk_E7 = 0xFF; + globalCtx->envCtx.unk_E8 = 0xFF; + LOG_STRING("来た!!!!!!!!!!!!!!!!!!!!!", "../z_play.c", 3471); // "It's here!!!!!!!!!" + globalCtx->unk_1241B = 15; + } else { + globalCtx->unk_1241B = 12; + } + break; + + case 15: + Audio_PlaySoundGeneral(0x20C0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + if (globalCtx->sceneLoadFlag == -0x14) { + if (globalCtx->envCtx.unk_E7 <= 0) { + D_80161490 = 0; + R_UPDATE_RATE = 3; + globalCtx->sceneLoadFlag = 0; + globalCtx->unk_1241B = 0; + } + } + break; + + case 16: + D_801614C8 = 0; + globalCtx->envCtx.unk_E1 = 1; + globalCtx->envCtx.unk_E2[0] = 0; + globalCtx->envCtx.unk_E2[1] = 0; + globalCtx->envCtx.unk_E2[2] = 0; + globalCtx->envCtx.unk_E2[3] = 0xFF; + globalCtx->unk_1241B = 17; + break; + + case 17: + if (gSaveContext.unk_1410 != 0) { + globalCtx->envCtx.unk_E2[3] = gSaveContext.unk_1410; + if (gSaveContext.unk_1410 < 0x65) { + D_80161490 = 0; + R_UPDATE_RATE = 3; + globalCtx->sceneLoadFlag = 0; + globalCtx->unk_1241B = 0; + } + } + break; + } + } + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3533); + } + + temp = HREG(63); + if (1 && (D_80161490 != 3)) { + if (1 && temp) { + LOG_NUM("1", 1, "../z_play.c", 3542); + } + + if ((gSaveContext.gameMode == 0) && (globalCtx->msgCtx.msgMode == 0) && (globalCtx->unk_10A20 == 0)) { + func_8006EA30(globalCtx); + } + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3551); + } + + sp80 = (globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.flag != 0); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3555); + } + + SkelAnime_AnimationCtxReset(&globalCtx->animationCtx); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3561); + } + + Object_UpdateBank(&globalCtx->objectCtx); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3577); + } + + if ((sp80 == 0) && (IREG(72) == 0)) { + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3580); + } + + globalCtx->gameplayFrames++; + + func_800AA178(1); + + if ((globalCtx->actorCtx.unk_00 != 0) && (globalCtx->actorCtx.unk_00-- < 5)) { + osSyncPrintf("FINISH=%d\n", globalCtx->actorCtx.unk_00); + if ((globalCtx->actorCtx.unk_00 > 0) && ((globalCtx->actorCtx.unk_00 % 2) != 0)) { + globalCtx->envCtx.unk_E1 = 1; + globalCtx->envCtx.unk_E2[0] = globalCtx->envCtx.unk_E2[1] = globalCtx->envCtx.unk_E2[2] = 0x96; + globalCtx->envCtx.unk_E2[3] = 0x50; + } else { + globalCtx->envCtx.unk_E1 = 0; + } + } else { + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3606); + } + + func_800973FC(globalCtx, &globalCtx->roomCtx); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3612); + } + + func_8006139C(globalCtx, &globalCtx->sub_11E60); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3618); + } + + func_80061C98(globalCtx, &globalCtx->sub_11E60); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3624); + } + + func_800622E4(globalCtx, &globalCtx->sub_11E60); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3631); + } + + func_8005D40C(globalCtx, &globalCtx->sub_11E60); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3637); + } + + if (globalCtx->unk_11DE9 == 0) { + Actor_UpdateAll(globalCtx, &globalCtx->actorCtx); + } + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3643); + } + + func_80064558(globalCtx, &globalCtx->csCtx); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3648); + } + + func_800645A0(globalCtx, &globalCtx->csCtx); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3651); + } + + func_80026F70(globalCtx); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3657); + } + + Effect_SS_UpdateAllParticles(globalCtx); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3662); + } + } + } else { + func_800AA178(0); + } + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3672); + } + + func_80095AA0(globalCtx, &globalCtx->roomCtx.curRoom, &input[1], 0); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3675); + } + + func_80095AA0(globalCtx, &globalCtx->roomCtx.prevRoom, &input[1], 1); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3677); + } + + if (globalCtx->unk_1242B != 0) { + if (!~(input[0].press.in.button | ~8)) { + if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.flag != 0)) { + // Translates to: "Changing viewpoint is prohibited due to the kaleidoscope" + osSyncPrintf(VT_FGCOL(CYAN) "カレイドスコープ中につき視点変更を禁止しております\n" VT_RST); + } else if (func_8008E988(globalCtx)) { + // Translates to: "Changing viewpoint is prohibited during the cutscene" + osSyncPrintf(VT_FGCOL(CYAN) "デモ中につき視点変更を禁止しております\n" VT_RST); + } else if (YREG(15) == 0x10) { + Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } else { + func_800BC490(globalCtx, globalCtx->unk_1242B ^ 3); + } + } + func_800BC450(globalCtx); + } + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3708); + } + + func_800B1744(&globalCtx->skyboxCtx); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3716); + } + + if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.flag != 0)) { + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3721); + } + + KaleidoScopeCall_Update(globalCtx); + } else if (globalCtx->unk_10A20 != 0) { + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3727); + } + + func_801104C8(globalCtx); + } else { + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3733); + } + + func_8010F6F0(globalCtx); + } + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3737); + } + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3742); + } + + Interface_Update(globalCtx); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3765); + } + + func_800A390C(globalCtx, &globalCtx->animationCtx); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3771); + } + + func_8006BA30(globalCtx); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3777); + } + + func_800B39B8(R_UPDATE_RATE); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3783); + } + + func_800B3568(&globalCtx->sub_1241C, R_UPDATE_RATE); + } + } + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3799); + } + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3801); + } + + if ((sp80 == 0) || (D_8011D394 != 0)) { + s32 i; // 0x54 + s32 camIdx; + Vec3s sp48; + + globalCtx->nextCamera = globalCtx->activeCamera; + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3806); + } + + for (i = 0, camIdx = globalCtx->nextCamera; i < 4; i++) { + if ((i != camIdx) && (globalCtx->cameraPtrs[i] != NULL)) { + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3809); + } + + func_800591EC(&sp48, globalCtx->cameraPtrs[i]); + camIdx = globalCtx->nextCamera; + } + } + + func_800591EC(&sp48, globalCtx->cameraPtrs[camIdx]); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3814); + } + } + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 3816); + } + + func_80070C24(globalCtx, &globalCtx->envCtx, &globalCtx->lightCtx, &globalCtx->pauseCtx, &globalCtx->msgCtx, + &globalCtx->unk_10A20, globalCtx->state.gfxCtx); +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/Gameplay_Update.s") +#endif + +void Gameplay_DrawOverlayElements(GlobalContext* globalCtx) { + if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.flag != 0)) { + KaleidoScopeCall_Draw(globalCtx); + } + + if (gSaveContext.gameMode == 0) { + Interface_Draw(globalCtx); + } + + func_8010F58C(globalCtx); + + if (globalCtx->unk_10A20 != 0) { + func_80110460(globalCtx); + } +} + +#ifdef NON_MATCHING +// regalloc, stakc usage and minor ordering differences +void Gameplay_Draw(GlobalContext* globalCtx) { + LightMapper* sp228; + Vec3f sp21C; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; // 0x208 + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, gfxCtx, "../z_play.c", 3907); + + gSegments[4] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[globalCtx->objectCtx.mainKeepIndex].segment); + gSegments[5] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); + gSegments[2] = PHYSICAL_TO_VIRTUAL(globalCtx->sceneSegment); + + gSPSegment(gfxCtx->polyOpa.p++, 0x00, NULL); + gSPSegment(gfxCtx->polyXlu.p++, 0x00, NULL); + gSPSegment(gfxCtx->overlay.p++, 0x00, NULL); + + gSPSegment(gfxCtx->polyOpa.p++, 0x04, globalCtx->objectCtx.status[globalCtx->objectCtx.mainKeepIndex].segment); + gSPSegment(gfxCtx->polyXlu.p++, 0x04, globalCtx->objectCtx.status[globalCtx->objectCtx.mainKeepIndex].segment); + gSPSegment(gfxCtx->overlay.p++, 0x04, globalCtx->objectCtx.status[globalCtx->objectCtx.mainKeepIndex].segment); + + gSPSegment(gfxCtx->polyOpa.p++, 0x05, globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); + gSPSegment(gfxCtx->polyXlu.p++, 0x05, globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); + gSPSegment(gfxCtx->overlay.p++, 0x05, globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); + + gSPSegment(gfxCtx->polyOpa.p++, 0x02, globalCtx->sceneSegment); + gSPSegment(gfxCtx->polyXlu.p++, 0x02, globalCtx->sceneSegment); + gSPSegment(gfxCtx->overlay.p++, 0x02, globalCtx->sceneSegment); + + func_80095248(gfxCtx, 0, 0, 0); + + if ((HREG(80) != 10) || (HREG(82) != 0)) { + gfxCtx->polyOpa.p = func_800BC8A0(globalCtx, gfxCtx->polyOpa.p); + gfxCtx->polyXlu.p = func_800BC8A0(globalCtx, gfxCtx->polyXlu.p); + + func_800AA460(&globalCtx->view, globalCtx->view.fovy, globalCtx->view.near, globalCtx->lightCtx.unk_0C); + func_800AAA50(&globalCtx->view, 15); + + Matrix_MtxToMtxF(&globalCtx->view.viewing, &globalCtx->mf_11DA0); + Matrix_MtxToMtxF(&globalCtx->view.projection, &globalCtx->mf_11D60); + Matrix_Mult(&globalCtx->mf_11D60, MTXMODE_NEW); + Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY); + Matrix_Get(&globalCtx->mf_11D60); + globalCtx->mf_11DA0.mf[3][2] = 0.0f; + globalCtx->mf_11DA0.mf[3][1] = 0.0f; + globalCtx->mf_11DA0.mf[3][0] = 0.0f; + globalCtx->mf_11DA0.mf[2][3] = 0.0f; + globalCtx->mf_11DA0.mf[1][3] = 0.0f; + globalCtx->mf_11DA0.mf[0][3] = 0.0f; + Matrix_Reverse(&globalCtx->mf_11DA0); + globalCtx->unk_11DE0 = Matrix_MtxFToMtx(Matrix_CheckFloats(&globalCtx->mf_11DA0, "../z_play.c", 4005), + Graph_Alloc(gfxCtx, sizeof(Mtx))); + + gSPSegment(gfxCtx->polyOpa.p++, 0x01, globalCtx->unk_11DE0); + + if ((HREG(80) != 10) || (HREG(92) != 0)) { + Gfx* sp1CC = gfxCtx->polyOpa.p; + Gfx* sp1D0 = Graph_GfxPlusOne(gfxCtx->polyOpa.p); + gSPDisplayList(gfxCtx->overlay.p++, sp1D0); + + if ((globalCtx->unk_1241B == 3) || (globalCtx->unk_1241B == 11) || + (globalCtx->transitionCtx.unk_228 >= 56)) { + View view; // 0xA0 + Viewport viewport; // 0x90 + + View_Init(&view, gfxCtx); + view.flags = 2 | 8; + + // clang-format off + viewport.bottomY = SCREEN_HEIGHT; viewport.rightX = SCREEN_WIDTH; + viewport.topY = 0; viewport.leftX = 0; + // clang-format on + + View_SetViewport(&view, &viewport); + func_800AB9EC(&view, 15, &sp1D0); + globalCtx->transitionCtx.unk_238(&globalCtx->transitionCtx, &sp1D0); + } + + func_800B3718(&globalCtx->sub_1241C, &sp1D0); + + if (D_801614B0.a > 0x00) { + D_80161498.color.rgba = D_801614B0.rgba; + func_800AD5C0(&D_80161498, &sp1D0); + } + + gSPEndDisplayList(sp1D0++); + Graph_BranchDlist(sp1CC, sp1D0); + gfxCtx->polyOpa.p = sp1D0; + } + + if (D_80161490 == 3) { + Gfx* sp88 = gfxCtx->polyOpa.p; + func_800B2188(&D_801613B0, &sp88); + gfxCtx->polyOpa.p = sp88; + goto Gameplay_Draw_DrawOverlayElements; + } else { + func_800C0ED8(&globalCtx->preRenderCtx, 0x140, 0xF0, gfxCtx->curFrameBuffer, gZBuffer); + + if (R_PAUSE_MENU_MODE == 2) { + MsgEvent_SendNullTask(); + func_800C3770(&globalCtx->preRenderCtx); + R_PAUSE_MENU_MODE = 3; + } else if (R_PAUSE_MENU_MODE >= 4) { + R_PAUSE_MENU_MODE = 0; + } + + if (R_PAUSE_MENU_MODE == 3) { + Gfx* sp84 = gfxCtx->polyOpa.p; + func_800C24BC(&globalCtx->preRenderCtx, &sp84); + gfxCtx->polyOpa.p = sp84; + goto Gameplay_Draw_DrawOverlayElements; + } else { + s32 sp80; + if ((HREG(80) != 10) || (HREG(83) != 0)) { + if (globalCtx->skyboxId != 0) { + s32 skyboxId = globalCtx->skyboxId; + if ((globalCtx->skyboxId != 0x1D) && !globalCtx->envCtx.skyDisabled) { + if ((globalCtx->skyboxId == 1) || (skyboxId == 5)) { + func_8006FC88(globalCtx->skyboxId, &globalCtx->envCtx, &globalCtx->skyboxCtx); + func_800B10C4(&globalCtx->skyboxCtx, gfxCtx, globalCtx->skyboxId, + globalCtx->envCtx.unk_13, globalCtx->view.eye.x, globalCtx->view.eye.y, + globalCtx->view.eye.z); + } else if (globalCtx->skyboxCtx.unk_140 == 0) { + func_800B10C4(&globalCtx->skyboxCtx, gfxCtx, skyboxId, 0, globalCtx->view.eye.x, + globalCtx->view.eye.y, globalCtx->view.eye.z); + } + } + } + } + + if ((HREG(80) != 10) || (HREG(90) & 2)) { + if (!globalCtx->envCtx.sunMoonDisabled) { + func_800730DC(globalCtx); + } + } + + if ((HREG(80) != 10) || (HREG(90) & 1)) { + func_80074D6C(globalCtx); + } + + if ((HREG(80) != 10) || (HREG(90) & 4)) { + func_800750C0(globalCtx); + func_8007542C(globalCtx, 0); + } + + if ((HREG(80) != 10) || (HREG(90) & 8)) { + sp228 = Lights_CreateMapper(&globalCtx->lightCtx, gfxCtx); + func_8007A474(sp228, globalCtx->lightCtx.lightsHead, 0); + func_80079EFC(sp228, gfxCtx); + } + + if ((HREG(80) != 10) || (HREG(84) != 0)) { + if (VREG(94) == 0) { + if (HREG(80) != 10) { + sp80 = 3; + } else { + sp80 = HREG(84); + } + Scene_Draw(globalCtx); + Room_Draw(globalCtx, &globalCtx->roomCtx.curRoom, sp80 & 3); + Room_Draw(globalCtx, &globalCtx->roomCtx.prevRoom, sp80 & 3); + } + } + + if ((HREG(80) != 10) || (HREG(83) != 0)) { + if (globalCtx->skyboxCtx.unk_140 != 0) { + if (globalCtx->cameraPtrs[globalCtx->activeCamera]->unk_142 != 0x19) { + Vec3f sp74; + func_8005AFB4(&sp74, globalCtx->cameraPtrs[globalCtx->activeCamera]); + func_800B10C4(&globalCtx->skyboxCtx, gfxCtx, globalCtx->skyboxId, 0, + globalCtx->view.eye.x + sp74.x, globalCtx->view.eye.y + sp74.y, + globalCtx->view.eye.z + sp74.z); + } + } + } + + if (globalCtx->envCtx.unk_EE[1] != 0) { + func_80074704(globalCtx, &globalCtx->view, gfxCtx); + } + + if ((HREG(80) != 10) || (HREG(84) != 0)) { + func_8007672C(gfxCtx, 0, 0, 0, globalCtx->unk_11E18, 1); + } + + if ((HREG(80) != 10) || (HREG(85) != 0)) { + func_800315AC(globalCtx, &globalCtx->actorCtx); + } + + if ((HREG(80) != 10) || (HREG(86) != 0)) { + if (!globalCtx->envCtx.sunMoonDisabled) { + sp21C.x = globalCtx->view.eye.x + globalCtx->envCtx.unk_04.x; + sp21C.y = globalCtx->view.eye.y + globalCtx->envCtx.unk_04.y; + sp21C.z = globalCtx->view.eye.z + globalCtx->envCtx.unk_04.z; + func_80073988(globalCtx, &globalCtx->envCtx, &globalCtx->view, gfxCtx, sp21C, 0); + } + func_80075E68(globalCtx); + } + + if ((HREG(80) != 10) || (HREG(87) != 0)) { + if (MREG(64) != 0) { + func_8007672C(gfxCtx, MREG(65), MREG(66), MREG(67), MREG(68), 3); + } + + if (globalCtx->envCtx.unk_E1) {} // Necessary to match + + if (globalCtx->envCtx.unk_E1 == 1) { + func_8007672C(gfxCtx, globalCtx->envCtx.unk_E2[0], globalCtx->envCtx.unk_E2[1], + globalCtx->envCtx.unk_E2[2], globalCtx->envCtx.unk_E2[3], 3); + } else { + // Also necessary to match + } + } + + if ((HREG(80) != 10) || (HREG(88) != 0)) { + if (globalCtx->envCtx.unk_E6 != 0) { + func_80076934(globalCtx); + } + } + + if ((HREG(80) != 10) || (HREG(93) != 0)) { + DebugDisplay_DrawObjects(globalCtx); + } + + if ((R_PAUSE_MENU_MODE == 1) || (D_80161490 == 1)) { + Gfx* sp70 = gfxCtx->overlay.p; + globalCtx->preRenderCtx.unk_10 = gfxCtx->curFrameBuffer; + globalCtx->preRenderCtx.unk_14 = gZBuffer; + func_800C1F20(&globalCtx->preRenderCtx, &sp70); + if (R_PAUSE_MENU_MODE == 1) { + globalCtx->preRenderCtx.unk_18 = gfxCtx->curFrameBuffer; + func_800C20B4(&globalCtx->preRenderCtx, &sp70); + R_PAUSE_MENU_MODE = 2; + } else { + D_80161490 = 2; + } + gfxCtx->overlay.p = sp70; + globalCtx->preRenderCtx.unk_A3 = 2; + SREG(33) |= 1; + } else { + Gameplay_Draw_DrawOverlayElements: + if ((HREG(80) != 10) || (HREG(89) != 0)) { + Gameplay_DrawOverlayElements(globalCtx); + } + } + } + } + } + + if (globalCtx->view.unk_124 != 0) { + Vec3s sp50; + func_800591EC(&sp50, globalCtx->cameraPtrs[globalCtx->activeCamera]); + func_800AB944(&globalCtx->view); + globalCtx->view.unk_124 = 0; + if ((globalCtx->skyboxId != 0) && (globalCtx->skyboxId != 0x1D) && !globalCtx->envCtx.skyDisabled) { + func_800B1030(&globalCtx->skyboxCtx, globalCtx->view.eye.x, globalCtx->view.eye.y, globalCtx->view.eye.z); + } + } + + func_80059EC8(globalCtx->cameraPtrs[globalCtx->activeCamera]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_play.c", 4508); +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/Gameplay_Draw.s") +#endif + +void Gameplay_Main(GlobalContext* globalCtx) { + D_8012D1F8 = &globalCtx->state.input[0]; + + DebugDisplay_Init(); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 4556); + } + + if ((HREG(80) == 10) && (HREG(94) != 10)) { + HREG(81) = 1; + HREG(82) = 1; + HREG(83) = 1; + HREG(84) = 3; + HREG(85) = 1; + HREG(86) = 1; + HREG(87) = 1; + HREG(88) = 1; + HREG(89) = 1; + HREG(90) = 15; + HREG(91) = 1; + HREG(92) = 1; + HREG(93) = 1; + HREG(94) = 10; + } + + if ((HREG(80) != 10) || (HREG(81) != 0)) { + Gameplay_Update(globalCtx); + } + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 4583) + } + + Gameplay_Draw(globalCtx); + + if (1 && HREG(63)) { + LOG_NUM("1", 1, "../z_play.c", 4587); + } +} + +// original name: "Game_play_demo_mode_check" +s32 Gameplay_InCsMode(GlobalContext* globalCtx) { + return (globalCtx->csCtx.state != 0) || func_8008E988(globalCtx); +} + +#ifdef NON_MATCHING +// saved register usage differences and possibly stack usage or regalloc differences +f32 func_800BFCB8(GlobalContext* globalCtx, MtxF* mf, Vec3f* vec) { + PosRot sp50; + f32 temp_f0; + f32 phi_f12; + f32 phi_f16; + f32 sp40; + f32 sp3C; + f32 sp38; + f32 sp34; + + sp40 = func_8003CB30(globalCtx, &globalCtx->colCtx, &sp50, mf); + + if (sp40 > -32000.0f) { + sp3C = sp50.rot.x * (1.0f / 32767.0f); + sp38 = sp50.rot.y * (1.0f / 32767.0f); + sp34 = sp50.rot.z * (1.0f / 32767.0f); + + temp_f0 = sqrtf(1.0f - SQ(sp3C)); + + if (temp_f0 != 0.0f) { + phi_f12 = sp38 * temp_f0; + phi_f16 = -sp34 * temp_f0; + } else { + phi_f12 = 0.0f; + phi_f16 = 0.0f; + } + + mf->xx = temp_f0; + mf->xy = -sp3C * phi_f12; + mf->xz = sp3C * phi_f16; + mf->yx = sp3C; + mf->yy = sp38; + mf->zy = phi_f16; + mf->zz = phi_f12; + mf->xw = 0.0f; + mf->yw = 0.0f; + mf->zx = 0.0f; + mf->zw = 0.0f; + mf->yz = sp34; + mf->wx = vec->x; + mf->wy = sp40; + mf->wz = vec->z; + mf->ww = 1.0f; + } else { + mf->yx = 0.0f; + mf->xz = 0.0f; + mf->xy = 0.0f; + mf->xx = 0.0f; + mf->zw = 0.0f; + mf->zx = 0.0f; + mf->yw = 0.0f; + mf->xw = 0.0f; + mf->zz = 0.0f; + mf->zy = 0.0f; + mf->yz = 0.0f; + mf->yy = 1.0f; + mf->wx = vec->x; + mf->wy = vec->y; + mf->wz = vec->z; + mf->ww = 1.0f; + } + + return sp40; +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BFCB8.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BFE5C.s") +void* Gameplay_LoadFile(GlobalContext* globalCtx, RomFile* file) { + u32 size; + void* allocp; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BFEC4.s") + size = file->vromEnd - file->vromStart; + allocp = Game_Alloc(&globalCtx->state, size, "../z_play.c", 4692); + DmaMgr_SendRequest1(allocp, file->vromStart, size, "../z_play.c", 4694); -void func_800BFF0C(GlobalContext* globalCtx, s32 a1) { - globalCtx->curSpawn = a1; + return allocp; +} + +void Gameplay_InitSkybox(GlobalContext* globalCtx, s16 skyboxId) { + func_800B0E50(globalCtx, &globalCtx->skyboxCtx, skyboxId); + func_8006F140(globalCtx, &globalCtx->envCtx, 0); +} + +void Gameplay_InitScene(GlobalContext* globalCtx, s32 spawn) { + globalCtx->curSpawn = spawn; globalCtx->linkActorEntry = NULL; globalCtx->unk_11DFC = NULL; globalCtx->setupEntranceList = NULL; @@ -64,91 +1469,386 @@ void func_800BFF0C(GlobalContext* globalCtx, s32 a1) { Object_InitBank(globalCtx, &globalCtx->objectCtx); func_8007A614(globalCtx, &globalCtx->lightCtx); func_80098CBC(globalCtx, &globalCtx->nbTransitionActors); - func_80096FD4(globalCtx, &globalCtx->roomCtx); + func_80096FD4(globalCtx, &globalCtx->roomCtx.curRoom); YREG(15) = 0; - gSaveContext.world_map_area = 0; - Scene_ExecuteCommands(globalCtx, globalCtx->unk_B0); - func_800BFEC4(globalCtx, globalCtx->skyboxId); + gSaveContext.worldMapArea = 0; + Scene_ExecuteCommands(globalCtx, globalCtx->sceneSegment); + Gameplay_InitSkybox(globalCtx, globalCtx->skyboxId); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/Area_Spawn.s") +void Gameplay_SpawnScene(GlobalContext* globalCtx, s32 sceneNum, s32 spawn) { + Scene* scene = &gSceneTable[sceneNum]; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C016C.s") + scene->unk_13 = 0; + globalCtx->loadedScene = scene; + globalCtx->sceneNum = sceneNum; + globalCtx->sceneConfig = scene->config; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0230.s") + osSyncPrintf("\nSCENE SIZE %fK\n", (scene->sceneFile.vromEnd - scene->sceneFile.vromStart) * 0.0009765625f); -s16 func_800C030C(GlobalContext* globalCtx) { - return globalCtx->cameraCtx.unk_5C0; + globalCtx->sceneSegment = Gameplay_LoadFile(globalCtx, &scene->sceneFile); + scene->unk_13 = 0; + if (globalCtx->sceneSegment == NULL) { + __assert("this->sceneSegment != NULL", "../z_play.c", 4960); + } + gSegments[2] = PHYSICAL_TO_VIRTUAL(globalCtx->sceneSegment); + + Gameplay_InitScene(globalCtx, spawn); + + osSyncPrintf("ROOM SIZE=%fK\n", func_80096FE8(globalCtx, &globalCtx->roomCtx) * 0.0009765625f); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0314.s") +void func_800C016C(GlobalContext* globalCtx, Vec3f* src, Vec3f* dest) { + f32 temp; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0384.s") + Matrix_Mult(&globalCtx->mf_11D60, MTXMODE_NEW); + Matrix_MultVec3f(src, dest); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0438.s") + temp = globalCtx->mf_11D60.ww + + (globalCtx->mf_11D60.xw * src->x + globalCtx->mf_11D60.yw * src->y + globalCtx->mf_11D60.zw * src->z); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C04A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C04D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C05E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0704.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0744.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C078C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0808.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0874.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C08AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0A44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0A88.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0AF4.s") - -void func_800C0B60(GlobalContext* globalCtx) { - gSaveContext.respawn[RESPAWN_MODE_DOWN].temp_swch_flags = globalCtx->actorCtx.flags.tempSwch; - gSaveContext.respawn[RESPAWN_MODE_DOWN].temp_collect_flags = globalCtx->actorCtx.flags.tempCollect; - gSaveContext.respawn_flag = 1; - globalCtx->sceneLoadFlag = 0x14; - globalCtx->nextEntranceIndex = gSaveContext.respawn[0].entrance_index; - globalCtx->fadeOutTransition = 2; + dest->x = 160.0f + ((dest->x / temp) * 160.0f); + dest->y = 120.0f - ((dest->y / temp) * 120.0f); } -void func_800C0BB4(GlobalContext* globalCtx) { - gSaveContext.respawn_flag = -1; - globalCtx->sceneLoadFlag = 0x14; +s16 Gameplay_CreateSubCamera(GlobalContext* globalCtx) { + s16 i; - if (globalCtx->sceneNum == SCENE_GANON_SONOGO || globalCtx->sceneNum == SCENE_GANON_FINAL || - globalCtx->sceneNum == SCENE_GANONTIKA_SONOGO || globalCtx->sceneNum == SCENE_GANON_DEMO) { - globalCtx->nextEntranceIndex = 0x043F; - Item_Give(globalCtx, ITEM_SWORD_MASTER); - } else if (gSaveContext.entrance_index == 0x028A || gSaveContext.entrance_index == 0x028E || - gSaveContext.entrance_index == 0x0292 || gSaveContext.entrance_index == 0x0476) { - globalCtx->nextEntranceIndex = 0x01F9; - } else { - globalCtx->nextEntranceIndex = gSaveContext.entrance_index; + for (i = 1; i < 4; i++) { + if (globalCtx->cameraPtrs[i] == NULL) { + break; + } } - globalCtx->fadeOutTransition = 2; + if (i == 4) { + osSyncPrintf(VT_COL(RED, WHITE) "camera control: error: fulled sub camera system area\n" VT_RST); + return -1; + } + + osSyncPrintf("camera control: " VT_BGCOL(CYAN) " " VT_COL(WHITE, BLUE) " create new sub camera [%d] " VT_BGCOL( + CYAN) " " VT_RST "\n", + i); + + globalCtx->cameraPtrs[i] = &globalCtx->cameras[i]; + func_80057C6C(globalCtx->cameraPtrs[i], &globalCtx->view, &globalCtx->colCtx, globalCtx); + globalCtx->cameraPtrs[i]->unk_164 = i; + + return i; } -void func_800C0C88(GlobalContext* globalCtx) { - func_800C0AF4(globalCtx, 0, 0xDFF); - func_800C0BB4(globalCtx); +s16 Gameplay_GetActiveCamId(GlobalContext* globalCtx) { + return globalCtx->activeCamera; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0CB8.s") +void Gameplay_ChangeCameraStatus(GlobalContext* globalCtx, s16 camId, s16 status) { + s16 camIdx = (camId == -1) ? globalCtx->activeCamera : camId; + + if (status == 7) { + globalCtx->activeCamera = camIdx; + } + + Camera_ChangeStatus(globalCtx->cameraPtrs[camIdx], status); +} + +void Gameplay_ClearCamera(GlobalContext* globalCtx, s16 camId) { + s16 camIdx = (camId == -1) ? globalCtx->activeCamera : camId; + + if (camIdx == 0) { + osSyncPrintf(VT_COL(RED, WHITE) "camera control: error: never clear camera !!\n" VT_RST); + } + + if (globalCtx->cameraPtrs[camIdx] != NULL) { + Camera_ChangeStatus(globalCtx->cameraPtrs[camIdx], 0x100); + globalCtx->cameraPtrs[camIdx] = NULL; + osSyncPrintf("camera control: " VT_BGCOL(CYAN) " " VT_COL(WHITE, BLUE) " clear sub camera [%d] " VT_BGCOL( + CYAN) " " VT_RST "\n", + camIdx); + } else { + osSyncPrintf(VT_COL(RED, WHITE) "camera control: error: camera No.%d already cleared\n" VT_RST, camIdx); + } +} + +void Gameplay_ClearAllSubCameras(GlobalContext* globalCtx) { + s16 i; + + for (i = 1; i < 4; i++) { + if (globalCtx->cameraPtrs[i] != NULL) { + Gameplay_ClearCamera(globalCtx, i); + } + } + + globalCtx->activeCamera = 0; +} + +Camera* Gameplay_GetCamera(GlobalContext* globalCtx, s16 camId) { + s16 camIdx = (camId == -1) ? globalCtx->activeCamera : camId; + + return globalCtx->cameraPtrs[camIdx]; +} + +s32 func_800C04D8(GlobalContext* globalCtx, s16 camId, Vec3f* arg2, Vec3f* arg3) { + u32 ret; + s16 camIdx = (camId == -1) ? globalCtx->activeCamera : camId; + Camera* camera; + Player* player; + + camera = globalCtx->cameraPtrs[camIdx]; + + ret = func_8005AA90(camera, 1, arg2); + ret *= 2; + ret |= func_8005AA90(camera, 2, arg3); + + if (1) {} // Necessary to match + + camera->unk_DC = func_800CB678(arg2, arg3); + + player = camera->player; + if (player != NULL) { + camera->unk_E4.x = arg2->x - player->actor.posRot.pos.x; + camera->unk_E4.y = arg2->y - player->actor.posRot.pos.y; + camera->unk_E4.z = arg2->z - player->actor.posRot.pos.z; + } else { + camera->unk_E4.x = camera->unk_E4.y = camera->unk_E4.z = 0.0f; + } + + camera->unk_100 = 0.01f; + + return ret; +} + +#ifdef NON_MATCHING +// missing an extra stack store/load instruction pair +s32 func_800C05E4(GlobalContext* globalCtx, s16 camId, Vec3f* arg2, Vec3f* arg3, Vec3f* arg4) { + u32 ret; + s16 camIdx = (camId == -1) ? globalCtx->activeCamera : camId; + Camera* camera; + Player* player; + + camera = globalCtx->cameraPtrs[camIdx]; + + if (1) {} // Probably necessary to match + + ret = func_8005AA90(camera, 1, arg2); + ret *= 2; + ret |= func_8005AA90(camera, 2, arg3); + ret *= 2; + ret |= func_8005AA90(camera, 4, arg4); + + camera->unk_DC = func_800CB678(arg2, arg3); + + player = camera->player; + if (player != NULL) { + camera->unk_E4.x = arg2->x - player->actor.posRot.pos.x; + camera->unk_E4.y = arg2->y - player->actor.posRot.pos.y; + camera->unk_E4.z = arg2->z - player->actor.posRot.pos.z; + } else { + camera->unk_E4.x = camera->unk_E4.y = camera->unk_E4.z = 0.0f; + } + + camera->unk_100 = 0.01f; + + return ret; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C05E4.s") +#endif + +#ifdef NON_MATCHING +// missing an extra move instruction +s32 func_800C0704(GlobalContext* globalCtx, s16 camId, f32 arg2) { + return (func_8005AA90(globalCtx->cameraPtrs[camId], 32, &arg2) & 1); +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0704.s") +#endif + +s32 func_800C0744(GlobalContext* globalCtx, s16 camId, s16 arg2) { + s16 camIdx = (camId == -1) ? globalCtx->activeCamera : camId; + Camera* camera; + + camera = globalCtx->cameraPtrs[camIdx]; + camera->unk_15A = arg2; + + return 1; +} + +void func_800C078C(GlobalContext* globalCtx, s16 camId1, s16 camId2) { + s16 camIdx2 = (camId2 == -1) ? globalCtx->activeCamera : camId2; + s16 camIdx1 = (camId1 == -1) ? globalCtx->activeCamera : camId1; + + func_8005AE64(globalCtx->cameraPtrs[camIdx1], globalCtx->cameraPtrs[camIdx2]); +} + +void func_800C0808(GlobalContext* globalCtx, s16 camId, s32 arg2, s16 arg3) { + Camera* camera; + s16 camIdx = (camId == -1) ? globalCtx->activeCamera : camId; + + camera = globalCtx->cameraPtrs[camIdx]; + func_80058148(camera, arg2); + func_8005A77C(camera, arg3); +} + +void func_800C0874(GlobalContext* globalCtx, s16 camId, s16 arg2) { + func_8005A77C(Gameplay_GetCamera(globalCtx, camId), arg2); +} + +void func_800C08AC(GlobalContext* globalCtx, s16 camId, s16 arg2) { + s16 camIdx = (camId == -1) ? globalCtx->activeCamera : camId; + s16 i; + + Gameplay_ClearCamera(globalCtx, camIdx); + + for (i = 1; i < 4; i++) { + if (globalCtx->cameraPtrs[i] != NULL) { + osSyncPrintf( + VT_COL(RED, WHITE) "camera control: error: return to main, other camera left. %d cleared!!\n" VT_RST, + i); + Gameplay_ClearCamera(globalCtx, i); + } + } + + if (arg2 <= 0) { + Gameplay_ChangeCameraStatus(globalCtx, 0, 7); + globalCtx->cameraPtrs[0]->unk_14E = globalCtx->cameraPtrs[0]->unk_162 = 0; + } else { + func_800800F8(globalCtx, 1020, arg2, NULL, 0); + } +} + +s16 func_800C09A4(GlobalContext* globalCtx, s16 camId) { + Camera* camera = globalCtx->cameraPtrs[camId]; + + if (camera != NULL) { + return camera->unk_130; + } else { + return -1; + } +} + +s16 func_800C09D8(GlobalContext* globalCtx, s16 camId, s16 arg2) { + Camera* camera = globalCtx->cameraPtrs[camId]; + + if (camera != NULL) { + return 0; + } else if (camera->unk_130 != arg2) { + return 0; + } else if (camera->unk_140 != 7) { + return 2; + } else { + return 1; + } +} + +void Gameplay_SaveSceneFlags(GlobalContext* globalCtx) { + SaveSceneFlags* sceneFlags = &gSaveContext.sceneFlags[globalCtx->sceneNum]; + + sceneFlags->chest = globalCtx->actorCtx.flags.chest; + sceneFlags->swch = globalCtx->actorCtx.flags.swch; + sceneFlags->clear = globalCtx->actorCtx.flags.clear; + sceneFlags->collect = globalCtx->actorCtx.flags.collect; +} + +void Gameplay_SetRespawnData(GlobalContext* globalCtx, s32 respawnMode, s16 entranceIndex, s32 roomIndex, + s32 playerParams, Vec3f* pos, s16 yaw) { + RespawnData* respawnData = &gSaveContext.respawn[respawnMode]; + + respawnData->entranceIndex = entranceIndex; + respawnData->roomIndex = roomIndex; + respawnData->pos = *pos; + respawnData->yaw = yaw; + respawnData->playerParams = playerParams; + respawnData->tempSwchFlags = globalCtx->actorCtx.flags.tempSwch; + respawnData->tempCollectFlags = globalCtx->actorCtx.flags.tempCollect; +} + +void Gameplay_SetupRespawnPoint(GlobalContext* globalCtx, s32 respawnMode, s32 playerParams) { + Player* player = PLAYER; + s32 entranceIndex; + s8 roomIndex; + + if ((globalCtx->sceneNum != SCENE_YOUSEI_IZUMI_TATE) && (globalCtx->sceneNum != SCENE_KAKUSIANA)) { + roomIndex = globalCtx->roomCtx.curRoom.num; + entranceIndex = gSaveContext.entranceIndex; + Gameplay_SetRespawnData(globalCtx, respawnMode, entranceIndex, roomIndex, playerParams, + &player->actor.posRot.pos, player->actor.shape.rot.y); + } +} + +void Gameplay_TriggerVoidOut(GlobalContext* globalCtx) { + gSaveContext.respawn[RESPAWN_MODE_DOWN].tempSwchFlags = globalCtx->actorCtx.flags.tempSwch; + gSaveContext.respawn[RESPAWN_MODE_DOWN].tempCollectFlags = globalCtx->actorCtx.flags.tempCollect; + gSaveContext.respawnFlag = 1; + globalCtx->sceneLoadFlag = 0x14; + globalCtx->nextEntranceIndex = gSaveContext.respawn[0].entranceIndex; + globalCtx->fadeTransition = 2; +} + +void Gameplay_LoadToLastEntrance(GlobalContext* globalCtx) { + gSaveContext.respawnFlag = -1; + globalCtx->sceneLoadFlag = 0x14; + + if ((globalCtx->sceneNum == SCENE_GANON_SONOGO) || (globalCtx->sceneNum == SCENE_GANON_FINAL) || + (globalCtx->sceneNum == SCENE_GANONTIKA_SONOGO) || (globalCtx->sceneNum == SCENE_GANON_DEMO)) { + globalCtx->nextEntranceIndex = 0x043F; + Item_Give(globalCtx, ITEM_SWORD_MASTER); + } else if ((gSaveContext.entranceIndex == 0x028A) || (gSaveContext.entranceIndex == 0x028E) || + (gSaveContext.entranceIndex == 0x0292) || (gSaveContext.entranceIndex == 0x0476)) { + globalCtx->nextEntranceIndex = 0x01F9; + } else { + globalCtx->nextEntranceIndex = gSaveContext.entranceIndex; + } + + globalCtx->fadeTransition = 2; +} + +void Gameplay_TriggerRespawn(GlobalContext* globalCtx) { + Gameplay_SetupRespawnPoint(globalCtx, RESPAWN_MODE_DOWN, 0xDFF); + Gameplay_LoadToLastEntrance(globalCtx); +} + +s32 func_800C0CB8(GlobalContext* globalCtx) { + return (globalCtx->roomCtx.curRoom.mesh->polygon.type != 1) && (YREG(15) != 0x20) && (YREG(15) != 0x30) && + (YREG(15) != 0x40) && (globalCtx->sceneNum != SCENE_HAIRAL_NIWA); +} s32 func_800C0D28(GlobalContext* globalCtx) { - return globalCtx->unk_7B8 != 0; + return (globalCtx->sub_7B8.unk_0 != 0); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0D34.s") +s32 func_800C0D34(GlobalContext* globalCtx, Actor* actor, s16* yaw) { + TransitionActorEntry* transitionActor; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0DB4.s") + if (actor->type != ACTORTYPE_DOOR) { + return 0; + } + + transitionActor = &globalCtx->transitionActorList[(u16)actor->params >> 10]; + + if (transitionActor->backRoom == transitionActor->frontRoom) { + return 0; + } + + if (actor->room == transitionActor->frontRoom) { + *yaw = actor->shape.rot.y; + } else { + *yaw = actor->shape.rot.y + 0x8000; + } + + return 1; +} + +s32 func_800C0DB4(GlobalContext* globalCtx, Vec3f* arg1) { + UNK_TYPE sp3C; + CollisionPoly* sp38; + Vec3f sp2C; + s32 sp28; + + sp2C = *arg1; + + if ((func_8004213C(globalCtx, &globalCtx->colCtx, sp2C.x, sp2C.z, &sp2C.y, &sp3C) == 1) && (arg1->y < sp2C.y) && + (func_8003C940(&globalCtx->colCtx, &sp38, &sp28, &sp2C) != -32000.0f)) { + return 1; + } else { + return 0; + } +} diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 4ddb530fe8..dc2aef74e1 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -3,22 +3,22 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008E750.s") -UNK_TYPE func_8008E8DC(GlobalContext* globalCtx, Player* player) { +s32 func_8008E8DC(GlobalContext* globalCtx, Player* player) { return (player->stateFlags1 & 0x20000080 || player->action || globalCtx->sceneLoadFlag == 0x14 || player->stateFlags1 & 1 || player->unk_692 & 0x80 || - gSaveContext.unk_13F0 && func_8008F0D8(player, player->unk_154) >= 0); + (gSaveContext.unk_13F0 && func_8008F0D8(player, player->unk_154) >= 0)); } -UNK_TYPE func_8008E988(GlobalContext* globalCtx) { +s32 func_8008E988(GlobalContext* globalCtx) { Player* player = PLAYER; return func_8008E8DC(globalCtx, player) || player->unk_6AD == 4; } -UNK_TYPE func_8008E9C4(Player* player) { +s32 func_8008E9C4(Player* player) { return player->stateFlags1 & 0x10; } -UNK_TYPE func_8008E9D0(Player* player) { +s32 func_8008E9D0(Player* player) { return LINK_IS_CHILD && player->currentShield == 2; } @@ -38,7 +38,7 @@ void func_8008EC70(Player* player) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008ECAC.s") -void func_8008ED9C(GlobalContext* globalCtx, Player* player, UNK_TYPE item, UNK_TYPE arg2) { +void func_8008ED9C(GlobalContext* globalCtx, Player* player, s32 item, s32 arg2) { Inventory_UpdateBottleItem(globalCtx, item, player->unk_150); if (item != ITEM_BOTTLE) { player->unk_152 = item; @@ -56,7 +56,7 @@ void func_8008EDF0(Player* player) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008EEAC.s") -UNK_TYPE func_8008EF44(GlobalContext* globalCtx, UNK_TYPE arg1) { +s32 func_8008EF44(GlobalContext* globalCtx, s32 arg1) { globalCtx->unk_11E5C = (arg1 + 1); return 1; } @@ -75,17 +75,17 @@ void func_8008F08C(GlobalContext* globalCtx) { player->currentMask = 0; } -UNK_TYPE func_8008F098(GlobalContext* globalCtx) { +s32 func_8008F098(GlobalContext* globalCtx) { Player* player = PLAYER; return player->currentShield == 3; } -UNK_TYPE func_8008F0AC(GlobalContext* globalCtx) { +s32 func_8008F0AC(GlobalContext* globalCtx) { Player* player = PLAYER; return player->unk_15D == 0xa && player->currentShield == 3; } -s32 func_8008F0D8(Player* player, UNK_TYPE arg1) { +s32 func_8008F0D8(Player* player, s32 arg1) { s32 temp_v0 = arg1 - 0x15; if (temp_v0 >= 0 && temp_v0 < 6) { return temp_v0; @@ -93,15 +93,15 @@ s32 func_8008F0D8(Player* player, UNK_TYPE arg1) { return -1; } -UNK_TYPE func_8008F104(Player* player) { +s32 func_8008F104(Player* player) { return player->unk_151 == 0x10 || player->unk_151 == 0x11; } -UNK_TYPE func_8008F128(Player* player) { +s32 func_8008F128(Player* player) { return func_8008F104(player) && player->heldActor == NULL; } -s32 func_8008F158(UNK_TYPE arg0) { +s32 func_8008F158(s32 arg0) { s32 temp_v0 = arg0 - 2; if (temp_v0 > 0 && temp_v0 < 6) { return temp_v0; @@ -113,7 +113,7 @@ void func_8008F180(Player* player) { func_8008F158(player->unk_151); } -UNK_TYPE func_8008F1A0(Player* player) { +s32 func_8008F1A0(Player* player) { if (player->unk_151 >= 5 && player->unk_151 < 8) { return 1; } @@ -122,7 +122,7 @@ UNK_TYPE func_8008F1A0(Player* player) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008F1CC.s") -s32 func_8008F224(Player* player, UNK_TYPE arg1) { +s32 func_8008F224(Player* player, s32 arg1) { s32 temp_v0 = arg1 - 0x1E; if (temp_v0 >= 0 && temp_v0 < 0xD) { return temp_v0; @@ -134,7 +134,7 @@ void func_8008F250(Player* player) { func_8008F224(player, player->unk_151); } -s32 func_8008F270(Player* player, UNK_TYPE arg1) { +s32 func_8008F270(Player* player, s32 arg1) { s32 temp_v0 = arg1 - 0x12; if (temp_v0 >= 0 && temp_v0 < 2) { return temp_v0; diff --git a/src/code/z_quake.c b/src/code/z_quake.c index 78c05be345..da0cf92a2e 100644 --- a/src/code/z_quake.c +++ b/src/code/z_quake.c @@ -144,7 +144,7 @@ s16 Quake_GetFreeIndex() { QuakeRequest* Quake_AddImpl(Camera* cam, u32 callbackIdx) { s16 idx = Quake_GetFreeIndex(); - QuakeRequest* req = sQuakeRequest + idx; + QuakeRequest* req = &sQuakeRequest[idx]; func_80106860(req, 0, sizeof(QuakeRequest)); // memset req->cam = cam; @@ -164,7 +164,8 @@ void Quake_Remove(QuakeRequest* req) { } QuakeRequest* Quake_GetRequest(s16 idx) { - QuakeRequest* req = sQuakeRequest + (idx & 3); + QuakeRequest* req = &sQuakeRequest[idx & 3]; + if (req->callbackIdx == 0) { return NULL; } @@ -329,7 +330,7 @@ s16 Quake_Calc(Camera* camera, UnkQuakeCalcStruct* camData) { for (idx = 0; idx < ARRAY_COUNT(sQuakeRequest); idx++) { req = &sQuakeRequest[idx]; if (req->callbackIdx != 0) { - if (globalCtx->cameraCtx.activeCameraPtrs[req->camPtrIdx] == 0) { + if (globalCtx->cameraPtrs[req->camPtrIdx] == 0) { osSyncPrintf(VT_COL(YELLOW, BLACK) "quake: stopped! 'coz camera [%d] killed!!\n" VT_RST, req->camPtrIdx); Quake_Remove(req); diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c index 7544056559..11ae432212 100644 --- a/src/code/z_rcp.c +++ b/src/code/z_rcp.c @@ -1460,12 +1460,10 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { gSPDisplayList(gfxCtx->polyOpa.p++, sFillSetupDL); gSPDisplayList(gfxCtx->polyXlu.p++, sFillSetupDL); gSPDisplayList(gfxCtx->overlay.p++, sFillSetupDL); - gDPSetScissorFrac(gfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, (s32)gScreenWidth * 4.0f, - (s32)gScreenHeight * 4.0f); - gDPSetScissorFrac(gfxCtx->polyXlu.p++, G_SC_NON_INTERLACE, 0, 0, (s32)gScreenWidth * 4.0f, - (s32)gScreenHeight * 4.0f); - gDPSetScissorFrac(gfxCtx->overlay.p++, G_SC_NON_INTERLACE, 0, 0, (s32)gScreenWidth * 4.0f, - (s32)gScreenHeight * 4.0f); + + gDPSetScissorFrac(gfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f); + gDPSetScissorFrac(gfxCtx->polyXlu.p++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f); + gDPSetScissorFrac(gfxCtx->overlay.p++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f); gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); @@ -1554,8 +1552,7 @@ void func_80095974(GraphicsContext* gfxCtx) { Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2503); gSPDisplayList(gfxCtx->polyOpa.p++, sFillSetupDL); - gDPSetScissorFrac(gfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, (s32)gScreenWidth * 4.0f, - (s32)gScreenHeight * 4.0f); + gDPSetScissorFrac(gfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f); gDPSetDepthImage(gfxCtx->polyOpa.p++, gZBuffer); gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); diff --git a/src/code/z_room.c b/src/code/z_room.c index 442dee0ace..600f4e0144 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -29,7 +29,7 @@ void (*sRoomDrawHandlers[])(GlobalContext* globalCtx, Room* room, u32 flags) = { func_80095D04, }; -void func_80095AA0(GlobalContext* globalCtx, Room* room, UNK_TYPE arg2, UNK_TYPE arg3) { +void func_80095AA0(GlobalContext* globalCtx, Room* room, Input* arg2, UNK_TYPE arg3) { } // Room Draw Polygon Type 0 @@ -343,7 +343,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) { gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 628); - camera = globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]; + camera = globalCtx->cameraPtrs[globalCtx->activeCamera]; polygon1 = &room->mesh->polygon1; sp9C = (camera->unk_142 ^ 25) == 0; polygonDlist = SEGMENTED_TO_VIRTUAL(polygon1->dlist); @@ -405,7 +405,7 @@ BgImage* func_80096A74(PolygonType1* polygon1, GlobalContext* globalCtx) { BgImage* bgImage; s32 i; - camera = globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]; + camera = globalCtx->cameraPtrs[globalCtx->activeCamera]; camId = camera->unk_148; camId2 = func_80041C10(&globalCtx->colCtx, camId, 50)->unk_0E; if (camId2 >= 0) { @@ -449,7 +449,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) { gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 752); - camera = globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]; + camera = globalCtx->cameraPtrs[globalCtx->activeCamera]; sp98 = (camera->unk_142 ^ 25) == 0; polygon1 = &room->mesh->polygon1; polygonDlist = SEGMENTED_TO_VIRTUAL(polygon1->dlist); @@ -576,8 +576,8 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) { roomCtx->unk_30 = 0; roomCtx->status = 0; - if (gSaveContext.respawn_flag > 0) { - nextRoomNum = gSaveContext.respawn[gSaveContext.respawn_flag - 1].room_index; + if (gSaveContext.respawnFlag > 0) { + nextRoomNum = gSaveContext.respawn[gSaveContext.respawnFlag - 1].roomIndex; } else { nextRoomNum = globalCtx->setupEntranceList[globalCtx->curSpawn].room; } diff --git a/src/code/z_sample.c b/src/code/z_sample.c index 38add9d423..73d502a06e 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -2,21 +2,17 @@ #include #include -void Sample_Calc(SampleContext* this) { +void Sample_HandleStateChange(SampleContext* this) { if (!~(this->state.input[0].press.in.button | ~START_BUTTON)) { - SET_NEXT_GAMESTATE(&this->state, func_800BCA64, GlobalContext); + SET_NEXT_GAMESTATE(&this->state, Gameplay_Init, GlobalContext); this->state.running = false; } } -// very close from matching, the only difference is the place of "mtx" in the stack -#ifdef NON_MATCHING void Sample_Draw(SampleContext* this) { - u32 pad; GraphicsContext* gfxCtx = this->state.gfxCtx; View* view = &this->view; - Gfx* dispRefs[4]; - Mtx* mtx; + Gfx* dispRefs[5]; Graph_OpenDisps(dispRefs, gfxCtx, "../z_sample.c", 62); @@ -25,12 +21,14 @@ void Sample_Draw(SampleContext* this) { func_80095248(gfxCtx, 0, 0, 0); - view->unk_120 = 7; + view->flags = 1 | 2 | 4; func_800AAA50(view, 15); - mtx = Graph_Alloc(gfxCtx, sizeof(Mtx)); - func_80103D58(mtx, SREG(37), SREG(38), SREG(39), 1.0f, SREG(40), SREG(41), SREG(42)); - gSPMatrix(gfxCtx->polyOpa.p++, mtx, G_MTX_LOAD); + if (1) { + Mtx* mtx = Graph_Alloc(gfxCtx, sizeof(Mtx)); + func_80103D58(mtx, SREG(37), SREG(38), SREG(39), 1.0f, SREG(40), SREG(41), SREG(42)); + gSPMatrix(gfxCtx->polyOpa.p++, mtx, G_MTX_LOAD); + } gfxCtx->polyOpa.p = Gfx_SetFog2(gfxCtx->polyOpa.p, 0xFF, 0xFF, 0xFF, 0, 0, 0); func_80093D18(gfxCtx); @@ -42,13 +40,10 @@ void Sample_Draw(SampleContext* this) { Graph_CloseDisps(dispRefs, gfxCtx, "../z_sample.c", 111); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_sample/Sample_Draw.s") -#endif -void Sample_Update(SampleContext* this) { +void Sample_Main(SampleContext* this) { Sample_Draw(this); - Sample_Calc(this); + Sample_HandleStateChange(this); } void Sample_Destroy(SampleContext* this) { @@ -57,21 +52,21 @@ void Sample_Destroy(SampleContext* this) { void Sample_SetupView(SampleContext* this) { View* view; GraphicsContext* gfxCtx; - u32 v0[4]; + Viewport viewport; Vec3f v1; Vec3f v2; Vec3f v3; view = &this->view; gfxCtx = this->state.gfxCtx; - func_800AA278(view, gfxCtx); + View_Init(view, gfxCtx); // clang-format off - v0[1] = SCREEN_HEIGHT; v0[3] = SCREEN_WIDTH; - v0[0] = 0; v0[2] = 0; + viewport.bottomY = SCREEN_HEIGHT; viewport.rightX = SCREEN_WIDTH; + viewport.topY = 0; viewport.leftX = 0; // clang-format on - func_800AA4FC(view, &v0); + View_SetViewport(view, &viewport); func_800AA460(view, 60, 10, 12800); v1.x = 0; @@ -95,7 +90,7 @@ void Sample_LoadTitleStatic(SampleContext* this) { } void Sample_Init(SampleContext* this) { - this->state.main = Sample_Update; + this->state.main = Sample_Main; this->state.destroy = Sample_Destroy; R_UPDATE_RATE = 1; Sample_SetupView(this); diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 6ad51d2ee3..3bf7e0dec8 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -44,7 +44,7 @@ void Object_InitBank(GlobalContext* globalCtx, ObjectContext* objectCtx) { if (globalCtx2->sceneNum == SCENE_SPOT00) { spaceSize = 1024000; } else if (globalCtx2->sceneNum == SCENE_GANON_DEMO) { - if (gSaveContext.scene_setup_index != 4) { + if (gSaveContext.sceneSetupIndex != 4) { spaceSize = 1177600; } else { spaceSize = 1024000; @@ -203,9 +203,9 @@ void func_80098508(GlobalContext* globalCtx, SceneCmd* cmd) { s32 linkAge; globalCtx->linkActorEntry = linkEntry; - globalCtx->linkAgeOnLoad = gSaveContext.link_age; + globalCtx->linkAgeOnLoad = gSaveContext.linkAge; - linkAge = gSaveContext.link_age; + linkAge = gSaveContext.linkAge; linkObjectId = gLinkObjectIds[linkAge]; gActorOverlayTable[linkEntry->id].initInfo->objectId = linkObjectId; @@ -261,7 +261,7 @@ void func_8009883C(GlobalContext* globalCtx, SceneCmd* cmd) { } if (cmd->specialFiles.cUpElfMsgNum != 0) { - globalCtx->cUpElfMsgs = func_800BFE5C(globalCtx, &sNaviMsgFiles[cmd->specialFiles.cUpElfMsgNum - 1]); + globalCtx->cUpElfMsgs = Gameplay_LoadFile(globalCtx, &sNaviMsgFiles[cmd->specialFiles.cUpElfMsgNum - 1]); } } @@ -362,21 +362,21 @@ void func_80098CBC(GlobalContext* globalCtx, u8* nbTransitionActors) { // Scene Command 0x0F: Light Setting List void func_80098CC8(GlobalContext* globalCtx, SceneCmd* cmd) { - globalCtx->nbLightSettings = cmd->lightSettingList.num; - globalCtx->lightSettingsList = SEGMENTED_TO_VIRTUAL(cmd->lightSettingList.segment); + globalCtx->envCtx.nbLightSettings = cmd->lightSettingList.num; + globalCtx->envCtx.lightSettingsList = SEGMENTED_TO_VIRTUAL(cmd->lightSettingList.segment); } // Scene Command 0x11: Skybox Settings void func_80098D1C(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->skyboxId = cmd->skyboxSettings.skyboxId; - globalCtx->gloomySky = globalCtx->unk_10A3C = cmd->skyboxSettings.unk_05; - globalCtx->unk_10A42 = cmd->skyboxSettings.unk_06; + globalCtx->envCtx.gloomySky = globalCtx->envCtx.unk_18 = cmd->skyboxSettings.unk_05; + globalCtx->envCtx.unk_1E = cmd->skyboxSettings.unk_06; } // Scene Command 0x12: Skybox Disables void func_80098D5C(GlobalContext* globalCtx, SceneCmd* cmd) { - globalCtx->skyDisabled = cmd->skyboxDisables.unk_04; - globalCtx->sunMoonDisabled = cmd->skyboxDisables.unk_05; + globalCtx->envCtx.skyDisabled = cmd->skyboxDisables.unk_04; + globalCtx->envCtx.sunMoonDisabled = cmd->skyboxDisables.unk_05; } // Scene Command 0x10: Time Settings @@ -384,38 +384,38 @@ void func_80098D80(GlobalContext* globalCtx, SceneCmd* cmd) { u32 dayTime; if ((cmd->timeSettings.hour != 0xFF) && (cmd->timeSettings.min != 0xFF)) { - gSaveContext.environment_time = gSaveContext.day_time = + gSaveContext.environmentTime = gSaveContext.dayTime = ((cmd->timeSettings.hour + (cmd->timeSettings.min / 60.0f)) * 60.0f) / 0.021972656f; } if (cmd->timeSettings.unk_06 != 0xFF) { - globalCtx->unk_10A26 = cmd->timeSettings.unk_06; + globalCtx->envCtx.unk_02 = cmd->timeSettings.unk_06; } else { - globalCtx->unk_10A26 = 0; + globalCtx->envCtx.unk_02 = 0; } if (gSaveContext.unk_1422 == 0) { - D_8011FB40 = globalCtx->unk_10A26; + D_8011FB40 = globalCtx->envCtx.unk_02; } - dayTime = gSaveContext.day_time; - globalCtx->unk_10A28 = -(Math_Sins(dayTime - 0x8000) * 120.0f) * 25.0f; - dayTime = gSaveContext.day_time; - globalCtx->unk_10A2C = (Math_Coss(dayTime - 0x8000) * 120.0f) * 25.0f; - dayTime = gSaveContext.day_time; - globalCtx->unk_10A30 = (Math_Coss(dayTime - 0x8000) * 20.0f) * 25.0f; + dayTime = gSaveContext.dayTime; + globalCtx->envCtx.unk_04.x = -(Math_Sins(dayTime - 0x8000) * 120.0f) * 25.0f; + dayTime = gSaveContext.dayTime; + globalCtx->envCtx.unk_04.y = (Math_Coss(dayTime - 0x8000) * 120.0f) * 25.0f; + dayTime = gSaveContext.dayTime; + globalCtx->envCtx.unk_04.z = (Math_Coss(dayTime - 0x8000) * 20.0f) * 25.0f; - if (((globalCtx->unk_10A26 == 0) && (gSaveContext.cutscene_index < 0xFFF0)) || - (gSaveContext.entrance_index == 0x0604)) { - gSaveContext.environment_time = gSaveContext.day_time; - if ((gSaveContext.environment_time >= 0x2AAC) && (gSaveContext.environment_time < 0x4555)) { - gSaveContext.environment_time = 0x3556; - } else if ((gSaveContext.environment_time >= 0x4555) && (gSaveContext.environment_time < 0x5556)) { - gSaveContext.environment_time = 0x5556; - } else if ((gSaveContext.environment_time >= 0xAAAB) && (gSaveContext.environment_time < 0xB556)) { - gSaveContext.environment_time = 0xB556; - } else if ((gSaveContext.environment_time >= 0xC001) && (gSaveContext.environment_time < 0xCAAC)) { - gSaveContext.environment_time = 0xCAAC; + if (((globalCtx->envCtx.unk_02 == 0) && (gSaveContext.cutsceneIndex < 0xFFF0)) || + (gSaveContext.entranceIndex == 0x0604)) { + gSaveContext.environmentTime = gSaveContext.dayTime; + if ((gSaveContext.environmentTime >= 0x2AAC) && (gSaveContext.environmentTime < 0x4555)) { + gSaveContext.environmentTime = 0x3556; + } else if ((gSaveContext.environmentTime >= 0x4555) && (gSaveContext.environmentTime < 0x5556)) { + gSaveContext.environmentTime = 0x5556; + } else if ((gSaveContext.environmentTime >= 0xAAAB) && (gSaveContext.environmentTime < 0xB556)) { + gSaveContext.environmentTime = 0xB556; + } else if ((gSaveContext.environmentTime >= 0xC001) && (gSaveContext.environmentTime < 0xCAAC)) { + gSaveContext.environmentTime = 0xCAAC; } } } @@ -426,10 +426,10 @@ void func_80099090(GlobalContext* globalCtx, SceneCmd* cmd) { s8 temp2 = cmd->windSettings.unk_05; s8 temp3 = cmd->windSettings.unk_06; - globalCtx->unk_10ACC = temp1; - globalCtx->unk_10ACE = temp2; - globalCtx->unk_10AD0 = temp3; - globalCtx->unk_10AD4 = cmd->windSettings.unk_07; + globalCtx->envCtx.unk_A8 = temp1; + globalCtx->envCtx.unk_AA = temp2; + globalCtx->envCtx.unk_AC = temp3; + globalCtx->envCtx.unk_B0 = cmd->windSettings.unk_07; } // Scene Command 0x13: Exit List @@ -446,7 +446,7 @@ void func_80099140(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->soundCtx.musicSeq = cmd->soundSettings.musicSeq; globalCtx->soundCtx.nighttimeSFX = cmd->soundSettings.nighttimeSFX; - if (gSaveContext.seq_index == 0xFF) { + if (gSaveContext.seqIndex == 0xFF) { Audio_SetBGM(cmd->soundSettings.bgmId | 0xF0000000); } } @@ -463,13 +463,13 @@ void func_800991A0(GlobalContext* globalCtx, SceneCmd* cmd) { SceneCmd** altHeaders; SceneCmd* altHeader; - osSyncPrintf("\n[ZU]sceneset age =[%X]", gSaveContext.link_age); - osSyncPrintf("\n[ZU]sceneset time =[%X]", gSaveContext.cutscene_index); - osSyncPrintf("\n[ZU]sceneset counter=[%X]", gSaveContext.scene_setup_index); + osSyncPrintf("\n[ZU]sceneset age =[%X]", gSaveContext.linkAge); + osSyncPrintf("\n[ZU]sceneset time =[%X]", gSaveContext.cutsceneIndex); + osSyncPrintf("\n[ZU]sceneset counter=[%X]", gSaveContext.sceneSetupIndex); - if (gSaveContext.scene_setup_index != 0) { + if (gSaveContext.sceneSetupIndex != 0) { altHeaders = SEGMENTED_TO_VIRTUAL(cmd->altHeaders.segment); - altHeader = altHeaders[gSaveContext.scene_setup_index - 1]; + altHeader = altHeaders[gSaveContext.sceneSetupIndex - 1]; if (altHeader != NULL) { Scene_ExecuteCommands(globalCtx, SEGMENTED_TO_VIRTUAL(altHeader)); @@ -478,9 +478,9 @@ void func_800991A0(GlobalContext* globalCtx, SceneCmd* cmd) { // Translates to: "COUGHH! THERE IS NO SPECIFIED DATAAAAA!" osSyncPrintf("\nげぼはっ！ 指定されたデータがないでええっす！"); - if (gSaveContext.scene_setup_index == 3) { + if (gSaveContext.sceneSetupIndex == 3) { altHeaders = SEGMENTED_TO_VIRTUAL(cmd->altHeaders.segment); - altHeader = altHeaders[gSaveContext.scene_setup_index - 2]; + altHeader = altHeaders[gSaveContext.sceneSetupIndex - 2]; // Translates to: "USING ADULT DAY DATA THERE!" osSyncPrintf("\nそこで、大人の昼データを使用するでええっす！！"); @@ -507,20 +507,20 @@ void func_8009934C(GlobalContext* globalCtx, SceneCmd* cmd) { // Scene Command 0x19: Misc. Settings (Camera & World Map Area) void func_800993C0(GlobalContext* globalCtx, SceneCmd* cmd) { YREG(15) = cmd->miscSettings.cameraMovement; - gSaveContext.world_map_area = cmd->miscSettings.area; + gSaveContext.worldMapArea = cmd->miscSettings.area; if ((globalCtx->sceneNum == SCENE_SHOP1) || (globalCtx->sceneNum == SCENE_SYATEKIJYOU)) { if (LINK_AGE_IN_YEARS == YEARS_ADULT) { - gSaveContext.world_map_area = 1; + gSaveContext.worldMapArea = 1; } } if (((globalCtx->sceneNum >= SCENE_SPOT00) && (globalCtx->sceneNum <= SCENE_GANON_TOU)) || ((globalCtx->sceneNum >= SCENE_ENTRA) && (globalCtx->sceneNum <= SCENE_SHRINE_R))) { - if (gSaveContext.cutscene_index < 0xFFF0) { - gSaveContext.world_map_area_data |= gBitFlags[gSaveContext.world_map_area]; - osSyncPrintf("０００ ａｒｅａ＿ａｒｒｉｖａｌ＝%x (%d)\n", gSaveContext.world_map_area_data, - gSaveContext.world_map_area); + if (gSaveContext.cutsceneIndex < 0xFFF0) { + gSaveContext.worldMapAreaData |= gBitFlags[gSaveContext.worldMapArea]; + osSyncPrintf("０００ ａｒｅａ＿ａｒｒｉｖａｌ＝%x (%d)\n", gSaveContext.worldMapAreaData, + gSaveContext.worldMapArea); } } } diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index f4893ac56f..381c167a0c 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -1,526 +1,791 @@ #include #include +#define ENTRANCE(scene, spawn, continueBgm, displayTitleCard, fadeIn, fadeOut) \ + { \ + scene, spawn, \ + ((continueBgm & 1) << 15) | ((displayTitleCard & 1) << 14) | ((fadeIn & 0x7F) << 7) | (fadeOut & 0x7F) \ + } + EntranceInfo gEntranceTable[] = { - { 0x00, 0x00, 0, 1, 0x02, 0x02 }, { 0x00, 0x00, 0, 1, 0x02, 0x02 }, { 0x00, 0x00, 0, 1, 0x02, 0x02 }, - { 0x00, 0x00, 0, 1, 0x02, 0x02 }, { 0x01, 0x00, 0, 1, 0x02, 0x02 }, { 0x01, 0x00, 0, 1, 0x02, 0x02 }, - { 0x01, 0x00, 0, 1, 0x02, 0x02 }, { 0x01, 0x00, 0, 1, 0x02, 0x02 }, { 0x0B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x0B, 0x00, 0, 1, 0x02, 0x02 }, { 0x0B, 0x00, 0, 1, 0x02, 0x02 }, { 0x0B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x14, 0x00, 1, 1, 0x02, 0x02 }, { 0x14, 0x00, 1, 1, 0x02, 0x02 }, { 0x14, 0x00, 1, 1, 0x02, 0x02 }, - { 0x14, 0x00, 1, 1, 0x02, 0x02 }, { 0x05, 0x00, 0, 1, 0x02, 0x02 }, { 0x05, 0x00, 0, 1, 0x02, 0x02 }, - { 0x05, 0x00, 0, 1, 0x02, 0x02 }, { 0x05, 0x00, 0, 1, 0x02, 0x02 }, { 0x6E, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6E, 0x00, 0, 1, 0x02, 0x02 }, { 0x6E, 0x00, 0, 1, 0x02, 0x02 }, { 0x6E, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6C, 0x00, 0, 1, 0x02, 0x02 }, { 0x6C, 0x00, 0, 1, 0x02, 0x02 }, { 0x6C, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6C, 0x00, 0, 1, 0x02, 0x02 }, { 0x68, 0x00, 0, 1, 0x02, 0x02 }, { 0x68, 0x00, 0, 1, 0x02, 0x02 }, - { 0x68, 0x00, 0, 1, 0x02, 0x02 }, { 0x68, 0x00, 0, 1, 0x02, 0x02 }, { 0x69, 0x00, 0, 1, 0x02, 0x02 }, - { 0x69, 0x00, 0, 1, 0x02, 0x02 }, { 0x69, 0x00, 0, 1, 0x02, 0x02 }, { 0x69, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6D, 0x00, 0, 1, 0x02, 0x02 }, { 0x6D, 0x00, 0, 1, 0x02, 0x02 }, { 0x6D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6D, 0x00, 0, 1, 0x02, 0x02 }, { 0x02, 0x00, 0, 1, 0x02, 0x02 }, { 0x02, 0x00, 0, 1, 0x02, 0x02 }, - { 0x02, 0x00, 0, 1, 0x02, 0x02 }, { 0x02, 0x00, 0, 1, 0x02, 0x02 }, { 0x02, 0x00, 0, 1, 0x02, 0x02 }, - { 0x41, 0x00, 0, 1, 0x02, 0x26 }, { 0x41, 0x00, 0, 1, 0x02, 0x26 }, { 0x41, 0x00, 0, 1, 0x02, 0x26 }, - { 0x41, 0x00, 0, 1, 0x02, 0x26 }, { 0x41, 0x00, 0, 1, 0x02, 0x02 }, { 0x41, 0x00, 0, 1, 0x02, 0x02 }, - { 0x1B, 0x00, 1, 1, 0x03, 0x03 }, { 0x1C, 0x00, 1, 1, 0x02, 0x02 }, { 0x1D, 0x00, 1, 1, 0x03, 0x03 }, - { 0x1D, 0x00, 1, 1, 0x02, 0x02 }, { 0x07, 0x00, 0, 1, 0x02, 0x02 }, { 0x07, 0x00, 0, 1, 0x02, 0x02 }, - { 0x07, 0x00, 0, 1, 0x02, 0x02 }, { 0x07, 0x00, 0, 1, 0x02, 0x02 }, { 0x42, 0x00, 0, 1, 0x04, 0x20 }, - { 0x42, 0x00, 0, 1, 0x04, 0x20 }, { 0x42, 0x00, 0, 1, 0x04, 0x20 }, { 0x42, 0x00, 0, 1, 0x04, 0x20 }, - { 0x3E, 0x00, 0, 1, 0x02, 0x02 }, { 0x3E, 0x00, 0, 1, 0x02, 0x02 }, { 0x3E, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x00, 0, 1, 0x02, 0x02 }, { 0x38, 0x00, 0, 1, 0x04, 0x20 }, { 0x38, 0x00, 0, 1, 0x04, 0x20 }, - { 0x38, 0x00, 0, 1, 0x04, 0x20 }, { 0x38, 0x00, 0, 1, 0x04, 0x20 }, { 0x6A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6A, 0x00, 0, 1, 0x02, 0x02 }, { 0x6A, 0x00, 0, 1, 0x02, 0x02 }, { 0x6A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x40, 0x00, 0, 1, 0x02, 0x26 }, { 0x40, 0x00, 0, 1, 0x02, 0x26 }, { 0x40, 0x00, 0, 1, 0x02, 0x26 }, - { 0x40, 0x00, 0, 1, 0x02, 0x26 }, { 0x4C, 0x00, 0, 1, 0x04, 0x20 }, { 0x4C, 0x00, 0, 1, 0x04, 0x20 }, - { 0x4C, 0x00, 0, 1, 0x04, 0x20 }, { 0x4C, 0x00, 0, 1, 0x04, 0x20 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x0B, 0x0B }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x10, 0x00, 0, 1, 0x04, 0x20 }, { 0x10, 0x00, 0, 1, 0x04, 0x20 }, { 0x10, 0x00, 0, 1, 0x04, 0x20 }, - { 0x10, 0x00, 0, 1, 0x04, 0x20 }, { 0x1E, 0x03, 1, 1, 0x03, 0x03 }, { 0x1F, 0x03, 1, 1, 0x02, 0x02 }, - { 0x1E, 0x03, 1, 1, 0x02, 0x02 }, { 0x1F, 0x03, 1, 1, 0x02, 0x02 }, { 0x44, 0x00, 0, 1, 0x07, 0x07 }, - { 0x44, 0x00, 0, 1, 0x07, 0x07 }, { 0x44, 0x00, 0, 1, 0x07, 0x07 }, { 0x44, 0x00, 0, 1, 0x07, 0x07 }, - { 0x44, 0x00, 0, 1, 0x0D, 0x02 }, { 0x44, 0x00, 0, 1, 0x0D, 0x02 }, { 0x44, 0x00, 0, 1, 0x03, 0x03 }, - { 0x4E, 0x00, 0, 1, 0x04, 0x20 }, { 0x4E, 0x00, 0, 1, 0x04, 0x20 }, { 0x4E, 0x00, 0, 1, 0x04, 0x20 }, - { 0x4E, 0x00, 0, 1, 0x04, 0x20 }, { 0x6B, 0x00, 0, 1, 0x22, 0x22 }, { 0x6B, 0x00, 0, 1, 0x22, 0x22 }, - { 0x6B, 0x00, 0, 1, 0x22, 0x22 }, { 0x6B, 0x00, 0, 1, 0x22, 0x22 }, { 0x45, 0x00, 0, 1, 0x22, 0x04 }, - { 0x46, 0x00, 0, 1, 0x22, 0x04 }, { 0x45, 0x00, 0, 1, 0x22, 0x04 }, { 0x46, 0x00, 0, 1, 0x22, 0x04 }, - { 0x4D, 0x00, 0, 1, 0x02, 0x02 }, { 0x4D, 0x00, 0, 1, 0x02, 0x02 }, { 0x4D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x4D, 0x00, 0, 1, 0x02, 0x02 }, { 0x06, 0x00, 0, 1, 0x02, 0x02 }, { 0x06, 0x00, 0, 1, 0x02, 0x02 }, - { 0x06, 0x00, 0, 1, 0x02, 0x02 }, { 0x06, 0x00, 0, 1, 0x02, 0x02 }, { 0x06, 0x00, 0, 1, 0x02, 0x02 }, - { 0x06, 0x00, 0, 1, 0x02, 0x02 }, { 0x09, 0x00, 0, 1, 0x02, 0x02 }, { 0x09, 0x00, 0, 1, 0x02, 0x02 }, - { 0x09, 0x00, 0, 1, 0x02, 0x02 }, { 0x09, 0x00, 0, 1, 0x02, 0x02 }, { 0x09, 0x00, 0, 1, 0x02, 0x02 }, - { 0x17, 0x00, 1, 1, 0x02, 0x02 }, { 0x17, 0x00, 1, 1, 0x02, 0x02 }, { 0x17, 0x00, 1, 1, 0x02, 0x02 }, - { 0x17, 0x00, 1, 1, 0x02, 0x02 }, { 0x17, 0x00, 0, 1, 0x02, 0x02 }, { 0x17, 0x00, 0, 1, 0x02, 0x02 }, - { 0x17, 0x00, 0, 1, 0x02, 0x02 }, { 0x65, 0x00, 0, 1, 0x02, 0x02 }, { 0x65, 0x00, 0, 1, 0x02, 0x02 }, - { 0x65, 0x00, 0, 1, 0x02, 0x02 }, { 0x65, 0x00, 0, 1, 0x02, 0x02 }, { 0x08, 0x00, 0, 1, 0x04, 0x04 }, - { 0x08, 0x00, 0, 1, 0x04, 0x04 }, { 0x08, 0x00, 0, 1, 0x04, 0x04 }, { 0x08, 0x00, 0, 1, 0x04, 0x04 }, - { 0x27, 0x00, 0, 1, 0x04, 0x04 }, { 0x27, 0x00, 0, 1, 0x04, 0x04 }, { 0x27, 0x00, 0, 1, 0x04, 0x04 }, - { 0x27, 0x00, 0, 1, 0x04, 0x04 }, { 0x47, 0x00, 0, 1, 0x03, 0x03 }, { 0x47, 0x00, 0, 1, 0x03, 0x03 }, - { 0x47, 0x00, 0, 1, 0x03, 0x03 }, { 0x47, 0x00, 0, 1, 0x03, 0x03 }, { 0x47, 0x00, 0, 1, 0x0A, 0x0A }, - { 0x47, 0x00, 0, 1, 0x02, 0x0A }, { 0x47, 0x00, 1, 1, 0x0A, 0x0A }, { 0x47, 0x00, 0, 1, 0x0B, 0x0B }, - { 0x47, 0x00, 0, 1, 0x03, 0x03 }, { 0x47, 0x00, 0, 1, 0x02, 0x02 }, { 0x47, 0x00, 0, 1, 0x02, 0x02 }, - { 0x47, 0x00, 0, 1, 0x03, 0x03 }, { 0x47, 0x00, 0, 1, 0x03, 0x03 }, { 0x1E, 0x00, 1, 1, 0x03, 0x03 }, - { 0x1F, 0x00, 1, 1, 0x02, 0x02 }, { 0x1E, 0x00, 1, 1, 0x02, 0x02 }, { 0x1F, 0x00, 1, 1, 0x02, 0x02 }, - { 0x20, 0x00, 1, 1, 0x03, 0x03 }, { 0x21, 0x00, 1, 1, 0x02, 0x02 }, { 0x22, 0x00, 1, 1, 0x02, 0x02 }, - { 0x22, 0x00, 1, 1, 0x02, 0x02 }, { 0x20, 0x00, 0, 1, 0x08, 0x08 }, { 0x67, 0x00, 0, 1, 0x02, 0x02 }, - { 0x2C, 0x00, 0, 1, 0x04, 0x20 }, { 0x2C, 0x00, 0, 1, 0x04, 0x20 }, { 0x2C, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2C, 0x00, 0, 1, 0x04, 0x20 }, { 0x34, 0x00, 0, 1, 0x04, 0x04 }, { 0x34, 0x00, 0, 1, 0x04, 0x04 }, - { 0x34, 0x00, 0, 1, 0x04, 0x04 }, { 0x34, 0x00, 0, 1, 0x04, 0x04 }, { 0x34, 0x00, 0, 1, 0x04, 0x02 }, - { 0x34, 0x00, 0, 1, 0x10, 0x10 }, { 0x2D, 0x00, 0, 1, 0x04, 0x04 }, { 0x2D, 0x00, 0, 1, 0x04, 0x04 }, - { 0x2D, 0x00, 0, 1, 0x04, 0x04 }, { 0x2D, 0x00, 0, 1, 0x04, 0x04 }, { 0x01, 0x01, 1, 0, 0x02, 0x02 }, - { 0x01, 0x01, 1, 0, 0x02, 0x02 }, { 0x01, 0x01, 1, 0, 0x02, 0x02 }, { 0x01, 0x01, 1, 0, 0x02, 0x02 }, - { 0x26, 0x00, 0, 1, 0x04, 0x04 }, { 0x26, 0x00, 0, 1, 0x04, 0x04 }, { 0x26, 0x00, 0, 1, 0x04, 0x04 }, - { 0x26, 0x00, 0, 1, 0x04, 0x04 }, { 0x51, 0x00, 0, 1, 0x03, 0x03 }, { 0x51, 0x00, 0, 1, 0x02, 0x02 }, - { 0x51, 0x00, 0, 1, 0x03, 0x03 }, { 0x51, 0x00, 0, 1, 0x02, 0x02 }, { 0x51, 0x00, 0, 1, 0x04, 0x02 }, - { 0x51, 0x00, 0, 1, 0x21, 0x21 }, { 0x51, 0x00, 0, 1, 0x21, 0x21 }, { 0x51, 0x00, 0, 1, 0x23, 0x23 }, - { 0x51, 0x00, 0, 1, 0x03, 0x03 }, { 0x51, 0x00, 1, 1, 0x02, 0x02 }, { 0x51, 0x00, 0, 1, 0x23, 0x23 }, - { 0x51, 0x00, 0, 1, 0x03, 0x03 }, { 0x51, 0x00, 0, 1, 0x29, 0x29 }, { 0x51, 0x00, 1, 1, 0x03, 0x03 }, - { 0x52, 0x00, 0, 1, 0x03, 0x03 }, { 0x52, 0x00, 0, 1, 0x02, 0x02 }, { 0x52, 0x00, 0, 1, 0x03, 0x03 }, - { 0x52, 0x00, 0, 1, 0x02, 0x02 }, { 0x52, 0x00, 0, 1, 0x26, 0x26 }, { 0x52, 0x00, 0, 1, 0x21, 0x21 }, - { 0x52, 0x00, 1, 1, 0x21, 0x21 }, { 0x52, 0x00, 0, 1, 0x21, 0x21 }, { 0x52, 0x00, 1, 1, 0x02, 0x02 }, - { 0x53, 0x00, 0, 1, 0x03, 0x03 }, { 0x53, 0x00, 0, 1, 0x02, 0x02 }, { 0x53, 0x00, 0, 1, 0x03, 0x03 }, - { 0x53, 0x00, 0, 1, 0x02, 0x02 }, { 0x53, 0x00, 0, 1, 0x04, 0x02 }, { 0x53, 0x00, 1, 1, 0x02, 0x02 }, - { 0x54, 0x00, 1, 1, 0x03, 0x03 }, { 0x54, 0x00, 1, 1, 0x02, 0x02 }, { 0x54, 0x00, 1, 1, 0x03, 0x03 }, - { 0x54, 0x00, 1, 1, 0x02, 0x02 }, { 0x55, 0x00, 0, 1, 0x03, 0x03 }, { 0x55, 0x00, 0, 1, 0x02, 0x02 }, - { 0x55, 0x00, 0, 1, 0x03, 0x03 }, { 0x55, 0x00, 0, 1, 0x02, 0x02 }, { 0x55, 0x00, 1, 1, 0x0A, 0x0A }, - { 0x55, 0x00, 0, 1, 0x0A, 0x0A }, { 0x55, 0x00, 1, 1, 0x0A, 0x0A }, { 0x55, 0x00, 0, 1, 0x0D, 0x0A }, - { 0x55, 0x00, 0, 1, 0x0A, 0x0A }, { 0x55, 0x00, 0, 1, 0x0A, 0x0A }, { 0x55, 0x00, 1, 1, 0x02, 0x02 }, - { 0x55, 0x00, 1, 1, 0x02, 0x02 }, { 0x55, 0x00, 1, 1, 0x02, 0x02 }, { 0x55, 0x00, 1, 1, 0x02, 0x02 }, - { 0x56, 0x00, 1, 1, 0x02, 0x02 }, { 0x56, 0x00, 1, 1, 0x02, 0x02 }, { 0x56, 0x00, 1, 1, 0x02, 0x02 }, - { 0x56, 0x00, 1, 1, 0x02, 0x02 }, { 0x56, 0x00, 0, 1, 0x03, 0x03 }, { 0x56, 0x00, 0, 1, 0x00, 0x00 }, - { 0x57, 0x00, 1, 1, 0x03, 0x03 }, { 0x57, 0x00, 1, 1, 0x02, 0x02 }, { 0x57, 0x00, 1, 1, 0x03, 0x03 }, - { 0x57, 0x00, 1, 1, 0x02, 0x02 }, { 0x57, 0x00, 0, 1, 0x03, 0x03 }, { 0x57, 0x00, 1, 1, 0x02, 0x02 }, - { 0x58, 0x00, 0, 1, 0x02, 0x02 }, { 0x58, 0x00, 0, 1, 0x02, 0x02 }, { 0x58, 0x00, 0, 1, 0x02, 0x02 }, - { 0x58, 0x00, 0, 1, 0x02, 0x02 }, { 0x58, 0x00, 1, 1, 0x02, 0x02 }, { 0x58, 0x00, 1, 1, 0x02, 0x02 }, - { 0x59, 0x00, 0, 1, 0x03, 0x03 }, { 0x59, 0x00, 0, 1, 0x02, 0x02 }, { 0x59, 0x00, 0, 1, 0x03, 0x03 }, - { 0x59, 0x00, 0, 1, 0x02, 0x02 }, { 0x59, 0x00, 0, 1, 0x0D, 0x00 }, { 0x59, 0x00, 0, 1, 0x02, 0x02 }, - { 0x59, 0x00, 1, 1, 0x02, 0x02 }, { 0x59, 0x00, 0, 1, 0x02, 0x02 }, { 0x59, 0x00, 1, 1, 0x02, 0x02 }, - { 0x5A, 0x00, 0, 1, 0x03, 0x03 }, { 0x5A, 0x00, 0, 1, 0x02, 0x02 }, { 0x5A, 0x00, 0, 1, 0x03, 0x03 }, - { 0x5A, 0x00, 0, 1, 0x02, 0x02 }, { 0x5A, 0x00, 1, 1, 0x0C, 0x0A }, { 0x5A, 0x00, 1, 1, 0x0A, 0x0A }, - { 0x5A, 0x00, 1, 1, 0x02, 0x02 }, { 0x5B, 0x00, 0, 1, 0x02, 0x02 }, { 0x5B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x00, 0, 1, 0x02, 0x02 }, { 0x5B, 0x00, 0, 1, 0x02, 0x02 }, { 0x5B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x5C, 0x00, 1, 1, 0x0F, 0x0F }, { 0x5C, 0x00, 1, 1, 0x0F, 0x0F }, { 0x5C, 0x00, 1, 1, 0x0F, 0x0F }, - { 0x5C, 0x00, 1, 1, 0x0F, 0x0F }, { 0x5C, 0x00, 1, 1, 0x02, 0x02 }, { 0x5C, 0x00, 1, 1, 0x0F, 0x0F }, - { 0x5D, 0x00, 1, 1, 0x03, 0x03 }, { 0x5D, 0x00, 1, 1, 0x02, 0x02 }, { 0x5D, 0x00, 1, 1, 0x03, 0x03 }, - { 0x5D, 0x00, 1, 1, 0x02, 0x02 }, { 0x5D, 0x00, 1, 1, 0x21, 0x21 }, { 0x5D, 0x00, 1, 1, 0x02, 0x02 }, - { 0x5D, 0x00, 1, 1, 0x02, 0x02 }, { 0x5E, 0x00, 1, 1, 0x0E, 0x0E }, { 0x5E, 0x00, 1, 1, 0x0E, 0x0E }, - { 0x5E, 0x00, 1, 1, 0x0E, 0x0E }, { 0x5E, 0x00, 1, 1, 0x0E, 0x0E }, { 0x0E, 0x01, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x01, 1, 1, 0x02, 0x02 }, { 0x0E, 0x01, 1, 1, 0x02, 0x02 }, { 0x0E, 0x01, 1, 1, 0x02, 0x02 }, - { 0x5F, 0x00, 0, 1, 0x03, 0x03 }, { 0x5F, 0x00, 0, 1, 0x02, 0x02 }, { 0x64, 0x00, 0, 1, 0x02, 0x02 }, - { 0x64, 0x00, 0, 1, 0x02, 0x02 }, { 0x64, 0x00, 0, 1, 0x04, 0x02 }, { 0x60, 0x00, 0, 1, 0x03, 0x03 }, - { 0x60, 0x00, 0, 1, 0x02, 0x02 }, { 0x60, 0x00, 0, 1, 0x03, 0x03 }, { 0x60, 0x00, 0, 1, 0x02, 0x02 }, - { 0x60, 0x00, 1, 1, 0x0A, 0x0A }, { 0x60, 0x00, 0, 1, 0x03, 0x03 }, { 0x60, 0x00, 0, 1, 0x02, 0x02 }, - { 0x60, 0x00, 1, 1, 0x02, 0x02 }, { 0x60, 0x00, 1, 1, 0x03, 0x03 }, { 0x60, 0x00, 1, 1, 0x03, 0x03 }, - { 0x61, 0x00, 0, 1, 0x02, 0x02 }, { 0x61, 0x00, 0, 1, 0x02, 0x02 }, { 0x61, 0x00, 0, 1, 0x02, 0x02 }, - { 0x61, 0x00, 0, 1, 0x02, 0x02 }, { 0x61, 0x00, 0, 1, 0x03, 0x03 }, { 0x61, 0x00, 0, 1, 0x02, 0x02 }, - { 0x62, 0x00, 0, 1, 0x02, 0x02 }, { 0x62, 0x00, 0, 1, 0x02, 0x02 }, { 0x62, 0x00, 0, 1, 0x02, 0x02 }, - { 0x62, 0x00, 0, 1, 0x02, 0x02 }, { 0x62, 0x00, 0, 1, 0x02, 0x02 }, { 0x62, 0x00, 1, 1, 0x02, 0x02 }, - { 0x58, 0x03, 0, 1, 0x00, 0x00 }, { 0x58, 0x03, 0, 1, 0x00, 0x00 }, { 0x58, 0x03, 0, 1, 0x00, 0x00 }, - { 0x58, 0x03, 0, 1, 0x00, 0x00 }, { 0x63, 0x00, 0, 1, 0x03, 0x03 }, { 0x63, 0x00, 0, 1, 0x02, 0x02 }, - { 0x63, 0x00, 0, 1, 0x03, 0x03 }, { 0x63, 0x00, 0, 1, 0x02, 0x02 }, { 0x63, 0x00, 0, 1, 0x20, 0x20 }, - { 0x63, 0x00, 0, 1, 0x2A, 0x2A }, { 0x63, 0x00, 1, 1, 0x02, 0x02 }, { 0x63, 0x00, 1, 1, 0x02, 0x02 }, - { 0x63, 0x00, 1, 1, 0x02, 0x02 }, { 0x63, 0x00, 1, 1, 0x02, 0x02 }, { 0x63, 0x00, 1, 1, 0x02, 0x02 }, - { 0x63, 0x00, 1, 1, 0x02, 0x02 }, { 0x63, 0x00, 1, 1, 0x02, 0x02 }, { 0x63, 0x00, 1, 1, 0x02, 0x02 }, - { 0x04, 0x00, 0, 1, 0x02, 0x02 }, { 0x04, 0x00, 0, 1, 0x02, 0x02 }, { 0x04, 0x00, 0, 1, 0x02, 0x02 }, - { 0x04, 0x00, 0, 1, 0x02, 0x02 }, { 0x03, 0x00, 0, 1, 0x02, 0x02 }, { 0x03, 0x00, 0, 1, 0x02, 0x02 }, - { 0x03, 0x00, 0, 1, 0x02, 0x02 }, { 0x03, 0x00, 0, 1, 0x02, 0x02 }, { 0x42, 0x01, 0, 1, 0x04, 0x20 }, - { 0x42, 0x01, 0, 1, 0x04, 0x20 }, { 0x42, 0x01, 0, 1, 0x04, 0x20 }, { 0x42, 0x01, 0, 1, 0x04, 0x20 }, - { 0x23, 0x00, 0, 1, 0x03, 0x03 }, { 0x24, 0x00, 0, 1, 0x02, 0x02 }, { 0x25, 0x00, 0, 1, 0x02, 0x02 }, - { 0x25, 0x00, 0, 1, 0x02, 0x02 }, { 0x04, 0x01, 1, 1, 0x02, 0x02 }, { 0x04, 0x01, 1, 1, 0x02, 0x02 }, - { 0x04, 0x01, 1, 1, 0x02, 0x02 }, { 0x04, 0x01, 1, 1, 0x02, 0x02 }, { 0x0E, 0x00, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x00, 1, 1, 0x02, 0x02 }, { 0x0E, 0x00, 1, 1, 0x02, 0x02 }, { 0x0E, 0x00, 1, 1, 0x02, 0x02 }, - { 0x51, 0x01, 0, 1, 0x03, 0x03 }, { 0x51, 0x01, 0, 1, 0x02, 0x02 }, { 0x51, 0x01, 0, 1, 0x03, 0x03 }, - { 0x51, 0x01, 0, 1, 0x02, 0x02 }, { 0x51, 0x02, 1, 1, 0x03, 0x03 }, { 0x51, 0x02, 1, 1, 0x02, 0x02 }, - { 0x51, 0x02, 1, 1, 0x03, 0x03 }, { 0x51, 0x02, 1, 1, 0x02, 0x02 }, { 0x51, 0x03, 0, 1, 0x02, 0x02 }, - { 0x51, 0x03, 0, 1, 0x02, 0x02 }, { 0x51, 0x03, 0, 1, 0x02, 0x02 }, { 0x51, 0x03, 0, 1, 0x02, 0x02 }, - { 0x51, 0x04, 1, 1, 0x03, 0x03 }, { 0x51, 0x04, 1, 1, 0x02, 0x02 }, { 0x51, 0x04, 1, 1, 0x03, 0x03 }, - { 0x51, 0x04, 1, 1, 0x02, 0x02 }, { 0x51, 0x05, 0, 1, 0x03, 0x03 }, { 0x51, 0x05, 0, 1, 0x02, 0x02 }, - { 0x51, 0x05, 0, 1, 0x03, 0x03 }, { 0x51, 0x05, 0, 1, 0x02, 0x02 }, { 0x52, 0x01, 0, 1, 0x03, 0x03 }, - { 0x52, 0x01, 0, 1, 0x02, 0x02 }, { 0x52, 0x01, 0, 1, 0x03, 0x03 }, { 0x52, 0x01, 0, 1, 0x02, 0x02 }, - { 0x52, 0x02, 0, 1, 0x03, 0x03 }, { 0x52, 0x02, 0, 1, 0x02, 0x02 }, { 0x52, 0x02, 0, 1, 0x03, 0x03 }, - { 0x52, 0x02, 0, 1, 0x02, 0x02 }, { 0x54, 0x01, 1, 1, 0x03, 0x03 }, { 0x54, 0x01, 1, 1, 0x03, 0x03 }, - { 0x54, 0x01, 1, 1, 0x03, 0x03 }, { 0x54, 0x01, 1, 1, 0x03, 0x03 }, { 0x54, 0x02, 0, 1, 0x03, 0x03 }, - { 0x54, 0x02, 0, 1, 0x02, 0x02 }, { 0x54, 0x02, 0, 1, 0x03, 0x03 }, { 0x54, 0x02, 0, 1, 0x02, 0x02 }, - { 0x58, 0x01, 0, 1, 0x02, 0x02 }, { 0x58, 0x01, 0, 1, 0x02, 0x02 }, { 0x58, 0x01, 0, 1, 0x02, 0x02 }, - { 0x58, 0x01, 0, 1, 0x02, 0x02 }, { 0x5A, 0x01, 0, 1, 0x03, 0x03 }, { 0x5A, 0x01, 0, 1, 0x02, 0x02 }, - { 0x5A, 0x01, 0, 1, 0x03, 0x03 }, { 0x5A, 0x01, 0, 1, 0x02, 0x02 }, { 0x5B, 0x01, 1, 1, 0x02, 0x02 }, - { 0x5B, 0x01, 1, 1, 0x02, 0x02 }, { 0x5B, 0x01, 1, 1, 0x02, 0x02 }, { 0x5B, 0x01, 1, 1, 0x02, 0x02 }, - { 0x5B, 0x02, 0, 1, 0x02, 0x02 }, { 0x5B, 0x02, 0, 1, 0x02, 0x02 }, { 0x5B, 0x02, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x02, 0, 1, 0x02, 0x02 }, { 0x5B, 0x03, 0, 1, 0x02, 0x02 }, { 0x5B, 0x03, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x03, 0, 1, 0x02, 0x02 }, { 0x5B, 0x03, 0, 1, 0x02, 0x02 }, { 0x0E, 0x02, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x02, 1, 1, 0x02, 0x02 }, { 0x0E, 0x02, 1, 1, 0x02, 0x02 }, { 0x0E, 0x02, 1, 1, 0x02, 0x02 }, - { 0x60, 0x01, 0, 1, 0x03, 0x03 }, { 0x60, 0x01, 0, 1, 0x02, 0x02 }, { 0x60, 0x01, 0, 1, 0x03, 0x03 }, - { 0x60, 0x01, 0, 1, 0x02, 0x02 }, { 0x60, 0x02, 0, 1, 0x03, 0x03 }, { 0x60, 0x02, 0, 1, 0x02, 0x02 }, - { 0x60, 0x02, 0, 1, 0x03, 0x03 }, { 0x60, 0x02, 0, 1, 0x02, 0x02 }, { 0x62, 0x01, 0, 1, 0x02, 0x02 }, - { 0x62, 0x01, 0, 1, 0x02, 0x02 }, { 0x62, 0x01, 0, 1, 0x02, 0x02 }, { 0x62, 0x01, 0, 1, 0x02, 0x02 }, - { 0x38, 0x01, 0, 1, 0x04, 0x20 }, { 0x38, 0x01, 0, 1, 0x04, 0x20 }, { 0x38, 0x01, 0, 1, 0x04, 0x20 }, - { 0x38, 0x01, 0, 1, 0x04, 0x20 }, { 0x1A, 0x05, 1, 1, 0x02, 0x02 }, { 0x1A, 0x05, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x05, 1, 1, 0x02, 0x02 }, { 0x1A, 0x05, 1, 1, 0x02, 0x02 }, { 0x20, 0x08, 0, 1, 0x04, 0x02 }, - { 0x21, 0x08, 0, 1, 0x04, 0x02 }, { 0x22, 0x08, 0, 1, 0x04, 0x02 }, { 0x22, 0x08, 0, 1, 0x04, 0x02 }, - { 0x20, 0x09, 0, 1, 0x04, 0x02 }, { 0x21, 0x09, 0, 1, 0x04, 0x02 }, { 0x22, 0x09, 0, 1, 0x04, 0x02 }, - { 0x22, 0x09, 0, 1, 0x04, 0x02 }, { 0x20, 0x0A, 0, 1, 0x04, 0x02 }, { 0x21, 0x0A, 0, 1, 0x04, 0x02 }, - { 0x22, 0x0A, 0, 1, 0x04, 0x02 }, { 0x22, 0x0A, 0, 1, 0x04, 0x02 }, { 0x54, 0x03, 1, 1, 0x03, 0x03 }, - { 0x54, 0x03, 1, 1, 0x02, 0x02 }, { 0x54, 0x03, 1, 1, 0x03, 0x03 }, { 0x54, 0x03, 1, 1, 0x02, 0x02 }, - { 0x54, 0x04, 0, 1, 0x2C, 0x2C }, { 0x54, 0x04, 0, 1, 0x2C, 0x2C }, { 0x54, 0x04, 0, 1, 0x2C, 0x2C }, - { 0x54, 0x04, 0, 1, 0x2C, 0x2C }, { 0x5C, 0x01, 0, 1, 0x03, 0x03 }, { 0x5C, 0x01, 0, 1, 0x02, 0x02 }, - { 0x5C, 0x01, 0, 1, 0x03, 0x03 }, { 0x5C, 0x01, 0, 1, 0x02, 0x02 }, { 0x5C, 0x02, 0, 0, 0x03, 0x03 }, - { 0x5C, 0x02, 0, 0, 0x02, 0x02 }, { 0x5C, 0x02, 0, 0, 0x03, 0x03 }, { 0x5C, 0x02, 0, 0, 0x02, 0x02 }, - { 0x5C, 0x03, 0, 0, 0x03, 0x03 }, { 0x5C, 0x03, 0, 0, 0x02, 0x02 }, { 0x5C, 0x03, 0, 0, 0x03, 0x03 }, - { 0x5C, 0x03, 0, 0, 0x02, 0x02 }, { 0x5C, 0x04, 0, 1, 0x02, 0x02 }, { 0x5C, 0x04, 0, 1, 0x02, 0x02 }, - { 0x5C, 0x04, 0, 1, 0x02, 0x02 }, { 0x5C, 0x04, 0, 1, 0x02, 0x02 }, { 0x5C, 0x05, 0, 1, 0x03, 0x03 }, - { 0x5C, 0x05, 0, 1, 0x02, 0x02 }, { 0x5C, 0x05, 0, 1, 0x03, 0x03 }, { 0x5C, 0x05, 0, 1, 0x02, 0x02 }, - { 0x5C, 0x06, 1, 0, 0x0F, 0x0F }, { 0x5C, 0x06, 1, 0, 0x0F, 0x0F }, { 0x5C, 0x06, 1, 0, 0x0F, 0x0F }, - { 0x5C, 0x06, 1, 0, 0x0F, 0x0F }, { 0x51, 0x06, 0, 1, 0x03, 0x03 }, { 0x51, 0x06, 0, 1, 0x02, 0x02 }, - { 0x51, 0x06, 0, 1, 0x03, 0x03 }, { 0x51, 0x06, 0, 1, 0x02, 0x02 }, { 0x51, 0x07, 0, 1, 0x03, 0x03 }, - { 0x51, 0x07, 0, 1, 0x02, 0x02 }, { 0x51, 0x07, 0, 1, 0x03, 0x03 }, { 0x51, 0x07, 0, 1, 0x02, 0x02 }, - { 0x52, 0x03, 0, 1, 0x04, 0x02 }, { 0x52, 0x03, 0, 1, 0x04, 0x02 }, { 0x52, 0x03, 0, 1, 0x04, 0x02 }, - { 0x52, 0x03, 0, 1, 0x04, 0x02 }, { 0x53, 0x01, 0, 1, 0x02, 0x02 }, { 0x53, 0x01, 0, 1, 0x02, 0x02 }, - { 0x53, 0x01, 0, 1, 0x02, 0x02 }, { 0x53, 0x01, 0, 1, 0x02, 0x02 }, { 0x55, 0x01, 0, 1, 0x03, 0x03 }, - { 0x55, 0x01, 0, 1, 0x02, 0x02 }, { 0x55, 0x01, 0, 1, 0x03, 0x03 }, { 0x55, 0x01, 0, 1, 0x02, 0x02 }, - { 0x55, 0x02, 0, 1, 0x02, 0x02 }, { 0x55, 0x02, 0, 1, 0x02, 0x02 }, { 0x55, 0x02, 0, 1, 0x02, 0x02 }, - { 0x55, 0x02, 0, 1, 0x02, 0x02 }, { 0x55, 0x03, 0, 1, 0x04, 0x04 }, { 0x55, 0x03, 0, 1, 0x04, 0x04 }, - { 0x55, 0x03, 0, 1, 0x04, 0x04 }, { 0x55, 0x03, 0, 1, 0x04, 0x04 }, { 0x56, 0x01, 0, 1, 0x12, 0x12 }, - { 0x56, 0x01, 0, 1, 0x02, 0x02 }, { 0x56, 0x01, 0, 1, 0x12, 0x12 }, { 0x56, 0x01, 0, 1, 0x02, 0x02 }, - { 0x57, 0x01, 0, 1, 0x03, 0x03 }, { 0x57, 0x01, 0, 1, 0x02, 0x02 }, { 0x57, 0x01, 0, 1, 0x03, 0x03 }, - { 0x57, 0x01, 0, 1, 0x02, 0x02 }, { 0x57, 0x02, 0, 1, 0x13, 0x13 }, { 0x57, 0x02, 0, 1, 0x02, 0x02 }, - { 0x57, 0x02, 0, 1, 0x13, 0x13 }, { 0x57, 0x02, 0, 1, 0x02, 0x02 }, { 0x59, 0x01, 0, 1, 0x02, 0x02 }, - { 0x59, 0x01, 0, 1, 0x02, 0x02 }, { 0x59, 0x01, 0, 1, 0x02, 0x02 }, { 0x59, 0x01, 0, 1, 0x02, 0x02 }, - { 0x59, 0x02, 0, 1, 0x03, 0x03 }, { 0x59, 0x02, 0, 1, 0x02, 0x02 }, { 0x59, 0x02, 0, 1, 0x03, 0x03 }, - { 0x59, 0x02, 0, 1, 0x02, 0x02 }, { 0x5A, 0x02, 1, 1, 0x03, 0x03 }, { 0x5A, 0x02, 1, 1, 0x02, 0x02 }, - { 0x5A, 0x02, 1, 1, 0x03, 0x03 }, { 0x5A, 0x02, 1, 1, 0x02, 0x02 }, { 0x5A, 0x03, 1, 1, 0x03, 0x03 }, - { 0x5A, 0x03, 1, 1, 0x02, 0x02 }, { 0x5A, 0x03, 1, 1, 0x03, 0x03 }, { 0x5A, 0x03, 1, 1, 0x02, 0x02 }, - { 0x5D, 0x01, 0, 1, 0x03, 0x03 }, { 0x5D, 0x01, 0, 1, 0x02, 0x02 }, { 0x5D, 0x01, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x01, 0, 1, 0x02, 0x02 }, { 0x5D, 0x02, 0, 1, 0x03, 0x03 }, { 0x5D, 0x02, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x02, 0, 1, 0x03, 0x03 }, { 0x5D, 0x02, 0, 1, 0x02, 0x02 }, { 0x5D, 0x03, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x03, 0, 1, 0x02, 0x02 }, { 0x5D, 0x03, 0, 1, 0x03, 0x03 }, { 0x5D, 0x03, 0, 1, 0x02, 0x02 }, - { 0x5F, 0x01, 0, 1, 0x03, 0x03 }, { 0x5F, 0x01, 0, 1, 0x02, 0x02 }, { 0x64, 0x01, 0, 1, 0x05, 0x05 }, - { 0x64, 0x01, 0, 1, 0x05, 0x05 }, { 0x5F, 0x01, 0, 1, 0x00, 0x00 }, { 0x60, 0x03, 0, 1, 0x03, 0x03 }, - { 0x60, 0x03, 0, 1, 0x02, 0x02 }, { 0x60, 0x03, 0, 1, 0x03, 0x03 }, { 0x60, 0x03, 0, 1, 0x02, 0x02 }, - { 0x61, 0x01, 0, 1, 0x02, 0x02 }, { 0x61, 0x01, 0, 1, 0x02, 0x02 }, { 0x61, 0x01, 0, 1, 0x02, 0x02 }, - { 0x61, 0x01, 0, 1, 0x02, 0x02 }, { 0x61, 0x02, 0, 1, 0x02, 0x02 }, { 0x61, 0x02, 0, 1, 0x02, 0x02 }, - { 0x61, 0x02, 0, 1, 0x02, 0x02 }, { 0x61, 0x02, 0, 1, 0x02, 0x02 }, { 0x03, 0x01, 1, 1, 0x02, 0x02 }, - { 0x03, 0x01, 1, 1, 0x02, 0x02 }, { 0x03, 0x01, 1, 1, 0x02, 0x02 }, { 0x03, 0x01, 1, 1, 0x02, 0x02 }, - { 0x00, 0x01, 1, 0, 0x02, 0x02 }, { 0x00, 0x01, 1, 0, 0x02, 0x02 }, { 0x00, 0x01, 1, 0, 0x02, 0x02 }, - { 0x00, 0x01, 1, 0, 0x02, 0x02 }, { 0x0E, 0x03, 1, 1, 0x02, 0x02 }, { 0x0E, 0x03, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x03, 1, 1, 0x02, 0x02 }, { 0x0E, 0x03, 1, 1, 0x02, 0x02 }, { 0x20, 0x01, 0, 1, 0x03, 0x03 }, - { 0x21, 0x01, 0, 1, 0x02, 0x02 }, { 0x22, 0x01, 0, 1, 0x02, 0x02 }, { 0x22, 0x01, 0, 1, 0x02, 0x02 }, - { 0x20, 0x02, 0, 1, 0x03, 0x03 }, { 0x21, 0x02, 0, 1, 0x02, 0x02 }, { 0x22, 0x02, 0, 1, 0x02, 0x02 }, - { 0x22, 0x02, 0, 1, 0x02, 0x02 }, { 0x20, 0x03, 1, 1, 0x03, 0x03 }, { 0x21, 0x03, 1, 1, 0x02, 0x02 }, - { 0x22, 0x03, 1, 1, 0x02, 0x02 }, { 0x22, 0x03, 1, 1, 0x02, 0x02 }, { 0x55, 0x04, 0, 0, 0x04, 0x04 }, - { 0x55, 0x04, 0, 0, 0x04, 0x04 }, { 0x55, 0x04, 0, 0, 0x04, 0x04 }, { 0x55, 0x04, 0, 0, 0x04, 0x04 }, - { 0x55, 0x05, 0, 0, 0x04, 0x04 }, { 0x55, 0x05, 0, 0, 0x04, 0x04 }, { 0x55, 0x05, 0, 0, 0x04, 0x04 }, - { 0x55, 0x05, 0, 0, 0x04, 0x04 }, { 0x1B, 0x02, 0, 0, 0x02, 0x02 }, { 0x1C, 0x02, 0, 0, 0x02, 0x02 }, - { 0x1D, 0x02, 0, 0, 0x02, 0x02 }, { 0x1D, 0x02, 0, 0, 0x02, 0x02 }, { 0x34, 0x01, 0, 1, 0x04, 0x04 }, - { 0x34, 0x01, 0, 1, 0x04, 0x04 }, { 0x34, 0x01, 0, 1, 0x04, 0x04 }, { 0x34, 0x01, 0, 1, 0x04, 0x04 }, - { 0x1B, 0x01, 0, 1, 0x03, 0x03 }, { 0x1C, 0x01, 0, 1, 0x02, 0x02 }, { 0x1D, 0x01, 0, 1, 0x02, 0x02 }, - { 0x1D, 0x01, 0, 1, 0x02, 0x02 }, { 0x51, 0x08, 1, 1, 0x03, 0x03 }, { 0x51, 0x08, 1, 1, 0x02, 0x02 }, - { 0x51, 0x08, 1, 1, 0x03, 0x03 }, { 0x51, 0x08, 1, 1, 0x02, 0x02 }, { 0x51, 0x09, 0, 1, 0x03, 0x03 }, - { 0x51, 0x09, 0, 1, 0x03, 0x03 }, { 0x51, 0x09, 0, 1, 0x03, 0x03 }, { 0x51, 0x09, 0, 1, 0x03, 0x03 }, - { 0x51, 0x0A, 0, 1, 0x03, 0x03 }, { 0x51, 0x0A, 0, 1, 0x03, 0x03 }, { 0x51, 0x0A, 0, 1, 0x03, 0x03 }, - { 0x51, 0x0A, 0, 1, 0x03, 0x03 }, { 0x55, 0x06, 0, 1, 0x02, 0x02 }, { 0x55, 0x06, 0, 1, 0x02, 0x02 }, - { 0x55, 0x06, 0, 1, 0x02, 0x02 }, { 0x55, 0x06, 0, 1, 0x02, 0x02 }, { 0x51, 0x0B, 0, 1, 0x05, 0x05 }, - { 0x51, 0x0B, 0, 1, 0x04, 0x02 }, { 0x51, 0x0B, 0, 1, 0x05, 0x05 }, { 0x51, 0x0B, 0, 1, 0x04, 0x02 }, - { 0x51, 0x0C, 0, 1, 0x05, 0x05 }, { 0x51, 0x0C, 0, 1, 0x04, 0x02 }, { 0x51, 0x0C, 0, 1, 0x05, 0x05 }, - { 0x51, 0x0C, 0, 1, 0x04, 0x02 }, { 0x51, 0x0D, 0, 1, 0x05, 0x05 }, { 0x51, 0x0D, 0, 1, 0x04, 0x02 }, - { 0x51, 0x0D, 0, 1, 0x05, 0x05 }, { 0x51, 0x0D, 0, 1, 0x04, 0x02 }, { 0x45, 0x01, 0, 1, 0x03, 0x03 }, - { 0x46, 0x01, 0, 1, 0x02, 0x02 }, { 0x45, 0x01, 0, 1, 0x03, 0x03 }, { 0x46, 0x01, 0, 1, 0x02, 0x02 }, - { 0x1E, 0x01, 1, 1, 0x03, 0x03 }, { 0x1F, 0x01, 1, 1, 0x02, 0x02 }, { 0x1E, 0x01, 1, 1, 0x02, 0x02 }, - { 0x1F, 0x01, 1, 1, 0x02, 0x02 }, { 0x20, 0x04, 1, 1, 0x03, 0x03 }, { 0x21, 0x04, 1, 1, 0x02, 0x02 }, - { 0x22, 0x04, 1, 1, 0x02, 0x02 }, { 0x22, 0x04, 1, 1, 0x02, 0x02 }, { 0x20, 0x05, 0, 1, 0x04, 0x02 }, - { 0x21, 0x05, 0, 1, 0x04, 0x02 }, { 0x22, 0x05, 0, 1, 0x04, 0x02 }, { 0x22, 0x05, 0, 1, 0x04, 0x02 }, - { 0x52, 0x04, 0, 1, 0x02, 0x02 }, { 0x52, 0x04, 0, 1, 0x02, 0x02 }, { 0x52, 0x04, 0, 1, 0x02, 0x02 }, - { 0x52, 0x04, 0, 1, 0x02, 0x02 }, { 0x5D, 0x04, 0, 1, 0x03, 0x03 }, { 0x5D, 0x04, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x04, 0, 1, 0x03, 0x03 }, { 0x5D, 0x04, 0, 1, 0x02, 0x02 }, { 0x63, 0x01, 0, 0, 0x03, 0x03 }, - { 0x63, 0x01, 0, 0, 0x02, 0x02 }, { 0x63, 0x01, 0, 0, 0x03, 0x03 }, { 0x63, 0x01, 0, 0, 0x02, 0x02 }, - { 0x07, 0x01, 0, 1, 0x02, 0x02 }, { 0x07, 0x01, 0, 1, 0x02, 0x02 }, { 0x07, 0x01, 0, 1, 0x02, 0x02 }, - { 0x07, 0x01, 0, 1, 0x02, 0x02 }, { 0x07, 0x02, 1, 1, 0x02, 0x02 }, { 0x07, 0x02, 1, 1, 0x02, 0x02 }, - { 0x07, 0x02, 1, 1, 0x02, 0x02 }, { 0x07, 0x02, 1, 1, 0x02, 0x02 }, { 0x5D, 0x05, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x05, 0, 1, 0x02, 0x02 }, { 0x5D, 0x05, 0, 1, 0x03, 0x03 }, { 0x5D, 0x05, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x06, 0, 1, 0x03, 0x03 }, { 0x5D, 0x06, 0, 1, 0x02, 0x02 }, { 0x5D, 0x06, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x06, 0, 1, 0x02, 0x02 }, { 0x5D, 0x07, 0, 1, 0x03, 0x03 }, { 0x5D, 0x07, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x07, 0, 1, 0x03, 0x03 }, { 0x5D, 0x07, 0, 1, 0x02, 0x02 }, { 0x5D, 0x08, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x08, 0, 1, 0x02, 0x02 }, { 0x5D, 0x08, 0, 1, 0x03, 0x03 }, { 0x5D, 0x08, 0, 1, 0x02, 0x02 }, - { 0x43, 0x02, 0, 1, 0x0A, 0x0A }, { 0x43, 0x02, 0, 1, 0x0A, 0x0A }, { 0x43, 0x02, 0, 1, 0x0A, 0x0A }, - { 0x43, 0x02, 0, 1, 0x0A, 0x0A }, { 0x44, 0x01, 0, 1, 0x02, 0x02 }, { 0x44, 0x01, 0, 1, 0x02, 0x02 }, - { 0x44, 0x01, 0, 1, 0x02, 0x02 }, { 0x44, 0x01, 0, 1, 0x02, 0x02 }, { 0x5D, 0x09, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x09, 0, 1, 0x02, 0x02 }, { 0x5D, 0x09, 0, 1, 0x03, 0x03 }, { 0x5D, 0x09, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x0A, 0, 1, 0x03, 0x03 }, { 0x5D, 0x0A, 0, 1, 0x02, 0x02 }, { 0x5D, 0x0A, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x0A, 0, 1, 0x02, 0x02 }, { 0x5D, 0x0B, 0, 1, 0x03, 0x03 }, { 0x5D, 0x0B, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x0B, 0, 1, 0x03, 0x03 }, { 0x5D, 0x0B, 0, 1, 0x02, 0x02 }, { 0x5D, 0x0C, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x0C, 0, 1, 0x02, 0x02 }, { 0x5D, 0x0C, 0, 1, 0x03, 0x03 }, { 0x5D, 0x0C, 0, 1, 0x02, 0x02 }, - { 0x63, 0x02, 0, 1, 0x03, 0x03 }, { 0x63, 0x02, 0, 1, 0x02, 0x02 }, { 0x63, 0x02, 0, 1, 0x03, 0x03 }, - { 0x63, 0x02, 0, 1, 0x02, 0x02 }, { 0x63, 0x03, 0, 1, 0x03, 0x03 }, { 0x63, 0x03, 0, 1, 0x02, 0x02 }, - { 0x63, 0x03, 0, 1, 0x03, 0x03 }, { 0x63, 0x03, 0, 1, 0x02, 0x02 }, { 0x42, 0x00, 0, 1, 0x02, 0x02 }, - { 0x42, 0x00, 0, 1, 0x02, 0x02 }, { 0x42, 0x00, 0, 1, 0x02, 0x02 }, { 0x42, 0x00, 0, 1, 0x02, 0x02 }, - { 0x56, 0x00, 0, 1, 0x02, 0x02 }, { 0x47, 0x00, 0, 1, 0x02, 0x02 }, { 0x42, 0x00, 0, 1, 0x02, 0x02 }, - { 0x42, 0x00, 0, 1, 0x02, 0x02 }, { 0x42, 0x00, 0, 1, 0x02, 0x02 }, { 0x42, 0x00, 0, 1, 0x02, 0x02 }, - { 0x42, 0x00, 0, 1, 0x02, 0x02 }, { 0x06, 0x01, 1, 1, 0x02, 0x02 }, { 0x06, 0x01, 1, 1, 0x02, 0x02 }, - { 0x06, 0x01, 1, 1, 0x02, 0x02 }, { 0x06, 0x01, 1, 1, 0x02, 0x02 }, { 0x36, 0x00, 0, 1, 0x04, 0x20 }, - { 0x36, 0x00, 0, 1, 0x04, 0x20 }, { 0x36, 0x00, 0, 1, 0x04, 0x20 }, { 0x36, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2A, 0x00, 0, 1, 0x04, 0x20 }, { 0x2A, 0x00, 0, 1, 0x04, 0x20 }, { 0x2A, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2A, 0x00, 0, 1, 0x04, 0x20 }, { 0x13, 0x00, 1, 1, 0x02, 0x02 }, { 0x13, 0x00, 1, 1, 0x02, 0x02 }, - { 0x13, 0x00, 1, 1, 0x02, 0x02 }, { 0x13, 0x00, 1, 1, 0x02, 0x02 }, { 0x15, 0x00, 1, 1, 0x02, 0x02 }, - { 0x15, 0x00, 1, 1, 0x02, 0x02 }, { 0x15, 0x00, 1, 1, 0x02, 0x02 }, { 0x15, 0x00, 1, 1, 0x02, 0x02 }, - { 0x57, 0x06, 0, 1, 0x04, 0x02 }, { 0x57, 0x06, 0, 1, 0x04, 0x02 }, { 0x57, 0x06, 0, 1, 0x04, 0x02 }, - { 0x57, 0x06, 0, 1, 0x04, 0x02 }, { 0x3A, 0x00, 0, 1, 0x02, 0x20 }, { 0x3A, 0x00, 0, 1, 0x02, 0x20 }, - { 0x3A, 0x00, 0, 1, 0x02, 0x20 }, { 0x3A, 0x00, 0, 1, 0x02, 0x20 }, { 0x51, 0x0E, 1, 1, 0x03, 0x03 }, - { 0x51, 0x0E, 1, 1, 0x03, 0x03 }, { 0x51, 0x0E, 1, 1, 0x03, 0x03 }, { 0x51, 0x0E, 1, 1, 0x03, 0x03 }, - { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, { 0x3F, 0x00, 0, 1, 0x02, 0x26 }, { 0x3F, 0x00, 0, 1, 0x02, 0x26 }, - { 0x3F, 0x00, 0, 1, 0x02, 0x26 }, { 0x3F, 0x00, 0, 1, 0x02, 0x26 }, { 0x43, 0x03, 0, 1, 0x02, 0x02 }, - { 0x43, 0x03, 0, 1, 0x02, 0x02 }, { 0x43, 0x03, 0, 1, 0x02, 0x02 }, { 0x43, 0x03, 0, 1, 0x02, 0x02 }, - { 0x43, 0x04, 0, 1, 0x02, 0x02 }, { 0x43, 0x04, 0, 1, 0x02, 0x02 }, { 0x43, 0x04, 0, 1, 0x02, 0x02 }, - { 0x43, 0x04, 0, 1, 0x02, 0x02 }, { 0x58, 0x04, 0, 1, 0x2C, 0x2C }, { 0x58, 0x04, 0, 1, 0x2C, 0x2C }, - { 0x58, 0x04, 0, 1, 0x2C, 0x2C }, { 0x58, 0x04, 0, 1, 0x2C, 0x2C }, { 0x1A, 0x02, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x02, 1, 1, 0x02, 0x02 }, { 0x1A, 0x02, 1, 1, 0x02, 0x02 }, { 0x1A, 0x02, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x03, 1, 1, 0x02, 0x02 }, { 0x1A, 0x03, 1, 1, 0x02, 0x02 }, { 0x1A, 0x03, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x03, 1, 1, 0x02, 0x02 }, { 0x1A, 0x04, 1, 1, 0x02, 0x02 }, { 0x1A, 0x04, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x04, 1, 1, 0x02, 0x02 }, { 0x1A, 0x04, 1, 1, 0x02, 0x02 }, { 0x55, 0x07, 0, 0, 0x04, 0x04 }, - { 0x55, 0x07, 0, 0, 0x04, 0x04 }, { 0x55, 0x07, 0, 0, 0x04, 0x04 }, { 0x55, 0x07, 0, 0, 0x04, 0x04 }, - { 0x55, 0x08, 0, 0, 0x04, 0x04 }, { 0x55, 0x08, 0, 0, 0x04, 0x04 }, { 0x55, 0x08, 0, 0, 0x04, 0x04 }, - { 0x55, 0x08, 0, 0, 0x04, 0x04 }, { 0x5F, 0x02, 0, 1, 0x02, 0x02 }, { 0x5F, 0x02, 0, 1, 0x02, 0x02 }, - { 0x64, 0x02, 0, 1, 0x02, 0x02 }, { 0x64, 0x02, 0, 1, 0x02, 0x02 }, { 0x5F, 0x02, 0, 1, 0x00, 0x00 }, - { 0x52, 0x05, 0, 1, 0x04, 0x02 }, { 0x52, 0x05, 0, 1, 0x04, 0x02 }, { 0x52, 0x05, 0, 1, 0x04, 0x02 }, - { 0x52, 0x05, 0, 1, 0x04, 0x02 }, { 0x52, 0x06, 0, 1, 0x04, 0x02 }, { 0x52, 0x06, 0, 1, 0x04, 0x02 }, - { 0x52, 0x06, 0, 1, 0x04, 0x02 }, { 0x52, 0x06, 0, 1, 0x04, 0x02 }, { 0x52, 0x07, 0, 1, 0x04, 0x02 }, - { 0x52, 0x07, 0, 1, 0x04, 0x02 }, { 0x52, 0x07, 0, 1, 0x04, 0x02 }, { 0x52, 0x07, 0, 1, 0x04, 0x02 }, - { 0x52, 0x08, 0, 1, 0x04, 0x02 }, { 0x52, 0x08, 0, 1, 0x04, 0x02 }, { 0x52, 0x08, 0, 1, 0x04, 0x02 }, - { 0x52, 0x08, 0, 1, 0x04, 0x02 }, { 0x53, 0x02, 0, 1, 0x04, 0x02 }, { 0x53, 0x02, 0, 1, 0x04, 0x02 }, - { 0x53, 0x02, 0, 1, 0x04, 0x02 }, { 0x53, 0x02, 0, 1, 0x04, 0x02 }, { 0x53, 0x03, 0, 1, 0x03, 0x03 }, - { 0x53, 0x03, 0, 1, 0x03, 0x03 }, { 0x53, 0x03, 0, 1, 0x03, 0x03 }, { 0x53, 0x03, 0, 1, 0x03, 0x03 }, - { 0x53, 0x04, 0, 1, 0x03, 0x03 }, { 0x53, 0x04, 0, 1, 0x03, 0x03 }, { 0x53, 0x04, 0, 1, 0x03, 0x03 }, - { 0x53, 0x04, 0, 1, 0x03, 0x03 }, { 0x53, 0x05, 0, 1, 0x03, 0x03 }, { 0x53, 0x05, 0, 1, 0x03, 0x03 }, - { 0x53, 0x05, 0, 1, 0x03, 0x03 }, { 0x53, 0x05, 0, 1, 0x03, 0x03 }, { 0x5E, 0x01, 1, 1, 0x0E, 0x0E }, - { 0x5E, 0x01, 1, 1, 0x0E, 0x0E }, { 0x5E, 0x01, 1, 1, 0x0E, 0x0E }, { 0x5E, 0x01, 1, 1, 0x0E, 0x0E }, - { 0x5E, 0x02, 0, 1, 0x0E, 0x0E }, { 0x5E, 0x02, 0, 1, 0x0E, 0x0E }, { 0x5E, 0x02, 0, 1, 0x0E, 0x0E }, - { 0x5E, 0x02, 0, 1, 0x0E, 0x0E }, { 0x3C, 0x00, 0, 1, 0x03, 0x03 }, { 0x3C, 0x00, 0, 1, 0x03, 0x03 }, - { 0x3C, 0x00, 0, 1, 0x03, 0x03 }, { 0x3C, 0x00, 0, 1, 0x03, 0x03 }, { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x63, 0x04, 0, 1, 0x04, 0x02 }, { 0x63, 0x04, 0, 1, 0x04, 0x02 }, { 0x63, 0x04, 0, 1, 0x04, 0x02 }, - { 0x63, 0x04, 0, 1, 0x04, 0x02 }, { 0x2E, 0x00, 0, 1, 0x04, 0x20 }, { 0x2E, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2E, 0x00, 0, 1, 0x04, 0x20 }, { 0x2E, 0x00, 0, 1, 0x04, 0x20 }, { 0x2F, 0x00, 0, 1, 0x04, 0x04 }, - { 0x2F, 0x00, 0, 1, 0x04, 0x04 }, { 0x2F, 0x00, 0, 1, 0x04, 0x04 }, { 0x2F, 0x00, 0, 1, 0x04, 0x04 }, - { 0x30, 0x00, 0, 0, 0x04, 0x20 }, { 0x30, 0x00, 0, 0, 0x04, 0x20 }, { 0x30, 0x00, 0, 1, 0x04, 0x20 }, - { 0x30, 0x00, 0, 1, 0x04, 0x20 }, { 0x31, 0x00, 0, 1, 0x04, 0x20 }, { 0x31, 0x00, 0, 1, 0x04, 0x20 }, - { 0x31, 0x00, 0, 1, 0x04, 0x20 }, { 0x31, 0x00, 0, 1, 0x04, 0x20 }, { 0x1E, 0x04, 0, 1, 0x04, 0x02 }, - { 0x1F, 0x04, 0, 1, 0x04, 0x02 }, { 0x1E, 0x04, 0, 1, 0x04, 0x02 }, { 0x1F, 0x04, 0, 1, 0x04, 0x02 }, - { 0x32, 0x00, 0, 1, 0x02, 0x02 }, { 0x32, 0x00, 0, 1, 0x02, 0x02 }, { 0x32, 0x00, 0, 1, 0x02, 0x02 }, - { 0x32, 0x00, 0, 1, 0x02, 0x02 }, { 0x59, 0x05, 0, 1, 0x03, 0x03 }, { 0x59, 0x05, 0, 1, 0x03, 0x03 }, - { 0x59, 0x05, 0, 1, 0x03, 0x03 }, { 0x59, 0x05, 0, 1, 0x03, 0x03 }, { 0x35, 0x00, 0, 1, 0x04, 0x02 }, - { 0x35, 0x00, 0, 1, 0x04, 0x02 }, { 0x35, 0x00, 0, 1, 0x04, 0x02 }, { 0x35, 0x00, 0, 1, 0x04, 0x02 }, - { 0x37, 0x00, 0, 1, 0x04, 0x20 }, { 0x37, 0x00, 0, 1, 0x04, 0x20 }, { 0x37, 0x00, 0, 1, 0x04, 0x20 }, - { 0x37, 0x00, 0, 1, 0x04, 0x20 }, { 0x39, 0x00, 0, 1, 0x04, 0x04 }, { 0x39, 0x00, 0, 1, 0x04, 0x04 }, - { 0x39, 0x00, 0, 1, 0x04, 0x04 }, { 0x39, 0x00, 0, 1, 0x04, 0x04 }, { 0x5D, 0x0D, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x0D, 0, 1, 0x02, 0x02 }, { 0x5D, 0x0D, 0, 1, 0x03, 0x03 }, { 0x5D, 0x0D, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x0E, 0, 1, 0x03, 0x05 }, { 0x5D, 0x0E, 0, 1, 0x02, 0x04 }, { 0x5D, 0x0E, 0, 1, 0x03, 0x05 }, - { 0x5D, 0x0E, 0, 1, 0x02, 0x04 }, { 0x5D, 0x0F, 1, 1, 0x0F, 0x0F }, { 0x5D, 0x0F, 1, 1, 0x0F, 0x0F }, - { 0x5D, 0x0F, 1, 1, 0x0F, 0x0F }, { 0x5D, 0x0F, 1, 1, 0x0F, 0x0F }, { 0x5D, 0x10, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x10, 0, 1, 0x02, 0x02 }, { 0x5D, 0x10, 0, 1, 0x02, 0x02 }, { 0x5D, 0x10, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x11, 0, 1, 0x02, 0x02 }, { 0x5D, 0x11, 0, 1, 0x02, 0x02 }, { 0x5D, 0x11, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x11, 0, 1, 0x02, 0x02 }, { 0x20, 0x06, 0, 1, 0x04, 0x02 }, { 0x21, 0x06, 0, 1, 0x04, 0x02 }, - { 0x22, 0x06, 0, 1, 0x04, 0x02 }, { 0x22, 0x06, 0, 1, 0x04, 0x02 }, { 0x20, 0x07, 0, 1, 0x04, 0x02 }, - { 0x21, 0x07, 0, 1, 0x04, 0x02 }, { 0x22, 0x07, 0, 1, 0x04, 0x02 }, { 0x22, 0x07, 0, 1, 0x04, 0x02 }, - { 0x1E, 0x02, 0, 1, 0x04, 0x02 }, { 0x1F, 0x02, 0, 1, 0x04, 0x02 }, { 0x1E, 0x02, 0, 1, 0x03, 0x03 }, - { 0x1F, 0x02, 0, 1, 0x02, 0x02 }, { 0x58, 0x02, 0, 1, 0x02, 0x02 }, { 0x58, 0x02, 0, 1, 0x02, 0x02 }, - { 0x58, 0x02, 0, 1, 0x02, 0x02 }, { 0x58, 0x02, 0, 1, 0x02, 0x02 }, { 0x57, 0x03, 0, 1, 0x03, 0x03 }, - { 0x57, 0x03, 0, 1, 0x03, 0x03 }, { 0x57, 0x03, 0, 1, 0x03, 0x03 }, { 0x57, 0x03, 0, 1, 0x03, 0x03 }, - { 0x57, 0x04, 0, 1, 0x04, 0x02 }, { 0x57, 0x04, 0, 1, 0x04, 0x02 }, { 0x57, 0x04, 0, 1, 0x04, 0x02 }, - { 0x57, 0x04, 0, 1, 0x04, 0x02 }, { 0x5A, 0x04, 0, 1, 0x04, 0x02 }, { 0x5A, 0x04, 0, 1, 0x04, 0x02 }, - { 0x5A, 0x04, 0, 1, 0x04, 0x02 }, { 0x5A, 0x04, 0, 1, 0x04, 0x02 }, { 0x59, 0x03, 0, 1, 0x03, 0x03 }, - { 0x59, 0x03, 0, 1, 0x02, 0x02 }, { 0x59, 0x03, 0, 1, 0x03, 0x03 }, { 0x59, 0x03, 0, 1, 0x02, 0x02 }, - { 0x59, 0x04, 0, 1, 0x02, 0x02 }, { 0x59, 0x04, 0, 1, 0x02, 0x02 }, { 0x59, 0x04, 0, 1, 0x02, 0x02 }, - { 0x59, 0x04, 0, 1, 0x02, 0x02 }, { 0x0E, 0x04, 1, 1, 0x02, 0x02 }, { 0x0E, 0x04, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x04, 1, 1, 0x02, 0x02 }, { 0x0E, 0x04, 1, 1, 0x02, 0x02 }, { 0x0E, 0x05, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x05, 1, 1, 0x02, 0x02 }, { 0x0E, 0x05, 1, 1, 0x02, 0x02 }, { 0x0E, 0x05, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x06, 1, 1, 0x02, 0x02 }, { 0x0E, 0x06, 1, 1, 0x02, 0x02 }, { 0x0E, 0x06, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x06, 1, 1, 0x02, 0x02 }, { 0x30, 0x01, 0, 0, 0x04, 0x20 }, { 0x30, 0x01, 0, 0, 0x04, 0x20 }, - { 0x30, 0x01, 0, 1, 0x04, 0x20 }, { 0x30, 0x01, 0, 1, 0x04, 0x20 }, { 0x30, 0x02, 0, 0, 0x04, 0x20 }, - { 0x30, 0x02, 0, 0, 0x04, 0x20 }, { 0x30, 0x02, 0, 1, 0x04, 0x20 }, { 0x30, 0x02, 0, 1, 0x04, 0x20 }, - { 0x06, 0x02, 0, 0, 0x02, 0x02 }, { 0x06, 0x02, 0, 0, 0x02, 0x02 }, { 0x06, 0x02, 0, 0, 0x02, 0x02 }, - { 0x06, 0x02, 0, 0, 0x02, 0x02 }, { 0x06, 0x03, 0, 0, 0x02, 0x02 }, { 0x06, 0x03, 0, 0, 0x02, 0x02 }, - { 0x06, 0x03, 0, 0, 0x02, 0x02 }, { 0x06, 0x03, 0, 0, 0x02, 0x02 }, { 0x06, 0x04, 0, 1, 0x02, 0x02 }, - { 0x06, 0x04, 0, 1, 0x02, 0x02 }, { 0x06, 0x04, 0, 1, 0x02, 0x02 }, { 0x06, 0x04, 0, 1, 0x02, 0x02 }, - { 0x62, 0x02, 0, 1, 0x04, 0x02 }, { 0x62, 0x02, 0, 1, 0x04, 0x02 }, { 0x62, 0x02, 0, 1, 0x04, 0x02 }, - { 0x62, 0x02, 0, 1, 0x04, 0x02 }, { 0x4A, 0x00, 0, 1, 0x03, 0x03 }, { 0x4A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x4A, 0x00, 0, 1, 0x03, 0x03 }, { 0x4A, 0x00, 0, 1, 0x02, 0x02 }, { 0x4A, 0x00, 0, 1, 0x03, 0x03 }, - { 0x4A, 0x00, 0, 1, 0x03, 0x03 }, { 0x4A, 0x00, 0, 1, 0x03, 0x03 }, { 0x02, 0x01, 1, 1, 0x02, 0x02 }, - { 0x02, 0x01, 1, 1, 0x02, 0x02 }, { 0x02, 0x01, 1, 1, 0x02, 0x02 }, { 0x02, 0x01, 1, 1, 0x02, 0x02 }, - { 0x12, 0x00, 1, 0, 0x02, 0x02 }, { 0x12, 0x00, 1, 0, 0x02, 0x02 }, { 0x12, 0x00, 1, 0, 0x02, 0x02 }, - { 0x12, 0x00, 1, 0, 0x02, 0x02 }, { 0x11, 0x00, 1, 0, 0x02, 0x02 }, { 0x11, 0x00, 1, 0, 0x02, 0x02 }, - { 0x11, 0x00, 1, 0, 0x02, 0x02 }, { 0x11, 0x00, 1, 0, 0x02, 0x02 }, { 0x18, 0x00, 1, 1, 0x02, 0x02 }, - { 0x18, 0x00, 1, 1, 0x02, 0x02 }, { 0x18, 0x00, 1, 1, 0x02, 0x02 }, { 0x18, 0x00, 1, 1, 0x02, 0x02 }, - { 0x16, 0x00, 1, 1, 0x02, 0x02 }, { 0x16, 0x00, 1, 1, 0x02, 0x02 }, { 0x16, 0x00, 1, 1, 0x02, 0x02 }, - { 0x16, 0x00, 1, 1, 0x02, 0x02 }, { 0x0A, 0x00, 0, 1, 0x02, 0x02 }, { 0x0A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x0A, 0x00, 0, 1, 0x02, 0x02 }, { 0x0A, 0x00, 0, 1, 0x02, 0x02 }, { 0x19, 0x00, 1, 1, 0x02, 0x02 }, - { 0x19, 0x00, 1, 1, 0x02, 0x02 }, { 0x19, 0x00, 1, 1, 0x02, 0x02 }, { 0x19, 0x00, 1, 1, 0x02, 0x02 }, - { 0x05, 0x01, 1, 1, 0x03, 0x02 }, { 0x05, 0x01, 1, 1, 0x02, 0x02 }, { 0x05, 0x01, 1, 1, 0x03, 0x02 }, - { 0x05, 0x01, 1, 1, 0x02, 0x02 }, { 0x0A, 0x01, 1, 1, 0x02, 0x02 }, { 0x0A, 0x01, 1, 1, 0x02, 0x02 }, - { 0x0A, 0x01, 1, 1, 0x02, 0x02 }, { 0x0A, 0x01, 1, 1, 0x02, 0x02 }, { 0x0A, 0x02, 0, 1, 0x02, 0x02 }, - { 0x0A, 0x02, 0, 1, 0x02, 0x02 }, { 0x0A, 0x02, 0, 1, 0x02, 0x02 }, { 0x0A, 0x02, 0, 1, 0x02, 0x02 }, - { 0x63, 0x05, 0, 1, 0x04, 0x02 }, { 0x63, 0x05, 0, 1, 0x04, 0x02 }, { 0x63, 0x05, 0, 1, 0x04, 0x02 }, - { 0x63, 0x05, 0, 1, 0x04, 0x02 }, { 0x28, 0x00, 0, 1, 0x04, 0x04 }, { 0x28, 0x00, 0, 1, 0x04, 0x04 }, - { 0x28, 0x00, 0, 1, 0x04, 0x04 }, { 0x28, 0x00, 0, 1, 0x04, 0x04 }, { 0x29, 0x00, 0, 1, 0x04, 0x04 }, - { 0x29, 0x00, 0, 1, 0x04, 0x04 }, { 0x29, 0x00, 0, 1, 0x04, 0x04 }, { 0x29, 0x00, 0, 1, 0x04, 0x04 }, - { 0x2B, 0x00, 0, 1, 0x04, 0x20 }, { 0x2B, 0x00, 0, 1, 0x04, 0x20 }, { 0x2B, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2B, 0x00, 0, 1, 0x04, 0x20 }, { 0x1A, 0x00, 1, 1, 0x02, 0x02 }, { 0x1A, 0x00, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x00, 1, 1, 0x02, 0x02 }, { 0x1A, 0x00, 1, 1, 0x02, 0x02 }, { 0x55, 0x09, 0, 0, 0x04, 0x04 }, - { 0x55, 0x09, 0, 0, 0x04, 0x04 }, { 0x55, 0x09, 0, 0, 0x04, 0x04 }, { 0x55, 0x09, 0, 0, 0x04, 0x04 }, - { 0x55, 0x0A, 0, 0, 0x04, 0x04 }, { 0x55, 0x0A, 0, 0, 0x04, 0x04 }, { 0x55, 0x0A, 0, 0, 0x04, 0x04 }, - { 0x55, 0x0A, 0, 0, 0x04, 0x04 }, { 0x52, 0x09, 0, 1, 0x04, 0x04 }, { 0x52, 0x09, 0, 1, 0x04, 0x04 }, - { 0x52, 0x09, 0, 1, 0x04, 0x04 }, { 0x52, 0x09, 0, 1, 0x04, 0x04 }, { 0x48, 0x00, 0, 1, 0x02, 0x26 }, - { 0x48, 0x00, 0, 1, 0x02, 0x26 }, { 0x48, 0x00, 0, 1, 0x02, 0x26 }, { 0x48, 0x00, 0, 1, 0x02, 0x26 }, - { 0x48, 0x01, 0, 1, 0x04, 0x20 }, { 0x48, 0x01, 0, 1, 0x04, 0x20 }, { 0x48, 0x01, 0, 1, 0x04, 0x20 }, - { 0x48, 0x01, 0, 1, 0x04, 0x20 }, { 0x55, 0x0B, 0, 1, 0x04, 0x02 }, { 0x55, 0x0B, 0, 1, 0x04, 0x02 }, - { 0x55, 0x0B, 0, 1, 0x04, 0x02 }, { 0x55, 0x0B, 0, 1, 0x04, 0x02 }, { 0x60, 0x04, 0, 1, 0x02, 0x02 }, - { 0x60, 0x04, 0, 1, 0x02, 0x02 }, { 0x60, 0x04, 0, 1, 0x02, 0x02 }, { 0x60, 0x04, 0, 1, 0x02, 0x02 }, - { 0x49, 0x00, 0, 1, 0x02, 0x20 }, { 0x49, 0x00, 0, 1, 0x02, 0x20 }, { 0x49, 0x00, 0, 1, 0x02, 0x20 }, - { 0x49, 0x00, 0, 1, 0x02, 0x20 }, { 0x52, 0x0A, 0, 1, 0x04, 0x02 }, { 0x52, 0x0A, 0, 1, 0x04, 0x02 }, - { 0x52, 0x0A, 0, 1, 0x04, 0x02 }, { 0x52, 0x0A, 0, 1, 0x04, 0x02 }, { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, { 0x23, 0x01, 0, 1, 0x04, 0x02 }, { 0x24, 0x01, 0, 1, 0x04, 0x02 }, - { 0x25, 0x01, 0, 1, 0x04, 0x02 }, { 0x25, 0x01, 0, 1, 0x04, 0x02 }, { 0x51, 0x0F, 0, 1, 0x05, 0x05 }, - { 0x51, 0x0F, 0, 1, 0x04, 0x02 }, { 0x51, 0x0F, 0, 1, 0x05, 0x05 }, { 0x51, 0x0F, 0, 1, 0x04, 0x02 }, - { 0x60, 0x05, 0, 1, 0x04, 0x02 }, { 0x60, 0x05, 0, 1, 0x04, 0x02 }, { 0x60, 0x05, 0, 1, 0x04, 0x02 }, - { 0x60, 0x05, 0, 1, 0x04, 0x02 }, { 0x5F, 0x04, 0, 1, 0x03, 0x03 }, { 0x5F, 0x04, 0, 1, 0x02, 0x02 }, - { 0x64, 0x04, 0, 1, 0x02, 0x02 }, { 0x64, 0x04, 0, 1, 0x02, 0x02 }, { 0x61, 0x03, 0, 1, 0x02, 0x02 }, - { 0x61, 0x03, 0, 1, 0x02, 0x02 }, { 0x61, 0x03, 0, 1, 0x02, 0x02 }, { 0x61, 0x03, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x00, 0, 1, 0x02, 0x02 }, { 0x0C, 0x00, 0, 1, 0x02, 0x02 }, { 0x0C, 0x00, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x00, 0, 1, 0x02, 0x02 }, { 0x0C, 0x01, 0, 1, 0x02, 0x02 }, { 0x0C, 0x01, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x01, 0, 1, 0x02, 0x02 }, { 0x0C, 0x01, 0, 1, 0x02, 0x02 }, { 0x0C, 0x02, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x02, 0, 1, 0x02, 0x02 }, { 0x0C, 0x02, 0, 1, 0x02, 0x02 }, { 0x0C, 0x02, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x03, 0, 1, 0x02, 0x02 }, { 0x0C, 0x03, 0, 1, 0x02, 0x02 }, { 0x0C, 0x03, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x03, 0, 1, 0x02, 0x02 }, { 0x0C, 0x04, 0, 1, 0x02, 0x02 }, { 0x0C, 0x04, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x04, 0, 1, 0x02, 0x02 }, { 0x0C, 0x04, 0, 1, 0x02, 0x02 }, { 0x0C, 0x05, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x05, 0, 1, 0x02, 0x02 }, { 0x0C, 0x05, 0, 1, 0x02, 0x02 }, { 0x0C, 0x05, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x06, 0, 1, 0x02, 0x02 }, { 0x0C, 0x06, 0, 1, 0x02, 0x02 }, { 0x0C, 0x06, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x06, 0, 1, 0x02, 0x02 }, { 0x0C, 0x07, 0, 1, 0x02, 0x02 }, { 0x0C, 0x07, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x07, 0, 1, 0x02, 0x02 }, { 0x0C, 0x07, 0, 1, 0x02, 0x02 }, { 0x0C, 0x08, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x08, 0, 1, 0x02, 0x02 }, { 0x0C, 0x08, 0, 1, 0x02, 0x02 }, { 0x0C, 0x08, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x09, 0, 1, 0x02, 0x02 }, { 0x0C, 0x09, 0, 1, 0x02, 0x02 }, { 0x0C, 0x09, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x09, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0A, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0A, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x0A, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0A, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0B, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x0B, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0B, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0B, 0, 1, 0x02, 0x02 }, - { 0x0E, 0x07, 1, 1, 0x02, 0x02 }, { 0x0E, 0x07, 1, 1, 0x02, 0x02 }, { 0x0E, 0x07, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x07, 1, 1, 0x02, 0x02 }, { 0x1A, 0x01, 1, 1, 0x02, 0x02 }, { 0x1A, 0x01, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x01, 1, 1, 0x02, 0x02 }, { 0x1A, 0x01, 1, 1, 0x02, 0x02 }, { 0x3B, 0x01, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x01, 0, 1, 0x02, 0x02 }, { 0x3B, 0x01, 0, 1, 0x02, 0x02 }, { 0x3B, 0x01, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x02, 0, 1, 0x02, 0x02 }, { 0x3B, 0x02, 0, 1, 0x02, 0x02 }, { 0x3B, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x02, 0, 1, 0x02, 0x02 }, { 0x5B, 0x04, 0, 1, 0x02, 0x02 }, { 0x5B, 0x04, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x04, 0, 1, 0x02, 0x02 }, { 0x5B, 0x04, 0, 1, 0x02, 0x02 }, { 0x63, 0x06, 0, 0, 0x02, 0x26 }, - { 0x63, 0x06, 0, 0, 0x02, 0x26 }, { 0x63, 0x06, 0, 0, 0x02, 0x26 }, { 0x63, 0x06, 0, 0, 0x02, 0x26 }, - { 0x63, 0x07, 0, 0, 0x2E, 0x2E }, { 0x63, 0x07, 0, 0, 0x2E, 0x2E }, { 0x63, 0x07, 0, 0, 0x2E, 0x2E }, - { 0x63, 0x07, 0, 0, 0x2E, 0x2E }, { 0x5B, 0x05, 0, 1, 0x02, 0x02 }, { 0x5B, 0x05, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x05, 0, 1, 0x02, 0x02 }, { 0x5B, 0x05, 0, 1, 0x02, 0x02 }, { 0x5B, 0x06, 0, 1, 0x2C, 0x2C }, - { 0x5B, 0x06, 0, 1, 0x2C, 0x2C }, { 0x5B, 0x06, 0, 1, 0x2C, 0x2C }, { 0x5B, 0x06, 0, 1, 0x2C, 0x2C }, - { 0x5B, 0x07, 0, 1, 0x2C, 0x2C }, { 0x5B, 0x07, 0, 1, 0x2C, 0x2C }, { 0x5B, 0x07, 0, 1, 0x2C, 0x2C }, - { 0x5B, 0x07, 0, 1, 0x2C, 0x2C }, { 0x5B, 0x08, 0, 0, 0x02, 0x02 }, { 0x5B, 0x08, 0, 0, 0x02, 0x02 }, - { 0x5B, 0x08, 0, 0, 0x02, 0x02 }, { 0x5B, 0x08, 0, 0, 0x02, 0x02 }, { 0x62, 0x03, 0, 1, 0x2C, 0x2C }, - { 0x62, 0x03, 0, 1, 0x2C, 0x2C }, { 0x62, 0x03, 0, 1, 0x2C, 0x2C }, { 0x62, 0x03, 0, 1, 0x2C, 0x2C }, - { 0x57, 0x05, 0, 1, 0x02, 0x02 }, { 0x57, 0x05, 0, 1, 0x02, 0x02 }, { 0x57, 0x05, 0, 1, 0x02, 0x02 }, - { 0x57, 0x05, 0, 1, 0x02, 0x02 }, { 0x07, 0x03, 0, 1, 0x02, 0x02 }, { 0x07, 0x03, 0, 1, 0x02, 0x02 }, - { 0x07, 0x03, 0, 1, 0x02, 0x02 }, { 0x07, 0x03, 0, 1, 0x02, 0x02 }, { 0x52, 0x0B, 0, 1, 0x04, 0x02 }, - { 0x52, 0x0B, 0, 1, 0x04, 0x02 }, { 0x52, 0x0B, 0, 1, 0x04, 0x02 }, { 0x52, 0x0B, 0, 1, 0x04, 0x02 }, - { 0x3B, 0x03, 0, 1, 0x02, 0x02 }, { 0x3B, 0x03, 0, 1, 0x02, 0x02 }, { 0x3B, 0x03, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x03, 0, 1, 0x02, 0x02 }, { 0x61, 0x04, 0, 1, 0x02, 0x02 }, { 0x61, 0x04, 0, 1, 0x02, 0x02 }, - { 0x61, 0x04, 0, 1, 0x02, 0x02 }, { 0x61, 0x04, 0, 1, 0x02, 0x02 }, { 0x5F, 0x03, 0, 1, 0x03, 0x03 }, - { 0x5F, 0x03, 0, 1, 0x02, 0x02 }, { 0x64, 0x03, 0, 1, 0x02, 0x02 }, { 0x64, 0x03, 0, 1, 0x02, 0x02 }, - { 0x5F, 0x03, 0, 1, 0x00, 0x00 }, { 0x52, 0x0C, 0, 1, 0x04, 0x02 }, { 0x52, 0x0C, 0, 1, 0x04, 0x02 }, - { 0x52, 0x0C, 0, 1, 0x04, 0x02 }, { 0x52, 0x0C, 0, 1, 0x04, 0x02 }, { 0x48, 0x02, 1, 1, 0x04, 0x20 }, - { 0x48, 0x02, 1, 1, 0x04, 0x20 }, { 0x48, 0x02, 1, 1, 0x04, 0x20 }, { 0x48, 0x02, 1, 1, 0x04, 0x20 }, - { 0x4B, 0x00, 0, 1, 0x04, 0x20 }, { 0x4B, 0x00, 0, 1, 0x04, 0x20 }, { 0x4B, 0x00, 0, 1, 0x04, 0x20 }, - { 0x4B, 0x00, 0, 1, 0x04, 0x20 }, { 0x53, 0x06, 0, 1, 0x03, 0x03 }, { 0x53, 0x06, 0, 1, 0x03, 0x03 }, - { 0x53, 0x06, 0, 1, 0x03, 0x03 }, { 0x53, 0x06, 0, 1, 0x03, 0x03 }, { 0x51, 0x10, 0, 1, 0x0B, 0x0B }, - { 0x51, 0x10, 0, 1, 0x0B, 0x0B }, { 0x51, 0x10, 0, 1, 0x0B, 0x0B }, { 0x51, 0x10, 0, 1, 0x0B, 0x0B }, - { 0x52, 0x0D, 0, 1, 0x03, 0x03 }, { 0x52, 0x0D, 0, 1, 0x02, 0x02 }, { 0x52, 0x0D, 0, 1, 0x03, 0x03 }, - { 0x52, 0x0D, 0, 1, 0x02, 0x02 }, { 0x4F, 0x00, 0, 1, 0x03, 0x03 }, { 0x4F, 0x00, 0, 1, 0x03, 0x03 }, - { 0x4F, 0x00, 0, 1, 0x03, 0x03 }, { 0x4F, 0x00, 0, 1, 0x03, 0x03 }, { 0x4F, 0x00, 0, 1, 0x03, 0x03 }, - { 0x1A, 0x06, 1, 1, 0x02, 0x02 }, { 0x1A, 0x06, 1, 1, 0x02, 0x02 }, { 0x1A, 0x06, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x06, 1, 1, 0x02, 0x02 }, { 0x66, 0x00, 0, 1, 0x02, 0x02 }, { 0x66, 0x00, 0, 1, 0x02, 0x02 }, - { 0x66, 0x00, 0, 1, 0x02, 0x02 }, { 0x66, 0x00, 0, 1, 0x02, 0x02 }, { 0x1A, 0x07, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x07, 1, 1, 0x02, 0x02 }, { 0x1A, 0x07, 1, 1, 0x02, 0x02 }, { 0x1A, 0x07, 1, 1, 0x02, 0x02 }, - { 0x32, 0x01, 0, 1, 0x02, 0x02 }, { 0x32, 0x01, 0, 1, 0x02, 0x02 }, { 0x32, 0x01, 0, 1, 0x02, 0x02 }, - { 0x32, 0x01, 0, 1, 0x02, 0x02 }, { 0x2C, 0x01, 0, 1, 0x04, 0x20 }, { 0x2C, 0x01, 0, 1, 0x04, 0x20 }, - { 0x2C, 0x01, 0, 1, 0x04, 0x20 }, { 0x2C, 0x01, 0, 1, 0x04, 0x20 }, { 0x33, 0x00, 0, 1, 0x04, 0x20 }, - { 0x33, 0x00, 0, 1, 0x04, 0x20 }, { 0x33, 0x00, 0, 1, 0x04, 0x20 }, { 0x33, 0x00, 0, 1, 0x04, 0x20 }, - { 0x0D, 0x01, 0, 0, 0x04, 0x02 }, { 0x0D, 0x01, 0, 0, 0x04, 0x02 }, { 0x0D, 0x01, 0, 0, 0x04, 0x02 }, - { 0x0D, 0x01, 0, 0, 0x04, 0x02 }, { 0x0D, 0x02, 0, 1, 0x04, 0x02 }, { 0x0D, 0x02, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x02, 0, 1, 0x04, 0x02 }, { 0x0D, 0x02, 0, 1, 0x04, 0x02 }, { 0x0D, 0x03, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x03, 0, 1, 0x04, 0x02 }, { 0x0D, 0x03, 0, 1, 0x04, 0x02 }, { 0x0D, 0x03, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x04, 0, 1, 0x04, 0x02 }, { 0x0D, 0x04, 0, 1, 0x04, 0x02 }, { 0x0D, 0x04, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x04, 0, 1, 0x04, 0x02 }, { 0x0D, 0x05, 0, 1, 0x04, 0x02 }, { 0x0D, 0x05, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x05, 0, 1, 0x04, 0x02 }, { 0x0D, 0x05, 0, 1, 0x04, 0x02 }, { 0x0D, 0x06, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x06, 0, 1, 0x04, 0x02 }, { 0x0D, 0x06, 0, 1, 0x04, 0x02 }, { 0x0D, 0x06, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x07, 0, 1, 0x04, 0x02 }, { 0x0D, 0x07, 0, 1, 0x04, 0x02 }, { 0x0D, 0x07, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x07, 0, 1, 0x04, 0x02 }, { 0x50, 0x00, 0, 1, 0x04, 0x20 }, { 0x50, 0x00, 0, 1, 0x04, 0x20 }, - { 0x50, 0x00, 0, 1, 0x04, 0x20 }, { 0x50, 0x00, 0, 1, 0x04, 0x20 }, { 0x52, 0x0E, 0, 1, 0x03, 0x03 }, - { 0x52, 0x0E, 0, 1, 0x02, 0x02 }, { 0x52, 0x0E, 0, 1, 0x03, 0x03 }, { 0x52, 0x0E, 0, 1, 0x02, 0x02 }, - { 0x63, 0x08, 0, 0, 0x20, 0x20 }, { 0x63, 0x08, 0, 0, 0x20, 0x20 }, { 0x63, 0x08, 0, 0, 0x20, 0x20 }, - { 0x63, 0x08, 0, 0, 0x20, 0x20 }, { 0x63, 0x09, 0, 0, 0x02, 0x02 }, { 0x63, 0x09, 0, 0, 0x02, 0x02 }, - { 0x63, 0x09, 0, 0, 0x02, 0x02 }, { 0x63, 0x09, 0, 0, 0x02, 0x02 }, { 0x57, 0x07, 0, 1, 0x2C, 0x2C }, - { 0x57, 0x07, 0, 1, 0x2C, 0x2C }, { 0x57, 0x07, 0, 1, 0x2C, 0x2C }, { 0x57, 0x07, 0, 1, 0x2C, 0x2C }, - { 0x61, 0x05, 0, 1, 0x02, 0x02 }, { 0x61, 0x05, 0, 1, 0x02, 0x02 }, { 0x61, 0x05, 0, 1, 0x02, 0x02 }, - { 0x61, 0x05, 0, 1, 0x02, 0x02 }, { 0x53, 0x07, 0, 1, 0x03, 0x03 }, { 0x53, 0x07, 0, 1, 0x03, 0x03 }, - { 0x53, 0x07, 0, 1, 0x03, 0x03 }, { 0x53, 0x07, 0, 1, 0x03, 0x03 }, { 0x0F, 0x00, 1, 1, 0x02, 0x02 }, - { 0x0F, 0x00, 1, 1, 0x02, 0x02 }, { 0x0F, 0x00, 1, 1, 0x02, 0x02 }, { 0x0F, 0x00, 1, 1, 0x02, 0x02 }, - { 0x0C, 0x0C, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0C, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0C, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x0C, 0, 1, 0x02, 0x02 }, { 0x41, 0x01, 0, 1, 0x02, 0x02 }, { 0x41, 0x01, 0, 1, 0x02, 0x02 }, - { 0x41, 0x01, 0, 1, 0x02, 0x02 }, { 0x41, 0x01, 0, 1, 0x02, 0x02 }, { 0x3D, 0x01, 0, 1, 0x04, 0x04 }, - { 0x3D, 0x01, 0, 1, 0x04, 0x04 }, { 0x3D, 0x01, 0, 1, 0x04, 0x04 }, { 0x3D, 0x01, 0, 1, 0x04, 0x04 }, - { 0x5C, 0x07, 0, 1, 0x03, 0x03 }, { 0x5C, 0x07, 0, 1, 0x02, 0x02 }, { 0x5C, 0x07, 0, 1, 0x03, 0x03 }, - { 0x5C, 0x07, 0, 1, 0x02, 0x02 }, { 0x53, 0x08, 0, 1, 0x03, 0x03 }, { 0x53, 0x08, 0, 1, 0x03, 0x03 }, - { 0x53, 0x08, 0, 1, 0x03, 0x03 }, { 0x53, 0x08, 0, 1, 0x03, 0x03 }, { 0x03, 0x02, 0, 1, 0x02, 0x02 }, - { 0x03, 0x02, 0, 1, 0x02, 0x02 }, { 0x03, 0x02, 0, 1, 0x02, 0x02 }, { 0x03, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3D, 0x02, 0, 1, 0x02, 0x02 }, { 0x3D, 0x02, 0, 1, 0x02, 0x02 }, { 0x3D, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3D, 0x02, 0, 1, 0x02, 0x02 }, { 0x43, 0x05, 0, 1, 0x02, 0x02 }, { 0x43, 0x05, 0, 1, 0x02, 0x02 }, - { 0x43, 0x05, 0, 1, 0x02, 0x02 }, { 0x43, 0x05, 0, 1, 0x02, 0x02 }, { 0x43, 0x06, 0, 1, 0x02, 0x02 }, - { 0x43, 0x06, 0, 1, 0x02, 0x02 }, { 0x43, 0x06, 0, 1, 0x02, 0x02 }, { 0x43, 0x06, 0, 1, 0x02, 0x02 }, - { 0x51, 0x11, 0, 1, 0x03, 0x03 }, { 0x51, 0x11, 0, 1, 0x02, 0x02 }, { 0x51, 0x11, 0, 1, 0x03, 0x03 }, - { 0x51, 0x11, 0, 1, 0x02, 0x02 }, { 0x3E, 0x01, 0, 1, 0x02, 0x02 }, { 0x3E, 0x01, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x01, 0, 1, 0x02, 0x02 }, { 0x3E, 0x01, 0, 1, 0x02, 0x02 }, { 0x3E, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x02, 0, 1, 0x02, 0x02 }, { 0x3E, 0x02, 0, 1, 0x02, 0x02 }, { 0x3E, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x03, 0, 1, 0x02, 0x02 }, { 0x3E, 0x03, 0, 1, 0x02, 0x02 }, { 0x3E, 0x03, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x03, 0, 1, 0x02, 0x02 }, { 0x3E, 0x04, 0, 1, 0x02, 0x02 }, { 0x3E, 0x04, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x04, 0, 1, 0x02, 0x02 }, { 0x3E, 0x04, 0, 1, 0x02, 0x02 }, { 0x3E, 0x05, 0, 1, 0x02, 0x03 }, - { 0x3E, 0x05, 0, 1, 0x02, 0x03 }, { 0x3E, 0x05, 0, 1, 0x02, 0x03 }, { 0x3E, 0x05, 0, 1, 0x02, 0x03 }, - { 0x3E, 0x06, 0, 1, 0x02, 0x02 }, { 0x3E, 0x06, 0, 1, 0x02, 0x02 }, { 0x3E, 0x06, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x06, 0, 1, 0x02, 0x02 }, { 0x3E, 0x07, 0, 1, 0x02, 0x02 }, { 0x3E, 0x07, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x07, 0, 1, 0x02, 0x02 }, { 0x3E, 0x07, 0, 1, 0x02, 0x02 }, { 0x3E, 0x08, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x08, 0, 1, 0x02, 0x02 }, { 0x3E, 0x08, 0, 1, 0x02, 0x02 }, { 0x3E, 0x08, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x09, 0, 1, 0x02, 0x02 }, { 0x3E, 0x09, 0, 1, 0x02, 0x02 }, { 0x3E, 0x09, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x09, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0A, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0A, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0A, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0A, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0B, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0B, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0B, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0B, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0C, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0C, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0C, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0C, 0, 1, 0x02, 0x02 }, { 0x37, 0x01, 0, 1, 0x04, 0x20 }, { 0x37, 0x01, 0, 1, 0x04, 0x20 }, - { 0x37, 0x01, 0, 1, 0x04, 0x20 }, { 0x37, 0x01, 0, 1, 0x04, 0x20 }, { 0x08, 0x01, 0, 1, 0x04, 0x04 }, - { 0x08, 0x01, 0, 1, 0x04, 0x04 }, { 0x08, 0x01, 0, 1, 0x04, 0x04 }, { 0x08, 0x01, 0, 1, 0x04, 0x04 }, - { 0x4C, 0x01, 0, 1, 0x04, 0x20 }, { 0x4C, 0x01, 0, 1, 0x04, 0x20 }, { 0x4C, 0x01, 0, 1, 0x04, 0x20 }, - { 0x4C, 0x01, 0, 1, 0x04, 0x20 }, { 0x63, 0x0A, 0, 1, 0x04, 0x02 }, { 0x63, 0x0A, 0, 1, 0x04, 0x02 }, - { 0x63, 0x0A, 0, 1, 0x04, 0x02 }, { 0x63, 0x0A, 0, 1, 0x04, 0x02 }, { 0x09, 0x01, 0, 1, 0x02, 0x02 }, - { 0x09, 0x01, 0, 1, 0x02, 0x02 }, { 0x09, 0x01, 0, 1, 0x02, 0x02 }, { 0x09, 0x01, 0, 1, 0x02, 0x02 }, - { 0x52, 0x0F, 0, 1, 0x03, 0x03 }, { 0x52, 0x0F, 0, 1, 0x02, 0x02 }, { 0x52, 0x0F, 0, 1, 0x03, 0x03 }, - { 0x52, 0x0F, 0, 1, 0x02, 0x02 }, { 0x5B, 0x09, 0, 0, 0x02, 0x02 }, { 0x5B, 0x09, 0, 0, 0x02, 0x02 }, - { 0x5B, 0x09, 0, 0, 0x02, 0x02 }, { 0x5B, 0x09, 0, 0, 0x02, 0x02 }, { 0x4C, 0x02, 0, 1, 0x04, 0x20 }, - { 0x4C, 0x02, 0, 1, 0x04, 0x20 }, { 0x4C, 0x02, 0, 1, 0x04, 0x20 }, { 0x4C, 0x02, 0, 1, 0x04, 0x20 }, - { 0x55, 0x0C, 0, 1, 0x04, 0x02 }, { 0x55, 0x0C, 0, 1, 0x04, 0x02 }, { 0x55, 0x0C, 0, 1, 0x04, 0x02 }, - { 0x55, 0x0C, 0, 1, 0x04, 0x02 }, { 0x17, 0x02, 1, 1, 0x02, 0x02 }, { 0x17, 0x02, 1, 1, 0x02, 0x02 }, - { 0x17, 0x02, 1, 1, 0x02, 0x02 }, { 0x17, 0x02, 1, 1, 0x02, 0x02 }, { 0x4A, 0x01, 0, 0, 0x03, 0x03 }, - { 0x4A, 0x01, 0, 0, 0x02, 0x02 }, { 0x4A, 0x01, 0, 0, 0x03, 0x03 }, { 0x4A, 0x01, 0, 0, 0x02, 0x02 }, - { 0x43, 0x07, 0, 1, 0x02, 0x02 }, { 0x43, 0x07, 0, 1, 0x02, 0x02 }, { 0x43, 0x07, 0, 1, 0x02, 0x02 }, - { 0x43, 0x07, 0, 1, 0x02, 0x02 }, { 0x5D, 0x12, 0, 1, 0x02, 0x02 }, { 0x5D, 0x12, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x12, 0, 1, 0x02, 0x02 }, { 0x5D, 0x12, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0D, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0D, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0D, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0D, 0, 1, 0x02, 0x02 }, - { 0x56, 0x02, 0, 1, 0x12, 0x12 }, { 0x56, 0x02, 0, 1, 0x02, 0x02 }, { 0x56, 0x02, 0, 1, 0x12, 0x12 }, - { 0x56, 0x02, 0, 1, 0x02, 0x02 }, { 0x57, 0x08, 0, 1, 0x02, 0x02 }, { 0x57, 0x08, 0, 1, 0x02, 0x02 }, - { 0x57, 0x08, 0, 1, 0x02, 0x02 }, { 0x57, 0x08, 0, 1, 0x02, 0x02 }, { 0x56, 0x03, 0, 1, 0x03, 0x03 }, - { 0x56, 0x03, 0, 1, 0x03, 0x03 }, { 0x56, 0x03, 0, 1, 0x03, 0x03 }, { 0x56, 0x03, 0, 1, 0x03, 0x03 }, - { 0x57, 0x09, 0, 1, 0x03, 0x03 }, { 0x57, 0x09, 0, 1, 0x03, 0x03 }, { 0x57, 0x09, 0, 1, 0x03, 0x03 }, - { 0x57, 0x09, 0, 1, 0x03, 0x03 }, { 0x5C, 0x08, 0, 1, 0x03, 0x03 }, { 0x5C, 0x08, 0, 1, 0x03, 0x03 }, - { 0x5C, 0x08, 0, 1, 0x03, 0x03 }, { 0x5C, 0x08, 0, 1, 0x03, 0x03 }, + ENTRANCE(0x00, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x00, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x00, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x00, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x01, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x01, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x01, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x01, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x0B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x0B, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x0B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x0B, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x14, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x14, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x14, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x14, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x05, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x05, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x05, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x05, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x6E, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x6E, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x6E, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x6E, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x6C, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x6C, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x6C, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x6C, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x68, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x68, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x68, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x68, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x69, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x69, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x69, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x69, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x6D, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x6D, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x6D, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x6D, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x02, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x02, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x02, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x02, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x02, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x41, 0x00, 0, 1, 0x02, 0x26), + ENTRANCE(0x41, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x41, 0x00, 0, 1, 0x02, 0x26), + ENTRANCE(0x41, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x41, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x41, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x1B, 0x00, 1, 1, 0x03, 0x03), + ENTRANCE(0x1C, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x1D, 0x00, 1, 1, 0x03, 0x03), + ENTRANCE(0x1D, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x07, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x07, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x07, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x07, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x42, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x42, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x42, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x42, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x3E, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x38, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x38, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x38, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x38, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x6A, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x6A, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x6A, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x6A, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x40, 0x00, 0, 1, 0x02, 0x26), + ENTRANCE(0x40, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x40, 0x00, 0, 1, 0x02, 0x26), + ENTRANCE(0x40, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x4C, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x4C, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x4C, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x4C, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x00, 0, 1, 0x0B, 0x0B), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x10, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x10, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x10, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x10, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x1E, 0x03, 1, 1, 0x03, 0x03), + ENTRANCE(0x1F, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x1E, 0x03, 1, 1, 0x02, 0x02), + ENTRANCE(0x1F, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x44, 0x00, 0, 1, 0x07, 0x07), + ENTRANCE(0x44, 0x00, 0, 1, 0x07, 0x07), ENTRANCE(0x44, 0x00, 0, 1, 0x07, 0x07), + ENTRANCE(0x44, 0x00, 0, 1, 0x07, 0x07), ENTRANCE(0x44, 0x00, 0, 1, 0x0D, 0x02), + ENTRANCE(0x44, 0x00, 0, 1, 0x0D, 0x02), ENTRANCE(0x44, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x4E, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x4E, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x4E, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x4E, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x6B, 0x00, 0, 1, 0x22, 0x22), ENTRANCE(0x6B, 0x00, 0, 1, 0x22, 0x22), + ENTRANCE(0x6B, 0x00, 0, 1, 0x22, 0x22), ENTRANCE(0x6B, 0x00, 0, 1, 0x22, 0x22), + ENTRANCE(0x45, 0x00, 0, 1, 0x22, 0x04), ENTRANCE(0x46, 0x00, 0, 1, 0x22, 0x04), + ENTRANCE(0x45, 0x00, 0, 1, 0x22, 0x04), ENTRANCE(0x46, 0x00, 0, 1, 0x22, 0x04), + ENTRANCE(0x4D, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x4D, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x4D, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x4D, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x06, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x06, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x06, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x06, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x06, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x06, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x09, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x09, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x09, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x09, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x09, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x17, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x17, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x17, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x17, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x17, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x17, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x17, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x65, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x65, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x65, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x65, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x08, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x08, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x08, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x08, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x27, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x27, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x27, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x27, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x47, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x47, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x47, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x47, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x47, 0x00, 0, 1, 0x0A, 0x0A), ENTRANCE(0x47, 0x00, 0, 1, 0x02, 0x0A), + ENTRANCE(0x47, 0x00, 1, 1, 0x0A, 0x0A), ENTRANCE(0x47, 0x00, 0, 1, 0x0B, 0x0B), + ENTRANCE(0x47, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x47, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x47, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x47, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x47, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x1E, 0x00, 1, 1, 0x03, 0x03), + ENTRANCE(0x1F, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x1E, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x1F, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x20, 0x00, 1, 1, 0x03, 0x03), + ENTRANCE(0x21, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x22, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x22, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x20, 0x00, 0, 1, 0x08, 0x08), + ENTRANCE(0x67, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x2C, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x2C, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x2C, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x2C, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x34, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x34, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x34, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x34, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x34, 0x00, 0, 1, 0x04, 0x02), + ENTRANCE(0x34, 0x00, 0, 1, 0x10, 0x10), ENTRANCE(0x2D, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x2D, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x2D, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x2D, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x01, 0x01, 1, 0, 0x02, 0x02), + ENTRANCE(0x01, 0x01, 1, 0, 0x02, 0x02), ENTRANCE(0x01, 0x01, 1, 0, 0x02, 0x02), + ENTRANCE(0x01, 0x01, 1, 0, 0x02, 0x02), ENTRANCE(0x26, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x26, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x26, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x26, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x51, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x00, 0, 1, 0x04, 0x02), + ENTRANCE(0x51, 0x00, 0, 1, 0x21, 0x21), ENTRANCE(0x51, 0x00, 0, 1, 0x21, 0x21), + ENTRANCE(0x51, 0x00, 0, 1, 0x23, 0x23), ENTRANCE(0x51, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x51, 0x00, 0, 1, 0x23, 0x23), + ENTRANCE(0x51, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x00, 0, 1, 0x29, 0x29), + ENTRANCE(0x51, 0x00, 1, 1, 0x03, 0x03), ENTRANCE(0x52, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x52, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x52, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x00, 0, 1, 0x26, 0x26), + ENTRANCE(0x52, 0x00, 0, 1, 0x21, 0x21), ENTRANCE(0x52, 0x00, 1, 1, 0x21, 0x21), + ENTRANCE(0x52, 0x00, 0, 1, 0x21, 0x21), ENTRANCE(0x52, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x53, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x53, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x53, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x53, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x54, 0x00, 1, 1, 0x03, 0x03), ENTRANCE(0x54, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x54, 0x00, 1, 1, 0x03, 0x03), ENTRANCE(0x54, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x55, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x55, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x55, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x55, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x55, 0x00, 1, 1, 0x0A, 0x0A), ENTRANCE(0x55, 0x00, 0, 1, 0x0A, 0x0A), + ENTRANCE(0x55, 0x00, 1, 1, 0x0A, 0x0A), ENTRANCE(0x55, 0x00, 0, 1, 0x0D, 0x0A), + ENTRANCE(0x55, 0x00, 0, 1, 0x0A, 0x0A), ENTRANCE(0x55, 0x00, 0, 1, 0x0A, 0x0A), + ENTRANCE(0x55, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x55, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x55, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x55, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x56, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x56, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x56, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x56, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x56, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x56, 0x00, 0, 1, 0x00, 0x00), + ENTRANCE(0x57, 0x00, 1, 1, 0x03, 0x03), ENTRANCE(0x57, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x57, 0x00, 1, 1, 0x03, 0x03), ENTRANCE(0x57, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x57, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x57, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x58, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x58, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x58, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x58, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x58, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x58, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x59, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x59, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x59, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x59, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x59, 0x00, 0, 1, 0x0D, 0x00), ENTRANCE(0x59, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x59, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x59, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x59, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x5A, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x5A, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x00, 1, 1, 0x0C, 0x0A), + ENTRANCE(0x5A, 0x00, 1, 1, 0x0A, 0x0A), ENTRANCE(0x5A, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x5B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x5B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x5B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x5C, 0x00, 1, 1, 0x0F, 0x0F), + ENTRANCE(0x5C, 0x00, 1, 1, 0x0F, 0x0F), ENTRANCE(0x5C, 0x00, 1, 1, 0x0F, 0x0F), + ENTRANCE(0x5C, 0x00, 1, 1, 0x0F, 0x0F), ENTRANCE(0x5C, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x5C, 0x00, 1, 1, 0x0F, 0x0F), ENTRANCE(0x5D, 0x00, 1, 1, 0x03, 0x03), + ENTRANCE(0x5D, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x00, 1, 1, 0x03, 0x03), + ENTRANCE(0x5D, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x00, 1, 1, 0x21, 0x21), + ENTRANCE(0x5D, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x5E, 0x00, 1, 1, 0x0E, 0x0E), ENTRANCE(0x5E, 0x00, 1, 1, 0x0E, 0x0E), + ENTRANCE(0x5E, 0x00, 1, 1, 0x0E, 0x0E), ENTRANCE(0x5E, 0x00, 1, 1, 0x0E, 0x0E), + ENTRANCE(0x0E, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x0E, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x5F, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x5F, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x64, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x64, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x64, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x60, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x60, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x60, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x60, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x60, 0x00, 1, 1, 0x0A, 0x0A), + ENTRANCE(0x60, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x60, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x60, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x60, 0x00, 1, 1, 0x03, 0x03), + ENTRANCE(0x60, 0x00, 1, 1, 0x03, 0x03), ENTRANCE(0x61, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x61, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x61, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x61, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x62, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x62, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x62, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x62, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x62, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x62, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x58, 0x03, 0, 1, 0x00, 0x00), + ENTRANCE(0x58, 0x03, 0, 1, 0x00, 0x00), ENTRANCE(0x58, 0x03, 0, 1, 0x00, 0x00), + ENTRANCE(0x58, 0x03, 0, 1, 0x00, 0x00), ENTRANCE(0x63, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x63, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x63, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x63, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x63, 0x00, 0, 1, 0x20, 0x20), + ENTRANCE(0x63, 0x00, 0, 1, 0x2A, 0x2A), ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x04, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x04, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x04, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x04, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x03, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x03, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x03, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x03, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x42, 0x01, 0, 1, 0x04, 0x20), + ENTRANCE(0x42, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x42, 0x01, 0, 1, 0x04, 0x20), + ENTRANCE(0x42, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x23, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x24, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x25, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x25, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x04, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x04, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x04, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x04, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x0E, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x0E, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x51, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x02, 1, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x51, 0x02, 1, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x51, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x51, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x51, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x04, 1, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x04, 1, 1, 0x02, 0x02), ENTRANCE(0x51, 0x04, 1, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x04, 1, 1, 0x02, 0x02), ENTRANCE(0x51, 0x05, 0, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x05, 0, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x52, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x52, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x02, 0, 1, 0x03, 0x03), + ENTRANCE(0x52, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x02, 0, 1, 0x03, 0x03), + ENTRANCE(0x52, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x54, 0x01, 1, 1, 0x03, 0x03), + ENTRANCE(0x54, 0x01, 1, 1, 0x03, 0x03), ENTRANCE(0x54, 0x01, 1, 1, 0x03, 0x03), + ENTRANCE(0x54, 0x01, 1, 1, 0x03, 0x03), ENTRANCE(0x54, 0x02, 0, 1, 0x03, 0x03), + ENTRANCE(0x54, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x54, 0x02, 0, 1, 0x03, 0x03), + ENTRANCE(0x54, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x58, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x58, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x58, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x58, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x5A, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x5A, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x5B, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x5B, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x5B, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x5B, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x5B, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x5B, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x02, 1, 1, 0x02, 0x02), + ENTRANCE(0x0E, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x02, 1, 1, 0x02, 0x02), + ENTRANCE(0x0E, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x60, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x60, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x60, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x60, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x60, 0x02, 0, 1, 0x03, 0x03), + ENTRANCE(0x60, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x60, 0x02, 0, 1, 0x03, 0x03), + ENTRANCE(0x60, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x62, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x62, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x62, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x62, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x38, 0x01, 0, 1, 0x04, 0x20), + ENTRANCE(0x38, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x38, 0x01, 0, 1, 0x04, 0x20), + ENTRANCE(0x38, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x1A, 0x05, 1, 1, 0x02, 0x02), + ENTRANCE(0x1A, 0x05, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x05, 1, 1, 0x02, 0x02), + ENTRANCE(0x1A, 0x05, 1, 1, 0x02, 0x02), ENTRANCE(0x20, 0x08, 0, 1, 0x04, 0x02), + ENTRANCE(0x21, 0x08, 0, 1, 0x04, 0x02), ENTRANCE(0x22, 0x08, 0, 1, 0x04, 0x02), + ENTRANCE(0x22, 0x08, 0, 1, 0x04, 0x02), ENTRANCE(0x20, 0x09, 0, 1, 0x04, 0x02), + ENTRANCE(0x21, 0x09, 0, 1, 0x04, 0x02), ENTRANCE(0x22, 0x09, 0, 1, 0x04, 0x02), + ENTRANCE(0x22, 0x09, 0, 1, 0x04, 0x02), ENTRANCE(0x20, 0x0A, 0, 1, 0x04, 0x02), + ENTRANCE(0x21, 0x0A, 0, 1, 0x04, 0x02), ENTRANCE(0x22, 0x0A, 0, 1, 0x04, 0x02), + ENTRANCE(0x22, 0x0A, 0, 1, 0x04, 0x02), ENTRANCE(0x54, 0x03, 1, 1, 0x03, 0x03), + ENTRANCE(0x54, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x54, 0x03, 1, 1, 0x03, 0x03), + ENTRANCE(0x54, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x54, 0x04, 0, 1, 0x2C, 0x2C), + ENTRANCE(0x54, 0x04, 0, 1, 0x2C, 0x2C), ENTRANCE(0x54, 0x04, 0, 1, 0x2C, 0x2C), + ENTRANCE(0x54, 0x04, 0, 1, 0x2C, 0x2C), ENTRANCE(0x5C, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x5C, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x5C, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x5C, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x5C, 0x02, 0, 0, 0x03, 0x03), + ENTRANCE(0x5C, 0x02, 0, 0, 0x02, 0x02), ENTRANCE(0x5C, 0x02, 0, 0, 0x03, 0x03), + ENTRANCE(0x5C, 0x02, 0, 0, 0x02, 0x02), ENTRANCE(0x5C, 0x03, 0, 0, 0x03, 0x03), + ENTRANCE(0x5C, 0x03, 0, 0, 0x02, 0x02), ENTRANCE(0x5C, 0x03, 0, 0, 0x03, 0x03), + ENTRANCE(0x5C, 0x03, 0, 0, 0x02, 0x02), ENTRANCE(0x5C, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x5C, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x5C, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x5C, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x5C, 0x05, 0, 1, 0x03, 0x03), + ENTRANCE(0x5C, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x5C, 0x05, 0, 1, 0x03, 0x03), + ENTRANCE(0x5C, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x5C, 0x06, 1, 0, 0x0F, 0x0F), + ENTRANCE(0x5C, 0x06, 1, 0, 0x0F, 0x0F), ENTRANCE(0x5C, 0x06, 1, 0, 0x0F, 0x0F), + ENTRANCE(0x5C, 0x06, 1, 0, 0x0F, 0x0F), ENTRANCE(0x51, 0x06, 0, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x06, 0, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x07, 0, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x07, 0, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x03, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x03, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x03, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x03, 0, 1, 0x04, 0x02), ENTRANCE(0x53, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x53, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x53, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x53, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x55, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x55, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x55, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x55, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x55, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x55, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x55, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x55, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x55, 0x03, 0, 1, 0x04, 0x04), + ENTRANCE(0x55, 0x03, 0, 1, 0x04, 0x04), ENTRANCE(0x55, 0x03, 0, 1, 0x04, 0x04), + ENTRANCE(0x55, 0x03, 0, 1, 0x04, 0x04), ENTRANCE(0x56, 0x01, 0, 1, 0x12, 0x12), + ENTRANCE(0x56, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x56, 0x01, 0, 1, 0x12, 0x12), + ENTRANCE(0x56, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x57, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x57, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x02, 0, 1, 0x13, 0x13), + ENTRANCE(0x57, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x02, 0, 1, 0x13, 0x13), + ENTRANCE(0x57, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x59, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x59, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x59, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x59, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x59, 0x02, 0, 1, 0x03, 0x03), + ENTRANCE(0x59, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x59, 0x02, 0, 1, 0x03, 0x03), + ENTRANCE(0x59, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x02, 1, 1, 0x03, 0x03), + ENTRANCE(0x5A, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x02, 1, 1, 0x03, 0x03), + ENTRANCE(0x5A, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x03, 1, 1, 0x03, 0x03), + ENTRANCE(0x5A, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x03, 1, 1, 0x03, 0x03), + ENTRANCE(0x5A, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x5D, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x5D, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x02, 0, 1, 0x03, 0x03), + ENTRANCE(0x5D, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x02, 0, 1, 0x03, 0x03), + ENTRANCE(0x5D, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x03, 0, 1, 0x03, 0x03), + ENTRANCE(0x5D, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x03, 0, 1, 0x03, 0x03), + ENTRANCE(0x5D, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x5F, 0x01, 0, 1, 0x03, 0x03), + ENTRANCE(0x5F, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x64, 0x01, 0, 1, 0x05, 0x05), + ENTRANCE(0x64, 0x01, 0, 1, 0x05, 0x05), ENTRANCE(0x5F, 0x01, 0, 1, 0x00, 0x00), + ENTRANCE(0x60, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x60, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x60, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x60, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x61, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x61, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x61, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x61, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x03, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x03, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x03, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x03, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x00, 0x01, 1, 0, 0x02, 0x02), ENTRANCE(0x00, 0x01, 1, 0, 0x02, 0x02), + ENTRANCE(0x00, 0x01, 1, 0, 0x02, 0x02), ENTRANCE(0x00, 0x01, 1, 0, 0x02, 0x02), + ENTRANCE(0x0E, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x03, 1, 1, 0x02, 0x02), + ENTRANCE(0x0E, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x03, 1, 1, 0x02, 0x02), + ENTRANCE(0x20, 0x01, 0, 1, 0x03, 0x03), ENTRANCE(0x21, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x22, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x22, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x20, 0x02, 0, 1, 0x03, 0x03), ENTRANCE(0x21, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x22, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x22, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x20, 0x03, 1, 1, 0x03, 0x03), ENTRANCE(0x21, 0x03, 1, 1, 0x02, 0x02), + ENTRANCE(0x22, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x22, 0x03, 1, 1, 0x02, 0x02), + ENTRANCE(0x55, 0x04, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x04, 0, 0, 0x04, 0x04), + ENTRANCE(0x55, 0x04, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x04, 0, 0, 0x04, 0x04), + ENTRANCE(0x55, 0x05, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x05, 0, 0, 0x04, 0x04), + ENTRANCE(0x55, 0x05, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x05, 0, 0, 0x04, 0x04), + ENTRANCE(0x1B, 0x02, 0, 0, 0x02, 0x02), ENTRANCE(0x1C, 0x02, 0, 0, 0x02, 0x02), + ENTRANCE(0x1D, 0x02, 0, 0, 0x02, 0x02), ENTRANCE(0x1D, 0x02, 0, 0, 0x02, 0x02), + ENTRANCE(0x34, 0x01, 0, 1, 0x04, 0x04), ENTRANCE(0x34, 0x01, 0, 1, 0x04, 0x04), + ENTRANCE(0x34, 0x01, 0, 1, 0x04, 0x04), ENTRANCE(0x34, 0x01, 0, 1, 0x04, 0x04), + ENTRANCE(0x1B, 0x01, 0, 1, 0x03, 0x03), ENTRANCE(0x1C, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x1D, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x1D, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x51, 0x08, 1, 1, 0x03, 0x03), ENTRANCE(0x51, 0x08, 1, 1, 0x02, 0x02), + ENTRANCE(0x51, 0x08, 1, 1, 0x03, 0x03), ENTRANCE(0x51, 0x08, 1, 1, 0x02, 0x02), + ENTRANCE(0x51, 0x09, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x09, 0, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x09, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x09, 0, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x0A, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x0A, 0, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x0A, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x0A, 0, 1, 0x03, 0x03), + ENTRANCE(0x55, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x55, 0x06, 0, 1, 0x02, 0x02), + ENTRANCE(0x55, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x55, 0x06, 0, 1, 0x02, 0x02), + ENTRANCE(0x51, 0x0B, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0B, 0, 1, 0x04, 0x02), + ENTRANCE(0x51, 0x0B, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0B, 0, 1, 0x04, 0x02), + ENTRANCE(0x51, 0x0C, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0C, 0, 1, 0x04, 0x02), + ENTRANCE(0x51, 0x0C, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0C, 0, 1, 0x04, 0x02), + ENTRANCE(0x51, 0x0D, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0D, 0, 1, 0x04, 0x02), + ENTRANCE(0x51, 0x0D, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0D, 0, 1, 0x04, 0x02), + ENTRANCE(0x45, 0x01, 0, 1, 0x03, 0x03), ENTRANCE(0x46, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x45, 0x01, 0, 1, 0x03, 0x03), ENTRANCE(0x46, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x1E, 0x01, 1, 1, 0x03, 0x03), ENTRANCE(0x1F, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x1E, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x1F, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x20, 0x04, 1, 1, 0x03, 0x03), ENTRANCE(0x21, 0x04, 1, 1, 0x02, 0x02), + ENTRANCE(0x22, 0x04, 1, 1, 0x02, 0x02), ENTRANCE(0x22, 0x04, 1, 1, 0x02, 0x02), + ENTRANCE(0x20, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x21, 0x05, 0, 1, 0x04, 0x02), + ENTRANCE(0x22, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x22, 0x05, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x52, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x04, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x04, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x63, 0x01, 0, 0, 0x03, 0x03), ENTRANCE(0x63, 0x01, 0, 0, 0x02, 0x02), + ENTRANCE(0x63, 0x01, 0, 0, 0x03, 0x03), ENTRANCE(0x63, 0x01, 0, 0, 0x02, 0x02), + ENTRANCE(0x07, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x07, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x07, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x07, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x07, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x07, 0x02, 1, 1, 0x02, 0x02), + ENTRANCE(0x07, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x07, 0x02, 1, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x05, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x05, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x05, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x05, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x06, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x06, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x06, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x06, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x07, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x07, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x07, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x07, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x08, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x08, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x08, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x08, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x02, 0, 1, 0x0A, 0x0A), ENTRANCE(0x43, 0x02, 0, 1, 0x0A, 0x0A), + ENTRANCE(0x43, 0x02, 0, 1, 0x0A, 0x0A), ENTRANCE(0x43, 0x02, 0, 1, 0x0A, 0x0A), + ENTRANCE(0x44, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x44, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x44, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x44, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x09, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x09, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x09, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x09, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x0A, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0A, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x0A, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0A, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x0B, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0B, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x0B, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0B, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x0C, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0C, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x0C, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0C, 0, 1, 0x02, 0x02), + ENTRANCE(0x63, 0x02, 0, 1, 0x03, 0x03), ENTRANCE(0x63, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x63, 0x02, 0, 1, 0x03, 0x03), ENTRANCE(0x63, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x63, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x63, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x63, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x63, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x56, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x47, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x06, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x06, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x06, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x06, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x36, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x36, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x36, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x36, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x2A, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x2A, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x2A, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x2A, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x13, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x13, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x13, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x13, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x15, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x15, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x15, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x15, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x57, 0x06, 0, 1, 0x04, 0x02), + ENTRANCE(0x57, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x57, 0x06, 0, 1, 0x04, 0x02), + ENTRANCE(0x57, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x3A, 0x00, 0, 1, 0x02, 0x20), + ENTRANCE(0x3A, 0x00, 0, 1, 0x02, 0x20), ENTRANCE(0x3A, 0x00, 0, 1, 0x02, 0x20), + ENTRANCE(0x3A, 0x00, 0, 1, 0x02, 0x20), ENTRANCE(0x51, 0x0E, 1, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x0E, 1, 1, 0x03, 0x03), ENTRANCE(0x51, 0x0E, 1, 1, 0x03, 0x03), + ENTRANCE(0x51, 0x0E, 1, 1, 0x03, 0x03), ENTRANCE(0x3B, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x3B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x3B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x3B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x3F, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x3F, 0x00, 0, 1, 0x02, 0x26), + ENTRANCE(0x3F, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x3F, 0x00, 0, 1, 0x02, 0x26), + ENTRANCE(0x43, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x58, 0x04, 0, 1, 0x2C, 0x2C), ENTRANCE(0x58, 0x04, 0, 1, 0x2C, 0x2C), + ENTRANCE(0x58, 0x04, 0, 1, 0x2C, 0x2C), ENTRANCE(0x58, 0x04, 0, 1, 0x2C, 0x2C), + ENTRANCE(0x1A, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x02, 1, 1, 0x02, 0x02), + ENTRANCE(0x1A, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x02, 1, 1, 0x02, 0x02), + ENTRANCE(0x1A, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x03, 1, 1, 0x02, 0x02), + ENTRANCE(0x1A, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x03, 1, 1, 0x02, 0x02), + ENTRANCE(0x1A, 0x04, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x04, 1, 1, 0x02, 0x02), + ENTRANCE(0x1A, 0x04, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x04, 1, 1, 0x02, 0x02), + ENTRANCE(0x55, 0x07, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x07, 0, 0, 0x04, 0x04), + ENTRANCE(0x55, 0x07, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x07, 0, 0, 0x04, 0x04), + ENTRANCE(0x55, 0x08, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x08, 0, 0, 0x04, 0x04), + ENTRANCE(0x55, 0x08, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x08, 0, 0, 0x04, 0x04), + ENTRANCE(0x5F, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x5F, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x64, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x64, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x5F, 0x02, 0, 1, 0x00, 0x00), ENTRANCE(0x52, 0x05, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x05, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x06, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x06, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x07, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x07, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x07, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x07, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x08, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x08, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x08, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x08, 0, 1, 0x04, 0x02), ENTRANCE(0x53, 0x02, 0, 1, 0x04, 0x02), + ENTRANCE(0x53, 0x02, 0, 1, 0x04, 0x02), ENTRANCE(0x53, 0x02, 0, 1, 0x04, 0x02), + ENTRANCE(0x53, 0x02, 0, 1, 0x04, 0x02), ENTRANCE(0x53, 0x03, 0, 1, 0x03, 0x03), + ENTRANCE(0x53, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x03, 0, 1, 0x03, 0x03), + ENTRANCE(0x53, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x04, 0, 1, 0x03, 0x03), + ENTRANCE(0x53, 0x04, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x04, 0, 1, 0x03, 0x03), + ENTRANCE(0x53, 0x04, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x05, 0, 1, 0x03, 0x03), + ENTRANCE(0x53, 0x05, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x05, 0, 1, 0x03, 0x03), + ENTRANCE(0x53, 0x05, 0, 1, 0x03, 0x03), ENTRANCE(0x5E, 0x01, 1, 1, 0x0E, 0x0E), + ENTRANCE(0x5E, 0x01, 1, 1, 0x0E, 0x0E), ENTRANCE(0x5E, 0x01, 1, 1, 0x0E, 0x0E), + ENTRANCE(0x5E, 0x01, 1, 1, 0x0E, 0x0E), ENTRANCE(0x5E, 0x02, 0, 1, 0x0E, 0x0E), + ENTRANCE(0x5E, 0x02, 0, 1, 0x0E, 0x0E), ENTRANCE(0x5E, 0x02, 0, 1, 0x0E, 0x0E), + ENTRANCE(0x5E, 0x02, 0, 1, 0x0E, 0x0E), ENTRANCE(0x3C, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x3C, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x3C, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x3C, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x3D, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x3D, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x3D, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x3D, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x3D, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x3D, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x3D, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x63, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x63, 0x04, 0, 1, 0x04, 0x02), + ENTRANCE(0x63, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x63, 0x04, 0, 1, 0x04, 0x02), + ENTRANCE(0x2E, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x2E, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x2E, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x2E, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x2F, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x2F, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x2F, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x2F, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x30, 0x00, 0, 0, 0x04, 0x20), ENTRANCE(0x30, 0x00, 0, 0, 0x04, 0x20), + ENTRANCE(0x30, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x30, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x31, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x31, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x31, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x31, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x1E, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x1F, 0x04, 0, 1, 0x04, 0x02), + ENTRANCE(0x1E, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x1F, 0x04, 0, 1, 0x04, 0x02), + ENTRANCE(0x32, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x32, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x32, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x32, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x59, 0x05, 0, 1, 0x03, 0x03), ENTRANCE(0x59, 0x05, 0, 1, 0x03, 0x03), + ENTRANCE(0x59, 0x05, 0, 1, 0x03, 0x03), ENTRANCE(0x59, 0x05, 0, 1, 0x03, 0x03), + ENTRANCE(0x35, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x35, 0x00, 0, 1, 0x04, 0x02), + ENTRANCE(0x35, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x35, 0x00, 0, 1, 0x04, 0x02), + ENTRANCE(0x37, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x37, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x37, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x37, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x39, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x39, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x39, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x39, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x5D, 0x0D, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0D, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x0D, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0D, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x0E, 0, 1, 0x03, 0x05), ENTRANCE(0x5D, 0x0E, 0, 1, 0x02, 0x04), + ENTRANCE(0x5D, 0x0E, 0, 1, 0x03, 0x05), ENTRANCE(0x5D, 0x0E, 0, 1, 0x02, 0x04), + ENTRANCE(0x5D, 0x0F, 1, 1, 0x0F, 0x0F), ENTRANCE(0x5D, 0x0F, 1, 1, 0x0F, 0x0F), + ENTRANCE(0x5D, 0x0F, 1, 1, 0x0F, 0x0F), ENTRANCE(0x5D, 0x0F, 1, 1, 0x0F, 0x0F), + ENTRANCE(0x5D, 0x10, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x10, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x10, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x10, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x11, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x11, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x11, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x11, 0, 1, 0x02, 0x02), + ENTRANCE(0x20, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x21, 0x06, 0, 1, 0x04, 0x02), + ENTRANCE(0x22, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x22, 0x06, 0, 1, 0x04, 0x02), + ENTRANCE(0x20, 0x07, 0, 1, 0x04, 0x02), ENTRANCE(0x21, 0x07, 0, 1, 0x04, 0x02), + ENTRANCE(0x22, 0x07, 0, 1, 0x04, 0x02), ENTRANCE(0x22, 0x07, 0, 1, 0x04, 0x02), + ENTRANCE(0x1E, 0x02, 0, 1, 0x04, 0x02), ENTRANCE(0x1F, 0x02, 0, 1, 0x04, 0x02), + ENTRANCE(0x1E, 0x02, 0, 1, 0x03, 0x03), ENTRANCE(0x1F, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x58, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x58, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x58, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x58, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x57, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x57, 0x03, 0, 1, 0x03, 0x03), + ENTRANCE(0x57, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x57, 0x03, 0, 1, 0x03, 0x03), + ENTRANCE(0x57, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x57, 0x04, 0, 1, 0x04, 0x02), + ENTRANCE(0x57, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x57, 0x04, 0, 1, 0x04, 0x02), + ENTRANCE(0x5A, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x5A, 0x04, 0, 1, 0x04, 0x02), + ENTRANCE(0x5A, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x5A, 0x04, 0, 1, 0x04, 0x02), + ENTRANCE(0x59, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x59, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x59, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x59, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x59, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x59, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x59, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x59, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x0E, 0x04, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x04, 1, 1, 0x02, 0x02), + ENTRANCE(0x0E, 0x04, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x04, 1, 1, 0x02, 0x02), + ENTRANCE(0x0E, 0x05, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x05, 1, 1, 0x02, 0x02), + ENTRANCE(0x0E, 0x05, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x05, 1, 1, 0x02, 0x02), + ENTRANCE(0x0E, 0x06, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x06, 1, 1, 0x02, 0x02), + ENTRANCE(0x0E, 0x06, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x06, 1, 1, 0x02, 0x02), + ENTRANCE(0x30, 0x01, 0, 0, 0x04, 0x20), ENTRANCE(0x30, 0x01, 0, 0, 0x04, 0x20), + ENTRANCE(0x30, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x30, 0x01, 0, 1, 0x04, 0x20), + ENTRANCE(0x30, 0x02, 0, 0, 0x04, 0x20), ENTRANCE(0x30, 0x02, 0, 0, 0x04, 0x20), + ENTRANCE(0x30, 0x02, 0, 1, 0x04, 0x20), ENTRANCE(0x30, 0x02, 0, 1, 0x04, 0x20), + ENTRANCE(0x06, 0x02, 0, 0, 0x02, 0x02), ENTRANCE(0x06, 0x02, 0, 0, 0x02, 0x02), + ENTRANCE(0x06, 0x02, 0, 0, 0x02, 0x02), ENTRANCE(0x06, 0x02, 0, 0, 0x02, 0x02), + ENTRANCE(0x06, 0x03, 0, 0, 0x02, 0x02), ENTRANCE(0x06, 0x03, 0, 0, 0x02, 0x02), + ENTRANCE(0x06, 0x03, 0, 0, 0x02, 0x02), ENTRANCE(0x06, 0x03, 0, 0, 0x02, 0x02), + ENTRANCE(0x06, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x06, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x06, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x06, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x62, 0x02, 0, 1, 0x04, 0x02), ENTRANCE(0x62, 0x02, 0, 1, 0x04, 0x02), + ENTRANCE(0x62, 0x02, 0, 1, 0x04, 0x02), ENTRANCE(0x62, 0x02, 0, 1, 0x04, 0x02), + ENTRANCE(0x4A, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x4A, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x4A, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x4A, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x4A, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x4A, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x4A, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x02, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x02, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x02, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x02, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x12, 0x00, 1, 0, 0x02, 0x02), + ENTRANCE(0x12, 0x00, 1, 0, 0x02, 0x02), ENTRANCE(0x12, 0x00, 1, 0, 0x02, 0x02), + ENTRANCE(0x12, 0x00, 1, 0, 0x02, 0x02), ENTRANCE(0x11, 0x00, 1, 0, 0x02, 0x02), + ENTRANCE(0x11, 0x00, 1, 0, 0x02, 0x02), ENTRANCE(0x11, 0x00, 1, 0, 0x02, 0x02), + ENTRANCE(0x11, 0x00, 1, 0, 0x02, 0x02), ENTRANCE(0x18, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x18, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x18, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x18, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x16, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x16, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x16, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x16, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x0A, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x0A, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x0A, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x0A, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x19, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x19, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x19, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x19, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x05, 0x01, 1, 1, 0x03, 0x02), + ENTRANCE(0x05, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x05, 0x01, 1, 1, 0x03, 0x02), + ENTRANCE(0x05, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x0A, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x0A, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x0A, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x0A, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x0A, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x0A, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x0A, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x0A, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x63, 0x05, 0, 1, 0x04, 0x02), + ENTRANCE(0x63, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x63, 0x05, 0, 1, 0x04, 0x02), + ENTRANCE(0x63, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x28, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x28, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x28, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x28, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x29, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x29, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x29, 0x00, 0, 1, 0x04, 0x04), + ENTRANCE(0x29, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x2B, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x2B, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x2B, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x2B, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x1A, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x1A, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x1A, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x55, 0x09, 0, 0, 0x04, 0x04), + ENTRANCE(0x55, 0x09, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x09, 0, 0, 0x04, 0x04), + ENTRANCE(0x55, 0x09, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x0A, 0, 0, 0x04, 0x04), + ENTRANCE(0x55, 0x0A, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x0A, 0, 0, 0x04, 0x04), + ENTRANCE(0x55, 0x0A, 0, 0, 0x04, 0x04), ENTRANCE(0x52, 0x09, 0, 1, 0x04, 0x04), + ENTRANCE(0x52, 0x09, 0, 1, 0x04, 0x04), ENTRANCE(0x52, 0x09, 0, 1, 0x04, 0x04), + ENTRANCE(0x52, 0x09, 0, 1, 0x04, 0x04), ENTRANCE(0x48, 0x00, 0, 1, 0x02, 0x26), + ENTRANCE(0x48, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x48, 0x00, 0, 1, 0x02, 0x26), + ENTRANCE(0x48, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x48, 0x01, 0, 1, 0x04, 0x20), + ENTRANCE(0x48, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x48, 0x01, 0, 1, 0x04, 0x20), + ENTRANCE(0x48, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x55, 0x0B, 0, 1, 0x04, 0x02), + ENTRANCE(0x55, 0x0B, 0, 1, 0x04, 0x02), ENTRANCE(0x55, 0x0B, 0, 1, 0x04, 0x02), + ENTRANCE(0x55, 0x0B, 0, 1, 0x04, 0x02), ENTRANCE(0x60, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x60, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x60, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x60, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x49, 0x00, 0, 1, 0x02, 0x20), + ENTRANCE(0x49, 0x00, 0, 1, 0x02, 0x20), ENTRANCE(0x49, 0x00, 0, 1, 0x02, 0x20), + ENTRANCE(0x49, 0x00, 0, 1, 0x02, 0x20), ENTRANCE(0x52, 0x0A, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x0A, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x0A, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x0A, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), + ENTRANCE(0x23, 0x01, 0, 1, 0x04, 0x02), ENTRANCE(0x24, 0x01, 0, 1, 0x04, 0x02), + ENTRANCE(0x25, 0x01, 0, 1, 0x04, 0x02), ENTRANCE(0x25, 0x01, 0, 1, 0x04, 0x02), + ENTRANCE(0x51, 0x0F, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0F, 0, 1, 0x04, 0x02), + ENTRANCE(0x51, 0x0F, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0F, 0, 1, 0x04, 0x02), + ENTRANCE(0x60, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x60, 0x05, 0, 1, 0x04, 0x02), + ENTRANCE(0x60, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x60, 0x05, 0, 1, 0x04, 0x02), + ENTRANCE(0x5F, 0x04, 0, 1, 0x03, 0x03), ENTRANCE(0x5F, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x64, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x64, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x61, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x61, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x05, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x05, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x06, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x06, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x07, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x07, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x08, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x08, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x08, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x08, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x09, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x09, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x09, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x09, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x0A, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x0A, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x0A, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x0A, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x0B, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x0B, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x0B, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x0B, 0, 1, 0x02, 0x02), + ENTRANCE(0x0E, 0x07, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x07, 1, 1, 0x02, 0x02), + ENTRANCE(0x0E, 0x07, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x07, 1, 1, 0x02, 0x02), + ENTRANCE(0x1A, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x1A, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x01, 1, 1, 0x02, 0x02), + ENTRANCE(0x3B, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x3B, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x3B, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x3B, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x5B, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x5B, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x63, 0x06, 0, 0, 0x02, 0x26), ENTRANCE(0x63, 0x06, 0, 0, 0x02, 0x26), + ENTRANCE(0x63, 0x06, 0, 0, 0x02, 0x26), ENTRANCE(0x63, 0x06, 0, 0, 0x02, 0x26), + ENTRANCE(0x63, 0x07, 0, 0, 0x2E, 0x2E), ENTRANCE(0x63, 0x07, 0, 0, 0x2E, 0x2E), + ENTRANCE(0x63, 0x07, 0, 0, 0x2E, 0x2E), ENTRANCE(0x63, 0x07, 0, 0, 0x2E, 0x2E), + ENTRANCE(0x5B, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x05, 0, 1, 0x02, 0x02), + ENTRANCE(0x5B, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x05, 0, 1, 0x02, 0x02), + ENTRANCE(0x5B, 0x06, 0, 1, 0x2C, 0x2C), ENTRANCE(0x5B, 0x06, 0, 1, 0x2C, 0x2C), + ENTRANCE(0x5B, 0x06, 0, 1, 0x2C, 0x2C), ENTRANCE(0x5B, 0x06, 0, 1, 0x2C, 0x2C), + ENTRANCE(0x5B, 0x07, 0, 1, 0x2C, 0x2C), ENTRANCE(0x5B, 0x07, 0, 1, 0x2C, 0x2C), + ENTRANCE(0x5B, 0x07, 0, 1, 0x2C, 0x2C), ENTRANCE(0x5B, 0x07, 0, 1, 0x2C, 0x2C), + ENTRANCE(0x5B, 0x08, 0, 0, 0x02, 0x02), ENTRANCE(0x5B, 0x08, 0, 0, 0x02, 0x02), + ENTRANCE(0x5B, 0x08, 0, 0, 0x02, 0x02), ENTRANCE(0x5B, 0x08, 0, 0, 0x02, 0x02), + ENTRANCE(0x62, 0x03, 0, 1, 0x2C, 0x2C), ENTRANCE(0x62, 0x03, 0, 1, 0x2C, 0x2C), + ENTRANCE(0x62, 0x03, 0, 1, 0x2C, 0x2C), ENTRANCE(0x62, 0x03, 0, 1, 0x2C, 0x2C), + ENTRANCE(0x57, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x05, 0, 1, 0x02, 0x02), + ENTRANCE(0x57, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x05, 0, 1, 0x02, 0x02), + ENTRANCE(0x07, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x07, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x07, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x07, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x52, 0x0B, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x0B, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x0B, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x0B, 0, 1, 0x04, 0x02), + ENTRANCE(0x3B, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x3B, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x61, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x61, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x5F, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x5F, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x64, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x64, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x5F, 0x03, 0, 1, 0x00, 0x00), ENTRANCE(0x52, 0x0C, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x0C, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x0C, 0, 1, 0x04, 0x02), + ENTRANCE(0x52, 0x0C, 0, 1, 0x04, 0x02), ENTRANCE(0x48, 0x02, 1, 1, 0x04, 0x20), + ENTRANCE(0x48, 0x02, 1, 1, 0x04, 0x20), ENTRANCE(0x48, 0x02, 1, 1, 0x04, 0x20), + ENTRANCE(0x48, 0x02, 1, 1, 0x04, 0x20), ENTRANCE(0x4B, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x4B, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x4B, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x4B, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x53, 0x06, 0, 1, 0x03, 0x03), + ENTRANCE(0x53, 0x06, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x06, 0, 1, 0x03, 0x03), + ENTRANCE(0x53, 0x06, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x10, 0, 1, 0x0B, 0x0B), + ENTRANCE(0x51, 0x10, 0, 1, 0x0B, 0x0B), ENTRANCE(0x51, 0x10, 0, 1, 0x0B, 0x0B), + ENTRANCE(0x51, 0x10, 0, 1, 0x0B, 0x0B), ENTRANCE(0x52, 0x0D, 0, 1, 0x03, 0x03), + ENTRANCE(0x52, 0x0D, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x0D, 0, 1, 0x03, 0x03), + ENTRANCE(0x52, 0x0D, 0, 1, 0x02, 0x02), ENTRANCE(0x4F, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x4F, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x4F, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x4F, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x4F, 0x00, 0, 1, 0x03, 0x03), + ENTRANCE(0x1A, 0x06, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x06, 1, 1, 0x02, 0x02), + ENTRANCE(0x1A, 0x06, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x06, 1, 1, 0x02, 0x02), + ENTRANCE(0x66, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x66, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x66, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x66, 0x00, 0, 1, 0x02, 0x02), + ENTRANCE(0x1A, 0x07, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x07, 1, 1, 0x02, 0x02), + ENTRANCE(0x1A, 0x07, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x07, 1, 1, 0x02, 0x02), + ENTRANCE(0x32, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x32, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x32, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x32, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x2C, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x2C, 0x01, 0, 1, 0x04, 0x20), + ENTRANCE(0x2C, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x2C, 0x01, 0, 1, 0x04, 0x20), + ENTRANCE(0x33, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x33, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x33, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x33, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x0D, 0x01, 0, 0, 0x04, 0x02), ENTRANCE(0x0D, 0x01, 0, 0, 0x04, 0x02), + ENTRANCE(0x0D, 0x01, 0, 0, 0x04, 0x02), ENTRANCE(0x0D, 0x01, 0, 0, 0x04, 0x02), + ENTRANCE(0x0D, 0x02, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x02, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x02, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x02, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x03, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x03, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x03, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x03, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x04, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x04, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x05, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x05, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x06, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x06, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x07, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x07, 0, 1, 0x04, 0x02), + ENTRANCE(0x0D, 0x07, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x07, 0, 1, 0x04, 0x02), + ENTRANCE(0x50, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x50, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x50, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x50, 0x00, 0, 1, 0x04, 0x20), + ENTRANCE(0x52, 0x0E, 0, 1, 0x03, 0x03), ENTRANCE(0x52, 0x0E, 0, 1, 0x02, 0x02), + ENTRANCE(0x52, 0x0E, 0, 1, 0x03, 0x03), ENTRANCE(0x52, 0x0E, 0, 1, 0x02, 0x02), + ENTRANCE(0x63, 0x08, 0, 0, 0x20, 0x20), ENTRANCE(0x63, 0x08, 0, 0, 0x20, 0x20), + ENTRANCE(0x63, 0x08, 0, 0, 0x20, 0x20), ENTRANCE(0x63, 0x08, 0, 0, 0x20, 0x20), + ENTRANCE(0x63, 0x09, 0, 0, 0x02, 0x02), ENTRANCE(0x63, 0x09, 0, 0, 0x02, 0x02), + ENTRANCE(0x63, 0x09, 0, 0, 0x02, 0x02), ENTRANCE(0x63, 0x09, 0, 0, 0x02, 0x02), + ENTRANCE(0x57, 0x07, 0, 1, 0x2C, 0x2C), ENTRANCE(0x57, 0x07, 0, 1, 0x2C, 0x2C), + ENTRANCE(0x57, 0x07, 0, 1, 0x2C, 0x2C), ENTRANCE(0x57, 0x07, 0, 1, 0x2C, 0x2C), + ENTRANCE(0x61, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x05, 0, 1, 0x02, 0x02), + ENTRANCE(0x61, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x05, 0, 1, 0x02, 0x02), + ENTRANCE(0x53, 0x07, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x07, 0, 1, 0x03, 0x03), + ENTRANCE(0x53, 0x07, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x07, 0, 1, 0x03, 0x03), + ENTRANCE(0x0F, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x0F, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x0F, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x0F, 0x00, 1, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x0C, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x0C, 0, 1, 0x02, 0x02), + ENTRANCE(0x0C, 0x0C, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x0C, 0, 1, 0x02, 0x02), + ENTRANCE(0x41, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x41, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x41, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x41, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x3D, 0x01, 0, 1, 0x04, 0x04), ENTRANCE(0x3D, 0x01, 0, 1, 0x04, 0x04), + ENTRANCE(0x3D, 0x01, 0, 1, 0x04, 0x04), ENTRANCE(0x3D, 0x01, 0, 1, 0x04, 0x04), + ENTRANCE(0x5C, 0x07, 0, 1, 0x03, 0x03), ENTRANCE(0x5C, 0x07, 0, 1, 0x02, 0x02), + ENTRANCE(0x5C, 0x07, 0, 1, 0x03, 0x03), ENTRANCE(0x5C, 0x07, 0, 1, 0x02, 0x02), + ENTRANCE(0x53, 0x08, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x08, 0, 1, 0x03, 0x03), + ENTRANCE(0x53, 0x08, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x08, 0, 1, 0x03, 0x03), + ENTRANCE(0x03, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x03, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x03, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x03, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x3D, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x3D, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x3D, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x3D, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x05, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x05, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x06, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x06, 0, 1, 0x02, 0x02), + ENTRANCE(0x51, 0x11, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x11, 0, 1, 0x02, 0x02), + ENTRANCE(0x51, 0x11, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x11, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x03, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x04, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x05, 0, 1, 0x02, 0x03), ENTRANCE(0x3E, 0x05, 0, 1, 0x02, 0x03), + ENTRANCE(0x3E, 0x05, 0, 1, 0x02, 0x03), ENTRANCE(0x3E, 0x05, 0, 1, 0x02, 0x03), + ENTRANCE(0x3E, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x06, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x06, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x07, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x07, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x08, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x08, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x08, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x08, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x09, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x09, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x09, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x09, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x0A, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0A, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x0A, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0A, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x0B, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0B, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x0B, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0B, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x0C, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0C, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x0C, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0C, 0, 1, 0x02, 0x02), + ENTRANCE(0x37, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x37, 0x01, 0, 1, 0x04, 0x20), + ENTRANCE(0x37, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x37, 0x01, 0, 1, 0x04, 0x20), + ENTRANCE(0x08, 0x01, 0, 1, 0x04, 0x04), ENTRANCE(0x08, 0x01, 0, 1, 0x04, 0x04), + ENTRANCE(0x08, 0x01, 0, 1, 0x04, 0x04), ENTRANCE(0x08, 0x01, 0, 1, 0x04, 0x04), + ENTRANCE(0x4C, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x4C, 0x01, 0, 1, 0x04, 0x20), + ENTRANCE(0x4C, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x4C, 0x01, 0, 1, 0x04, 0x20), + ENTRANCE(0x63, 0x0A, 0, 1, 0x04, 0x02), ENTRANCE(0x63, 0x0A, 0, 1, 0x04, 0x02), + ENTRANCE(0x63, 0x0A, 0, 1, 0x04, 0x02), ENTRANCE(0x63, 0x0A, 0, 1, 0x04, 0x02), + ENTRANCE(0x09, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x09, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x09, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x09, 0x01, 0, 1, 0x02, 0x02), + ENTRANCE(0x52, 0x0F, 0, 1, 0x03, 0x03), ENTRANCE(0x52, 0x0F, 0, 1, 0x02, 0x02), + ENTRANCE(0x52, 0x0F, 0, 1, 0x03, 0x03), ENTRANCE(0x52, 0x0F, 0, 1, 0x02, 0x02), + ENTRANCE(0x5B, 0x09, 0, 0, 0x02, 0x02), ENTRANCE(0x5B, 0x09, 0, 0, 0x02, 0x02), + ENTRANCE(0x5B, 0x09, 0, 0, 0x02, 0x02), ENTRANCE(0x5B, 0x09, 0, 0, 0x02, 0x02), + ENTRANCE(0x4C, 0x02, 0, 1, 0x04, 0x20), ENTRANCE(0x4C, 0x02, 0, 1, 0x04, 0x20), + ENTRANCE(0x4C, 0x02, 0, 1, 0x04, 0x20), ENTRANCE(0x4C, 0x02, 0, 1, 0x04, 0x20), + ENTRANCE(0x55, 0x0C, 0, 1, 0x04, 0x02), ENTRANCE(0x55, 0x0C, 0, 1, 0x04, 0x02), + ENTRANCE(0x55, 0x0C, 0, 1, 0x04, 0x02), ENTRANCE(0x55, 0x0C, 0, 1, 0x04, 0x02), + ENTRANCE(0x17, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x17, 0x02, 1, 1, 0x02, 0x02), + ENTRANCE(0x17, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x17, 0x02, 1, 1, 0x02, 0x02), + ENTRANCE(0x4A, 0x01, 0, 0, 0x03, 0x03), ENTRANCE(0x4A, 0x01, 0, 0, 0x02, 0x02), + ENTRANCE(0x4A, 0x01, 0, 0, 0x03, 0x03), ENTRANCE(0x4A, 0x01, 0, 0, 0x02, 0x02), + ENTRANCE(0x43, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x07, 0, 1, 0x02, 0x02), + ENTRANCE(0x43, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x07, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x12, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x12, 0, 1, 0x02, 0x02), + ENTRANCE(0x5D, 0x12, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x12, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x0D, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0D, 0, 1, 0x02, 0x02), + ENTRANCE(0x3E, 0x0D, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0D, 0, 1, 0x02, 0x02), + ENTRANCE(0x56, 0x02, 0, 1, 0x12, 0x12), ENTRANCE(0x56, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x56, 0x02, 0, 1, 0x12, 0x12), ENTRANCE(0x56, 0x02, 0, 1, 0x02, 0x02), + ENTRANCE(0x57, 0x08, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x08, 0, 1, 0x02, 0x02), + ENTRANCE(0x57, 0x08, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x08, 0, 1, 0x02, 0x02), + ENTRANCE(0x56, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x56, 0x03, 0, 1, 0x03, 0x03), + ENTRANCE(0x56, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x56, 0x03, 0, 1, 0x03, 0x03), + ENTRANCE(0x57, 0x09, 0, 1, 0x03, 0x03), ENTRANCE(0x57, 0x09, 0, 1, 0x03, 0x03), + ENTRANCE(0x57, 0x09, 0, 1, 0x03, 0x03), ENTRANCE(0x57, 0x09, 0, 1, 0x03, 0x03), + ENTRANCE(0x5C, 0x08, 0, 1, 0x03, 0x03), ENTRANCE(0x5C, 0x08, 0, 1, 0x03, 0x03), + ENTRANCE(0x5C, 0x08, 0, 1, 0x03, 0x03), ENTRANCE(0x5C, 0x08, 0, 1, 0x03, 0x03), }; #define TITLED_SCENE(name, title, unk_10, config, unk_12) \ @@ -662,7 +927,7 @@ Gfx sDefaultDisplayList[] = { void func_800994A0(GlobalContext* globalCtx) { s16 computedEntranceIndex; - if (gSaveContext.night_flag) { + if (gSaveContext.nightFlag) { if (LINK_IS_CHILD) { computedEntranceIndex = globalCtx->nextEntranceIndex + 1; } else { @@ -676,7 +941,7 @@ void func_800994A0(GlobalContext* globalCtx) { } } - globalCtx->fadeOutTransition = gEntranceTable[computedEntranceIndex].fadeOutTransition; + globalCtx->fadeTransition = gEntranceTable[computedEntranceIndex].field & 0x7F; // Fade out } // Scene Draw Config 0 @@ -714,7 +979,7 @@ void func_800995DC(GlobalContext* globalCtx) { { s32 pad; } // Necessary to match stack usage - gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A2F8[gSaveContext.night_flag])); + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A2F8[gSaveContext.nightFlag])); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 4783); } @@ -756,7 +1021,7 @@ void func_80099878(GlobalContext* globalCtx) { Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 4905); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A300[gSaveContext.night_flag])); + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A300[gSaveContext.nightFlag])); gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_8012A308[(s32)(gameplayFrames & 14) >> 1])); gSPSegment(gfxCtx->polyXlu.p++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 256, 0, 64, 32, 1, 0, @@ -841,7 +1106,7 @@ void func_80099BD8(GlobalContext* globalCtx) { Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5145); - if (gSaveContext.scene_setup_index == 5) { + if (gSaveContext.sceneSetupIndex == 5) { D_8015FCF0 = 1; D_8015FCF8.x = -20.0f; D_8015FCF8.y = 1220.0f; @@ -1037,7 +1302,7 @@ void func_8009AFE0(GlobalContext* globalCtx) { { s32 pad[2]; } // Necessary to match stack usage - gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A328[gSaveContext.night_flag])); + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A328[gSaveContext.nightFlag])); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5507); } @@ -1061,7 +1326,7 @@ void func_8009B0FC(GlobalContext* globalCtx) { spAC = globalCtx->unk_11D30[1] & 0xFF; gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A330[gSaveContext.night_flag])); + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A330[gSaveContext.nightFlag])); if (spB0 == 1) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, @@ -1236,14 +1501,14 @@ void func_8009BEEC(GlobalContext* globalCtx) { s32 var; if (globalCtx->gameplayFrames % 128 == 13) { - var = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 2); + var = Quake_Add(globalCtx->cameraPtrs[globalCtx->activeCamera], 2); Quake_SetSpeed(var, 10000); Quake_SetQuakeValues(var, 4, 0, 0, 0); Quake_SetCountdown(var, 127); } if ((globalCtx->gameplayFrames % 64 == 0) && (Math_Rand_ZeroOne() > 0.6f)) { - var = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 3); + var = Quake_Add(globalCtx->cameraPtrs[globalCtx->activeCamera], 3); Quake_SetSpeed(var, 32000.0f + (Math_Rand_ZeroOne() * 3000.0f)); Quake_SetQuakeValues(var, 10.0f - (Math_Rand_ZeroOne() * 9.0f), 0, 0, 0); Quake_SetCountdown(var, 48.0f - (Math_Rand_ZeroOne() * 15.0f)); @@ -1313,7 +1578,7 @@ void func_8009C3EC(GlobalContext* globalCtx) { Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6042); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A338[gSaveContext.night_flag])); + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A338[gSaveContext.nightFlag])); gSPSegment(gfxCtx->polyOpa.p++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); @@ -1427,7 +1692,7 @@ void func_8009CC00(GlobalContext* globalCtx) { Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6290); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A340[gSaveContext.night_flag])); + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A340[gSaveContext.nightFlag])); gSPSegment(gfxCtx->polyOpa.p++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); @@ -1529,7 +1794,7 @@ void func_8009D31C(GlobalContext* globalCtx) { gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6515); - gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A348[gSaveContext.night_flag])); + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A348[gSaveContext.nightFlag])); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1555,7 +1820,7 @@ void func_8009D438(GlobalContext* globalCtx) { if (LINK_IS_ADULT) { var = 1; } else { - var = gSaveContext.night_flag; + var = gSaveContext.nightFlag; } gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A358[var])); @@ -1609,7 +1874,7 @@ void func_8009D758(GlobalContext* globalCtx) { Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6640); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A360[gSaveContext.night_flag])); + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A360[gSaveContext.nightFlag])); gSPSegment(gfxCtx->polyXlu.p++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); @@ -1639,7 +1904,7 @@ void func_8009D974(GlobalContext* globalCtx) { gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6752); - gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A368[gSaveContext.night_flag])); + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A368[gSaveContext.nightFlag])); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6762); } @@ -1672,14 +1937,14 @@ void func_8009DA30(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyXlu.p++, 0x0A, displayListHead); - if ((gSaveContext.day_time >= 0x4AAC) && (gSaveContext.day_time <= 0xC555)) { + if ((gSaveContext.dayTime >= 0x4AAC) && (gSaveContext.dayTime <= 0xC555)) { gSPEndDisplayList(displayListHead); } else { - if (gSaveContext.day_time > 0xC555) { + if (gSaveContext.dayTime > 0xC555) { if (globalCtx->unk_11D30[0] != 255) { Math_ApproxS(&globalCtx->unk_11D30[0], 255, 5); } - } else if (gSaveContext.day_time >= 0x4000) { + } else if (gSaveContext.dayTime >= 0x4000) { if (globalCtx->unk_11D30[0] != 0) { Math_ApproxS(&globalCtx->unk_11D30[0], 0, 10); } @@ -1704,7 +1969,7 @@ void func_8009DD5C(GlobalContext* globalCtx) { gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6890); - gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A370[gSaveContext.night_flag])); + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A370[gSaveContext.nightFlag])); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1775,11 +2040,11 @@ void func_8009E0B8(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - if (gSaveContext.scene_setup_index == 4) { + if (gSaveContext.sceneSetupIndex == 4) { spA3 = 255 - (u8)globalCtx->unk_11D30[0]; - } else if (gSaveContext.scene_setup_index == 6) { + } else if (gSaveContext.sceneSetupIndex == 6) { spA0 = globalCtx->unk_11D30[0] + 500; - } else if (((gSaveContext.scene_setup_index < 4) || LINK_IS_ADULT) && (gSaveContext.event_chk_inf[0] & 0x80)) { + } else if (((gSaveContext.sceneSetupIndex < 4) || LINK_IS_ADULT) && (gSaveContext.eventChkInf[0] & 0x80)) { spA0 = 2150; } @@ -1810,7 +2075,7 @@ void func_8009E54C(GlobalContext* globalCtx) { gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7058); - if ((gSaveContext.scene_setup_index > 3) || (LINK_IS_ADULT && !(gSaveContext.event_chk_inf[6] & 0x200))) { + if ((gSaveContext.sceneSetupIndex > 3) || (LINK_IS_ADULT && !(gSaveContext.eventChkInf[6] & 0x200))) { globalCtx->unk_11D30[0] = 87; } @@ -1851,7 +2116,7 @@ void func_8009E730(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); - gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A378[gSaveContext.night_flag])); + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A378[gSaveContext.nightFlag])); { s32 pad[2]; } // Necessary to match stack usage @@ -1993,7 +2258,7 @@ void func_8009F1B4(GlobalContext* globalCtx) { gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7363); - gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380[gSaveContext.night_flag])); + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380[gSaveContext.nightFlag])); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7371); } @@ -2063,14 +2328,14 @@ void func_8009F5D4(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyXlu.p++, 0x08, displayListHead); - if ((gSaveContext.day_time >= 0x4AAC) && (gSaveContext.day_time <= 0xC000)) { + if ((gSaveContext.dayTime >= 0x4AAC) && (gSaveContext.dayTime <= 0xC000)) { gSPEndDisplayList(displayListHead); } else { - if (gSaveContext.day_time > 0xC000) { + if (gSaveContext.dayTime > 0xC000) { if (globalCtx->unk_11D30[0] != 255) { Math_ApproxS(&globalCtx->unk_11D30[0], 255, 5); } - } else if (gSaveContext.day_time >= 0x4000) { + } else if (gSaveContext.dayTime >= 0x4000) { if (globalCtx->unk_11D30[0] != 0) { Math_ApproxS(&globalCtx->unk_11D30[0], 0, 10); } @@ -2143,7 +2408,7 @@ void func_8009F9D0(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A388[gSaveContext.night_flag])); + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A388[gSaveContext.nightFlag])); { s32 pad[2]; } // Necessary to match stack usage @@ -2161,7 +2426,7 @@ void func_8009FB74(GlobalContext* globalCtx) { gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7602); - gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A390[gSaveContext.night_flag])); + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A390[gSaveContext.nightFlag])); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2365,9 +2630,9 @@ void Scene_Draw(GlobalContext* globalCtx) { GraphicsContext* gfxCtx; Gfx* dispRefs[4]; - if (HREG(80) == 0x11) { - if (HREG(95) != 0x11) { - HREG(95) = 0x11; + if (HREG(80) == 17) { + if (HREG(95) != 17) { + HREG(95) = 17; HREG(81) = 1; HREG(82) = 1; HREG(83) = 0; diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 099fa122e8..36a5c8a858 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -15,14 +15,14 @@ void SkelAnime_AnimationType3Loaded(GlobalContext* globalCtx, AnimationEntryType void SkelAnime_AnimationType4Loaded(GlobalContext* globalCtx, AnimationEntryType4* entry); void SkelAnime_AnimationType5Loaded(GlobalContext* globalCtx, AnimationEntryType5* entry); -//.data +// .data u32 D_8012A480 = 0; static AnimationEntryCallback sAnimationLoadDone[] = { &SkelAnime_LinkAnimetionLoaded, &SkelAnime_AnimationType1Loaded, &SkelAnime_AnimationType2Loaded, &SkelAnime_AnimationType3Loaded, &SkelAnime_AnimationType4Loaded, &SkelAnime_AnimationType5Loaded, }; -//.bss +// .bss u32 D_801600B0; /* diff --git a/src/code/z_view.c b/src/code/z_view.c index 18336b98a2..83147cceb9 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -2,154 +2,165 @@ #include #include -volatile u32 D_8012ABF0 = 1; +volatile u32 D_8012ABF0 = true; -// TODO replace UnkViewStruct with Viewport and match with that instead -void func_800AA190(UnkViewStruct* arg0, Viewport* viewport) { - s32 xLen; - s32 yLen; +void View_ViewportToVp(Vp* dest, Viewport* src) { + s32 width = src->rightX - src->leftX; + s32 height = src->bottomY - src->topY; - xLen = viewport->rightX - viewport->leftX; - yLen = viewport->bottomY - viewport->topY; - arg0->unk_0 = (xLen * 2); - arg0->unk_2 = (yLen * 2); - arg0->unk_4 = 0x01FF; - arg0->unk_6 = 0; - arg0->unk_8 = (((viewport->leftX * 2) + xLen) * 2); - arg0->unk_A = (((viewport->topY * 2) + yLen) * 2); - arg0->unk_C = 0x01FF; - arg0->unk_E = 0; + dest->vp.vscale[0] = width * 2; + dest->vp.vscale[1] = height * 2; + dest->vp.vscale[2] = 0x01FF; + dest->vp.vscale[3] = 0; + dest->vp.vtrans[0] = ((src->leftX * 2) + width) * 2; + dest->vp.vtrans[1] = ((src->topY * 2) + height) * 2; + dest->vp.vtrans[2] = 0x01FF; + dest->vp.vtrans[3] = 0; } -View* func_800AA1F8(GraphicsContext* gfxCtx) { +View* View_New(GraphicsContext* gfxCtx) { View* view = SystemArena_MallocDebug(sizeof(View), "../z_view.c", 285); + if (view != NULL) { - func_80106860(view, 0, sizeof(View)); // TODO prototype this - func_800AA278(view, gfxCtx); + func_80106860(view, 0, sizeof(View)); // memset + View_Init(view, gfxCtx); } + return view; } -void func_800AA250(View* view) { +void View_Free(View* view) { SystemArena_FreeDebug(view, "../z_view.c", 297); } -void func_800AA278(View* view, GraphicsContext* gfxCtx) { +void View_Init(View* view, GraphicsContext* gfxCtx) { view->gfxCtx = gfxCtx; view->viewport.topY = 0; - view->viewport.bottomY = 240; + view->viewport.bottomY = SCREEN_HEIGHT; view->viewport.leftX = 0; - view->viewport.rightX = 320; - view->magic = 0x56494557; //"VIEW" + view->viewport.rightX = SCREEN_WIDTH; + view->magic = 0x56494557; // "VIEW" view->eye.x = 0.0f; view->eye.y = 0.0f; - view->unk_24 = 1.0f; - view->fieldOfView = 60.0f; - view->fogDistance = 10.0f; - view->zDepth = 12800.0f; + view->scale = 1.0f; + view->fovy = 60.0f; + view->near = 10.0f; + view->far = 12800.0f; view->unk_34.x = 0.0f; view->unk_40.x = 0.0f; view->unk_40.y = 1.0f; view->unk_40.z = 0.0f; view->eye.z = -1.0f; - if (D_8012ABF0 != 0) { + if (D_8012ABF0) { if (&D_8012ABF0) {} - osSyncPrintf("\nview: initialize ---\n", gfxCtx, view); - D_8012ABF0 = 0; + osSyncPrintf("\nview: initialize ---\n"); + D_8012ABF0 = false; } + view->unk_124 = 0; - view->unk_120 = 7; + view->flags = 1 | 2 | 4; func_800AA7B8(view); } -void func_800AA358(View* view, Vec3f* vec1, Vec3f* vec2, Vec3f* vec3) { - if (vec1->x == vec2->x && vec1->z == vec2->z) { - vec1->x += 0.1f; +void func_800AA358(View* view, Vec3f* eye, Vec3f* vec2, Vec3f* vec3) { + if (eye->x == vec2->x && eye->z == vec2->z) { + eye->x += 0.1f; } - view->eye = *vec1; + + view->eye = *eye; view->unk_34 = *vec2; view->unk_40 = *vec3; - view->unk_120 |= 1; + view->flags |= 1; } -void func_800AA3F0(View* view, Vec3f* vec1, Vec3f* vec2, Vec3f* vec3) { - view->eye = *vec1; +void func_800AA3F0(View* view, Vec3f* eye, Vec3f* vec2, Vec3f* vec3) { + view->eye = *eye; view->unk_34 = *vec2; view->unk_40 = *vec3; } -void func_800AA43C(View* view, f32 arg1) { - view->unk_120 |= 4; - view->unk_24 = arg1; +void View_SetScale(View* view, f32 scale) { + view->flags |= 4; + view->scale = scale; } -void func_800AA454(View* view, f32* arg1) { - *arg1 = view->unk_24; +void View_GetScale(View* view, f32* scale) { + *scale = view->scale; } -void func_800AA460(View* view, f32 fieldOfView, f32 fogDistance, f32 zDepth) { - view->fieldOfView = fieldOfView; - view->fogDistance = fogDistance; - view->zDepth = zDepth; - view->unk_120 |= 4; +void func_800AA460(View* view, f32 fovy, f32 near, f32 far) { + view->fovy = fovy; + view->near = near; + view->far = far; + view->flags |= 4; } -void func_800AA48C(View* view, f32* fieldOfView, f32* fogDistance, f32* zDepth) { - *fieldOfView = view->fieldOfView; - *fogDistance = view->fogDistance; - *zDepth = view->zDepth; +void func_800AA48C(View* view, f32* fovy, f32* near, f32* far) { + *fovy = view->fovy; + *near = view->near; + *far = view->far; } -void func_800AA4A8(View* view, f32 fieldOfView, f32 fogDistance, f32 zDepth) { - view->fieldOfView = fieldOfView; - view->fogDistance = fogDistance; - view->zDepth = zDepth; - view->unk_120 |= 8; - view->unk_24 = 1.0f; +void func_800AA4A8(View* view, f32 fovy, f32 near, f32 far) { + view->fovy = fovy; + view->near = near; + view->far = far; + view->flags |= 8; + view->scale = 1.0f; } -void func_800AA4E0(View* view, f32* fieldOfView, f32* fogDistance, f32* zDepth) { - *fieldOfView = view->fieldOfView; - *fogDistance = view->fogDistance; - *zDepth = view->zDepth; +void func_800AA4E0(View* view, f32* fovy, f32* near, f32* far) { + *fovy = view->fovy; + *near = view->near; + *far = view->far; } -void func_800AA4FC(View* view, Viewport* viewport) { +void View_SetViewport(View* view, Viewport* viewport) { view->viewport = *viewport; - view->unk_120 |= 2; + view->flags |= 2; } -void func_800AA52C(View* view, Viewport* viewport) { +void View_GetViewport(View* view, Viewport* viewport) { *viewport = view->viewport; } -#ifdef NON_MATCHING -// regalloc, zeros optimised out void func_800AA550(View* view) { - s32 phi_v1; - s32 phi_v1_2; + s32 varY; + s32 varX; s32 pad; s32 ulx; s32 uly; s32 lrx; s32 lry; GraphicsContext* gfxCtx; - s32 temp_a0; - Gfx* dispRefs[4]; + Gfx* dispRefs[5]; gfxCtx = view->gfxCtx; - phi_v1 = func_800B38FC(); - if (phi_v1 < 0) { - phi_v1 = 0; + + varY = func_800B38FC(); + + varX = -1; // The following is optimized to varX = 0 but affects codegen + + if (varX < 0) { + varX = 0; } - if (phi_v1 >= 0x79) { - phi_v1 = 0x78; + if (varX > SCREEN_WIDTH / 2) { + varX = SCREEN_WIDTH / 2; } - ulx = view->viewport.leftX + 0; - uly = view->viewport.topY + phi_v1; - lrx = view->viewport.rightX - 0; - lry = view->viewport.bottomY - phi_v1; + + if (varY < 0) { + varY = 0; + } + if (varY > SCREEN_HEIGHT / 2) { + varY = SCREEN_HEIGHT / 2; + } + + ulx = view->viewport.leftX + varX; + uly = view->viewport.topY + varY; + lrx = view->viewport.rightX - varX; + lry = view->viewport.bottomY - varY; + if (ulx < 0) { __assert("ulx >= 0", "../z_view.c", 454); } @@ -162,27 +173,27 @@ void func_800AA550(View* view) { if (lry > SCREEN_HEIGHT) { __assert("lry <= SCREEN_HT", "../z_view.c", 457); } + Graph_OpenDisps(dispRefs, gfxCtx, "../z_view.c", 459); + gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetScissor(gfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetScissor(gfxCtx->polyXlu.p++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_view.c", 472); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA550.s") -#endif -void func_800AA76C(View* view, f32 arg1, f32 arg2, f32 arg3) { - view->unk_E8.x = arg1; - view->unk_E8.y = arg2; - view->unk_E8.z = arg3; +void func_800AA76C(View* view, f32 x, f32 y, f32 z) { + view->unk_E8.x = x; + view->unk_E8.y = y; + view->unk_E8.z = z; } -void func_800AA78C(View* view, f32 arg1, f32 arg2, f32 arg3) { - view->unk_F4.x = arg1; - view->unk_F4.y = arg2; - view->unk_F4.z = arg3; +void func_800AA78C(View* view, f32 x, f32 y, f32 z) { + view->unk_F4.x = x; + view->unk_F4.y = y; + view->unk_F4.z = z; } void func_800AA7AC(View* view, f32 arg1) { @@ -218,7 +229,7 @@ void func_800AA840(View* view, Vec3f vec1, Vec3f vec2, f32 arg3) { } s32 func_800AA890(View* view, Mtx* mtx) { - MtxF mtxF; + MtxF mf; if (view->unk_100 == 0.0f) { return 0; @@ -235,21 +246,24 @@ s32 func_800AA890(View* view, Mtx* mtx) { view->unk_110.y += ((view->unk_F4.y - view->unk_110.y) * view->unk_100); view->unk_110.z += ((view->unk_F4.z - view->unk_110.z) * view->unk_100); } - Matrix_MtxToMtxF(mtx, &mtxF); - Matrix_Put(&mtxF); - Matrix_RotateX(view->unk_104.x, 1); - Matrix_RotateY(view->unk_104.y, 1); - Matrix_RotateZ(view->unk_104.z, 1); + + Matrix_MtxToMtxF(mtx, &mf); + Matrix_Put(&mf); + Matrix_RotateX(view->unk_104.x, MTXMODE_APPLY); + Matrix_RotateY(view->unk_104.y, MTXMODE_APPLY); + Matrix_RotateZ(view->unk_104.z, MTXMODE_APPLY); Matrix_Scale(view->unk_110.x, view->unk_110.y, view->unk_110.z, MTXMODE_APPLY); - Matrix_RotateZ(-view->unk_104.z, 1); - Matrix_RotateY(-view->unk_104.y, 1); - Matrix_RotateX(-view->unk_104.x, 1); + Matrix_RotateZ(-view->unk_104.z, MTXMODE_APPLY); + Matrix_RotateY(-view->unk_104.y, MTXMODE_APPLY); + Matrix_RotateX(-view->unk_104.x, MTXMODE_APPLY); Matrix_ToMtx(mtx, "../z_view.c", 566); + return 1; } void func_800AAA50(View* view, s32 arg1) { - arg1 = (view->unk_120 & arg1) | arg1 >> 4; + arg1 = (view->flags & arg1) | arg1 >> 4; + if (arg1 & 8) { func_800AB0A8(view); } else { @@ -257,91 +271,99 @@ void func_800AAA50(View* view, s32 arg1) { } } -#ifdef NON_MATCHING -// Just one stack var s32 func_800AAA9C(View* view) { - s32 pad; - s32 pad1; - s32 ylen; - Viewport* viewport; + f32 aspect; + s32 width; + s32 height; + Vp* vp; Mtx* projection; - MtxF* viewing; - Gfx* dispRefs[6]; - s32 xlen; + Mtx* viewing; GraphicsContext* gfxCtx; - s32 i; - MtxF mtxF; - MtxF mtxFv; + Gfx* dispRefs[5]; gfxCtx = view->gfxCtx; Graph_OpenDisps(dispRefs, gfxCtx, "../z_view.c", 596); - viewport = Graph_Alloc(gfxCtx, sizeof(Viewport)); - LogUtils_CheckNullPointer("vp", viewport, "../z_view.c", 601); - func_800AA190(viewport, &view->viewport); - view->unk_50 = *viewport; + + vp = Graph_Alloc(gfxCtx, sizeof(Vp)); + LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 601); + View_ViewportToVp(vp, &view->viewport); + view->vp = *vp; + func_800AA550(view); - gSPViewport(gfxCtx->polyOpa.p++, viewport); - gSPViewport(gfxCtx->polyXlu.p++, viewport); + gSPViewport(gfxCtx->polyOpa.p++, vp); + gSPViewport(gfxCtx->polyXlu.p++, vp); projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 616); - view->unk_E0 = projection; - xlen = view->viewport.rightX - view->viewport.leftX; - ylen = view->viewport.bottomY - view->viewport.topY; - if (HREG(80) == 0xB) { - if (HREG(94) != 0xB) { - HREG(94) = 0xB; - HREG(83) = 0x3C; - HREG(84) = 0x3415; - HREG(85) = 0xA; - HREG(86) = 0x3200; - HREG(87) = 0x64; + view->projectionPtr = projection; + + width = view->viewport.rightX - view->viewport.leftX; + height = view->viewport.bottomY - view->viewport.topY; + aspect = (f32)width / (f32)height; + + if (HREG(80) == 11) { + if (HREG(94) != 11) { + HREG(94) = 11; + HREG(83) = 60; + HREG(84) = 13333; + HREG(85) = 10; + HREG(86) = 12800; + HREG(87) = 100; } - guPerspective(projection, &view->unk_11C, HREG(83), HREG(84) / 10000.0f, HREG(85), HREG(86), HREG(87) / 100.0f); + guPerspective(projection, &view->normal, HREG(83), HREG(84) / 10000.0f, HREG(85), HREG(86), HREG(87) / 100.0f); } else { - guPerspective(projection, &view->unk_11C, view->fieldOfView, (f32)xlen / (f32)ylen, view->fogDistance, - view->zDepth, view->unk_24); + guPerspective(projection, &view->normal, view->fovy, aspect, view->near, view->far, view->scale); } + if (QREG(88) & 1) { - osSyncPrintf("fovy %f near %f far %f scale %f aspect %f normal %08x\n", view->fieldOfView, view->fogDistance, - view->zDepth, view->unk_24, (f32)xlen / (f32)ylen, view->unk_11C); - Matrix_MtxToMtxF(projection, &mtxF); + s32 i; + MtxF mf; + + osSyncPrintf("fovy %f near %f far %f scale %f aspect %f normal %08x\n", view->fovy, view->near, view->far, + view->scale, aspect, view->normal); + + Matrix_MtxToMtxF(projection, &mf); osSyncPrintf("projection\n"); for (i = 0; i < 4; i++) { - osSyncPrintf(" %f %f %f %f\n", mtxF.mf[i][0], mtxF.mf[i][1], mtxF.mf[i][2], - mtxF.mf[i][3]); + osSyncPrintf(" %f %f %f %f\n", mf.mf[i][0], mf.mf[i][1], mf.mf[i][2], mf.mf[i][3]); } osSyncPrintf("\n"); } - view->unk_60 = *projection; + + view->projection = *projection; func_800AA890(view, projection); - gSPPerspNormalize(gfxCtx->polyOpa.p++, view->unk_11C); + gSPPerspNormalize(gfxCtx->polyOpa.p++, view->normal); gSPMatrix(gfxCtx->polyOpa.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gSPPerspNormalize(gfxCtx->polyXlu.p++, view->unk_11C); + gSPPerspNormalize(gfxCtx->polyXlu.p++, view->normal); gSPMatrix(gfxCtx->polyXlu.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - viewing = Graph_Alloc(gfxCtx, sizeof(MtxF)); + viewing = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 667); - view->unk_E4 = viewing; + view->viewingPtr = viewing; + if (view->eye.x == view->unk_34.x && view->eye.y == view->unk_34.y && view->eye.z == view->unk_34.z) { view->eye.x += 1.0f; view->eye.y += 1.0f; view->eye.z += 1.0f; } + func_800ABE74(view->eye.x, view->eye.y, view->eye.z); func_80101E34(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z, view->unk_40.x, view->unk_40.y, view->unk_40.z); - view->unk_A0 = *viewing; + + view->viewing = *viewing; if (QREG(88) & 2) { - Matrix_MtxToMtxF(view->unk_E4, &mtxFv); + s32 i; + MtxF mf; + + Matrix_MtxToMtxF(view->viewingPtr, &mf); osSyncPrintf("viewing\n"); for (i = 0; i < 4; i++) { - osSyncPrintf(" %f %f %f %f\n", mtxFv.mf[i][0], mtxFv.mf[i][1], mtxFv.mf[i][2], - mtxFv.mf[i][3]); + osSyncPrintf(" %f %f %f %f\n", mf.mf[i][0], mf.mf[i][1], mf.mf[i][2], mf.mf[i][3]); } osSyncPrintf("\n"); } @@ -350,224 +372,227 @@ s32 func_800AAA9C(View* view) { gSPMatrix(gfxCtx->polyXlu.p++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); Graph_CloseDisps(dispRefs, gfxCtx, "../z_view.c", 711); + return 1; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AAA9C.s") -#endif s32 func_800AB0A8(View* view) { - Viewport* viewport; + Vp* vp; Mtx* projection; - s32 pad; - s32 pad1; GraphicsContext* gfxCtx; - Gfx* dispRefs[3]; + Gfx* dispRefs[5]; gfxCtx = view->gfxCtx; Graph_OpenDisps(dispRefs, gfxCtx, "../z_view.c", 726); - viewport = Graph_Alloc(gfxCtx, sizeof(Viewport)); - LogUtils_CheckNullPointer("vp", viewport, "../z_view.c", 730); - func_800AA190(viewport, &view->viewport); - view->unk_50 = *viewport; + + vp = Graph_Alloc(gfxCtx, sizeof(Vp)); + LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 730); + View_ViewportToVp(vp, &view->viewport); + view->vp = *vp; + func_800AA550(view); - gSPViewport(gfxCtx->polyOpa.p++, viewport); - gSPViewport(gfxCtx->polyXlu.p++, viewport); - gSPViewport(gfxCtx->overlay.p++, viewport); + gSPViewport(gfxCtx->polyOpa.p++, vp); + gSPViewport(gfxCtx->polyXlu.p++, vp); + gSPViewport(gfxCtx->overlay.p++, vp); projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 744); - view->unk_E0 = projection; - func_801045A4(projection, -(f32)(s32)gScreenWidth * 0.5f, (f32)(s32)gScreenWidth * 0.5f, - -(f32)(s32)gScreenHeight * 0.5f, (f32)(s32)gScreenHeight * 0.5f, view->fogDistance, view->zDepth, - view->unk_24); + view->projectionPtr = projection; - view->unk_60 = *projection; + func_801045A4(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f, + (f32)gScreenHeight * 0.5f, view->near, view->far, view->scale); + + view->projection = *projection; gSPMatrix(gfxCtx->polyOpa.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); gSPMatrix(gfxCtx->polyXlu.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); Graph_CloseDisps(dispRefs, gfxCtx, "../z_view.c", 762); + return 1; } -#ifdef NON_MATCHING -// saved registers allocated differently, everything else is OK s32 func_800AB2C4(View* view) { + Vp* vp; Mtx* projection; - f32 pad; - f32 pad1; - Viewport* viewport; - Gfx* dispRefs[4]; GraphicsContext* gfxCtx; + Gfx* dispRefs[5]; + + if (1) {} // Necessary to match gfxCtx = view->gfxCtx; Graph_OpenDisps(dispRefs, gfxCtx, "../z_view.c", 777); - viewport = Graph_Alloc(gfxCtx, sizeof(Viewport)); - LogUtils_CheckNullPointer("vp", viewport, "../z_view.c", 781); - func_800AA190(viewport, &view->viewport); - view->unk_50 = *viewport; + + vp = Graph_Alloc(gfxCtx, sizeof(Vp)); + LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 781); + View_ViewportToVp(vp, &view->viewport); + view->vp = *vp; gDPPipeSync(gfxCtx->overlay.p++); gDPSetScissor(gfxCtx->overlay.p++, G_SC_NON_INTERLACE, view->viewport.leftX, view->viewport.topY, view->viewport.rightX, view->viewport.bottomY); - gSPViewport(gfxCtx->overlay.p++, viewport); + gSPViewport(gfxCtx->overlay.p++, vp); projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 791); - view->unk_E0 = projection; - func_801045A4(projection, -(f32)(s32)gScreenWidth * 0.5f, (f32)(s32)gScreenWidth * 0.5f, - -(f32)(s32)gScreenHeight * 0.5f, (f32)(s32)gScreenHeight * 0.5f, view->fogDistance, view->zDepth, - view->unk_24); - view->unk_60 = *projection; + view->projectionPtr = projection; + + func_801045A4(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f, + (f32)gScreenHeight * 0.5f, view->near, view->far, view->scale); + + view->projection = *projection; gSPMatrix(gfxCtx->overlay.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); Graph_CloseDisps(dispRefs, gfxCtx, "../z_view.c", 801); + return 1; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AB2C4.s") -#endif -#ifdef NON_MATCHING -// regalloc s32 func_800AB560(View* view) { - s32 pad; - s32 pad1; - s32 pad2; - s32 pad3; - GraphicsContext* gfxCtx; - Viewport* viewport; - Mtx* projection; - MtxF* viewing; - Gfx* dispRefs[6]; + s32 pad[2]; f32 aspect; + s32 width; + s32 height; + Vp* vp; + Mtx* projection; + Mtx* viewing; + GraphicsContext* gfxCtx; + Gfx* dispRefs[5]; gfxCtx = view->gfxCtx; Graph_OpenDisps(dispRefs, gfxCtx, "../z_view.c", 816); - viewport = Graph_Alloc(gfxCtx, sizeof(Viewport)); - LogUtils_CheckNullPointer("vp", viewport, "../z_view.c", 821); + vp = Graph_Alloc(gfxCtx, sizeof(Vp)); + LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 821); + View_ViewportToVp(vp, &view->viewport); + view->vp = *vp; - func_800AA190(viewport, &view->viewport); - view->unk_50 = *viewport; gDPPipeSync(gfxCtx->overlay.p++); gDPSetScissor(gfxCtx->overlay.p++, G_SC_NON_INTERLACE, view->viewport.leftX, view->viewport.topY, view->viewport.rightX, view->viewport.bottomY); - gSPViewport(gfxCtx->overlay.p++, viewport); + gSPViewport(gfxCtx->overlay.p++, vp); projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 833); + view->projectionPtr = projection; - view->unk_E0 = projection; - guPerspective(projection, &view->unk_11C, view->fieldOfView, - (f32)(view->viewport.rightX - view->viewport.leftX) / - (f32)(view->viewport.bottomY - view->viewport.topY), - view->fogDistance, view->zDepth, view->unk_24); - view->unk_60 = *projection; - gSPPerspNormalize(gfxCtx->overlay.p++, view->unk_11C); + width = view->viewport.rightX - view->viewport.leftX; + height = view->viewport.bottomY - view->viewport.topY; + + aspect = (f32)width / (f32)height; + guPerspective(projection, &view->normal, view->fovy, aspect, view->near, view->far, view->scale); + + view->projection = *projection; + + gSPPerspNormalize(gfxCtx->overlay.p++, view->normal); gSPMatrix(gfxCtx->overlay.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - viewing = Graph_Alloc(gfxCtx, sizeof(MtxF)); + viewing = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 848); + view->viewingPtr = viewing; - view->unk_E4 = viewing; if (view->eye.x == view->unk_34.x && view->eye.y == view->unk_34.y && view->eye.z == view->unk_34.z) { view->eye.x += 1.0f; view->eye.y += 1.0f; view->eye.z += 1.0f; } + func_800ABE74(view->eye.x, view->eye.y, view->eye.z); func_80101E34(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z, view->unk_40.x, view->unk_40.y, view->unk_40.z); - view->unk_A0 = *viewing; + + view->viewing = *viewing; + gSPMatrix(gfxCtx->overlay.p++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); Graph_CloseDisps(dispRefs, gfxCtx, "../z_view.c", 871); + return 1; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AB560.s") -#endif s32 func_800AB944(View* view) { Gfx* dispRefs[5]; Graph_OpenDisps(dispRefs, view->gfxCtx, "../z_view.c", 878); + func_800ABE74(view->eye.x, view->eye.y, view->eye.z); - func_80101E34(view->unk_E4, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z, - view->unk_40.x, view->unk_40.y, view->unk_40.z); + func_80101E34(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, + view->unk_34.z, view->unk_40.x, view->unk_40.y, view->unk_40.z); Graph_CloseDisps(dispRefs, view->gfxCtx, "../z_view.c", 886); + return 1; } #ifdef NON_MATCHING // saved register usage is wrong, relatively minor reorderings, regalloc -s32 func_800AB9EC(View* view, s32 arg1, Gfx** p) { - Viewport* viewport; - Mtx* projection; - Mtx* projection2; - MtxF* viewing; - GraphicsContext* gfxCtx; - Gfx* pLocal; +s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) { + GraphicsContext* gfxCtx = view->gfxCtx; + Gfx* gfx = *gfxp; + + arg1 = (view->flags & arg1) | arg1 >> 4; - gfxCtx = view->gfxCtx; - pLocal = *p; - arg1 = (view->unk_120 & arg1) | arg1 >> 4; if (arg1 & 2) { - viewport = Graph_Alloc(view->gfxCtx, sizeof(Viewport)); - LogUtils_CheckNullPointer("vp", viewport, "../z_view.c", 910); - func_800AA190(viewport, &view->viewport); + Vp* vp = Graph_Alloc(view->gfxCtx, sizeof(Vp)); + LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 910); + View_ViewportToVp(vp, &view->viewport); + view->vp = *vp; - view->unk_50 = *viewport; - - gDPPipeSync(pLocal++); - gDPSetScissor(pLocal++, G_SC_NON_INTERLACE, view->viewport.leftX, view->viewport.topY, view->viewport.rightX, + gDPPipeSync(gfx++); + gDPSetScissor(gfx++, G_SC_NON_INTERLACE, view->viewport.leftX, view->viewport.topY, view->viewport.rightX, view->viewport.bottomY); - gSPViewport(pLocal++, viewport); + gSPViewport(gfx++, vp); } + if (arg1 & 8) { - projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); + Mtx* projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 921); - view->unk_E0 = projection; - func_801045A4(projection, -(f32)(s32)gScreenWidth * 0.5f, (f32)(s32)gScreenWidth * 0.5f, - -(f32)(s32)gScreenHeight * 0.5f, (f32)(s32)gScreenHeight * 0.5f, view->fogDistance, view->zDepth, - view->unk_24); + view->projectionPtr = projection; - view->unk_60 = *projection; + func_801045A4(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f, + (f32)gScreenHeight * 0.5f, view->near, view->far, view->scale); - gSPMatrix(pLocal++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + view->projection = *projection; + + gSPMatrix(gfx++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } else if (arg1 & 6) { - projection2 = Graph_Alloc(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("projection", projection2, "../z_view.c", 932); - view->unk_E0 = projection2; - guPerspective(projection2, &view->unk_11C, view->fieldOfView, - (f32)(view->viewport.rightX - view->viewport.leftX) / - (f32)(view->viewport.bottomY - view->viewport.topY), - view->fogDistance, view->zDepth, view->unk_24); + s32 width; + s32 height; + Mtx* projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); + LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 932); + view->projectionPtr = projection; - view->unk_60 = *projection2; + width = view->viewport.rightX - view->viewport.leftX; + height = view->viewport.bottomY - view->viewport.topY; - gSPPerspNormalize(pLocal++, view->unk_11C); - gSPMatrix(pLocal++, projection2, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + guPerspective(projection, &view->normal, view->fovy, (f32)width / (f32)height, view->near, view->far, + view->scale); + + view->projection = *projection; + + gSPPerspNormalize(gfx++, view->normal); + gSPMatrix(gfx++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } + if (arg1 & 1) { - viewing = Graph_Alloc(gfxCtx, sizeof(MtxF)); + Mtx* viewing = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 948); - view->unk_E4 = viewing; + view->viewingPtr = viewing; + func_800ABE74(view->eye.x, view->eye.y, view->eye.z); func_80101E34(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z, view->unk_40.x, view->unk_40.y, view->unk_40.z); - view->unk_A0 = *viewing; + view->viewing = *viewing; - gSPMatrix(pLocal++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + gSPMatrix(gfx++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); } - view->unk_120 = 0; - *p = pLocal; + + view->flags = 0; + *gfxp = gfx; + return 1; } #else @@ -575,28 +600,28 @@ s32 func_800AB9EC(View* view, s32 arg1, Gfx** p) { #endif s32 func_800ABE74(f32 eyeX, f32 eyeY, f32 eyeZ) { - s32 errorCode = 0; + s32 error = 0; - if ((eyeX * eyeX) + (eyeY * eyeY) + (eyeZ * eyeZ) > 1073676288.0f) { - errorCode = 3; + if (SQ(eyeX) + SQ(eyeY) + SQ(eyeZ) > SQ(32767.0f)) { + error = 3; } else { - f32 absEyeX; - f32 absEyeY; - f32 absEyeZ; - absEyeX = ABS(eyeX); - absEyeY = ABS(eyeY); - absEyeZ = ABS(eyeZ); + f32 absEyeX = ABS(eyeX); + f32 absEyeY = ABS(eyeY); + f32 absEyeZ = ABS(eyeZ); + if (((18900.0f < absEyeX) || (18900.0f < absEyeY)) || (18900.0f < absEyeZ)) { - errorCode = 2; + error = 2; } else if (((16000.0f < absEyeX) || (16000.0f < absEyeY)) || (16000.0f < absEyeZ)) { - errorCode = 1; + error = 1; } } - if (errorCode != 0) { + + if (error != 0) { osSyncPrintf(VT_FGCOL(RED)); - // Is too large - osSyncPrintf("eye が大きすぎます eye=[%8.3f %8.3f %8.3f] error=%d\n", eyeX, eyeY, eyeZ, errorCode); + // "Is too large" + osSyncPrintf("eye が大きすぎます eye=[%8.3f %8.3f %8.3f] error=%d\n", eyeX, eyeY, eyeZ, error); osSyncPrintf(VT_RST); } - return errorCode; + + return error; } diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index febf8cbc8a..cbfc03dafd 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -5,6 +5,7 @@ */ #include "z_arrow_fire.h" + #include "../ovl_En_Arrow/z_en_arrow.h" #define FLAGS 0x02000010 @@ -53,14 +54,14 @@ void ArrowFire_Init(ArrowFire* this, GlobalContext* globalCtx) { void ArrowFire_Destroy(ArrowFire* this, GlobalContext* globalCtx) { func_800876C8(globalCtx); - // Translates to: ""Disappearance" = Disappearance" + // Translates to: "Disappearance" LOG_STRING("消滅", "../z_arrow_fire.c", 421); } void ArrowFire_Charge(ArrowFire* this, GlobalContext* globalCtx) { EnArrow* arrow; - arrow = this->actor.attachedA; + arrow = (EnArrow*)this->actor.attachedA; if ((arrow == NULL) || (arrow->actor.update == NULL)) { Actor_Kill(&this->actor); return; @@ -147,7 +148,7 @@ void ArrowFire_Fly(ArrowFire* this, GlobalContext* globalCtx) { f32 distanceScaled; s32 pad; - arrow = this->actor.attachedA; + arrow = (EnArrow*)this->actor.attachedA; if ((arrow == NULL) || (arrow->actor.update == NULL)) { Actor_Kill(&this->actor); return; @@ -194,7 +195,7 @@ void ArrowFire_Draw(ArrowFire* this, GlobalContext* globalCtx) { Gfx* dispRefs[4]; stateFrames = globalCtx->state.frames; - arrow = this->actor.attachedA; + arrow = (EnArrow*)this->actor.attachedA; if (1) {} if ((arrow != NULL) && (arrow->actor.update != NULL) && (this->timer < 255)) { diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 813e880f1a..e33348beac 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -5,6 +5,7 @@ */ #include "z_arrow_ice.h" + #include "../ovl_En_Arrow/z_en_arrow.h" #define FLAGS 0x02000010 @@ -53,14 +54,14 @@ void ArrowIce_Init(ArrowIce* this, GlobalContext* globalCtx) { void ArrowIce_Destroy(ArrowIce* this, GlobalContext* globalCtx) { func_800876C8(globalCtx); - // Translates to: ""Disappearance" = Disappearance" + // Translates to: "Disappearance" LOG_STRING("消滅", "../z_arrow_ice.c", 415); } void ArrowIce_Charge(ArrowIce* this, GlobalContext* globalCtx) { EnArrow* arrow; - arrow = this->actor.attachedA; + arrow = (EnArrow*)this->actor.attachedA; if ((arrow == NULL) || (arrow->actor.update == NULL)) { Actor_Kill(&this->actor); return; @@ -147,7 +148,7 @@ void ArrowIce_Fly(ArrowIce* this, GlobalContext* globalCtx) { f32 distanceScaled; s32 pad; - arrow = this->actor.attachedA; + arrow = (EnArrow*)this->actor.attachedA; if ((arrow == NULL) || (arrow->actor.update == NULL)) { Actor_Kill(&this->actor); return; @@ -194,7 +195,7 @@ void ArrowIce_Draw(ArrowIce* this, GlobalContext* globalCtx) { Gfx* dispRefs[4]; stateFrames = globalCtx->state.frames; - arrow = this->actor.attachedA; + arrow = (EnArrow*)this->actor.attachedA; if (1) {} if ((arrow != NULL) && (arrow->actor.update != NULL) && (this->timer < 255)) { diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 53178700ca..9e31dde574 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -5,6 +5,7 @@ */ #include "z_arrow_light.h" + #include "../ovl_En_Arrow/z_en_arrow.h" #define FLAGS 0x02000010 @@ -53,14 +54,14 @@ void ArrowLight_Init(ArrowLight* this, GlobalContext* globalCtx) { void ArrowLight_Destroy(ArrowLight* this, GlobalContext* globalCtx) { func_800876C8(globalCtx); - // Translates to: ""Disappearance" = Disappearance" + // Translates to: "Disappearance" LOG_STRING("消滅", "../z_arrow_light.c", 403); } void ArrowLight_Charge(ArrowLight* this, GlobalContext* globalCtx) { EnArrow* arrow; - arrow = this->actor.attachedA; + arrow = (EnArrow*)this->actor.attachedA; if ((arrow == NULL) || (arrow->actor.update == NULL)) { Actor_Kill(&this->actor); return; @@ -147,7 +148,7 @@ void ArrowLight_Fly(ArrowLight* this, GlobalContext* globalCtx) { f32 distanceScaled; s32 pad; - arrow = this->actor.attachedA; + arrow = (EnArrow*)this->actor.attachedA; if ((arrow == NULL) || (arrow->actor.update == NULL)) { Actor_Kill(&this->actor); return; @@ -194,7 +195,7 @@ void ArrowLight_Draw(ArrowLight* this, GlobalContext* globalCtx) { Gfx* dispRefs[4]; stateFrames = globalCtx->state.frames; - arrow = this->actor.attachedA; + arrow = (EnArrow*)this->actor.attachedA; if (1) {} if ((arrow != NULL) && (arrow->actor.update != NULL) && (this->timer < 255)) { diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index 22d9d30fca..c859ec47fa 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -69,7 +69,7 @@ s32 BgBdanObjects_GetContactRu1(BgBdanObjects* this, s32 arg1) { case 0: return this->unk_1B8 == 1; case 4: - return gSaveContext.inf_table[20] & 0x40; + return gSaveContext.infTable[20] & 0x40; case 3: return this->unk_1B8 == 4; default: @@ -87,7 +87,7 @@ void BgBdanObjects_SetContactRu1(BgBdanObjects* this, s32 arg1) { this->unk_1B8 = 3; break; case 4: - gSaveContext.inf_table[20] |= 0x40; + gSaveContext.infTable[20] |= 0x40; break; default: osSyncPrintf("Bg_Bdan_Objects_Set_Contact_Ru1\nそんな送信モードは無い%d!!!!!!!!\n"); @@ -185,7 +185,7 @@ void func_8086C054(BgBdanObjects* this, GlobalContext* globalCtx) { } } - if ((!func_800BFC84(globalCtx)) && (!BgBdanObjects_GetContactRu1(this, 0))) { + if (!Gameplay_InCsMode(globalCtx) && !BgBdanObjects_GetContactRu1(this, 0)) { this->dyna.actor.posRot.pos.y = this->dyna.actor.initPosRot.pos.y + -79.0f; } else { this->dyna.actor.posRot.pos.y = (this->dyna.actor.initPosRot.pos.y + -79.0f) - 5.0f; @@ -218,7 +218,7 @@ void func_8086C29C(BgBdanObjects* this, GlobalContext* globalCtx) { if (this->unk_16A != 0) { this->unk_16A -= 1; if (this->unk_16A == 0) { - temp = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 1); + temp = Quake_Add(globalCtx->cameraPtrs[globalCtx->activeCamera], 1); Quake_SetSpeed(temp, 0x3A98); Quake_SetQuakeValues(temp, 0, 1, 0xFA, 1); Quake_SetCountdown(temp, 0xA); @@ -232,7 +232,7 @@ void func_8086C29C(BgBdanObjects* this, GlobalContext* globalCtx) { BgBdanObjects_SetContactRu1(this, 4); this->unk_16A = 0xA; this->actionFunc = (ActorFunc)func_8086C55C; - func_8005B1A4(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]); + func_8005B1A4(globalCtx->cameraPtrs[globalCtx->activeCamera]); } } @@ -345,13 +345,13 @@ void func_8086C874(BgBdanObjects* this, GlobalContext* globalCtx) { } if (this->unk_168 == 0) { if (func_8004356C(&this->dyna.actor)) { - this->unk_1B8 = globalCtx->cameraCtx.activeCameraPtrs[0]->unk_142; - func_8005A77C(globalCtx->cameraCtx.activeCameraPtrs[0], 0x3A); - func_8005AD1C(globalCtx->cameraCtx.activeCameraPtrs[0], 4); + this->unk_1B8 = globalCtx->cameraPtrs[0]->unk_142; + func_8005A77C(globalCtx->cameraPtrs[0], 0x3A); + func_8005AD1C(globalCtx->cameraPtrs[0], 4); this->unk_168 = 0xAU; } } else { - func_8005A77C(globalCtx->cameraCtx.activeCameraPtrs[0], 0x3A); + func_8005A77C(globalCtx->cameraPtrs[0], 0x3A); if (!func_8004356C(&this->dyna.actor)) { if (this->unk_168 != 0) { this->unk_168 -= 1; @@ -360,8 +360,8 @@ void func_8086C874(BgBdanObjects* this, GlobalContext* globalCtx) { if (this->unk_168 == 0) { do { } while (0); - func_8005A77C(globalCtx->cameraCtx.activeCameraPtrs[0], (s16)this->unk_1B8); - func_8005ACFC(globalCtx->cameraCtx.activeCameraPtrs[0], 4); + func_8005A77C(globalCtx->cameraPtrs[0], (s16)this->unk_1B8); + func_8005ACFC(globalCtx->cameraPtrs[0], 4); } } this->dyna.actor.posRot.pos.y = this->dyna.actor.initPosRot.pos.y - diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c index dc334ac69c..b782802d99 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c @@ -6,6 +6,8 @@ #include "z_bg_bom_guard.h" +#include "../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h" + #include #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h index 539b1096bb..f7545cf34a 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h @@ -4,8 +4,6 @@ #include #include -#include "../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h" - typedef struct { /* 0x0000 */ DynaPolyActor dyna; /* 0x0164 */ ActorFunc actionFunc; diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index 34624364e4..17775e6118 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -46,7 +46,7 @@ void BgGateShutter_Init(BgGateShutter* this, GlobalContext* globalCtx) { this->somePosX = thisx->posRot.pos.x; this->somePosY = thisx->posRot.pos.y; this->somePosZ = thisx->posRot.pos.z; - if ((gSaveContext.inf_table[7] & 0x40) || (gSaveContext.event_chk_inf[4] & 0x20)) { + if ((gSaveContext.infTable[7] & 0x40) || (gSaveContext.eventChkInf[4] & 0x20)) { if (globalCtx->sceneNum == SCENE_SPOT01) { thisx->posRot.pos.x = -89.0f; thisx->posRot.pos.z = -1375.0f; @@ -65,7 +65,7 @@ void BgGateShutter_Destroy(BgGateShutter* this, GlobalContext* globalCtx) { } void func_8087828C(BgGateShutter* this, GlobalContext* globalCtx) { - if (this->unk_168 == 1 && !(gSaveContext.inf_table[7] & 0x40)) { + if (this->unk_168 == 1 && !(gSaveContext.infTable[7] & 0x40)) { this->unk_178 = 2; this->actionFunc = (ActorFunc)func_80878300; } else if (this->unk_168 == 2) { diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index 53c6d0c9a0..dce6ffc162 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -52,7 +52,7 @@ void BgGjyoBridge_Init(BgGjyoBridge* this, GlobalContext* globalCtx) { this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, dynaCollisionContext, this, local_c); - if (gSaveContext.event_chk_inf[4] & 0x2000) { + if (gSaveContext.eventChkInf[4] & 0x2000) { this->actionFunc = func_808787A4; } else { this->dyna.actor.draw = NULL; @@ -71,13 +71,13 @@ void func_808787A4(BgGjyoBridge* this, GlobalContext* globalCtx) { void BgGjyoBridge_TriggerCutscene(BgGjyoBridge* this, GlobalContext* globalCtx) { Player* player = PLAYER; - if ((gBitFlags[3] & gSaveContext.quest_items) && (gBitFlags[4] & gSaveContext.quest_items) && + if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) && (INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT) && (player->actor.posRot.pos.x > -70.0f) && (player->actor.posRot.pos.x < 300.0f) && (player->actor.posRot.pos.y > 1340.0f) && (player->actor.posRot.pos.z > 1340.0f) && (player->actor.posRot.pos.z < 1662.0f) && - (func_800BFC84(globalCtx) == 0)) { + !Gameplay_InCsMode(globalCtx)) { globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&D_02002640); - gSaveContext.cutscene_trigger = 1; + gSaveContext.cutsceneTrigger = 1; this->actionFunc = BgGjyoBridge_SpawnBridge; } } @@ -87,7 +87,7 @@ void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, GlobalContext* globalCtx) { (globalCtx->csCtx.actorActions[2]->action == 2)) { this->dyna.actor.draw = &BgGjyoBridge_Draw; func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); - gSaveContext.event_chk_inf[4] |= 0x2000; + gSaveContext.eventChkInf[4] |= 0x2000; } } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index 124c0c475c..734810bda6 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -191,9 +191,8 @@ void BgHidanFirewall_Update(BgHidanFirewall* this, GlobalContext* globalCtx) { void BgHidanFirewall_Draw(BgHidanFirewall* this, GlobalContext* globalCtx) { UNK_PTR* temp; - u32 pad; GraphicsContext* gfxCtx; - Gfx* dispRefs[3]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index 397cac5f89..8d1a3d9281 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -132,12 +132,12 @@ void BgHidanFslift_Update(BgHidanFslift* this, GlobalContext* globalCtx) { if (this->unk_16A == 0) { this->unk_16A = 3; } - func_8005A77C(globalCtx->cameraCtx.activeCameraPtrs[0], 0x30); + func_8005A77C(globalCtx->cameraPtrs[0], 0x30); return; } if (func_8004356C(thisx) == 0) { if (this->unk_16A != 0) { - func_8005A77C(globalCtx->cameraCtx.activeCameraPtrs[0], 3); + func_8005A77C(globalCtx->cameraPtrs[0], 3); } this->unk_16A = 0; } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index fe50a59c66..55e7555ee9 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -108,12 +108,12 @@ void BgHidanSyoku_Update(BgHidanSyoku* this, GlobalContext* globalCtx) { if (this->unk_168 == 0) { this->unk_168 = 3; } - func_8005A77C(globalCtx->cameraCtx.activeCameraPtrs[0], 0x30); + func_8005A77C(globalCtx->cameraPtrs[0], 0x30); return; } if (!func_8004356C(&this->dyna.actor)) { if (this->unk_168 != 0) { - func_8005A77C(globalCtx->cameraCtx.activeCameraPtrs[0], 3); + func_8005A77C(globalCtx->cameraPtrs[0], 3); } this->unk_168 = 0; } diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index 3a66aad492..f6afde0e0e 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -99,7 +99,7 @@ void func_80899950(BgJyaKanaami* this, GlobalContext* globalCtx) { if (Math_ApproxUpdateScaledS(&this->actor.posRot.rot.x, 0x4000, this->unk_168)) { func_80899A08(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_TRAP_BOUND); - var = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 3); + var = Quake_Add(globalCtx->cameraPtrs[globalCtx->activeCamera], 3); Quake_SetSpeed(var, 25000); Quake_SetQuakeValues(var, 2, 0, 0, 0); Quake_SetCountdown(var, 0x10); diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c index 2e0783f50c..13537b6da7 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c @@ -45,8 +45,8 @@ void BgSpot01Fusya_Init(BgSpot01Fusya* this, GlobalContext* globalCtx) { this->unk_154 = 100.0f; this->unk_158 = 100.0f; this->unk_15C = 0.5f; - if (gSaveContext.scene_setup_index < 4) { - gSaveContext.event_chk_inf[6] &= 0xFFDF; + if (gSaveContext.sceneSetupIndex < 4) { + gSaveContext.eventChkInf[6] &= 0xFFDF; } BgSpot01Fusya_SetupAction(this, func_808AAA50); } @@ -57,7 +57,7 @@ void BgSpot01Fusya_Destroy(BgSpot01Fusya* this, GlobalContext* globalCtx) { void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx) { f32 temp; Actor* thisx = &this->actor; - if (gSaveContext.event_chk_inf[6] & 0x20) { + if (gSaveContext.eventChkInf[6] & 0x20) { this->unk_158 = 1800.0f; } thisx->shape.rot.z += this->unk_154; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h index 97b4e79e7e..4eb3fea3d7 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h @@ -9,8 +9,8 @@ typedef struct { /* 0x014C */ char unk_14C[0x18]; /* 0x0164 */ ActorFunc actionFunc; /* 0x0168 */ char unk_168[0x10]; - /* 0x0178 */ s8 objBankIndex; - /* 0x0179 */ char unk_179[0x7]; + /* 0x0178 */ s32 objectId; + /* 0x0179 */ char unk_179[0x4]; } BgSpot01Objects2; // size = 0x0180 extern const ActorInit Bg_Spot01_Objects2_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 862ba1d7ab..4f37e4ebb0 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -57,11 +57,11 @@ s32 func_808B1AE0(BgSpot09Obj* this, GlobalContext* globalCtx) { s32 carpentersRescued; Actor* thisx = &this->dyna.actor; - if (gSaveContext.scene_setup_index >= 4) { + if (gSaveContext.sceneSetupIndex >= 4) { return thisx->params == 0; } - carpentersRescued = (gSaveContext.event_chk_inf[9] & 0xF) == 0xF; + carpentersRescued = (gSaveContext.eventChkInf[9] & 0xF) == 0xF; if (LINK_AGE_IN_YEARS == YEARS_ADULT) { switch (thisx->params) { @@ -136,7 +136,7 @@ void BgSpot09Obj_Init(BgSpot09Obj* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; osSyncPrintf("Spot09 Object [arg_data : 0x%04x](大工救出フラグ 0x%x)\n", thisx->params, - gSaveContext.event_chk_inf[9] & 0xF); + gSaveContext.eventChkInf[9] & 0xF); thisx->params &= 0xFF; if ((thisx->params < 0) || (thisx->params >= 5)) { osSyncPrintf("Error : Spot 09 object の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n", diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index 4b43755346..35c36e624d 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -113,7 +113,7 @@ void func_808B318C(BgSpot12Gate* this, GlobalContext* globalCtx) { Math_ApproxF(&thisx->velocity.y, 1.6f, 0.03f); if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y + 200.0f, thisx->velocity.y)) { func_808B3274(this); - var = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 3); + var = Quake_Add(globalCtx->cameraPtrs[globalCtx->activeCamera], 3); Quake_SetSpeed(var, -0x3CB0); Quake_SetQuakeValues(var, 3, 0, 0, 0); Quake_SetCountdown(var, 0xC); diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c index d9b6a6a00e..be2931ddf8 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c @@ -46,7 +46,7 @@ void BgSpot15Saku_Init(BgSpot15Saku* this, GlobalContext* globalCtx) { this->unk_170 = thisx->posRot.pos.x; this->unk_174 = thisx->posRot.pos.y; this->unk_178 = thisx->posRot.pos.z; - if ((gSaveContext.inf_table[7] & 2) != 0) { + if ((gSaveContext.infTable[7] & 2) != 0) { thisx->posRot.pos.z = 2659.0f; } this->actionFunc = func_808B4930; @@ -57,7 +57,7 @@ void BgSpot15Saku_Destroy(BgSpot15Saku* this, GlobalContext* globalCtx) { } void func_808B4930(BgSpot15Saku* this, GlobalContext* globalCtx) { - if (this->unk_168 && !(gSaveContext.inf_table[7] & 2)) { + if (this->unk_168 && !(gSaveContext.infTable[7] & 2)) { this->unk_17C = 2; this->actionFunc = func_808B4978; } diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index dc97d5f425..42b3f70c89 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -57,10 +57,10 @@ void func_808B7478(BgSpot17Funen* this, GlobalContext* globalCtx) { Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot17_funen.c", 153); func_80093D84(globalCtx->state.gfxCtx); - Matrix_RotateY((s16)(func_8005A9F4(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]) - - this->actor.shape.rot.y + 0x8000) * - 9.58738019108e-05f, - MTXMODE_APPLY); + Matrix_RotateY( + (s16)(func_8005A9F4(globalCtx->cameraPtrs[globalCtx->activeCamera]) - this->actor.shape.rot.y + 0x8000) * + 9.58738019108e-05f, + MTXMODE_APPLY); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot17_funen.c", 161), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index 7c98c25523..f1dccb770d 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -193,7 +193,7 @@ void BgTokiSwd_Init(BgTokiSwd* this, GlobalContext* globalCtx) { thisx->draw = NULL; } - if (gSaveContext.scene_setup_index == 5) { + if (gSaveContext.sceneSetupIndex == 5) { globalCtx->unk_11D30[0] = 0xFF; } @@ -209,13 +209,13 @@ void BgTokiSwd_Destroy(BgTokiSwd* this, GlobalContext* globalCtx) { } void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx) { - if (((gSaveContext.event_chk_inf[4] & 0x8000) == 0) && (gSaveContext.scene_setup_index < 4) && - (func_8002E12C(&this->actor, 800.0f, 0x7530) != 0) && (func_800BFC84(globalCtx) == 0)) { - gSaveContext.event_chk_inf[4] |= 0x8000; + if (((gSaveContext.eventChkInf[4] & 0x8000) == 0) && (gSaveContext.sceneSetupIndex < 4) && + (func_8002E12C(&this->actor, 800.0f, 0x7530) != 0) && !Gameplay_InCsMode(globalCtx)) { + gSaveContext.eventChkInf[4] |= 0x8000; globalCtx->csCtx.segment = D_808BBD90; - gSaveContext.cutscene_trigger = 1; + gSaveContext.cutsceneTrigger = 1; } - if (LINK_IS_CHILD || ((gSaveContext.event_chk_inf[5] & 0x20) != 0)) { + if (LINK_IS_CHILD || ((gSaveContext.eventChkInf[5] & 0x20) != 0)) { if (func_8002F410(&this->actor, globalCtx) != 0) { if (LINK_IS_CHILD) { Item_Give(globalCtx, ITEM_SWORD_MASTER); @@ -225,7 +225,7 @@ void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx) { } Audio_SetBGM(NA_BGM_STOP); Audio_SetBGM(NA_SE_PL_BOUND_DIRT); - gSaveContext.cutscene_trigger = 1; + gSaveContext.cutsceneTrigger = 1; this->actor.attachedA = 0; BgTokiSwd_SetupAction(this, func_808BB0AC); } else { @@ -234,7 +234,7 @@ void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx) { } } } - if (gSaveContext.scene_setup_index == 5) { + if (gSaveContext.sceneSetupIndex == 5) { if (globalCtx->unk_11D30[0] > 0) { globalCtx->unk_11D30[0]--; } else { diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index c073f2cbd1..ef74a531a2 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -6,6 +6,8 @@ #include "z_bg_zg.h" +#include + #define FLAGS 0x00000010 void BgZg_Init(BgZg* this, GlobalContext* globalCtx); diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h index ab959e101b..1cf27b6342 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h @@ -3,7 +3,6 @@ #include #include -#include typedef struct { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index f8be4dd636..97e776eaa4 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -45,7 +45,7 @@ static s16 entrances[] = { }; // display list -extern Gfx* D_05001390; +extern Gfx D_05001390[]; // sets current actionFunc to be ran on next update call void DoorAna_SetupAction(DoorAna* this, ActorFunc func) { @@ -120,7 +120,7 @@ void DoorAna_Update_Open(DoorAna* this, GlobalContext* globalCtx) { if ((this->actor.unk_1F != 0) && (globalCtx->sceneLoadFlag == 0) && (player->stateFlags1 & 0x80000000) && (player->unk_84F == 0)) { destinationIdx = ((this->actor.params >> 0xC) & 7) - 1; - func_800C0AF4(globalCtx, 1, 0x4FF); + Gameplay_SetupRespawnPoint(globalCtx, RESPAWN_MODE_RETURN, 0x4FF); gSaveContext.respawn[RESPAWN_MODE_RETURN].pos.y = this->actor.posRot.pos.y; gSaveContext.respawn[RESPAWN_MODE_RETURN].yaw = this->actor.initPosRot.rot.y; gSaveContext.respawn[RESPAWN_MODE_RETURN].data = this->actor.params & 0xFFFF; @@ -130,7 +130,7 @@ void DoorAna_Update_Open(DoorAna* this, GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = entrances[destinationIdx]; DoorAna_SetupAction(this, (ActorFunc)&DoorAna_Update_Entering); } else { - if (func_8008E988(globalCtx) == 0 && !(player->stateFlags1 & 0x8800000) && + if (!func_8008E988(globalCtx) && !(player->stateFlags1 & 0x8800000) && this->actor.xzDistanceFromLink <= 15.0f && -50.0f <= this->actor.yDistanceFromLink && this->actor.yDistanceFromLink <= 15.0f) { player->stateFlags1 |= 0x80000000; @@ -157,19 +157,17 @@ void DoorAna_Update_Entering(DoorAna* this, GlobalContext* globalCtx) { void DoorAna_Update(DoorAna* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); // changes the grottos facing angle based on camera angle - this->actor.shape.rot.y = - func_8005A9F4(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]) + 0x8000; + this->actor.shape.rot.y = func_8005A9F4(globalCtx->cameraPtrs[globalCtx->activeCamera]) + 0x8000; } void DoorAna_Draw(DoorAna* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx** dList = &D_05001390; // required for stack placement? - Gfx* dispRefs[3]; + Gfx* dispRefs[4]; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_door_ana.c", 440); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_ana.c", 446), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gfxCtx->polyXlu.p++, dList); + gSPDisplayList(gfxCtx->polyXlu.p++, D_05001390); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_door_ana.c", 449); } diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c index 0e10b2b015..3bac8c67bc 100644 --- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c +++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c @@ -46,7 +46,7 @@ void DoorToki_Destroy(DoorToki* this, GlobalContext* globalCtx) { } void DoorToki_Update(DoorToki* this, GlobalContext* globalCtx) { - if (gSaveContext.event_chk_inf[4] & 0x800) { + if (gSaveContext.eventChkInf[4] & 0x800) { func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } else { func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index b722576196..8bd205480c 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -123,7 +123,7 @@ void func_809B0558(EnAni* this, GlobalContext* globalCtx) { } else { EnAni_SetupAction(this, func_809B0524); } - gSaveContext.item_get_inf[1] |= 0x20; + gSaveContext.itemGetInf[1] |= 0x20; return; } func_8002F434(&this->actor, globalCtx, GI_HEART_PIECE, 10000.0f, 200.0f); @@ -147,8 +147,8 @@ void func_809B064C(EnAni* this, GlobalContext* globalCtx) { if (!textId) {} if (textId2 == 0) { - textId = gSaveContext.night_flag ? 0x5051 : 0x5050; // "...all I can do is look at the stars." - // "...all I can do is look at Death Mountain." + textId = gSaveContext.nightFlag ? 0x5051 : 0x5050; // "...all I can do is look at the stars." + // "...all I can do is look at Death Mountain." } yawDiff = this->actor.rotTowardsLinkY - this->actor.shape.rot.y; @@ -162,7 +162,7 @@ void func_809B064C(EnAni* this, GlobalContext* globalCtx) { } } else if (yawDiff >= -0x36AF && yawDiff < 0 && this->actor.xzDistanceFromLink < 150.0f && -80.0f < this->actor.yDistanceFromLink) { - if (gSaveContext.item_get_inf[1] & 0x20) { + if (gSaveContext.itemGetInf[1] & 0x20) { EnAni_SetText(this, globalCtx, 0x5056); // "To get a good view..." } else { EnAni_SetText(this, globalCtx, 0x5055); // "...I'll give you this as a memento." @@ -188,17 +188,17 @@ void func_809B07F8(EnAni* this, GlobalContext* globalCtx) { } } else if (yawDiff >= -0x36AF && yawDiff < 0 && this->actor.xzDistanceFromLink < 150.0f && -80.0f < this->actor.yDistanceFromLink) { - if ((gSaveContext.item_get_inf[1] & 0x20) != 0) { + if ((gSaveContext.itemGetInf[1] & 0x20) != 0) { EnAni_SetText(this, globalCtx, 0x5056); // "To get a good view..." } else { EnAni_SetText(this, globalCtx, 0x5055); // "...I'll give you this as a memento." } } else if (yawDiff >= -0x3E7 && yawDiff < 0x36B0 && this->actor.xzDistanceFromLink < 350.0f) { - if ((gSaveContext.event_chk_inf[2] & 0x8000) == 0) { + if ((gSaveContext.eventChkInf[2] & 0x8000) == 0) { textId = 0x5052; // "...Something is happening on Death Mountain!" } else { - textId = (gSaveContext.item_get_inf[1] & 0x20) ? 0x5054 : 0x5053; // "I don't feel like getting down..." - // "...Death Mountain is back to normal!" + textId = (gSaveContext.itemGetInf[1] & 0x20) ? 0x5054 : 0x5053; // "I don't feel like getting down..." + // "...Death Mountain is back to normal!" } EnAni_SetText(this, globalCtx, textId); } diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c index fbb5c54c8b..4d98afc25a 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c @@ -6,6 +6,8 @@ #include "z_en_anubice_tag.h" +#include + #define FLAGS 0x00000010 void EnAnubiceTag_Init(EnAnubiceTag* this, GlobalContext* globalCtx); @@ -29,7 +31,7 @@ const ActorInit En_Anubice_Tag_InitVars = { void EnAnubiceTag_Init(EnAnubiceTag* this, GlobalContext* globalCtx) { osSyncPrintf("\n\n"); - //"Anubis control tag generated" + // "Anubis control tag generated" osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ アヌビス制御タグ発生 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); if (this->actor.params < (s16)0xFFFF) { diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h index 7175999d64..a67c32441c 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h @@ -3,7 +3,7 @@ #include #include -#include + #include "../ovl_En_Anubice/z_en_anubice.h" typedef struct { diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index f6f0fcdf7f..b9fc98a70f 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -33,10 +33,9 @@ const ActorInit En_Dog_InitVars = { }; static ColliderCylinderInit cylinderInit = { - 0x06, 0x00, 0x09, 0x39, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00000000, - 0x00, 0x00, 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, - - 0x0010, 0x0014, 0x0000, 0x0000, 0x0000, 0x0000, + 0x06, 0x00, 0x09, 0x39, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x01, 0x00, 0x0010, 0x0014, 0x0000, 0x0000, 0x0000, 0x0000, }; static Sub98Init5 sub98Data = { @@ -54,15 +53,6 @@ static struct_80034EC0_Entry animations[] = { { 0x06000928, 1.0f, 0.0f, 6.0f, 0x02, -6.0f }, { 0x06000C28, 1.0f, 0.0f, -1.0f, 0x00, -6.0f }, }; -// Bandaid fix for a lw vs lh issue in EnDog_FollowPath. Roman will look at it later. -typedef union { - /* 0x00 */ s32 entry; - struct { - s16 unk_0; - s16 unk_2; - }; -} s16ArrEntry; - typedef enum { /* 0x00 */ DOG_WALK, /* 0x01 */ DOG_RUN, @@ -164,7 +154,7 @@ s32 EnDog_PlayAnimAndSFX(EnDog* this) { return 0; } -static s8 EnDog_CanFollow(EnDog* this, GlobalContext* globalCtx) { +s8 EnDog_CanFollow(EnDog* this, GlobalContext* globalCtx) { if ((this->collider.base.collideFlags & 2)) { this->collider.base.collideFlags &= ~2; return 2; @@ -186,7 +176,7 @@ static s8 EnDog_CanFollow(EnDog* this, GlobalContext* globalCtx) { return 0; } -static EnDog_UpdateWaypoint(EnDog* this, GlobalContext* globalCtx) { +s32 EnDog_UpdateWaypoint(EnDog* this, GlobalContext* globalCtx) { s32 change; if (this->path == NULL) { @@ -293,8 +283,8 @@ void EnDog_Destroy(EnDog* this, GlobalContext* globalCtx) { } void EnDog_FollowPath(EnDog* this, GlobalContext* globalCtx) { - s16ArrEntry behaviors[] = { DOG_SIT, DOG_BOW, DOG_BARK }; - s16ArrEntry unused[] = { 40, 80, 20 }; + s32 behaviors[] = { DOG_SIT, DOG_BOW, DOG_BARK }; + s32 unused[] = { 40, 80, 20 }; f32 speed; s32 frame; @@ -316,16 +306,16 @@ void EnDog_FollowPath(EnDog* this, GlobalContext* globalCtx) { // depending on where he is on his path. En_Hy checks these event flags. if (this->waypoint < 9) { // Richard is close to her, text says something about his coat - gSaveContext.event_inf[3] |= 1; + gSaveContext.eventInf[3] |= 1; } else { // Richard is far, text says something about running fast - gSaveContext.event_inf[3] &= ~1; + gSaveContext.eventInf[3] &= ~1; } } else { frame = globalCtx->state.frames % 3; - this->nextBehavior = behaviors[frame].entry; - // no clue why they're using the action id to calculate timer. possibly meant to use the unused array? - this->behaviorTimer = Math_Rand_S16Offset(60, behaviors[frame].unk_2); + this->nextBehavior = behaviors[frame]; + // no clue why they're using the behavior id to calculate timer. possibly meant to use the unused array? + this->behaviorTimer = Math_Rand_S16Offset(60, behaviors[frame]); this->actionFunc = EnDog_ChooseMovement; } } @@ -451,8 +441,7 @@ void EnDog_Update(EnDog* this, GlobalContext* globalCtx) { Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider); } -static UNK_TYPE EnDog_Callback1(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, - Actor* actor) { +s32 EnDog_Callback1(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor) { return 0; } diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index f6e95bc41e..2f368bb98b 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -99,7 +99,7 @@ void EnDs_DisplayOddPotionText(EnDs* this, GlobalContext* globalCtx) { this->actor.textId = 0x504F; this->actionFunc = EnDs_TalkAfterGiveOddPotion; this->actor.flags &= ~0x100; - gSaveContext.item_get_inf[3] |= 1; + gSaveContext.itemGetInf[3] |= 1; } } @@ -107,7 +107,7 @@ void EnDs_GiveOddPotion(EnDs* this, GlobalContext* globalCtx) { if (func_8002F410(&this->actor, globalCtx) != 0) { this->actor.attachedA = NULL; this->actionFunc = EnDs_DisplayOddPotionText; - gSaveContext.timer_2_state = 0; + gSaveContext.timer2State = 0; } else { func_8002F434(&this->actor, globalCtx, GI_ODD_POTION, 10000.0f, 50.0f); } @@ -229,7 +229,7 @@ void EnDs_Wait(EnDs* this, GlobalContext* globalCtx) { Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); player->actor.textId = 0x504A; this->actionFunc = EnDs_OfferOddPotion; - } else if (gSaveContext.item_get_inf[3] & 1) { + } else if (gSaveContext.itemGetInf[3] & 1) { player->actor.textId = 0x500C; this->actionFunc = EnDs_OfferBluePotion; } else { diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.c b/src/overlays/actors/ovl_En_Eg/z_en_eg.c index 8bcd6d783d..1ade84a120 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.c +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.c @@ -6,9 +6,10 @@ #include "z_en_eg.h" +#include + #define FLAGS 0x00000010 -void EnEg_PlayVoidOutSFX(); void EnEg_Init(EnEg* this, GlobalContext* globalCtx); void EnEg_Destroy(EnEg* this, GlobalContext* globalCtx); void func_809FFDC8(EnEg* this, GlobalContext* globalCtx); @@ -32,7 +33,7 @@ const ActorInit En_Eg_InitVars = { (ActorFunc)EnEg_Draw, }; -void PlayVoidOutSFX() { +void EnEg_PlayVoidOutSFX() { func_800788CC(NA_SE_OC_ABYSS); } @@ -44,13 +45,13 @@ void EnEg_Init(EnEg* this, GlobalContext* globalCtx) { } void func_809FFDC8(EnEg* this, GlobalContext* globalCtx) { - if (!hasVoidedOut && (gSaveContext.timer_2_value < 1) && Flags_GetSwitch(globalCtx, 0x36) && (kREG(0) == 0)) { + if (!hasVoidedOut && (gSaveContext.timer2Value < 1) && Flags_GetSwitch(globalCtx, 0x36) && (kREG(0) == 0)) { // Void the player out - func_800C0C88(globalCtx); - gSaveContext.respawn_flag = -2; + Gameplay_TriggerRespawn(globalCtx); + gSaveContext.respawnFlag = -2; Audio_SetBGM(NA_BGM_STOP); - globalCtx->fadeOutTransition = 2; - PlayVoidOutSFX(); + globalCtx->fadeTransition = 2; + EnEg_PlayVoidOutSFX(); hasVoidedOut = true; } } diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.h b/src/overlays/actors/ovl_En_Eg/z_en_eg.h index 75d127c3e5..5c9a0f4a66 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.h +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.h @@ -3,7 +3,6 @@ #include #include -#include typedef struct { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index a4ff6c08b7..b480c893a7 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -105,9 +105,8 @@ Gfx* func_80A28148(GraphicsContext* gfxCtx, BossGanon* dorf) { void EnGanonOrgan_Draw(EnGanonOrgan* this, GlobalContext* globalCtx) { BossGanon* dorf; - u32 pad; GraphicsContext* gfxCtx; - Gfx* dispRefs[3]; + Gfx* dispRefs[4]; dorf = (BossGanon*)this->actor.attachedA; gfxCtx = globalCtx->state.gfxCtx; diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index facc283404..c212a360e0 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -138,7 +138,7 @@ void EnMs_Talk(EnMs* this, GlobalContext* globalCtx) { void EnMs_Sell(EnMs* this, GlobalContext* globalCtx) { if (func_8002F410(&this->actor, globalCtx) != 0) { // if attached is set - Rupees_ChangeBy(-prices[BEANS_BOUGHT]); // decrease ruppees + Rupees_ChangeBy(-prices[BEANS_BOUGHT]); this->actor.attachedA = NULL; this->actionFunc = &EnMs_TalkAfterBuy; return; @@ -165,7 +165,7 @@ void EnMs_Update(EnMs* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); this->actionFunc(this, globalCtx); - if (gSaveContext.entrance_index == 0x157 && gSaveContext.scene_setup_index == 8) { // ride carpet if in credits + if (gSaveContext.entranceIndex == 0x157 && gSaveContext.sceneSetupIndex == 8) { // ride carpet if in credits Actor_MoveForward(&this->actor); osSyncPrintf("OOOHHHHHH %f\n", this->actor.velocity.y); func_8002E4B4(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c index bec9deb126..959c1afe73 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c @@ -41,33 +41,33 @@ void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, ActorFunc* newActionFunc } void EnOkarinaEffect_Destroy(EnOkarinaEffect* this, GlobalContext* globalCtx) { - globalCtx->unk_10B16[0] = 0; - if ((D_8011FB30 != 4) && (D_8011FB30 != 5) && (globalCtx->gloomySkyEvent == 1)) { - globalCtx->gloomySkyEvent = 2; // end gloomy sky + globalCtx->envCtx.unk_F2[0] = 0; + if ((D_8011FB30 != 4) && (D_8011FB30 != 5) && (globalCtx->envCtx.gloomySkyEvent == 1)) { + globalCtx->envCtx.gloomySkyEvent = 2; // end gloomy sky func_80077684(globalCtx); } - globalCtx->lightning = 2; // end lightning + globalCtx->envCtx.lightning = 2; // end lightning } void EnOkarinaEffect_Init(EnOkarinaEffect* this, GlobalContext* globalCtx) { osSyncPrintf("\n\n"); - //"Ocarina Storm Effect" + // "Ocarina Storm Effect" osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ オカリナあらし効果ビカビカビカ〜 ☆☆☆☆☆ \n" VT_RST); osSyncPrintf("\n\n"); - if (globalCtx->unk_10B12[1] != 0) { + if (globalCtx->envCtx.unk_EE[1] != 0) { Actor_Kill(&this->actor); // kill if an instance is already spawned } EnOkarinaEffect_SetupAction(this, &EnOkarinaEffect_TriggerStorm); } void EnOkarinaEffect_TriggerStorm(EnOkarinaEffect* this, GlobalContext* globalCtx) { - this->timer = 400; // 20 seconds - globalCtx->unk_10B16[0] = 20; // rain intensity target - globalCtx->gloomySkyEvent = 1; // start gloomy sky - if ((D_8011FB30 != 0) || globalCtx->gloomySky != 0) { - globalCtx->unk_10B02 = 1; + this->timer = 400; // 20 seconds + globalCtx->envCtx.unk_F2[0] = 20; // rain intensity target + globalCtx->envCtx.gloomySkyEvent = 1; // start gloomy sky + if ((D_8011FB30 != 0) || globalCtx->envCtx.gloomySky != 0) { + globalCtx->envCtx.unk_DE = 1; } - globalCtx->lightning = 1; // start lightning + globalCtx->envCtx.lightning = 1; // start lightning func_80077624(globalCtx); EnOkarinaEffect_SetupAction(this, &EnOkarinaEffect_ManageStorm); } @@ -75,14 +75,14 @@ void EnOkarinaEffect_TriggerStorm(EnOkarinaEffect* this, GlobalContext* globalCt void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, GlobalContext* globalCtx) { func_8006C438(globalCtx, 5); // clear bean grow env flag if (((globalCtx->pauseCtx.state == 0) && (globalCtx->unk_10A20 == 0) && (globalCtx->msgCtx.unk_E300 == 0) && - (func_800C0D28(globalCtx) == 0) && ((globalCtx->unk_1241B == 0) || (gSaveContext.game_mode != 0))) || + (func_800C0D28(globalCtx) == 0) && ((globalCtx->unk_1241B == 0) || (gSaveContext.gameMode != 0))) || (this->timer >= 250)) { - if (globalCtx->unk_10A42 != 0 || globalCtx->unk_10A43 != 1) { + if (globalCtx->envCtx.unk_1E != 0 || globalCtx->envCtx.unk_1F != 1) { this->timer--; } osSyncPrintf("\nthis->timer=[%d]", this->timer); if (this->timer == 308) { - //"Let's grow some beans" + // "Let's grow some beans" osSyncPrintf("\n\n\n豆よ のびろ 指定\n\n\n"); func_8006C3D0(globalCtx, 5); // set bean grow env flag } @@ -93,7 +93,7 @@ void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, GlobalContext* globalCtx } if (this->timer == 0) { - globalCtx->unk_10B16[0] = 0; + globalCtx->envCtx.unk_F2[0] = 0; if (globalCtx->csCtx.state == 0) { func_80077684(globalCtx); } else if (func_800FA0B4(0) == 1) { @@ -101,14 +101,14 @@ void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, GlobalContext* globalCtx func_800F6D58(0xE, 1, 0); } osSyncPrintf("\n\n\nE_wether_flg=[%d]", D_8011FB30); - osSyncPrintf("\nrain_evt_trg=[%d]\n\n", globalCtx->gloomySkyEvent); - if (D_8011FB30 == 0 && (globalCtx->gloomySkyEvent == 1)) { - globalCtx->gloomySkyEvent = 2; // end gloomy sky + osSyncPrintf("\nrain_evt_trg=[%d]\n\n", globalCtx->envCtx.gloomySkyEvent); + if (D_8011FB30 == 0 && (globalCtx->envCtx.gloomySkyEvent == 1)) { + globalCtx->envCtx.gloomySkyEvent = 2; // end gloomy sky } else { - globalCtx->gloomySkyEvent = 0; - globalCtx->unk_10B02 = 0; + globalCtx->envCtx.gloomySkyEvent = 0; + globalCtx->envCtx.unk_DE = 0; } - globalCtx->lightning = 2; // end lightning + globalCtx->envCtx.lightning = 2; // end lightning Actor_Kill(&this->actor); } } diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index f9e4322cc0..ba66c0fb64 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -266,11 +266,11 @@ void func_80AF2AB4(EnRu2* this, GlobalContext* globalCtx) { Player* player; s16 temp; - if (gSaveContext.chamber_cutscene_num == 2 && gSaveContext.scene_setup_index < 4) { + if (gSaveContext.chamberCutsceneNum == 2 && gSaveContext.sceneSetupIndex < 4) { player = PLAYER; this->action = 1; globalCtx->csCtx.segment = &D_80AF411C; - gSaveContext.cutscene_trigger = 2; + gSaveContext.cutsceneTrigger = 2; Item_Give(globalCtx, ITEM_MEDALLION_WATER); temp = this->actor.posRot.rot.y + 0x8000; player->actor.shape.rot.y = temp; @@ -626,7 +626,7 @@ s32 func_80AF383C(EnRu2* this, GlobalContext* globalCtx) { } void func_80AF3878(EnRu2* this, GlobalContext* globalCtx) { - if (func_80AF383C(this, globalCtx) && !func_800BFC84(globalCtx)) { + if (func_80AF383C(this, globalCtx) && !Gameplay_InCsMode(globalCtx)) { this->action = 16; func_800800F8(globalCtx, 0xC3A, -0x63, &this->actor, 0); } @@ -667,7 +667,7 @@ void func_80AF39DC(EnRu2* this, GlobalContext* globalCtx) { if (this->unk_2C2 % 6 == 3) { player = PLAYER; osSyncPrintf("うおりゃー！ \n"); - func_8005B1A4(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]); + func_8005B1A4(globalCtx->cameraPtrs[globalCtx->activeCamera]); player->actor.posRot.pos.x = 820.0f; player->actor.posRot.pos.y = 0.0f; player->actor.posRot.pos.z = 180.0f; @@ -678,7 +678,7 @@ void func_80AF39DC(EnRu2* this, GlobalContext* globalCtx) { this->unk_2C3 = dialogState; if (func_8010BDBC(msgCtx) == 2) { this->action = 18; - func_8005B1A4(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]); + func_8005B1A4(globalCtx->cameraPtrs[globalCtx->activeCamera]); } } diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 4635ac07c8..85c4e7fcb4 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -354,7 +354,7 @@ u16 func_80B1C54C(GlobalContext* globalCtx, Actor* a1) { return ret; } - if (gSaveContext.inf_table[13] & 0x0200) { + if (gSaveContext.infTable[13] & 0x0200) { /* "Do you want me to dig here? ..." */ return 0x5019; } else { @@ -373,7 +373,7 @@ s16 func_80B1C5A0(GlobalContext* globalCtx, Actor* actor) { case 2: /* "I am the boss of the carpenters ..." (wtf?) */ if (actor->textId == 0x5028) { - gSaveContext.inf_table[13] |= 0x0100; + gSaveContext.infTable[13] |= 0x0100; } ret = 0; break; @@ -390,11 +390,11 @@ s16 func_80B1C5A0(GlobalContext* globalCtx, Actor* actor) { } else { globalCtx->msgCtx.msgMode = 0x37; Rupees_ChangeBy(-10); - gSaveContext.inf_table[13] |= 0x0200; + gSaveContext.infTable[13] |= 0x0200; return 2; } func_8010B720(globalCtx, actor->textId); - gSaveContext.inf_table[13] |= 0x0200; + gSaveContext.infTable[13] |= 0x0200; } break; case 5: @@ -507,7 +507,7 @@ void EnTk_Init(EnTk* this, GlobalContext* globalCtx) { func_80061EFC(&thisAgain->actor.sub_98, NULL, &D_80B1D534); - if (gSaveContext.day_time <= 0xC000 || gSaveContext.day_time >= 0xE000 || !LINK_IS_CHILD || + if (gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || !LINK_IS_CHILD || globalCtx->sceneNum != SCENE_SPOT02) { Actor_Kill(&thisAgain->actor); return; @@ -629,8 +629,8 @@ void EnTk_Dig(EnTk* this, GlobalContext* globalCtx) { * Upgrade the purple rupee reward to the heart piece if this * is the first grand prize dig. */ - if ((gSaveContext.item_get_inf[1] & 0x1000) == 0) { - gSaveContext.item_get_inf[1] |= 0x1000; + if ((gSaveContext.itemGetInf[1] & 0x1000) == 0) { + gSaveContext.itemGetInf[1] |= 0x1000; this->currentReward = 4; } } diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 98e8ebeb23..c254dbf45d 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -236,7 +236,7 @@ void EnTuboTrap_WaitForProximity(EnTuboTrap* this, GlobalContext* globalCtx) { if (this->actor.xzDistanceFromLink < 200.0f && this->actor.posRot.pos.y <= player->actor.posRot.pos.y) { Actor_ChangeType(globalCtx, &globalCtx->actorCtx, this, ACTORTYPE_ENEMY); this->actor.flags |= 1; - targetHeight = 40.0f + -10.0f * gSaveContext.link_age; + targetHeight = 40.0f + -10.0f * gSaveContext.linkAge; this->targetY = player->actor.posRot.pos.y + targetHeight; if (this->targetY < this->actor.posRot.pos.y) { diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 99017f0881..3b838e45fa 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -69,7 +69,7 @@ static ActorDamageChart damageChart = { { { 0x0, 0x2 }, { 0x0, 0x2 }, { 0x0, 0x8 }, { 0x0, 0x4 }, { 0x0, 0x0 }, { 0x0, 0x0 }, { 0x0, 0x4 }, { 0x0, 0x0 }, } }; -static InitChainEntry initChain[3] = { +static InitChainEntry initChain[] = { ICHAIN_S8(naviEnemyId, 0x30, 1), ICHAIN_F32(unk_4C, 0x157C, 1), ICHAIN_F32_DIV1000(gravity, 0xFA24, 0), @@ -295,7 +295,7 @@ void EnWallmas_WaitToDrop(EnWallmas* this, GlobalContext* globalCtx) { void EnWallmas_Drop(EnWallmas* this, GlobalContext* globalCtx) { Player* player = PLAYER; - if ((func_8008E988(globalCtx) == 0) && (player->stateFlags2 & 0x10) == 0 && (player->unk_A78 >= 0) && + if (!func_8008E988(globalCtx) && (player->stateFlags2 & 0x10) == 0 && (player->unk_A78 >= 0) && (this->actor.xzDistanceFromLink < 30.0f) && (this->actor.yDistanceFromLink < -5.0f) && (-(f32)(player->unk_4DA + 0xA) < this->actor.yDistanceFromLink)) { EnWallmas_TakePlayerBegin(this, globalCtx); @@ -417,14 +417,14 @@ void EnWallmas_TakePlayer(EnWallmas* this, GlobalContext* globalCtx) { this->actor.posRot.pos.y = this->actor.posRot.pos.y + 10.0f; } - if (gSaveContext.link_age != 0) { + if (LINK_IS_CHILD) { player->actor.posRot.pos.y = this->actor.posRot.pos.y - 30.0f; } else { player->actor.posRot.pos.y = this->actor.posRot.pos.y - 50.0f; } if (this->timer == -0x1E) { - if (gSaveContext.link_age != 0) { + if (LINK_IS_CHILD) { func_8002F7DC(&this->actor, NA_SE_VO_LI_TAKEN_AWAY_KID); } else { func_8002F7DC(&this->actor, NA_SE_VO_LI_TAKEN_AWAY); @@ -436,8 +436,7 @@ void EnWallmas_TakePlayer(EnWallmas* this, GlobalContext* globalCtx) { this->timer = this->timer + 2; } else { - Math_ApproxF(&this->actor.posRot.pos.y, - player->actor.posRot.pos.y + (gSaveContext.link_age != 0 ? 30.0f : 50.0f), 5.0f); + Math_ApproxF(&this->actor.posRot.pos.y, player->actor.posRot.pos.y + (LINK_IS_CHILD ? 30.0f : 50.0f), 5.0f); } Math_ApproxF(&this->actor.posRot.pos.x, player->actor.posRot.pos.x, 3.0f); @@ -445,7 +444,7 @@ void EnWallmas_TakePlayer(EnWallmas* this, GlobalContext* globalCtx) { if (this->timer == 0x1E) { func_80078884(NA_SE_OC_ABYSS); - func_800C0C88(globalCtx); + Gameplay_TriggerRespawn(globalCtx); } } diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index 9de45885dc..69f099b1a0 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -6,6 +6,8 @@ #include "z_obj_makekinsuta.h" +#include + #define FLAGS 0x00000010 void ObjMakekinsuta_Init(ObjMakekinsuta* this, GlobalContext* globalCtx); diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h index e481beea9c..88b3b904a0 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h @@ -3,7 +3,6 @@ #include #include -#include typedef struct { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c index 105f9f83b9..c776ec9592 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -46,8 +46,8 @@ void ObjRoomtimer_Init(ObjRoomtimer* this, GlobalContext* globalCtx) { void ObjRoomtimer_Destroy(ObjRoomtimer* this, GlobalContext* globalCtx) { if (this->actor.params != 0x3FF) { - if (gSaveContext.timer_1_value > 0) { - gSaveContext.timer_1_state = 10; + if (gSaveContext.timer1Value > 0) { + gSaveContext.timer1State = 10; } } } @@ -64,7 +64,7 @@ void func_80B9D054(ObjRoomtimer* this, GlobalContext* globalCtx) { void func_80B9D0B0(ObjRoomtimer* this, GlobalContext* globalCtx) { if (Flags_GetTempClear(globalCtx, this->actor.room)) { if (this->actor.params != 0x3FF) { - gSaveContext.timer_1_state = 10; + gSaveContext.timer1State = 10; } Flags_SetClear(globalCtx, this->actor.room); @@ -73,9 +73,9 @@ void func_80B9D0B0(ObjRoomtimer* this, GlobalContext* globalCtx) { Actor_Kill(&this->actor); } else { if (this->actor.params != 0x3FF) { - if (gSaveContext.timer_1_value == 0) { + if (gSaveContext.timer1Value == 0) { Audio_PlaySoundGeneral(NA_SE_OC_ABYSS, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - func_800C0B60(globalCtx); // Void Out + Gameplay_TriggerVoidOut(globalCtx); Actor_Kill(&this->actor); } } diff --git a/src/overlays/gamestates/ovl_opening/z_opening.c b/src/overlays/gamestates/ovl_opening/z_opening.c index 1348ce4248..84619ea824 100644 --- a/src/overlays/gamestates/ovl_opening/z_opening.c +++ b/src/overlays/gamestates/ovl_opening/z_opening.c @@ -7,22 +7,22 @@ #include #include -void Opening_SetNextGameState(OpeningContext* this) { - gSaveContext.game_mode = 1; +void Opening_SetupTitleScreen(OpeningContext* this) { + gSaveContext.gameMode = 1; this->state.running = false; - gSaveContext.link_age = 0; + gSaveContext.linkAge = 0; func_800A82C8(); - gSaveContext.cutscene_index = 0xFFF3; - gSaveContext.scene_setup_index = 7; - SET_NEXT_GAMESTATE(&this->state, func_800BCA64, GlobalContext); + gSaveContext.cutsceneIndex = 0xFFF3; + gSaveContext.sceneSetupIndex = 7; + SET_NEXT_GAMESTATE(&this->state, Gameplay_Init, GlobalContext); } void func_80803C5C(OpeningContext* this) { } -void Opening_Update(OpeningContext* this) { +void Opening_Main(OpeningContext* this) { func_80095248(this->state.gfxCtx, 0, 0, 0); - Opening_SetNextGameState(this); + Opening_SetupTitleScreen(this); func_80803C5C(this); } @@ -32,7 +32,7 @@ void Opening_Destroy(OpeningContext* this) { void Opening_Init(OpeningContext* this) { R_UPDATE_RATE = 1; Matrix_Init(&this->state); - func_800AA278(&this->view, this->state.gfxCtx); - this->state.main = Opening_Update; + View_Init(&this->view, this->state.gfxCtx); + this->state.main = Opening_Main; this->state.destroy = Opening_Destroy; } diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index a6f58ef054..a80fb91393 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -40,7 +40,7 @@ void Title_Calc(TitleContext* this) { this->exit = 1; } -void Title_InitView(TitleContext* this, f32 x, f32 y, f32 z) { +void Title_SetupView(TitleContext* this, f32 x, f32 y, f32 z) { View* view; Vec3f v1; Vec3f v2; @@ -91,7 +91,7 @@ void Title_Draw(TitleContext* this) { func_8002EABC(&v1, &v2, &v3, this->state.gfxCtx); gSPSetLights1(gfxCtx->polyOpa.p++, sTitleLights); - Title_InitView(this, 0, 150.0, 300.0); + Title_SetupView(this, 0, 150.0, 300.0); func_80093D18(this->state.gfxCtx); Matrix_Translate(-53.0, -5.0, 0, MTXMODE_NEW); Matrix_Scale(1.0, 1.0, 1.0, MTXMODE_APPLY); @@ -127,12 +127,11 @@ void Title_Draw(TitleContext* this) { Graph_CloseDisps(dispRefs, this->state.gfxCtx, "../z_title.c", 483); } -void Title_Update(TitleContext* this) { +void Title_Main(TitleContext* this) { GraphicsContext* gfxCtx = this->state.gfxCtx; - u32 pad; - Gfx* dispRefs[4]; - u32 pad2; - Gfx* gfx[2]; + Gfx* dispRefs[5]; + u32 pad[2]; + Gfx* gfx; Graph_OpenDisps(dispRefs, this->state.gfxCtx, "../z_title.c", 494); @@ -142,14 +141,14 @@ void Title_Update(TitleContext* this) { Title_Calc(this); Title_Draw(this); if (D_8012DBC0) { - gfx[0] = gfxCtx->polyOpa.p; + gfx = gfxCtx->polyOpa.p; Title_PrintBuildInfo(&gfx); - gfxCtx->polyOpa.p = gfx[0]; + gfxCtx->polyOpa.p = gfx; } if (this->exit) { - gSaveContext.seq_index = -1; - gSaveContext.night_sfx = -1; - gSaveContext.game_mode = 1; + gSaveContext.seqIndex = 0xFF; + gSaveContext.nightSeqIndex = 0xFF; + gSaveContext.gameMode = 1; this->state.running = false; SET_NEXT_GAMESTATE(&this->state, Opening_Init, OpeningContext); } @@ -173,11 +172,11 @@ void Title_Init(TitleContext* this) { DmaMgr_SendRequest1(this->staticSegment, (u32)_nintendo_rogo_staticSegmentRomStart, size, "../z_title.c", 615); R_UPDATE_RATE = 1; Matrix_Init(&this->state); - func_800AA278(&this->view, this->state.gfxCtx); - this->state.main = Title_Update; + View_Init(&this->view, this->state.gfxCtx); + this->state.main = Title_Main; this->state.destroy = Title_Destroy; this->exit = false; - gSaveContext.file_num = 0xFF; + gSaveContext.fileNum = 0xFF; func_800A9CD4(&this->state, &this->sram); this->ult = 0; this->unk_1D4 = 0x14; diff --git a/undefined_syms.txt b/undefined_syms.txt index 77325b5b27..f26e21b9e0 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -139,6 +139,9 @@ D_070380D4 = 0x070380D4; D_0703811C = 0x0703811C; D_080895C0 = 0x080895C0; +// z_skelanime +link_animetion_segment = 0x07000000; + // z_en_tubo_trap D_05017870 = 0x05017870; D_05017A60 = 0x05017A60; @@ -200,7 +203,6 @@ D_0600C4C8 = 0x0600C4C8; D_0600F000 = 0x0600F000; D_0600F208 = 0x0600F208; - // z_bg_menkuri_kaiten D_060038D0 = 0x060038D0; D_060042D8 = 0x060042D8; @@ -284,13 +286,7 @@ D_06000100 = 0x06000100; D_040254B0 = 0x040254B0; D_040244B0 = 0x040244B0; -// z_select -D_01AA0200 = 0x01AA0200; -D_01A9E000 = 0x01A9E000; - // z_title -D_01AA3DC0 = 0x01AA3DC0; -D_01AA1000 = 0x01AA1000; D_01002720 = 0x01002720; D_01001800 = 0x01001800; D_01000000 = 0x01000000; @@ -467,9 +463,6 @@ D_06001BD0 = 0x06001BD0; D_060011D4 = 0x060011D4; D_06001080 = 0x06001080; -// z_skelanime -link_animetion_segment = 0x07000000; - // z_en_ds D_06004768 = 0x06004768; D_0600039C = 0x0600039C;