Added w3 and w5 labels for misc/mobile_40.asm

battle/core.asm

@@ -3,7 +3,7 @@ BattleCore:
 ; Core components of the battle engine.
 
 
-Function3c000: ; 3c000
+SendOutFirstMons: ; 3c000
 	xor a
 	ld [wBattleParticipantsNotFainted], a
 	ld [wc6fc], a
@@ -2506,7 +2506,7 @@ WinTrainerBattle: ; 3cfa4
 
 .mobile
 	call Function3ebd8
-	ld c, $28
+	ld c, 40
 	call DelayFrames
 	ld c, $4
 	callba Function4ea0a
@@ -2514,12 +2514,12 @@ WinTrainerBattle: ; 3cfa4
 
 .battle_tower
 	call Function3ebd8
-	ld c, $28
+	ld c, 40
 	call DelayFrames
 	call EmptyBattleTextBox
 	ld c, $3
 	callba BattleTowerText
-	call Functiona80
+	call WaitPressAorB_BlinkCursor
 	ld hl, wPayDayMoney
 	ld a, [hli]
 	or [hl]
@@ -3135,7 +3135,7 @@ LostBattle: ; 3d38e
 	call EmptyBattleTextBox
 	ld c, 2
 	callba BattleTowerText
-	call Functiona80
+	call WaitPressAorB_BlinkCursor
 	call ClearTileMap
 	call WhiteBGMap
 	ret
@@ -7713,7 +7713,7 @@ endr
 	predef PrintTempMonStats
 	ld c, $1e
 	call DelayFrames
-	call Functiona80
+	call WaitPressAorB_BlinkCursor
 	call Call_LoadTempTileMapToTileMap
 	xor a ; PARTYMON
 	ld [MonType], a
@@ -8474,8 +8474,8 @@ StartBattle: ; 3f4c1
 	ld a, [TimeOfDayPal]
 	push af
 	call BattleIntro
-	call Function3c000
+	call SendOutFirstMons
-	call Function3f69e
+	call ExitBattle
 	pop af
 	ld [TimeOfDayPal], a
 	scf
@@ -8483,8 +8483,9 @@ StartBattle: ; 3f4c1
 ; 3f4d9
 
 
-Function3f4d9: ; 3f4d9
+_SendOutFirstMons: ; 3f4d9
-	call Function3c000
+; unreferenced
+	call SendOutFirstMons
 	ret
 ; 3f4dd
 
@@ -8716,9 +8717,9 @@ Function3f662: ; 3f662
 ; 3f69e
 
 
-Function3f69e: ; 3f69e
+ExitBattle: ; 3f69e
 	call Function3f6a5
-	call Function3f6d0
+	call CleanUpBattleRAM
 	ret
 ; 3f6a5
 
@@ -8726,7 +8727,7 @@ Function3f6a5: ; 3f6a5
 	ld a, [wLinkMode]
 	and a
 	jr z, .not_linked
-	call Function3f759
+	call ShowLinkBattleParticipantsAfterEnd
 	ld c, 150
 	call DelayFrames
 	call Function3f77c
@@ -8736,7 +8737,7 @@ Function3f6a5: ; 3f6a5
 	ld a, [wBattleResult]
 	and $f
 	ret nz
-	call Function3f71d
+	call CheckPayDay
 	xor a
 	ld [wd1e9], a
 	predef Function421e6
@@ -8744,7 +8745,7 @@ Function3f6a5: ; 3f6a5
 	ret
 ; 3f6d0
 
-Function3f6d0: ; 3f6d0
+CleanUpBattleRAM: ; 3f6d0
 	call Function3f998
 	xor a
 	ld [Danger], a
@@ -8777,7 +8778,7 @@ Function3f6d0: ; 3f6d0
 	ret
 ; 3f71d
 
-Function3f71d: ; 3f71d
+CheckPayDay: ; 3f71d
 	ld hl, wPayDayMoney
 	ld a, [hli]
 	or [hl]
