fixed multiple issue

3 files changed, 6 insertions, 10 deletions

diff --git a/src/dynamic_placeholder_text_util.c b/src/dynamic_placeholder_text_util.c
index c92cd2dcd..6909fea30 100644
--- a/src/dynamic_placeholder_text_util.c
+++ b/src/dynamic_placeholder_text_util.c
@@ -24,7 +24,7 @@ void DynamicPlaceholderTextUtil_Reset(void)
     {
         *ptr2-- = fillval;
     }
-    while ((int)ptr2 >= (int)ptr);
+    while ((intptr_t)ptr2 >= (intptr_t)ptr);
 }
 
 void DynamicPlaceholderTextUtil_SetPlaceholderPtr(u8 idx, const u8 *ptr)
diff --git a/src/field_poison.c b/src/field_poison.c
index eaffdb89f..474fbcd69 100644
--- a/src/field_poison.c
+++ b/src/field_poison.c
@@ -100,7 +100,7 @@ s32 DoPoisonFieldEffect(void)
         if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
         {
             hp = GetMonData(pokemon, MON_DATA_HP);
-            if (!hp || !--hp)
+            if (hp == 0 || --hp == 0)
                 numFainted++;
             SetMonData(pokemon, MON_DATA_HP, &hp);
             numPoisoned++;
diff --git a/src/list_menu.c b/src/list_menu.c
index a819ffc22..5f2bd02b3 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -132,11 +132,11 @@ s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const str
         break;
     case 1:
         sMysteryGiftLinkMenu.currItemId = ListMenu_ProcessInput(sMysteryGiftLinkMenu.listTaskId);
-        if (gMain.newKeys & A_BUTTON)
+        if (JOY_NEW(A_BUTTON))
         {
             sMysteryGiftLinkMenu.state = 2;
         }
-        if (gMain.newKeys & B_BUTTON)
+        if (JOY_NEW(B_BUTTON))
         {
             sMysteryGiftLinkMenu.currItemId = LIST_CANCEL;
             sMysteryGiftLinkMenu.state = 2;
@@ -195,11 +195,11 @@ s32 ListMenu_ProcessInput(u8 listTaskId)
 {
     struct ListMenu *list = (struct ListMenu *)gTasks[listTaskId].data;
 
-    if (gMain.newKeys & A_BUTTON)
+    if (JOY_NEW(A_BUTTON))
     {
         return list->template.items[list->scrollOffset + list->selectedRow].index;
     }
-    else if (gMain.newKeys & B_BUTTON)
+    else if (JOY_NEW(B_BUTTON))
     {
         return LIST_CANCEL;
     }
@@ -249,8 +249,6 @@ s32 ListMenu_ProcessInput(u8 listTaskId)
     }
 }
 
-#define TASK_NONE 0xFF
-
 void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow)
 {
     struct ListMenu *list = (struct ListMenu *)gTasks[listTaskId].data;
@@ -434,8 +432,6 @@ static void ListMenuDrawCursor(struct ListMenu *list)
     }
 }
 
-#undef TASK_NONE
-
 static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind)
 {
     struct CursorStruct cursor;