Disassembled the rest of the code in bank 4 as far as i can tell. Lines 899, 1538, and 1631 in engine/menu/start_menu.asm have hardcoded jumps that i couldn't figure out how to make work myself.

2026-04-26 08:13:44 -05:00 · 2018-11-29 01:50:18 -07:00 · 2018-11-29 01:50:18 -07:00 · 7564f1a7c2
commit 7564f1a7c2
parent e32b842067
24 changed files with 3680 additions and 63 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-WIP disassembly of the Spaceworld 1997 Gold proto
+WIP disassembly of the Space World 1997 Gold proto

 It attempts to build the following ROMs:

--- a/data/predef_pointers.inc
+++ b/data/predef_pointers.inc
@ -38,8 +38,8 @@ GiveItemPredef::
 	add_predef UpdateHPBar
 	add_predef Functiondf7d ; 18
 	add_predef Functiondf91
-	add_predef Function1128f
-	add_predef Function112c1
+	add_predef CanLearnTMHMMove
+	add_predef GetTMHMMove
 	add_predef LinkTextboxAtHL
 	add_predef Function2d663
 	add_predef Function3d5ce
@ -97,5 +97,5 @@ GiveItemPredef::
 	add_predef Functioncc000
 	add_predef Functioncc000_2
 	add_predef Functionfdb66
-	add_predef Function1240b
+	add_predef LoadItemData
 	dbw $ff, InexplicablyEmptyFunction ; 56
--- a/data/text/text_input_chars.asm
+++ b/data/text/text_input_chars.asm
@ -0,0 +1,27 @@
+INCLUDE "constants.asm"
+
+SECTION "data/text/text_input_chars.asm", ROMX
+
+TextEntryChars: ; 04:58B3
+	db "あいうえお　かきくけこ　さしすせそ"
+	db "たちつてと　なにぬねの　はひふへほ"
+	db "まみむめも　やゆよわん　らりるれろ"
+	db "アイウエオ　カキクケコ　サシスセソ"
+	db "タチツテト　ナニヌネノ　ハヒフへホ"
+	db "マミムメモ　ヤユヨワン　ラりルレロ"
+	db "ゃゅょっを　ャュョッヲ　ﾞﾟ　ー。"
+	db "１２３４５　６７８９０　？！×.円"
+	
+TextEntryHiragana: ; 04:593B
+	db "あいうえお　かきくけこ　さしすせそ"
+	db "たちつてと　なにぬねの　はひふへほ"
+	db "まみむめも　やゆよわん　らりるれろ"
+	db "ゃゅょっを　１２３４５　６７８９０"
+	db "　ﾞﾟ　ー？！円"
+	
+TextEntryKatakana: ; 04:5987
+	db "アイウエオ　カキクケコ　サシスセソ"
+	db "タチツテト　ナニヌネノ　ハヒフへホ"
+	db "マミムメモ　ヤユヨワン　ラりルレロ"
+	db "ャュョッヲ　１２３４５　６７８９０"
+	db "　ﾞﾟ　ー？！円"
--- a/engine/Intro.asm
+++ b/engine/Intro.asm
@ -494,7 +494,7 @@ ChoosePlayerName:: ; 5B25
 .loop
 	ld b, $01
 	ld de, wPlayerName
-	callba Function113f4
+	callba NamingScreen
 	ld a, [wPlayerName]
 	cp "@"
 	jr z, .loop
@ -547,7 +547,7 @@ ChooseRivalName:: ; 5BA9
 .loop
 	ld b, $02
 	ld de, wRivalName
-	callba Function113f4 ; manual text entry box?
+	callba NamingScreen
 	ld a, [wRivalName]
 	cp "@"
 	jr z, .loop
@ -599,7 +599,7 @@ MomNamePrompt:: ; 5C31
 .loop
 	ld b, $03
 	ld de, wMomsName
-	callba Function113f4
+	callba NamingScreen
 	ld a, [wMomsName]
 	cp "@"
 	jr z, .loop
--- a/engine/dumps/bank01.asm
+++ b/engine/dumps/bank01.asm
@ -3374,9 +3374,9 @@ Function6713: ; 01:6713
 	push hl
 	ld e, l
 	ld d, h
-	ld a, BANK(Function113f4)
+	ld a, BANK(NamingScreen)
 	ld b, $00
