From 777a408455a8c71161b1ddc0ed48456fbebdb2a0 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 2 Dec 2024 17:17:48 +0000 Subject: [PATCH] Bit 7 of wJumptableIndex is often JUMPTABLE_EXIT_F --- pokecrystal.map | 4 ++-- pokecrystal.sym | 4 ++-- pokecrystal11.map | 4 ++-- pokecrystal11.sym | 4 ++-- pokecrystal11_debug.map | 4 ++-- pokecrystal11_debug.sym | 4 ++-- pokecrystal11_vc.map | 4 ++-- pokecrystal11_vc.sym | 4 ++-- pokecrystal_au.map | 4 ++-- pokecrystal_au.sym | 4 ++-- pokecrystal_debug.map | 4 ++-- pokecrystal_debug.sym | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pokecrystal.map b/pokecrystal.map index 202fa6b66..ab2d414dd 100644 --- a/pokecrystal.map +++ b/pokecrystal.map @@ -47471,9 +47471,9 @@ SRAM bank #2: $ad64 = sBox4Mon3CaughtGender $ad64 = sBox4Mon3CaughtLocation $ad65 = sBox4Mon3Level + $ad66 = sBox4Mon4 $ad66 = sBox4Mon3BoxEnd $ad66 = sBox4Mon4Species - $ad66 = sBox4Mon4 $ad67 = sBox4Mon4Item $ad68 = sBox4Mon4Moves $ad6c = sBox4Mon4ID @@ -54020,7 +54020,6 @@ WRAM0 bank #0: SECTION: $c608-$c7e7 ($01e0 bytes) ["Miscellaneous"] $c608 = wOddEggSpecies $c608 = wBattle - $c608 = wBoxPartialData $c608 = wTimeSetBuffer $c608 = wHallOfFameTemp $c608 = wBT_OTTempName @@ -54028,6 +54027,7 @@ WRAM0 bank #0: $c608 = wUnknownGender $c608 = wDebugLightColor $c608 = wHallOfFameTempWinCount + $c608 = wBoxPartialData $c608 = wMobileMonSender $c608 = wBT_OTTemp $c608 = wEnemyMoveStruct diff --git a/pokecrystal.sym b/pokecrystal.sym index 6deaddc96..cb1cf364b 100644 --- a/pokecrystal.sym +++ b/pokecrystal.sym @@ -46745,9 +46745,9 @@ 02:ad64 sBox4Mon3CaughtGender 02:ad64 sBox4Mon3CaughtLocation 02:ad65 sBox4Mon3Level +02:ad66 sBox4Mon4 02:ad66 sBox4Mon3BoxEnd 02:ad66 sBox4Mon4Species -02:ad66 sBox4Mon4 02:ad67 sBox4Mon4Item 02:ad68 sBox4Mon4Moves 02:ad6c sBox4Mon4ID @@ -53258,7 +53258,6 @@ 00:c608 wTilemapEnd 00:c608 wOddEggSpecies 00:c608 wBattle -00:c608 wBoxPartialData 00:c608 wTimeSetBuffer 00:c608 wHallOfFameTemp 00:c608 wBT_OTTempName @@ -53266,6 +53265,7 @@ 00:c608 wUnknownGender 00:c608 wDebugLightColor 00:c608 wHallOfFameTempWinCount +00:c608 wBoxPartialData 00:c608 wMobileMonSender 00:c608 wBT_OTTemp 00:c608 wEnemyMoveStruct diff --git a/pokecrystal11.map b/pokecrystal11.map index b9bb8bf65..790b327ff 100644 --- a/pokecrystal11.map +++ b/pokecrystal11.map @@ -47471,9 +47471,9 @@ SRAM bank #2: $ad64 = sBox4Mon3CaughtGender $ad64 = sBox4Mon3CaughtLocation $ad65 = sBox4Mon3Level + $ad66 = sBox4Mon4 $ad66 = sBox4Mon3BoxEnd $ad66 = sBox4Mon4Species - $ad66 = sBox4Mon4 $ad67 = sBox4Mon4Item $ad68 = sBox4Mon4Moves $ad6c = sBox4Mon4ID @@ -54020,7 +54020,6 @@ WRAM0 bank #0: SECTION: $c608-$c7e7 ($01e0 bytes) ["Miscellaneous"] $c608 = wOddEggSpecies $c608 = wBattle - $c608 = wBoxPartialData $c608 = wTimeSetBuffer $c608 = wHallOfFameTemp $c608 = wBT_OTTempName @@ -54028,6 +54027,7 @@ WRAM0 bank #0: $c608 = wUnknownGender $c608 = wDebugLightColor $c608 = wHallOfFameTempWinCount + $c608 = wBoxPartialData $c608 = wMobileMonSender $c608 = wBT_OTTemp $c608 = wEnemyMoveStruct diff --git a/pokecrystal11.sym b/pokecrystal11.sym index fdbaff86d..8cde0c843 100644 --- a/pokecrystal11.sym +++ b/pokecrystal11.sym @@ -46745,9 +46745,9 @@ 02:ad64 sBox4Mon3CaughtGender 02:ad64 sBox4Mon3CaughtLocation 02:ad65 sBox4Mon3Level +02:ad66 sBox4Mon4 02:ad66 sBox4Mon3BoxEnd 02:ad66 sBox4Mon4Species -02:ad66 sBox4Mon4 02:ad67 sBox4Mon4Item 02:ad68 sBox4Mon4Moves 02:ad6c sBox4Mon4ID @@ -53258,7 +53258,6 @@ 00:c608 wTilemapEnd 00:c608 wOddEggSpecies 00:c608 wBattle -00:c608 wBoxPartialData 00:c608 wTimeSetBuffer 00:c608 wHallOfFameTemp 00:c608 wBT_OTTempName @@ -53266,6 +53265,7 @@ 00:c608 wUnknownGender 00:c608 wDebugLightColor 00:c608 wHallOfFameTempWinCount +00:c608 wBoxPartialData 00:c608 wMobileMonSender 00:c608 wBT_OTTemp 00:c608 wEnemyMoveStruct diff --git a/pokecrystal11_debug.map b/pokecrystal11_debug.map index a8c8e4d96..cc800f800 100644 --- a/pokecrystal11_debug.map +++ b/pokecrystal11_debug.map @@ -47644,9 +47644,9 @@ SRAM bank #2: $ad1d = sBox4Mon1PP $ad21 = sBox4Mon1Happiness $ad22 = sBox4Mon1PokerusStatus - $ad23 = sBox4Mon1CaughtData $ad23 = sBox4Mon1CaughtTime $ad23 = sBox4Mon1CaughtLevel + $ad23 = sBox4Mon1CaughtData $ad24 = sBox4Mon1CaughtLocation $ad24 = sBox4Mon1CaughtGender $ad25 = sBox4Mon1Level @@ -54245,7 +54245,6 @@ WRAM0 bank #0: SECTION: $c608-$c7e7 ($01e0 bytes) ["Miscellaneous"] $c608 = wOddEggSpecies $c608 = wBattle - $c608 = wBoxPartialData $c608 = wTimeSetBuffer $c608 = wHallOfFameTemp $c608 = wBT_OTTempName @@ -54253,6 +54252,7 @@ WRAM0 bank #0: $c608 = wUnknownGender $c608 = wDebugLightColor $c608 = wHallOfFameTempWinCount + $c608 = wBoxPartialData $c608 = wMobileMonSender $c608 = wBT_OTTemp $c608 = wEnemyMoveStruct diff --git a/pokecrystal11_debug.sym b/pokecrystal11_debug.sym index f6ec577c1..493a583a0 100644 --- a/pokecrystal11_debug.sym +++ b/pokecrystal11_debug.sym @@ -46918,9 +46918,9 @@ 02:ad1d sBox4Mon1PP 02:ad21 sBox4Mon1Happiness 02:ad22 sBox4Mon1PokerusStatus -02:ad23 sBox4Mon1CaughtData 02:ad23 sBox4Mon1CaughtTime 02:ad23 sBox4Mon1CaughtLevel +02:ad23 sBox4Mon1CaughtData 02:ad24 sBox4Mon1CaughtLocation 02:ad24 sBox4Mon1CaughtGender 02:ad25 sBox4Mon1Level @@ -53483,7 +53483,6 @@ 00:c608 wTilemapEnd 00:c608 wOddEggSpecies 00:c608 wBattle -00:c608 wBoxPartialData 00:c608 wTimeSetBuffer 00:c608 wHallOfFameTemp 00:c608 wBT_OTTempName @@ -53491,6 +53490,7 @@ 00:c608 wUnknownGender 00:c608 wDebugLightColor 00:c608 wHallOfFameTempWinCount +00:c608 wBoxPartialData 00:c608 wMobileMonSender 00:c608 wBT_OTTemp 00:c608 wEnemyMoveStruct diff --git a/pokecrystal11_vc.map b/pokecrystal11_vc.map index ba59630a7..852eeb8eb 100644 --- a/pokecrystal11_vc.map +++ b/pokecrystal11_vc.map @@ -47542,9 +47542,9 @@ SRAM bank #2: $ad64 = sBox4Mon3CaughtGender $ad64 = sBox4Mon3CaughtLocation $ad65 = sBox4Mon3Level + $ad66 = sBox4Mon4 $ad66 = sBox4Mon3BoxEnd $ad66 = sBox4Mon4Species - $ad66 = sBox4Mon4 $ad67 = sBox4Mon4Item $ad68 = sBox4Mon4Moves $ad6c = sBox4Mon4ID @@ -54091,7 +54091,6 @@ WRAM0 bank #0: SECTION: $c608-$c7e7 ($01e0 bytes) ["Miscellaneous"] $c608 = wOddEggSpecies $c608 = wBattle - $c608 = wBoxPartialData $c608 = wTimeSetBuffer $c608 = wHallOfFameTemp $c608 = wBT_OTTempName @@ -54099,6 +54098,7 @@ WRAM0 bank #0: $c608 = wUnknownGender $c608 = wDebugLightColor $c608 = wHallOfFameTempWinCount + $c608 = wBoxPartialData $c608 = wMobileMonSender $c608 = wBT_OTTemp $c608 = wEnemyMoveStruct diff --git a/pokecrystal11_vc.sym b/pokecrystal11_vc.sym index 283c5810d..4c631b59c 100644 --- a/pokecrystal11_vc.sym +++ b/pokecrystal11_vc.sym @@ -46816,9 +46816,9 @@ 02:ad64 sBox4Mon3CaughtGender 02:ad64 sBox4Mon3CaughtLocation 02:ad65 sBox4Mon3Level +02:ad66 sBox4Mon4 02:ad66 sBox4Mon3BoxEnd 02:ad66 sBox4Mon4Species -02:ad66 sBox4Mon4 02:ad67 sBox4Mon4Item 02:ad68 sBox4Mon4Moves 02:ad6c sBox4Mon4ID @@ -53329,7 +53329,6 @@ 00:c608 wTilemapEnd 00:c608 wOddEggSpecies 00:c608 wBattle -00:c608 wBoxPartialData 00:c608 wTimeSetBuffer 00:c608 wHallOfFameTemp 00:c608 wBT_OTTempName @@ -53337,6 +53336,7 @@ 00:c608 wUnknownGender 00:c608 wDebugLightColor 00:c608 wHallOfFameTempWinCount +00:c608 wBoxPartialData 00:c608 wMobileMonSender 00:c608 wBT_OTTemp 00:c608 wEnemyMoveStruct diff --git a/pokecrystal_au.map b/pokecrystal_au.map index 38020ad53..eb824ea88 100644 --- a/pokecrystal_au.map +++ b/pokecrystal_au.map @@ -47471,9 +47471,9 @@ SRAM bank #2: $ad64 = sBox4Mon3CaughtGender $ad64 = sBox4Mon3CaughtLocation $ad65 = sBox4Mon3Level + $ad66 = sBox4Mon4 $ad66 = sBox4Mon3BoxEnd $ad66 = sBox4Mon4Species - $ad66 = sBox4Mon4 $ad67 = sBox4Mon4Item $ad68 = sBox4Mon4Moves $ad6c = sBox4Mon4ID @@ -54020,7 +54020,6 @@ WRAM0 bank #0: SECTION: $c608-$c7e7 ($01e0 bytes) ["Miscellaneous"] $c608 = wOddEggSpecies $c608 = wBattle - $c608 = wBoxPartialData $c608 = wTimeSetBuffer $c608 = wHallOfFameTemp $c608 = wBT_OTTempName @@ -54028,6 +54027,7 @@ WRAM0 bank #0: $c608 = wUnknownGender $c608 = wDebugLightColor $c608 = wHallOfFameTempWinCount + $c608 = wBoxPartialData $c608 = wMobileMonSender $c608 = wBT_OTTemp $c608 = wEnemyMoveStruct diff --git a/pokecrystal_au.sym b/pokecrystal_au.sym index 15cd071bf..b91994da5 100644 --- a/pokecrystal_au.sym +++ b/pokecrystal_au.sym @@ -46745,9 +46745,9 @@ 02:ad64 sBox4Mon3CaughtGender 02:ad64 sBox4Mon3CaughtLocation 02:ad65 sBox4Mon3Level +02:ad66 sBox4Mon4 02:ad66 sBox4Mon3BoxEnd 02:ad66 sBox4Mon4Species -02:ad66 sBox4Mon4 02:ad67 sBox4Mon4Item 02:ad68 sBox4Mon4Moves 02:ad6c sBox4Mon4ID @@ -53258,7 +53258,6 @@ 00:c608 wTilemapEnd 00:c608 wOddEggSpecies 00:c608 wBattle -00:c608 wBoxPartialData 00:c608 wTimeSetBuffer 00:c608 wHallOfFameTemp 00:c608 wBT_OTTempName @@ -53266,6 +53265,7 @@ 00:c608 wUnknownGender 00:c608 wDebugLightColor 00:c608 wHallOfFameTempWinCount +00:c608 wBoxPartialData 00:c608 wMobileMonSender 00:c608 wBT_OTTemp 00:c608 wEnemyMoveStruct diff --git a/pokecrystal_debug.map b/pokecrystal_debug.map index 6fd9ded67..9bbd601f0 100644 --- a/pokecrystal_debug.map +++ b/pokecrystal_debug.map @@ -47644,9 +47644,9 @@ SRAM bank #2: $ad1d = sBox4Mon1PP $ad21 = sBox4Mon1Happiness $ad22 = sBox4Mon1PokerusStatus + $ad23 = sBox4Mon1CaughtLevel $ad23 = sBox4Mon1CaughtData $ad23 = sBox4Mon1CaughtTime - $ad23 = sBox4Mon1CaughtLevel $ad24 = sBox4Mon1CaughtLocation $ad24 = sBox4Mon1CaughtGender $ad25 = sBox4Mon1Level @@ -54245,7 +54245,6 @@ WRAM0 bank #0: SECTION: $c608-$c7e7 ($01e0 bytes) ["Miscellaneous"] $c608 = wOddEggSpecies $c608 = wBattle - $c608 = wBoxPartialData $c608 = wTimeSetBuffer $c608 = wHallOfFameTemp $c608 = wBT_OTTempName @@ -54253,6 +54252,7 @@ WRAM0 bank #0: $c608 = wUnknownGender $c608 = wDebugLightColor $c608 = wHallOfFameTempWinCount + $c608 = wBoxPartialData $c608 = wMobileMonSender $c608 = wBT_OTTemp $c608 = wEnemyMoveStruct diff --git a/pokecrystal_debug.sym b/pokecrystal_debug.sym index 1a5766d6f..8fb1ccde0 100644 --- a/pokecrystal_debug.sym +++ b/pokecrystal_debug.sym @@ -46918,9 +46918,9 @@ 02:ad1d sBox4Mon1PP 02:ad21 sBox4Mon1Happiness 02:ad22 sBox4Mon1PokerusStatus +02:ad23 sBox4Mon1CaughtLevel 02:ad23 sBox4Mon1CaughtData 02:ad23 sBox4Mon1CaughtTime -02:ad23 sBox4Mon1CaughtLevel 02:ad24 sBox4Mon1CaughtLocation 02:ad24 sBox4Mon1CaughtGender 02:ad25 sBox4Mon1Level @@ -53483,7 +53483,6 @@ 00:c608 wTilemapEnd 00:c608 wOddEggSpecies 00:c608 wBattle -00:c608 wBoxPartialData 00:c608 wTimeSetBuffer 00:c608 wHallOfFameTemp 00:c608 wBT_OTTempName @@ -53491,6 +53490,7 @@ 00:c608 wUnknownGender 00:c608 wDebugLightColor 00:c608 wHallOfFameTempWinCount +00:c608 wBoxPartialData 00:c608 wMobileMonSender 00:c608 wBT_OTTemp 00:c608 wEnemyMoveStruct