Use tabs for indentation, not spaces.

hg-commit-id: e5f18384709d

common.asm

@@ -848,8 +848,7 @@ DelayFrame: ; 20AF
 
 ; wait for the next Vblank, halting to conserve battery
 .halt\@
-	db $76 ; XXX this is a hack--rgbasm adds a nop after this instr
+	db $76 ; XXX this is a hack--rgbasm adds a nop after this instr even when ints are enabled
-	       ; even when ints are enabled
 	ld a,[$FFD6]
 	and a
 	jr nz,.halt\@
@@ -859,8 +858,8 @@ DelayFrame: ; 20AF
 ; These routines manage gradual fading
 ; (e.g., entering a doorway)
 LoadGBPal: ; 20BA
-	ld a,[$d35d]		;tells if cur.map is dark
+	ld a,[$d35d] ;tells if cur.map is dark (requires HM5_FLASH?)
-	ld b,a			;(requires HM5_FLASH?)
+	ld b,a
 	ld hl,GBPalTable_00	;16
 	ld a,l
 	sub b
@@ -7901,13 +7900,17 @@ ItemUseBall:	;03:5687
 	ld a,[hli]
 	ld b,a
 	ld a,[hl]
-	srl b		;explanation:
+
-	rr a		;we have a 16 bit value
+; explanation: we have a 16-bit value equal to [b << 8 | a].
-	srl b		;equal to [b << 8 | a].
+; This number is divided by 4. The result is 8 bit (reg. a).
-	rr a		;This number is divided
+; Always bigger than zero.
-	and a		;by 4. The result is
+	srl b
-	jr nz,.next8\@	;8 bit (reg. a). Always
+	rr a
-	inc a		;bigger than zero.
+	srl b
+	rr a
+	and a
+	jr nz,.next8\@
+	inc a
 .next8\@	;$5766
 	ld [$ff99],a
 	ld b,4
@@ -17667,19 +17670,13 @@ Green2Data:
 	db $FF,37,PIDGEOT,38,GROWLITHE,35,EXEGGCUTE,35,ALAKAZAM,40,BLASTOISE,0
 	db $FF,37,PIDGEOT,38,GYARADOS,35,GROWLITHE,35,ALAKAZAM,40,VENUSAUR,0
 	db $FF,37,PIDGEOT,38,EXEGGCUTE,35,GYARADOS,35,ALAKAZAM,40,CHARIZARD,0
-	db $FF,47,PIDGEOT,45,RHYHORN,45,GROWLITHE,47,EXEGGCUTE,50,ALAKAZAM ;\
+	db $FF,47,PIDGEOT,45,RHYHORN,45,GROWLITHE,47,EXEGGCUTE,50,ALAKAZAM,53,BLASTOISE,0
-		db 53,BLASTOISE,0
+	db $FF,47,PIDGEOT,45,RHYHORN,45,GYARADOS,47,GROWLITHE,50,ALAKAZAM,53,VENUSAUR,0
-	db $FF,47,PIDGEOT,45,RHYHORN,45,GYARADOS,47,GROWLITHE,50,ALAKAZAM ;\
+	db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM,53,CHARIZARD,0
-		db 53,VENUSAUR,0
-	db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM ;\
-		db 53,CHARIZARD,0
 Green3Data:
-	db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,ARCANINE,63,EXEGGUTOR ;\
+	db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,ARCANINE,63,EXEGGUTOR,65,BLASTOISE,0
-		db 65,BLASTOISE,0
+	db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,GYARADOS,63,ARCANINE,65,VENUSAUR,0
-	db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,GYARADOS,63,ARCANINE ;\
+	db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,EXEGGUTOR,63,GYARADOS,65,CHARIZARD,0
-		db 65,VENUSAUR,0
-	db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,EXEGGUTOR,63,GYARADOS ;\
-		db 65,CHARIZARD,0
 LoreleiData:
 	db $FF,54,DEWGONG,53,CLOYSTER,54,SLOWBRO,56,JYNX,56,LAPRAS,0
 ChannelerData:
@@ -17710,8 +17707,7 @@ ChannelerData:
 AgathaData:
 	db $FF,56,GENGAR,56,GOLBAT,55,HAUNTER,58,ARBOK,60,GENGAR,0
 LanceData:
-	db $FF,58,GYARADOS,56,DRAGONAIR,56,DRAGONAIR,60,AERODACTYL ;\
+	db $FF,58,GYARADOS,56,DRAGONAIR,56,DRAGONAIR,60,AERODACTYL,62,DRAGONITE,0
-		db 62,DRAGONITE,0
 
 TrainerAI: ; 652E
 ;XXX called at 34964, 3c342, 3c398
