Pokedex labels

battle/core.asm

@@ -1430,8 +1430,8 @@ HandleMysteryberry: ; 3c93c
 	ld a, [hBattleTurn]
 	and a
 	jr z, .wild
-	ld de, wc739
+	ld de, wWildMonPP
-	ld hl, wc735
+	ld hl, wWildMonMoves
 	ld a, [wBattleMode]
 	dec a
 	jr z, .wild
@@ -3643,13 +3643,13 @@ LoadEnemyPkmnToSwitchTo: ; 3d6ca
 	ld a, [CurPartySpecies]
 	cp UNOWN
 	jr nz, .skip_unown
-	ld a, [wdef4]
+	ld a, [wFirstUnownSeen]
 	and a
 	jr nz, .skip_unown
 	ld hl, EnemyMonDVs
 	predef GetUnownLetter
 	ld a, [UnownLetter]
-	ld [wdef4], a
+	ld [wFirstUnownSeen], a
 .skip_unown
 
 	ld hl, EnemyMonHP
@@ -6711,7 +6711,7 @@ endr
 	ld bc, PKMN_NAME_LENGTH
 	call CopyBytes
 
-; Caught this mon
+; Saw this mon
 	ld a, [TempEnemyMonSpecies]
 	dec a
 	ld c, a
@@ -8531,7 +8531,7 @@ BattleIntro: ; 3f4dd
 	call ClearBox
 	call ClearSprites
 	ld a, [wBattleMode]
-	cp $1
+	cp WILD_BATTLE
 	call z, UpdateEnemyHUD
 	ld a, $1
 	ld [hBGMapMode], a
@@ -8560,9 +8560,9 @@ InitEnemy: ; 3f55e
 BackUpVBGMap2: ; 3f568
 	ld a, [rSVBK]
 	push af
-	ld a, $6 ; BANK(w6_d000)
+	ld a, $6 ; BANK(wBackupTilemap)
 	ld [rSVBK], a
-	ld hl, w6_d000
+	ld hl, wBackupTilemap
 	ld bc, $40 tiles ; VBGMap3 - VBGMap2
 	ld a, $2
 	call ByteFill
@@ -8570,7 +8570,7 @@ BackUpVBGMap2: ; 3f568
 	push af
 	ld a, $1
 	ld [rVBK], a
-	ld de, w6_d000
+	ld de, wBackupTilemap
 	hlbgcoord 0, 0 ; VBGMap2
 	lb bc, BANK(BackUpVBGMap2), $40
 	call Request2bpp
@@ -8637,16 +8637,16 @@ InitEnemyTrainer: ; 3f594
 ; 3f607
 
 InitEnemyWildmon: ; 3f607
-	ld a, $1
+	ld a, WILD_BATTLE
 	ld [wBattleMode], a
 	callba MobileFn_10605d
 	call LoadEnemyMon
 	ld hl, EnemyMonMoves
-	ld de, wc735
+	ld de, wWildMonMoves
 	ld bc, NUM_MOVES
 	call CopyBytes
 	ld hl, EnemyMonPP
-	ld de, wc739
+	ld de, wWildMonPP
 	ld bc, NUM_MOVES
 	call CopyBytes
 	ld hl, EnemyMonDVs
@@ -8654,11 +8654,11 @@ InitEnemyWildmon: ; 3f607
 	ld a, [CurPartySpecies]
 	cp UNOWN
 	jr nz, .skip_unown
-	ld a, [wdef4]
+	ld a, [wFirstUnownSeen]
 	and a
 	jr nz, .skip_unown
 	ld a, [UnownLetter]
-	ld [wdef4], a
+	ld [wFirstUnownSeen], a
 .skip_unown
 	ld de, VTiles2
 	predef FrontpicPredef
@@ -9456,12 +9456,12 @@ InitBattleDisplay: ; 3fb6c
 	ld a, $6
 	ld [rSVBK], a
 
-	ld hl, w6_d000
+	ld hl, wBackupTilemap
-	ld bc, w6_d400 - w6_d000
+	ld bc, wBackupAttrMap - wBackupTilemap
 	ld a, " "
 	call ByteFill
 