-	ld hl, Function113f4
+	ld hl, NamingScreen
 	call FarCall_hl
 	call ClearBGPalettes
 	call ClearTileMap
@ -3417,9 +3417,9 @@ Text6788: ; 01:6788
 Function679d: ; 01:679d
 	ld de, wFieldMoveScriptID
 	push de
-	ld hl, Function113f4
+	ld hl, NamingScreen
 	ld b, $00
-	ld a, BANK(Function113f4)
+	ld a, BANK(NamingScreen)
 	call FarCall_hl
 	call ClearBGPalettes
 	call Function360b
--- a/engine/dumps/bank03.asm
+++ b/engine/dumps/bank03.asm
@ -1256,7 +1256,7 @@ Functiondac8: ; 03:5ac8
 	cp $03
 	ld hl, wd882
 	jr z, .sub_db1f
-	ld hl, wUnknownListLengthda83
+	ld hl, wBoxListLength
 	ld a, [hl]
 	cp $1e
 	jr nz, .sub_daed
@ -1291,7 +1291,7 @@ Functiondac8: ; 03:5ac8
 	jr nz, .sub_db1b
 	ld hl, wdaa3
 	ld bc, $0020
-	ld a, [wUnknownListLengthda83]
+	ld a, [wBoxListLength]
 .sub_db1b
 	dec a
 	call AddNTimes
@ -1324,7 +1324,7 @@ Functiondac8: ; 03:5ac8
 	ld a, [wPartyCount]
 	jr nz, .sub_db60
 	ld hl, wde63
-	ld a, [wUnknownListLengthda83]
+	ld a, [wBoxListLength]
 .sub_db60
 	dec a
 	call SkipNames
@ -1354,7 +1354,7 @@ Functiondac8: ; 03:5ac8
 	ld a, [wPartyCount]
 	jr nz, .sub_db9e
 	ld hl, wdf17
-	ld a, [wUnknownListLengthda83]
+	ld a, [wBoxListLength]
 .sub_db9e
 	dec a
 	call SkipNames
@ -1432,7 +1432,7 @@ Functiondc16: ; 03:5c16
 	cp $06
 	push af
 	jr nz, .sub_dc2a
-	ld hl, wUnknownListLengthda83
+	ld hl, wBoxListLength
 	ld a, [hl]
 	cp $1e
 	jr nz, .sub_dc2a
@ -1516,7 +1516,7 @@ Functiondc16: ; 03:5c16
 	jr .sub_dce9
 .sub_dcad
 	ld hl, wdf17
-	ld a, [wUnknownListLengthda83]
+	ld a, [wBoxListLength]
 	ld bc, $0006
 	call AddNTimes
 	push hl
@ -1526,7 +1526,7 @@ Functiondc16: ; 03:5c16
 	call CopyBytes
 	push hl
 	ld hl, wde63
-	ld a, [wUnknownListLengthda83]
+	ld a, [wBoxListLength]
 	ld bc, $0006
 	call AddNTimes
 	ld d, h
@ -1535,7 +1535,7 @@ Functiondc16: ; 03:5c16
 	call CopyBytes
 	push hl
 	ld hl, wdaa3
-	ld a, [wUnknownListLengthda83]
+	ld a, [wBoxListLength]
 	ld bc, $0030
 	call AddNTimes
 	ld d, h
@ -1591,7 +1591,7 @@ Functiondcfc: ; 03:5cfc
 	jp CopyBytes

 Functiondd5c: ; 03:5d5c
-	ld de, wUnknownListLengthda83
+	ld de, wBoxListLength
 	ld a, [de]
 	cp $1e
 	ret nc
@ -1612,7 +1612,7 @@ Functiondd5c: ; 03:5d5c
 	call GetMonHeader
 	ld hl, wde63
 	ld bc, $0006
-	ld a, [wUnknownListLengthda83]
+	ld a, [wBoxListLength]
 	dec a
 	jr z, .sub_dda9
 	dec a
@ -1623,7 +1623,7 @@ Functiondd5c: ; 03:5d5c
 	ld d, h
 	ld e, l
 	pop hl
-	ld a, [wUnknownListLengthda83]
+	ld a, [wBoxListLength]
 	dec a
 	ld b, a
 .sub_dd96
@ -1644,7 +1644,7 @@ Functiondd5c: ; 03:5d5c
 	ld de, wde63
 	ld bc, $0006
 	call CopyBytes
