From 64b893589dd2f27f7fcd62dc028eda6315ccc2d6 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 8 Jun 2026 17:34:46 +0000 Subject: [PATCH] Add some comments/constants, minor fixes (#1255) --- pokecrystal.map | 12 ++++++------ pokecrystal.sym | 12 ++++++------ pokecrystal11.map | 12 ++++++------ pokecrystal11.sym | 12 ++++++------ pokecrystal11_debug.map | 12 ++++++------ pokecrystal11_debug.sym | 12 ++++++------ pokecrystal11_vc.map | 12 ++++++------ pokecrystal11_vc.sym | 12 ++++++------ pokecrystal_au.map | 12 ++++++------ pokecrystal_au.sym | 12 ++++++------ pokecrystal_debug.map | 12 ++++++------ pokecrystal_debug.sym | 12 ++++++------ 12 files changed, 72 insertions(+), 72 deletions(-) diff --git a/pokecrystal.map b/pokecrystal.map index e33390e80..ccaae4492 100644 --- a/pokecrystal.map +++ b/pokecrystal.map @@ -17370,11 +17370,11 @@ ROMX bank #35: $426d = DoBattleTransition.InitGFX $4288 = DoBattleTransition.mobile $428b = DoBattleTransition.resume - $42a0 = DoBattleTransition.NonMobile_LoadPokeballTiles - $42aa = LoadTrainerBattlePokeballTiles - $42cf = ConvertTrainerBattlePokeballTilesTo2bpp - $42dd = ConvertTrainerBattlePokeballTilesTo2bpp.loop - $42f4 = TrainerBattlePokeballTiles + $42a0 = DoBattleTransition.NonMobile_LoadBattleTransitionTiles + $42aa = LoadBattleTransitionGFX + $42cf = InitBattleTransitionBGMap + $42dd = InitBattleTransitionBGMap.loop + $42f4 = BattleTransitionTiles $4314 = BattleTransitionJumptable $4323 = BattleTransitionJumptable.Jumptable $4365 = StartTrainerBattle_DetermineWhichAnimation @@ -38220,7 +38220,7 @@ ROMX bank #100: $409b = MahoganyTownRagecandybarSign $409e = MahoganyGymSign $40a1 = MahoganyTownPokecenterSign - $40a4 = MahoganyTownCollideDownFaceLeftMovement + $40a4 = MahoganyTownMartSign $40a7 = MahoganyTownPlayerStepLeftMovement $40a9 = MahoganyTownRageCandyBarMerchantBlocksYouMovement $40ad = MahoganyTownRageCandyBarMerchantReturnsMovement diff --git a/pokecrystal.sym b/pokecrystal.sym index 8732f4168..66189a805 100644 --- a/pokecrystal.sym +++ b/pokecrystal.sym @@ -17151,11 +17151,11 @@ 23:426d DoBattleTransition.InitGFX 23:4288 DoBattleTransition.mobile 23:428b DoBattleTransition.resume -23:42a0 DoBattleTransition.NonMobile_LoadPokeballTiles -23:42aa LoadTrainerBattlePokeballTiles -23:42cf ConvertTrainerBattlePokeballTilesTo2bpp -23:42dd ConvertTrainerBattlePokeballTilesTo2bpp.loop -23:42f4 TrainerBattlePokeballTiles +23:42a0 DoBattleTransition.NonMobile_LoadBattleTransitionTiles +23:42aa LoadBattleTransitionGFX +23:42cf InitBattleTransitionBGMap +23:42dd InitBattleTransitionBGMap.loop +23:42f4 BattleTransitionTiles 23:4314 BattleTransitionJumptable 23:4323 BattleTransitionJumptable.Jumptable 23:4365 StartTrainerBattle_DetermineWhichAnimation @@ -37659,7 +37659,7 @@ 64:409b MahoganyTownRagecandybarSign 64:409e MahoganyGymSign 64:40a1 MahoganyTownPokecenterSign -64:40a4 MahoganyTownCollideDownFaceLeftMovement +64:40a4 MahoganyTownMartSign 64:40a7 MahoganyTownPlayerStepLeftMovement 64:40a9 MahoganyTownRageCandyBarMerchantBlocksYouMovement 64:40ad MahoganyTownRageCandyBarMerchantReturnsMovement diff --git a/pokecrystal11.map b/pokecrystal11.map index a88d02154..d795e7218 100644 --- a/pokecrystal11.map +++ b/pokecrystal11.map @@ -17370,11 +17370,11 @@ ROMX bank #35: $426d = DoBattleTransition.InitGFX $4288 = DoBattleTransition.mobile $428b = DoBattleTransition.resume - $42a0 = DoBattleTransition.NonMobile_LoadPokeballTiles - $42aa = LoadTrainerBattlePokeballTiles - $42cf = ConvertTrainerBattlePokeballTilesTo2bpp - $42dd = ConvertTrainerBattlePokeballTilesTo2bpp.loop - $42f4 = TrainerBattlePokeballTiles + $42a0 = DoBattleTransition.NonMobile_LoadBattleTransitionTiles + $42aa = LoadBattleTransitionGFX + $42cf = InitBattleTransitionBGMap + $42dd = InitBattleTransitionBGMap.loop + $42f4 = BattleTransitionTiles $4314 = BattleTransitionJumptable $4323 = BattleTransitionJumptable.Jumptable $4365 = StartTrainerBattle_DetermineWhichAnimation @@ -38220,7 +38220,7 @@ ROMX bank #100: $409b = MahoganyTownRagecandybarSign $409e = MahoganyGymSign $40a1 = MahoganyTownPokecenterSign - $40a4 = MahoganyTownCollideDownFaceLeftMovement + $40a4 = MahoganyTownMartSign $40a7 = MahoganyTownPlayerStepLeftMovement $40a9 = MahoganyTownRageCandyBarMerchantBlocksYouMovement $40ad = MahoganyTownRageCandyBarMerchantReturnsMovement diff --git a/pokecrystal11.sym b/pokecrystal11.sym index 54db23644..7b36994d3 100644 --- a/pokecrystal11.sym +++ b/pokecrystal11.sym @@ -17151,11 +17151,11 @@ 23:426d DoBattleTransition.InitGFX 23:4288 DoBattleTransition.mobile 23:428b DoBattleTransition.resume -23:42a0 DoBattleTransition.NonMobile_LoadPokeballTiles -23:42aa LoadTrainerBattlePokeballTiles -23:42cf ConvertTrainerBattlePokeballTilesTo2bpp -23:42dd ConvertTrainerBattlePokeballTilesTo2bpp.loop -23:42f4 TrainerBattlePokeballTiles +23:42a0 DoBattleTransition.NonMobile_LoadBattleTransitionTiles +23:42aa LoadBattleTransitionGFX +23:42cf InitBattleTransitionBGMap +23:42dd InitBattleTransitionBGMap.loop +23:42f4 BattleTransitionTiles 23:4314 BattleTransitionJumptable 23:4323 BattleTransitionJumptable.Jumptable 23:4365 StartTrainerBattle_DetermineWhichAnimation @@ -37659,7 +37659,7 @@ 64:409b MahoganyTownRagecandybarSign 64:409e MahoganyGymSign 64:40a1 MahoganyTownPokecenterSign -64:40a4 MahoganyTownCollideDownFaceLeftMovement +64:40a4 MahoganyTownMartSign 64:40a7 MahoganyTownPlayerStepLeftMovement 64:40a9 MahoganyTownRageCandyBarMerchantBlocksYouMovement 64:40ad MahoganyTownRageCandyBarMerchantReturnsMovement diff --git a/pokecrystal11_debug.map b/pokecrystal11_debug.map index d490663d7..37491a4f8 100644 --- a/pokecrystal11_debug.map +++ b/pokecrystal11_debug.map @@ -17382,11 +17382,11 @@ ROMX bank #35: $426d = DoBattleTransition.InitGFX $4288 = DoBattleTransition.mobile $428b = DoBattleTransition.resume - $42a0 = DoBattleTransition.NonMobile_LoadPokeballTiles - $42aa = LoadTrainerBattlePokeballTiles - $42cf = ConvertTrainerBattlePokeballTilesTo2bpp - $42dd = ConvertTrainerBattlePokeballTilesTo2bpp.loop - $42f4 = TrainerBattlePokeballTiles + $42a0 = DoBattleTransition.NonMobile_LoadBattleTransitionTiles + $42aa = LoadBattleTransitionGFX + $42cf = InitBattleTransitionBGMap + $42dd = InitBattleTransitionBGMap.loop + $42f4 = BattleTransitionTiles $4314 = BattleTransitionJumptable $4323 = BattleTransitionJumptable.Jumptable $4365 = StartTrainerBattle_DetermineWhichAnimation @@ -38232,7 +38232,7 @@ ROMX bank #100: $409b = MahoganyTownRagecandybarSign $409e = MahoganyGymSign $40a1 = MahoganyTownPokecenterSign - $40a4 = MahoganyTownCollideDownFaceLeftMovement + $40a4 = MahoganyTownMartSign $40a7 = MahoganyTownPlayerStepLeftMovement $40a9 = MahoganyTownRageCandyBarMerchantBlocksYouMovement $40ad = MahoganyTownRageCandyBarMerchantReturnsMovement diff --git a/pokecrystal11_debug.sym b/pokecrystal11_debug.sym index 5ca3f0f09..4d28b10ac 100644 --- a/pokecrystal11_debug.sym +++ b/pokecrystal11_debug.sym @@ -17163,11 +17163,11 @@ 23:426d DoBattleTransition.InitGFX 23:4288 DoBattleTransition.mobile 23:428b DoBattleTransition.resume -23:42a0 DoBattleTransition.NonMobile_LoadPokeballTiles -23:42aa LoadTrainerBattlePokeballTiles -23:42cf ConvertTrainerBattlePokeballTilesTo2bpp -23:42dd ConvertTrainerBattlePokeballTilesTo2bpp.loop -23:42f4 TrainerBattlePokeballTiles +23:42a0 DoBattleTransition.NonMobile_LoadBattleTransitionTiles +23:42aa LoadBattleTransitionGFX +23:42cf InitBattleTransitionBGMap +23:42dd InitBattleTransitionBGMap.loop +23:42f4 BattleTransitionTiles 23:4314 BattleTransitionJumptable 23:4323 BattleTransitionJumptable.Jumptable 23:4365 StartTrainerBattle_DetermineWhichAnimation @@ -37671,7 +37671,7 @@ 64:409b MahoganyTownRagecandybarSign 64:409e MahoganyGymSign 64:40a1 MahoganyTownPokecenterSign -64:40a4 MahoganyTownCollideDownFaceLeftMovement +64:40a4 MahoganyTownMartSign 64:40a7 MahoganyTownPlayerStepLeftMovement 64:40a9 MahoganyTownRageCandyBarMerchantBlocksYouMovement 64:40ad MahoganyTownRageCandyBarMerchantReturnsMovement diff --git a/pokecrystal11_vc.map b/pokecrystal11_vc.map index 4f78ec689..7c808c8d2 100644 --- a/pokecrystal11_vc.map +++ b/pokecrystal11_vc.map @@ -17415,11 +17415,11 @@ ROMX bank #35: $426d = DoBattleTransition.InitGFX $4288 = DoBattleTransition.mobile $428b = DoBattleTransition.resume - $42a0 = DoBattleTransition.NonMobile_LoadPokeballTiles - $42aa = LoadTrainerBattlePokeballTiles - $42cf = ConvertTrainerBattlePokeballTilesTo2bpp - $42dd = ConvertTrainerBattlePokeballTilesTo2bpp.loop - $42f4 = TrainerBattlePokeballTiles + $42a0 = DoBattleTransition.NonMobile_LoadBattleTransitionTiles + $42aa = LoadBattleTransitionGFX + $42cf = InitBattleTransitionBGMap + $42dd = InitBattleTransitionBGMap.loop + $42f4 = BattleTransitionTiles $4314 = BattleTransitionJumptable $4323 = BattleTransitionJumptable.Jumptable $4365 = StartTrainerBattle_DetermineWhichAnimation @@ -38291,7 +38291,7 @@ ROMX bank #100: $409b = MahoganyTownRagecandybarSign $409e = MahoganyGymSign $40a1 = MahoganyTownPokecenterSign - $40a4 = MahoganyTownCollideDownFaceLeftMovement + $40a4 = MahoganyTownMartSign $40a7 = MahoganyTownPlayerStepLeftMovement $40a9 = MahoganyTownRageCandyBarMerchantBlocksYouMovement $40ad = MahoganyTownRageCandyBarMerchantReturnsMovement diff --git a/pokecrystal11_vc.sym b/pokecrystal11_vc.sym index 17a249e9e..caba7086a 100644 --- a/pokecrystal11_vc.sym +++ b/pokecrystal11_vc.sym @@ -17196,11 +17196,11 @@ 23:426d DoBattleTransition.InitGFX 23:4288 DoBattleTransition.mobile 23:428b DoBattleTransition.resume -23:42a0 DoBattleTransition.NonMobile_LoadPokeballTiles -23:42aa LoadTrainerBattlePokeballTiles -23:42cf ConvertTrainerBattlePokeballTilesTo2bpp -23:42dd ConvertTrainerBattlePokeballTilesTo2bpp.loop -23:42f4 TrainerBattlePokeballTiles +23:42a0 DoBattleTransition.NonMobile_LoadBattleTransitionTiles +23:42aa LoadBattleTransitionGFX +23:42cf InitBattleTransitionBGMap +23:42dd InitBattleTransitionBGMap.loop +23:42f4 BattleTransitionTiles 23:4314 BattleTransitionJumptable 23:4323 BattleTransitionJumptable.Jumptable 23:4365 StartTrainerBattle_DetermineWhichAnimation @@ -37730,7 +37730,7 @@ 64:409b MahoganyTownRagecandybarSign 64:409e MahoganyGymSign 64:40a1 MahoganyTownPokecenterSign -64:40a4 MahoganyTownCollideDownFaceLeftMovement +64:40a4 MahoganyTownMartSign 64:40a7 MahoganyTownPlayerStepLeftMovement 64:40a9 MahoganyTownRageCandyBarMerchantBlocksYouMovement 64:40ad MahoganyTownRageCandyBarMerchantReturnsMovement diff --git a/pokecrystal_au.map b/pokecrystal_au.map index e5623d6c9..3b6054958 100644 --- a/pokecrystal_au.map +++ b/pokecrystal_au.map @@ -17370,11 +17370,11 @@ ROMX bank #35: $426d = DoBattleTransition.InitGFX $4288 = DoBattleTransition.mobile $428b = DoBattleTransition.resume - $42a0 = DoBattleTransition.NonMobile_LoadPokeballTiles - $42aa = LoadTrainerBattlePokeballTiles - $42cf = ConvertTrainerBattlePokeballTilesTo2bpp - $42dd = ConvertTrainerBattlePokeballTilesTo2bpp.loop - $42f4 = TrainerBattlePokeballTiles + $42a0 = DoBattleTransition.NonMobile_LoadBattleTransitionTiles + $42aa = LoadBattleTransitionGFX + $42cf = InitBattleTransitionBGMap + $42dd = InitBattleTransitionBGMap.loop + $42f4 = BattleTransitionTiles $4314 = BattleTransitionJumptable $4323 = BattleTransitionJumptable.Jumptable $4365 = StartTrainerBattle_DetermineWhichAnimation @@ -38220,7 +38220,7 @@ ROMX bank #100: $409b = MahoganyTownRagecandybarSign $409e = MahoganyGymSign $40a1 = MahoganyTownPokecenterSign - $40a4 = MahoganyTownCollideDownFaceLeftMovement + $40a4 = MahoganyTownMartSign $40a7 = MahoganyTownPlayerStepLeftMovement $40a9 = MahoganyTownRageCandyBarMerchantBlocksYouMovement $40ad = MahoganyTownRageCandyBarMerchantReturnsMovement diff --git a/pokecrystal_au.sym b/pokecrystal_au.sym index 2d30d6437..4c7209d28 100644 --- a/pokecrystal_au.sym +++ b/pokecrystal_au.sym @@ -17151,11 +17151,11 @@ 23:426d DoBattleTransition.InitGFX 23:4288 DoBattleTransition.mobile 23:428b DoBattleTransition.resume -23:42a0 DoBattleTransition.NonMobile_LoadPokeballTiles -23:42aa LoadTrainerBattlePokeballTiles -23:42cf ConvertTrainerBattlePokeballTilesTo2bpp -23:42dd ConvertTrainerBattlePokeballTilesTo2bpp.loop -23:42f4 TrainerBattlePokeballTiles +23:42a0 DoBattleTransition.NonMobile_LoadBattleTransitionTiles +23:42aa LoadBattleTransitionGFX +23:42cf InitBattleTransitionBGMap +23:42dd InitBattleTransitionBGMap.loop +23:42f4 BattleTransitionTiles 23:4314 BattleTransitionJumptable 23:4323 BattleTransitionJumptable.Jumptable 23:4365 StartTrainerBattle_DetermineWhichAnimation @@ -37659,7 +37659,7 @@ 64:409b MahoganyTownRagecandybarSign 64:409e MahoganyGymSign 64:40a1 MahoganyTownPokecenterSign -64:40a4 MahoganyTownCollideDownFaceLeftMovement +64:40a4 MahoganyTownMartSign 64:40a7 MahoganyTownPlayerStepLeftMovement 64:40a9 MahoganyTownRageCandyBarMerchantBlocksYouMovement 64:40ad MahoganyTownRageCandyBarMerchantReturnsMovement diff --git a/pokecrystal_debug.map b/pokecrystal_debug.map index 66136637e..1fff57e1e 100644 --- a/pokecrystal_debug.map +++ b/pokecrystal_debug.map @@ -17382,11 +17382,11 @@ ROMX bank #35: $426d = DoBattleTransition.InitGFX $4288 = DoBattleTransition.mobile $428b = DoBattleTransition.resume - $42a0 = DoBattleTransition.NonMobile_LoadPokeballTiles - $42aa = LoadTrainerBattlePokeballTiles - $42cf = ConvertTrainerBattlePokeballTilesTo2bpp - $42dd = ConvertTrainerBattlePokeballTilesTo2bpp.loop - $42f4 = TrainerBattlePokeballTiles + $42a0 = DoBattleTransition.NonMobile_LoadBattleTransitionTiles + $42aa = LoadBattleTransitionGFX + $42cf = InitBattleTransitionBGMap + $42dd = InitBattleTransitionBGMap.loop + $42f4 = BattleTransitionTiles $4314 = BattleTransitionJumptable $4323 = BattleTransitionJumptable.Jumptable $4365 = StartTrainerBattle_DetermineWhichAnimation @@ -38232,7 +38232,7 @@ ROMX bank #100: $409b = MahoganyTownRagecandybarSign $409e = MahoganyGymSign $40a1 = MahoganyTownPokecenterSign - $40a4 = MahoganyTownCollideDownFaceLeftMovement + $40a4 = MahoganyTownMartSign $40a7 = MahoganyTownPlayerStepLeftMovement $40a9 = MahoganyTownRageCandyBarMerchantBlocksYouMovement $40ad = MahoganyTownRageCandyBarMerchantReturnsMovement diff --git a/pokecrystal_debug.sym b/pokecrystal_debug.sym index 9517042db..1f6e2ed3e 100644 --- a/pokecrystal_debug.sym +++ b/pokecrystal_debug.sym @@ -17163,11 +17163,11 @@ 23:426d DoBattleTransition.InitGFX 23:4288 DoBattleTransition.mobile 23:428b DoBattleTransition.resume -23:42a0 DoBattleTransition.NonMobile_LoadPokeballTiles -23:42aa LoadTrainerBattlePokeballTiles -23:42cf ConvertTrainerBattlePokeballTilesTo2bpp -23:42dd ConvertTrainerBattlePokeballTilesTo2bpp.loop -23:42f4 TrainerBattlePokeballTiles +23:42a0 DoBattleTransition.NonMobile_LoadBattleTransitionTiles +23:42aa LoadBattleTransitionGFX +23:42cf InitBattleTransitionBGMap +23:42dd InitBattleTransitionBGMap.loop +23:42f4 BattleTransitionTiles 23:4314 BattleTransitionJumptable 23:4323 BattleTransitionJumptable.Jumptable 23:4365 StartTrainerBattle_DetermineWhichAnimation @@ -37671,7 +37671,7 @@ 64:409b MahoganyTownRagecandybarSign 64:409e MahoganyGymSign 64:40a1 MahoganyTownPokecenterSign -64:40a4 MahoganyTownCollideDownFaceLeftMovement +64:40a4 MahoganyTownMartSign 64:40a7 MahoganyTownPlayerStepLeftMovement 64:40a9 MahoganyTownRageCandyBarMerchantBlocksYouMovement 64:40ad MahoganyTownRageCandyBarMerchantReturnsMovement