-	ld de, w6_d000
+	ld de, wBackupTilemap
 	hlbgcoord 0, 0
 	lb bc, BANK(.BlankBGMap), $40
 	call Request2bpp

constants/map_setup_constants.asm

@@ -15,50 +15,50 @@ const_value SET $f1
 ; Command descriptions from Condensation water's scripting compendium.	const_def
 	const_def
 
-	const map_lcd_on
+	const map_lcd_on              ; 00
-	const map_lcd_off
+	const map_lcd_off             ; 01
-	const map_sound_off
+	const map_sound_off           ; 02
-	const map_music
+	const map_music               ; 03
-	const map_start_music
+	const map_start_music         ; 04
-	const map_fade_music
+	const map_fade_music          ; 05
-	const map_fade
+	const map_fade                ; 06
-	const map_bike_music
+	const map_bike_music          ; 07
-	const map_music_force
+	const map_music_force         ; 08
-	const map_max_volume
+	const map_max_volume          ; 09
-	const map_load_blocks
+	const map_load_blocks         ; 0a
-	const map_connection_blocks
+	const map_connection_blocks   ; 0b
-	const map_save_screen
+	const map_save_screen         ; 0c
-	const map_buffer_screen
+	const map_buffer_screen       ; 0d
-	const map_load_graphics
+	const map_load_graphics       ; 0e
-	const map_load_tileset_header
+	const map_load_tileset_header ; 0f
-	const map_time_of_day
+	const map_time_of_day         ; 10
-	const map_palettes
+	const map_palettes            ; 11
-	const map_wildmons
+	const map_wildmons            ; 12
-	const map_sprites
+	const map_sprites             ; 13
-	const map_change_callback
+	const map_change_callback     ; 14
-	const map_start_callback
+	const map_start_callback      ; 15
-	const map_load_objects
+	const map_load_objects        ; 16
-	const map_load_spawn
+	const map_load_spawn          ; 17
-	const map_load_connection
+	const map_load_connection     ; 18
-	const map_load_warp
+	const map_load_warp           ; 19
-	const map_attributes
+	const map_attributes          ; 1a
-	const map_attributes_2
+	const map_attributes_2        ; 1b
-	const map_clear_bg_palettes
+	const map_clear_bg_palettes   ; 1c
-	const map_fade_out_palettes
+	const map_fade_out_palettes   ; 1d
-	const map_fade_in_palettes
+	const map_fade_in_palettes    ; 1e
-	const map_anchor_screen
+	const map_anchor_screen       ; 1f
-	const map_warp_face
+	const map_warp_face           ; 20
-	const map_face_down
+	const map_face_down           ; 21
-	const map_spawn_coord
+	const map_spawn_coord         ; 22
-	const map_player_coord
+	const map_player_coord        ; 23
-	const map_prolong_sprites
+	const map_prolong_sprites     ; 24
-	const map_delay_sprites
+	const map_delay_sprites       ; 25
-	const map_update_roam
+	const map_update_roam         ; 26
-	const map_keep_roam
+	const map_keep_roam           ; 27
-	const map_fade_out_music
+	const map_fade_out_music      ; 28
-	const map_animations_on
+	const map_animations_on       ; 29
-	const map_animations_off
+	const map_animations_off      ; 2a
-	const map_keep_palettes
+	const map_keep_palettes       ; 2b
-	const map_text_scroll_off
+	const map_text_scroll_off     ; 2c
-	const map_stop_script
+	const map_stop_script         ; 2d
 map_end_setup_script EQU -1

constants/wram_constants.asm

@@ -96,3 +96,10 @@ PC_WITHDRAW EQU 0
 PC_DEPOSIT EQU 1
 DAYCARE_WITHDRAW EQU 2
 DAYCARE_DEPOSIT EQU 3
+
+; wCurrentDexMode
+	const_def
+	const DEXMODE_NEW
+	const DEXMODE_OLD
+	const DEXMODE_ABC
+	const DEXMODE_UNOWN

engine/battle_start.asm