@@ -8786,21 +8787,21 @@ Function3f71d: ; 3f71d
 	ret z
 	ld a, [wc73d]
 	and a
-	jr z, .asm_3f73d
+	jr z, .okay
 	ld hl, wPayDayMoney + 2
 	sla [hl]
 	dec hl
 	rl [hl]
 	dec hl
 	rl [hl]
-	jr nc, .asm_3f73d
+	jr nc, .okay
 	ld a, $ff
 rept 2
 	ld [hli], a
 endr
 	ld [hl], a
 
-.asm_3f73d
+.okay
 	ld hl, wPayDayMoney + 2
 	ld de, Money + 2
 	call Function3d0be
@@ -8814,7 +8815,7 @@ endr
 	ret
 ; 3f759
 
-Function3f759: ; 3f759
+ShowLinkBattleParticipantsAfterEnd: ; 3f759
 	callba MobileFn_1060df
 	callba BackupMobileEventIndex
 	ld a, [CurOTMon]
@@ -8829,13 +8830,15 @@ Function3f759: ; 3f759
 
 Function3f77c: ; 3f77c
 	callba CheckMobileBattleError
-	jp c, Function3f80f
+	jp c, .Mobile_InvalidBattle
-	call Function3f830
+	call IsMobileBattle2
 	jr nz, .proceed
+
 	ld hl, wcd2a
 	bit 4, [hl]
 	jr z, .proceed
-	callba Function2b930
+
+	callba DetermineLinkBattleResult
 
 .proceed
 	ld a, [wBattleResult]
@@ -8843,17 +8846,17 @@ Function3f77c: ; 3f77c
 	cp $1
 	jr c, .victory
 	jr z, .loss
-	callba MobileFn_106107
+	callba MobileFn_SaveBattleResult_Draw
 	ld de, .Draw
 	jr .store_result
 
 .victory
-	callba MobileFn_1060fb
+	callba MobileFn_SaveBattleResult_Win
 	ld de, .Win
 	jr .store_result
 
 .loss
-	callba MobileFn_106101
+	callba MobileFn_SaveBattleResult_Lose
 	ld de, .Lose
 	jr .store_result
 
@@ -8872,13 +8875,13 @@ Function3f77c: ; 3f77c
 
 	call CloseSRAM
 
-	call Function3f830
+	call IsMobileBattle2
-	jr z, .asm_3f7ee
+	jr z, .mobile
-	call Functiona80
+	call WaitPressAorB_BlinkCursor
 	call ClearTileMap
 	ret
 
-.asm_3f7ee
+.mobile
 	ld c, 200
 	call DelayFrames
 	call ClearTileMap
@@ -8894,11 +8897,11 @@ Function3f77c: ; 3f77c
 ; 3f80f
 
 
-Function3f80f: ; 3f80f
+.Mobile_InvalidBattle: ; 3f80f
 	hlcoord 6, 8
 	ld de, .Invalid
 	call PlaceString
-	ld c, $c8
+	ld c, 200
 	call DelayFrames
 	call ClearTileMap
 	ret
@@ -8909,7 +8912,7 @@ Function3f80f: ; 3f80f
 ; 3f830
 
 
-Function3f830: ; 3f830
+IsMobileBattle2: ; 3f830
 	ld a, [wLinkMode]
 	cp LINK_MOBILE
 	ret
@@ -8919,7 +8922,9 @@ Function3f830: ; 3f830
 Function3f836: ; 3f836
 	ld a, BANK(sLinkBattleStats)
 	call GetSRAMBank
+
 	call Function3f85f
+
 	call CloseSRAM
 	hlcoord 0, 0, AttrMap
 	xor a
@@ -8931,7 +8936,7 @@ Function3f836: ; 3f836
 	call SetPalettes
 	ld c, $8
 	call DelayFrames
