Bugfix: passive skill unlocked popup only shows when level up.

laqieer · Apr 21, 2020 · ad6725a · ad6725a
1 parent 5446d4f
commit ad6725a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/linkerscript b/linkerscript
@@ -1,6 +1,7 @@
 ENTRY(_start)
 
 gAISTable = 0x2000000;
+gLevelUpProc = 0x20200ac;
 DAT_0203e0ac = 0x203e0ac;
 
 gStatScreen = 0x200310C;

diff --git a/src/skill.c b/src/skill.c
@@ -4736,6 +4736,21 @@ struct Unit *getUnitByAIS(void *AIS)
     return unitAtLeft;
 }
 
+struct Unit *getUnitBySideAndNumber(int side, int number)
+{
+    switch(side)
+    {
+        case PlayerSide:
+            return &playerUnits[number];
+        case EnemySide:
+            return &enemyUnits[number];
+        case NPCSide:
+            return &NPCUnits[number];
+        default:
+            return &P4Units[number];
+    }
+}
+
 struct Unit *getUnitByCurrentAIS()
 {
     return getUnitByAIS(getCurrentAIS());
@@ -4790,10 +4805,15 @@ char *getNewUnlockedPassiveSkillNameTextByCurrentAIS()
     return getNewUnlockedPassiveSkillNameText(getUnitByCurrentAIS());
 }
 
+extern struct Proc *gLevelUpProc;
+
 void newPopupPassiveSkillUnlocked(struct Proc *proc, struct Unit *unit)
 {
-    if(getNewUnlockedPassiveSkillNameText(unit))
+    if(gLevelUpProc != NULL && getNewUnlockedPassiveSkillNameText(unit))
+    {
         newPopup(gPopupPassiveSkillUnlocked, 0x60, 0, proc);
+        gLevelUpProc = NULL;
+    }
 }
 
 void newPopupPassiveSkillUnlockedWhenLevelUp(struct Proc *proc)