Pokegear functions and RAM labels

constants/sprite_constants.asm

@@ -482,7 +482,7 @@ MAX_OUTDOOR_SPRITES EQU 23
 	const SPRITE_ANIM_INDEX_SLOTS_CHANSEY
 	const SPRITE_ANIM_INDEX_SLOTS_EGG
 	const SPRITE_ANIM_INDEX_09
-	const SPRITE_ANIM_INDEX_WALK_CYCLE
+	const SPRITE_ANIM_INDEX_RED_WALK
 	const SPRITE_ANIM_INDEX_0B
 	const SPRITE_ANIM_INDEX_0C
 	const SPRITE_ANIM_INDEX_0D
@@ -502,7 +502,7 @@ MAX_OUTDOOR_SPRITES EQU 23
 	const SPRITE_ANIM_INDEX_1B
 	const SPRITE_ANIM_INDEX_1C
 	const SPRITE_ANIM_INDEX_1D
-	const SPRITE_ANIM_INDEX_1E
+	const SPRITE_ANIM_INDEX_BLUE_WALK
 	const SPRITE_ANIM_INDEX_1F
 	const SPRITE_ANIM_INDEX_20
 	const SPRITE_ANIM_INDEX_21

engine/link.asm

@@ -578,7 +578,7 @@ FixDataForLinkTransfer: ; 28434
 rept 3
 	ld [hli], a
 endr
-	ld b, wc6d3 - (wMisc + 3)
+	ld b, $c8
 	xor a
 .loop3
 	ld [hli], a

engine/namingscreen.asm

@@ -3,6 +3,7 @@ _NamingScreen: ; 0x116b7
 	call NamingScreen
 	call ReturnToMapWithSpeechTextbox
 	ret
+
 ; 0x116c1
 
 NamingScreen: ; 116c1
@@ -37,6 +38,7 @@ NamingScreen: ; 116c1
 	ld [Options], a
 	call ClearJoypad
 	ret
+
 ; 116f8
 
 .SetUpNamingScreen: ; 116f8
@@ -54,6 +56,7 @@ NamingScreen: ; 116c1
 	call SetPalettes
 	call NamingScreen_InitNameEntry
 	ret
+
 ; 1171d
 
 .GetNamingScreenSetup: ; 1171d
@@ -69,8 +72,8 @@ endr
 	ld h, [hl]
 	ld l, a
 	jp [hl]
-; 1172e
 
+; 1172e
 
 .Jumptable: ; 1172e (4:572e)
 	dw .Pokemon
@@ -82,7 +85,6 @@ endr
 	dw .Pokemon
 	dw .Pokemon
 
-
 .Pokemon: ; 1173e (4:573e)
 	ld a, [CurPartySpecies]
 	ld [wd265], a
@@ -113,11 +115,13 @@ endr
 .genderless
 	call .StoreMonIconParams
 	ret
+
 ; 11780 (4:5780)
 
 .NicknameStrings: ; 11780
 	db "'S@"
 	db "NICKNAME?@"
+
 ; 1178d
 
 .Player: ; 1178d (4:578d)
@@ -128,10 +132,12 @@ endr
 	call PlaceString
 	call .StoreSpriteIconParams
 	ret
+
 ; 117a3 (4:57a3)
 
 .PlayerNameString: ; 117a3
 	db "YOUR NAME?@"
+
 ; 117ae
 
 .Rival: ; 117ae (4:57ae)
@@ -143,10 +149,12 @@ endr
 	call PlaceString
 	call .StoreSpriteIconParams
 	ret
+
 ; 117c3 (4:57c3)
 
 .RivalNameString: ; 117c3
 	db "RIVAL'S NAME?@"
+
 ; 117d1
 
 .Mom: ; 117d1 (4:57d1)
@@ -158,10 +166,12 @@ endr
 	call PlaceString
 	call .StoreSpriteIconParams
 	ret
+
 ; 117e6 (4:57e6)
 
 .MomNameString: ; 117e6
 	db "MOTHER'S NAME?@"
+
 ; 117f5
 
 .Box: ; 117f5 (4:57f5)
@@ -170,11 +180,11 @@ endr
 	lb bc, BANK(PokeBallSpriteGFX), $4
 	call Request2bpp
 	xor a
