Split base stats

engine/mon_icons.asm

@@ -18,16 +18,16 @@ Function8e83f: ; 8e83f
 	push hl
 	push de
 	push bc
-	call Function8e849
+	call .LoadIcon
 	pop bc
 	pop de
 	pop hl
 	ret
 ; 8e849
 
-Function8e849: ; 8e849
+.LoadIcon: ; 8e849
 	ld d, 0
-	ld hl, .dw
+	ld hl, .Jumptable
 rept 2
 	add hl, de
 endr
@@ -38,23 +38,23 @@ endr
 ; 8e854
 
 
-.dw: ; 8e854 (23:6854)
+.Jumptable: ; 8e854 (23:6854)
 	dw Function8e8d5 ; init
 	dw Function8e961
 	dw Function8e97d
-	dw Function8e99a
+	dw Trade_LoadMonIconGFX
 	dw Function8e898
 	dw Mobile_InitPartyMenuBGPal71
-	dw Function8e862
+	dw .GetPartyMenuMonIcon
 
 
-Function8e862: ; 8e862 (23:6862)
+.GetPartyMenuMonIcon: ; 8e862 (23:6862)
 	call InitPartyMenuIcon
-	call Function8e86c
+	call .GetPartyMonItemGFX
 	call SetPartyMonIconAnimSpeed
 	ret
 
-Function8e86c: ; 8e86c (23:686c)
+.GetPartyMonItemGFX: ; 8e86c (23:686c)
 	push bc
 	ld a, [hObjectStructIndexBuffer]
 	ld hl, PartyMon1Item
@@ -63,22 +63,23 @@ Function8e86c: ; 8e86c (23:686c)
 	pop bc
 	ld a, [hl]
 	and a
-	jr z, .asm_8e890
+	jr z, .no_item
 	push hl
 	push bc
 	ld d, a
 	callab ItemIsMail
 	pop bc
 	pop hl
-	jr c, .asm_8e88e
+	jr c, .not_mail
 	ld a, $6
-	jr .asm_8e892
-.asm_8e88e
+	jr .got_tile
+.not_mail
 	ld a, $5
-	; jr .asm_8e892
-.asm_8e890
+	; jr .got_tile
+
+.no_item
 	ld a, $4
-.asm_8e892
+.got_tile
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld [hl], a
@@ -246,7 +247,7 @@ Function8e97d: ; 8e97d (23:697d)
 	ld [hl], SPRITE_ANIM_SEQ_NULL
 	ret
 
-Function8e99a: ; 8e99a (23:699a)
+Trade_LoadMonIconGFX: ; 8e99a (23:699a)
 	ld a, [wd265]
 	call ReadMonMenuIcon
 	ld [CurIcon], a

engine/money.asm

@@ -86,7 +86,7 @@ CompareFunds: ; 1600d
 	jr .skip_carry
 
 .set_carry
-	ld a, TRUE
+	ld a, 1
 	and a
 	scf
 .skip_carry

engine/sprite_anims.asm

@@ -218,7 +218,7 @@ DoAnimFrame: ; 8d24b
 	ret
 
 .five: ; 8d36c (23:536c)
-	callab Function11a3b
+	callab NamingScreen_AnimateCursor
 	ret
 
 .twelve: ; 8d373 (23:5373)

engine/trade/animation.asm

@@ -3,12 +3,12 @@ TradeAnimation: ; 28f24
 	ld [wcf66], a
 	ld hl, wPlayerTrademonSenderName
 	ld de, wOTTrademonSenderName
-	call Function297ff
+	call LinkTradeAnim_LoadTradePlayerNames
 	ld hl, wPlayerTrademonSpecies
 	ld de, wOTTrademonSpecies
-	call Function29814
+	call LinkTradeAnim_LoadTradeMonSpecies
 	ld de, .data_28f3f
-	jr Function28fa1
+	jr RunTradeAnimSequence
 
 .data_28f3f
 	tradeanim_setup_givemon_scroll
@@ -54,12 +54,12 @@ TradeAnimationPlayer2: ; 28f63
 	ld [wcf66], a
 	ld hl, wOTTrademonSenderName
 	ld de, wPlayerTrademonSenderName
-	call Function297ff
+	call LinkTradeAnim_LoadTradePlayerNames
 	ld hl, wOTTrademonSpecies
 	ld de, wPlayerTrademonSpecies
-	call Function29814
+	call LinkTradeAnim_LoadTradeMonSpecies
 	ld de, .data_28f7e
-	jr Function28fa1
+	jr RunTradeAnimSequence
 
 .data_28f7e
 	tradeanim_ot_sends_text_2
@@ -99,7 +99,7 @@ TradeAnimationPlayer2: ; 28f63
 	tradeanim_scroll_out_right
 	tradeanim_end
 
-Function28fa1: ; 28fa1
+RunTradeAnimSequence: ; 28fa1
 	ld hl, wTradeAnimPointer
 	ld [hl], e
 	inc hl
@@ -116,7 +116,7 @@ Function28fa1: ; 28fa1
 	ld a, [hl]
 	push af
 	set 4, [hl]