@@ -120,7 +120,7 @@ Function8c2cf: ; 8c2cf
 	ld a, $6
 	ld [rSVBK], a
 	push hl
-	ld hl, w6_d000
+	ld hl, wBackupTilemap
 	ld bc, $28 * $10
 
 .loop
@@ -132,7 +132,7 @@ Function8c2cf: ; 8c2cf
 	jr nz, .loop
 
 	pop hl
-	ld de, w6_d000
+	ld de, wBackupTilemap
 	ld b, BANK(Function8c2cf) ; BANK(@)
 	ld c, $28
 	call Request2bpp

engine/crystal_intro.asm

@@ -79,17 +79,17 @@ Functione45e8: ; e45e8
 	ld [rSVBK], a
 
 	ld hl, IntroLogoGFX
-	ld de, w6_d000
+	ld de, wBackupTilemap
 	ld a, BANK(IntroLogoGFX)
 	call FarDecompress
 
 	ld hl, VTiles0
-	ld de, w6_d000
+	ld de, wBackupTilemap
 	lb bc, 1, 8 tiles
 	call Request2bpp
 
 	ld hl, VTiles1
-	ld de, w6_d000 + $80 tiles
+	ld de, wBackupTilemap + $80 tiles
 	lb bc, 1, 8 tiles
 	call Request2bpp
 
@@ -1886,7 +1886,7 @@ Functione541b: ; e541b (39:541b)
 	push af
 	ld a, $6
 	ld [rSVBK], a
-	ld hl, w6_d000
+	ld hl, wBackupTilemap
 	decoord 0, 0
 	ld b, SCREEN_HEIGHT
 .asm_e542a
@@ -2000,10 +2000,10 @@ Functione54c2: ; e54c2 (39:54c2)
 	ld a, $6
 	ld [rSVBK], a
 	push de
-	ld de, w6_d000
+	ld de, wBackupTilemap
 	call Decompress
 	pop hl
-	ld de, w6_d000
+	ld de, wBackupTilemap
 	ld bc, $180
 	call Request2bpp
 	pop af
@@ -2016,10 +2016,10 @@ Functione54de: ; e54de (39:54de)
 	ld a, $6
 	ld [rSVBK], a
 	push de
-	ld de, w6_d000
+	ld de, wBackupTilemap
 	call Decompress
 	pop hl
-	ld de, w6_d000
+	ld de, wBackupTilemap
 	ld bc, $1ff
 	call Request2bpp
 	pop af
@@ -2032,10 +2032,10 @@ Functione54fa: ; e54fa (39:54fa)
 	ld a, $6
 	ld [rSVBK], a
 	push de
-	ld de, w6_d000
+	ld de, wBackupTilemap
 	call Decompress
 	pop hl
-	ld de, w6_d000
+	ld de, wBackupTilemap
 	ld bc, $140
 	call Request2bpp
 	pop af

engine/time_capsule/conversion.asm

@@ -355,7 +355,7 @@ NewPokedexEntry: ; fb877
 	ld [hSCX], a
 	xor a
 	ld [wPokedexStatus], a
-	callba Function41a7f
+	callba _NewPokedexEntry
 	call WaitPressAorB_BlinkCursor
 	ld a, $1
 	ld [wPokedexStatus], a
@@ -366,7 +366,7 @@ NewPokedexEntry: ; fb877
 	call MaxVolume
 	call RotateThreePalettesRight
 	ld a, [hSCX]
-	add $fb
+	add -5 ; 251 ; NUM_POKEMON
 	ld [hSCX], a
 	call Functionfb8c8
 	pop af
@@ -378,7 +378,7 @@ Functionfb8c8: ; fb8c8
 	call ClearTileMap
 	call LoadFontsExtra
 	call LoadStandardFont
-	callba Function40ab2
+	callba Pokedex_PlaceFrontpicTopLeftCorner
 	call Function3200
 	callba GetEnemyMonDVs
 	ld a, [hli]

engine/warp_connection.asm