-	ld hl, wc300
+	ld hl, wSpriteAnimDict
 	ld [hli], a
 	ld [hl], a
 	depixel 4, 4, 4, 0
-	ld a, SPRITE_ANIM_INDEX_WALK_CYCLE
+	ld a, SPRITE_ANIM_INDEX_RED_WALK
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
@@ -184,10 +194,12 @@ endr
 	call PlaceString
 	call .StoreBoxIconParams
 	ret
+
 ; 11822 (4:5822)
 
 .BoxNameString: ; 11822
 	db "BOX NAME?@"
+
 ; 1182c
 
 .Tomodachi: ; 1182c (4:582c)
@@ -196,10 +208,12 @@ endr
 	call PlaceString
 	call .StoreSpriteIconParams
 	ret
+
 ; 11839 (4:5839)
 
 .oTomodachi_no_namae_sutoringu: ; 11839
 	db "おともだち の なまえは?@"
+
 ; 11847
 
 .LoadSprite: ; 11847 (4:5847)
@@ -216,18 +230,18 @@ endr
 	ld hl, VTiles0 tile $04
 	call Request2bpp
 	xor a
-	ld hl, wc300
+	ld hl, wSpriteAnimDict
 	ld [hli], a
 	ld [hl], a
 	pop de
-	ld b, SPRITE_ANIM_INDEX_WALK_CYCLE
+	ld b, SPRITE_ANIM_INDEX_RED_WALK
 	ld a, d
 	cp KrisSpriteGFX / $100
 	jr nz, .not_kris
 	ld a, e
 	cp KrisSpriteGFX % $100
 	jr nz, .not_kris
-	ld b, SPRITE_ANIM_INDEX_1E
+	ld b, SPRITE_ANIM_INDEX_BLUE_WALK
 .not_kris
 	ld a, b
 	depixel 4, 4, 4, 0
@@ -257,7 +271,6 @@ endr
 	ld [wNamingScreenStringEntryCoord + 1], a
 	ret
 
-
 NamingScreen_IsTargetBox: ; 1189c
 	push bc
 	push af
@@ -268,6 +281,7 @@ NamingScreen_IsTargetBox: ; 1189c
 	dec b
 	pop bc
 	ret
+
 ; 118a8
 
 NamingScreen_InitText: ; 118a8
@@ -330,6 +344,7 @@ NamingScreen_ApplyTextInputMode: ; 118ca
 	dec b
 	jr nz, .row
 	ret
+
 ; 11915
 
 NamingScreenJoypadLoop: ; 11915
@@ -352,6 +367,7 @@ NamingScreenJoypadLoop: ; 11915
 	ld [hSCY], a
 	scf
 	ret
+
 ; 11940
 
 .UpdateStringEntry: ; 11940
@@ -377,6 +393,7 @@ NamingScreenJoypadLoop: ; 11915
 	ld a, $1
 	ld [hBGMapMode], a
 	ret
+
 ; 11968
 
 .RunJumptable: ; 11968
@@ -391,14 +408,13 @@ endr
 	ld h, [hl]
 	ld l, a
 	jp [hl]
-; 11977
 
+; 11977
 
 .Jumptable: ; 11977 (4:5977)
 	dw .InitCursor
 	dw .ReadButtons
 
-
 .InitCursor: ; 1197b (4:597b)
 	depixel 10, 3
 	call NamingScreen_IsTargetBox
@@ -410,7 +426,7 @@ endr
 	ld a, c
 	ld [wNamingScreenCursorObjectPointer], a
 	ld a, b
-	ld [wc6d6], a
+	ld [wNamingScreenCursorObjectPointer + 1], a
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld a, [hl]
@@ -569,6 +585,7 @@ NamingScreen_AnimateCursor: ; 11a3b (4:5a3b)
 	add hl, bc
 	ld [hl], a
 	ret
+
 ; 11a79 (4:5a79)
 
 .LetterEntries: ; 11a79
@@ -576,6 +593,7 @@ NamingScreen_AnimateCursor: ; 11a3b (4:5a3b)
 
 .CaseDelEnd: ; 11a82
 	db $00, $00, $00, $30, $30, $30, $60, $60, $60
+
 ; 11a8b
 
 .GetDPad: ; 11a8b (4:5a8b)
@@ -593,6 +611,7 @@ NamingScreen_AnimateCursor: ; 11a3b (4:5a3b)
 	and D_RIGHT
 	jr nz, .right
 	ret
