From ef15cc741166eb3fb098cc9006389acee52a5961 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Fri, 27 Dec 2024 17:55:51 +0000 Subject: [PATCH] Identify `CHANNEL_FIELD16` as `CHANNEL_NOTE_DURATION_MODIFIER` (#1162) --- pokecrystal.map | 18 +++++++++--------- pokecrystal.sym | 18 +++++++++--------- pokecrystal11.map | 18 +++++++++--------- pokecrystal11.sym | 18 +++++++++--------- pokecrystal11_debug.map | 18 +++++++++--------- pokecrystal11_debug.sym | 18 +++++++++--------- pokecrystal11_vc.map | 18 +++++++++--------- pokecrystal11_vc.sym | 18 +++++++++--------- pokecrystal_au.map | 18 +++++++++--------- pokecrystal_au.sym | 18 +++++++++--------- pokecrystal_debug.map | 18 +++++++++--------- pokecrystal_debug.sym | 18 +++++++++--------- 12 files changed, 108 insertions(+), 108 deletions(-) diff --git a/pokecrystal.map b/pokecrystal.map index 13897c4fb6..d909c97998 100644 --- a/pokecrystal.map +++ b/pokecrystal.map @@ -50617,8 +50617,8 @@ SRAM bank #3: $a994 = sBox10Mon7CaughtGender $a995 = sBox10Mon7Level $a996 = sBox10Mon8Species - $a996 = sBox10Mon8 $a996 = sBox10Mon7BoxEnd + $a996 = sBox10Mon8 $a997 = sBox10Mon8Item $a998 = sBox10Mon8Moves $a99c = sBox10Mon8ID @@ -53203,7 +53203,7 @@ WRAM0 bank #0: $c114 = wChannel1Octave $c115 = wChannel1Transposition $c116 = wChannel1NoteDuration - $c117 = wChannel1Field16 + $c117 = wChannel1NoteDurationModifier $c119 = wChannel1LoopCount $c11a = wChannel1Tempo $c11c = wChannel1Tracks @@ -53241,7 +53241,7 @@ WRAM0 bank #0: $c146 = wChannel2Octave $c147 = wChannel2Transposition $c148 = wChannel2NoteDuration - $c149 = wChannel2Field16 + $c149 = wChannel2NoteDurationModifier $c14b = wChannel2LoopCount $c14c = wChannel2Tempo $c14e = wChannel2Tracks @@ -53279,7 +53279,7 @@ WRAM0 bank #0: $c178 = wChannel3Octave $c179 = wChannel3Transposition $c17a = wChannel3NoteDuration - $c17b = wChannel3Field16 + $c17b = wChannel3NoteDurationModifier $c17d = wChannel3LoopCount $c17e = wChannel3Tempo $c180 = wChannel3Tracks @@ -53317,7 +53317,7 @@ WRAM0 bank #0: $c1aa = wChannel4Octave $c1ab = wChannel4Transposition $c1ac = wChannel4NoteDuration - $c1ad = wChannel4Field16 + $c1ad = wChannel4NoteDurationModifier $c1af = wChannel4LoopCount $c1b0 = wChannel4Tempo $c1b2 = wChannel4Tracks @@ -53355,7 +53355,7 @@ WRAM0 bank #0: $c1dc = wChannel5Octave $c1dd = wChannel5Transposition $c1de = wChannel5NoteDuration - $c1df = wChannel5Field16 + $c1df = wChannel5NoteDurationModifier $c1e1 = wChannel5LoopCount $c1e2 = wChannel5Tempo $c1e4 = wChannel5Tracks @@ -53393,7 +53393,7 @@ WRAM0 bank #0: $c20e = wChannel6Octave $c20f = wChannel6Transposition $c210 = wChannel6NoteDuration - $c211 = wChannel6Field16 + $c211 = wChannel6NoteDurationModifier $c213 = wChannel6LoopCount $c214 = wChannel6Tempo $c216 = wChannel6Tracks @@ -53431,7 +53431,7 @@ WRAM0 bank #0: $c240 = wChannel7Octave $c241 = wChannel7Transposition $c242 = wChannel7NoteDuration - $c243 = wChannel7Field16 + $c243 = wChannel7NoteDurationModifier $c245 = wChannel7LoopCount $c246 = wChannel7Tempo $c248 = wChannel7Tracks @@ -53469,7 +53469,7 @@ WRAM0 bank #0: $c272 = wChannel8Octave $c273 = wChannel8Transposition $c274 = wChannel8NoteDuration - $c275 = wChannel8Field16 + $c275 = wChannel8NoteDurationModifier $c277 = wChannel8LoopCount $c278 = wChannel8Tempo $c27a = wChannel8Tracks diff --git a/pokecrystal.sym b/pokecrystal.sym index 5c5bb1c894..293dc33d5a 100644 --- a/pokecrystal.sym +++ b/pokecrystal.sym @@ -49886,8 +49886,8 @@ 03:a994 sBox10Mon7CaughtGender 03:a995 sBox10Mon7Level 03:a996 sBox10Mon8Species -03:a996 sBox10Mon8 03:a996 sBox10Mon7BoxEnd +03:a996 sBox10Mon8 03:a997 sBox10Mon8Item 03:a998 sBox10Mon8Moves 03:a99c sBox10Mon8ID @@ -52447,7 +52447,7 @@ 00:c114 wChannel1Octave 00:c115 wChannel1Transposition 00:c116 wChannel1NoteDuration -00:c117 wChannel1Field16 +00:c117 wChannel1NoteDurationModifier 00:c119 wChannel1LoopCount 00:c11a wChannel1Tempo 00:c11c wChannel1Tracks @@ -52485,7 +52485,7 @@ 00:c146 wChannel2Octave 00:c147 wChannel2Transposition 00:c148 wChannel2NoteDuration -00:c149 wChannel2Field16 +00:c149 wChannel2NoteDurationModifier 00:c14b wChannel2LoopCount 00:c14c wChannel2Tempo 00:c14e wChannel2Tracks @@ -52523,7 +52523,7 @@ 00:c178 wChannel3Octave 00:c179 wChannel3Transposition 00:c17a wChannel3NoteDuration -00:c17b wChannel3Field16 +00:c17b wChannel3NoteDurationModifier 00:c17d wChannel3LoopCount 00:c17e wChannel3Tempo 00:c180 wChannel3Tracks @@ -52561,7 +52561,7 @@ 00:c1aa wChannel4Octave 00:c1ab wChannel4Transposition 00:c1ac wChannel4NoteDuration -00:c1ad wChannel4Field16 +00:c1ad wChannel4NoteDurationModifier 00:c1af wChannel4LoopCount 00:c1b0 wChannel4Tempo 00:c1b2 wChannel4Tracks @@ -52599,7 +52599,7 @@ 00:c1dc wChannel5Octave 00:c1dd wChannel5Transposition 00:c1de wChannel5NoteDuration -00:c1df wChannel5Field16 +00:c1df wChannel5NoteDurationModifier 00:c1e1 wChannel5LoopCount 00:c1e2 wChannel5Tempo 00:c1e4 wChannel5Tracks @@ -52637,7 +52637,7 @@ 00:c20e wChannel6Octave 00:c20f wChannel6Transposition 00:c210 wChannel6NoteDuration -00:c211 wChannel6Field16 +00:c211 wChannel6NoteDurationModifier 00:c213 wChannel6LoopCount 00:c214 wChannel6Tempo 00:c216 wChannel6Tracks @@ -52675,7 +52675,7 @@ 00:c240 wChannel7Octave 00:c241 wChannel7Transposition 00:c242 wChannel7NoteDuration -00:c243 wChannel7Field16 +00:c243 wChannel7NoteDurationModifier 00:c245 wChannel7LoopCount 00:c246 wChannel7Tempo 00:c248 wChannel7Tracks @@ -52713,7 +52713,7 @@ 00:c272 wChannel8Octave 00:c273 wChannel8Transposition 00:c274 wChannel8NoteDuration -00:c275 wChannel8Field16 +00:c275 wChannel8NoteDurationModifier 00:c277 wChannel8LoopCount 00:c278 wChannel8Tempo 00:c27a wChannel8Tracks diff --git a/pokecrystal11.map b/pokecrystal11.map index 8c9c24bac8..71db2c4534 100644 --- a/pokecrystal11.map +++ b/pokecrystal11.map @@ -50617,8 +50617,8 @@ SRAM bank #3: $a994 = sBox10Mon7CaughtGender $a995 = sBox10Mon7Level $a996 = sBox10Mon8Species - $a996 = sBox10Mon8 $a996 = sBox10Mon7BoxEnd + $a996 = sBox10Mon8 $a997 = sBox10Mon8Item $a998 = sBox10Mon8Moves $a99c = sBox10Mon8ID @@ -53203,7 +53203,7 @@ WRAM0 bank #0: $c114 = wChannel1Octave $c115 = wChannel1Transposition $c116 = wChannel1NoteDuration - $c117 = wChannel1Field16 + $c117 = wChannel1NoteDurationModifier $c119 = wChannel1LoopCount $c11a = wChannel1Tempo $c11c = wChannel1Tracks @@ -53241,7 +53241,7 @@ WRAM0 bank #0: $c146 = wChannel2Octave $c147 = wChannel2Transposition $c148 = wChannel2NoteDuration - $c149 = wChannel2Field16 + $c149 = wChannel2NoteDurationModifier $c14b = wChannel2LoopCount $c14c = wChannel2Tempo $c14e = wChannel2Tracks @@ -53279,7 +53279,7 @@ WRAM0 bank #0: $c178 = wChannel3Octave $c179 = wChannel3Transposition $c17a = wChannel3NoteDuration - $c17b = wChannel3Field16 + $c17b = wChannel3NoteDurationModifier $c17d = wChannel3LoopCount $c17e = wChannel3Tempo $c180 = wChannel3Tracks @@ -53317,7 +53317,7 @@ WRAM0 bank #0: $c1aa = wChannel4Octave $c1ab = wChannel4Transposition $c1ac = wChannel4NoteDuration - $c1ad = wChannel4Field16 + $c1ad = wChannel4NoteDurationModifier $c1af = wChannel4LoopCount $c1b0 = wChannel4Tempo $c1b2 = wChannel4Tracks @@ -53355,7 +53355,7 @@ WRAM0 bank #0: $c1dc = wChannel5Octave $c1dd = wChannel5Transposition $c1de = wChannel5NoteDuration - $c1df = wChannel5Field16 + $c1df = wChannel5NoteDurationModifier $c1e1 = wChannel5LoopCount $c1e2 = wChannel5Tempo $c1e4 = wChannel5Tracks @@ -53393,7 +53393,7 @@ WRAM0 bank #0: $c20e = wChannel6Octave $c20f = wChannel6Transposition $c210 = wChannel6NoteDuration - $c211 = wChannel6Field16 + $c211 = wChannel6NoteDurationModifier $c213 = wChannel6LoopCount $c214 = wChannel6Tempo $c216 = wChannel6Tracks @@ -53431,7 +53431,7 @@ WRAM0 bank #0: $c240 = wChannel7Octave $c241 = wChannel7Transposition $c242 = wChannel7NoteDuration - $c243 = wChannel7Field16 + $c243 = wChannel7NoteDurationModifier $c245 = wChannel7LoopCount $c246 = wChannel7Tempo $c248 = wChannel7Tracks @@ -53469,7 +53469,7 @@ WRAM0 bank #0: $c272 = wChannel8Octave $c273 = wChannel8Transposition $c274 = wChannel8NoteDuration - $c275 = wChannel8Field16 + $c275 = wChannel8NoteDurationModifier $c277 = wChannel8LoopCount $c278 = wChannel8Tempo $c27a = wChannel8Tracks diff --git a/pokecrystal11.sym b/pokecrystal11.sym index 844e0db0e2..cca5d3e53a 100644 --- a/pokecrystal11.sym +++ b/pokecrystal11.sym @@ -49886,8 +49886,8 @@ 03:a994 sBox10Mon7CaughtGender 03:a995 sBox10Mon7Level 03:a996 sBox10Mon8Species -03:a996 sBox10Mon8 03:a996 sBox10Mon7BoxEnd +03:a996 sBox10Mon8 03:a997 sBox10Mon8Item 03:a998 sBox10Mon8Moves 03:a99c sBox10Mon8ID @@ -52447,7 +52447,7 @@ 00:c114 wChannel1Octave 00:c115 wChannel1Transposition 00:c116 wChannel1NoteDuration -00:c117 wChannel1Field16 +00:c117 wChannel1NoteDurationModifier 00:c119 wChannel1LoopCount 00:c11a wChannel1Tempo 00:c11c wChannel1Tracks @@ -52485,7 +52485,7 @@ 00:c146 wChannel2Octave 00:c147 wChannel2Transposition 00:c148 wChannel2NoteDuration -00:c149 wChannel2Field16 +00:c149 wChannel2NoteDurationModifier 00:c14b wChannel2LoopCount 00:c14c wChannel2Tempo 00:c14e wChannel2Tracks @@ -52523,7 +52523,7 @@ 00:c178 wChannel3Octave 00:c179 wChannel3Transposition 00:c17a wChannel3NoteDuration -00:c17b wChannel3Field16 +00:c17b wChannel3NoteDurationModifier 00:c17d wChannel3LoopCount 00:c17e wChannel3Tempo 00:c180 wChannel3Tracks @@ -52561,7 +52561,7 @@ 00:c1aa wChannel4Octave 00:c1ab wChannel4Transposition 00:c1ac wChannel4NoteDuration -00:c1ad wChannel4Field16 +00:c1ad wChannel4NoteDurationModifier 00:c1af wChannel4LoopCount 00:c1b0 wChannel4Tempo 00:c1b2 wChannel4Tracks @@ -52599,7 +52599,7 @@ 00:c1dc wChannel5Octave 00:c1dd wChannel5Transposition 00:c1de wChannel5NoteDuration -00:c1df wChannel5Field16 +00:c1df wChannel5NoteDurationModifier 00:c1e1 wChannel5LoopCount 00:c1e2 wChannel5Tempo 00:c1e4 wChannel5Tracks @@ -52637,7 +52637,7 @@ 00:c20e wChannel6Octave 00:c20f wChannel6Transposition 00:c210 wChannel6NoteDuration -00:c211 wChannel6Field16 +00:c211 wChannel6NoteDurationModifier 00:c213 wChannel6LoopCount 00:c214 wChannel6Tempo 00:c216 wChannel6Tracks @@ -52675,7 +52675,7 @@ 00:c240 wChannel7Octave 00:c241 wChannel7Transposition 00:c242 wChannel7NoteDuration -00:c243 wChannel7Field16 +00:c243 wChannel7NoteDurationModifier 00:c245 wChannel7LoopCount 00:c246 wChannel7Tempo 00:c248 wChannel7Tracks @@ -52713,7 +52713,7 @@ 00:c272 wChannel8Octave 00:c273 wChannel8Transposition 00:c274 wChannel8NoteDuration -00:c275 wChannel8Field16 +00:c275 wChannel8NoteDurationModifier 00:c277 wChannel8LoopCount 00:c278 wChannel8Tempo 00:c27a wChannel8Tracks diff --git a/pokecrystal11_debug.map b/pokecrystal11_debug.map index 13e984e3a6..65ddfe04c2 100644 --- a/pokecrystal11_debug.map +++ b/pokecrystal11_debug.map @@ -50842,8 +50842,8 @@ SRAM bank #3: $a994 = sBox10Mon7CaughtGender $a995 = sBox10Mon7Level $a996 = sBox10Mon8Species - $a996 = sBox10Mon8 $a996 = sBox10Mon7BoxEnd + $a996 = sBox10Mon8 $a997 = sBox10Mon8Item $a998 = sBox10Mon8Moves $a99c = sBox10Mon8ID @@ -53428,7 +53428,7 @@ WRAM0 bank #0: $c114 = wChannel1Octave $c115 = wChannel1Transposition $c116 = wChannel1NoteDuration - $c117 = wChannel1Field16 + $c117 = wChannel1NoteDurationModifier $c119 = wChannel1LoopCount $c11a = wChannel1Tempo $c11c = wChannel1Tracks @@ -53466,7 +53466,7 @@ WRAM0 bank #0: $c146 = wChannel2Octave $c147 = wChannel2Transposition $c148 = wChannel2NoteDuration - $c149 = wChannel2Field16 + $c149 = wChannel2NoteDurationModifier $c14b = wChannel2LoopCount $c14c = wChannel2Tempo $c14e = wChannel2Tracks @@ -53504,7 +53504,7 @@ WRAM0 bank #0: $c178 = wChannel3Octave $c179 = wChannel3Transposition $c17a = wChannel3NoteDuration - $c17b = wChannel3Field16 + $c17b = wChannel3NoteDurationModifier $c17d = wChannel3LoopCount $c17e = wChannel3Tempo $c180 = wChannel3Tracks @@ -53542,7 +53542,7 @@ WRAM0 bank #0: $c1aa = wChannel4Octave $c1ab = wChannel4Transposition $c1ac = wChannel4NoteDuration - $c1ad = wChannel4Field16 + $c1ad = wChannel4NoteDurationModifier $c1af = wChannel4LoopCount $c1b0 = wChannel4Tempo $c1b2 = wChannel4Tracks @@ -53580,7 +53580,7 @@ WRAM0 bank #0: $c1dc = wChannel5Octave $c1dd = wChannel5Transposition $c1de = wChannel5NoteDuration - $c1df = wChannel5Field16 + $c1df = wChannel5NoteDurationModifier $c1e1 = wChannel5LoopCount $c1e2 = wChannel5Tempo $c1e4 = wChannel5Tracks @@ -53618,7 +53618,7 @@ WRAM0 bank #0: $c20e = wChannel6Octave $c20f = wChannel6Transposition $c210 = wChannel6NoteDuration - $c211 = wChannel6Field16 + $c211 = wChannel6NoteDurationModifier $c213 = wChannel6LoopCount $c214 = wChannel6Tempo $c216 = wChannel6Tracks @@ -53656,7 +53656,7 @@ WRAM0 bank #0: $c240 = wChannel7Octave $c241 = wChannel7Transposition $c242 = wChannel7NoteDuration - $c243 = wChannel7Field16 + $c243 = wChannel7NoteDurationModifier $c245 = wChannel7LoopCount $c246 = wChannel7Tempo $c248 = wChannel7Tracks @@ -53694,7 +53694,7 @@ WRAM0 bank #0: $c272 = wChannel8Octave $c273 = wChannel8Transposition $c274 = wChannel8NoteDuration - $c275 = wChannel8Field16 + $c275 = wChannel8NoteDurationModifier $c277 = wChannel8LoopCount $c278 = wChannel8Tempo $c27a = wChannel8Tracks diff --git a/pokecrystal11_debug.sym b/pokecrystal11_debug.sym index b7b6991afd..762035113d 100644 --- a/pokecrystal11_debug.sym +++ b/pokecrystal11_debug.sym @@ -50111,8 +50111,8 @@ 03:a994 sBox10Mon7CaughtGender 03:a995 sBox10Mon7Level 03:a996 sBox10Mon8Species -03:a996 sBox10Mon8 03:a996 sBox10Mon7BoxEnd +03:a996 sBox10Mon8 03:a997 sBox10Mon8Item 03:a998 sBox10Mon8Moves 03:a99c sBox10Mon8ID @@ -52672,7 +52672,7 @@ 00:c114 wChannel1Octave 00:c115 wChannel1Transposition 00:c116 wChannel1NoteDuration -00:c117 wChannel1Field16 +00:c117 wChannel1NoteDurationModifier 00:c119 wChannel1LoopCount 00:c11a wChannel1Tempo 00:c11c wChannel1Tracks @@ -52710,7 +52710,7 @@ 00:c146 wChannel2Octave 00:c147 wChannel2Transposition 00:c148 wChannel2NoteDuration -00:c149 wChannel2Field16 +00:c149 wChannel2NoteDurationModifier 00:c14b wChannel2LoopCount 00:c14c wChannel2Tempo 00:c14e wChannel2Tracks @@ -52748,7 +52748,7 @@ 00:c178 wChannel3Octave 00:c179 wChannel3Transposition 00:c17a wChannel3NoteDuration -00:c17b wChannel3Field16 +00:c17b wChannel3NoteDurationModifier 00:c17d wChannel3LoopCount 00:c17e wChannel3Tempo 00:c180 wChannel3Tracks @@ -52786,7 +52786,7 @@ 00:c1aa wChannel4Octave 00:c1ab wChannel4Transposition 00:c1ac wChannel4NoteDuration -00:c1ad wChannel4Field16 +00:c1ad wChannel4NoteDurationModifier 00:c1af wChannel4LoopCount 00:c1b0 wChannel4Tempo 00:c1b2 wChannel4Tracks @@ -52824,7 +52824,7 @@ 00:c1dc wChannel5Octave 00:c1dd wChannel5Transposition 00:c1de wChannel5NoteDuration -00:c1df wChannel5Field16 +00:c1df wChannel5NoteDurationModifier 00:c1e1 wChannel5LoopCount 00:c1e2 wChannel5Tempo 00:c1e4 wChannel5Tracks @@ -52862,7 +52862,7 @@ 00:c20e wChannel6Octave 00:c20f wChannel6Transposition 00:c210 wChannel6NoteDuration -00:c211 wChannel6Field16 +00:c211 wChannel6NoteDurationModifier 00:c213 wChannel6LoopCount 00:c214 wChannel6Tempo 00:c216 wChannel6Tracks @@ -52900,7 +52900,7 @@ 00:c240 wChannel7Octave 00:c241 wChannel7Transposition 00:c242 wChannel7NoteDuration -00:c243 wChannel7Field16 +00:c243 wChannel7NoteDurationModifier 00:c245 wChannel7LoopCount 00:c246 wChannel7Tempo 00:c248 wChannel7Tracks @@ -52938,7 +52938,7 @@ 00:c272 wChannel8Octave 00:c273 wChannel8Transposition 00:c274 wChannel8NoteDuration -00:c275 wChannel8Field16 +00:c275 wChannel8NoteDurationModifier 00:c277 wChannel8LoopCount 00:c278 wChannel8Tempo 00:c27a wChannel8Tracks diff --git a/pokecrystal11_vc.map b/pokecrystal11_vc.map index 412a744990..b915634cc6 100644 --- a/pokecrystal11_vc.map +++ b/pokecrystal11_vc.map @@ -50688,8 +50688,8 @@ SRAM bank #3: $a994 = sBox10Mon7CaughtGender $a995 = sBox10Mon7Level $a996 = sBox10Mon8Species - $a996 = sBox10Mon8 $a996 = sBox10Mon7BoxEnd + $a996 = sBox10Mon8 $a997 = sBox10Mon8Item $a998 = sBox10Mon8Moves $a99c = sBox10Mon8ID @@ -53274,7 +53274,7 @@ WRAM0 bank #0: $c114 = wChannel1Octave $c115 = wChannel1Transposition $c116 = wChannel1NoteDuration - $c117 = wChannel1Field16 + $c117 = wChannel1NoteDurationModifier $c119 = wChannel1LoopCount $c11a = wChannel1Tempo $c11c = wChannel1Tracks @@ -53312,7 +53312,7 @@ WRAM0 bank #0: $c146 = wChannel2Octave $c147 = wChannel2Transposition $c148 = wChannel2NoteDuration - $c149 = wChannel2Field16 + $c149 = wChannel2NoteDurationModifier $c14b = wChannel2LoopCount $c14c = wChannel2Tempo $c14e = wChannel2Tracks @@ -53350,7 +53350,7 @@ WRAM0 bank #0: $c178 = wChannel3Octave $c179 = wChannel3Transposition $c17a = wChannel3NoteDuration - $c17b = wChannel3Field16 + $c17b = wChannel3NoteDurationModifier $c17d = wChannel3LoopCount $c17e = wChannel3Tempo $c180 = wChannel3Tracks @@ -53388,7 +53388,7 @@ WRAM0 bank #0: $c1aa = wChannel4Octave $c1ab = wChannel4Transposition $c1ac = wChannel4NoteDuration - $c1ad = wChannel4Field16 + $c1ad = wChannel4NoteDurationModifier $c1af = wChannel4LoopCount $c1b0 = wChannel4Tempo $c1b2 = wChannel4Tracks @@ -53426,7 +53426,7 @@ WRAM0 bank #0: $c1dc = wChannel5Octave $c1dd = wChannel5Transposition $c1de = wChannel5NoteDuration - $c1df = wChannel5Field16 + $c1df = wChannel5NoteDurationModifier $c1e1 = wChannel5LoopCount $c1e2 = wChannel5Tempo $c1e4 = wChannel5Tracks @@ -53464,7 +53464,7 @@ WRAM0 bank #0: $c20e = wChannel6Octave $c20f = wChannel6Transposition $c210 = wChannel6NoteDuration - $c211 = wChannel6Field16 + $c211 = wChannel6NoteDurationModifier $c213 = wChannel6LoopCount $c214 = wChannel6Tempo $c216 = wChannel6Tracks @@ -53502,7 +53502,7 @@ WRAM0 bank #0: $c240 = wChannel7Octave $c241 = wChannel7Transposition $c242 = wChannel7NoteDuration - $c243 = wChannel7Field16 + $c243 = wChannel7NoteDurationModifier $c245 = wChannel7LoopCount $c246 = wChannel7Tempo $c248 = wChannel7Tracks @@ -53540,7 +53540,7 @@ WRAM0 bank #0: $c272 = wChannel8Octave $c273 = wChannel8Transposition $c274 = wChannel8NoteDuration - $c275 = wChannel8Field16 + $c275 = wChannel8NoteDurationModifier $c277 = wChannel8LoopCount $c278 = wChannel8Tempo $c27a = wChannel8Tracks diff --git a/pokecrystal11_vc.sym b/pokecrystal11_vc.sym index 849b521050..5bf96111e0 100644 --- a/pokecrystal11_vc.sym +++ b/pokecrystal11_vc.sym @@ -49957,8 +49957,8 @@ 03:a994 sBox10Mon7CaughtGender 03:a995 sBox10Mon7Level 03:a996 sBox10Mon8Species -03:a996 sBox10Mon8 03:a996 sBox10Mon7BoxEnd +03:a996 sBox10Mon8 03:a997 sBox10Mon8Item 03:a998 sBox10Mon8Moves 03:a99c sBox10Mon8ID @@ -52518,7 +52518,7 @@ 00:c114 wChannel1Octave 00:c115 wChannel1Transposition 00:c116 wChannel1NoteDuration -00:c117 wChannel1Field16 +00:c117 wChannel1NoteDurationModifier 00:c119 wChannel1LoopCount 00:c11a wChannel1Tempo 00:c11c wChannel1Tracks @@ -52556,7 +52556,7 @@ 00:c146 wChannel2Octave 00:c147 wChannel2Transposition 00:c148 wChannel2NoteDuration -00:c149 wChannel2Field16 +00:c149 wChannel2NoteDurationModifier 00:c14b wChannel2LoopCount 00:c14c wChannel2Tempo 00:c14e wChannel2Tracks @@ -52594,7 +52594,7 @@ 00:c178 wChannel3Octave 00:c179 wChannel3Transposition 00:c17a wChannel3NoteDuration -00:c17b wChannel3Field16 +00:c17b wChannel3NoteDurationModifier 00:c17d wChannel3LoopCount 00:c17e wChannel3Tempo 00:c180 wChannel3Tracks @@ -52632,7 +52632,7 @@ 00:c1aa wChannel4Octave 00:c1ab wChannel4Transposition 00:c1ac wChannel4NoteDuration -00:c1ad wChannel4Field16 +00:c1ad wChannel4NoteDurationModifier 00:c1af wChannel4LoopCount 00:c1b0 wChannel4Tempo 00:c1b2 wChannel4Tracks @@ -52670,7 +52670,7 @@ 00:c1dc wChannel5Octave 00:c1dd wChannel5Transposition 00:c1de wChannel5NoteDuration -00:c1df wChannel5Field16 +00:c1df wChannel5NoteDurationModifier 00:c1e1 wChannel5LoopCount 00:c1e2 wChannel5Tempo 00:c1e4 wChannel5Tracks @@ -52708,7 +52708,7 @@ 00:c20e wChannel6Octave 00:c20f wChannel6Transposition 00:c210 wChannel6NoteDuration -00:c211 wChannel6Field16 +00:c211 wChannel6NoteDurationModifier 00:c213 wChannel6LoopCount 00:c214 wChannel6Tempo 00:c216 wChannel6Tracks @@ -52746,7 +52746,7 @@ 00:c240 wChannel7Octave 00:c241 wChannel7Transposition 00:c242 wChannel7NoteDuration -00:c243 wChannel7Field16 +00:c243 wChannel7NoteDurationModifier 00:c245 wChannel7LoopCount 00:c246 wChannel7Tempo 00:c248 wChannel7Tracks @@ -52784,7 +52784,7 @@ 00:c272 wChannel8Octave 00:c273 wChannel8Transposition 00:c274 wChannel8NoteDuration -00:c275 wChannel8Field16 +00:c275 wChannel8NoteDurationModifier 00:c277 wChannel8LoopCount 00:c278 wChannel8Tempo 00:c27a wChannel8Tracks diff --git a/pokecrystal_au.map b/pokecrystal_au.map index 9a09832555..c0903199f6 100644 --- a/pokecrystal_au.map +++ b/pokecrystal_au.map @@ -50617,8 +50617,8 @@ SRAM bank #3: $a994 = sBox10Mon7CaughtGender $a995 = sBox10Mon7Level $a996 = sBox10Mon8Species - $a996 = sBox10Mon8 $a996 = sBox10Mon7BoxEnd + $a996 = sBox10Mon8 $a997 = sBox10Mon8Item $a998 = sBox10Mon8Moves $a99c = sBox10Mon8ID @@ -53203,7 +53203,7 @@ WRAM0 bank #0: $c114 = wChannel1Octave $c115 = wChannel1Transposition $c116 = wChannel1NoteDuration - $c117 = wChannel1Field16 + $c117 = wChannel1NoteDurationModifier $c119 = wChannel1LoopCount $c11a = wChannel1Tempo $c11c = wChannel1Tracks @@ -53241,7 +53241,7 @@ WRAM0 bank #0: $c146 = wChannel2Octave $c147 = wChannel2Transposition $c148 = wChannel2NoteDuration - $c149 = wChannel2Field16 + $c149 = wChannel2NoteDurationModifier $c14b = wChannel2LoopCount $c14c = wChannel2Tempo $c14e = wChannel2Tracks @@ -53279,7 +53279,7 @@ WRAM0 bank #0: $c178 = wChannel3Octave $c179 = wChannel3Transposition $c17a = wChannel3NoteDuration - $c17b = wChannel3Field16 + $c17b = wChannel3NoteDurationModifier $c17d = wChannel3LoopCount $c17e = wChannel3Tempo $c180 = wChannel3Tracks @@ -53317,7 +53317,7 @@ WRAM0 bank #0: $c1aa = wChannel4Octave $c1ab = wChannel4Transposition $c1ac = wChannel4NoteDuration - $c1ad = wChannel4Field16 + $c1ad = wChannel4NoteDurationModifier $c1af = wChannel4LoopCount $c1b0 = wChannel4Tempo $c1b2 = wChannel4Tracks @@ -53355,7 +53355,7 @@ WRAM0 bank #0: $c1dc = wChannel5Octave $c1dd = wChannel5Transposition $c1de = wChannel5NoteDuration - $c1df = wChannel5Field16 + $c1df = wChannel5NoteDurationModifier $c1e1 = wChannel5LoopCount $c1e2 = wChannel5Tempo $c1e4 = wChannel5Tracks @@ -53393,7 +53393,7 @@ WRAM0 bank #0: $c20e = wChannel6Octave $c20f = wChannel6Transposition $c210 = wChannel6NoteDuration - $c211 = wChannel6Field16 + $c211 = wChannel6NoteDurationModifier $c213 = wChannel6LoopCount $c214 = wChannel6Tempo $c216 = wChannel6Tracks @@ -53431,7 +53431,7 @@ WRAM0 bank #0: $c240 = wChannel7Octave $c241 = wChannel7Transposition $c242 = wChannel7NoteDuration - $c243 = wChannel7Field16 + $c243 = wChannel7NoteDurationModifier $c245 = wChannel7LoopCount $c246 = wChannel7Tempo $c248 = wChannel7Tracks @@ -53469,7 +53469,7 @@ WRAM0 bank #0: $c272 = wChannel8Octave $c273 = wChannel8Transposition $c274 = wChannel8NoteDuration - $c275 = wChannel8Field16 + $c275 = wChannel8NoteDurationModifier $c277 = wChannel8LoopCount $c278 = wChannel8Tempo $c27a = wChannel8Tracks diff --git a/pokecrystal_au.sym b/pokecrystal_au.sym index 34ecdbeff2..b684dbd592 100644 --- a/pokecrystal_au.sym +++ b/pokecrystal_au.sym @@ -49886,8 +49886,8 @@ 03:a994 sBox10Mon7CaughtGender 03:a995 sBox10Mon7Level 03:a996 sBox10Mon8Species -03:a996 sBox10Mon8 03:a996 sBox10Mon7BoxEnd +03:a996 sBox10Mon8 03:a997 sBox10Mon8Item 03:a998 sBox10Mon8Moves 03:a99c sBox10Mon8ID @@ -52447,7 +52447,7 @@ 00:c114 wChannel1Octave 00:c115 wChannel1Transposition 00:c116 wChannel1NoteDuration -00:c117 wChannel1Field16 +00:c117 wChannel1NoteDurationModifier 00:c119 wChannel1LoopCount 00:c11a wChannel1Tempo 00:c11c wChannel1Tracks @@ -52485,7 +52485,7 @@ 00:c146 wChannel2Octave 00:c147 wChannel2Transposition 00:c148 wChannel2NoteDuration -00:c149 wChannel2Field16 +00:c149 wChannel2NoteDurationModifier 00:c14b wChannel2LoopCount 00:c14c wChannel2Tempo 00:c14e wChannel2Tracks @@ -52523,7 +52523,7 @@ 00:c178 wChannel3Octave 00:c179 wChannel3Transposition 00:c17a wChannel3NoteDuration -00:c17b wChannel3Field16 +00:c17b wChannel3NoteDurationModifier 00:c17d wChannel3LoopCount 00:c17e wChannel3Tempo 00:c180 wChannel3Tracks @@ -52561,7 +52561,7 @@ 00:c1aa wChannel4Octave 00:c1ab wChannel4Transposition 00:c1ac wChannel4NoteDuration -00:c1ad wChannel4Field16 +00:c1ad wChannel4NoteDurationModifier 00:c1af wChannel4LoopCount 00:c1b0 wChannel4Tempo 00:c1b2 wChannel4Tracks @@ -52599,7 +52599,7 @@ 00:c1dc wChannel5Octave 00:c1dd wChannel5Transposition 00:c1de wChannel5NoteDuration -00:c1df wChannel5Field16 +00:c1df wChannel5NoteDurationModifier 00:c1e1 wChannel5LoopCount 00:c1e2 wChannel5Tempo 00:c1e4 wChannel5Tracks @@ -52637,7 +52637,7 @@ 00:c20e wChannel6Octave 00:c20f wChannel6Transposition 00:c210 wChannel6NoteDuration -00:c211 wChannel6Field16 +00:c211 wChannel6NoteDurationModifier 00:c213 wChannel6LoopCount 00:c214 wChannel6Tempo 00:c216 wChannel6Tracks @@ -52675,7 +52675,7 @@ 00:c240 wChannel7Octave 00:c241 wChannel7Transposition 00:c242 wChannel7NoteDuration -00:c243 wChannel7Field16 +00:c243 wChannel7NoteDurationModifier 00:c245 wChannel7LoopCount 00:c246 wChannel7Tempo 00:c248 wChannel7Tracks @@ -52713,7 +52713,7 @@ 00:c272 wChannel8Octave 00:c273 wChannel8Transposition 00:c274 wChannel8NoteDuration -00:c275 wChannel8Field16 +00:c275 wChannel8NoteDurationModifier 00:c277 wChannel8LoopCount 00:c278 wChannel8Tempo 00:c27a wChannel8Tracks diff --git a/pokecrystal_debug.map b/pokecrystal_debug.map index bcb500a8bd..64a4c1b266 100644 --- a/pokecrystal_debug.map +++ b/pokecrystal_debug.map @@ -50842,8 +50842,8 @@ SRAM bank #3: $a994 = sBox10Mon7CaughtGender $a995 = sBox10Mon7Level $a996 = sBox10Mon8Species - $a996 = sBox10Mon8 $a996 = sBox10Mon7BoxEnd + $a996 = sBox10Mon8 $a997 = sBox10Mon8Item $a998 = sBox10Mon8Moves $a99c = sBox10Mon8ID @@ -53428,7 +53428,7 @@ WRAM0 bank #0: $c114 = wChannel1Octave $c115 = wChannel1Transposition $c116 = wChannel1NoteDuration - $c117 = wChannel1Field16 + $c117 = wChannel1NoteDurationModifier $c119 = wChannel1LoopCount $c11a = wChannel1Tempo $c11c = wChannel1Tracks @@ -53466,7 +53466,7 @@ WRAM0 bank #0: $c146 = wChannel2Octave $c147 = wChannel2Transposition $c148 = wChannel2NoteDuration - $c149 = wChannel2Field16 + $c149 = wChannel2NoteDurationModifier $c14b = wChannel2LoopCount $c14c = wChannel2Tempo $c14e = wChannel2Tracks @@ -53504,7 +53504,7 @@ WRAM0 bank #0: $c178 = wChannel3Octave $c179 = wChannel3Transposition $c17a = wChannel3NoteDuration - $c17b = wChannel3Field16 + $c17b = wChannel3NoteDurationModifier $c17d = wChannel3LoopCount $c17e = wChannel3Tempo $c180 = wChannel3Tracks @@ -53542,7 +53542,7 @@ WRAM0 bank #0: $c1aa = wChannel4Octave $c1ab = wChannel4Transposition $c1ac = wChannel4NoteDuration - $c1ad = wChannel4Field16 + $c1ad = wChannel4NoteDurationModifier $c1af = wChannel4LoopCount $c1b0 = wChannel4Tempo $c1b2 = wChannel4Tracks @@ -53580,7 +53580,7 @@ WRAM0 bank #0: $c1dc = wChannel5Octave $c1dd = wChannel5Transposition $c1de = wChannel5NoteDuration - $c1df = wChannel5Field16 + $c1df = wChannel5NoteDurationModifier $c1e1 = wChannel5LoopCount $c1e2 = wChannel5Tempo $c1e4 = wChannel5Tracks @@ -53618,7 +53618,7 @@ WRAM0 bank #0: $c20e = wChannel6Octave $c20f = wChannel6Transposition $c210 = wChannel6NoteDuration - $c211 = wChannel6Field16 + $c211 = wChannel6NoteDurationModifier $c213 = wChannel6LoopCount $c214 = wChannel6Tempo $c216 = wChannel6Tracks @@ -53656,7 +53656,7 @@ WRAM0 bank #0: $c240 = wChannel7Octave $c241 = wChannel7Transposition $c242 = wChannel7NoteDuration - $c243 = wChannel7Field16 + $c243 = wChannel7NoteDurationModifier $c245 = wChannel7LoopCount $c246 = wChannel7Tempo $c248 = wChannel7Tracks @@ -53694,7 +53694,7 @@ WRAM0 bank #0: $c272 = wChannel8Octave $c273 = wChannel8Transposition $c274 = wChannel8NoteDuration - $c275 = wChannel8Field16 + $c275 = wChannel8NoteDurationModifier $c277 = wChannel8LoopCount $c278 = wChannel8Tempo $c27a = wChannel8Tracks diff --git a/pokecrystal_debug.sym b/pokecrystal_debug.sym index 693ecbdb83..9541ce89f6 100644 --- a/pokecrystal_debug.sym +++ b/pokecrystal_debug.sym @@ -50111,8 +50111,8 @@ 03:a994 sBox10Mon7CaughtGender 03:a995 sBox10Mon7Level 03:a996 sBox10Mon8Species -03:a996 sBox10Mon8 03:a996 sBox10Mon7BoxEnd +03:a996 sBox10Mon8 03:a997 sBox10Mon8Item 03:a998 sBox10Mon8Moves 03:a99c sBox10Mon8ID @@ -52672,7 +52672,7 @@ 00:c114 wChannel1Octave 00:c115 wChannel1Transposition 00:c116 wChannel1NoteDuration -00:c117 wChannel1Field16 +00:c117 wChannel1NoteDurationModifier 00:c119 wChannel1LoopCount 00:c11a wChannel1Tempo 00:c11c wChannel1Tracks @@ -52710,7 +52710,7 @@ 00:c146 wChannel2Octave 00:c147 wChannel2Transposition 00:c148 wChannel2NoteDuration -00:c149 wChannel2Field16 +00:c149 wChannel2NoteDurationModifier 00:c14b wChannel2LoopCount 00:c14c wChannel2Tempo 00:c14e wChannel2Tracks @@ -52748,7 +52748,7 @@ 00:c178 wChannel3Octave 00:c179 wChannel3Transposition 00:c17a wChannel3NoteDuration -00:c17b wChannel3Field16 +00:c17b wChannel3NoteDurationModifier 00:c17d wChannel3LoopCount 00:c17e wChannel3Tempo 00:c180 wChannel3Tracks @@ -52786,7 +52786,7 @@ 00:c1aa wChannel4Octave 00:c1ab wChannel4Transposition 00:c1ac wChannel4NoteDuration -00:c1ad wChannel4Field16 +00:c1ad wChannel4NoteDurationModifier 00:c1af wChannel4LoopCount 00:c1b0 wChannel4Tempo 00:c1b2 wChannel4Tracks @@ -52824,7 +52824,7 @@ 00:c1dc wChannel5Octave 00:c1dd wChannel5Transposition 00:c1de wChannel5NoteDuration -00:c1df wChannel5Field16 +00:c1df wChannel5NoteDurationModifier 00:c1e1 wChannel5LoopCount 00:c1e2 wChannel5Tempo 00:c1e4 wChannel5Tracks @@ -52862,7 +52862,7 @@ 00:c20e wChannel6Octave 00:c20f wChannel6Transposition 00:c210 wChannel6NoteDuration -00:c211 wChannel6Field16 +00:c211 wChannel6NoteDurationModifier 00:c213 wChannel6LoopCount 00:c214 wChannel6Tempo 00:c216 wChannel6Tracks @@ -52900,7 +52900,7 @@ 00:c240 wChannel7Octave 00:c241 wChannel7Transposition 00:c242 wChannel7NoteDuration -00:c243 wChannel7Field16 +00:c243 wChannel7NoteDurationModifier 00:c245 wChannel7LoopCount 00:c246 wChannel7Tempo 00:c248 wChannel7Tracks @@ -52938,7 +52938,7 @@ 00:c272 wChannel8Octave 00:c273 wChannel8Transposition 00:c274 wChannel8NoteDuration -00:c275 wChannel8Field16 +00:c275 wChannel8NoteDurationModifier 00:c277 wChannel8LoopCount 00:c278 wChannel8Tempo 00:c27a wChannel8Tracks