summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-10-14 00:22:52 +0200
committerTreeki <treeki@gmail.com>2012-10-14 00:22:52 +0200
commit50d6ddc30b8a65425a64deb005377449c0d4c85e (patch)
tree039c693adc3ea500c8c6a508b24f3064a56c564e
parentdf13f0ace795e491f2fd975ea1967e72411f1981 (diff)
downloadkamek-50d6ddc30b8a65425a64deb005377449c0d4c85e.tar.gz
kamek-50d6ddc30b8a65425a64deb005377449c0d4c85e.zip
sigh.
Diffstat (limited to '')
-rw-r--r--bugfixes.yaml16
-rw-r--r--src/randomcrap.S3
2 files changed, 14 insertions, 5 deletions
diff --git a/bugfixes.yaml b/bugfixes.yaml
index e5e4a9a..9c6c46a 100644
--- a/bugfixes.yaml
+++ b/bugfixes.yaml
@@ -9,11 +9,11 @@ hooks:
src_addr_pal: 0x8010191C
target_func: 'TitleScreenFucker'
- - name: MPPauseFix1
- type: branch_insn
- branch_type: bl
- target_func: 'mpPauseFix1'
- src_addr_pal: 0x801410C4
+# - name: MPPauseFix1
+# type: branch_insn
+# branch_type: bl
+# target_func: 'mpPauseFix1'
+# src_addr_pal: 0x801410C4
#This one disables the player freezing and doing the grow animation
#skawo didn't like it
# - name: MPPauseFix2
@@ -21,6 +21,12 @@ hooks:
# branch_type: bl
# target_func: 'mpPauseFix2'
# src_addr_pal: 0x801410DC
+# - name: MPPauseFix4
+# type: branch_insn
+# branch_type: bl
+# target_func: 'mpPauseFix4'
+# src_addr_pal: 0x8014169C
+
- name: MPDeathPauseFix
type: nop_insn
area_pal: 0x8013DA70
diff --git a/src/randomcrap.S b/src/randomcrap.S
index 63363de..e0530c8 100644
--- a/src/randomcrap.S
+++ b/src/randomcrap.S
@@ -64,6 +64,9 @@ mpPauseFix2:
ori r5, r5, continueFromMpPauseFix2@l
b mpPauseFix
+.global mpPauseFix4
+mpPauseFix4:
+ b CheckIfSinglePlayer
.extern CheckIfSinglePlayer
mpPauseFix: