lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge an assorment of calc84maniac's fixes.

This commit is contained in:
notaz 2012-09-18 01:30:43 +03:00
parent 5b5ebfc1db
commit c95affa70d
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arm/arm_emit.h
View File

@ -1519,7 +1519,6 @@ u32 execute_store_cpsr_body(u32 _cpsr, u32 store_mask, u32 address)
thumb_decode_##type(); \ thumb_decode_##type(); \
u32 __rn = prepare_load_reg(reg_rn, _rs); \ u32 __rn = prepare_load_reg(reg_rn, _rs); \
u32 __rd = prepare_store_reg(reg_rd, _rd); \ u32 __rd = prepare_store_reg(reg_rd, _rd); \
generate_load_reg(reg_rn, _rs); \
thumb_generate_op_##op_type(name, _rd, _rs, _rn); \ thumb_generate_op_##op_type(name, _rd, _rs, _rn); \
complete_store_reg(__rd, _rd); \ complete_store_reg(__rd, _rd); \
} \ } \

2
arm/video_blend.S
View File

@ -31,7 +31,7 @@ expand_blend:
cmp r3, #16 @ if(blend_a > 16) cmp r3, #16 @ if(blend_a > 16)
movgt r3, #16 @ blend_a = 16 movgt r3, #16 @ blend_a = 16
cmp r4, #16 @ if(blend_b > 16) cmp r4, #16 @ if(blend_b > 16)
movgt r3, #16 @ blend_b = 16 movgt r4, #16 @ blend_b = 16
ldr r14, 6b + 4 @ r14 = palette_ram_converted ldr r14, 6b + 4 @ r14 = palette_ram_converted
ldr r12, 6b + 8 @ r12 = 0x04000200 ldr r12, 6b + 8 @ r12 = 0x04000200

2
gui.c
View File

@ -808,7 +808,7 @@ s32 load_game_config_file()
for(i = 0; i < 10; i++) for(i = 0; i < 10; i++)
{ {
cheats[i].cheat_active = file_options[3 + i] % 2; cheats[i].cheat_active = file_options[4 + i] % 2;
cheats[i].cheat_name[0] = 0; cheats[i].cheat_name[0] = 0;
} }