diff options
| -rw-r--r-- | kamek_configs.yaml | 3 | ||||
| -rwxr-xr-x | makeNewerKP | 1 | ||||
| -rwxr-xr-x | makeSummerSun | 20 | ||||
| -rw-r--r-- | summerhax.yaml | 20 | ||||
| -rwxr-xr-x | tools/mapfile_tool.py | 28 |
5 files changed, 51 insertions, 21 deletions
diff --git a/kamek_configs.yaml b/kamek_configs.yaml index 33dd868..6d969cb 100644 --- a/kamek_configs.yaml +++ b/kamek_configs.yaml @@ -7,7 +7,8 @@ pal2: 'kamek_pal2.x',
ntsc: 'kamek_ntsc.x',
ntsc2: 'kamek_ntsc2.x',
- jpn: 'kamek_jpn.x'
+ jpn: 'kamek_jpn.x',
+ jpn2: 'kamek_jpn2.x'
}
dynamic_link: true
# rel_area_start: 0x807684C0
diff --git a/makeNewerKP b/makeNewerKP index 87a3daa..d299c18 100755 --- a/makeNewerKP +++ b/makeNewerKP @@ -18,6 +18,7 @@ copy_files pal2 EU_2 copy_files ntsc US_1 copy_files ntsc2 US_2 copy_files jpn JP_1 +copy_files jpn2 JP_2 echo Built all! diff --git a/makeSummerSun b/makeSummerSun index 4927ec4..a57f9b6 100755 --- a/makeSummerSun +++ b/makeSummerSun @@ -1,10 +1,9 @@ #!/bin/sh -rm -r ~/.wine remove_files() { - rm "~/Dropbox/NEWERsmbw/Summer\ Sun/System$1.bin" - rm "~/Dropbox/NEWERsmbw/Summer\ Sun/DLCode$1.bin" - rm "~/Dropbox/NEWERsmbw/Summer\ Sun/DLRelocs$1.bin" + rm "SumSource/System$1.bin" + rm "SumSource/DLCode$1.bin" + rm "SumSource/DLRelocs$1.bin" } remove_files EU_1 @@ -12,9 +11,11 @@ remove_files EU_2 remove_files US_1 remove_files US_2 remove_files JP_1 +remove_files JP_2 -python tools/mapfile_tool.py -python tools/kamek.py SummerSun.yaml --no-rels --use-mw --use-wine --gcc-type=/usr/local/devkitPRO/devkitPPC/bin/powerpc-eabi --mw-path=tools +python2 tools/mapfile_tool.py +python2 tools/kamek.py SummerSun.yaml --no-rels --use-mw --use-wine --gcc-type=/opt/wiidev/bin/powerpc-elf --mw-path=tools --fast-hack +#python tools/kamek.py SummerSun.yaml --no-rels --use-mw --use-wine --gcc-type=/usr/local/devkitPRO/devkitPPC/bin/powerpc-eabi --mw-path=tools if [ "$?" = "0" ]; then echo "compile successful" else @@ -22,9 +23,9 @@ else fi copy_files() { - cp NewerASM/n_$1_loader.bin "~/Dropbox/NEWERsmbw/Summer\ Sun/System$2.bin" - cp NewerASM/n_$1_dlcode.bin "~/Dropbox/NEWERsmbw/Summer\ Sun/DLCode$2.bin" - cp NewerASM/n_$1_dlrelocs.bin "~/Dropbox/NEWERsmbw/Summer\ Sun/DLRelocs$2.bin" + cp NewerASM/n_$1_loader.bin "SumSource/System$2.bin" + cp NewerASM/n_$1_dlcode.bin "SumSource/DLCode$2.bin" + cp NewerASM/n_$1_dlrelocs.bin "SumSource/DLRelocs$2.bin" } copy_files pal EU_1 @@ -32,6 +33,7 @@ copy_files pal2 EU_2 copy_files ntsc US_1 copy_files ntsc2 US_2 copy_files jpn JP_1 +copy_files jpn2 JP_2 echo Built all! diff --git a/summerhax.yaml b/summerhax.yaml index 2dfd60f..d955008 100644 --- a/summerhax.yaml +++ b/summerhax.yaml @@ -1,4 +1,4 @@ -source_files: [../src/summermodel.cpp, ../src/fix38.S, ../src/nullsub.S] +source_files: [../src/summermodel.cpp, ../src/fix38.S, ../src/nullsub.S, ../src/soundPlayer.S] hooks: - {name: RemoveTitleReplay, addr_pal: 0x80781FBC, type: patch, data: '60000000 60000000 60000000'} - {name: RemoveToadHouseMsg1, addr_pal: 0x808FB974, type: patch, data: '60000000'} @@ -89,32 +89,32 @@ hooks: - name: StarsDontKillSpikesUD type: add_func_pointer src_addr_pal: 0x80AFF4D8 - target_func: 'Return' + target_func: 'ReturnNone' - name: StarsDontKillSpikesD type: add_func_pointer src_addr_pal: 0x80AFF784 - target_func: 'Return' + target_func: 'ReturnNone' - name: StarsDontKillSpikesU type: add_func_pointer src_addr_pal: 0x80AFFA30 - target_func: 'Return' + target_func: 'ReturnNone' - name: StarsDontKillSpikesLR type: add_func_pointer src_addr_pal: 0x80AFFCDC - target_func: 'Return' + target_func: 'ReturnNone' - name: StarsDontKillSpikesR type: add_func_pointer src_addr_pal: 0x80AFFF88 - target_func: 'Return' + target_func: 'ReturnNone' - name: StarsDontKillSpikesL type: add_func_pointer src_addr_pal: 0x80B00234 - target_func: 'Return' + target_func: 'ReturnNone' - name: WaterEffectsWm_ob_sandpillar02 @@ -162,17 +162,17 @@ hooks: - name: UrchinDoNotDieFireIce type: add_func_pointer src_addr_pal: 0x80B0CF38 - target_func: 'Return' + target_func: 'ReturnNone' - name: UrchinDoNotDieFireIceB type: add_func_pointer src_addr_pal: 0x80B0CF3C - target_func: 'Return' + target_func: 'ReturnNone' - name: UrchinDoNotDieStar type: add_func_pointer src_addr_pal: 0x80B0CF38 - target_func: 'Return' + target_func: 'ReturnNone' - name: UrchinDoNotTurn type: patch diff --git a/tools/mapfile_tool.py b/tools/mapfile_tool.py index 41eff5a..cab9ec2 100755 --- a/tools/mapfile_tool.py +++ b/tools/mapfile_tool.py @@ -9,6 +9,9 @@ def make_hex_offset(offs): return '0x%08X' % offs
def fix_offs_pal_v2(offs):
+ if offs >= 0x800CF6E8 and offs <= 0x800CF90F:
+ return offs + 8
+
if offs >= 0x807685A0 and offs <= 0x807AAA70:
return offs + 0x40
@@ -81,6 +84,9 @@ def fix_offs_ntsc_v1(offs): def fix_offs_ntsc_v2(offs):
offs = fix_offs_ntsc_v1(offs)
+ if offs >= 0x800CF5F8 and offs <= 0x800CF81F:
+ return offs + 8
+
if offs >= 0x807685A0 and offs <= 0x807AAA70:
return offs + 0x40
@@ -196,6 +202,24 @@ def fix_offs_jpn_v1(offs): return offs
+def fix_offs_jpn_v2(offs):
+ offs = fix_offs_jpn_v1(offs)
+
+ if offs >= 0x800CF578 and offs <= 0x800CF79F:
+ return offs + 8
+
+ if offs >= 0x807685A0 and offs <= 0x807AA7FF:
+ return offs + 0x40
+
+ if offs >= 0x807AA800 and offs <= 0x809900FF:
+ return offs + 0x10
+
+ if offs >= 0x80990100:
+ return offs + 0x20
+
+ return offs
+
+
import yaml
original = 'pal'
@@ -203,7 +227,8 @@ fix_for = { 'pal2': fix_offs_pal_v2,
'ntsc': fix_offs_ntsc_v1,
'ntsc2': fix_offs_ntsc_v2,
- 'jpn': fix_offs_jpn_v1
+ 'jpn': fix_offs_jpn_v1,
+ 'jpn2': fix_offs_jpn_v2
}
def do_mapfile(src, dest, fix_offset):
@@ -287,6 +312,7 @@ def main(): do_mapfile('kamek_pal.x', 'kamek_ntsc.x', fix_offs_ntsc_v1)
do_mapfile('kamek_pal.x', 'kamek_ntsc2.x', fix_offs_ntsc_v2)
do_mapfile('kamek_pal.x', 'kamek_jpn.x', fix_offs_jpn_v1)
+ do_mapfile('kamek_pal.x', 'kamek_jpn2.x', fix_offs_jpn_v2)
already_done = set()
do_project('NewerProject.yaml', already_done)
|