ported battle_controller_player from pokeem and matched several new functions

asm/battle_2.s

@@ -4427,8 +4427,8 @@ _08012130:
 _08012134: .4byte gIntroSlideFlags
 	thumb_func_end sub_8012110
 
-	thumb_func_start dp11b_obj_instanciate
-dp11b_obj_instanciate: @ 8012138
+	thumb_func_start DoBounceEffect
+DoBounceEffect: @ 8012138
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -4570,10 +4570,10 @@ _0801223C:
 _0801224C: .4byte gBattlerSpriteIds
 _08012250: .4byte gBattleSpritesDataPtr
 _08012254: .4byte gSprites
-	thumb_func_end dp11b_obj_instanciate
+	thumb_func_end DoBounceEffect
 
-	thumb_func_start dp11b_obj_free
-dp11b_obj_free: @ 8012258
+	thumb_func_start EndBounceEffect
+EndBounceEffect: @ 8012258
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -4660,7 +4660,7 @@ _080122FA:
 	.align 2, 0
 _08012300: .4byte gBattleSpritesDataPtr
 _08012304: .4byte gSprites
-	thumb_func_end dp11b_obj_free
+	thumb_func_end EndBounceEffect
 
 	thumb_func_start SpriteCB_HealthBoxBounce
 SpriteCB_HealthBoxBounce: @ 8012308

asm/battle_controller_link_partner.s

@@ -5375,7 +5375,7 @@ _080D6DFC:
 	adds r1, r4
 	ldrb r0, [r1, 0x13]
 _080D6E0C:
-	ldr r1, _080D6EA4 @ =gUnknown_8239FD4
+	ldr r1, _080D6EA4 @ =gTrainerBackPicPaletteTable
 	lsls r0, 3
 	adds r0, r1
 	ldr r0, [r0]
@@ -5451,7 +5451,7 @@ _080D6E86:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080D6EA4: .4byte gUnknown_8239FD4
+_080D6EA4: .4byte gTrainerBackPicPaletteTable
 _080D6EA8: .4byte gSprites
 _080D6EAC: .4byte gBattlerSpriteIds
 _080D6EB0: .4byte gActiveBattler

asm/battle_controller_oak.s

@@ -101,12 +101,12 @@ sub_80E763C: @ 80E763C
 	movs r1, 0x1
 	movs r2, 0x7
 	movs r3, 0x1
-	bl dp11b_obj_instanciate
+	bl DoBounceEffect
 	ldrb r0, [r4]
 	movs r1, 0
 	movs r2, 0x7
 	movs r3, 0x1
-	bl dp11b_obj_instanciate
+	bl DoBounceEffect
 	ldr r0, _080E76A4 @ =gMain
 	ldrh r1, [r0, 0x2E]
 	movs r2, 0x1
@@ -329,7 +329,7 @@ _080E782C:
 	ands r0, r1
 	cmp r0, 0
 	beq _080E7838
-	bl sub_8048A4C
+	bl SwapHpBarsWithHpText
 _080E7838:
 	pop {r3}
 	mov r8, r3
@@ -511,7 +511,7 @@ _080E7984: .4byte gDoingBattleAnim
 	thumb_func_start sub_80E7988
 sub_80E7988: @ 80E7988
 	push {lr}
-	bl sub_802EA10
+	bl HandleInputChooseMove
 	ldr r2, _080E79AC @ =gBattleControllerExecFlags
 	ldr r1, _080E79B0 @ =gBitTable
 	ldr r0, _080E79B4 @ =gActiveBattler
@@ -562,7 +562,7 @@ sub_80E79B8: @ 80E79B8
 	bl DestroyTask
 	bl FreeAllWindowBuffers
 	adds r0, r4, 0
-	bl sub_81278DC
+	bl OpenPartyMenuInBattle
 _080E79F6:
 	pop {r4}
 	pop {r0}
@@ -6031,7 +6031,7 @@ _080EA71E:
 	ands r0, r1
 	cmp r0, 0
 	beq _080EA770