@@ -0,0 +1,440 @@
+
+RunCallback_05_03: ; 1045b0
+	call Clearwc7e8
+	call ResetMapBufferEventFlags
+	call ResetFlashIfOutOfCave
+	call GetCurrentMapTrigger
+	call ResetBikeFlags
+	ld a, $5
+	call RunMapCallback
+
+RunCallback_03: ; 1045c4
+	callba ClearCmdQueue
+	ld a, $3
+	call RunMapCallback
+	call GetMapHeaderTimeOfDayNybble
+	ld [wc2d0], a
+	ret
+
+
+EnterMapConnection: ; 1045d6
+; Return carry if a connection has been entered.
+	ld a, [wPlayerStepDirection]
+	and a
+	jp z, EnterSouthConnection
+	cp 1
+	jp z, EnterNorthConnection
+	cp 2
+	jp z, EnterWestConnection
+	cp 3
+	jp z, EnterEastConnection
+	ret
+; 1045ed
+
+
+EnterWestConnection: ; 1045ed
+	ld a, [WestConnectedMapGroup]
+	ld [MapGroup], a
+	ld a, [WestConnectedMapNumber]
+	ld [MapNumber], a
+	ld a, [WestConnectionStripXOffset]
+	ld [XCoord], a
+	ld a, [WestConnectionStripYOffset]
+	ld hl, YCoord
+	add [hl]
+	ld [hl], a
+	ld c, a
+	ld hl, WestConnectionWindow
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	srl c
+	jr z, .skip_to_load
+	ld a, [WestConnectedMapWidth]
+	add 6
+	ld e, a
+	ld d, 0
+
+.loop
+	add hl, de
+	dec c
+	jr nz, .loop
+
+.skip_to_load
+	ld a, l
+	ld [wd194], a
+	ld a, h
+	ld [wd194 + 1], a
+	jp EnteredConnection
+; 104629
+
+
+EnterEastConnection: ; 104629
+	ld a, [EastConnectedMapGroup]
+	ld [MapGroup], a
+	ld a, [EastConnectedMapNumber]
+	ld [MapNumber], a
+	ld a, [EastConnectionStripXOffset]
+	ld [XCoord], a
+	ld a, [EastConnectionStripYOffset]
+	ld hl, YCoord
+	add [hl]
+	ld [hl], a
+	ld c, a
+	ld hl, EastConnectionWindow
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	srl c
+	jr z, .skip_to_load
+	ld a, [EastConnectedMapWidth]
+	add 6
+	ld e, a
+	ld d, 0
+
+.loop
+	add hl, de
+	dec c
+	jr nz, .loop
+
+.skip_to_load
+	ld a, l
+	ld [wd194], a
+	ld a, h
+	ld [wd194 + 1], a
+	jp EnteredConnection
+; 104665
+
+
+EnterNorthConnection: ; 104665
+	ld a, [NorthConnectedMapGroup]
+	ld [MapGroup], a
+	ld a, [NorthConnectedMapNumber]
+	ld [MapNumber], a
+	ld a, [NorthConnectionStripYOffset]
+	ld [YCoord], a
+	ld a, [NorthConnectionStripXOffset]
+	ld hl, XCoord
+	add [hl]
+	ld [hl], a
+	ld c, a
+	ld hl, NorthConnectionWindow
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	ld b, 0
+	srl c
+	add hl, bc
+	ld a, l
+	ld [wd194], a
+	ld a, h
+	ld [wd194 + 1], a
+	jp EnteredConnection
+; 104696
+
+
+EnterSouthConnection: ; 104696
+	ld a, [SouthConnectedMapGroup]
+	ld [MapGroup], a
+	ld a, [SouthConnectedMapNumber]
+	ld [MapNumber], a
+	ld a, [SouthConnectionStripYOffset]
+	ld [YCoord], a
+	ld a, [SouthConnectionStripXOffset]
+	ld hl, XCoord
+	add [hl]
+	ld [hl], a
+	ld c, a
+	ld hl, SouthConnectionWindow
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	ld b, 0
+	srl c
+	add hl, bc
+	ld a, l
+	ld [wd194], a
+	ld a, h
+	ld [wd194 + 1], a
+	; fallthrough
+; 1046c4
+
+EnteredConnection: ; 1046c4
+	scf
+	ret
+; 1046c6
+
+LoadWarpData: ; 1046c6
+	call .SaveDigWarp
+	call .SetSpawn
+	ld a, [wNextWarp]
+	ld [WarpNumber], a
+	ld a, [wNextMapGroup]
+	ld [MapGroup], a
+	ld a, [wNextMapNumber]
+	ld [MapNumber], a
+	ret
+
+.SaveDigWarp: ; 1046df (41:46df)
+	call GetMapPermission
+	call CheckOutdoorMap
+	ret nz
+	ld a, [wNextMapGroup]
+	ld b, a
+	ld a, [wNextMapNumber]
+	ld c, a
+	call GetAnyMapPermission
+	call CheckIndoorMap
+	ret nz
+	ld a, [wPrevMapGroup]
+	cp GROUP_MOUNT_MOON_SQUARE
+	jr nz, .not_mt_moon_or_tin_tower
+	ld a, [wPrevMapNumber]
+	cp MAP_MOUNT_MOON_SQUARE
+	ret z
+	cp MAP_TIN_TOWER_ROOF
+	ret z
+.not_mt_moon_or_tin_tower
+	ld a, [wPrevWarp]
+	ld [wDigWarp], a
+	ld a, [wPrevMapGroup]
+	ld [wDigMapGroup], a
+	ld a, [wPrevMapNumber]
+	ld [wDigMapNumber], a
+	ret
+
+.SetSpawn: ; 104718 (41:4718)
+	call GetMapPermission
+	call CheckOutdoorMap
+	ret nz
+	ld a, [wNextMapGroup]
+	ld b, a
+	ld a, [wNextMapNumber]
+	ld c, a
+	call GetAnyMapPermission
+	call CheckIndoorMap
+	ret nz
+	ld a, [wNextMapGroup]
+	ld b, a
+	ld a, [wNextMapNumber]
+	ld c, a
+	call GetAnyMapTileset
+	ld a, c
+	cp TILESET_POKECENTER
+	jr z, .pokecenter_pokecom
+	cp TILESET_POKECOM_CENTER
+	jr z, .pokecenter_pokecom
+	ret
+.pokecenter_pokecom
+	ld a, [wPrevMapGroup]
+	ld [wLastSpawnMapGroup], a
+	ld a, [wPrevMapNumber]
+	ld [wLastSpawnMapNumber], a
+	ret
+
+LoadMapTimeOfDay: ; 104750
+	ld hl, VramState
+	res 6, [hl]
+	ld a, $1
+	ld [wSpriteUpdatesEnabled], a
+	callba Function8c0e5
+	callba Function8c001
+	call OverworldTextModeSwitch
+	call Function104770
+	call Function1047a3
+	ret
+
+Function104770: ; 104770 (41:4770)
+	ld a, VBGMap0 / $100
+	ld [wBGMapAnchor + 1], a
+	xor a
+	ld [wBGMapAnchor], a
+	ld [hSCY], a
+	ld [hSCX], a
+	callba Function5958
+	ld a, [rVBK]
+	push af
+	ld a, $1
+	ld [rVBK], a
+	xor a
+	lb bc, 4, 0
+	hlbgcoord 0, 0
+	call ByteFill
+	pop af
+	ld [rVBK], a
+	ld a, $60
+	lb bc, 4, 0
+	hlbgcoord 0, 0
+	call ByteFill
+	ret
+
+Function1047a3: ; 1047a3 (41:47a3)
+	decoord 0, 0
+	call .copy
+	ld a, [hCGB]
+	and a
+	ret z
+
+	decoord 0, 0, AttrMap
+	ld a, $1
+	ld [rVBK], a
+.copy:
+	hlbgcoord 0, 0
+	ld c, SCREEN_WIDTH
+	ld b, SCREEN_HEIGHT
+.row
+	push bc
+.column
+	ld a, [de]
+	inc de
+	ld [hli], a
+	dec c
+	jr nz, .column
+	ld bc, $20 - SCREEN_WIDTH
+	add hl, bc
+	pop bc
+	dec b
+	jr nz, .row
+	ld a, $0
+	ld [rVBK], a
+	ret
+
+LoadGraphics: ; 1047cf
+	call LoadTilesetHeader
+	call LoadTileset
+	xor a
+	ld [hMapAnims], a
+	xor a
+	ld [hTileAnimFrame], a
+	callba RefreshSprites
+	call LoadFontsExtra
+	callba Function106594
+	ret
+
+LoadMapPalettes: ; 1047eb
+	ld b, SCGB_09
+	jp GetSGBLayout
+; 1047f0
+
+RefreshMapSprites: ; 1047f0
+	call ClearSprites
+	callba ReturnFromMapSetupScript
+	call GetMovementPermissions
+	callba Function579d
+	callba CheckReplaceKrisSprite
+	ld hl, wPlayerSpriteSetupFlags
+	bit 6, [hl]
+	jr nz, .skip
+	ld hl, VramState
+	set 0, [hl]
+	call Function2e31
+.skip
+	ld a, [wPlayerSpriteSetupFlags]
+	and $1c
+	ld [wPlayerSpriteSetupFlags], a
+	ret
+
+CheckMovingOffEdgeOfMap:: ; 104820 (41:4820)
+	ld a, [wPlayerStepDirection]
+	cp STANDING
+	ret z
+	and a ; DOWN
+	jr z, .down
+	cp UP
+	jr z, .up
+	cp LEFT
+	jr z, .left
+	cp RIGHT
+	jr z, .right
+	and a
+	ret
+
+.down
+	ld a, [PlayerNextMapY]
+	sub 4
+	ld b, a
+	ld a, [MapHeight]
+	add a
+	cp b
+	jr z, .ok
+	and a
+	ret
+
+.up
+	ld a, [PlayerNextMapY]
+	sub 4
+	cp -1
+	jr z, .ok
+	and a
+	ret
+
+.left
+	ld a, [PlayerNextMapX]
+	sub $4
+	cp -1
+	jr z, .ok
+	and a
+	ret
+
+.right
+	ld a, [PlayerNextMapX]
+	sub 4
+	ld b, a
+	ld a, [MapWidth]
+	add a
+	cp b
+	jr z, .ok
+	and a
+	ret
+
+.ok
+	scf
+	ret
+
+
+GetCoordOfUpperLeftCorner:: ; 10486d
+	ld hl, OverworldMap
+	ld a, [XCoord]
+	bit 0, a
+	jr nz, .increment_then_halve1
+	srl a
+	add $1
+	jr .resume
+
+.increment_then_halve1
+	add $1
+	srl a
+
+.resume
+	ld c, a
+	ld b, $0
+	add hl, bc
+	ld a, [MapWidth]
+	add $6
+	ld c, a
+	ld b, $0
+	ld a, [YCoord]
+	bit 0, a
+	jr nz, .increment_then_halve2
+	srl a
+	add $1
+	jr .resume2
+
+.increment_then_halve2
+	add $1
+	srl a
+
+.resume2
+	call AddNTimes
+	ld a, l
+	ld [wd194], a
+	ld a, h
+	ld [wd194 + 1], a
+	ld a, [YCoord]
+	and $1
+	ld [wd196], a
+	ld a, [XCoord]
+	and $1
+	ld [wd197], a
+	ret
+; 1048ba

