mirror of
https://github.com/pmret/papermario.git
synced 2024-11-09 12:32:38 +01:00
fix some asm paths in battle/item/ (#336)
* moved asm src path in battle/item as the correct way * INCLUDE_ASM no indent lol
This commit is contained in:
parent
6a033afffb
commit
d23a6cabdf
@ -90,7 +90,7 @@ void N(func_802A123C_72C7EC)(void) {
|
||||
}
|
||||
}
|
||||
#else
|
||||
INCLUDE_ASM(ApiStatus, "battle/item/mystery/lib", battle_item_mystery_func_802A123C_72C7EC, ScriptInstance* script,
|
||||
INCLUDE_ASM(ApiStatus, "battle/item/mystery", battle_item_mystery_func_802A123C_72C7EC, ScriptInstance* script,
|
||||
s32 isInitialCall);
|
||||
#endif
|
||||
|
||||
@ -258,7 +258,7 @@ ApiStatus N(func_802A13E4_72C994)(ScriptInstance* script, s32 isInitialCall) {
|
||||
return ApiStatus_BLOCK;
|
||||
}
|
||||
#else
|
||||
INCLUDE_ASM(ApiStatus, "battle/item/mystery/lib", battle_item_mystery_func_802A13E4_72C994, ScriptInstance* script,
|
||||
INCLUDE_ASM(ApiStatus, "battle/item/mystery", battle_item_mystery_func_802A13E4_72C994, ScriptInstance* script,
|
||||
s32 isInitialCall);
|
||||
#endif
|
||||
|
||||
|
@ -98,7 +98,7 @@ ApiStatus N(func_802A123C_71D9AC)(ScriptInstance* script, s32 isInitialCall) {
|
||||
return ApiStatus_DONE2;
|
||||
}
|
||||
#else
|
||||
INCLUDE_ASM(ApiStatus, "battle/item/shooting_star/lib", battle_item_shooting_star_func_802A123C_71D9AC,
|
||||
INCLUDE_ASM(ApiStatus, "battle/item/shooting_star", battle_item_shooting_star_func_802A123C_71D9AC,
|
||||
ScriptInstance* script, s32 isInitialCall);
|
||||
#endif
|
||||
|
||||
|
@ -211,7 +211,7 @@ ApiStatus func_802A123C_71E88C(ScriptInstance* script, s32 isInitialCall) {
|
||||
return ApiStatus_BLOCK;
|
||||
}
|
||||
#else
|
||||
INCLUDE_ASM(ApiStatus, "battle/item/sleepy_sheep/lib", battle_item_sleepy_sheep_func_802A123C_71E88C,
|
||||
INCLUDE_ASM(ApiStatus, "battle/item/sleepy_sheep", battle_item_sleepy_sheep_func_802A123C_71E88C,
|
||||
ScriptInstance* script, s32 isInitialCall);
|
||||
#endif
|
||||
|
||||
|
@ -91,7 +91,7 @@ ApiStatus N(func_802A123C_73153C)(ScriptInstance* script, s32 isInitialCall) {
|
||||
}
|
||||
}
|
||||
#else
|
||||
INCLUDE_ASM(ApiStatus, "battle/item/strange_cake/lib", battle_item_strange_cake_func_802A123C_73153C);
|
||||
INCLUDE_ASM(ApiStatus, "battle/item/strange_cake", battle_item_strange_cake_func_802A123C_73153C);
|
||||
#endif
|
||||
|
||||
#ifdef NON_MATCHING
|
||||
@ -251,7 +251,7 @@ ApiStatus N(func_802A13E4_7316E4)(ScriptInstance* script, s32 isInitialCall) {
|
||||
return ApiStatus_BLOCK;
|
||||
}
|
||||
#else
|
||||
INCLUDE_ASM(ApiStatus, "battle/item/strange_cake/lib", battle_item_strange_cake_func_802A13E4_7316E4,
|
||||
INCLUDE_ASM(ApiStatus, "battle/item/strange_cake", battle_item_strange_cake_func_802A13E4_7316E4,
|
||||
ScriptInstance* script, s32 isInitialCall);
|
||||
#endif
|
||||
|
||||
|
@ -55,5 +55,5 @@ ApiStatus func_802A1628_795908(ScriptInstance* script, s32 isInitialCall) {
|
||||
return ApiStatus_DONE2;
|
||||
}
|
||||
#else
|
||||
INCLUDE_ASM(s32, "battle/star/up_and_away/7952E0", func_802A1628_795908);
|
||||
INCLUDE_ASM(s32, "battle/star/up_and_away/7952E0", func_802A1628_795908);
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user