-	ldr r0, _080EA76C @ =gUnknown_83FE6D5
+	ldr r0, _080EA76C @ =gText_WhatWillPkmnDo
 	bl BattleStringExpandPlaceholdersToDisplayedString
 	b _080EA776
 	.align 2, 0
@@ -6042,7 +6042,7 @@ _080EA75C: .4byte gUnknown_83FDA4C
 _080EA760: .4byte gUnknown_83FE725
 _080EA764: .4byte gActionSelectionCursor
 _080EA768: .4byte gBattleTypeFlags
-_080EA76C: .4byte gUnknown_83FE6D5
+_080EA76C: .4byte gText_WhatWillPkmnDo
 _080EA770:
 	ldr r0, _080EA784 @ =gUnknown_83FE6FA
 	bl BattleStringExpandPlaceholdersToDisplayedString
@@ -6108,7 +6108,7 @@ sub_80EA7DC: @ 80EA7DC
 	ands r0, r1
 	cmp r0, 0
 	beq _080EA810
-	bl sub_8032CB4
+	bl InitMoveSelectionsVarsAndStrings
 	ldr r1, _080EA804 @ =gBattlerControllerFuncs
 	ldr r0, _080EA808 @ =gActiveBattler
 	ldrb r0, [r0]
@@ -6135,7 +6135,7 @@ _080EA810:
 	.align 2, 0
 _080EA824: .4byte gBattleStruct
 _080EA828:
-	bl sub_8032CB4
+	bl InitMoveSelectionsVarsAndStrings
 	ldr r1, [r4]
 	adds r1, 0x95
 	ldrb r0, [r1]
@@ -6891,7 +6891,7 @@ _080EAD64:
 	bl AllocSpritePalette
 	adds r4, r0, 0
 	lsls r4, 24
-	ldr r1, _080EAEC0 @ =gUnknown_8239FD4
+	ldr r1, _080EAEC0 @ =gTrainerBackPicPaletteTable
 	ldr r0, _080EAEC4 @ =gSaveBlock2Ptr
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x8]
@@ -6973,7 +6973,7 @@ _080EAEB0: .4byte 0x0000ffd8
 _080EAEB4: .4byte StartAnimLinearTranslation
 _080EAEB8: .4byte sub_80335F8
 _080EAEBC: .4byte 0x0000d6f8
-_080EAEC0: .4byte gUnknown_8239FD4
+_080EAEC0: .4byte gTrainerBackPicPaletteTable
 _080EAEC4: .4byte gSaveBlock2Ptr
 _080EAEC8: .4byte sub_80EB0A8
 _080EAECC: .4byte gTasks
@@ -7326,10 +7326,10 @@ sub_80EB1AC: @ 80EB1AC
 	ldr r4, _080EB1CC @ =gActiveBattler
 	ldrb r0, [r4]
 	movs r1, 0x1
-	bl dp11b_obj_free
+	bl EndBounceEffect
 	ldrb r0, [r4]
 	movs r1, 0
-	bl dp11b_obj_free
+	bl EndBounceEffect
 	bl WallyBufferExecCompleted
 	pop {r4}
 	pop {r0}
@@ -7410,10 +7410,10 @@ sub_80EB238: @ 80EB238
 	bgt _080EB260
 	adds r0, r2, 0
 	movs r1, 0x1
-	bl dp11b_obj_free
+	bl EndBounceEffect
 	ldrb r0, [r4]
 	movs r1, 0
-	bl dp11b_obj_free
+	bl EndBounceEffect
 _080EB260:
 	bl WallyBufferExecCompleted
 	pop {r4}

asm/battle_controller_pokedude.s

@@ -5191,7 +5191,7 @@ _08158B8E:
 	ldrb r0, [r0]
 	movs r1, 0
 	bl ActionSelectionCreateCursorAt
-	ldr r0, _08158BD4 @ =gUnknown_83FE6D5
+	ldr r0, _08158BD4 @ =gText_WhatWillPkmnDo
 	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, _08158BD8 @ =gDisplayedStringBattle
 	movs r1, 0x1
@@ -5204,7 +5204,7 @@ _08158BC4: .4byte sub_8158B20
 _08158BC8: .4byte gUnknown_83FDA4C
 _08158BCC: .4byte gUnknown_83FE725
 _08158BD0: .4byte gActionSelectionCursor