+
 .right
 	call NamingScreen_GetCursorPosition
 	and a
@@ -604,9 +623,11 @@ NamingScreen_AnimateCursor: ; 11a3b (4:5a3b)
 	jr nc, .asm_11ab4
 	inc [hl]
 	ret
+
 .asm_11ab4
 	ld [hl], $0
 	ret
+
 .asm_11ab7
 	cp $3
 	jr nz, .asm_11abc
@@ -619,6 +640,7 @@ NamingScreen_AnimateCursor: ; 11a3b (4:5a3b)
 	add hl, bc
 	ld [hl], a
 	ret
+
 .left
 	call NamingScreen_GetCursorPosition
 	and a
@@ -630,9 +652,11 @@ NamingScreen_AnimateCursor: ; 11a3b (4:5a3b)
 	jr z, .asm_11ad5
 	dec [hl]
 	ret
+
 .asm_11ad5
 	ld [hl], $8
 	ret
+
 .asm_11ad8
 	cp $1
 	jr nz, .asm_11ade
@@ -648,6 +672,7 @@ endr
 	add hl, bc
 	ld [hl], a
 	ret
+
 .down
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
@@ -658,14 +683,17 @@ endr
 	jr nc, .asm_11aff
 	inc [hl]
 	ret
+
 .asm_11af9
 	cp $4
 	jr nc, .asm_11aff
 	inc [hl]
 	ret
+
 .asm_11aff
 	ld [hl], $0
 	ret
+
 .up
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
@@ -674,6 +702,7 @@ endr
 	jr z, .asm_11b0c
 	dec [hl]
 	ret
+
 .asm_11b0c
 	ld [hl], $4
 	call NamingScreen_IsTargetBox
@@ -710,6 +739,7 @@ NamingScreen_AdvanceCursor_CheckEndOfString: ; 11b27
 .end_of_string
 	scf
 	ret
+
 ; 11b39 (4:5b39)
 
 ; XXX
@@ -735,6 +765,7 @@ NamingScreen_AdvanceCursor_CheckEndOfString: ; 11b27
 .done
 	ld a, [hl]
 	jr NamingScreen_LoadNextCharacter
+
 ; 11b56
 
 Dakutens: ; Dummied out
@@ -752,6 +783,7 @@ Handakutens: ; Dummied out
 	db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
 	db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
 	db $ff
+
 ; 11bbc
 
 NamingScreen_DeleteCharacter: ; 11bbc (4:5bbc)
@@ -781,6 +813,7 @@ NamingScreen_GetTextCursorPosition: ; 11bd0 (4:5bd0)
 	add hl, de
 	pop af
 	ret
+
 ; 11be0
 
 NamingScreen_InitNameEntry: ; 11be0
@@ -801,8 +834,8 @@ NamingScreen_InitNameEntry: ; 11be0
 	jr nz, .loop
 	ld [hl], "@"
 	ret
-; 11bf7
 
+; 11bf7
 
 NamingScreen_StoreEntry: ; 11bf7 (4:5bf7)
 	ld hl, wNamingScreenDestinationPointer
@@ -861,13 +894,13 @@ NamingScreen_GetLastCharacter: ; 11c11 (4:5c11)
 	add hl, bc
 	dec d
 	jr .loop
+
 .done
 	add hl, de
 	ld a, [hl]
 	ld [wNamingScreenLastCharacter], a
 	ret
 
-
 LoadNamingScreenGFX: ; 11c51
 	call ClearSprites
 	callab ClearSpriteAnims
@@ -912,6 +945,7 @@ LoadNamingScreenGFX: ; 11c51
 	ld a, $7
 	ld [hWX], a
 	ret
+
 ; 11cb7
 
 NamingScreenGFX_Border: ; 11cb7
@@ -928,6 +962,7 @@ NameInputLower:
 	db "s t u v w x y z  "
 	db "× ( ) : ; [ ] <PK> <MN>"
 	db "UPPER  DEL   END "
+
 BoxNameInputLower:
 	db "a b c d e f g h i"
 	db "j k l m n o p q r"
@@ -935,12 +970,14 @@ BoxNameInputLower:
 	db "é 'd 'l 'm 'r 's 't 'v 0"
 	db "1 2 3 4 5 6 7 8 9"
 	db "UPPER  DEL   END "
