Merge pull request #254 from Rangi42/master

Remove RAM address comments, and add original Red/Green graphics

engine/battle/core.asm

@@ -5054,11 +5054,11 @@ BuildingRageText:
 ; copy last move for Mirror Move
 ; sets zero flag on failure and unsets zero flag on success
 MirrorMoveCopyMove:
-; Mirror Move makes use of ccf1 (wPlayerUsedMove) and ccf2 (wEnemyUsedMove) addresses,
+; Mirror Move makes use of wPlayerUsedMove and wEnemyUsedMove,
 ; which are mainly used to print the "[Pokemon] used [Move]" text.
 ; Both are set to 0 whenever a new Pokemon is sent out
-; ccf1 is also set to 0 whenever the player is fast asleep or frozen solid.
-; ccf2 is also set to 0 whenever the enemy is fast asleep or frozen solid.
+; wPlayerUsedMove is also set to 0 whenever the player is fast asleep or frozen solid.
+; wEnemyUsedMove is also set to 0 whenever the enemy is fast asleep or frozen solid.
 
 	ld a, [H_WHOSETURN]
 	and a

engine/battle/moveEffects/substitute_effect.asm

@@ -28,7 +28,7 @@ SubstituteEffect_:
 	add hl, de ; point hl to current HP low byte
 	pop de
 	ld a, b
-	ld [de], a ; save copy of HP to subtract in ccd7/ccd8 [how much HP substitute has]
+	ld [de], a ; save copy of HP to subtract in wPlayerSubstituteHP/wEnemySubstituteHP
 	ld a, [hld]
 ; subtract [max hp / 4] to current HP
 	sub b

sram.asm

@@ -1,45 +1,45 @@
 SECTION "Sprite Buffers", SRAM ; BANK 0
 
-sSpriteBuffer0:: ds SPRITEBUFFERSIZE ; a000
-sSpriteBuffer1:: ds SPRITEBUFFERSIZE ; a188
-sSpriteBuffer2:: ds SPRITEBUFFERSIZE ; a310
+sSpriteBuffer0:: ds SPRITEBUFFERSIZE
+sSpriteBuffer1:: ds SPRITEBUFFERSIZE
+sSpriteBuffer2:: ds SPRITEBUFFERSIZE
 
 	ds $100
 
-sHallOfFame:: ds HOF_TEAM * HOF_TEAM_CAPACITY ; a598
+sHallOfFame:: ds HOF_TEAM * HOF_TEAM_CAPACITY
 
 
 SECTION "Save Data", SRAM ; BANK 1
 	ds $598
 
-sPlayerName::  ds NAME_LENGTH ; a598
-sMainData::    ds wMainDataEnd   - wMainDataStart ; a5a3
-sSpriteData::  ds wSpriteDataEnd - wSpriteDataStart ; ad2c
-sPartyData::   ds wPartyDataEnd  - wPartyDataStart ; af2c
-sCurBoxData::  ds wBoxDataEnd    - wBoxDataStart ; b0c0
-sTilesetType:: ds 1 ; b522
-sMainDataCheckSum:: ds 1 ; b523
+sPlayerName::  ds NAME_LENGTH
+sMainData::    ds wMainDataEnd   - wMainDataStart
+sSpriteData::  ds wSpriteDataEnd - wSpriteDataStart
+sPartyData::   ds wPartyDataEnd  - wPartyDataStart
+sCurBoxData::  ds wBoxDataEnd    - wBoxDataStart
+sTilesetType:: ds 1
+sMainDataCheckSum:: ds 1
 
 
 SECTION "Saved Boxes 1", SRAM ; BANK 2
 
-sBox1:: ds wBoxDataEnd - wBoxDataStart ; a000
-sBox2:: ds wBoxDataEnd - wBoxDataStart ; a462
-sBox3:: ds wBoxDataEnd - wBoxDataStart ; a8c4
-sBox4:: ds wBoxDataEnd - wBoxDataStart ; ad26
-sBox5:: ds wBoxDataEnd - wBoxDataStart ; b188
-sBox6:: ds wBoxDataEnd - wBoxDataStart ; b5ea
-sBank2AllBoxesChecksum:: ds 1 ; ba4c
-sBank2IndividualBoxChecksums:: ds 6 ; ba4d
+sBox1:: ds wBoxDataEnd - wBoxDataStart
+sBox2:: ds wBoxDataEnd - wBoxDataStart
+sBox3:: ds wBoxDataEnd - wBoxDataStart
+sBox4:: ds wBoxDataEnd - wBoxDataStart
+sBox5:: ds wBoxDataEnd - wBoxDataStart
+sBox6:: ds wBoxDataEnd - wBoxDataStart
+sBank2AllBoxesChecksum:: ds 1
+sBank2IndividualBoxChecksums:: ds 6
 
 
 SECTION "Saved Boxes 2", SRAM ; BANK 3
 
-sBox7::  ds wBoxDataEnd - wBoxDataStart ; a000
-sBox8::  ds wBoxDataEnd - wBoxDataStart ; a462
-sBox9::  ds wBoxDataEnd - wBoxDataStart ; a8c4
-sBox10:: ds wBoxDataEnd - wBoxDataStart ; ad26
-sBox11:: ds wBoxDataEnd - wBoxDataStart ; b188
-sBox12:: ds wBoxDataEnd - wBoxDataStart ; b5ea
-sBank3AllBoxesChecksum:: ds 1 ; ba4c
-sBank3IndividualBoxChecksums:: ds 6 ; ba4d
+sBox7::  ds wBoxDataEnd - wBoxDataStart
+sBox8::  ds wBoxDataEnd - wBoxDataStart
+sBox9::  ds wBoxDataEnd - wBoxDataStart
+sBox10:: ds wBoxDataEnd - wBoxDataStart
+sBox11:: ds wBoxDataEnd - wBoxDataStart
+sBox12:: ds wBoxDataEnd - wBoxDataStart
+sBank3AllBoxesChecksum:: ds 1
+sBank3IndividualBoxChecksums:: ds 6