-	call Functiona80
+	call WaitPressAorB_BlinkCursor
 	ret
 ; 3f85f
 
@@ -9634,7 +9639,7 @@ BattleStartMessage: ; 3fc8b
 	pop hl
 	call StdBattleTextBox
 
-	call Function3f830
+	call IsMobileBattle2
 	ret nz
 
 	ld c, $2

engine/breeding/egg.asm

@@ -894,7 +894,7 @@ Special_DayCareMon2: ; 17440
 	jp PrintText
 
 Function1745f: ; 1745f
-	jp Functiona80
+	jp WaitPressAorB_BlinkCursor
 ; 17462
 
 UnknownText_0x17462: ; 0x17462

engine/clock_reset.asm

@@ -99,7 +99,7 @@ RestartClock: ; 20021 (8:4021)
 	call .PrintTime
 	ld hl, .Text_ClockReset
 	call PrintText
-	call Functiona80
+	call WaitPressAorB_BlinkCursor
 	xor a
 	ret
 

engine/diploma.asm

@@ -1,7 +1,7 @@
 
 Function1dd702: ; 1dd702
 	call Function1dd709
-	call Functiona80
+	call WaitPressAorB_BlinkCursor
 	ret
 ; 1dd709
 

home.asm

@@ -1623,7 +1623,7 @@ PrintWinLossText:: ; 3718
 	call GetMapScriptHeaderBank
 	call FarPrintText
 	call WaitBGMap
-	call Functiona80
+	call WaitPressAorB_BlinkCursor
 	ret
 ; 3741
 

home/copy2.asm

@@ -98,7 +98,9 @@ FarCopyWRAM:: ; 306b
 	push af
 	ld a, [hBuffer]
 	ld [rSVBK], a
+
 	call CopyBytes
+
 	pop af
 	ld [rSVBK], a
 	ret

home/joypad.asm

@@ -355,7 +355,7 @@ JoyTextDelay:: ; a57
 	ret
 ; a80
 
-Functiona80:: ; a80
+WaitPressAorB_BlinkCursor:: ; a80
 	ld a, [hMapObjectIndexBuffer]
 	push af
 	ld a, [hObjectStructIndexBuffer]
@@ -368,7 +368,7 @@ Functiona80:: ; a80
 .loop
 	push hl
 	hlcoord 18, 17
-	call Functionb06
+	call BlinkCursor
 	pop hl
 
 	call JoyTextDelay
@@ -383,7 +383,7 @@ Functiona80:: ; a80
 	ret
 ; aa5
 
-Functionaa5:: ; aa5
+SimpleWaitPressAorB:: ; aa5
 .loop
 	call JoyTextDelay
 	ld a, [hJoyLast]
@@ -451,14 +451,14 @@ KeepTextOpen:: ; aaf
 	ret
 ; b06
 
-Functionb06:: ; b06
+BlinkCursor:: ; b06
 	push bc
 	ld a, [hl]
 	ld b, a
 	ld a, "▼"
 	cp b
 	pop bc
-	jr nz, .asm_b27
+	jr nz, .place_arrow
 	ld a, [hMapObjectIndexBuffer]
 	dec a
 	ld [hMapObjectIndexBuffer], a
@@ -475,7 +475,7 @@ Functionb06:: ; b06
 	ld [hObjectStructIndexBuffer], a
 	ret
 
-.asm_b27
+.place_arrow
 	ld a, [hMapObjectIndexBuffer]
 	and a
 	ret z
@@ -488,9 +488,9 @@ Functionb06:: ; b06
 	dec a
 	ld [hObjectStructIndexBuffer], a
 	ret nz
-	ld a, $6
+	ld a, 6
 	ld [hObjectStructIndexBuffer], a
-	ld a, $ee
+	ld a, "▼"
 	ld [hl], a
 	ret
 ; b40

items/item_effects.asm

