merge an assorment of calc84maniac's fixes.

diff --git a/arm/arm_emit.h b/arm/arm_emit.h
index a770063..587ad28 100644 (file)
--- 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 (file)
--- a/arm/video_blend.S
+++ b/arm/video_blend.S
@@ -31,7 +31,7 @@ expand_blend:
   cmp r3, #16                     @ if(blend_a > 16)\r
   movgt r3, #16                   @   blend_a = 16\r
   cmp r4, #16                     @ if(blend_b > 16)\r
-  movgt r3, #16                   @   blend_b = 16\r
+  movgt r4, #16                   @   blend_b = 16\r
 \r
   ldr r14, 6b + 4                 @ r14 = palette_ram_converted\r
   ldr r12, 6b + 8                 @ r12 = 0x04000200\r

diff --git a/gui.c b/gui.c
index 1cdbdd5..411ec12 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -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;
       }