event/photo.asm

@@ -162,7 +162,7 @@ Function16cff: ; 16cff
 
 	ld a, BANK(sScratch)
 	call GetSRAMBank
-	ld de, w6_d000
+	ld de, wBackupTilemap
 	ld hl, sScratch
 	ld a, [hROMBank]
 	ld b, a

home.asm

@@ -2192,7 +2192,7 @@ Function3f7c:: ; 3f7c
 ; 3f88
 
 Function3f88:: ; 3f88
-	ld hl, w6_d000
+	ld hl, wBackupTilemap
 	ld b, $0
 .asm_3f8d
 	push bc
@@ -2213,7 +2213,7 @@ Function3f88:: ; 3f88
 ; 3f9f
 
 Function3f9f:: ; 3f9f
-	ld hl, w6_d000
+	ld hl, wBackupTilemap
 .asm_3fa2
 	push bc
 	ld c, $8

home/map.asm

@@ -1425,10 +1425,10 @@ LoadTileset:: ; 2821
 	ld [rSVBK], a
 
 	ld a, e
-	ld de, w6_d000
+	ld de, wBackupTilemap
 	call FarDecompress
 
-	ld hl, w6_d000
+	ld hl, wBackupTilemap
 	ld de, VTiles2
 	ld bc, $60 tiles
 	call CopyBytes

