summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-10-03 12:56:28 -0500
committerColin Noga <Tempus@chronometry.ca>2012-10-03 12:56:28 -0500
commit62f3928eb263e3fdb283c21bb08aba78ac017c18 (patch)
tree8bdec2b2f1ac4cbb85f41bc790fa0e43320f2e79
parent34efbdba59b460a2f565c25a5ff20efb8d1077a0 (diff)
downloadkamek-62f3928eb263e3fdb283c21bb08aba78ac017c18.tar.gz
kamek-62f3928eb263e3fdb283c21bb08aba78ac017c18.zip
some sprite fixes, and a push to add SNOW2
-rw-r--r--spritetex.yaml20
-rw-r--r--src/music.cpp2
2 files changed, 11 insertions, 11 deletions
diff --git a/spritetex.yaml b/spritetex.yaml
index a15b859..b68b437 100644
--- a/spritetex.yaml
+++ b/spritetex.yaml
@@ -664,11 +664,11 @@ hooks:
src_addr_pal: 0x808BB34C
target_func: 'TobiPukuBypass'
- # - name: TEX_TobiPuku
- # type: branch_insn
- # branch_type: bl
- # src_addr_pal: 0x80AB2288
- # target_func: 'TEX_TobiPuku'
+ - name: TEX_TobiPuku
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x80AB2288
+ target_func: 'TEX_TobiPuku'
- name: TobiPukuSoundChangeB
type: branch_insn
@@ -695,11 +695,11 @@ hooks:
src_addr_pal: 0x80ABC0C0
target_func: 'IgaPukuBypass'
- - name: TEX_IgaPuku
- type: branch_insn
- branch_type: bl
- src_addr_pal: 0x80AB2288
- target_func: 'TEX_IgaPuku'
+ # - name: TEX_IgaPuku
+ # type: branch_insn
+ # branch_type: bl
+ # src_addr_pal: 0x80AB2288
+ # target_func: 'TEX_IgaPuku'
- name: IgaPukuNoEffect1
diff --git a/src/music.cpp b/src/music.cpp
index b00b90d..f7498a9 100644
--- a/src/music.cpp
+++ b/src/music.cpp
@@ -39,7 +39,7 @@ const char* SongNameList [] = {
"BONUS",
"AMBUSH",
"",
- "",
+ "SNOW2",
"MINIMEGA",
"CLIFFS",
"AUTUMN",