Merge pull request #732 from ditto-salsa/WeaponSelectMenuNameChange

Eebit · web-flow · commit 82bb25735d63 · 2025-12-31T11:53:02.000-05:00
UnknownMenu -&gt; WeaponSelectMenu
diff --git a/include/bmmenu.h b/include/bmmenu.h
@@ -42,10 +42,10 @@ u8 StartUnitBallistaSelect(struct MenuProc * menu, struct MenuItemProc * menuIte
 u8 StartUnitWeaponSelect(struct MenuProc * menu, struct MenuItemProc * menuItem);
 int DisplayUnitStandingAttackRange(struct MenuProc * menu, struct MenuItemProc * menuItem);
 int HideMoveRangeGraphicsWrapper(struct MenuProc * menu, struct MenuItemProc * menuItem);
-u8 UnknownMenu_IsAvailable(const struct MenuItemDef * def, int number);
-u8 UnknownMenu_Selected(struct MenuProc * menu, struct MenuItemProc * menuItem);
-int UnknownMenu_Draw(struct MenuProc * menu, struct MenuItemProc * menuItem);
-int UnknownMenu_SwitchIn(struct MenuProc * menu, struct MenuItemProc * menuItem);
+u8 WeaponSelectMenu_IsAvailable(const struct MenuItemDef * def, int number);
+u8 WeaponSelectMenu_Selected(struct MenuProc * menu, struct MenuItemProc * menuItem);
+int WeaponSelectMenu_Draw(struct MenuProc * menu, struct MenuItemProc * menuItem);
+int WeaponSelectMenu_SwitchIn(struct MenuProc * menu, struct MenuItemProc * menuItem);
 int BallistaRangeMenu_SwitchOut(struct MenuProc * menu, struct MenuItemProc * menuItem);
 u8 AttackMapSelect_Select(ProcPtr proc, struct SelectTarget * target);
 void sub_8022E38(void);
diff --git a/include/menu_def.h b/include/menu_def.h
@@ -17,7 +17,7 @@ extern const struct MenuDef gItemMenuDef;
 extern const struct MenuDef gStaffItemSelectMenuDef;
 extern const struct MenuDef gItemSelectMenuDef;
 extern const struct MenuDef gBallistaRangeMenuDef;
-extern const struct MenuDef gUnknownMenuDef;
+extern const struct MenuDef gWeaponSelectMenuDef;
 extern const struct MenuDef gUnitActionMenuDef;
 
 extern struct SelectInfo CONST_DATA gSelectInfo_OffensiveStaff;
diff --git a/src/bmmenu.c b/src/bmmenu.c
@@ -469,7 +469,7 @@ u8 StartUnitBallistaSelect(struct MenuProc* menu, struct MenuItemProc* menuItem)
 }
 
 u8 StartUnitWeaponSelect(struct MenuProc* menu, struct MenuItemProc* menuItem) {
-    ProcPtr proc = StartOrphanMenu(&gUnknownMenuDef);
+    ProcPtr proc = StartOrphanMenu(&gWeaponSelectMenuDef);
 
     if (gActiveUnit->pClassData->number != CLASS_PHANTOM) {
         StartFace(0, GetUnitPortraitId(gActiveUnit), 0xB0, 0xC, 2);
@@ -505,7 +505,7 @@ int HideMoveRangeGraphicsWrapper(struct MenuProc* menu, struct MenuItemProc* men
     return 0;
 }
 
-u8 UnknownMenu_IsAvailable(const struct MenuItemDef* def, int number) {
+u8 WeaponSelectMenu_IsAvailable(const struct MenuItemDef* def, int number) {
     int item = gActiveUnit->items[number];
 
     if (!(GetItemAttributes(item) & IA_WEAPON)) {
@@ -525,7 +525,7 @@ u8 UnknownMenu_IsAvailable(const struct MenuItemDef* def, int number) {
     return MENU_ENABLED;
 }
 
-u8 UnknownMenu_Selected(struct MenuProc* menu, struct MenuItemProc* menuItem) {
+u8 WeaponSelectMenu_Selected(struct MenuProc* menu, struct MenuItemProc* menuItem) {
 
     EquipUnitItemSlot(gActiveUnit, menuItem->itemNumber);
     gActionData.itemSlotIndex = 0;
@@ -541,7 +541,7 @@ u8 UnknownMenu_Selected(struct MenuProc* menu, struct MenuItemProc* menuItem) {
     return MENU_ACT_SKIPCURSOR | MENU_ACT_END | MENU_ACT_SND6A | MENU_ACT_ENDFACE;
 }
 
-int UnknownMenu_Draw(struct MenuProc* menu, struct MenuItemProc* menuItem) {
+int WeaponSelectMenu_Draw(struct MenuProc* menu, struct MenuItemProc* menuItem) {
     int item = gActiveUnit->items[menuItem->itemNumber];
 
     s8 isUsable = CanUnitUseWeapon(gActiveUnit, item);
@@ -556,7 +556,7 @@ int UnknownMenu_Draw(struct MenuProc* menu, struct MenuItemProc* menuItem) {
     return 0;
 }
 
-int UnknownMenu_SwitchIn(struct MenuProc* menu, struct MenuItemProc* menuItem) {
+int WeaponSelectMenu_SwitchIn(struct MenuProc* menu, struct MenuItemProc* menuItem) {
 
     int reach;
 
@@ -923,7 +923,7 @@ int ItemSelectMenu_TextDraw(struct MenuProc* menu, struct MenuItemProc* menuItem
     int item = gActiveUnit->items[menuItem->itemNumber];
 
     if (GetItemAttributes(item) & IA_WEAPON) {
-        UnknownMenu_Draw(menu, menuItem);
+        WeaponSelectMenu_Draw(menu, menuItem);
         return 0;
     }
 
@@ -953,7 +953,7 @@ u8 ItemSelectMenu_Usability(const struct MenuItemDef* def, int number) {
     }
 
     if (GetItemAttributes(item) & IA_WEAPON) {
-        UnknownMenu_IsAvailable(def, number);
+        WeaponSelectMenu_IsAvailable(def, number);
     }
 
     return CanUnitUseItem(gActiveUnit, item)
diff --git a/src/menu_def.c b/src/menu_def.c
@@ -137,12 +137,12 @@ CONST_DATA struct MenuItemDef gBallistaRangeMenuItems[] = {
     MenuItemsEnd
 };
 
-CONST_DATA struct MenuItemDef gUnknownMenuItems[] = {
-    {"", 0, 0, 0, 0x49, UnknownMenu_IsAvailable, UnknownMenu_Draw, UnknownMenu_Selected, 0, UnknownMenu_SwitchIn, BallistaRangeMenu_SwitchOut},
-    {"", 0, 0, 0, 0x4A, UnknownMenu_IsAvailable, UnknownMenu_Draw, UnknownMenu_Selected, 0, UnknownMenu_SwitchIn, BallistaRangeMenu_SwitchOut},
-    {"", 0, 0, 0, 0x4B, UnknownMenu_IsAvailable, UnknownMenu_Draw, UnknownMenu_Selected, 0, UnknownMenu_SwitchIn, BallistaRangeMenu_SwitchOut},
-    {"", 0, 0, 0, 0x4C, UnknownMenu_IsAvailable, UnknownMenu_Draw, UnknownMenu_Selected, 0, UnknownMenu_SwitchIn, BallistaRangeMenu_SwitchOut},
-    {"", 0, 0, 0, 0x4D, UnknownMenu_IsAvailable, UnknownMenu_Draw, UnknownMenu_Selected, 0, UnknownMenu_SwitchIn, BallistaRangeMenu_SwitchOut},
+CONST_DATA struct MenuItemDef gWeaponSelectMenuItems[] = {
+    {"", 0, 0, 0, 0x49, WeaponSelectMenu_IsAvailable, WeaponSelectMenu_Draw, WeaponSelectMenu_Selected, 0, WeaponSelectMenu_SwitchIn, BallistaRangeMenu_SwitchOut},
+    {"", 0, 0, 0, 0x4A, WeaponSelectMenu_IsAvailable, WeaponSelectMenu_Draw, WeaponSelectMenu_Selected, 0, WeaponSelectMenu_SwitchIn, BallistaRangeMenu_SwitchOut},
+    {"", 0, 0, 0, 0x4B, WeaponSelectMenu_IsAvailable, WeaponSelectMenu_Draw, WeaponSelectMenu_Selected, 0, WeaponSelectMenu_SwitchIn, BallistaRangeMenu_SwitchOut},
+    {"", 0, 0, 0, 0x4C, WeaponSelectMenu_IsAvailable, WeaponSelectMenu_Draw, WeaponSelectMenu_Selected, 0, WeaponSelectMenu_SwitchIn, BallistaRangeMenu_SwitchOut},
+    {"", 0, 0, 0, 0x4D, WeaponSelectMenu_IsAvailable, WeaponSelectMenu_Draw, WeaponSelectMenu_Selected, 0, WeaponSelectMenu_SwitchIn, BallistaRangeMenu_SwitchOut},
     MenuItemsEnd
 };
 
@@ -338,10 +338,10 @@ CONST_DATA struct MenuDef gBallistaRangeMenuDef = {
     BallistaRangeMenuHelpBox
 };
 
-CONST_DATA struct MenuDef gUnknownMenuDef = {
+CONST_DATA struct MenuDef gWeaponSelectMenuDef = {
     {1, 1, 14, 0},
     0,
-    gUnknownMenuItems,
+    gWeaponSelectMenuItems,
     0, 0, 0,
     ItemMenu_ButtonBPressed,
     MenuAutoHelpBoxSelect,

Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ u8 StartUnitBallistaSelect(struct MenuProc* menu, struct MenuItemProc* menuItem)`
`469`	`469`	`}`
`470`	`470`
`471`	`471`	`u8 StartUnitWeaponSelect(struct MenuProc* menu, struct MenuItemProc* menuItem) {`
`472`		`- ProcPtr proc = StartOrphanMenu(&gUnknownMenuDef);`
	`472`	`+ ProcPtr proc = StartOrphanMenu(&gWeaponSelectMenuDef);`
`473`	`473`
`474`	`474`	`if (gActiveUnit->pClassData->number != CLASS_PHANTOM) {`
`475`	`475`	`StartFace(0, GetUnitPortraitId(gActiveUnit), 0xB0, 0xC, 2);`
`@@ -505,7 +505,7 @@ int HideMoveRangeGraphicsWrapper(struct MenuProc* menu, struct MenuItemProc* men`
`505`	`505`	`return 0;`
`506`	`506`	`}`
`507`	`507`
`508`		`-u8 UnknownMenu_IsAvailable(const struct MenuItemDef* def, int number) {`
	`508`	`+u8 WeaponSelectMenu_IsAvailable(const struct MenuItemDef* def, int number) {`
`509`	`509`	`int item = gActiveUnit->items[number];`
`510`	`510`
`511`	`511`	`if (!(GetItemAttributes(item) & IA_WEAPON)) {`
`@@ -525,7 +525,7 @@ u8 UnknownMenu_IsAvailable(const struct MenuItemDef* def, int number) {`
`525`	`525`	`return MENU_ENABLED;`
`526`	`526`	`}`
`527`	`527`
`528`		`-u8 UnknownMenu_Selected(struct MenuProc* menu, struct MenuItemProc* menuItem) {`
	`528`	`+u8 WeaponSelectMenu_Selected(struct MenuProc* menu, struct MenuItemProc* menuItem) {`
`529`	`529`
`530`	`530`	`EquipUnitItemSlot(gActiveUnit, menuItem->itemNumber);`
`531`	`531`	`gActionData.itemSlotIndex = 0;`
`@@ -541,7 +541,7 @@ u8 UnknownMenu_Selected(struct MenuProc* menu, struct MenuItemProc* menuItem) {`
`541`	`541`	`return MENU_ACT_SKIPCURSOR \| MENU_ACT_END \| MENU_ACT_SND6A \| MENU_ACT_ENDFACE;`
`542`	`542`	`}`
`543`	`543`
`544`		`-int UnknownMenu_Draw(struct MenuProc* menu, struct MenuItemProc* menuItem) {`
	`544`	`+int WeaponSelectMenu_Draw(struct MenuProc* menu, struct MenuItemProc* menuItem) {`
`545`	`545`	`int item = gActiveUnit->items[menuItem->itemNumber];`
`546`	`546`
`547`	`547`	`s8 isUsable = CanUnitUseWeapon(gActiveUnit, item);`
`@@ -556,7 +556,7 @@ int UnknownMenu_Draw(struct MenuProc* menu, struct MenuItemProc* menuItem) {`
`556`	`556`	`return 0;`
`557`	`557`	`}`
`558`	`558`
`559`		`-int UnknownMenu_SwitchIn(struct MenuProc* menu, struct MenuItemProc* menuItem) {`
	`559`	`+int WeaponSelectMenu_SwitchIn(struct MenuProc* menu, struct MenuItemProc* menuItem) {`
`560`	`560`
`561`	`561`	`int reach;`
`562`	`562`
`@@ -923,7 +923,7 @@ int ItemSelectMenu_TextDraw(struct MenuProc* menu, struct MenuItemProc* menuItem`
`923`	`923`	`int item = gActiveUnit->items[menuItem->itemNumber];`
`924`	`924`
`925`	`925`	`if (GetItemAttributes(item) & IA_WEAPON) {`
`926`		`- UnknownMenu_Draw(menu, menuItem);`
	`926`	`+ WeaponSelectMenu_Draw(menu, menuItem);`
`927`	`927`	`return 0;`
`928`	`928`	`}`
`929`	`929`
`@@ -953,7 +953,7 @@ u8 ItemSelectMenu_Usability(const struct MenuItemDef* def, int number) {`
`953`	`953`	`}`
`954`	`954`
`955`	`955`	`if (GetItemAttributes(item) & IA_WEAPON) {`
`956`		`- UnknownMenu_IsAvailable(def, number);`
	`956`	`+ WeaponSelectMenu_IsAvailable(def, number);`
`957`	`957`	`}`
`958`	`958`
`959`	`959`	`return CanUnitUseItem(gActiveUnit, item)`