Merge branch 'mr-origin-96'

2024-10-19 23:10:46 -05:00
parent 9443a276c5 0ba0a22549
commit a59e1abddf
291 changed files with 2238 additions and 2204 deletions
--- a/src/lair/code_5ED0.c
+++ b/src/lair/code_5ED0.c
@@ -67,8 +67,6 @@ extern s32  ability_getAllLearned(void); // get unlocked moves bitfield
 extern s32  item_getCount(s32); // item count get
 extern void item_adjustByDiffWithoutHud(s32, s32); // item count set

-extern void func_80250530(s32, u16, f32);
-
 extern void func_8025A55C(s32, s32, s32);

 extern void func_80324CFC(f32, s16, s16);