Use exported constants for VC patch (#125)

pret · Dec 27, 2024 · b77e038 · b77e038
1 parent c51f15b
commit b77e038
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 12 deletions.
diff --git a/pokegold_vc.map b/pokegold_vc.map
@@ -37003,8 +37003,8 @@ SRAM bank #3:
 	         $a938 = sBox10Mon5Moves
 	         $a93c = sBox10Mon5ID
 	         $a93e = sBox10Mon5Exp
-	         $a941 = sBox10Mon5StatExp
 	         $a941 = sBox10Mon5HPExp
+	         $a941 = sBox10Mon5StatExp
 	         $a943 = sBox10Mon5AtkExp
 	         $a945 = sBox10Mon5DefExp
 	         $a947 = sBox10Mon5SpdExp
@@ -37016,9 +37016,9 @@ SRAM bank #3:
 	         $a953 = sBox10Mon5Unused1
 	         $a954 = sBox10Mon5Unused2
 	         $a955 = sBox10Mon5Level
-	         $a956 = sBox10Mon6Species
 	         $a956 = sBox10Mon6
 	         $a956 = sBox10Mon5BoxEnd
+	         $a956 = sBox10Mon6Species
 	         $a957 = sBox10Mon6Item
 	         $a958 = sBox10Mon6Moves
 	         $a95c = sBox10Mon6ID
@@ -39602,8 +39602,8 @@ WRAM0 bank #0:
 	         $c335 = wShadowOAMSprite13XCoord
 	         $c336 = wShadowOAMSprite13TileID
 	         $c337 = wShadowOAMSprite13Attributes
-	         $c338 = wShadowOAMSprite14
 	         $c338 = wShadowOAMSprite14YCoord
+	         $c338 = wShadowOAMSprite14
 	         $c339 = wShadowOAMSprite14XCoord
 	         $c33a = wShadowOAMSprite14TileID
 	         $c33b = wShadowOAMSprite14Attributes

diff --git a/pokegold_vc.sym b/pokegold_vc.sym
@@ -36329,8 +36329,8 @@
 03:a938 sBox10Mon5Moves
 03:a93c sBox10Mon5ID
 03:a93e sBox10Mon5Exp
-03:a941 sBox10Mon5StatExp
 03:a941 sBox10Mon5HPExp
+03:a941 sBox10Mon5StatExp
 03:a943 sBox10Mon5AtkExp
 03:a945 sBox10Mon5DefExp
 03:a947 sBox10Mon5SpdExp
@@ -36342,9 +36342,9 @@
 03:a953 sBox10Mon5Unused1
 03:a954 sBox10Mon5Unused2
 03:a955 sBox10Mon5Level
-03:a956 sBox10Mon6Species
 03:a956 sBox10Mon6
 03:a956 sBox10Mon5BoxEnd
+03:a956 sBox10Mon6Species
 03:a957 sBox10Mon6Item
 03:a958 sBox10Mon6Moves
 03:a95c sBox10Mon6ID
@@ -38918,8 +38918,8 @@
 00:c335 wShadowOAMSprite13XCoord
 00:c336 wShadowOAMSprite13TileID
 00:c337 wShadowOAMSprite13Attributes
-00:c338 wShadowOAMSprite14
 00:c338 wShadowOAMSprite14YCoord
+00:c338 wShadowOAMSprite14
 00:c339 wShadowOAMSprite14XCoord
 00:c33a wShadowOAMSprite14TileID
 00:c33b wShadowOAMSprite14Attributes
@@ -42733,6 +42733,7 @@
 00:ffe7 hCGBPalUpdate
 00:ffe8 hCGB
 00:ffe9 hSGB
+00 NO_INPUT
 00 SCENE_AZALEATOWN_NOOP
 00 SCENE_BRUNOSROOM_LOCK_DOOR
 00 SCENE_BURNEDTOWER1F_RIVAL_BATTLE
@@ -42789,6 +42790,7 @@
 00 SCENE_VICTORYROADGATE_BADGE_CHECK
 00 SCENE_VICTORYROAD_RIVAL_BATTLE
 00 SCENE_WILLSROOM_LOCK_DOOR
+01 A_BUTTON
 01 SCENE_AZALEATOWN_RIVAL_BATTLE
 01 SCENE_BRUNOSROOM_NOOP
 01 SCENE_BURNEDTOWER1F_FIREBREATHER_DICK
@@ -42837,6 +42839,7 @@
 01 SCENE_VICTORYROADGATE_NOOP
 01 SCENE_VICTORYROAD_NOOP
 01 SCENE_WILLSROOM_NOOP
+02 B_BUTTON
 02 SCENE_BURNEDTOWER1F_NOOP
 02 SCENE_ELMSLAB_NOOP
 02 SCENE_FASTSHIP1F_MEET_GRANDPA
@@ -42855,3 +42858,27 @@
 05 POKEDEX_SCX
 05 SCENE_ELMSLAB_AIDE_GIVES_POTION
 06 SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS
+08 MAP_CIANWOOD_PHOTO_STUDIO
+0d BATTLE_ANIM_GFX_BUBBLE
+16 MAPGROUP_CIANWOOD
+40 D_UP
+50 AT_CHAR
+7f SPACE_CHAR
+80 A_CHAR
+80 D_DOWN
+83 D_CHAR
+84 E_CHAR
+85 F_CHAR
+87 H_CHAR
+88 I_CHAR
+8b L_CHAR
+8d N_CHAR
+8e O_CHAR
+8f P_CHAR
+90 SCREEN_HEIGHT_PX
+91 R_CHAR
+92 S_CHAR
+93 T_CHAR
+94 U_CHAR
+97 X_CHAR
+98 Y_CHAR
diff --git a/pokesilver_vc.map b/pokesilver_vc.map
@@ -37004,8 +37004,8 @@ SRAM bank #3:
 	         $a938 = sBox10Mon5Moves
 	         $a93c = sBox10Mon5ID
 	         $a93e = sBox10Mon5Exp
-	         $a941 = sBox10Mon5StatExp
 	         $a941 = sBox10Mon5HPExp
+	         $a941 = sBox10Mon5StatExp
 	         $a943 = sBox10Mon5AtkExp
 	         $a945 = sBox10Mon5DefExp
 	         $a947 = sBox10Mon5SpdExp
@@ -37017,9 +37017,9 @@ SRAM bank #3:
 	         $a953 = sBox10Mon5Unused1
 	         $a954 = sBox10Mon5Unused2
 	         $a955 = sBox10Mon5Level
-	         $a956 = sBox10Mon6Species
 	         $a956 = sBox10Mon6
 	         $a956 = sBox10Mon5BoxEnd
+	         $a956 = sBox10Mon6Species
 	         $a957 = sBox10Mon6Item
 	         $a958 = sBox10Mon6Moves
 	         $a95c = sBox10Mon6ID
@@ -39603,8 +39603,8 @@ WRAM0 bank #0:
 	         $c335 = wShadowOAMSprite13XCoord
 	         $c336 = wShadowOAMSprite13TileID
 	         $c337 = wShadowOAMSprite13Attributes
-	         $c338 = wShadowOAMSprite14
 	         $c338 = wShadowOAMSprite14YCoord
+	         $c338 = wShadowOAMSprite14
 	         $c339 = wShadowOAMSprite14XCoord
 	         $c33a = wShadowOAMSprite14TileID
 	         $c33b = wShadowOAMSprite14Attributes

diff --git a/pokesilver_vc.sym b/pokesilver_vc.sym
@@ -36328,8 +36328,8 @@
 03:a938 sBox10Mon5Moves
 03:a93c sBox10Mon5ID
 03:a93e sBox10Mon5Exp
-03:a941 sBox10Mon5StatExp
 03:a941 sBox10Mon5HPExp
+03:a941 sBox10Mon5StatExp
 03:a943 sBox10Mon5AtkExp
 03:a945 sBox10Mon5DefExp
 03:a947 sBox10Mon5SpdExp
@@ -36341,9 +36341,9 @@
 03:a953 sBox10Mon5Unused1
 03:a954 sBox10Mon5Unused2
 03:a955 sBox10Mon5Level
-03:a956 sBox10Mon6Species
 03:a956 sBox10Mon6
 03:a956 sBox10Mon5BoxEnd
+03:a956 sBox10Mon6Species
 03:a957 sBox10Mon6Item
 03:a958 sBox10Mon6Moves
 03:a95c sBox10Mon6ID
@@ -38917,8 +38917,8 @@
 00:c335 wShadowOAMSprite13XCoord
 00:c336 wShadowOAMSprite13TileID
 00:c337 wShadowOAMSprite13Attributes
-00:c338 wShadowOAMSprite14
 00:c338 wShadowOAMSprite14YCoord
+00:c338 wShadowOAMSprite14
 00:c339 wShadowOAMSprite14XCoord
 00:c33a wShadowOAMSprite14TileID
 00:c33b wShadowOAMSprite14Attributes
@@ -42732,6 +42732,7 @@
 00:ffe7 hCGBPalUpdate
 00:ffe8 hCGB
 00:ffe9 hSGB
+00 NO_INPUT
 00 SCENE_AZALEATOWN_NOOP
 00 SCENE_BRUNOSROOM_LOCK_DOOR
 00 SCENE_BURNEDTOWER1F_RIVAL_BATTLE
@@ -42788,6 +42789,7 @@
 00 SCENE_VICTORYROADGATE_BADGE_CHECK
 00 SCENE_VICTORYROAD_RIVAL_BATTLE
 00 SCENE_WILLSROOM_LOCK_DOOR
+01 A_BUTTON
 01 SCENE_AZALEATOWN_RIVAL_BATTLE
 01 SCENE_BRUNOSROOM_NOOP
 01 SCENE_BURNEDTOWER1F_FIREBREATHER_DICK
@@ -42836,6 +42838,7 @@
 01 SCENE_VICTORYROADGATE_NOOP
 01 SCENE_VICTORYROAD_NOOP
 01 SCENE_WILLSROOM_NOOP
+02 B_BUTTON
 02 SCENE_BURNEDTOWER1F_NOOP
 02 SCENE_ELMSLAB_NOOP
 02 SCENE_FASTSHIP1F_MEET_GRANDPA
@@ -42854,3 +42857,27 @@
 05 POKEDEX_SCX
 05 SCENE_ELMSLAB_AIDE_GIVES_POTION
 06 SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS
+08 MAP_CIANWOOD_PHOTO_STUDIO
+0d BATTLE_ANIM_GFX_BUBBLE
+16 MAPGROUP_CIANWOOD
+40 D_UP
+50 AT_CHAR
+7f SPACE_CHAR
+80 A_CHAR
+80 D_DOWN
+83 D_CHAR
+84 E_CHAR
+85 F_CHAR
+87 H_CHAR
+88 I_CHAR
+8b L_CHAR
+8d N_CHAR
+8e O_CHAR
+8f P_CHAR
+90 SCREEN_HEIGHT_PX
+91 R_CHAR
+92 S_CHAR
+93 T_CHAR
+94 U_CHAR
+97 X_CHAR
+98 Y_CHAR