@@ -1438,7 +1438,7 @@ RareCandy: ; ef14
 	ld bc, $0004
 	predef PrintTempMonStats
 
-	call Functiona80
+	call WaitPressAorB_BlinkCursor
 
 	xor a ; PARTYMON
 	ld [MonType], a
@@ -1921,7 +1921,7 @@ Functionf279: ; f279 (3:7279)
 	ld [hBGMapMode], a
 	ld c, $32
 	call DelayFrames
-	jp Functiona80
+	jp WaitPressAorB_BlinkCursor
 
 Functionf299: ; f299 (3:7299)
 	call WontHaveAnyEffectMessage
@@ -2943,7 +2943,7 @@ Functionf789: ; f789
 	ld hl, UsedItemText
 	call PrintText
 	call Play_SFX_FULL_HEAL
-	call Functiona80
+	call WaitPressAorB_BlinkCursor
 	; fallthrough
 ; f795
 

misc/mobile_40.asm

@@ -6,15 +6,18 @@ Function100000: ; 100000
 	push af
 	ld a, $1
 	ld [rSVBK], a
+
 	call Function100022
 	call Function1000ba
 	call Function100675
 	call Function100057
 	call Function10016f
 	call Function100276
+
 	push bc
 	call Function100301
 	pop bc
+
 	pop af
 	ld [rSVBK], a
 	ret
@@ -313,11 +316,14 @@ Function10020b: ; 10020b
 	callba Function106464
 	call HideSprites
 	call DelayFrame
+
 	ld a, [rSVBK]
 	push af
 	ld a, $1
 	ld [rSVBK], a
+
 	callba Function17f555
+
 	pop af
 	ld [rSVBK], a
 	ret
@@ -400,7 +406,7 @@ Function1002c9: ; 1002c9
 	ld hl, wcd2a
 	bit 0, [hl]
 	ret z
-	callba Function3f6d0
+	callba CleanUpBattleRAM
 	callba LoadPokemonData
 	ret
 ; 1002dc
@@ -537,7 +543,7 @@ Function100393: ; 100393
 
 Function10039c: ; 10039c
 	ld hl, wcc60
-	ld de, wd000
+	ld de, w3_d000
 	ld bc, $0054
 	ld a, $3
 	call FarCopyWRAM
@@ -545,7 +551,7 @@ Function10039c: ; 10039c
 ; 1003ab
 
 Function1003ab: ; 1003ab
-	ld hl, wd000
+	ld hl, w3_d000
 	ld de, wcc60
 	ld bc, $0054
 	ld a, $3
@@ -555,7 +561,7 @@ Function1003ab: ; 1003ab
 
 Function1003ba: ; 1003ba
 	ld hl, wccb4
-	ld de, $d080
+	ld de, w3_d080
 	ld bc, $0054
 	ld a, $3
 	call FarCopyWRAM
@@ -563,7 +569,7 @@ Function1003ba: ; 1003ba
 ; 1003c9
 
 Function1003c9: ; 1003c9
-	ld hl, $d080
+	ld hl, w3_d080
 	ld de, wccb4
 	ld bc, $0054
 	ld a, $3
@@ -1501,7 +1507,7 @@ Function100902: ; 100902
 	ld de, SFX_4_NOTE_DITTY
 	call PlaySFX
 	callba Function104061
-	ld c, $78
+	ld c, 120
 	call DelayFrames
 	ret
 ; 10095a
@@ -1515,10 +1521,10 @@ Function100902: ; 100902
 
 Function100970: ; 100970
 	hlcoord 0, 0
-	ld de, wdc00
+	ld de, w3_dc00
 	call Function1009a5
 	hlcoord 0, 0, AttrMap
-	ld de, $dd68
+	ld de, w3_dd68
 	call Function1009a5
 	call Function1009d2
 	call Function1009ae
@@ -1526,12 +1532,12 @@ Function100970: ; 100970
 ; 100989
 
 Function100989: ; 100989
