diff --git a/Core/HLE/ReplaceTables.cpp b/Core/HLE/ReplaceTables.cpp index fdecda051d..53b8de6d79 100644 --- a/Core/HLE/ReplaceTables.cpp +++ b/Core/HLE/ReplaceTables.cpp @@ -2113,115 +2113,115 @@ static const ReplacementTableEntry entries[] = { // { "vmmul_q_transp", &Replace_vmmul_q_transp, 0, REPFLAG_DISABLED }, - { "godseaterburst_blit_texture", &Hook_godseaterburst_blit_texture, 0, REPFLAG_HOOKENTER }, - { "godseaterburst_depthmask_5551", &Hook_godseaterburst_depthmask_5551, 0, REPFLAG_HOOKENTER }, - { "hexyzforce_monoclome_thread", &Hook_hexyzforce_monoclome_thread, 0, REPFLAG_HOOKENTER, 0x58 }, - { "starocean_write_stencil", &Hook_starocean_write_stencil, 0, REPFLAG_HOOKENTER, 0x260 }, - { "topx_create_saveicon", &Hook_topx_create_saveicon, 0, REPFLAG_HOOKENTER, 0x34 }, - { "ff1_battle_effect", &Hook_ff1_battle_effect, 0, REPFLAG_HOOKENTER }, + { "godseaterburst_blit_texture", &Hook_godseaterburst_blit_texture, 0, REPFLAG_HOOK }, + { "godseaterburst_depthmask_5551", &Hook_godseaterburst_depthmask_5551, 0, REPFLAG_HOOK }, + { "hexyzforce_monoclome_thread", &Hook_hexyzforce_monoclome_thread, 0, REPFLAG_HOOK, 0x58 }, + { "starocean_write_stencil", &Hook_starocean_write_stencil, 0, REPFLAG_HOOK, 0x260 }, + { "topx_create_saveicon", &Hook_topx_create_saveicon, 0, REPFLAG_HOOK, 0x34 }, + { "ff1_battle_effect", &Hook_ff1_battle_effect, 0, REPFLAG_HOOK }, // This is actually used in other games, not just Dissidia. - { "dissidia_recordframe_avi", &Hook_dissidia_recordframe_avi, 0, REPFLAG_HOOKENTER }, - { "brandish_download_frame", &Hook_brandish_download_frame, 0, REPFLAG_HOOKENTER }, - { "growlanser_create_saveicon", &Hook_growlanser_create_saveicon, 0, REPFLAG_HOOKENTER, 0x7C }, - { "sd_gundam_g_generation_download_frame", &Hook_sd_gundam_g_generation_download_frame, 0, REPFLAG_HOOKENTER, 0x48}, - { "narisokonai_download_frame", &Hook_narisokonai_download_frame, 0, REPFLAG_HOOKENTER, 0x14 }, - { "kirameki_school_life_download_frame", &Hook_kirameki_school_life_download_frame, 0, REPFLAG_HOOKENTER }, - { "orenoimouto_download_frame", &Hook_orenoimouto_download_frame, 0, REPFLAG_HOOKENTER }, - { "sakurasou_download_frame", &Hook_sakurasou_download_frame, 0, REPFLAG_HOOKENTER, 0xF8 }, - { "suikoden1_and_2_download_frame_1", &Hook_suikoden1_and_2_download_frame_1, 0, REPFLAG_HOOKENTER, 0x9C }, - { "suikoden1_and_2_download_frame_2", &Hook_suikoden1_and_2_download_frame_2, 0, REPFLAG_HOOKENTER, 0x48 }, - { "rezel_cross_download_frame", &Hook_rezel_cross_download_frame, 0, REPFLAG_HOOKENTER, 0x54 }, - { "kagaku_no_ensemble_download_frame", &Hook_kagaku_no_ensemble_download_frame, 0, REPFLAG_HOOKENTER, 0x38 }, - { "soranokiseki_fc_download_frame", &Hook_soranokiseki_fc_download_frame, 0, REPFLAG_HOOKENTER, 0x180 }, - { "soranokiseki_sc_download_frame", &Hook_soranokiseki_sc_download_frame, 0, REPFLAG_HOOKENTER, }, - { "bokunonatsuyasumi4_download_frame", &Hook_bokunonatsuyasumi4_download_frame, 0, REPFLAG_HOOKENTER, 0x8C }, - { "danganronpa2_1_download_frame", &Hook_danganronpa2_1_download_frame, 0, REPFLAG_HOOKENTER, 0x68 }, - { "danganronpa2_2_download_frame", &Hook_danganronpa2_2_download_frame, 0, REPFLAG_HOOKENTER, 0x94 }, - { "danganronpa1_1_download_frame", &Hook_danganronpa1_1_download_frame, 0, REPFLAG_HOOKENTER, 0x78 }, - { "danganronpa1_2_download_frame", &Hook_danganronpa1_2_download_frame, 0, REPFLAG_HOOKENTER, 0xA8 }, - { "kankabanchoutbr_download_frame", &Hook_kankabanchoutbr_download_frame, 0, REPFLAG_HOOKENTER, }, - { "orenoimouto_download_frame_2", &Hook_orenoimouto_download_frame_2, 0, REPFLAG_HOOKENTER, }, - { "rewrite_download_frame", &Hook_rewrite_download_frame, 0, REPFLAG_HOOKENTER, 0x5C }, - { "kudwafter_download_frame", &Hook_kudwafter_download_frame, 0, REPFLAG_HOOKENTER, 0x58 }, - { "kumonohatateni_download_frame", &Hook_kumonohatateni_download_frame, 0, REPFLAG_HOOKENTER, }, - { "otomenoheihou_download_frame", &Hook_otomenoheihou_download_frame, 0, REPFLAG_HOOKENTER, 0x14 }, - { "grisaianokajitsu_download_frame", &Hook_grisaianokajitsu_download_frame, 0, REPFLAG_HOOKENTER, 0x14 }, - { "kokoroconnect_download_frame", &Hook_kokoroconnect_download_frame, 0, REPFLAG_HOOKENTER, 0x60 }, - { "toheart2_download_frame", &Hook_toheart2_download_frame, 0, REPFLAG_HOOKENTER, }, - { "toheart2_download_frame_2", &Hook_toheart2_download_frame_2, 0, REPFLAG_HOOKENTER, 0x18 }, - { "flowers_download_frame", &Hook_flowers_download_frame, 0, REPFLAG_HOOKENTER, 0x44 }, - { "motorstorm_download_frame", &Hook_motorstorm_download_frame, 0, REPFLAG_HOOKENTER, }, - { "utawarerumono_download_frame", &Hook_utawarerumono_download_frame, 0, REPFLAG_HOOKENTER, }, - { "photokano_download_frame", &Hook_photokano_download_frame, 0, REPFLAG_HOOKENTER, 0x2C }, - { "photokano_download_frame_2", &Hook_photokano_download_frame_2, 0, REPFLAG_HOOKENTER, }, - { "gakuenheaven_download_frame", &Hook_gakuenheaven_download_frame, 0, REPFLAG_HOOKENTER, }, - { "youkosohitsujimura_download_frame", &Hook_youkosohitsujimura_download_frame, 0, REPFLAG_HOOKENTER, 0x94 }, + { "dissidia_recordframe_avi", &Hook_dissidia_recordframe_avi, 0, REPFLAG_HOOK }, + { "brandish_download_frame", &Hook_brandish_download_frame, 0, REPFLAG_HOOK }, + { "growlanser_create_saveicon", &Hook_growlanser_create_saveicon, 0, REPFLAG_HOOK, 0x7C }, + { "sd_gundam_g_generation_download_frame", &Hook_sd_gundam_g_generation_download_frame, 0, REPFLAG_HOOK, 0x48}, + { "narisokonai_download_frame", &Hook_narisokonai_download_frame, 0, REPFLAG_HOOK, 0x14 }, + { "kirameki_school_life_download_frame", &Hook_kirameki_school_life_download_frame, 0, REPFLAG_HOOK }, + { "orenoimouto_download_frame", &Hook_orenoimouto_download_frame, 0, REPFLAG_HOOK }, + { "sakurasou_download_frame", &Hook_sakurasou_download_frame, 0, REPFLAG_HOOK, 0xF8 }, + { "suikoden1_and_2_download_frame_1", &Hook_suikoden1_and_2_download_frame_1, 0, REPFLAG_HOOK, 0x9C }, + { "suikoden1_and_2_download_frame_2", &Hook_suikoden1_and_2_download_frame_2, 0, REPFLAG_HOOK, 0x48 }, + { "rezel_cross_download_frame", &Hook_rezel_cross_download_frame, 0, REPFLAG_HOOK, 0x54 }, + { "kagaku_no_ensemble_download_frame", &Hook_kagaku_no_ensemble_download_frame, 0, REPFLAG_HOOK, 0x38 }, + { "soranokiseki_fc_download_frame", &Hook_soranokiseki_fc_download_frame, 0, REPFLAG_HOOK, 0x180 }, + { "soranokiseki_sc_download_frame", &Hook_soranokiseki_sc_download_frame, 0, REPFLAG_HOOK, }, + { "bokunonatsuyasumi4_download_frame", &Hook_bokunonatsuyasumi4_download_frame, 0, REPFLAG_HOOK, 0x8C }, + { "danganronpa2_1_download_frame", &Hook_danganronpa2_1_download_frame, 0, REPFLAG_HOOK, 0x68 }, + { "danganronpa2_2_download_frame", &Hook_danganronpa2_2_download_frame, 0, REPFLAG_HOOK, 0x94 }, + { "danganronpa1_1_download_frame", &Hook_danganronpa1_1_download_frame, 0, REPFLAG_HOOK, 0x78 }, + { "danganronpa1_2_download_frame", &Hook_danganronpa1_2_download_frame, 0, REPFLAG_HOOK, 0xA8 }, + { "kankabanchoutbr_download_frame", &Hook_kankabanchoutbr_download_frame, 0, REPFLAG_HOOK, }, + { "orenoimouto_download_frame_2", &Hook_orenoimouto_download_frame_2, 0, REPFLAG_HOOK, }, + { "rewrite_download_frame", &Hook_rewrite_download_frame, 0, REPFLAG_HOOK, 0x5C }, + { "kudwafter_download_frame", &Hook_kudwafter_download_frame, 0, REPFLAG_HOOK, 0x58 }, + { "kumonohatateni_download_frame", &Hook_kumonohatateni_download_frame, 0, REPFLAG_HOOK, }, + { "otomenoheihou_download_frame", &Hook_otomenoheihou_download_frame, 0, REPFLAG_HOOK, 0x14 }, + { "grisaianokajitsu_download_frame", &Hook_grisaianokajitsu_download_frame, 0, REPFLAG_HOOK, 0x14 }, + { "kokoroconnect_download_frame", &Hook_kokoroconnect_download_frame, 0, REPFLAG_HOOK, 0x60 }, + { "toheart2_download_frame", &Hook_toheart2_download_frame, 0, REPFLAG_HOOK, }, + { "toheart2_download_frame_2", &Hook_toheart2_download_frame_2, 0, REPFLAG_HOOK, 0x18 }, + { "flowers_download_frame", &Hook_flowers_download_frame, 0, REPFLAG_HOOK, 0x44 }, + { "motorstorm_download_frame", &Hook_motorstorm_download_frame, 0, REPFLAG_HOOK, }, + { "utawarerumono_download_frame", &Hook_utawarerumono_download_frame, 0, REPFLAG_HOOK, }, + { "photokano_download_frame", &Hook_photokano_download_frame, 0, REPFLAG_HOOK, 0x2C }, + { "photokano_download_frame_2", &Hook_photokano_download_frame_2, 0, REPFLAG_HOOK, }, + { "gakuenheaven_download_frame", &Hook_gakuenheaven_download_frame, 0, REPFLAG_HOOK, }, + { "youkosohitsujimura_download_frame", &Hook_youkosohitsujimura_download_frame, 0, REPFLAG_HOOK, 0x94 }, { "zettai_hero_update_minimap_tex", &Hook_zettai_hero_update_minimap_tex, 0, REPFLAG_HOOKEXIT, }, - { "tonyhawkp8_upload_tutorial_frame", &Hook_tonyhawkp8_upload_tutorial_frame, 0, REPFLAG_HOOKENTER, }, - { "sdgundamggenerationportable_download_frame", &Hook_sdgundamggenerationportable_download_frame, 0, REPFLAG_HOOKENTER, 0x34 }, - { "atvoffroadfurypro_download_frame", &Hook_atvoffroadfurypro_download_frame, 0, REPFLAG_HOOKENTER, 0xA0 }, - { "atvoffroadfuryblazintrails_download_frame", &Hook_atvoffroadfuryblazintrails_download_frame, 0, REPFLAG_HOOKENTER, 0x80 }, - { "littlebustersce_download_frame", &Hook_littlebustersce_download_frame, 0, REPFLAG_HOOKENTER, }, - { "shinigamitoshoujo_download_frame", &Hook_shinigamitoshoujo_download_frame, 0, REPFLAG_HOOKENTER, 0xBC }, - { "atvoffroadfuryprodemo_download_frame", &Hook_atvoffroadfuryprodemo_download_frame, 0, REPFLAG_HOOKENTER, 0x80 }, - { "unendingbloodycall_download_frame", &Hook_unendingbloodycall_download_frame, 0, REPFLAG_HOOKENTER, 0x54 }, - { "omertachinmokunookitethelegacy_download_frame", &Hook_omertachinmokunookitethelegacy_download_frame, 0, REPFLAG_HOOKENTER, 0x88 }, - { "katamari_render_check", &Hook_katamari_render_check, 0, REPFLAG_HOOKENTER, 0, }, - { "katamari_screenshot_to_565", &Hook_katamari_screenshot_to_565, 0, REPFLAG_HOOKENTER, 0 }, - { "mytranwars_upload_frame", &Hook_mytranwars_upload_frame, 0, REPFLAG_HOOKENTER, 0x128 }, - { "marvelalliance1_copy", &Hook_marvelalliance1_copy_a1_before, 0, REPFLAG_HOOKENTER, 0x284 }, - { "marvelalliance1_copy", &Hook_marvelalliance1_copy_after, 0, REPFLAG_HOOKENTER, 0x2bc }, - { "marvelalliance1_copy", &Hook_marvelalliance1_copy_a1_before, 0, REPFLAG_HOOKENTER, 0x2e8 }, - { "marvelalliance1_copy", &Hook_marvelalliance1_copy_after, 0, REPFLAG_HOOKENTER, 0x320 }, - { "marvelalliance1_copy", &Hook_marvelalliance1_copy_a2_before, 0, REPFLAG_HOOKENTER, 0x3b0 }, - { "marvelalliance1_copy", &Hook_marvelalliance1_copy_after, 0, REPFLAG_HOOKENTER, 0x3e8 }, - { "marvelalliance1_copy", &Hook_marvelalliance1_copy_a2_before, 0, REPFLAG_HOOKENTER, 0x410 }, - { "marvelalliance1_copy", &Hook_marvelalliance1_copy_after, 0, REPFLAG_HOOKENTER, 0x448 }, - { "marvelalliance1_copy", &Hook_marvelalliance1_copy_a1_before, 0, REPFLAG_HOOKENTER, 0x600 }, - { "marvelalliance1_copy", &Hook_marvelalliance1_copy_after, 0, REPFLAG_HOOKENTER, 0x638 }, - { "marvelalliance1_copy", &Hook_marvelalliance1_copy_a1_before, 0, REPFLAG_HOOKENTER, 0x664 }, - { "marvelalliance1_copy", &Hook_marvelalliance1_copy_after, 0, REPFLAG_HOOKENTER, 0x69c }, - { "starocean_clear_framebuf", &Hook_starocean_clear_framebuf_before, 0, REPFLAG_HOOKENTER, 0 }, + { "tonyhawkp8_upload_tutorial_frame", &Hook_tonyhawkp8_upload_tutorial_frame, 0, REPFLAG_HOOK, }, + { "sdgundamggenerationportable_download_frame", &Hook_sdgundamggenerationportable_download_frame, 0, REPFLAG_HOOK, 0x34 }, + { "atvoffroadfurypro_download_frame", &Hook_atvoffroadfurypro_download_frame, 0, REPFLAG_HOOK, 0xA0 }, + { "atvoffroadfuryblazintrails_download_frame", &Hook_atvoffroadfuryblazintrails_download_frame, 0, REPFLAG_HOOK, 0x80 }, + { "littlebustersce_download_frame", &Hook_littlebustersce_download_frame, 0, REPFLAG_HOOK, }, + { "shinigamitoshoujo_download_frame", &Hook_shinigamitoshoujo_download_frame, 0, REPFLAG_HOOK, 0xBC }, + { "atvoffroadfuryprodemo_download_frame", &Hook_atvoffroadfuryprodemo_download_frame, 0, REPFLAG_HOOK, 0x80 }, + { "unendingbloodycall_download_frame", &Hook_unendingbloodycall_download_frame, 0, REPFLAG_HOOK, 0x54 }, + { "omertachinmokunookitethelegacy_download_frame", &Hook_omertachinmokunookitethelegacy_download_frame, 0, REPFLAG_HOOK, 0x88 }, + { "katamari_render_check", &Hook_katamari_render_check, 0, REPFLAG_HOOK, 0, }, + { "katamari_screenshot_to_565", &Hook_katamari_screenshot_to_565, 0, REPFLAG_HOOK, 0 }, + { "mytranwars_upload_frame", &Hook_mytranwars_upload_frame, 0, REPFLAG_HOOK, 0x128 }, + { "marvelalliance1_copy", &Hook_marvelalliance1_copy_a1_before, 0, REPFLAG_HOOK, 0x284 }, + { "marvelalliance1_copy", &Hook_marvelalliance1_copy_after, 0, REPFLAG_HOOK, 0x2bc }, + { "marvelalliance1_copy", &Hook_marvelalliance1_copy_a1_before, 0, REPFLAG_HOOK, 0x2e8 }, + { "marvelalliance1_copy", &Hook_marvelalliance1_copy_after, 0, REPFLAG_HOOK, 0x320 }, + { "marvelalliance1_copy", &Hook_marvelalliance1_copy_a2_before, 0, REPFLAG_HOOK, 0x3b0 }, + { "marvelalliance1_copy", &Hook_marvelalliance1_copy_after, 0, REPFLAG_HOOK, 0x3e8 }, + { "marvelalliance1_copy", &Hook_marvelalliance1_copy_a2_before, 0, REPFLAG_HOOK, 0x410 }, + { "marvelalliance1_copy", &Hook_marvelalliance1_copy_after, 0, REPFLAG_HOOK, 0x448 }, + { "marvelalliance1_copy", &Hook_marvelalliance1_copy_a1_before, 0, REPFLAG_HOOK, 0x600 }, + { "marvelalliance1_copy", &Hook_marvelalliance1_copy_after, 0, REPFLAG_HOOK, 0x638 }, + { "marvelalliance1_copy", &Hook_marvelalliance1_copy_a1_before, 0, REPFLAG_HOOK, 0x664 }, + { "marvelalliance1_copy", &Hook_marvelalliance1_copy_after, 0, REPFLAG_HOOK, 0x69c }, + { "starocean_clear_framebuf", &Hook_starocean_clear_framebuf_before, 0, REPFLAG_HOOK, 0 }, { "starocean_clear_framebuf", &Hook_starocean_clear_framebuf_after, 0, REPFLAG_HOOKEXIT, 0 }, - { "motorstorm_pixel_read", &Hook_motorstorm_pixel_read, 0, REPFLAG_HOOKENTER, 0 }, - { "worms_copy_normalize_alpha", &Hook_worms_copy_normalize_alpha, 0, REPFLAG_HOOKENTER, 0x0CC }, - { "openseason_data_decode", &Hook_openseason_data_decode, 0, REPFLAG_HOOKENTER, 0x2F0 }, - { "soltrigger_render_ucschar", &Hook_soltrigger_render_ucschar, 0, REPFLAG_HOOKENTER, 0 }, + { "motorstorm_pixel_read", &Hook_motorstorm_pixel_read, 0, REPFLAG_HOOK, 0 }, + { "worms_copy_normalize_alpha", &Hook_worms_copy_normalize_alpha, 0, REPFLAG_HOOK, 0x0CC }, + { "openseason_data_decode", &Hook_openseason_data_decode, 0, REPFLAG_HOOK, 0x2F0 }, + { "soltrigger_render_ucschar", &Hook_soltrigger_render_ucschar, 0, REPFLAG_HOOK, 0 }, { "gow_fps_hack", &Hook_gow_fps_hack, 0, REPFLAG_HOOKEXIT , 0 }, - { "gow_vortex_hack", &Hook_gow_vortex_hack, 0, REPFLAG_HOOKENTER, 0x60 }, - { "ZZT3_select_hack", &Hook_ZZT3_select_hack, 0, REPFLAG_HOOKENTER, 0xC4 }, + { "gow_vortex_hack", &Hook_gow_vortex_hack, 0, REPFLAG_HOOK, 0x60 }, + { "ZZT3_select_hack", &Hook_ZZT3_select_hack, 0, REPFLAG_HOOK, 0xC4 }, { "blitz_fps_hack", &Hook_blitz_fps_hack, 0, REPFLAG_HOOKEXIT , 0 }, { "brian_lara_fps_hack", &Hook_brian_lara_fps_hack, 0, REPFLAG_HOOKEXIT , 0 }, - { "persona1_download_frame", &Hook_persona_download_frame, 0, REPFLAG_HOOKENTER, 0 }, - { "persona2_download_frame", &Hook_persona_download_frame, 0, REPFLAG_HOOKENTER, 0 }, - { "steinsgate_download_frame", &Hook_steinsgate_download_frame, 0, REPFLAG_HOOKENTER, 0 }, - { "infinity_download_frame", &Hook_infinity_download_frame, 0, REPFLAG_HOOKENTER, 0 }, - { "koori_download_frame", &Hook_koori_download_frame, 0, REPFLAG_HOOKENTER, 0 }, - { "takuyo_1_download_frame", &Hook_takuyo_download_frame, 0, REPFLAG_HOOKENTER, 0}, - { "takuyo_2_download_frame", &Hook_takuyo_download_frame, 0, REPFLAG_HOOKENTER, 0}, - { "takuyo_3_download_frame", &Hook_takuyo_download_frame, 0, REPFLAG_HOOKENTER, 0}, - { "kingdomhearts_download_frame", &Hook_kingdomhearts_download_frame, 0, REPFLAG_HOOKENTER, 0}, - { "everybodysgolf2_copy_portrait", &Hook_everybodys_copy_portrait, 0, REPFLAG_HOOKENTER, 0x50 }, - { "everybodystennis_copy_portrait", &Hook_everybodys_copy_portrait, 0, REPFLAG_HOOKENTER, 0x54 }, - { "everybodysgolf_copy_portrait", &Hook_everybodysgolf_copy_portrait, 0, REPFLAG_HOOKENTER, 0x50 }, - { "everybodysgolf_spinner_background", &Hook_everybodysgolf_spinner_background, 0, REPFLAG_HOOKENTER, 0x138 }, - { "codedarms_stencil_check", &Hook_codedarms_stencil_check, 0, REPFLAG_HOOKENTER, 0x8C }, - { "resistance_draw_trail", &Hook_resistance_draw_trail, 0, REPFLAG_HOOKENTER, 0x198 }, - { "resistance_update_trail", &Hook_resistance_update_trail, 0, REPFLAG_HOOKENTER, 0x438 }, - { "resistance_muzzle_light", &Hook_resistance_muzzle_light, 0, REPFLAG_HOOKENTER, 0xF0 }, - { "bejeweled2_draw_dirty_stuff", &Hook_bejeweled2_draw_dirty_stuff, 0, REPFLAG_HOOKENTER, 0 }, - { "gtavcs_plane_control", &Hook_gtavcs_plane_control_1, 0, REPFLAG_HOOKENTER, 0x620 }, - { "gtavcs_plane_control", &Hook_gtavcs_plane_control_2, 0, REPFLAG_HOOKENTER, 0x6AC }, - { "medievil_projectile_update", &Hook_medievil_projectile_update, 0, REPFLAG_HOOKENTER, 0x6BC }, + { "persona1_download_frame", &Hook_persona_download_frame, 0, REPFLAG_HOOK, 0 }, + { "persona2_download_frame", &Hook_persona_download_frame, 0, REPFLAG_HOOK, 0 }, + { "steinsgate_download_frame", &Hook_steinsgate_download_frame, 0, REPFLAG_HOOK, 0 }, + { "infinity_download_frame", &Hook_infinity_download_frame, 0, REPFLAG_HOOK, 0 }, + { "koori_download_frame", &Hook_koori_download_frame, 0, REPFLAG_HOOK, 0 }, + { "takuyo_1_download_frame", &Hook_takuyo_download_frame, 0, REPFLAG_HOOK, 0}, + { "takuyo_2_download_frame", &Hook_takuyo_download_frame, 0, REPFLAG_HOOK, 0}, + { "takuyo_3_download_frame", &Hook_takuyo_download_frame, 0, REPFLAG_HOOK, 0}, + { "kingdomhearts_download_frame", &Hook_kingdomhearts_download_frame, 0, REPFLAG_HOOK, 0}, + { "everybodysgolf2_copy_portrait", &Hook_everybodys_copy_portrait, 0, REPFLAG_HOOK, 0x50 }, + { "everybodystennis_copy_portrait", &Hook_everybodys_copy_portrait, 0, REPFLAG_HOOK, 0x54 }, + { "everybodysgolf_copy_portrait", &Hook_everybodysgolf_copy_portrait, 0, REPFLAG_HOOK, 0x50 }, + { "everybodysgolf_spinner_background", &Hook_everybodysgolf_spinner_background, 0, REPFLAG_HOOK, 0x138 }, + { "codedarms_stencil_check", &Hook_codedarms_stencil_check, 0, REPFLAG_HOOK, 0x8C }, + { "resistance_draw_trail", &Hook_resistance_draw_trail, 0, REPFLAG_HOOK, 0x198 }, + { "resistance_update_trail", &Hook_resistance_update_trail, 0, REPFLAG_HOOK, 0x438 }, + { "resistance_muzzle_light", &Hook_resistance_muzzle_light, 0, REPFLAG_HOOK, 0xF0 }, + { "bejeweled2_draw_dirty_stuff", &Hook_bejeweled2_draw_dirty_stuff, 0, REPFLAG_HOOK, 0 }, + { "gtavcs_plane_control", &Hook_gtavcs_plane_control_1, 0, REPFLAG_HOOK, 0x620 }, + { "gtavcs_plane_control", &Hook_gtavcs_plane_control_2, 0, REPFLAG_HOOK, 0x6AC }, + { "medievil_projectile_update", &Hook_medievil_projectile_update, 0, REPFLAG_HOOK, 0x6BC }, { "activisionhits_frame_limit", &Hook_activisionhits_frame_limit, 0, REPFLAG_HOOKEXIT, 0 }, - { "syphonfilterls_update_trail", &Hook_resistance_update_trail, 0, REPFLAG_HOOKENTER, 0x434 }, - { "syphonfilterls_draw_trail", &Hook_syphonfilterls_draw_trail, 0, REPFLAG_HOOKENTER, 0x198 }, - { "zuma_pad_analog", &Hook_zuma_pad_analog, 0, REPFLAG_HOOKENTER, 0x234 }, - { "zuma_aim_cursor", &Hook_zuma_aim_cursor, 0, REPFLAG_HOOKENTER, 0x210 }, - { "syphonfilter_steer", &Hook_syphonfilter_steer_arrived, 0, REPFLAG_HOOKENTER, 0x13E8 }, - { "syphonfilter_steer", &Hook_syphonfilter_steer_turn_rate, 0, REPFLAG_HOOKENTER, 0x1610 }, - { "syphonfilterls_fade", &Hook_syphonfilterls_fade_hold, 0, REPFLAG_HOOKENTER, 0x78 }, - { "syphonfilterls_fade", &Hook_syphonfilterls_fade_hold, 0, REPFLAG_HOOKENTER, 0x18C }, + { "syphonfilterls_update_trail", &Hook_resistance_update_trail, 0, REPFLAG_HOOK, 0x434 }, + { "syphonfilterls_draw_trail", &Hook_syphonfilterls_draw_trail, 0, REPFLAG_HOOK, 0x198 }, + { "zuma_pad_analog", &Hook_zuma_pad_analog, 0, REPFLAG_HOOK, 0x234 }, + { "zuma_aim_cursor", &Hook_zuma_aim_cursor, 0, REPFLAG_HOOK, 0x210 }, + { "syphonfilter_steer", &Hook_syphonfilter_steer_arrived, 0, REPFLAG_HOOK, 0x13E8 }, + { "syphonfilter_steer", &Hook_syphonfilter_steer_turn_rate, 0, REPFLAG_HOOK, 0x1610 }, + { "syphonfilterls_fade", &Hook_syphonfilterls_fade_hold, 0, REPFLAG_HOOK, 0x78 }, + { "syphonfilterls_fade", &Hook_syphonfilterls_fade_hold, 0, REPFLAG_HOOK, 0x18C }, {} }; @@ -2391,7 +2391,7 @@ void WriteReplaceInstructions(u32 address, u64 hash, int size) { } } } - } else if (entry->flags & REPFLAG_HOOKENTER) { + } else if (entry->flags & REPFLAG_HOOK) { if (WriteReplaceInstruction(address + entry->hookOffset, index, address, size, funcHash)) { didReplace = true; } diff --git a/Core/HLE/ReplaceTables.h b/Core/HLE/ReplaceTables.h index 586d3514d3..9c60a3a7c4 100644 --- a/Core/HLE/ReplaceTables.h +++ b/Core/HLE/ReplaceTables.h @@ -52,7 +52,7 @@ enum { // Used to keep things around but disable them. REPFLAG_DISABLED = 0x02, // Note that this will re-execute in a function that loops at start. - REPFLAG_HOOKENTER = 0x04, + REPFLAG_HOOK = 0x04, // Only hooks jr ra, so only use on funcs that have that. REPFLAG_HOOKEXIT = 0x08, // Function may take a lot of time and execute in slices (executed multiple times.) diff --git a/Core/MIPS/IR/IRFrontend.cpp b/Core/MIPS/IR/IRFrontend.cpp index 4754216396..c8d2ae5742 100644 --- a/Core/MIPS/IR/IRFrontend.cpp +++ b/Core/MIPS/IR/IRFrontend.cpp @@ -196,7 +196,7 @@ void IRFrontend::Comp_ReplacementFunc(MIPSOpcode op) { bool disabled = (entry->flags & REPFLAG_DISABLED) != 0; if (!disabled && funcSize != SymbolMap::INVALID_ADDRESS && funcSize > sizeof(u32)) { // We don't need to disable hooks, the code will still run. - if ((entry->flags & (REPFLAG_HOOKENTER | REPFLAG_HOOKEXIT)) == 0) { + if ((entry->flags & (REPFLAG_HOOK | REPFLAG_HOOKEXIT)) == 0) { // Any breakpoint at the func entry was already tripped, so we can still run the replacement. // That's a common case - just to see how often the replacement hits. disabled = g_breakpoints.RangeContainsBreakPoint(GetCompilerPC() + sizeof(u32), funcSize - sizeof(u32)); @@ -211,7 +211,7 @@ void IRFrontend::Comp_ReplacementFunc(MIPSOpcode op) { ir.Write(IROp::SetPCConst, 0, 0, 0, GetCompilerPC()); ir.Write(IROp::CallReplacement, IRTEMP_0, 0, 0, index); - if (entry->flags & (REPFLAG_HOOKENTER | REPFLAG_HOOKEXIT)) { + if (entry->flags & (REPFLAG_HOOK | REPFLAG_HOOKEXIT)) { // Compile the original instruction at this address. We ignore cycles for hooks. ApplyRoundingMode(); MIPSCompileOp(Memory::Read_Instruction(GetCompilerPC()), this); diff --git a/Core/MIPS/Interpreter.cpp b/Core/MIPS/Interpreter.cpp index 3dae884035..7ed63a3dcc 100644 --- a/Core/MIPS/Interpreter.cpp +++ b/Core/MIPS/Interpreter.cpp @@ -1333,7 +1333,7 @@ namespace MIPSInt { int cycles = entry->replaceFunc(mips); ApplyHostRoundingMode(mips); - if (entry->flags & (REPFLAG_HOOKENTER | REPFLAG_HOOKEXIT)) { + if (entry->flags & (REPFLAG_HOOK | REPFLAG_HOOKEXIT)) { // Interpret the original instruction under the hook. MIPSInterpret(mips, Memory::Read_Instruction(PC)); } else if (cycles < 0) { diff --git a/Core/MIPS/MIPSTables.cpp b/Core/MIPS/MIPSTables.cpp index bea541fe52..9d2a679146 100644 --- a/Core/MIPS/MIPSTables.cpp +++ b/Core/MIPS/MIPSTables.cpp @@ -1145,7 +1145,7 @@ static inline IRBlockEnd GetIRBlockEnd(MIPSOpcode op) { if ((enc & 0xFF000000) == MIPS_CALL_REPLACEMENT_OP) { // A hook runs the original instruction and goes on, like a disabled replacement. const ReplacementTableEntry *entry = GetReplacementFunc(enc & MIPS_REPLACEMENT_INDEX_MASK); - if (entry && entry->replaceFunc && (entry->flags & (REPFLAG_DISABLED | REPFLAG_HOOKENTER | REPFLAG_HOOKEXIT)) == 0) { + if (entry && entry->replaceFunc && (entry->flags & (REPFLAG_DISABLED | REPFLAG_HOOK | REPFLAG_HOOKEXIT)) == 0) { return IRBlockEnd::NOW; } }