-_08158BD4: .4byte gUnknown_83FE6D5
+_08158BD4: .4byte gText_WhatWillPkmnDo
 _08158BD8: .4byte gDisplayedStringBattle
 _08158BDC:
 	ldr r0, _08158BF0 @ =gBattlerControllerFuncs
@@ -5272,7 +5272,7 @@ sub_8158C48: @ 8158C48
 	lsls r0, 24
 	cmp r0, 0
 	bne _08158C74
-	bl sub_8032CB4
+	bl InitMoveSelectionsVarsAndStrings
 	ldr r0, _08158C6C @ =gBattlerControllerFuncs
 	ldrb r1, [r4]
 	lsls r1, 2
@@ -6198,7 +6198,7 @@ sub_8159304: @ 8159304
 	bl AllocSpritePalette
 	adds r4, r0, 0
 	lsls r4, 24
-	ldr r0, _08159458 @ =gUnknown_8239FD4
+	ldr r0, _08159458 @ =gTrainerBackPicPaletteTable
 	ldr r0, [r0, 0x20]
 	lsrs r4, 20
 	movs r2, 0x80
@@ -6276,7 +6276,7 @@ _08159448: .4byte 0x0000ffd8
 _0815944C: .4byte StartAnimLinearTranslation
 _08159450: .4byte sub_80335F8
 _08159454: .4byte 0x0000d6f8
-_08159458: .4byte gUnknown_8239FD4
+_08159458: .4byte gTrainerBackPicPaletteTable
 _0815945C: .4byte sub_81595EC
 _08159460: .4byte gTasks
 _08159464: .4byte gBattleSpritesDataPtr
@@ -6591,10 +6591,10 @@ sub_81596F0: @ 81596F0
 	ldr r4, _08159710 @ =gActiveBattler
 	ldrb r0, [r4]
 	movs r1, 0x1
-	bl dp11b_obj_free
+	bl EndBounceEffect
 	ldrb r0, [r4]
 	movs r1, 0
-	bl dp11b_obj_free
+	bl EndBounceEffect
 	bl PlayerPartnerBufferExecCompleted
 	pop {r4}
 	pop {r0}
@@ -6675,10 +6675,10 @@ sub_815977C: @ 815977C
 	bgt _081597A4
 	adds r0, r2, 0
 	movs r1, 0x1
-	bl dp11b_obj_free
+	bl EndBounceEffect
 	ldrb r0, [r4]
 	movs r1, 0
-	bl dp11b_obj_free
+	bl EndBounceEffect
 _081597A4:
 	bl PlayerPartnerBufferExecCompleted
 	pop {r4}
@@ -6765,12 +6765,12 @@ sub_8159824: @ 8159824
 	movs r1, 0x1
 	movs r2, 0x7
 	movs r3, 0x1
-	bl dp11b_obj_instanciate
+	bl DoBounceEffect
 	ldrb r0, [r4]
 	movs r1, 0
 	movs r2, 0x7
 	movs r3, 0x1
-	bl dp11b_obj_instanciate
+	bl DoBounceEffect
 _0815985C:
 	ldr r6, _081598C0 @ =gUnknown_3005EE0
 	ldrb r2, [r4]

asm/battle_interface.s

@@ -1945,8 +1945,8 @@ _08048A44: .4byte 0x060100c0
 _08048A48: .4byte 0x04000008
 	thumb_func_end sub_80487F8
 
-	thumb_func_start sub_8048A4C
-sub_8048A4C: @ 8048A4C
+	thumb_func_start SwapHpBarsWithHpText
+SwapHpBarsWithHpText: @ 8048A4C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2277,7 +2277,7 @@ _08048D04: .4byte gEnemyParty
 _08048D08: .4byte gBattleTypeFlags
 _08048D0C: .4byte gHealthboxSpriteIds
 _08048D10: .4byte gBattlersCount
-	thumb_func_end sub_8048A4C
+	thumb_func_end SwapHpBarsWithHpText
 
 	thumb_func_start CreatePartyStatusSummarySprites
 CreatePartyStatusSummarySprites: @ 8048D14

