Updated Edit the male and female player colors (markdown)

1 files changed, 34 insertions, 31 deletions

diff --git a/Edit-the-male-and-female-player-colors.md b/Edit-the-male-and-female-player-colors.md
index c284f97..15c3d0e 100644
--- a/Edit-the-male-and-female-player-colors.md
+++ b/Edit-the-male-and-female-player-colors.md
@@ -234,20 +234,21 @@ Edit [data/sprite_anims/sequences.asm](../blob/master/data/sprite_anims/sequence
 -; SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED
 -	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED,          SPRITE_ANIM_SEQ_NULL,                      SPRITE_ANIM_DICT_DEFAULT
 +; SPRITE_ANIM_INDEX_MAGNET_TRAIN_BROWN
-+	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BROWN,          SPRITE_ANIM_SEQ_NULL,                      SPRITE_ANIM_DICT_DEFAULT
++	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BROWN,        SPRITE_ANIM_SEQ_NULL,                      SPRITE_ANIM_DICT_DEFAULT
  	...
 -; SPRITE_ANIM_INDEX_BLUE_WALK
 -	db SPRITE_ANIM_FRAMESET_BLUE_WALK,                 SPRITE_ANIM_SEQ_NULL,                      SPRITE_ANIM_DICT_DEFAULT
 +; SPRITE_ANIM_INDEX_GREEN_WALK
-+	db SPRITE_ANIM_FRAMESET_GREEN_WALK,                 SPRITE_ANIM_SEQ_NULL,                      SPRITE_ANIM_DICT_DEFAULT
++	db SPRITE_ANIM_FRAMESET_GREEN_WALK,                SPRITE_ANIM_SEQ_NULL,                      SPRITE_ANIM_DICT_DEFAULT
 -; SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE
 -	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE,         SPRITE_ANIM_SEQ_NULL,                      SPRITE_ANIM_DICT_DEFAULT
 +; SPRITE_ANIM_INDEX_MAGNET_TRAIN_GREEN
-+	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_GREEN,         SPRITE_ANIM_SEQ_NULL,                      SPRITE_ANIM_DICT_DEFAULT
++	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_GREEN,        SPRITE_ANIM_SEQ_NULL,                      SPRITE_ANIM_DICT_DEFAULT
  	...
-; SPRITE_ANIM_INDEX_CELEBI
+ ; SPRITE_ANIM_INDEX_CELEBI
 	db SPRITE_ANIM_FRAMESET_CELEBI_LEFT,               SPRITE_ANIM_SEQ_NULL,                      SPRITE_ANIM_DICT_DEFAULT
-+	db SPRITE_ANIM_FRAMESET_BROWN_WALK,                SPRITE_ANIM_SEQ_NULL,                    SPRITE_ANIM_DICT_DEFAULT
++; SPRITE_ANIM_INDEX_BROWN_WALK
++	db SPRITE_ANIM_FRAMESET_BROWN_WALK,                SPRITE_ANIM_SEQ_NULL,                      SPRITE_ANIM_DICT_DEFAULT
 	assert_table_length NUM_SPRITE_ANIM_INDEXES
 ```
 
@@ -357,42 +358,42 @@ And edit [data/sprite_anims/oam.asm](../blob/master/data/sprite_anims/oam.asm):
 -.OAMData_BlueWalk:
 +.OAMData_GreenWalk:
  	db 4
--	dsprite -1,  0, -1,  0, $00, PAL_OW_BLUE
--	dsprite -1,  0,  0,  0, $01, PAL_OW_BLUE
--	dsprite  0,  0, -1,  0, $02, PAL_OW_BLUE
--	dsprite  0,  0,  0,  0, $03, PAL_OW_BLUE
-+	dsprite -1,  0, -1,  0, $00, PAL_OW_GREEN
-+	dsprite -1,  0,  0,  0, $01, PAL_OW_GREEN
-+	dsprite  0,  0, -1,  0, $02, PAL_OW_GREEN
-+	dsprite  0,  0,  0,  0, $03, PAL_OW_GREEN
+-	dbsprite -1, -1,  0,  0, $00, PAL_OW_BLUE
+-	dbsprite  0, -1,  0,  0, $01, PAL_OW_BLUE
+-	dbsprite -1,  0,  0,  0, $02, PAL_OW_BLUE
+-	dbsprite  0,  0,  0,  0, $03, PAL_OW_BLUE
++	dbsprite -1, -1,  0,  0, $00, PAL_OW_GREEN
++	dbsprite  0, -1,  0,  0, $01, PAL_OW_GREEN
++	dbsprite -1,  0,  0,  0, $02, PAL_OW_GREEN
++	dbsprite  0,  0,  0,  0, $03, PAL_OW_GREEN
 
 -.OAMData_MagnetTrainBlue:
 +.OAMData_MagnetTrainGreen:
  	db 4
--	dsprite -1,  0, -1,  0, $00, PAL_OW_BLUE | PRIORITY
--	dsprite -1,  0,  0,  0, $01, PAL_OW_BLUE | PRIORITY
--	dsprite  0,  0, -1,  0, $02, PAL_OW_BLUE | PRIORITY
--	dsprite  0,  0,  0,  0, $03, PAL_OW_BLUE | PRIORITY
-+	dsprite -1,  0, -1,  0, $00, PAL_OW_GREEN | PRIORITY
-+	dsprite -1,  0,  0,  0, $01, PAL_OW_GREEN | PRIORITY
-+	dsprite  0,  0, -1,  0, $02, PAL_OW_GREEN | PRIORITY
-+	dsprite  0,  0,  0,  0, $03, PAL_OW_GREEN | PRIORITY
+-	dbsprite -1, -1,  0,  0, $00, PAL_OW_BLUE | PRIORITY
+-	dbsprite  0, -1,  0,  0, $01, PAL_OW_BLUE | PRIORITY
+-	dbsprite -1,  0,  0,  0, $02, PAL_OW_BLUE | PRIORITY
+-	dbsprite  0,  0,  0,  0, $03, PAL_OW_BLUE | PRIORITY
++	dbsprite -1, -1,  0,  0, $00, PAL_OW_GREEN | PRIORITY
++	dbsprite  0, -1,  0,  0, $01, PAL_OW_GREEN | PRIORITY
++	dbsprite -1,  0,  0,  0, $02, PAL_OW_GREEN | PRIORITY
++	dbsprite  0,  0,  0,  0, $03, PAL_OW_GREEN | PRIORITY
 ```
 
 ```diff
 +.OAMData_BrownWalk:
 +	db 4
-+	dsprite -1,  0, -1,  0, $00, PAL_OW_BROWN
-+	dsprite -1,  0,  0,  0, $01, PAL_OW_BROWN
-+	dsprite  0,  0, -1,  0, $02, PAL_OW_BROWN
-+	dsprite  0,  0,  0,  0, $03, PAL_OW_BROWN
++	dbsprite -1, -1,  0,  0, $00, PAL_OW_BROWN
++	dbsprite  0, -1,  0,  0, $01, PAL_OW_BROWN
++	dbsprite -1,  0,  0,  0, $02, PAL_OW_BROWN
++	dbsprite  0,  0,  0,  0, $03, PAL_OW_BROWN
 +
 +.OAMData_MagnetTrainBrown:
 +	db 4
-+	dsprite -1,  0, -1,  0, $00, PAL_OW_BROWN | PRIORITY
-+	dsprite -1,  0,  0,  0, $01, PAL_OW_BROWN | PRIORITY
-+	dsprite  0,  0, -1,  0, $02, PAL_OW_BROWN | PRIORITY
-+	dsprite  0,  0,  0,  0, $03, PAL_OW_BROWN | PRIORITY
++	dbsprite -1, -1,  0,  0, $00, PAL_OW_BROWN | PRIORITY
++	dbsprite  0, -1,  0,  0, $01, PAL_OW_BROWN | PRIORITY
++	dbsprite -1,  0,  0,  0, $02, PAL_OW_BROWN | PRIORITY
++	dbsprite  0,  0,  0,  0, $03, PAL_OW_BROWN | PRIORITY
 ```
 
 Most of those changes were just renaming labels to avoid confusion. The only part that has a real effect on the game is the final part where the colors change.
@@ -589,7 +590,7 @@ NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
  	trainerclass MYSTICALMAN ; 43
  	const EUSINE
 
-+KRIS EQU __trainer_class__ - 1
++KRIS EQU __trainer_class__
  NUM_TRAINER_CLASSES EQU __trainer_class__ - 1
 ```
 
@@ -638,7 +639,9 @@ Then edit [data/trainers/palettes.asm](../blob/master/data/trainers/palettes.asm
 +
 +KrisPalette:
 +INCLUDE "gfx/player/kris.pal"
-	assert_table_length NUM_TRAINER_CLASSES + 1
+
+-	assert_table_length NUM_TRAINER_CLASSES + 1
++	assert_table_length NUM_TRAINER_CLASSES + 2
 ```
 
 Previously, Chris was using the same colors as Cal (the boy player lookalike whom you battle in Viridian City's Trainer House); and Kris was literally using Falkner's palette (which makes sense, given that `KRIS` and `FALKNER` were equivalent). Now they both have their own independent palettes.