-	ld a, [wUnknownListLengthda83]
+	ld a, [wBoxListLength]
 	dec a
 	jr z, .sub_dde5
 	ld hl, wdf17
@ -1657,7 +1657,7 @@ Functiondd5c: ; 03:5d5c
 	ld d, h
 	ld e, l
 	pop hl
-	ld a, [wUnknownListLengthda83]
+	ld a, [wBoxListLength]
 	dec a
 	ld b, a
 .sub_ddd2
@ -1681,7 +1681,7 @@ Functiondd5c: ; 03:5d5c
 	ld hl, wStringBuffer1
 	ld bc, $0006
 	call CopyBytes
-	ld a, [wUnknownListLengthda83]
+	ld a, [wBoxListLength]
 	dec a
 	jr z, .sub_de2a
 	ld hl, wdaa3
@ -1694,7 +1694,7 @@ Functiondd5c: ; 03:5d5c
 	ld d, h
 	ld e, l
 	pop hl
-	ld a, [wUnknownListLengthda83]
+	ld a, [wBoxListLength]
 	dec a
 	ld b, a
 .sub_de17
@ -1774,7 +1774,7 @@ Functionde79: ; 03:5e79
 	ld hl, wPartyCount
 	jr .sub_dead
 .sub_de8b
-	ld a, [wUnknownListLengthda83]
+	ld a, [wBoxListLength]
 	cp $1e
 	scf
 	ret z
@ -1787,7 +1787,7 @@ Functionde79: ; 03:5e79
 	call FarCall_hl
 	call Functiondd5c
 	ld de, wdf17
-	ld hl, wUnknownListLengthda83
+	ld hl, wBoxListLength
 .sub_dead
 	ld a, [hl]
 	push af
@ -1817,7 +1817,7 @@ Functiondecd: ; 03:5ecd
 	ld a, [wcd7c]
 	and a
 	jr z, .sub_ded9
-	ld hl, wUnknownListLengthda83
+	ld hl, wBoxListLength
 .sub_ded9
 	ld a, [hl]
 	dec a
@ -2174,8 +2174,8 @@ Function60a0: ; 03:60a0
 	jr c, .sub_e155
 	push de
 	ld b, $00
-	ld a, BANK(Function113f4)
-	ld hl, Function113f4
+	ld a, BANK(NamingScreen)
+	ld hl, NamingScreen
 	call FarCall_hl
 	pop de
 	ld a, [de]
@ -2655,8 +2655,8 @@ Texte551: ; 03:6551
 Functione57e: ; 03:657e
 	ld b, $04
 	ld de, wMovementBufferCount
-	ld a, BANK(Function113f4)
-	ld hl, Function113f4
+	ld a, BANK(NamingScreen)
+	ld hl, NamingScreen
 	call FarCall_hl
 	ld a, [wMovementBufferCount]
 	cp $50
@ -3079,7 +3079,7 @@ Functione8f9: ; 03:68f9
 	ld a, [wPartyCount]
 	cp $06
 	jr nz, .sub_e913
-	ld a, [wUnknownListLengthda83]
+	ld a, [wBoxListLength]
 	cp $1e
 	jp z, Functionf7d8
 .sub_e913
@ -3340,8 +3340,8 @@ Functione8f9: ; 03:68f9
 	ld d, h
 	ld e, l
 	ld b, $00
-	ld a, BANK(Function113f4)
-	ld hl, Function113f4
+	ld a, BANK(NamingScreen)
+	ld hl, NamingScreen
 	push de
 	call FarCall_hl
 	call RotateThreePalettesRight
@ -3363,8 +3363,8 @@ Functione8f9: ; 03:68f9
 	jr c, .sub_eb47
 	ld de, wdf17
 	ld b, $00
-	ld a, BANK(Function113f4)
-	ld hl, Function113f4
+	ld a, BANK(NamingScreen)
+	ld hl, NamingScreen
 	call FarCall_hl
 	call RotateThreePalettesRight
 	ld de, wdf17
--- a/engine/gfx.asm
+++ b/engine/gfx.asm
@ -117,6 +117,7 @@ LoadPokemonStatsGraphics:: ; f80fb (3e:40fb)
 	ld hl, $9550
 	lb bc, BANK(ExpBarGFX), ((ExpBarGFXEnd - ExpBarGFX) / LEN_2BPP_TILE)
 	call Get2bpp
