send gift mons w/o mail to box if party full (Rangi42#617)

Mizo1994 · Apr 8, 2021 · c08304a · c08304a
1 parent 1b711b2
commit c08304a
Show file tree

Hide file tree

Showing 26 changed files with 327 additions and 595 deletions.
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
@@ -42,6 +42,9 @@ MAX_DAY_CARE_EXP EQU $500000
 ; hall of fame
 HOF_MASTER_COUNT EQU 200
 
+; Kirk ID
+KIRK_SHUCKIE_ID EQU 00518
+
 ; crash error codes
 	const_def
 	const ERR_RST_0

diff --git a/data/events/special_pointers.asm b/data/events/special_pointers.asm
@@ -71,9 +71,7 @@ SpecialsPointers::
 	add_special Special_ActivateFishingSwarm
 	add_special ToggleMaptileDecorations
 	add_special ToggleDecorationsVisibility
-	add_special SpecialGiveShuckie
 	add_special ReturnShuckie
-	add_special TeachShuckiePoisonJab
 	add_special Special_BillsGrandfather
 	add_special SpecialCheckPokerus
 	add_special Special_DisplayCoinCaseBalance
@@ -115,7 +113,6 @@ SpecialsPointers::
 	add_special CheckCaughtCelebi
 	add_special JudgeMachine
 	add_special SpecialBuenasPassword
-	add_special TeachDratiniExtremeSpeed
 	add_special Special_SampleKenjiBreakCountdown
 	add_special SpecialBeastsCheck
 	add_special SpecialBirdsCheck
@@ -154,13 +151,11 @@ SpecialsPointers::
 	add_special RestoreMusic
 	add_special DeleteSavedMusic
 	add_special CheckIfTrendyPhraseIsLucky
-	add_special TeachMagikarpDragonRage
 	add_special Special_ChooseItem
 	add_special GetGourmetManiacPrice
 	add_special GetOreManiacPrice
 	add_special GetFossilManiacPrice
 	add_special Give_hMoneyTemp
-	add_special SetLastPartyMonBall
 	add_special CheckForSurfingPikachu
 	add_special InitializeHiddenGrotto
 	add_special GetHiddenGrottoContents

diff --git a/data/text/common.asm b/data/text/common.asm
@@ -2588,8 +2588,16 @@ MailMovedFromBoxText::
 	line "from the Mailbox."
 	prompt
 
-SECTION "Text_WasSentToBillsPC", ROMX
-Text_WasSentToBillsPC::
+SECTION "_ReceivedGiftMonText", ROMX
+_ReceivedGiftMonText::
+	text "<PLAYER> received"
+	line ""
+	text_ram wStringBuffer1
+	text "!"
+	done
+
+SECTION "_WasSentToBillsPCText", ROMX
+_WasSentToBillsPCText::
 	text_ram wStringBuffer1
 	text " was"
 	line "sent to Bill's PC."

diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm
@@ -703,8 +703,7 @@ DayCare_GenerateEgg:
 
 .GotMother:
 	ld [wCurPartySpecies], a
-	farcall GetPreEvolution
-	farcall GetPreEvolution
+	farcall GetBaseEvolution
 	ld a, EGG_LEVEL
 	ld [wCurPartyLevel], a
 

diff --git a/engine/events/shiny_ditto.asm b/engine/events/shiny_ditto.asm
@@ -88,3 +88,10 @@ endr
 
 .Nickname:
 	rawchar "Masuda@"
+
+_GetLastPartyMonAttribute:
+	ld a, [wPartyCount]
+	dec a
+	ld bc, PARTYMON_STRUCT_LENGTH
+	rst AddNTimes
+	ret
diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm
@@ -1,73 +1,3 @@
-KIRK_SHUCKIE_ID EQU 00518
-
-SpecialGiveShuckie:
-; Adding to the party.
-	xor a
-	ld [wMonType], a
-
-; Level 20 Shuckle.
-	ld a, SHUCKLE
-	ld [wCurPartySpecies], a
-	ld a, 20
-	ld [wCurPartyLevel], a
-
-	predef TryAddMonToParty
-	jr nc, .NotGiven
-
-; Caught data.
-	lb bc, MALE, NET_BALL
-	farcall SetGiftPartyMonCaughtData
-
-; Holding a Berry Juice.
-	ld hl, wPartyMon1Item
-	call _GetLastPartyMonAttribute
-	ld [hl], BERRY_JUICE
-
-; OT ID.
-	ld hl, wPartyMon1ID
-	call _GetLastPartyMonAttribute
-	ld a, HIGH(KIRK_SHUCKIE_ID)
-	ld [hli], a
-	ld [hl], LOW(KIRK_SHUCKIE_ID)
-
-; Nickname.
-	ld a, [wPartyCount]
-	dec a
-	ld hl, wPartyMonNicknames
-	call SkipNames
-	ld de, SpecialShuckleNickname
-	call CopyName2
-
-; OT and Extra.
-	ld a, [wPartyCount]
-	dec a
-	ld hl, wPartyMonOTs
-	call SkipNames
-	ld d, h
-	ld e, l
-	ld hl, SpecialShuckleOTAndExtra
-	ld bc, PLAYER_NAME_LENGTH + 3
-	rst CopyBytes
-
-; Engine flag for this event.
-	ld hl, wDailyFlags
-	set 5, [hl] ; ENGINE_GOT_SHUCKIE_TODAY
-	ld a, TRUE
-	ldh [hScriptVar], a
-	ret
-
-.NotGiven:
-	xor a ; ld a, FALSE
-	ldh [hScriptVar], a
-	ret
-
-_GetLastPartyMonAttribute:
-	ld a, [wPartyCount]
-	dec a
-	ld bc, PARTYMON_STRUCT_LENGTH
-	rst AddNTimes
-	ret
-
 ReturnShuckie:
 	farcall SelectMonFromParty
 	jr c, .refused
@@ -139,6 +69,3 @@ ReturnShuckie:
 SpecialShuckleOTAndExtra:
 	rawchar "Kirk@@@@"
 	db 0, 0, 0
-
-SpecialShuckleNickname:
-	rawchar "Shuckie@"
diff --git a/engine/events/special_movesets.asm b/engine/events/special_movesets.asm
diff --git a/engine/link/link.asm b/engine/link/link.asm
@@ -1658,11 +1658,8 @@ LinkTrade:
 	ld a, [hl]
 	ld [wCurPartySpecies], a
 	ld hl, wOTPartyMon1Species
-	ld a, c
-	call GetPartyLocation
-	ld de, wTempMonSpecies
-	ld bc, PARTYMON_STRUCT_LENGTH
-	rst CopyBytes
+	ld b, $80
+	farcall CopyBetweenPartyAndTemp
 	farcall AddTempMonToParty
 	ld a, [wPartyCount]
 	dec a

diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
@@ -1998,6 +1998,8 @@ Script_checkphonecall:
 	ret
 
 Script_givepoke:
+; return 0 in hScriptVar if no room in party or box
+; return 1 if sent to party, return 2 if sent to box
 	call GetScriptByte
 	ld [wCurPartySpecies], a
 	call GetScriptByte
@@ -2007,17 +2009,20 @@ Script_givepoke:
 	call GetScriptByte
 	ld [wCurItem], a
 	call GetScriptByte
+	ld [wGiftMonBall], a
+	call GetScriptByte
+	ld [wCurPlayerMove], a
+	call GetScriptByte
 	and a
 	ld b, a
 	jr z, .ok
 	ld hl, wScriptPos
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
+rept 6
 	call GetScriptByte
-	call GetScriptByte
-	call GetScriptByte
-	call GetScriptByte
+endr
 .ok
 	farcall GivePoke
 	ld a, b

diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm
@@ -701,6 +701,13 @@ EvoFlagAction:
 	pop de
 	ret
 
+GetBaseEvolution:
+; Find the first mon in the evolution chain including wCurPartySpecies.
+
+; Return carry and the new species in wCurPartySpecies
+; if a base evolution is found.
+
+	call GetPreEvolution
 GetPreEvolution:
 ; Find the first mon to evolve into wCurPartySpecies.