From 46f1627f5f41b9c5a905b0ac263f73bccf5b4abb Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Fri, 27 Dec 2024 18:11:18 +0000 Subject: [PATCH] Use exported constants for VC patch (#483) --- pokeblue_vc.map | 8 ++++---- pokeblue_vc.sym | 43 +++++++++++++++++++++++++++++++++++++++---- pokered_vc.map | 8 ++++---- pokered_vc.sym | 45 +++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 88 insertions(+), 16 deletions(-) diff --git a/pokeblue_vc.map b/pokeblue_vc.map index 5cea534844..e8fad6ebb7 100644 --- a/pokeblue_vc.map +++ b/pokeblue_vc.map @@ -18536,23 +18536,23 @@ WRAM0 bank #0: $c385 = wShadowOAMSprite33XCoord $c386 = wShadowOAMSprite33TileID $c387 = wShadowOAMSprite33Attributes - $c388 = wShadowOAMSprite34 $c388 = wShadowOAMSprite34YCoord + $c388 = wShadowOAMSprite34 $c389 = wShadowOAMSprite34XCoord $c38a = wShadowOAMSprite34TileID $c38b = wShadowOAMSprite34Attributes - $c38c = wShadowOAMSprite35 $c38c = wShadowOAMSprite35YCoord + $c38c = wShadowOAMSprite35 $c38d = wShadowOAMSprite35XCoord $c38e = wShadowOAMSprite35TileID $c38f = wShadowOAMSprite35Attributes - $c390 = wShadowOAMSprite36YCoord $c390 = wShadowOAMSprite36 + $c390 = wShadowOAMSprite36YCoord $c391 = wShadowOAMSprite36XCoord $c392 = wShadowOAMSprite36TileID $c393 = wShadowOAMSprite36Attributes - $c394 = wShadowOAMSprite37 $c394 = wShadowOAMSprite37YCoord + $c394 = wShadowOAMSprite37 $c395 = wShadowOAMSprite37XCoord $c396 = wShadowOAMSprite37TileID $c397 = wShadowOAMSprite37Attributes diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym index 223932048c..d4c11bb9cd 100644 --- a/pokeblue_vc.sym +++ b/pokeblue_vc.sym @@ -18205,23 +18205,23 @@ 00:c385 wShadowOAMSprite33XCoord 00:c386 wShadowOAMSprite33TileID 00:c387 wShadowOAMSprite33Attributes -00:c388 wShadowOAMSprite34 00:c388 wShadowOAMSprite34YCoord +00:c388 wShadowOAMSprite34 00:c389 wShadowOAMSprite34XCoord 00:c38a wShadowOAMSprite34TileID 00:c38b wShadowOAMSprite34Attributes -00:c38c wShadowOAMSprite35 00:c38c wShadowOAMSprite35YCoord +00:c38c wShadowOAMSprite35 00:c38d wShadowOAMSprite35XCoord 00:c38e wShadowOAMSprite35TileID 00:c38f wShadowOAMSprite35Attributes -00:c390 wShadowOAMSprite36YCoord 00:c390 wShadowOAMSprite36 +00:c390 wShadowOAMSprite36YCoord 00:c391 wShadowOAMSprite36XCoord 00:c392 wShadowOAMSprite36TileID 00:c393 wShadowOAMSprite36Attributes -00:c394 wShadowOAMSprite37 00:c394 wShadowOAMSprite37YCoord +00:c394 wShadowOAMSprite37 00:c395 wShadowOAMSprite37XCoord 00:c396 wShadowOAMSprite37TileID 00:c397 wShadowOAMSprite37Attributes @@ -20747,6 +20747,7 @@ 05 FUCHSIAGYM_ROCKER4 05 GAMECORNER_FISHING_GURU 05 INDIGOPLATEAULOBBY_LINK_RECEPTIONIST +05 MEGA_PUNCH 05 MRFUJISHOUSE_MR_FUJI 05 MTMOON1F_COOLTRAINER_F2 05 MTMOONB2F_ROCKET4 @@ -21032,6 +21033,7 @@ 0b SSANNEB1FROOMS_MAX_POTION 0b VICTORYROAD2F_BOULDER1 0b VIRIDIANGYM_REVIVE +0c GUILLOTINE 0c MTMOON1F_POTION2 0c POWERPLANT_RARE_CANDY 0c SAFFRONCITY_PIDGEOT @@ -21046,3 +21048,36 @@ 0e POWERPLANT_TM_REFLECT 0e SAFFRONCITY_ROCKET8 0f SAFFRONCITY_ROCKET9 +19 MEGA_KICK +3b BLIZZARD +3d BUBBLEBEAM +3f HYPER_BEAM +55 THUNDERBOLT +73 REFLECT +78 SELFDESTRUCT +80 A_CHAR +81 B_CHAR +82 C_CHAR +83 D_CHAR +84 E_CHAR +85 F_CHAR +86 G_CHAR +87 H_CHAR +88 I_CHAR +8a DREAM_EATER +8a K_CHAR +8b L_CHAR +8c M_CHAR +8d N_CHAR +8e O_CHAR +8f P_CHAR +91 R_CHAR +92 S_CHAR +93 SPORE +93 T_CHAR +94 U_CHAR +97 X_CHAR +98 Y_CHAR +99 EXPLOSION +99 Z_CHAR +9d ROCK_SLIDE diff --git a/pokered_vc.map b/pokered_vc.map index c091ce8fd4..f345ce1ed7 100644 --- a/pokered_vc.map +++ b/pokered_vc.map @@ -18539,23 +18539,23 @@ WRAM0 bank #0: $c385 = wShadowOAMSprite33XCoord $c386 = wShadowOAMSprite33TileID $c387 = wShadowOAMSprite33Attributes - $c388 = wShadowOAMSprite34 $c388 = wShadowOAMSprite34YCoord + $c388 = wShadowOAMSprite34 $c389 = wShadowOAMSprite34XCoord $c38a = wShadowOAMSprite34TileID $c38b = wShadowOAMSprite34Attributes - $c38c = wShadowOAMSprite35 $c38c = wShadowOAMSprite35YCoord + $c38c = wShadowOAMSprite35 $c38d = wShadowOAMSprite35XCoord $c38e = wShadowOAMSprite35TileID $c38f = wShadowOAMSprite35Attributes - $c390 = wShadowOAMSprite36YCoord $c390 = wShadowOAMSprite36 + $c390 = wShadowOAMSprite36YCoord $c391 = wShadowOAMSprite36XCoord $c392 = wShadowOAMSprite36TileID $c393 = wShadowOAMSprite36Attributes - $c394 = wShadowOAMSprite37 $c394 = wShadowOAMSprite37YCoord + $c394 = wShadowOAMSprite37 $c395 = wShadowOAMSprite37XCoord $c396 = wShadowOAMSprite37TileID $c397 = wShadowOAMSprite37Attributes diff --git a/pokered_vc.sym b/pokered_vc.sym index 1ad8cd73b7..82c2a6dfca 100644 --- a/pokered_vc.sym +++ b/pokered_vc.sym @@ -18208,23 +18208,23 @@ 00:c385 wShadowOAMSprite33XCoord 00:c386 wShadowOAMSprite33TileID 00:c387 wShadowOAMSprite33Attributes -00:c388 wShadowOAMSprite34 00:c388 wShadowOAMSprite34YCoord +00:c388 wShadowOAMSprite34 00:c389 wShadowOAMSprite34XCoord 00:c38a wShadowOAMSprite34TileID 00:c38b wShadowOAMSprite34Attributes -00:c38c wShadowOAMSprite35 00:c38c wShadowOAMSprite35YCoord +00:c38c wShadowOAMSprite35 00:c38d wShadowOAMSprite35XCoord 00:c38e wShadowOAMSprite35TileID 00:c38f wShadowOAMSprite35Attributes -00:c390 wShadowOAMSprite36YCoord 00:c390 wShadowOAMSprite36 +00:c390 wShadowOAMSprite36YCoord 00:c391 wShadowOAMSprite36XCoord 00:c392 wShadowOAMSprite36TileID 00:c393 wShadowOAMSprite36Attributes -00:c394 wShadowOAMSprite37 00:c394 wShadowOAMSprite37YCoord +00:c394 wShadowOAMSprite37 00:c395 wShadowOAMSprite37XCoord 00:c396 wShadowOAMSprite37TileID 00:c397 wShadowOAMSprite37Attributes @@ -20750,6 +20750,7 @@ 05 FUCHSIAGYM_ROCKER4 05 GAMECORNER_FISHING_GURU 05 INDIGOPLATEAULOBBY_LINK_RECEPTIONIST +05 MEGA_PUNCH 05 MRFUJISHOUSE_MR_FUJI 05 MTMOON1F_COOLTRAINER_F2 05 MTMOONB2F_ROCKET4 @@ -21035,6 +21036,7 @@ 0b SSANNEB1FROOMS_MAX_POTION 0b VICTORYROAD2F_BOULDER1 0b VIRIDIANGYM_REVIVE +0c GUILLOTINE 0c MTMOON1F_POTION2 0c POWERPLANT_RARE_CANDY 0c SAFFRONCITY_PIDGEOT @@ -21049,3 +21051,38 @@ 0e POWERPLANT_TM_REFLECT 0e SAFFRONCITY_ROCKET8 0f SAFFRONCITY_ROCKET9 +19 MEGA_KICK +3b BLIZZARD +3d BUBBLEBEAM +3f HYPER_BEAM +55 THUNDERBOLT +5d CONFUSION +5e PSYCHIC_M +73 REFLECT +78 SELFDESTRUCT +80 A_CHAR +81 B_CHAR +82 C_CHAR +83 D_CHAR +84 E_CHAR +85 F_CHAR +86 G_CHAR +87 H_CHAR +88 I_CHAR +8a DREAM_EATER +8a K_CHAR +8b L_CHAR +8c M_CHAR +8d N_CHAR +8e O_CHAR +8f P_CHAR +91 R_CHAR +92 S_CHAR +93 SPORE +93 T_CHAR +94 U_CHAR +97 X_CHAR +98 Y_CHAR +99 EXPLOSION +99 Z_CHAR +9d ROCK_SLIDE