Labels relating to odd egg

constants/engine_flags.asm

@@ -5,7 +5,7 @@
 	const ENGINE_PHONE_CARD
 	const ENGINE_EXPN_CARD
 	const ENGINE_POKEGEAR
-	const ENGINE_DAYCARE_MONS_ARE_COMPATIBLE
+	const ENGINE_DAYCARE_MAN_HAS_EGG
 	const ENGINE_DAYCARE_MAN_HAS_MON
 	const ENGINE_DAYCARE_LADY_HAS_MON
 	const ENGINE_MOM_SAVING_MONEY

data/odd_eggs.asm

@@ -58,36 +58,36 @@ GiveOddEgg: ; 1fb4b6
 
 	; load species in wcd2a
 	ld a, EGG
-	ld [wcd2a], a
+	ld [wMobileMonSpeciesBuffer], a
 
-	; load pointer to wcd29 in wcd20
-	ld a, wcd29 % $100
-	ld [wcd20], a
-	ld a, wcd29 / $100
-	ld [wcd21], a
-	; load pointer to OddEggSpecies in wcd22
+	; load pointer to (wMobileMonSpeciesBuffer - 1) in wMobileMonSpeciesPointerBuffer
+	ld a, (wMobileMonSpeciesBuffer - 1) % $100
+	ld [wMobileMonSpeciesPointerBuffer], a
+	ld a, (wMobileMonSpeciesBuffer - 1) / $100
+	ld [wMobileMonSpeciesPointerBuffer + 1], a
+	; load pointer to OddEggSpecies in wMobileMonStructurePointerBuffer
 	ld a, OddEggSpecies % $100
-	ld [wcd22], a
+	ld [wMobileMonStructurePointerBuffer], a
 	ld a, OddEggSpecies / $100
-	ld [wcd23], a
+	ld [wMobileMonStructurePointerBuffer + 1], a
 
-	; load Odd Egg Name in wcd2b
+	; load Odd Egg Name in wTempOddEggNickname
 	ld hl, .Odd
-	ld de, wcd2b
+	ld de, wTempOddEggNickname
 	ld bc, PKMN_NAME_LENGTH
 	call CopyBytes
 
-	; load pointer to wcd2b in wcd24
-	ld a, wcd2b % $100
-	ld [wcd24], a
-	ld a, wcd2b / $100
-	ld [wcd25], a
-	; load pointer to wOddEggName in wcd26
+	; load pointer to wTempOddEggNickname in wMobileMonOTNamePointerBuffer
+	ld a, wTempOddEggNickname % $100
+	ld [wMobileMonOTNamePointerBuffer], a
+	ld a, wTempOddEggNickname / $100
+	ld [wMobileMonOTNamePointerBuffer + 1], a
+	; load pointer to wOddEggName in wMobileMonNicknamePointerBuffer
 	ld a, wOddEggName % $100
-	ld [wcd26], a
+	ld [wMobileMonNicknamePointerBuffer], a
 	ld a, wOddEggName / $100
-	ld [wcd27], a
-	callba Function11b98f
+	ld [wMobileMonNicknamePointerBuffer + 1], a
+	callba AddMobileMonToParty
 	ret
 ; 1fb546
 
@@ -102,19 +102,25 @@ prob_total = prob_total + (\1)
 ENDM
 
 prob_total = 0
-
+; Pichu
 	prob 8
 	prob 1
+; Cleffa
 	prob 16
 	prob 3
+; Igglybuff
 	prob 16
 	prob 3
+; Smoochum
 	prob 14
 	prob 2
+; Magby
 	prob 10
 	prob 2
+; Elekid
 	prob 12
 	prob 2
+; Tyrogue
 	prob 10
 	prob 1
 ; 1fb56e

engine/engine_flags.asm

@@ -99,8 +99,8 @@ ENDM
 	engine_flag wPokegearFlags, 7 ; on/off
 
 	;   wDaycareMan, 7 ; daycare 1 on
-	engine_flag wDaycareMan, 6 ; monster 1 and 2 are compatible
-	;   wDaycareMan, 5 ; egg is ready
+	engine_flag wDaycareMan, 6 ; egg is ready
+	;   wDaycareMan, 5 ; monster 1 and 2 are compatible
 	engine_flag wDaycareMan, 0 ; monster 1 in daycare
 
 	;   wDaycareLady, 7 = daycare 2 on