+LoadOnlyPokemonStatsGraphics:: ; 3E:412E
 	ld de, StatsGFX
 	ld hl, $9310
 	lb bc, BANK(StatsGFX), ((StatsGFXEnd - StatsGFX) / LEN_2BPP_TILE)
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@ -0,0 +1,50 @@
+INCLUDE "constants.asm"
+
+SECTION "engine/items/tmhm.asm", ROMX
+
+CanLearnTMHMMove: ; 04:528f
+; Gets the index of TM or HM with move ID wce32, 
+; then checks the corresponding flag in wMonDexIndex's learnset.
+; Sets register c to 1 if TM/HM is in learnset OR if debug is enabled.
+	ld a, [wDebugFlags]
+	ld c, 01
+	bit 1, a
+	ret nz
+	
+	ld a, [wMonDexIndex]
+	ld [wCurSpecies], a
+	call GetMonHeader
+	ld hl, wMonHLearnset
+	push hl
+	
+	ld a, [wce32]
+	ld b, a
+	ld c, 0
+	ld hl, TMHMMoves
+.loop
+	ld a, [hli]
+	cp b
+	jr z, .jump
+	inc c
+	jr .loop
+	
+.jump
+	pop hl
+	ld b, 2 ;CHECK_FLAG
+	push de
+	ld d, 0
+	predef SmallFarFlagAction
+	pop de
+	ret
+
+GetTMHMMove: ; 04:52C1
+; converts TM/HM list index to TM/HM move ID
+	ld a, [wNamedObjectIndexBuffer]
+	dec a
+	ld hl, TMHMMoves
+	ld b, 0
+	ld c, a
+	add hl, bc
+	ld a, [hl]
+	ld [wNamedObjectIndexBuffer], a
+	ret
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@ -39,7 +39,7 @@ InitializeNewGameWRAM:

 	ld hl, wPartyCount
 	call InitializeByteList
-	ld hl, wUnknownListLengthda83
+	ld hl, wBoxListLength
 	call InitializeByteList
 	ld hl, wNumBagItems
 	call InitializeByteList