-	call Function28fdb
+	call .TradeAnimLayout
 	ld a, [wcf66]
 	and a
 	jr nz, .anim_loop
@@ -134,7 +134,7 @@ Function28fa1: ; 28fa1
 	ret
 ; 28fdb
 
-Function28fdb: ; 28fdb
+.TradeAnimLayout: ; 28fdb
 	xor a
 	ld [wJumptableIndex], a
 	call ClearBGPalettes
@@ -145,7 +145,7 @@ Function28fdb: ; 28fdb
 	callab ClearSpriteAnims
 	ld a, [hCGB]
 	and a
-	jr z, .asm_2900b
+	jr z, .NotCGB
 	ld a, $1
 	ld [rVBK], a
 	ld hl, VTiles0
@@ -155,7 +155,7 @@ Function28fdb: ; 28fdb
 	ld a, $0
 	ld [rVBK], a
 
-.asm_2900b
+.NotCGB
 	hlbgcoord 0, 0
 	ld bc, sScratch - VBGMap0
 	ld a, " "
@@ -182,7 +182,7 @@ Function28fdb: ; 28fdb
 	ld [hWY], a
 	callba GetTrademonFrontpic
 	call EnableLCD
-	call Function2982b
+	call LoadTradeBallAndCableGFX
 	ld a, [wPlayerTrademonSpecies]
 	ld hl, wPlayerTrademonDVs
 	ld de, VTiles0
@@ -313,7 +313,7 @@ TradeAnim_End: ; 29123
 TradeAnim_TubeToOT1: ; 29129
 	ld a, $ed
 	call Function292f6
-	ld a, [wc74c]
+	ld a, [wLinkTradeSendmonSpecies]
 	ld [wd265], a
 	xor a
 	depixel 5, 11, 4, 0
@@ -323,7 +323,7 @@ TradeAnim_TubeToOT1: ; 29129
 TradeAnim_TubeToPlayer1: ; 2913c
 	ld a, $ee
 	call Function292f6
-	ld a, [wc74d]
+	ld a, [wLinkTradeGetmonSpecies]
 	ld [wd265], a
 	ld a, $2
 	depixel 9, 18, 4, 4
@@ -350,7 +350,7 @@ Function2914e: ; 2914e
 	ld a, $70
 	ld [hWY], a
 	call EnableLCD
-	call Function2985a
+	call LoadTradeBubbleGFX
 	pop de
 	ld a, SPRITE_ANIM_INDEX_11
 	call _InitSpriteAnimStruct
@@ -476,7 +476,7 @@ TradeAnim_TubeToPlayer8: ; 29229
 	ld a, $90
 	ld [hWY], a
 	call EnableLCD
-	call Function2982b
+	call LoadTradeBallAndCableGFX
 	call WaitBGMap
 	call Function297ed
 	call TradeAnim_Next
@@ -1376,17 +1376,17 @@ Function297ed: ; 297ed
 	ld a, [hSGB]
 	and a
 	ld a, %11100100 ; 3,2,1,0
-	jr z, .asm_297f6
+	jr z, .not_sgb
 	ld a, $f0
 
-.asm_297f6
+.not_sgb
 	call DmgToCgbObjPal0
 	ld a, %11100100 ; 3,2,1,0
 	call DmgToCgbBGPals
 	ret
 ; 297ff
 
-Function297ff: ; 297ff
+LinkTradeAnim_LoadTradePlayerNames: ; 297ff
 	push de
 	ld de, wLinkPlayer1Name
 	ld bc, NAME_LENGTH
@@ -1398,11 +1398,11 @@ Function297ff: ; 297ff
 	ret
 ; 29814
 
-Function29814: ; 29814
+LinkTradeAnim_LoadTradeMonSpecies: ; 29814
 	ld a, [hl]
-	ld [wc74c], a
+	ld [wLinkTradeSendmonSpecies], a
 	ld a, [de]
-	ld [wc74d], a
+	ld [wLinkTradeGetmonSpecies], a
 	ret
 ; 2981d
 
@@ -1416,7 +1416,7 @@ Function2981d: ; 2981d
 	ret
 ; 2982b
 
-Function2982b: ; 2982b
+LoadTradeBallAndCableGFX: ; 2982b
 	call DelayFrame
 	ld de, TradeBallGFX
 	ld hl, VTiles0 tile $62
@@ -1431,13 +1431,13 @@ Function2982b: ; 2982b
 	lb bc, BANK(TradeCableGFX), $4
 	call Request2bpp
 	xor a
-	ld hl, wc300
+	ld hl, wSpriteAnimDict
 	ld [hli], a
 	ld [hl], $62
 	ret
 ; 2985a
 
-Function2985a: ; 2985a
+LoadTradeBubbleGFX: ; 2985a
 	call DelayFrame
 	ld e, $3
 	callab Function8e83f
@@ -1446,7 +1446,7 @@ Function2985a: ; 2985a
 	lb bc, BANK(TradeBubbleGFX), $4
 	call Request2bpp
 	xor a
-	ld hl, wc300
+	ld hl, wSpriteAnimDict
 	ld [hli], a
 	ld [hl], $62
 	ret