misc/fixed_words.asm

@@ -308,7 +308,7 @@ Function11c1ca: ; 11c1ca
 	callba ReloadMapPart
 	callba Function8cf53
 	callba LoadPokemonData
-	callba Function40c30
+	callba Pokedex_ABCMode
 	ld a, [rSVBK]
 	push af
 	ld a, $5

misc/mobile_40.asm

@@ -6774,11 +6774,11 @@ Function102d48: ; 102d48
 	call AddNTimes
 	predef GetUnownLetter
 	callba UpdateUnownDex
-	ld a, [wdef4]
+	ld a, [wFirstUnownSeen]
 	and a
 	jr nz, .asm_102d98
 	ld a, [UnownLetter]
-	ld [wdef4], a
+	ld [wFirstUnownSeen], a
 
 .asm_102d98
 	and a

misc/mobile_41.asm

@@ -1058,7 +1058,7 @@ Function1064d8: ; 1064d8
 	jr asm_1064ed
 
 asm_1064ed
-	ld de, w6_d000
+	ld de, wBackupTilemap
 	ld b, $0
 	ld a, [rSVBK]
 	push af

misc/mobile_45.asm

@@ -5662,7 +5662,7 @@ Function1161d5: ; 1161d5
 	ld [rSVBK], a
 
 	ld hl, Unknown_117356