--- a/engine/menu/start_menu.asm
+++ b/engine/menu/start_menu.asm
--- a/engine/menu/text_entry.asm
+++ b/engine/menu/text_entry.asm
--- a/engine/unknown11d32.asm
+++ b/engine/unknown11d32.asm
@ -0,0 +1,92 @@
+INCLUDE "constants.asm"
+
+SECTION "engine/unknown11d32.asm", ROMX
+
+Unknown11d32: ; 04:5D32
+	ld hl, hJoySum
+	ld a, [hl]
+	and D_UP
+	jr nz, .upJump
+	ld a, [hl] 
+	and D_DOWN
+	jr nz, .downJump
+	ld a, [hl]
+	and D_LEFT
+	jr nz, .leftJump
+	ld a, [hl] 
+	and D_RIGHT
+	jr nz, .rightJump
+	ret
+	
+.rightJump; 04:5D4A
+	ld hl, $000C
+	add hl, bc
+	ld a, [hl]
+	cp $0D
+	jr nc, .skip
+	inc [hl]
+	jr .escape
+.skip
+	ld [hl], 0
+	jr .escape
+.leftJump
+	ld hl, $000C
+	add hl, bc
+	ld a, [hl]
+	and a
+	jr z, .skip2
+	dec [hl]
+	jr .escape
+.skip2
+	ld [hl], $0D
+	jr .escape
+.downJump
+	ld hl, $000D
+	add hl, bc
+	ld a, [hl]
+	cp 4
+	jr nc, .skip3
+	inc [hl]
+	jr .escape
+.skip3
+	ld [hl], 00
+	jr .escape
+.upJump
+	ld hl, $000D
+	add hl, bc
+	ld a, [hl]
+	and a
+	jr z, .skip4
+	dec [hl]
+	jr .escape
+.skip4
+	ld [hl], 4
+	jr .escape
+.escape
+	ld hl, $000C
+	add hl, bc
+	ld e, [hl]
+	ld d, 0
+	ld hl, .Offsets1
+	add hl, de
+	ld a, [hl]
+	ld hl, $0006
+	add hl, bc
+	ld [hl], a
+	ld hl, $000D
+	add hl, bc
+	ld e, [hl]
+	ld d, 0
+	ld hl, .Offsets2
+	add hl, de
+	ld a, [hl]
+	ld hl, $0007
+	add hl, bc
+	ld [hl], a
+	ret
+	
+.Offsets1: ; 04:5DAB
+	db $00, $08, $10, $18, $20, $28, $30, $48, $50, $58, $60, $68, $70, $78 
+	
+.Offsets2: ; 04:5DB9
+	db $00, $08, $18, $20, $30
--- a/engine/unknown_boxes.asm
+++ b/engine/unknown_boxes.asm
@ -0,0 +1,83 @@
+INCLUDE "constants.asm"
+
+SECTION "engine/unknown_boxes.asm", ROMX
+
+Function1130a: ; 04:530A
+	ret
+	
+Function1130b: ; 04:530B
+	ld a, [wPartyCount]
+	cp PARTY_LENGTH
+	jr c, .bigjump
+	ld a, [wBoxListLength]
+	cp $1E
+	jr nc, .fullbox
+	xor a
+	ld [wca44], a
+	ld a, [wMonDexIndex]
+	ld [wcdd7], a
+	callab AddPokemonToBox
+	call RecievePokemon
+	predef Functiondd5c
+	and $7F
+	add a, $F7
+	ld hl, wStringBuffer2
+	ld [hli], a
+	ld [hl], "@"
+	ld hl, BoxCantHoldText
+	call PrintText
+	scf
+	ret
+.fullbox	
+	ld hl, BoxFullText
+	call PrintText
+	and a
+	ret
+.bigjump
+	call RecievePokemon
+	predef Functiond886
+	scf
+	ret
+	
+RecievePokemon: ; 04:5357
+	ld a, [wMonDexIndex]
+	push af
+	ld [wNamedObjectIndexBuffer], a
+	dec a
+	ld c, a
+	ld hl, wPokedexOwned
+	ld b, 01 ;SET_FLAG
+	predef SmallFarFlagAction
+	pop af
+	ld [wNamedObjectIndexBuffer], a
+	call GetPokemonName
+	ld hl, RecievePokemonText
+	jp PrintText
+	
+RecievePokemonText: ; 04:5377
+	text "<PLAYER>は"
+	line "@"
+	
+	db $01, $26, $CD
+	
+	text "を　てにいれた！@"
+	
+	db $0B, "@" 
+	
+BoxCantHoldText: ; 04:538B
+	text "#を　もちきれないので"
+	line "<PC>の　ボックス@"
+	db $01, $31, $CD
+	text "　に"
+	cont "@"
+	db $01, $17, $DF
+	text "を　てんそうした！"
+	done
+	
+BoxFullText: ; 04:53B6
+	text "#を　もちきれません！"
+	para "ボックスも　いっぱいで"
+	line "てんそうできません！"
+	para "#センターなどで"
+	line "ボックスを　かえてきて　ください"
+	done
--- a/gfx.asm
+++ b/gfx.asm
@ -80,6 +80,14 @@ TitleScreenLogoGFX:: INCBIN "gfx/title/title_logo.2bpp"
 TitleScreenGoldLogoGFX:: INCBIN "gfx/title/title_silverlogo.2bpp"
 endc

+SECTION "gfx.asm@Name Entry Extra Tiles", ROMX
+TextScreenGFX_End:: 
+INCBIN "gfx/font/text_entry_end.1bpp"
+TextScreenGFX_Hyphen::
+INCBIN "gfx/font/text_entry_hyphen.1bpp"
+TextScreenGFX_Underscore::
+INCBIN "gfx/font/text_entry_underscore.1bpp"
+
 SECTION "gfx.asm@Mail Icon GFX", ROMX
 MailIconGFX::
 INCBIN "gfx/icons/mail.2bpp"
@ -195,8 +203,10 @@ PokedexButtonsGFX::
 INCBIN "gfx/pokedex/buttons.2bpp"
 PokedexPokeBallGFX::
 INCBIN "gfx/pokedex/poke_ball.2bpp"
-PokedexCursorsGFX::
-INCBIN "gfx/pokedex/cursors.2bpp"
+PokedexCursorGFX::
+INCBIN "gfx/pokedex/cursor.2bpp"
+PokedexBorderGFX::
+INCBIN "gfx/pokedex/border.2bpp"
 PokedexSearchGFX::
 INCBIN "gfx/pokedex/search.2bpp"

