Identify more stuff

constants/gfx_constants.asm

@@ -43,3 +43,5 @@ DEF DOUBLESPRITEBUFFERSIZE EQU 2 * SPRITEBUFFERSIZE
 	const SPRITEOAMSTRUCT_ATTRIBUTES ; 3
 DEF SPRITEOAMSTRUCT_LENGTH EQU const_value
 DEF NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wShadowOAM
+
+DEF OAM_YCOORD_HIDDEN EQU 160 ; hides an OAM offscreen

constants/pokemon_constants.asm

@@ -192,3 +192,33 @@
 	const MON_BELLSPROUT    ; bc
 	const MON_WEEPINBELL    ; bd
 	const MON_VICTREEBEL    ; be
+
+; Unown forms
+	const_def 1
+	const UNOWN_A ;  1
+	const UNOWN_B ;  2
+	const UNOWN_C ;  3
+	const UNOWN_D ;  4
+	const UNOWN_E ;  5
+	const UNOWN_F ;  6
+	const UNOWN_G ;  7
+	const UNOWN_H ;  8
+	const UNOWN_I ;  9
+	const UNOWN_J ; 10
+	const UNOWN_K ; 11
+	const UNOWN_L ; 12
+	const UNOWN_M ; 13
+	const UNOWN_N ; 14
+	const UNOWN_O ; 15
+	const UNOWN_P ; 16
+	const UNOWN_Q ; 17
+	const UNOWN_R ; 18
+	const UNOWN_S ; 19
+	const UNOWN_T ; 20
+	const UNOWN_U ; 21
+	const UNOWN_V ; 22
+	const UNOWN_W ; 23
+	const UNOWN_X ; 24
+	const UNOWN_Y ; 25
+	const UNOWN_Z ; 26
+DEF NUM_UNOWN EQU const_value - 1 ; 26

data/predef_pointers.inc

@@ -61,7 +61,7 @@ GiveItemPredef::
 	add_predef Function40ac7
 	add_predef Function40000
 	add_predef Function40b5c ; 30
-	add_predef Function50000
+	add_predef CopyMonToTempMon
 	add_predef Function50bfe
 	add_predef Function50bcd
 	add_predef Function50b92
@@ -77,7 +77,7 @@ GiveItemPredef::
 	add_predef GetTypeName
 	add_predef PrintMoveType
 	add_predef PrintMonTypes ; 40
-	add_predef Function50ed9
+	add_predef GetUnownLetter
 	add_predef Functioncb6ff
 	add_predef Functioncb710
 	add_predef Functioncb733

engine/debug/debug_menu.asm

@@ -88,7 +88,7 @@ DebugMenuOptionSubGames::
 	jp DebugMenu
 
 DebugMenuOptionMonsterTest::
-	ld hl, wPokedexOwned
+	ld hl, wPokedexCaught
 	ld de, wPokedexSeen
 	ld b, NUM_POKEMON / 8
 	ld a, %11111111

engine/debug/field/item_test.inc

@@ -168,7 +168,7 @@ FieldDebug_ItemTest:
 	push hl
 	callfar _CheckTossableItem
 	pop hl
-	ld a, [wItemAttributeParamBuffer]
+	ld a, [wItemAttributeValue]
 	and a
 	jr nz, .not_tossable
 	call .tossable

engine/debug/field/pokemart_menu.inc

@@ -192,7 +192,7 @@ DebugMart_Sell:
 
 .DoBagFunctions:
 	callfar CheckItemMenu
-	ld a, [wItemAttributeParamBuffer]
+	ld a, [wItemAttributeValue]
 	ld hl, .BagJumptable
 	call CallJumptable
 	ret
@@ -230,7 +230,7 @@ DebugMart_Sell:
 
 .CheckSellableItem:
 	callfar _CheckTossableItem
-	ld a, [wItemAttributeParamBuffer]
+	ld a, [wItemAttributeValue]
 	and a
 	jr nz, .not_sellable
 	jp .ItemQuantityPrompt

engine/debug/field/unused_flag_menu.inc

@@ -76,7 +76,7 @@ ENDM
 Functionfd91e: ; unused?
 	call .asm_fd930
 	ld a, [wNumSetBits]
-	ld [wMonDexIndex], a
+	ld [wCurPartySpecies], a
 	callfar Pokepic
 	ret
 

engine/debug/field/vram_viewer.inc

@@ -166,7 +166,7 @@ FieldDebug_DoVRAMViewer:
 .LoadPokemon:
 	ld a, 3
 	ld [wce37], a
-	ld [wMonDexIndex], a
+	ld [wCurPartySpecies], a
 	call GetBaseData
 	call LoadMonFrontSprite
 	ret

engine/dumps/bank01.asm

@@ -3020,7 +3020,7 @@ LoadFonts_NoOAMUpdate:
 
 Function6445:
 	call BackUpTilesToBuffer
-	ld a, [wWhichPokemon]
+	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
 	call GetNick
 	ld hl, wStringBuffer1
@@ -3030,7 +3030,7 @@ Function6445:
 .sub_645d
 	ld hl, wPartyMon1Moves
 	ld bc, $0030
-	ld a, [wWhichPokemon]
+	ld a, [wCurPartyMon]
 	call AddNTimes
 	ld d, h
 	ld e, l
@@ -3073,7 +3073,7 @@ Function6445:
 	ld a, [wBattleMode]
 	and a
 	jp z, .sub_64eb
-	ld a, [wWhichPokemon]
+	ld a, [wCurPartyMon]
 	ld b, a
 	ld a, [wCurBattleMon]
 	cp b
@@ -3359,7 +3359,7 @@ Function6713:
 	ld b, $04
 	ld c, $0a
 	call z, ClearBox
-	ld a, [wMonDexIndex]
+	ld a, [wCurPartySpecies]
 	ld [wce37], a
 	call GetPokemonName
 	ld a, [wDebugFlags]
@@ -3428,7 +3428,7 @@ Function679d:
 	jr z, .sub_67d3
 	ld hl, wPartyMonNicknames
 	ld bc, $0006
-	ld a, [wWhichPokemon]
+	ld a, [wCurPartyMon]
 	call AddNTimes
 	ld e, l
 	ld d, h