asm/battle_message.s

@@ -2304,10 +2304,10 @@ _080D8504:
 	ldrb r0, [r0, 0x1]
 	lsls r1, r0, 3
 	subs r1, r0
-	ldr r0, _080D8510 @ =gUnknown_824F1A0
+	ldr r0, _080D8510 @ =gTypeNames
 	b _080D8616
 	.align 2, 0
-_080D8510: .4byte gUnknown_824F1A0
+_080D8510: .4byte gTypeNames
 _080D8514:
 	ldrb r0, [r4, 0x1]
 	bl GetBattlerSide

asm/item_menu.s

@@ -154,14 +154,14 @@ _08107EC8: .4byte sub_80568A8
 	thumb_func_start sub_8107ECC
 sub_8107ECC: @ 8107ECC
 	push {lr}
-	ldr r2, _08107EDC @ =sub_8030AEC
+	ldr r2, _08107EDC @ =SetCB2ToReshowScreenAfterMenu2
 	movs r0, 0x5
 	movs r1, 0x3
 	bl sub_8107DB4
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08107EDC: .4byte sub_8030AEC
+_08107EDC: .4byte SetCB2ToReshowScreenAfterMenu2
 	thumb_func_end sub_8107ECC
 
 	thumb_func_start sub_8107EE0
@@ -6124,14 +6124,14 @@ sub_810AF74: @ 810AF74
 	movs r0, 0x4
 	movs r1, 0x1
 	bl AddBagItem
-	ldr r2, _0810AF98 @ =sub_8030AEC
+	ldr r2, _0810AF98 @ =SetCB2ToReshowScreenAfterMenu2
 	movs r0, 0x6
 	movs r1, 0
 	bl sub_8107DB4
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0810AF98: .4byte sub_8030AEC
+_0810AF98: .4byte SetCB2ToReshowScreenAfterMenu2
 	thumb_func_end sub_810AF74
 
 	thumb_func_start sub_810AF9C
@@ -6348,13 +6348,13 @@ sub_810B108: @ 810B108
 	.align 2, 0
 _0810B15C: .4byte CB2_ReturnToTeachyTV
 _0810B160:
-	ldr r2, _0810B168 @ =sub_8030AEC
+	ldr r2, _0810B168 @ =SetCB2ToReshowScreenAfterMenu2
 	movs r0, 0x7
 	b _0810B170
 	.align 2, 0
-_0810B168: .4byte sub_8030AEC
+_0810B168: .4byte SetCB2ToReshowScreenAfterMenu2
 _0810B16C:
-	ldr r2, _0810B17C @ =sub_8030AEC
+	ldr r2, _0810B17C @ =SetCB2ToReshowScreenAfterMenu2
 	movs r0, 0x8
 _0810B170:
 	movs r1, 0
@@ -6363,7 +6363,7 @@ _0810B170:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0810B17C: .4byte sub_8030AEC
+_0810B17C: .4byte SetCB2ToReshowScreenAfterMenu2
 	thumb_func_end sub_810B108
 
 	thumb_func_start sub_810B180

asm/link_rfu_3.s

@@ -7242,7 +7242,7 @@ _081196EC:
 	lsrs r2, 2
 	lsls r1, r2, 3
 	subs r1, r2
-	ldr r2, _0811972C @ =gUnknown_824F1A0
+	ldr r2, _0811972C @ =gTypeNames
 	adds r1, r2
 	bl StringCopy
 	ldr r1, _08119730 @ =gUnknown_8458ED0
@@ -7250,7 +7250,7 @@ _081196EC:
 	.align 2, 0
 _08119724: .4byte gStringVar1
 _08119728: .4byte gStringVar2
-_0811972C: .4byte gUnknown_824F1A0
+_0811972C: .4byte gTypeNames
 _08119730: .4byte gUnknown_8458ED0
 _08119734:
 	ldr r4, _08119774 @ =gStringVar1
@@ -7273,7 +7273,7 @@ _08119734:
 	lsrs r2, 2
 	lsls r1, r2, 3
 	subs r1, r2