+
 NameInputUpper: ; Unreferenced?
 	db "A B C D E F G H I"
 	db "J K L M N O P Q R"
 	db "S T U V W X Y Z  "
 	db "- ? ! / . ,      "
 	db "lower  DEL   END "
+
 BoxNameInputUpper:
 	db "A B C D E F G H I"
 	db "J K L M N O P Q R"
@@ -948,6 +985,7 @@ BoxNameInputUpper:
 	db "× ( ) : ; [ ] <PK> <MN>"
 	db "- ? ! ♂ ♀ / . , &"
 	db "lower  DEL   END "
+
 ; 11e5d
 
 GFX_11e5d: ; ????
@@ -1047,6 +1085,7 @@ INCBIN "gfx/icon/mail2.2bpp"
 
 .Dummy: ; dummied out
 	db "メールを かいてね@"
+
 ; 11f84
 
 .InitCharset: ; 11f84 (4:5f84)
@@ -1137,7 +1176,6 @@ endr
 	dw .init_blinking_cursor
 	dw .process_joypad
 
-
 .init_blinking_cursor: ; 1201b (4:601b)
 	depixel 9, 2
 	ld a, SPRITE_ANIM_INDEX_09
@@ -1242,6 +1280,7 @@ endr
 	ret
 
 ; called from engine/sprite_anims.asm
+
 ComposeMail_AnimateCursor: ; 120c1 (4:60c1)
 	call .GetDPad
 	ld hl, SPRITEANIMSTRUCT_0D
@@ -1283,6 +1322,7 @@ ComposeMail_AnimateCursor: ; 120c1 (4:60c1)
 
 .CaseDelEnd: ; 12102
 	db $00, $00, $00, $30, $30, $30, $60, $60, $60, $60
+
 ; 1210c
 
 .GetDPad: ; 1210c (4:610c)
@@ -1425,6 +1465,7 @@ ComposeMail_GetCursorPosition: ; 1218b (4:618b)
 MailComposition_TryAddLastCharacter: ; 121ac (4:61ac)
 	ld a, [wNamingScreenLastCharacter]
 	jp MailComposition_TryAddCharacter
+
 ; 121b2 (4:61b2)
 
 ; XXX
@@ -1461,6 +1502,7 @@ endr
 .asm_121d9
 	ld a, [hl]
 	jp NamingScreen_LoadNextCharacter
+
 ; 121dd
 
 MailEntry_Uppercase: ; 122dd
@@ -1470,6 +1512,7 @@ MailEntry_Uppercase: ; 122dd
 	db "1 2 3 4 5 6 7 8 9 0"
 	db "<PK> <MN> <PO> <KE> é ♂ ♀ ¥ … ×"
 	db "lower  DEL   END   "
+
 ; 1224f
 
 MailEntry_Lowercase: ; 1224f
@@ -1479,4 +1522,5 @@ MailEntry_Lowercase: ; 1224f
 	db "'d 'l 'm 'r 's 't 'v & ( )"
 	db "<``> <''> [ ] ' : ;      "
 	db "UPPER  DEL   END   "
+
 ; 122c1

engine/phone.asm

@@ -651,15 +651,16 @@ Function90380: ; 90380 (24:4380)
 	call GetCallerName
 	ret
 
-Function9038a: ; 9038a (24:438a)
+CheckCanDeletePhoneNumber: ; 9038a (24:438a)
 	ld a, c
 	call GetCallerTrainerClass
 	ld a, c
+	; and a
 	ret nz
 	ld a, b
-	cp $1
+	cp PHONECONTACT_MOM
 	ret z
-	cp $4
+	cp PHONECONTACT_ELM
 	ret z
 	ld c, $1
 	ret

engine/town_map.asm