-	ld hl, wdc00
+	ld hl, w3_dc00
 	decoord 0, 0
 	call Function1009a5
 	call Function1009ae
 	callba Function104061
-	ld hl, $dd68
+	ld hl, w3_dd68
 	decoord 0, 0, AttrMap
 	call Function1009a5
 	ret
@@ -1549,23 +1555,25 @@ Function1009ae: ; 1009ae
 	push af
 	ld a, $3
 	ld [rSVBK], a
-	ld hl, $d800
+
+	ld hl, w3_d800
 	decoord 0, 0, AttrMap
-	ld c, $14
+	ld c, SCREEN_WIDTH
-	ld b, $12
+	ld b, SCREEN_HEIGHT
-.asm_1009bf
+.loop_row
 	push bc
-.asm_1009c0
+.loop_col
 	ld a, [hli]
 	ld [de], a
 	inc de
 	dec c
-	jr nz, .asm_1009c0
+	jr nz, .loop_col
-	ld bc, $000c
+	ld bc, 12
 	add hl, bc
 	pop bc
 	dec b
-	jr nz, .asm_1009bf
+	jr nz, .loop_row
+
 	pop af
 	ld [rSVBK], a
 	ret
@@ -1576,16 +1584,20 @@ Function1009d2: ; 1009d2
 	push af
 	ld a, $3
 	ld [rSVBK], a
+
 	ld a, [rVBK]
 	push af
 	ld a, $1
 	ld [rVBK], a
-	ld hl, $d800
+
+	ld hl, w3_d800
 	ld de, VBGMap0
 	lb bc, $3, $24
 	call Get2bpp
+
 	pop af
 	ld [rVBK], a
+
 	pop af
 	ld [rSVBK], a
 	ret
@@ -1613,7 +1625,7 @@ Function100a09: ; 100a09
 	ld [wd431], a
 	callba Function4000
 	ld a, [wLinkMode]
-	cp $4
+	cp LINK_MOBILE
 	jr nz, .asm_100a2a
 
 	call Function100a87
@@ -2538,7 +2550,7 @@ Function101050: ; 101050
 	call Function10107d
 	ld a, [OTPartyCount]
 rept 2
-	ld hl, $c608
+	ld hl, wc608
 endr
 	ld bc, $01b3
 	call Function1010de
@@ -2548,7 +2560,7 @@ endr
 	ld [hl], d
 	ld a, $7
 	call GetSRAMBank
-	ld hl, $c608
+	ld hl, wc608
 	ld de, $a001
 	ld bc, $01b5
 	call CopyBytes
@@ -2558,28 +2570,28 @@ endr
 
 Function10107d: ; 10107d
 	xor a
-	ld hl, $c608
+	ld hl, wc608
 	ld bc, $01b5
 	call ByteFill
 	ld hl, wd26b
-	ld de, $c608
+	ld de, wc608
 	ld bc, $000b
 	call CopyBytes
 	ld hl, wd271
 	ld a, [hli]
-	ld [$c608 + 11], a
+	ld [wc608 + 11], a
 	ld a, [hl]
-	ld [$c608 + 12], a
+	ld [wc608 + 12], a
 	ld hl, OTPartyMonNicknames
-	ld de, $c608 + 13
+	ld de, wc608 + 13
 	ld bc, $000b
 	call Function1010cd
 	ld hl, OTPartyMonOT
-	ld de, $c656 + 1
+	ld de, wc656 + 1
 	ld bc, $000b
 	call Function1010cd
 	ld hl, OTPartyMon1Species
-	ld de, $c68a + 15
+	ld de, wc68a + 15
 	ld bc, $0030
 	call Function1010cd
 	ld a, $50
@@ -2707,9 +2719,9 @@ Function101181: ; 101181
 	ld bc, $000b
 
 asm_101184:
-	ld a, $c608 % $100
+	ld a, wc608 % $100
 	ld [StringBuffer2], a
