Allow skill learning on promotion

Author: StanHash

Engine Hacks/Popups.event

@@ -29,6 +29,9 @@ gPromotionPopupTable:
 	PopRBattlePopup(PopR_InitLightRankNew, gPopup_PopR_NewWType, 96)
 	PopRBattlePopup(PopR_InitElderRankNew, gPopup_PopR_NewWType, 96)
 
+	// Skill system
+	PopRBattlePopup(InitPromotionSkillPopup|1, SkillLearnedPopup, 96)
+
 	PopRBattlePopupEnd
 
 #endif // POPUPS

Engine Hacks/Skill System/Internals/SkillPopups.event

@@ -22,6 +22,11 @@ InitLevelUpSkillPopup:
 	POIN (GetUnitLevelSkills|1)
 	POIN (SkillAdder|1)
 
+InitPromotionSkillPopup:
+	#incbin "asm/InitPromotionSkillPopup.dmp"
+	POIN (GetUnitLevelSkills|1)
+	POIN (SkillAdder|1)
+
 ALIGN 4
 SkillLearnedPopup:
 	// Popup macros are defined in [PopupRework/]Extensions/PopupDefinitions.txt

Engine Hacks/Skill System/Internals/asm/InitPromotionSkillPopup.dmp

@@ -0,0 +1,93 @@
+
+	.thumb
+
+	gpBeforeBattleUnit = 0x0203E18C @ unused, but here for reference
+	gpAfterBattleUnit  = 0x0203E188 @ this is the one we are looking at
+
+	gPopupItem         = 0x030005F4
+
+	lGetUnitLevelSkills = EALiterals+0x00
+	lAddSkill           = EALiterals+0x04
+
+InitPromotionSkillPopup:
+	@ We are going to do learning and showing popups at the same time even if this is probably a turbo bad idea
+
+	push {lr}
+
+	ldr r0, =gpAfterBattleUnit
+	ldr r0, [r0]
+
+	bl TryLearnSkill
+
+	cmp r0, #0
+	beq end
+
+yes:
+	ldr  r1, =gPopupItem
+	strh r0, [r1]
+
+	mov r0, #1
+
+end:
+	pop {r3}
+BXR3:
+	bx r3
+
+	.pool
+	.align
+
+TryLearnSkill:
+	@ Arguments: r0 = (Battle) Unit
+	@ Returns:   r0 = Skill Id Learned (0 if none)
+
+	push {r0-r1, r4, lr} @ note: pushing r0-r1 allocated 8 bytes on the stack
+
+	ldrb r1, [r0, #0x08] @ r1 = battle unit level
+
+	mov r4, r0 @ var r4 = bu
+
+	ldr r3, lGetUnitLevelSkills
+
+	@ implied  @ arg r0 = (battle) unit
+	@ implied  @ arg r1 = level
+	mov r2, sp @ arg r2 = output buffer
+
+	bl BXR3
+
+	@ implied  @ ret r0 = output buffer
+
+	ldrb r0, [r0] @ get first skill in output buffer
+
+	cmp r0, #0
+	beq TryLearnSkill.end @ Do not learn anything if list was empty
+
+	ldr r3, lAddSkill
+
+	mov r1, r0 @ arg r1 = skill id
+	mov r0, r4 @ arg r0 = unit
+
+	mov r4, r1 @ var r4 = skill id
+
+	bl  BXR3
+
+	cmp r0, #0
+	beq TryLearnSkill.no_skill
+
+	@ return skill id
+	mov r0, r4
+
+	b TryLearnSkill.end
+
+TryLearnSkill.no_skill:
+	@ return 0
+	mov r0, #0
+
+TryLearnSkill.end:
+	pop {r1-r2, r4} @ note: popping r1-r2 freed 8 bytes on the stack
+
+	pop {r1}
+	bx r1
+
+EALiterals:
+	@ POIN (GetUnitLevelSkills|1)
+	@ POIN (AddSkill|1)

Engine Hacks/Skill System/Internals/asm/InitPromotionSkillPopup.s

@@ -68,9 +68,9 @@ PUSH; ORG 0x59BAC4
 POP
 
 // Promotion proc Hook (unused since no skill learning on promotion)
-// PUSH; ORG 0xB126FC
-	// _6C_JUMP(_pProc_FromPromotionProc)
-// POP
+PUSH; ORG 0xB126BC
+	_6C_JUMP(_pProc_FromPromotionProc)
+POP
 
 ALIGN 4
 _pProc_FromBattleProc:
@@ -95,16 +95,51 @@ _pProc_FromMiscActionProc:
 	_6C_YIELD
 	_6C_END
 
-// ALIGN 4
-// _pProc_FromPromotionProc:
-	// _6C_CALL_ROUTINE_2(prCheckForSkillForgetting|1)
-	// _6C_END
+ALIGN 4
+_pProc_FromPromotionProc:
+	_6C_NEW_CHILD_BLOCKING(_pProc_FromPromotionProc_SubProc)
+	_6C_CALL_ROUTINE(0x0CC698|1)
+	_6C_END
+
+ALIGN 4
+_pProc_FromPromotionProc_SubProc:
+	_6C_CALL_ROUTINE(_prPromotionInit|1)
+
+_6C_LABEL(0) // trainee promotion
+_6C_LABEL(1) // prep screen promotion
+	_6C_CALL_ROUTINE(_prPromotionPrepScreenSetup|1)
+
+	_6C_CALL_ROUTINE_2(_prPromotionCheck|1)
+
+	_6C_CALL_ROUTINE_ARG(0x0AE2F4|1, 0x40) // StartFadeOut(0x40)
+	_6C_WHILE_ROUTINE(0x0AE2B8|1) // FadeOutExists
+
+	_6C_GOTO(776)
+
+_6C_LABEL(2) // map promotion
+	_6C_CALL_ROUTINE_2(_prPromotionCheck|1)
+	_6C_GOTO(776)
+
+_6C_LABEL(776)
+	_6C_END
 
 ALIGN 4
 _prCheckForBattleSkillForgetting:
 	#incbin "asm/CheckForBattleSkillForgetting.dmp"
 	POIN (prCheckForSkillForgetting|1)
 
+ALIGN 4
+_prPromotionInit:
+	#incbin "asm/PromotionInit.dmp"
+
+ALIGN 4
+_prPromotionCheck:
+	#incbin "asm/PromotionCheck.dmp"
+	POIN (prCheckForSkillForgetting|1)
+
+_prPromotionPrepScreenSetup:
+	#incbin "asm/PromotionPrepScreenSetup.dmp"
+
 }
 
 ALIGN 4