-	ld de, w6_d000
+	ld de, wBackupTilemap
 	ld bc, $0300
 	call CopyBytes
 

misc/mobile_46.asm

@@ -5986,7 +5986,7 @@ Function11ad1b: ; 11ad1b
 	ld [wcd30], a
 	ld a, $2
 	ld [wc7d4], a
-	callba Function40bdc
+	callba Pokedex_ChangeMode
 	ret
 ; 11ad6e
 

misc/mobile_5f.asm

@@ -418,12 +418,12 @@ Function17d1f1: ; 17d1f1
 	call AddNTimes
 	predef GetUnownLetter
 	callab UpdateUnownDex
-	ld a, [wdef4]
+	ld a, [wFirstUnownSeen]
 	and a
 	jr nz, .asm_17d223
 
 	ld a, [UnownLetter]
-	ld [wdef4], a
+	ld [wFirstUnownSeen], a
 
 .asm_17d223
 	ret

wram.asm

@@ -335,7 +335,7 @@ wc2cf:: ds 1
 wc2d0:: ds 4
 wc2d4:: ds 1
 wc2d5:: ds 1
-wc2d6:: ds 1
+wLastDexEntry:: ds 1
 wc2d7:: ds 1
 wPreviousLandmark:: ds 1
 wCurrentLandmark:: ds 1
@@ -762,7 +762,6 @@ wOTTrademon::     trademon wOTTrademon
 	ds wPlayerTrademon - @
 
 wc6d0::
-wPokedexDataStart::
 PlayerSDefLevel:: ; c6d0
 	ds 1
 wc6d1::
@@ -1003,10 +1002,20 @@ wc7b9:: ds 1
 wc7ba:: ds 1
 wc7bb:: ds 15
 wc7ca:: ds 6