-	ld a, $c608 / $100
+	ld a, wc608 / $100
 	ld [StringBuffer2 + 1], a
 	ld a, c
 	ld [StringBuffer2 + 2], a
@@ -2751,7 +2763,7 @@ asm_101184:
 	call Function1011df
 	ld d, h
 	ld e, l
-	ld hl, $c608
+	ld hl, wc608
 	call CopyBytes
 	ret
 ; 1011df
@@ -3368,11 +3380,11 @@ Function10158a: ; 10158a
 ; 10159d
 
 Function10159d: ; 10159d
-	ld de, $c608
+	ld de, wc608
 	callba Function100edf
-	ld de, $c608
+	ld de, wc608
 	ld a, $5
-	ld hl, $d800
+	ld hl, w5_d800
 	call Function10174c
 	ld a, $0
 	ld [wcd26], a
@@ -3383,11 +3395,11 @@ Function10159d: ; 10159d
 ; 1015be
 
 Function1015be: ; 1015be
-	ld de, $c608
+	ld de, wc608
 	callba Function100eed
-	ld de, $c608
+	ld de, wc608
 	ld a, $5
-	ld hl, $d800
+	ld hl, w5_d800
 	call Function10174c
 	ld a, $0
 	ld [wcd26], a
@@ -3398,11 +3410,11 @@ Function1015be: ; 1015be
 ; 1015df
 
 Function1015df: ; 1015df
-	ld de, $c608
+	ld de, wc608
 	callba Function100ef4
-	ld de, $c608
+	ld de, wc608
 	ld a, $5
-	ld hl, $d800
+	ld hl, w5_d800
 	call Function10174c
 	ld a, $0
 	ld [wcd26], a
@@ -3413,12 +3425,12 @@ Function1015df: ; 1015df
 ; 101600
 
 Function101600: ; 101600
-	ld hl, $d800
+	ld hl, w5_d800
-	ld de, $c608
+	ld de, wc608
 	ld bc, $01e0
 	ld a, $5
 	call FarCopyWRAM
-	ld de, $c608
+	ld de, wc608
 	callba Function100ee6
 	ld a, [wcd25]
 	inc a
@@ -3443,14 +3455,14 @@ Function10162a: ; 10162a
 ; 101635
 
 Function101635: ; 101635
-	ld de, $c608
+	ld de, wc608
 	ld bc, $01e0
 	call FarCopyWRAM
 	ret
 ; 10163f
 
 Function10163f: ; 10163f
-	ld hl, $c608
+	ld hl, wc608
 	ld bc, $01e0
 	call FarCopyWRAM
 	ret
@@ -3458,34 +3470,34 @@ Function10163f: ; 10163f
 
 Function101649: ; 101649
 	ld a, $5
-	ld hl, $d800
+	ld hl, w5_d800
 	call Function101635
 	ld a, $5
-	ld de, wda00
+	ld de, w5_da00
 	call Function10163f
 	ret
 ; 10165a
 
 Function10165a: ; 10165a
 	ld a, $5
-	ld hl, wda00
+	ld hl, w5_da00
 	call Function101635
 	ret
 ; 101663
 
 Function101663: ; 101663
 	ld a, $5
-	ld hl, $d800
+	ld hl, w5_d800
 	call Function101635
 	ld a, $5
-	ld de, wdc00
+	ld de, w5_dc00
 	call Function10163f
 	ret
 ; 101674
 
 Function101674: ; 101674 ; unreferenced
 	ld a, $5
-	ld hl, wdc00
+	ld hl, w5_dc00
 	call Function101635
 	ret
 ; 10167d
@@ -4008,16 +4020,19 @@ Function1019ee: ; 1019ee
 	push af
 	ld a, $5
 	ld [rSVBK], a
-	ld bc, wdc0d
+
-	ld de, wdc11
+	ld bc, w5_dc0d
+	ld de, w5_dc11
 	callba Function4e929