engine/specials.asm

@@ -147,7 +147,7 @@ SpecialsPointers:: ; c029
 	add_special Function_LoadOpponentTrainerAndPokemonsWithOTSprite
 	add_special Function11ba38
 	add_special SpecialCheckForBattleTowerRules
-	add_special Function117656
+	add_special Special_GiveOddEgg
 	add_special Reset
 	add_special Function1011f1
 	add_special Function101220

macros/map.asm

@@ -183,4 +183,3 @@ stonetable: MACRO
 	db \1, \2
 	dw \3
 endm
-

macros/trade_anim.asm

@@ -217,14 +217,14 @@ mobiletradeanim_end: macro
 	db mobiletradeanim_end_command ; 0c
 endm
 
-	enum mobiletradeanim_showwondertradegivemon_command
-mobiletradeanim_showwondertradegivemon: macro
-	db mobiletradeanim_showwondertradegivemon_command ; 0d
+	enum mobiletradeanim_showgtsgivemon_command
+mobiletradeanim_showgtsgivemon: macro
+	db mobiletradeanim_showgtsgivemon_command ; 0d
 endm
 
-	enum mobiletradeanim_showwondertradegetmon_command
-mobiletradeanim_showwondertradegetmon: macro
-	db mobiletradeanim_showwondertradegetmon_command ; 0e
+	enum mobiletradeanim_showgtsgetmon_command
+mobiletradeanim_showgtsgetmon: macro
+	db mobiletradeanim_showgtsgetmon_command ; 0e
 endm
 
 	enum mobiletradeanim_0f_command

maps/DayCare.asm

@@ -11,66 +11,66 @@ DayCare_MapScriptHeader:
 
 	; callbacks
 
-	dbw 2, UnknownScript_0x62f7b
+	dbw 2, .EggCheckCallback
 
-UnknownScript_0x62f7b:
-	checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE
-	iftrue UnknownScript_0x62f88
+.EggCheckCallback:
+	checkflag ENGINE_DAYCARE_MAN_HAS_EGG
+	iftrue .PutDaycareManOutside
 	clearevent EVENT_DAYCARE_MAN_IN_DAYCARE
 	setevent EVENT_DAYCARE_MAN_ON_ROUTE_34
 	return
 
-UnknownScript_0x62f88:
+.PutDaycareManOutside:
 	setevent EVENT_DAYCARE_MAN_IN_DAYCARE
 	clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34
 	return
 
-GrampsScript_0x62f8f:
+DayCareManScript_Inside:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_ODD_EGG
-	iftrue UnknownScript_0x62fbd
-	writetext UnknownText_0x630ce
+	iftrue .AlreadyHaveOddEgg
+	writetext DayCareManText_GiveOddEgg
 	buttonsound
 	closetext
 	checkcode VAR_PARTYCOUNT
-	if_equal $6, UnknownScript_0x62fb6
-	special Function117656
+	if_equal PARTY_LENGTH, .PartyFull
+	special Special_GiveOddEgg
 	opentext
-	writetext UnknownText_0x631ae
+	writetext DayCareText_GotOddEgg
 	playsound SFX_KEY_ITEM
 	waitsfx
-	writetext UnknownText_0x631c3
+	writetext DayCareText_DescribeOddEgg
 	waitbutton
 	closetext
 	setevent EVENT_GOT_ODD_EGG
 	end
 
-UnknownScript_0x62fb6:
+.PartyFull:
 	opentext
-	writetext UnknownText_0x63237
+	writetext DayCareText_PartyFull
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x62fbd:
+.AlreadyHaveOddEgg:
 	special Special_DayCareMan
 	waitbutton
 	closetext
 	end
 
-GrannyScript_0x62fc3:
+DayCareLadyScript:
 	faceplayer
 	opentext
-	checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE
-	iftrue UnknownScript_0x62fd1
+	checkflag ENGINE_DAYCARE_MAN_HAS_EGG
+	iftrue .HusbandWasLookingForYou
 	special Special_DayCareLady
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x62fd1:
-	writetext UnknownText_0x62fda
+.HusbandWasLookingForYou:
+	writetext Text_GrampsLookingForYou
 	waitbutton
 	closetext
 	end
@@ -78,12 +78,12 @@ UnknownScript_0x62fd1:
 DayCareBookshelf:
 	jumpstd difficultbookshelf
 