-wc7d0:: ds 1
+
-wc7d1:: ds 1
+	ds -$100
-wc7d2:: ds 1
+wPokedexDataStart::
-wc7d3:: ds 1
+wPokedexOrder:: ds NUM_POKEMON +- 1
+wPokedexOrderEnd:: ds 6
+wPokedexMetadata::
+wDexListingPage::
+wc7d0:: ds 1 ; Dex list page
+wDexListingCursor::
+wc7d1:: ds 1 ; Dex cursor
+wDexListingEnd::
+wc7d2:: ds 1 ; Last mon to display
+wc7d3:: ds 1 ; Number of mons visible per dex list page
+wCurrentDexMode::   ; Pokedex Mode
 wc7d4:: ds 1 ; Index of the topmost visible item in a scrolling menu
 wc7d5:: ds 1 ; Which row the cursor is at in a scrolling menu (0-6)
 wc7d6:: ds 1
@@ -1015,14 +1024,17 @@ wc7d8:: ds 1
 wc7d9:: ds 1
 wc7da:: ds 1
 wDexSearchSlowpokeFrame:: ds 1
-wc7dc:: ds 1
+wUnlockedUnownMode:: ds 1
 wc7dd:: ds 1
 wc7de:: ds 1
 wc7df:: ds 1
 wc7e0:: ds 1
 wc7e1:: ds 1
+wBackupDexListingCursor::
 wc7e2:: ds 1
+wBackupDexListingPage::
 wc7e3:: ds 1
+wDexCurrentLocation::
 wc7e4:: ds 1
 IF DEF(CRYSTAL11)
 wPokedexStatus::
@@ -1836,18 +1848,14 @@ CurPartyLevel:: ; d143
 wd144:: ds 2
 
 ; used when following a map warp
-wNextWarp::
+; d146
-wd146:: ds 1
+wNextWarp:: ds 1
-wNextMapGroup::
+wNextMapGroup:: ds 1
-wd147:: ds 1
+wNextMapNumber:: ds 1
-wNextMapNumber::
+wPrevWarp:: ds 1
-wd148:: ds 1
+wPrevMapGroup:: ds 1
-wPrevWarp::
+wPrevMapNumber:: ds 1
-wd149:: ds 1
+; d14c
-wPrevMapGroup::
-wd14a:: ds 1
-wPrevMapNumber::
-wd14b:: ds 1
 
 wd14c:: ds 1 ; used in FollowNotExact
 wd14d:: ds 1 ; used in FollowNotExact
@@ -2515,7 +2523,7 @@ PCItemsEnd::
 
 wPokegearFlags:: ds 1
 wRadioTuningKnob:: ds 1
-wd959:: ds 2
+wLastDexMode:: ds 2
 WhichRegisteredItem:: ; d95b
 	ds 1
 RegisteredItem:: ; d95c
@@ -2796,11 +2804,11 @@ wPlayerDataEnd::
 wMapData::
 
 VisitedSpawns:: ; dca5
-	flag_array 27
+	flag_array NUM_SPAWNS
 
-wdca9:: ds 1
+wDigWarp:: ds 1
-wdcaa:: ds 1
+wDigMapGroup:: ds 1
-wdcab:: ds 1
+wDigMapNumber:: ds 1
 ; used on maps like second floor pokécenter, which are reused, so we know which
 ; map to return to
 BackupWarpNumber:: ; dcac
@@ -2812,10 +2820,8 @@ BackupMapNumber:: ; dcae
 
 	ds 3
 
-wLastSpawnMapGroup::
+wLastSpawnMapGroup:: ds 1
-wdcb2:: ds 1
+wLastSpawnMapNumber:: ds 1
-wLastSpawnMapNumber::
-wdcb3:: ds 1
 
 WarpNumber:: ; dcb4
 	ds 1
@@ -2876,7 +2882,7 @@ UnownDex:: ; ded9
 UnlockedUnowns:: ; def3
 	ds 1
 
-wdef4:: ds 1
+wFirstUnownSeen:: ds 1
 
 
 wDaycareMan:: ; def5
@@ -3099,8 +3105,10 @@ w5_dc3e:: ds $c
 
 SECTION "WRAM 6", WRAMX, BANK [6]
 
-w6_d000:: ds $400
+wBackupTilemap:: ds $20 * SCREEN_HEIGHT
-w6_d400:: ds $200
+	ds $1c0
+wBackupAttrMap:: ds $20 * SCREEN_HEIGHT
+	ds -$40
 w6_d600:: ds $200
 w6_d800::