shithub: pokecrystal

Download patch

ref: 3eed7c4ab0fcf95acad67031b0637ffc0399ac10
parent: 0e05c9123956bc5530851e5c947717710b44e27b
author: JimB16 <[email protected]>
date: Sun Aug 23 18:30:37 EDT 2015

changed labels

--- a/main.asm
+++ b/main.asm
@@ -2938,7 +2938,7 @@
 
 ; Caught data.
 	ld b, 0
-	callba Function4dba3
+	callba SetPkmnCaughtData
 
 ; Holding a Berry.
 	ld bc, PartyMon2 - PartyMon1
@@ -9562,7 +9562,7 @@
 	ld [hli], a
 	ld [hl], $e9
 	pop bc
-	callba Function4dba3
+	callba SetPkmnCaughtData
 	jr .asm_e3b2
 
 .asm_e35e
@@ -9604,7 +9604,7 @@
 	callba Function4db49
 
 .asm_e3a6
-	callba Function4db3b
+	callba GiveANickname_YesNo
 	pop de
 	jr c, .asm_e3b2
 	call Functione3de
@@ -44804,7 +44804,7 @@
 	ld de, wd050
 	ld bc, $000b
 	call CopyBytes
-	call Function4db3b
+	call GiveANickname_YesNo
 	jr c, .asm_4da66
 	ld a, [PartyCount]
 	dec a
@@ -44868,7 +44868,7 @@
 	ld a, [CurPartySpecies]
 	ld [wd265], a
 	call GetPokemonName
-	call Function4db3b
+	call GiveANickname_YesNo
 	ld hl, StringBuffer1
 	jr c, .asm_4daf7
 	ld a, BOXMON
@@ -44915,13 +44915,13 @@
 ; 4db3b
 
 
-Function4db3b: ; 4db3b
-	ld hl, UnknownText_0x4db44
+GiveANickname_YesNo: ; 4db3b
+	ld hl, TextJump_GiveANickname
 	call PrintText
 	jp YesNoBox
 ; 4db44
 
-UnknownText_0x4db44: ; 0x4db44
+TextJump_GiveANickname: ; 0x4db44
 	; Give a nickname to the @  you received?
 	text_jump UnknownText_0x1c12fc
 	db "@"
@@ -44987,7 +44987,7 @@
 	ret
 ; 4dba3
 
-Function4dba3: ; 4dba3
+SetPkmnCaughtData: ; 4dba3
 	ld a, [PartyCount]
 	dec a
 	ld hl, PartyMon1CaughtLevel
@@ -87759,7 +87759,7 @@
 	jr c, .asm_fcd1c
 	ld b, 1
 .asm_fcd1c
-	callba Function4dba3
+	callba SetPkmnCaughtData
 
 	ld e, TRADE_NICK
 	call GetTradeAttribute
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -2388,7 +2388,7 @@
 	ld a, [hli]
 	ld b, a
 	push hl
-	callba Function4dba3
+	callba SetPkmnCaughtData
 	pop hl
 	pop bc
 	jr .asm_17df5e