-UnknownText_0x62fda:
+Text_GrampsLookingForYou:
 	text "Gramps was looking"
 	line "for you."
 	done
 
-UnknownText_0x62ff7:
+Text_DayCareManTalksAboutEggTicket:
 	text "I'm the DAY-CARE"
 	line "MAN."
 
@@ -106,7 +106,7 @@ UnknownText_0x62ff7:
 	line "as well have it."
 	done
 
-UnknownText_0x630ce:
+DayCareManText_GiveOddEgg:
 	text "I'm the DAY-CARE"
 	line "MAN."
 
@@ -130,16 +130,16 @@ UnknownText_0x630ce:
 	line "yours to keep!"
 	done
 
-UnknownText_0x631a1:
+DayCareText_ComeAgain:
 	text "Come again."
 	done
 
-UnknownText_0x631ae:
+DayCareText_GotOddEgg:
 	text "<PLAYER> received"
 	line "ODD EGG!"
 	done
 
-UnknownText_0x631c3:
+DayCareText_DescribeOddEgg:
 	text "I found that when"
 	line "I was caring for"
 
@@ -153,7 +153,7 @@ UnknownText_0x631c3:
 	line "it around."
 	done
 
-UnknownText_0x63237:
+DayCareText_PartyFull:
 	text "You've no room for"
 	line "this."
 	done
@@ -179,5 +179,5 @@ DayCare_MapEventHeader:
 
 .PersonEvents:
 	db 2
-	person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x62f8f, EVENT_DAYCARE_MAN_IN_DAYCARE
-	person_event SPRITE_GRANNY, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GrannyScript_0x62fc3, -1
+	person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAYCARE_MAN_IN_DAYCARE
+	person_event SPRITE_GRANNY, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, DayCareLadyScript, -1

misc/battle_tower_5c.asm

@@ -26,9 +26,9 @@ Function1700c4: ; 1700c4
 	ld [$be46], a
 	ld hl, w3_dffc
 	ld de, $aa41
-	ld bc, $0004
+	ld bc, 4
 	call CopyBytes
-	ld hl, w3_d202
+	ld hl, w3_d202Name
 	ld de, $aa8e
 	ld bc, 7 * $cc ; length of battle tower struct from japanese games?
 	call CopyBytes
@@ -44,7 +44,7 @@ Function1700c4: ; 1700c4
 	ld e, l
 	ld d, h
 	ld hl, w3_dffc
-	ld bc, $0004
+	ld bc, 4
 	call CopyBytes
 	call CloseSRAM
 	pop af
@@ -54,17 +54,17 @@ Function1700c4: ; 1700c4
 
 Function170114: ; 170114
 	call InitBattleTowerChallengeRAM
-	call Function170121
+	call .Function170121
 	callba Function11805f
 	ret
 ; 170121
 
-Function170121: ; 170121
+.Function170121: ; 170121
 	ld a, $5
 	call GetSRAMBank
 	ld hl, $a948
 	ld de, wMisc
-	ld bc, $00f6 ; 246
+	ld bc, $f6 ; 246
 	call CopyBytes
 	call CloseSRAM
 	call Function170c8b
@@ -106,7 +106,7 @@ Function170139: ; 170139
 	ld e, l
 	ld d, h
 	ld hl, PlayerName
-	ld bc, $0005 ; Japanese name length
+	ld bc, 5 ; Japanese name length
 	call CopyBytes
 	ld bc, PlayerID
 	ld de, PlayerGender
@@ -152,17 +152,17 @@ Function170139: ; 170139
 	ld a, $4
 	call GetSRAMBank
 	ld hl, $a013
-	ld bc, $0024
+	ld bc, $24
 	call CopyBytes
 	call CloseSRAM
 	ld a, $5
 	call GetSRAMBank
 	ld hl, $a894
-	ld bc, $0006
+	ld bc, 6
 	call CopyBytes
 	ld hl, wMisc
 	ld de, $a948
-	ld bc, $00f6
+	ld bc, $f6
 	call CopyBytes
 	call CloseSRAM
 	ret
@@ -710,7 +710,7 @@ endr
 
 	ld hl, $a89c
 	ld de, StringBuffer3
-	ld bc, $0016
+	ld bc, $16
 	call CopyBytes
 
 	ld hl, $a8b2

