summaryrefslogtreecommitdiff
path: root/summerhax.yaml
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-07-04 23:14:52 -0500
committerColin Noga <Tempus@chronometry.ca>2012-07-04 23:14:52 -0500
commit1c3e5a0b1c62829d78960c4d99e4928ccf73625f (patch)
tree66d70e39ff1b29d656d65d32ba7291735baba79e /summerhax.yaml
parent2a444dcd0e6227649964fda92b436e95c9a08c1b (diff)
downloadkamek-1c3e5a0b1c62829d78960c4d99e4928ccf73625f.tar.gz
kamek-1c3e5a0b1c62829d78960c4d99e4928ccf73625f.zip
Added Newer nullsubs for dynamic use, improved mapfile a little (mostly error output), updated newer and summer sun with nullsub fixes.
Diffstat (limited to '')
-rw-r--r--summerhax.yaml61
1 files changed, 33 insertions, 28 deletions
diff --git a/summerhax.yaml b/summerhax.yaml
index a8875e3..2dfd60f 100644
--- a/summerhax.yaml
+++ b/summerhax.yaml
@@ -1,4 +1,4 @@
-source_files: [../src/summermodel.cpp, ../src/fix38.S]
+source_files: [../src/summermodel.cpp, ../src/fix38.S, ../src/nullsub.S]
hooks:
- {name: RemoveTitleReplay, addr_pal: 0x80781FBC, type: patch, data: '60000000 60000000 60000000'}
- {name: RemoveToadHouseMsg1, addr_pal: 0x808FB974, type: patch, data: '60000000'}
@@ -12,9 +12,9 @@ hooks:
target_func: 'fix38WithJumpCoin'
- name: PreventW5Vine
- type: patch
- addr_pal: 0x809882A4
- data: '80004360'
+ type: add_func_pointer
+ src_addr_pal: 0x809882A4
+ target_func: 'ReturnTrue'
- name: PreventW5VineSound
type: patch
@@ -87,34 +87,34 @@ hooks:
data: '48000014'
- name: StarsDontKillSpikesUD
- type: patch
- addr_pal: 0x80AFF4D8
- data: '80004360'
+ type: add_func_pointer
+ src_addr_pal: 0x80AFF4D8
+ target_func: 'Return'
- name: StarsDontKillSpikesD
- type: patch
- addr_pal: 0x80AFF784
- data: '80004360'
+ type: add_func_pointer
+ src_addr_pal: 0x80AFF784
+ target_func: 'Return'
- name: StarsDontKillSpikesU
- type: patch
- addr_pal: 0x80AFFA30
- data: '80004360'
+ type: add_func_pointer
+ src_addr_pal: 0x80AFFA30
+ target_func: 'Return'
- name: StarsDontKillSpikesLR
- type: patch
- addr_pal: 0x80AFFCDC
- data: '80004360'
+ type: add_func_pointer
+ src_addr_pal: 0x80AFFCDC
+ target_func: 'Return'
- name: StarsDontKillSpikesR
- type: patch
- addr_pal: 0x80AFFF88
- data: '80004360'
+ type: add_func_pointer
+ src_addr_pal: 0x80AFFF88
+ target_func: 'Return'
- name: StarsDontKillSpikesL
- type: patch
- addr_pal: 0x80B00234
- data: '80004360'
+ type: add_func_pointer
+ src_addr_pal: 0x80B00234
+ target_func: 'Return'
- name: WaterEffectsWm_ob_sandpillar02
@@ -160,14 +160,19 @@ hooks:
- name: UrchinDoNotDieFireIce
- type: patch
- addr_pal: 0x80B0CF38
- data: '8000436080004360'
+ type: add_func_pointer
+ src_addr_pal: 0x80B0CF38
+ target_func: 'Return'
+
+- name: UrchinDoNotDieFireIceB
+ type: add_func_pointer
+ src_addr_pal: 0x80B0CF3C
+ target_func: 'Return'
- name: UrchinDoNotDieStar
- type: patch
- addr_pal: 0x80B0CF38
- data: '80004360'
+ type: add_func_pointer
+ src_addr_pal: 0x80B0CF38
+ target_func: 'Return'
- name: UrchinDoNotTurn
type: patch