--- a/gfx/font/text_entry_end.1bpp.png
+++ b/gfx/font/text_entry_end.1bpp.png
--- a/gfx/font/text_entry_hyphen.1bpp.png
+++ b/gfx/font/text_entry_hyphen.1bpp.png
--- a/gfx/font/text_entry_underscore.1bpp.png
+++ b/gfx/font/text_entry_underscore.1bpp.png
--- a/gfx/pokedex/border.png
+++ b/gfx/pokedex/border.png
--- a/gfx/pokedex/cursor.png
+++ b/gfx/pokedex/cursor.png
--- a/gfx/pokedex/cursors.png
+++ b/gfx/pokedex/cursors.png
--- a/macros.asm
+++ b/macros.asm
@ -11,4 +11,4 @@ INCLUDE "macros/wram.asm"
 INCLUDE "macros/audio.asm"
 INCLUDE "macros/scripts.asm"
 INCLUDE "macros/queue.asm"
-INCLUDE "macros/maps.asm"
+INCLUDE "macros/maps.asm"
--- a/pokegold-spaceworld.link
+++ b/pokegold-spaceworld.link
@ -166,15 +166,22 @@ ROMX $03
 ROMX $04
 	org $4000
 	"data/maps/maps.asm"
+	; $4743
 	org $47cf
 	"gfx.asm@Title Screen GFX"
-	org $52d1
+	"engine/items/tmhm.asm"
 	"data/moves/tmhm_moves.asm"
-	org $5bb1
+	"engine/unknown_boxes.asm"
+	"engine/menu/text_entry.asm@naming"
+	"data/text/text_input_chars.asm"
+	"gfx.asm@Name Entry Extra Tiles"
+	"engine/menu/text_entry.asm@mail"
 	"gfx.asm@Mail Icon GFX"
-	; $5c31
-	org $7171
+	"engine/menu/text_entry.asm@mail2"
+	"engine/unknown11d32.asm"
+	"engine/menu/start_menu.asm"
 	"gfx.asm@Trainer Card GFX"
+	; $7be3
 ROMX $05
 	org $4000
 	"engine/overworld/player_movement.asm@_RedrawPlayerSprite"
--- a/shim.sym
+++ b/shim.sym
@ -1,13 +1,5 @@
 04:4743 ShrinkPic1
 04:479D ShrinkPic2
-04:528F Function1128f
-04:52C1 Function112c1
-04:530A Function1130a
-04:53F4 Function113f4
-04:5677 DoPlayerMovement
-04:5DBE DisplayStartMenu
-04:640B Function1240b
-04:6C58 CheckRegisteredItem

 05:4036 RefreshSprites
 05:404C CheckInteriorMap
@ -44,13 +36,22 @@
 09:412C _ExitMenu
 09:4185 Function24185
 09:4199 _InitVerticalMenuCursor
+09:41EF Function241ef
 09:426A _InitScrollingMenu
 09:4287 _ScrollingMenu
+09:43AF Function243af
+09:45C5 Function245c5
+09:473B Function2473b
+09:4774 Function24774
+09:4783 Function24783
+09:4955 Function24955
+09:4C60 Function24c60

 0A:4C98 LinkTextboxAtHL
 0A:4D6E Function28d6e
 0A:4DA4 Function28da4

+0B:52FC Function2d2fc
 0B:5663 Function2d663

 0E:4B78 LoadTrainerClassName
@ -85,6 +86,7 @@
 10:4B07 Function40b07
 10:4B45 Function40b45
 10:4B5C Function40b5c
+10:58B8 Data4a8b8
 10:58BB Moves
 10:5F93 Function4af93
 10:5FA1 Function41fa1
@ -97,10 +99,11 @@
 14:40C6 Function500c6
 14:4244 Function50244
 14:4248 Function50248
-14:42B5 Function502b5
+14:42B5 Function502b5 ; Pokemon Summary routine?
 14:4628 Function50628
 14:469E Function5069e
 14:46D4 Function506d4
+14:4756 Function50756
 14:4771 Function50771
 14:4774 Function50774
 14:481F Function5081f
@ -127,7 +130,10 @@
 23:4d13 EffectObjectJumpNoDelay
 23:4d52 _InitSpriteAnimStruct
 23:60cc MenuMonIconGfx