misc/mobile_42.asm

@@ -1,12 +1,12 @@
-Function108000: ; 108000
+MobileTradeAnimation_SendGivemonToGTS: ; 108000
 	ld a, $80
 	ld [wcf65], a
-	ld de, Unknown_10800b
+	ld de, .TradeAnimScript
 	jp RunMobileTradeAnim_NoFrontpics
 ; 10800b
 
-Unknown_10800b:
-	mobiletradeanim_showwondertradegivemon
+.TradeAnimScript:
+	mobiletradeanim_showgtsgivemon
 	mobiletradeanim_12
 	mobiletradeanim_10
 	mobiletradeanim_sendmon 
@@ -14,23 +14,23 @@ Unknown_10800b:
 	mobiletradeanim_0f
 	mobiletradeanim_end
 
-Function108012:
+MobileTradeAnimation_RetrieveGivemonFromGTS:
 	ld a, $80
 	jr asm_108018
 
-Function108016: ; 108016
+MobileTradeAnimation_ReceiveGetmonFromGTS: ; 108016
 	ld a, $0
 asm_108018:
 	ld [wcf65], a
-	ld de, Unknown_108021
+	ld de, .TradeAnimScript
 	jp RunMobileTradeAnim_NoFrontpics
 ; 108021
 
-Unknown_108021:
+.TradeAnimScript:
 	mobiletradeanim_11
 	mobiletradeanim_07
 	mobiletradeanim_receivemon 
-	mobiletradeanim_showwondertradegetmon
+	mobiletradeanim_showgtsgetmon
 	mobiletradeanim_end
 
 Function108026: ; 108026
@@ -42,11 +42,11 @@ Function10802a: ; 10802a
 
 asm_10802c:
 	ld [wcf65], a
-	ld de, Unknown_108035
+	ld de, .TradeAnimScript
 	jp RunMobileTradeAnim_Frontpics
 ; 108035
 
-Unknown_108035: ; trade
+.TradeAnimScript: ; trade
 	mobiletradeanim_showgivemon
 	mobiletradeanim_12
 	mobiletradeanim_02
@@ -59,11 +59,11 @@ Unknown_108035: ; trade
 Function10803d: ; 10803d
 	ld a, $0
 	ld [wcf65], a
-	ld de, Unknown_108048
+	ld de, .TradeAnimScript
 	jp RunMobileTradeAnim_NoFrontpics
 ; 108048
 
-Unknown_108048:
+.TradeAnimScript:
 	mobiletradeanim_11
 	mobiletradeanim_07
 	mobiletradeanim_receivemon 
@@ -73,13 +73,13 @@ Unknown_108048:
 Function10804d: ; 10804d
 	ld a, $0
 	ld [wcf65], a
-	ld de, Unknown_108058
+	ld de, .TradeAnimScript
 	jp RunMobileTradeAnim_NoFrontpics
 ; 108058
 
-Unknown_108058:
+.TradeAnimScript:
 	mobiletradeanim_11
-	mobiletradeanim_showwondertradegetmon
+	mobiletradeanim_showgtsgetmon
 	mobiletradeanim_end
 
 RunMobileTradeAnim_Frontpics: ; 10805b
@@ -396,8 +396,8 @@ endr
 	jumptable MobileTradeAnim_GetTrademon3 ; 0a
 	jumptable MobileTradeAnim_ShowOTMonFromTrade ; 0b
 	jumptable EndMobileTradeAnim ; 0c
-	jumptable MobileTradeAnim_ShowPlayerMonForWonderTrade ; 0d
-	jumptable MobileTradeAnim_ShowOTMonFromWonderTrade ; 0e
+	jumptable MobileTradeAnim_ShowPlayerMonForGTS ; 0d
+	jumptable MobileTradeAnim_ShowOTMonFromGTS ; 0e
 	jumptable MobileTradeAnim_0f ; 0f
 	jumptable MobileTradeAnim_10 ; 10
 	jumptable MobileTradeAnim_11 ; 11
@@ -599,7 +599,7 @@ MobileTradeAnim_ShowOTMonFromTrade: ; 10839b
 	ret
 ; 10842c
 
-MobileTradeAnim_ShowPlayerMonForWonderTrade: ; 10842c
+MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c
 	ld de, MUSIC_EVOLUTION
 	call PlayMusic2
 	ld a, $80
