diff options
| -rw-r--r-- | arm/arm_emit.h | 1 | ||||
| -rw-r--r-- | arm/video_blend.S | 2 | ||||
| -rw-r--r-- | gui.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arm/arm_emit.h b/arm/arm_emit.h index a770063..587ad28 100644 --- a/arm/arm_emit.h +++ b/arm/arm_emit.h @@ -1519,7 +1519,6 @@ u32 execute_store_cpsr_body(u32 _cpsr, u32 store_mask, u32 address) thumb_decode_##type(); \ u32 __rn = prepare_load_reg(reg_rn, _rs); \ u32 __rd = prepare_store_reg(reg_rd, _rd); \ - generate_load_reg(reg_rn, _rs); \ thumb_generate_op_##op_type(name, _rd, _rs, _rn); \ complete_store_reg(__rd, _rd); \ } \ diff --git a/arm/video_blend.S b/arm/video_blend.S index ed70839..170be8f 100644 --- a/arm/video_blend.S +++ b/arm/video_blend.S @@ -31,7 +31,7 @@ expand_blend: cmp r3, #16 @ if(blend_a > 16)
movgt r3, #16 @ blend_a = 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 r12, 6b + 8 @ r12 = 0x04000200
@@ -808,7 +808,7 @@ s32 load_game_config_file() 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; } |