#18 fixes (#23)

* Adjust sprite for Pokemon name

* Fix arrow positioning in mobile party select

* ugh i really need to git gud on rebasing - lmao

* add "Not Able" text

data/sprite_anims/oam.asm

@@ -780,33 +780,35 @@ SpriteAnimOAMData:
 	dsprite  0,  0,  4,  0, $32, 0
 	dsprite  1,  0,  0,  0, $33, 0
 	dsprite  1,  0,  1,  0, $34, 0
-	;    dsprite  1,  0,  2,  0, $34, 0
+;	dsprite  1,  0,  2,  0, $34, 0
 	dsprite  1,  0,  3,  0, $34, 0
 	dsprite  1,  0,  4,  0, $35, 0
 
 ; split cursor for mon names
 .OAMData_EZChatCursor10:
-	db 12
+	db 18
 	dsprite  0,  0,  0,  0, $30, 0
 	dsprite  0,  0,  1,  0, $31, 0
 	dsprite  0,  0,  2,  0, $31, 0
-	;dsprite  0,  0,  3,  0, $31, 0
-	;dsprite  0,  0,  4,  0, $31, 0
-	;dsprite  0,  0,  (5+2),  0, $31, 0
+	dsprite  0,  0,  3,  0, $31, 0
+	dsprite  0,  0,  4,  0, $31, 0
+
+	dsprite  0,  0,  (5+2),  0, $31, 0
 	dsprite  0,  0,  (6+2),  0, $31, 0
 	dsprite  0,  0,  (7+2),  0, $31, 0
 	dsprite  0,  0,  (8+2),  0, $32, 0
+
 	dsprite  1,  0,  0,  0, $33, 0
 	dsprite  1,  0,  1,  0, $34, 0
 	dsprite  1,  0,  2,  0, $34, 0
-	;dsprite  1,  0,  3,  0, $34, 0
-	;dsprite  1,  0,  4,  0, $34, 0
-	;dsprite  1,  0,  (5+2),  0, $34, 0
+	dsprite  1,  0,  3,  0, $34, 0
+	dsprite  1,  0,  4,  0, $34, 0
+
+	dsprite  1,  0,  (5+2),  0, $34, 0
 	dsprite  1,  0,  (6+2),  0, $34, 0
 	dsprite  1,  0,  (7+2),  0, $34, 0
 	dsprite  1,  0,  (8+2),  0, $35, 0
 
-
 .OAMData_BlueWalk:
 	db 4
 	dbsprite -1, -1,  0,  0, $00, PAL_OW_BLUE

engine/pokemon/party_menu.asm

@@ -484,16 +484,31 @@ PlacePartyMonMobileBattleSelection:
 	hlcoord 12, 2;12, 1
 .loop
 	push bc
+	
+	call PartyMenuCheckEgg
+	jr nz, .mon_able
+	
 	push hl
-	ld de, .String_Sanka_Shinai
+	ld de, .String_NotAble
 	call PlaceString
 	pop hl
+	jr .mon_ok
+
+.mon_able	
+	push hl
+	ld de, .String_Able
+	call PlaceString
+	pop hl
+
+.mon_ok
 	ld de, 2 * SCREEN_WIDTH
 	add hl, de
+	
 	pop bc
 	inc b
 	dec c
 	jr nz, .loop
+
 	ld a, l
 	ld e, MON_NAME_LENGTH + 20
 	sub e
@@ -505,7 +520,7 @@ PlacePartyMonMobileBattleSelection:
 	call PlaceString
 	ld b, $3
 	ld c, $0
-	ld hl, wd002
+	ld hl, wd002 ; selected partymon indices
 	ld a, [hl]
 .loop2
 	push hl
@@ -520,10 +535,10 @@ PlacePartyMonMobileBattleSelection:
 	jr .loop3
 
 .done
-	ld de, .String_Banme
-	push hl
-	call PlaceString
-	pop hl
+;	ld de, .String_Banme
+;	push hl
+;	call PlaceString
+;	pop hl
 	pop bc
 	push bc
 	push hl
@@ -543,10 +558,12 @@ PlacePartyMonMobileBattleSelection:
 	ret z
 	jr .loop2
 
-.String_Banme:
-	db "@";"　ばんめ　　@" ; Place
-.String_Sanka_Shinai:
+;.String_Banme:
+;	db "@";"　ばんめ　　@" ; Place
+.String_Able:
 	db "ABLE@";"さんかしない@" ; Cancel
+.String_NotAble:
+	db "NOT ABLE@"
 .String_Kettei_Yameru:
 	db "OK  CANCEL@";"けってい　　やめる@" ; Quit
 .Strings_1_2_3:

mobile/mobile_12_2.asm

@@ -503,7 +503,7 @@ Function4ab1a:
 .asm_4ab1a
 	ld a, $fb
 	ld [wMenuJoypadFilter], a
-	ld a, $26
+	ld a, $24
 	ld [w2DMenuCursorOffsets], a
 	ld a, $2
 	ld [w2DMenuNumCols], a
@@ -665,7 +665,7 @@ Function4abc3:
 	call ClearBox
 	call Function4aab6
 	ld a, [wPartyCount]
-	hlcoord 6, 1
+	hlcoord 4, 1
 .asm_4ac3b
 	ld bc, $28
 	add hl, bc