Cammy_white: bugs fixes

**Total Linecount: ** 2042 -> 2065 (+23)
**Generic Linecount: ** 750 -> 751 (+1)
**Conditional Linecount: ** 1292 -> 1314 (+22)
**Targeted Linecount: ** 973 -> 995 (+22)

Targeting Updates:
    - `nami`: 0 -> 22 (+22)

Command executed by: metalytar13#4657