@@ -32141,47 +32137,47 @@ NoThanksText: ; 14:684F
 PrizeMenuMon1Entries: ; 14:6859
 	db ABRA
 	db CLEFAIRY
-		IF _RED
+IF _RED
 	db NIDORINA
-		ENDC
+ENDC
-		IF _BLUE
+IF _BLUE
 	db NIDORINO
-		ENDC
+ENDC
 	db "@"
 PrizeMenuMon1Cost: ; 14:685D
-		IF _RED
+IF _RED
 	db $01,$80
 	db $05,$00
-		ENDC
+ENDC
-		IF _BLUE
+IF _BLUE
 	db $01,$20
 	db $07,$50
-		ENDC
+ENDC
 	db $12,$00
 	db "@"
 
 PrizeMenuMon2Entries: ; 14:6864
-		IF _RED
+IF _RED
 	db DRATINI
 	db SCYTHER
-		ENDC
+ENDC
-		IF _BLUE
+IF _BLUE
 	db PINSIR
 	db DRATINI
-		ENDC
+ENDC
 	db PORYGON
 	db "@"
 PrizeMenuMon2Cost: ; 14:6868
-		IF _RED
+IF _RED
 	db $28,$00
 	db $55,$00
 	db $99,$99
-		ENDC
+ENDC
-		IF _BLUE
+IF _BLUE
 	db $25,$00
 	db $46,$00
 	db $65,$00
-		ENDC
+ENDC
 	db "@"
 
 PrizeMenuTMsEntries: ; 14:686F
@@ -32351,7 +32347,7 @@ GetPrizeMonLevel: ; 14:6977
 	ret
 
 PrizeMonLevelDictionary: ; 14:698A
-	IF _RED
+IF _RED
 	db ABRA,9
 	db CLEFAIRY,8
 	db NIDORINA,17
@@ -32359,8 +32355,8 @@ PrizeMonLevelDictionary: ; 14:698A
 	db DRATINI,18
 	db SCYTHER,25
 	db PORYGON,26
-	ENDC
+ENDC
-	IF _BLUE
+IF _BLUE
 	db ABRA,6
 	db CLEFAIRY,12
 	db NIDORINO,17
@@ -32368,7 +32364,7 @@ PrizeMonLevelDictionary: ; 14:698A
 	db PINSIR,20
 	db DRATINI,24
 	db PORYGON,18
-	ENDC
+ENDC
 
 INCBIN "baserom.gbc",$52996,$529e9 - $52996
 
@@ -44552,18 +44548,18 @@ SuperPalettes: ; 6660
 	RGB 20,26,31
 	RGB 17,23,10
 	RGB 3,2,2
-	IF _RED
+IF _RED
 	RGB 31,29,31 ; PAL_LOGO1
 	RGB 30,30,17
 	RGB 17,23,10
 	RGB 21,0,4
-	ENDC
+ENDC
-	IF _BLUE
+IF _BLUE
 	RGB 31,29,31 ; PAL_LOGO1
 	RGB 30,30,17
 	RGB 21,0,4
 	RGB 14,19,29
-	ENDC
+ENDC
 	RGB 31,29,31 ; XXX
 	RGB 30,30,17
 	RGB 18,18,24
@@ -44618,31 +44614,31 @@ SuperPalettes: ; 6660
 	RGB 3,2,2
 	RGB 31,29,31 ; PAL_SLOTS2
 	RGB 31,31,17
-	IF _RED
+IF _RED
 	RGB 25,17,21
-	ENDC
+ENDC
-	IF _BLUE
+IF _BLUE
 	RGB 16,19,29
-	ENDC
+ENDC
 	RGB 3,2,2
 	RGB 31,29,31 ; PAL_SLOTS3
 	RGB 22,31,16
-	IF _RED
+IF _RED
 	RGB 25,17,21
-	ENDC
+ENDC
-	IF _BLUE
+IF _BLUE
 	RGB 16,19,29
-	ENDC
+ENDC
 	RGB 3,2,2
 	RGB 31,29,31 ; PAL_SLOTS4
-	IF _RED
+IF _RED
 	RGB 16,19,29
 	RGB 25,17,21
-	ENDC
+ENDC
-	IF _BLUE
+IF _BLUE
 	RGB 25,17,21
 	RGB 16,19,29
-	ENDC
+ENDC
 	RGB 3,2,2
 	RGB 31,29,31 ; PAL_BLACK
 	RGB 7,7,7