+23:70CC Function8f0cc
+23:70E3 Function8f0e3
 23:71CB Function_8f1cb
+23:71F2 Function8f1f2

 24:4000 SetClockDialog
 24:4239 SlotMachineGame
@ -161,6 +167,7 @@
 3A:52C7 Music

 3F:40E9 InGameDebugMenu
+3F:4305 PokeGear
 3F:4C24 Functionfcc24
 3F:4E3E Functionfce3e
 3F:5B66 Functionfdb66
--- a/wram.asm
+++ b/wram.asm
@ -106,11 +106,31 @@ wc40c:: ds 1 ; c40c
 wc40d:: ds 1 ; c40d
 wc40e:: ds 1 ; c40e

-	ds 177
+	ds 11
+
+wc41a:: db ; c41a
+
+	ds 165

 wSpriteAnimIDBuffer:: db ; c4c0

-	ds 89
+	ds 6
+	
+wc4c7:: db ; c4c7
+wc4c8:: db ; c4c8
+
+	ds 7
+	
+wNamingScreenDestinationPointer:: dw ; c4d0
+wNamingScreenCurNameLength:: db ; c4d2
+wNamingScreenMaxNameLength:: db ; c4d3
+wNamingScreenType:: db ; c4d4
+wNamingScreenCursorObjectPointer:: dw ; c4d5
+wNamingScreenLastCharacter:: db ; c4d7
+wNamingScreenStringEntryCoordY:: db ; c4d8
+wNamingScreenStringEntryCoordX:: db ; c4d9
+	
+	ds 64
 	
 wc51a:: ds 1 ; c51a

@ -545,7 +565,7 @@ wRegularItemsScrollPosition:: db ; cd44
 wBackpackAndKeyItemsScrollPosition:: db ; cd45
 wcd46:: ds 1 ; cd46
 wcd47:: ds 1 ; cd47
-wcd48:: ds 1 ; cd48
+wSelectedSwapPosition:: db ; cd48
 wMenuScrollPosition:: db ; cd49

 wTextDest:: ds 2; cd4a
@ -595,6 +615,8 @@ wcd7c:: ds 1 ; cd7c
 wItemQuantity:: db ; cd7d
 wItemQuantityBuffer:: db ; cd7e
 wcd7f:: db ; cd7f
+wcd80:: db ; cd80
+wcd81:: db ; cd81

 SECTION "CD9E", WRAM0 [$CD9E]
 wcd9e:: db ; cd9e
@ -940,7 +962,9 @@ wBallQuantities:: db ; d1df
 wUnknownListLengthd1ea:: db ; d1ea
 wUnknownListd1eb:: db ; d1eb

-SECTION "Rival's Name", WRAM0[$D258]
+SECTION "Rival's Name", WRAM0[$D256]
+wRegisteredItem:: db ; d256
+wRegisteredItemQuantity:: db ; d257
 wRivalName:: ds 6 ; d258
 	ds 6

@ -971,8 +995,16 @@ wd39d:: db

 SECTION "Game Event Flags", WRAM0[$D41A]
 wd41a:: db
+; 76543210
+; |      \- read email?
+; \-------- talked to Blue, triggers Oak
 wd41b:: db
+; 76543210
+;      |\-- followed Oak to his back room 
+;      \--- chose a starter
 wd41c:: db
+; 76543210
+;    \----- recieved pokedexes
 wd41d:: db
 wd41e:: db

@ -1112,8 +1144,8 @@ wTilesetCollisionAddress:: ; d6a4
 wTilesetEnd:: ; d6aa

 wPartyCount:: db
-wPartySpecies:: ds PARTY_LENGTH
-wPartyEnd:: db
+wPartySpecies:: ds PARTY_LENGTH ; d6ab - d6b0
+wPartyEnd:: db ; d6b1

 wPartyMons::
 wPartyMon1:: party_struct wPartyMon1 ; d6b2
@ -1224,8 +1256,8 @@ wda5f:: db ; da5f

 SECTION "DA83", WRAM0[$DA83]

-wUnknownListLengthda83:: db ; da83
-wUnknownListda84:: db ; da84
+wBoxListLength:: db ; da83
+wBoxList:: ds $1E ; da84

 SECTION "DAA3", WRAM0[$DAA3]