@@ -676,7 +676,7 @@ MobileTradeAnim_ShowPlayerMonForWonderTrade: ; 10842c
 	ret
 ; 1084d7
 
-MobileTradeAnim_ShowOTMonFromWonderTrade: ; 1084d7
+MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -1672,15 +1672,15 @@ Function108c40: ; 108c40
 	ld a, $90
 	ld [hWY], a
 	ld a, [wcf65]
-	and $80
-	jr z, .asm_108c57
+	and %10000000
+	jr z, .Getmon
 	ld hl, .CameBack
 	call PrintText
 	ld c, 80
 	call DelayFrames
 	ret
 
-.asm_108c57
+.Getmon
 	ld hl, .TakeGoodCareOf
 	call PrintText
 	ld c, 80

misc/mobile_45.asm

@@ -7650,7 +7650,7 @@ Unknown_117356:
 
 SECTION "Mobile Stadium", ROMX, BANK[$45]
 
-Function117656: ; 117656
+Special_GiveOddEgg: ; 117656
 	callba GiveOddEgg
 	ret
 ; 11765d

misc/mobile_5f.asm

@@ -331,53 +331,53 @@ Function17d0f3: ; 17d0f3
 	ret
 ; 17d187
 
-Function17d187: ; 17d187
-	ld hl, Unknown_17d194
+Mobile_CopyDefaultOTName: ; 17d187
+	ld hl, Mobile5F_KrissName
 	ld de, $c63d
-	ld bc, $0005
+	ld bc, 5
 	call CopyBytes
 	ret
 ; 17d194
 
-Unknown_17d194:
+Mobile5F_KrissName:
 	db "クりス@@"
 ; 17d198
 
-Function17d199: ; 17d199
-	ld hl, Unknown_17d1a6
+Mobile_CopyDefaultNickname: ; 17d199
+	ld hl, .DefaultNickname
 	ld de, $c642
-	ld bc, $0005
+	ld bc, 5
 	call CopyBytes
 	ret
 ; 17d1a6
 
-Unknown_17d1a6:
+.DefaultNickname:
 	db "?????"
 
-Function17d1ab: ; 17d1ab
-	ld a, $50
+Mobile_CopyDefaultMail: ; 17d1ab
+	ld a, "@"
 	ld hl, $c647
-	ld bc, $0021
+	ld bc, MAIL_MSG_LENGTH + 1
 	call ByteFill
-	ld hl, Unknown_17d1c3
+	ld hl, .DefaultMessage
 	ld de, $c647
-	ld bc, $0006
+	ld bc, 6
 	call CopyBytes
 	ret
 ; 17d1c3
 
-Unknown_17d1c3:
+.DefaultMessage:
 	db "こんにちは@"
 ; 17d1c9
 
-Function17d1c9: ; 17d1c9
-	ld a, $50
+Mobile_CopyDefaultMailAuthor: ; 17d1c9
+	ld a, "@"
 	ld de, $c668
-	ld bc, $0005
+	ld bc, 5
 	call ByteFill
-	ld hl, Unknown_17d194
+	ld hl, Mobile5F_KrissName
 	ld de, $c668
-	ld bc, $0005
+	ld bc, 5
 	call CopyBytes
 	ret
 ; 17d1e1

wram.asm

@@ -1367,8 +1367,15 @@ wccba:: ds 102
 
 SECTION "Video", WRAM0
 CreditsPos::
-BGMapBuffer:: ; cd20
-wcd20:: ds 1
+BGMapBuffer::
+wMobileMonSpeciesPointerBuffer:: dw
+wMobileMonStructurePointerBuffer:: dw
+wMobileMonOTNamePointerBuffer:: dw
+wMobileMonNicknamePointerBuffer:: dw
+wMobileMonMailPointerBuffer:: dw
+	ds CreditsPos - @
+
+wcd20:: ds 1 ; cd20
 wcd21:: ds 1
 wcd22::
 CreditsTimer:: ; cd22
@@ -1381,7 +1388,9 @@ wcd26:: ds 1
 wcd27:: ds 1
 wcd28:: ds 1
 wcd29:: ds 1
+wMobileMonSpeciesBuffer::
 wcd2a:: ds 1
+wTempOddEggNickname::
 wcd2b:: ds 1
 wcd2c:: ds 1
 wcd2d:: ds 1