diff options
| author | Treeki <treeki@gmail.com> | 2012-10-06 15:57:05 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-10-06 15:57:05 +0200 |
| commit | 4fd3cfc8dc1215ae6f3bcea43a2dc23acebc6e51 (patch) | |
| tree | b1ad55f906611fb6fb153158fff9339dcf0d966e | |
| parent | 06137897ab529d4cc2bc1351cad678b29d8c6e32 (diff) | |
| parent | 62f3928eb263e3fdb283c21bb08aba78ac017c18 (diff) | |
| download | kamek-4fd3cfc8dc1215ae6f3bcea43a2dc23acebc6e51.tar.gz kamek-4fd3cfc8dc1215ae6f3bcea43a2dc23acebc6e51.zip | |
Merge branch 'level-select' of tsn:Kamek into level-select
| -rw-r--r-- | spritetex.yaml | 20 | ||||
| -rw-r--r-- | src/music.cpp | 2 |
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", |