Merge pull request #179 from suloku/master

Bugfixed

battle/core.asm

@@ -4125,16 +4125,17 @@ RecallPlayerMon: ; 3dce6
 ; 3dcf9
 
 HandleBugBiteEatBerry:
-	ld a, [hLinkPlayerNumber]
-	cp $1
-	jr z, .player_1
+	ld a, [hBattleTurn]
+	and a
+	jr nz, .player_consumeberry
+;enemyturn
 	call SetEnemyTurn
 	call UseHPHealingEatenBerry
 	call UseHeldStatusHealingItem
 	call UseConfusionHealingItem
 	call SetPlayerTurn
 	ret
-.player_1
+.player_consumeberry
 	call SetPlayerTurn
 	call UseHPHealingEatenBerry
 	call UseHeldStatusHealingItem

engine/move_mon.asm

@@ -224,11 +224,12 @@ endr
 .initializetrainermonpersonality
 	pop de
 
-; CaughtData/CaughtTime/CaughtLevel
-	xor a
+; CaughtData/CaughtTime/CaughtLevel --> this byte has been repurposedf for the personality value
+;	xor a ; don't erase it, since we will use the generated personality
 	ld [de], a
 	inc de
 ; CaughtGender/CaughtLocation
+	xor a ;this is initialized as zero
 	ld [de], a
 	inc de
 

maps/MurcottIsland.asm

@@ -195,6 +195,8 @@ MurcottIslandTMRainDance:
 	itemball TM_RAIN_DANCE
 	
 CrossBattle3Script1:
+	checkevent EVENT_MURCOTT_ISLAND_CROSS
+	iftrue .End
 	faceplayer
 	showemote EMOTE_SHOCK, PLAYER, 15
 	applymovement PLAYER, CrossMurcottIslandApproach1_Movement
@@ -247,9 +249,12 @@ CrossBattle3Script1:
 	pause 10
 	domaptrigger MURCOTT_ISLAND, $1
 	setevent EVENT_MURCOTT_ISLAND_CROSS
+.End
 	end	
 	
-CrossBattle3Script2:	
+CrossBattle3Script2:
+	checkevent EVENT_MURCOTT_ISLAND_CROSS
+	iftrue .End
 	faceplayer
 	showemote EMOTE_SHOCK, PLAYER, 15
 	applymovement PLAYER, CrossMurcottIslandApproach2_Movement
@@ -302,6 +307,7 @@ CrossBattle3Script2:
 	pause 10
 	domaptrigger MURCOTT_ISLAND, $1
 	setevent EVENT_MURCOTT_ISLAND_CROSS
+.End
 	end
 	
 CrossMurcottIslandText:

maps/Trovitopolis.asm

@@ -42,9 +42,12 @@ TrovitopolisGrampsScript:
 	opentext
 	writetext TrovitopolisGrampsText
 	waitbutton
-	checkevent EVENT_CROSS_ON_PUMMELO
-	iffalse .done
-	checkitem RAINBOW_WING
+	;failsafe to give the rainbow wing on old saves that already beat Cross at Pummelo
+	checkevent EVENT_BEAT_ORANGE_LEAGUE
+	iffalse .done ;if you haven't beat the league, we are done (to beat the league you must beat Cross at Pummelo first)
+	checkevent EVENT_CROSS_CORRUPTED_SUNRAY
+	iftrue .done ;if you triggered this event, you already got the rainbow wing (but may not have it until you beat Cross at route 51)
+	checkitem RAINBOW_WING ;you beat Cross on Pummelo, but haven't triggered Marshadow's event (and thus losing the Rainbow Wing), so assume old save and give it to the player
 	iftrue .done
 	verbosegiveitem RAINBOW_WING
 	

trainers/trainers.asm

@@ -3899,7 +3899,7 @@ CrossGroup:
 
 	db $ff ; end
 
-; ================ PUMMELO (PICK CHARMANDER)
+; ================ ROUTE 51 (PICK CHARMANDER)
 
 	; CROSS (16)
 	db "CROSS@"
@@ -3945,7 +3945,7 @@ CrossGroup:
 
 	db $ff ; end
 
-; ================ PUMMELO (PICK SQUIRTLE)
+; ================ ROUTE 51 (PICK SQUIRTLE)
 
 	; CROSS (17)
 	db "CROSS@"
@@ -3991,7 +3991,7 @@ CrossGroup:
 
 	db $ff ; end
 
-; ================ PUMMELO (PICK BULBASAUR)
+; ================ ROUTE 51 (PICK BULBASAUR)
 
 	; CROSS (18)
 	db "CROSS@"