@@ -1,171 +0,0 @@
-
-_TownMap: ; 9191c
-	ld hl, Options
-	ld a, [hl]
-	push af
-	set NO_TEXT_SCROLL, [hl]
-
-	ld a, [hInMenu]
-	push af
-	ld a, $1
-	ld [hInMenu], a
-
-	ld a, [VramState]
-	push af
-	xor a
-	ld [VramState], a
-
-	call ClearBGPalettes
-	call ClearTileMap
-	call ClearSprites
-	call DisableLCD
-	call Function90c4e
-	callba ClearSpriteAnims
-	ld a, 8
-	call SkipMusic
-	ld a, $e3
-	ld [rLCDC], a
-	call Function90d56
-	ld [wd002], a
-	ld [wd003], a
-	xor a
-	ld [hBGMapMode], a
-	call Function91a04
-	call WaitBGMap2
-	ld a, [wd002]
-	call Function9106a
-	ld a, [wd003]
-	call Function91098
-	ld a, c
-	ld [wd004], a
-	ld a, b
-	ld [wd005], a
-	ld b, SCGB_POKEGEAR_PALS
-	call GetSGBLayout
-	call SetPalettes
-	ld a, [hCGB]
-	and a
-	jr z, .dmg
-	ld a, %11100100
-	call DmgToCgbObjPal0
-	call DelayFrame
-
-.dmg
-	ld a, [wd002]
-	cp KANTO_LANDMARK
-	jr nc, .kanto
-	ld d, KANTO_LANDMARK - 1
-	ld e, 1
-	call .loop
-	jr .resume
-
-.kanto
-	call TownMap_GetKantoLandmarkLimits
-	call .loop
-
-.resume
-	pop af
-	ld [VramState], a
-	pop af
-	ld [hInMenu], a
-	pop af
-	ld [Options], a
-	call ClearBGPalettes
-	ret
-
-.loop
-	call JoyTextDelay
-	ld hl, hJoyPressed
-	ld a, [hl]
-	and B_BUTTON
-	ret nz
-
-	ld hl, hJoyLast
-	ld a, [hl]
-	and D_UP
-	jr nz, .pressed_up
-
-	ld a, [hl]
-	and D_DOWN
-	jr nz, .pressed_down
-.loop2
-	push de
-	callba PlaySpriteAnimations
-	pop de
-	call DelayFrame
-	jr .loop
-
-.pressed_up
-	ld hl, wd003
-	ld a, [hl]
-	cp d
-	jr c, .okay
-	ld a, e
-	dec a
-	ld [hl], a
-
-.okay
-	inc [hl]
-	jr .next
-
-.pressed_down
-	ld hl, wd003
-	ld a, [hl]
-	cp e
-	jr nz, .okay2
-	ld a, d
-	inc a
-	ld [hl], a
-
-.okay2
-	dec [hl]
-
-.next
-	push de
-	ld a, [wd003]
-	call Function910b4
-	ld a, [wd004]
-	ld c, a
-	ld a, [wd005]
-	ld b, a
-	ld a, [wd003]
-	call Function910d4
-	pop de
-	jr .loop2
-; 91a04
-
-Function91a04: ; 91a04
-	ld a, [wd002]
-	cp KANTO_LANDMARK
-	jr nc, .kanto
-	ld e, $0
-	jr .okay
-
-.kanto
-	ld e, $1
-
-.okay
-	callba PokegearMap
-	ld a, $7
-	ld bc, 6
-	hlcoord 1, 0
-	call ByteFill
-	hlcoord 0, 0
-	ld [hl], $6
-	hlcoord 7, 0
-	ld [hl], $17
-	hlcoord 7, 1
-	ld [hl], $16
-	hlcoord 7, 2
-	ld [hl], $26
-	ld a, $7
-	ld bc, NAME_LENGTH
-	hlcoord 8, 2
-	call ByteFill
-	hlcoord 19, 2
-	ld [hl], $17
-	ld a, [wd003]
-	call Function910b4
-	callba TownMapPals
-	ret
-; 91a53

event/field_moves.asm

@@ -330,7 +330,7 @@ FlyFromAnim: ; 8caed
 	ld [VramState], a
 	call FlyFunction_InitGFX
 	depixel 10, 10, 4, 0
-	ld a, SPRITE_ANIM_INDEX_WALK_CYCLE
+	ld a, SPRITE_ANIM_INDEX_RED_WALK
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
@@ -365,7 +365,7 @@ FlyToAnim: ; 8cb33
 	ld [VramState], a
 	call FlyFunction_InitGFX
 	depixel 31, 10, 4, 0
-	ld a, SPRITE_ANIM_INDEX_WALK_CYCLE
+	ld a, SPRITE_ANIM_INDEX_RED_WALK
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc

macros/wram.asm

@@ -232,3 +232,20 @@ move_struct: MACRO
 \1PP:: ds 1
 \1EffectChance:: ds 1
 endm