+
 	pop af
 	ld [rSVBK], a
+
 	ld a, c
 	ld [OtherTrainerClass], a
 	ld hl, wd26b
-	ld de, $c656
+	ld de, wc656
-	ld bc, $000b
+	ld bc, NAME_LENGTH
 	call CopyBytes
 	ld a, [wcd2f]
 	and a
@@ -4040,8 +4055,8 @@ Function101a21: ; 101a21
 	ld a, $1
 	ld [wc2d7], a
 	callba BattleIntro
-	callba Function3c000
+	callba SendOutFirstMons
-	callba Function3f759
+	callba ShowLinkBattleParticipantsAfterEnd
 	xor a
 	ld [wc2d7], a
 	ld a, $ff
@@ -4057,7 +4072,7 @@ Function101a4f: ; 101a4f
 	callba Function3f77c
 	xor a
 	ld [wc2d7], a
-	callba Function3f6d0
+	callba CleanUpBattleRAM
 	callba LoadPokemonData
 	call Function1013c0
 	ld a, [wcd25]
@@ -4940,10 +4955,10 @@ Function1020ea: ; 1020ea
 	bit 2, [hl]
 	jr nz, .asm_102110
 	call Function10218d
-	ld hl, $c608
+	ld hl, wc608
 	bit 4, [hl]
 	jr z, .asm_102110
-	ld hl, $c608
+	ld hl, wc608
 	bit 2, [hl]
 	jr nz, .asm_102110
 	call Function102112
@@ -4963,7 +4978,7 @@ Function102112: ; 102112
 	ld c, $28
 .asm_10211c
 	push hl
-	ld de, $c60f
+	ld de, wc60f
 	ld b, $1f
 .asm_102122
 	ld a, [de]
@@ -5022,7 +5037,7 @@ Function102142: ; 102142
 ; 102180
 
 Function102180: ; 102180
-	ld hl, $c608 + 1
+	ld hl, wc608 + 1
 	ld de, StringBuffer2
 	ld bc, $000b
 	call CopyBytes
@@ -5031,18 +5046,18 @@ Function102180: ; 102180
 
 Function10218d: ; 10218d
 	ld hl, wdc00
-	ld de, $c608
+	ld de, wc608
 	ld bc, $0026
 	ld a, $5
 	call FarCopyWRAM
-	ld de, $c608 + 1
+	ld de, wc608 + 1
 	ret
 ; 10219f
 
 Function10219f: ; 10219f
 	call FadeToMenu
 	call Function10218d
-	ld de, $c608 + 1
+	ld de, wc608 + 1
 	callba Function8ac4e
 	call JoyWaitAorB
 	call PlayClickSFX
@@ -5053,7 +5068,7 @@ Function10219f: ; 10219f
 Function1021b8: ; 1021b8
 	call FadeToMenu
 	call Function10218d
-	ld de, $c60f
+	ld de, wc60f
 	callba Function8ac70
 	ld a, c
 	ld [StringBuffer1], a
@@ -6336,7 +6351,7 @@ Function102a3b: ; 102a3b
 	ld a, [wcd30]
 	ld [wc74e], a
 	ld hl, PlayerName
-	ld de, $c6e7
+	ld de, wc6e7
 	ld bc, $000b
 	call CopyBytes
 	ld a, [wcd4c]
@@ -6346,12 +6361,12 @@ Function102a3b: ; 102a3b
 	ld hl, PartySpecies
 	add hl, bc
 	ld a, [hl]
-	ld [$c6d0], a
+	ld [wc6d0], a
 	ld a, [wcd4c]
 	dec a
 	ld hl, PartyMonOT
 	call SkipNames
-	ld de, $c6f2
+	ld de, wc6f2
 	ld bc, $000b
 	call CopyBytes
 	ld a, [wcd4c]