-	ldr r2, _0811977C @ =gUnknown_824F1A0
+	ldr r2, _0811977C @ =gTypeNames
 	adds r1, r2
 	bl StringCopy
 	ldr r1, _08119780 @ =gUnknown_8458F04
@@ -7284,7 +7284,7 @@ _0811976A:
 	.align 2, 0
 _08119774: .4byte gStringVar1
 _08119778: .4byte gStringVar2
-_0811977C: .4byte gUnknown_824F1A0
+_0811977C: .4byte gTypeNames
 _08119780: .4byte gUnknown_8458F04
 _08119784:
 	adds r0, r6, 0

asm/party_menu.s

@@ -17930,8 +17930,8 @@ _081278D6:
 	bx r1
 	thumb_func_end sub_81278B4
 
-	thumb_func_start sub_81278DC
-sub_81278DC: @ 81278DC
+	thumb_func_start OpenPartyMenuInBattle
+OpenPartyMenuInBattle: @ 81278DC
 	push {r4,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -17955,7 +17955,7 @@ sub_81278DC: @ 81278DC
 	str r0, [sp]
 	ldr r0, _08127928 @ =sub_8120C3C
 	str r0, [sp, 0x4]
-	ldr r0, _0812792C @ =sub_8030ADC
+	ldr r0, _0812792C @ =SetCB2ToReshowScreenAfterMenu
 	str r0, [sp, 0x8]
 	movs r0, 0x1
 	adds r2, r4, 0
@@ -17967,7 +17967,7 @@ sub_81278DC: @ 81278DC
 	.align 2, 0
 _08127924: .4byte gBattleTypeFlags
 _08127928: .4byte sub_8120C3C
-_0812792C: .4byte sub_8030ADC
+_0812792C: .4byte SetCB2ToReshowScreenAfterMenu
 _08127930:
 	bl sub_81278B4
 	adds r1, r0, 0
@@ -17977,7 +17977,7 @@ _08127930:
 	str r0, [sp]
 	ldr r0, _08127960 @ =sub_811FB28
 	str r0, [sp, 0x4]
-	ldr r0, _08127964 @ =sub_8030ADC
+	ldr r0, _08127964 @ =SetCB2ToReshowScreenAfterMenu
 	str r0, [sp, 0x8]
 	movs r0, 0x1
 	adds r2, r4, 0
@@ -17992,8 +17992,8 @@ _08127950:
 	bx r0
 	.align 2, 0
 _08127960: .4byte sub_811FB28
-_08127964: .4byte sub_8030ADC
-	thumb_func_end sub_81278DC
+_08127964: .4byte SetCB2ToReshowScreenAfterMenu
+	thumb_func_end OpenPartyMenuInBattle
 
 	thumb_func_start sub_8127968
 sub_8127968: @ 8127968
@@ -18007,7 +18007,7 @@ sub_8127968: @ 8127968
 	str r0, [sp]
 	ldr r0, _0812799C @ =sub_8120EBC
 	str r0, [sp, 0x4]
-	ldr r0, _081279A0 @ =sub_8030ADC
+	ldr r0, _081279A0 @ =SetCB2ToReshowScreenAfterMenu
 	str r0, [sp, 0x8]
 	movs r0, 0x1
 	movs r2, 0
@@ -18020,7 +18020,7 @@ sub_8127968: @ 8127968
 	bx r0
 	.align 2, 0
 _0812799C: .4byte sub_8120EBC
-_081279A0: .4byte sub_8030ADC
+_081279A0: .4byte SetCB2ToReshowScreenAfterMenu
 	thumb_func_end sub_8127968
 
 	thumb_func_start sub_81279A4
@@ -19046,12 +19046,12 @@ _0812817A:
 sub_8128184: @ 8128184
 	push {lr}
 	bl sub_8108CF0
-	ldr r0, _08128194 @ =sub_8030ADC
+	ldr r0, _08128194 @ =SetCB2ToReshowScreenAfterMenu
 	bl SetMainCallback2
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08128194: .4byte sub_8030ADC
+_08128194: .4byte SetCB2ToReshowScreenAfterMenu
 	thumb_func_end sub_8128184
 
 	thumb_func_start sub_8128198