+
+slot_reel: MACRO
+\1ReelAction::   db
+\1TilemapAddr::  dw
+\1Position::     db
+\1SpinDistance:: db
+\1SpinRate::     db
+\1OAMAddr::      dw
+\1XCoord::       db
+\1Slot09::       ds 1
+\1Slot0a::       ds 1
+\1Slot0b::       ds 1
+\1Slot0c::       ds 1
+\1Slot0d::       ds 1
+\1Slot0e::       ds 1
+\1Slot0f::       ds 1
+endm

text/common_1.asm

@@ -368,10 +368,10 @@ UnknownText_0x1bc6c7::
 	done
 
 UnknownText_0x1bc6e9::
-	text_from_ram wc6d1
+	text_from_ram wPlayerTrademonSpeciesName
 	text " was"
 	line "sent to @"
-	text_from_ram wc719
+	text_from_ram wOTTrademonSenderName
 	text "."
 	done
 
@@ -380,104 +380,104 @@ UnknownText_0x1bc701::
 	done
 
 UnknownText_0x1bc703::
-	text_from_ram wc719
+	text_from_ram wOTTrademonSenderName
 	text " bids"
 	line "farewell to"
 	done
 
 UnknownText_0x1bc719::
-	text_from_ram wc703
+	text_from_ram wOTTrademonSpeciesName
 	text "."
 	done
 
 UnknownText_0x1bc71f::
 	text "Take good care of"
 	line "@"
-	text_from_ram wc703
+	text_from_ram wOTTrademonSpeciesName
 	text "."
 	done
 
 UnknownText_0x1bc739::
 	text "For @"
-	text_from_ram wc6e7
+	text_from_ram wPlayerTrademonSenderName
 	text "'s"
 	line "@"
-	text_from_ram wc6d1
+	text_from_ram wPlayerTrademonSpeciesName
 	text ","
 	done
 
 UnknownText_0x1bc74c::
-	text_from_ram wc719
+	text_from_ram wOTTrademonSenderName
 	text " sends"
 	line "@"
-	text_from_ram wc703
+	text_from_ram wOTTrademonSpeciesName
 	text "."
 	done
 
 UnknownText_0x1bc75e::
-	text_from_ram wc719
+	text_from_ram wOTTrademonSenderName
 	text " will"
 	line "trade @"
-	text_from_ram wc703
+	text_from_ram wOTTrademonSpeciesName
 	db "@@"
 
 UnknownText_0x1bc774::
 	text "for @"
-	text_from_ram wc6e7
+	text_from_ram wPlayerTrademonSenderName
 	text "'s"
 	line "@"
-	text_from_ram wc6d1
+	text_from_ram wPlayerTrademonSpeciesName
 	text "."
 	done
 
 UnknownText_0x1bc787::
-	text_from_ram wc6e7
+	text_from_ram wPlayerTrademonSenderName
 	text " will"
 	line "trade @"
-	text_from_ram wc6d1
+	text_from_ram wPlayerTrademonSpeciesName
 	db "@@"
 
 UnknownText_0x1bc79d::
 	text "for @"
-	text_from_ram wc719
+	text_from_ram wOTTrademonSenderName
 	text "'s"
 	line "@"
-	text_from_ram wc703
+	text_from_ram wOTTrademonSpeciesName
 	text "."
 	done
 
 UnknownText_0x1bc7b0::
-	text_from_ram wc6e7
+	text_from_ram wPlayerTrademonSenderName
 	text "'s"
 	line "@"
-	text_from_ram wc6d1
+	text_from_ram wPlayerTrademonSpeciesName
 	text " trade…"
 	done
 
 UnknownText_0x1bc7c3::
 	text "Take good care of"
 	line "@"
-	text_from_ram wc703
+	text_from_ram wOTTrademonSpeciesName
 	text "."
 	done
 
 UnknownText_0x1bc7dd::
-	text_from_ram wc6e7
+	text_from_ram wPlayerTrademonSenderName
 	text "'s"
 	line "@"
-	text_from_ram wc6d1
+	text_from_ram wPlayerTrademonSpeciesName
 	text " trade…"
 	done
 
 UnknownText_0x1bc7f0::
 	text "Take good care of"
 	line "@"
-	text_from_ram wc703
+	text_from_ram wOTTrademonSpeciesName
 	text "."
 	done
 
 UnknownText_0x1bc80a::