@@ -6359,7 +6374,7 @@ Function102a3b: ; 102a3b
 	ld hl, PartyMon1ID
 	call GetPartyLocation
 	ld a, [hli]
-	ld [$c6ff], a
+	ld [wc6ff], a
 	ld a, [hl]
 	ld [wc700], a
 	ld a, [wcd4c]
@@ -6367,9 +6382,9 @@ Function102a3b: ; 102a3b
 	ld hl, PartyMon1DVs
 	call GetPartyLocation
 	ld a, [hli]
-	ld [$c6fd], a
+	ld [wc6fd], a
 	ld a, [hl]
-	ld [$c6fe], a
+	ld [wc6fe], a
 	ld a, [wcd4c]
 	dec a
 	ld hl, PartyMon1Species
@@ -6606,11 +6621,11 @@ Function102c48: ; 102c48
 	ld a, $0
 	call GetSRAMBank
 	ld hl, $a600
-	ld de, $c608
+	ld de, wc608
 	ld bc, $002f
 	call Function102c71
 	call CloseSRAM
-	ld hl, $c608
+	ld hl, wc608
 	ld de, wda00
 	ld bc, $01e0
 	ld a, $5
@@ -6644,12 +6659,12 @@ Function102c87: ; 102c87
 	ld [wcf64], a
 	ld a, $0
 	ld hl, $a600
-	ld de, $c608
+	ld de, wc608
 	ld bc, $011a
 	call Function102d3e
 	call Function102cee
 	ld a, $0
-	ld hl, $c608
+	ld hl, wc608
 	ld de, $a600
 	ld bc, $011a
 	call Function102d3e
@@ -6659,12 +6674,12 @@ Function102c87: ; 102c87
 	ld [wcf64], a
 	ld a, $5
 	ld hl, wda00
-	ld de, $c608
+	ld de, wc608
 	ld bc, $011a
 	call FarCopyWRAM
 	call Function102cee
 	ld a, $5
-	ld hl, $c608
+	ld hl, wc608
 	ld de, wda00
 	ld bc, $011a
 	call FarCopyWRAM
@@ -6712,7 +6727,7 @@ Function102cee: ; 102cee
 ; 102d34
 
 Function102d34: ; 102d34
-	ld hl, $c608
+	ld hl, wc608
 	ld bc, $002f
 	call AddNTimes
 	ret

wram.asm

@@ -757,6 +757,7 @@ AlreadyFailed:: ; c6fb
 
 wc6fc:: ds 1
 wc6fd:: ds 1
+wc6fe::
 wPlayerMinimized:: ds 1 ; c6fe
 wc6ff::
 PlayerScreens:: ; c6ff
@@ -2741,7 +2742,9 @@ wPokeAnimStructEnd::
 SECTION "WRAM 3", WRAMX, BANK [3]
 
 w3_d000:: ; d000
-	ds $90
+	ds $80
+w3_d080::
+	ds $10
 w3_d090::
 	ds $70
 
@@ -2753,7 +2756,9 @@ BT_TrainerTextIndex::
 	ds $600
 
 wBTChoiceOfLvlGroup::
-w3_d800:: ds 1
+w3_d800:: ds $400
+w3_dc00:: ds $168
+w3_dd68::
 
 
 SECTION "GBC Video", WRAMX, BANK [5]
@@ -2819,7 +2824,18 @@ BattleAnimTemps:: ; d419
 w5_d422:: ds $32
 wBattleAnimEnd::
 	ds $e
+; d462
 
+SECTION "WRAM 5 MOBILE", WRAMX [$d800], BANK [5]
+w5_d800:: ds $200
+w5_da00:: ds $200
+w5_dc00:: ds $d
+w5_dc0d:: ds 4
+w5_dc11:: ds 9
+w5_dc1a:: ds $c
+w5_dc26:: ds $c
+w5_dc32:: ds $c
+w5_dc3e:: ds $c
 
 SECTION "WRAM 6", WRAMX, BANK [6]