Engine Hacks/Skill System/Skill Removal Menu/RemoveSkillMenu.event

@@ -0,0 +1,32 @@
+
+	.thumb
+
+	.include "Definitions.inc"
+
+	lCheckForSkillForgetting = EALiterals+0x00
+
+PromotionCheck:
+	push {r4, lr}
+
+	mov r4, r0
+
+	ldr r0, [r4, #0x14] @ get parent
+	ldr r0, [r0, #0x14] @ get parent's parent (welcome to promotion procs)
+	ldr r0, [r0, #0x38] @ get unit
+
+	@ implied  @ arg r0 = unit
+	mov r1, r4 @ arg r1 = parent proc
+
+	ldr  r3, lCheckForSkillForgetting
+	_blr r3
+
+	pop {r4}
+
+	pop {r1}
+	bx r1
+
+	.pool
+	.align
+
+EALiterals:
+	@ POIN (CheckForSkillForgetting|1)

Engine Hacks/Skill System/Skill Removal Menu/asm/PromotionCheck.dmp

@@ -0,0 +1,20 @@
+
+	.thumb
+
+	.include "Definitions.inc"
+
+PromotionInit:
+	ldr  r1, [r0, #0x14] @ r1 = parent
+	ldr  r1, [r1, #0x14] @ r1 = parent's parent
+
+	mov  r2, #0x31
+	ldrb r1, [r1, r2] @ r1 = promotion context id
+
+	ldr r3, =0x08002F24|1
+	bx  r3
+
+	.pool
+	.align
+
+EALiterals:
+	@ nothing

Engine Hacks/Skill System/Skill Removal Menu/asm/PromotionCheck.s

@@ -0,0 +1,21 @@
+
+	.thumb
+
+	.include "Definitions.inc"
+
+	@ gLCDIOBuffer = 0x03003080
+
+PromotionPrepScreenSetup:
+	push {r4, lr}
+
+	mov r0, #0
+	_blh 0x08001B58 @ SetBgConfig
+
+	_blh 0x080156F4 @ ReloadGameCoreGfx
+
+	_blh 0x0804E884 @ ClearBG0BG1
+
+	pop {r4}
+
+	pop {r1}
+	bx r1