-	text_from_ram wc703
+	text_from_ram wOTTrademonSpeciesName
 	text " came"
 	line "back!"
 	done

wram.asm

@@ -574,44 +574,34 @@ PlayerSAtkLevel:: ; c6cf
 wc6d0::
 PlayerSDefLevel:: ; c6d0
 	ds 1
-wc6d1::
 PlayerAccLevel:: ; c6d1
 	ds 1
-wc6d2::
 PlayerEvaLevel:: ; c6d2
 	ds 1
 ; c6d3
-wc6d3:: ds 1
+	ds 1
 PlayerStatLevelsEnd::
 
-wc6d4::
 EnemyStatLevels:: ; c6d4
 ; 07 neutral
 EnemyAtkLevel:: ; c6d4
 	ds 1
-wc6d5::
 EnemyDefLevel:: ; c6d5
 	ds 1
-wc6d6::
 EnemySpdLevel:: ; c6d6
 	ds 1
-wc6d7::
 wTownMapCursorLandmark::
 EnemySAtkLevel:: ; c6d7
 	ds 1
-wc6d8::
 wTownMapPlayerIconLandmark::
 EnemySDefLevel:: ; c6d8
 	ds 1
-wc6d9::
 EnemyAccLevel:: ; c6d9
 	ds 1
-wc6da::
 EnemyEvaLevel:: ; c6da
 	ds 1
 
-wc6db:: ds 1
+	ds 1
-wc6dc::
 EnemyTurnsTaken:: ; c6dc
 	ds 1
 PlayerTurnsTaken:: ; c6dd
@@ -621,7 +611,6 @@ PlayerTurnsTaken:: ; c6dd
 
 PlayerSubstituteHP:: ; c6df
 	ds 1
-wc6e0::
 EnemySubstituteHP:: ; c6e0
 	ds 1
 
@@ -820,6 +809,7 @@ wc7bb:: ds 2
 wc7bd::
 	ds wc6d0 - @
 
+; naming screen
 wNamingScreenDestinationPointer:: ds 2 ; c6d0
 wNamingScreenCurrNameLength:: ds 1 ; c6d2
 wNamingScreenMaxNameLength:: ds 1 ; c6d3
@@ -829,24 +819,21 @@ wNamingScreenLastCharacter:: ds 1 ; c6d7
 wNamingScreenStringEntryCoord:: ds 2 ; c6d8
 	ds wc6d0 - @
 
-; Slot Machine
+; pokegear
+wPokegearPhoneLoadNameBuffer:: ds 1 ; c6d0
+wPokegearPhoneCursorPosition:: ds 1 ; c6d1
+wPokegearPhoneScrollPosition:: ds 1 ; c6d2
+wPokegearPhoneSelectedPerson:: ds 1 ; c6d3
+wPokegearPhoneSubmenuCursor:: ds 1 ; c6d4
+wPokegearMapCursorObjectPointer:: ds 2 ; c6d5
+	ds 2
+wPokegearRadioChannelBank:: ds 1 ; c6d9
+wPokegearRadioChannelAddr:: ds 2 ; c6da
+wPokegearRadioMusicPlaying:: ds 1 ; c6dc
+	ds wc6d0 - @
+
 wSlots::
-slot_reel: MACRO
+; Slot Machine
-\1ReelAction::   db
-\1TilemapAddr::  dw
-\1Position::     db
-\1SpinDistance:: db
-\1SpinRate::     db
-\1OAMAddr::      dw
-\1XCoord::       db
-\1Slot09::       ds 1
-\1Slot0a::       ds 1
-\1Slot0b::       ds 1
-\1Slot0c::       ds 1
-\1Slot0d::       ds 1
-\1Slot0e::       ds 1
-\1Slot0f::       ds 1
-endm
 ; c6d0
 wReel1:: slot_reel wReel1
 wReel2:: slot_reel wReel2
@@ -2577,6 +2564,11 @@ PCItemsEnd::
 	ds 1
 
 wPokegearFlags:: ds 1
+; bit 0: map
+; bit 1: radio
+; bit 2: phone
+; bit 3: expn
+; bit 7: on/off
 wRadioTuningKnob:: ds 1
 wLastDexMode:: ds 2
 WhichRegisteredItem:: ; d95b