pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed section boundaries and matched non_matchings

Browse Source
This commit is contained in:
Ethan Roseman 2021-02-15 20:14:10 +09:00
parent ec4b1cc9a1
commit db6202ebf4
37 changed files with 167 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/data/battle/move/auto_jump_765D10.data.s Normal file
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/auto_multibounce_76A920.data.s Normal file
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/auto_smash_7635E0.data.s
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/auto_smash_7635F0.data.s Normal file
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/dizzy_stomp_748EC0.data.s Normal file
View File

File diff suppressed because one or more lines are too long

4
asm/data/battle/move/hammer_throw_752500.data.s
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/mega_jump_771020.data.s Normal file
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/mega_smash_777740.data.s Normal file
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/multibounce_740DA0.data.s
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/multibounce_740DB0.data.s Normal file
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/power_jump_76D850.data.s Normal file
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/power_quake_767D40.data.s Normal file
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/power_smash_772C50.data.s Normal file
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/quake_hammer_73AF80.data.s Normal file
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/shrink_smash_77CC30.data.s Normal file
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/shrink_stomp_783C90.data.s Normal file
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/sleep_stomp_746F00.data.s Normal file
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/super_jump_76F420.data.s Normal file
View File

File diff suppressed because one or more lines are too long

6
asm/data/battle/move/super_smash_7751B0.data.s Normal file
View File

File diff suppressed because one or more lines are too long

17
src/battle/move/auto_jump_765C20.c
View File

@ -1,10 +1,9 @@
#include "common.h"
#ifdef NON_MATCHING
ApiStatus func_802A1000_765C20(ScriptInstance* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
BattleStatus* secondBattleStatus = &gBattleStatus;
Actor* partnerActor = battleStatus->partnerActor;
Actor* partnerActor = battleStatus->playerActor;
f32 posX = partnerActor->currentPos.x;
f32 posY = partnerActor->currentPos.y;
f32 posZ = partnerActor->currentPos.z;
@ -14,21 +13,17 @@ ApiStatus func_802A1000_765C20(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f;
if (script->varTable[0] >= 21) {
if (script->varTable[0] > 20) {
script->varTable[0] = 20;
}
if (secondBattleStatus->unk_83 != 0) {
if (script->varTable[0] < 10) {
script->varTable[0] = 10;
if (script->varTable[0] < 6) {
script->varTable[0] = 6;
}
} else if (script->varTable[0] < 15) {
script->varTable[0] = 15;
} else if (script->varTable[0] < 12) {
script->varTable[0] = 12;
}
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/auto_jump_765C20", func_802A1000_765C20);
#endif

18
src/battle/move/auto_multibounce_76A830.c
View File

@ -1,10 +1,9 @@
#include "common.h"
#ifdef NON_MATCHING
ApiStatus func_80238000_6F10E0(ScriptInstance* script, s32 isInitialCall) {
ApiStatus func_802A1000_76A830(ScriptInstance* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
BattleStatus* secondBattleStatus = &gBattleStatus;
Actor* partnerActor = battleStatus->partnerActor;
Actor* partnerActor = battleStatus->playerActor;
f32 posX = partnerActor->currentPos.x;
f32 posY = partnerActor->currentPos.y;
f32 posZ = partnerActor->currentPos.z;
@ -14,20 +13,17 @@ ApiStatus func_80238000_6F10E0(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f;
if (script->varTable[0] >= 21) {
if (script->varTable[0] > 20) {
script->varTable[0] = 20;
}
if (secondBattleStatus->unk_83 != 0) {
if (script->varTable[0] < 10) {
script->varTable[0] = 10;
if (script->varTable[0] < 6) {
script->varTable[0] = 6;
}
} else if (script->varTable[0] < 15) {
script->varTable[0] = 15;
} else if (script->varTable[0] < 12) {
script->varTable[0] = 12;
}
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/auto_multibounce_76A830", func_802A1000_76A830);
#endif

6
src/battle/move/auto_smash_763540.c
View File

@ -12,7 +12,6 @@ ApiStatus func_802A1000_763540(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#ifdef NOT_MATCHING
ApiStatus func_802A1050_763590(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = 0;
@ -21,11 +20,8 @@ ApiStatus func_802A1050_763590(ScriptInstance* script, s32 isInitialCall) {
}
if ((gBattleStatus.flags1 & 0x1000) != FALSE) {
script->varTable[0] = 1;
script->varTable[0] = 1;
}
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/auto_smash_763540", func_802A1050_763590);
#endif

17
src/battle/move/dizzy_stomp_748DD0.c
View File

@ -1,10 +1,9 @@
#include "common.h"
#ifdef NON_MATCHING
ApiStatus func_802A1000_748DD0(ScriptInstance* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
BattleStatus* secondBattleStatus = &gBattleStatus;
Actor* partnerActor = battleStatus->partnerActor;
Actor* partnerActor = battleStatus->playerActor;
f32 posX = partnerActor->currentPos.x;
f32 posY = partnerActor->currentPos.y;
f32 posZ = partnerActor->currentPos.z;
@ -14,21 +13,17 @@ ApiStatus func_802A1000_748DD0(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f;
if (script->varTable[0] >= 21) {
if (script->varTable[0] > 20) {
script->varTable[0] = 20;
}
if (secondBattleStatus->unk_83 != 0) {
if (script->varTable[0] < 10) {
script->varTable[0] = 10;
if (script->varTable[0] < 6) {
script->varTable[0] = 6;
}
} else if (script->varTable[0] < 15) {
script->varTable[0] = 15;
} else if (script->varTable[0] < 12) {
script->varTable[0] = 12;
}
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/dizzy_stomp_748DD0", func_802A1000_748DD0);
#endif

1
src/battle/move/jump_73D860.c
View File

@ -29,6 +29,7 @@ ApiStatus func_802A1000_73D860(ScriptInstance* script, s32 isInitialCall) {
}
// NOT WORKING
// TODO JUMP TABLE ETHAN
#ifdef NON_MATCHING
ApiStatus func_802A10E4_73D944(ScriptInstance* script, s32 isInitialCall) {
PlayerData* playerData = &gPlayerData;

15
src/battle/move/mega_jump_770F30.c
View File

@ -1,10 +1,9 @@
#include "common.h"
#ifdef NON_MATCHING
ApiStatus func_802A1000_770F30(ScriptInstance* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
BattleStatus* secondBattleStatus = &gBattleStatus;
Actor* partnerActor = battleStatus->partnerActor;
Actor* partnerActor = battleStatus->playerActor;
f32 posX = partnerActor->currentPos.x;
f32 posY = partnerActor->currentPos.y;
f32 posZ = partnerActor->currentPos.z;
@ -19,16 +18,12 @@ ApiStatus func_802A1000_770F30(ScriptInstance* script, s32 isInitialCall) {
}
if (secondBattleStatus->unk_83 != 0) {
if (script->varTable[0] < 10) {
script->varTable[0] = 10;
if (script->varTable[0] < 6) {
script->varTable[0] = 6;
}
} else if (script->varTable[0] < 15) {
script->varTable[0] = 15;
} else if (script->varTable[0] < 12) {
script->varTable[0] = 12;
}
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/mega_jump_770F30", func_802A1000_770F30);
#endif

5
src/battle/move/mega_smash_777690.c
View File

@ -12,7 +12,6 @@ ApiStatus func_802A1000_777690(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#ifdef NOT_MATCHING
ApiStatus func_802A1050_7776E0(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = 0;
@ -26,7 +25,3 @@ ApiStatus func_802A1050_7776E0(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/mega_smash_777690", func_802A1050_7776E0);
#endif

17
src/battle/move/multibounce_740CC0.c
View File

@ -1,10 +1,9 @@
#include "common.h"
#ifdef NON_MATCHING
ApiStatus func_802A1000_740CC0(ScriptInstance* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
BattleStatus* secondBattleStatus = &gBattleStatus;
Actor* partnerActor = battleStatus->partnerActor;
Actor* partnerActor = battleStatus->playerActor;
f32 posX = partnerActor->currentPos.x;
f32 posY = partnerActor->currentPos.y;
f32 posZ = partnerActor->currentPos.z;
@ -14,21 +13,17 @@ ApiStatus func_802A1000_740CC0(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f;
if (script->varTable[0] >= 21) {
if (script->varTable[0] > 20) {
script->varTable[0] = 20;
}
if (secondBattleStatus->unk_83 != 0) {
if (script->varTable[0] < 10) {
script->varTable[0] = 10;
if (script->varTable[0] < 6) {
script->varTable[0] = 6;
}
} else if (script->varTable[0] < 15) {
script->varTable[0] = 15;
} else if (script->varTable[0] < 12) {
script->varTable[0] = 12;
}
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/multibounce_740CC0", func_802A1000_740CC0);
#endif

15
src/battle/move/power_jump_76D760.c
View File

@ -1,10 +1,9 @@
#include "common.h"
#ifdef NON_MATCHING
ApiStatus func_802A1000_76D760(ScriptInstance* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
BattleStatus* secondBattleStatus = &gBattleStatus;
Actor* partnerActor = battleStatus->partnerActor;
Actor* partnerActor = battleStatus->playerActor;
f32 posX = partnerActor->currentPos.x;
f32 posY = partnerActor->currentPos.y;
f32 posZ = partnerActor->currentPos.z;
@ -19,16 +18,12 @@ ApiStatus func_802A1000_76D760(ScriptInstance* script, s32 isInitialCall) {
}
if (secondBattleStatus->unk_83 != 0) {
if (script->varTable[0] < 10) {
script->varTable[0] = 10;
if (script->varTable[0] < 6) {
script->varTable[0] = 6;
}
} else if (script->varTable[0] < 15) {
script->varTable[0] = 15;
} else if (script->varTable[0] < 12) {
script->varTable[0] = 12;
}
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/power_jump_76D760", func_802A1000_76D760);
#endif

5
src/battle/move/power_quake_767C90.c
View File

@ -12,7 +12,6 @@ ApiStatus func_802A1000_767C90(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#ifdef NOT_MATCHING
ApiStatus func_802A1050_767CE0(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = 0;
@ -26,7 +25,3 @@ ApiStatus func_802A1050_767CE0(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/power_quake_767C90", func_802A1050_767CE0);
#endif

5
src/battle/move/power_smash_772BA0.c
View File

@ -12,7 +12,6 @@ ApiStatus func_802A1000_772BA0(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#ifdef NOT_MATCHING
ApiStatus func_802A1050_772BF0(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = 0;
@ -26,7 +25,3 @@ ApiStatus func_802A1050_772BF0(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/power_smash_772BA0", func_802A1050_772BF0);
#endif

5
src/battle/move/quake_hammer_73AED0.c
View File

@ -12,7 +12,6 @@ ApiStatus func_802A1000_73AED0(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#ifdef NOT_MATCHING
ApiStatus func_802A1050_73AF20(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = 0;
@ -26,7 +25,3 @@ ApiStatus func_802A1050_73AF20(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/quake_hammer_73AED0", func_802A1050_73AF20);
#endif

5
src/battle/move/shrink_smash_77CB80.c
View File

@ -12,7 +12,6 @@ ApiStatus func_802A1000_77CB80(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#ifdef NOT_MATCHING
ApiStatus func_802A1050_77CBD0(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = 0;
@ -26,7 +25,3 @@ ApiStatus func_802A1050_77CBD0(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/shrink_smash_77CB80", func_802A1050_77CBD0);
#endif

15
src/battle/move/shrink_stomp_783BA0.c
View File

@ -1,10 +1,9 @@
#include "common.h"
#ifdef NON_MATCHING
ApiStatus func_802A1000_783BA0(ScriptInstance* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
BattleStatus* secondBattleStatus = &gBattleStatus;
Actor* partnerActor = battleStatus->partnerActor;
Actor* partnerActor = battleStatus->playerActor;
f32 posX = partnerActor->currentPos.x;
f32 posY = partnerActor->currentPos.y;
f32 posZ = partnerActor->currentPos.z;
@ -19,16 +18,12 @@ ApiStatus func_802A1000_783BA0(ScriptInstance* script, s32 isInitialCall) {
}
if (secondBattleStatus->unk_83 != 0) {
if (script->varTable[0] < 10) {
script->varTable[0] = 10;
if (script->varTable[0] < 6) {
script->varTable[0] = 6;
}
} else if (script->varTable[0] < 15) {
script->varTable[0] = 15;
} else if (script->varTable[0] < 12) {
script->varTable[0] = 12;
}
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/shrink_stomp_783BA0", func_802A1000_783BA0);
#endif

17
src/battle/move/sleep_stomp_746E10.c
View File

@ -1,10 +1,9 @@
#include "common.h"
#ifdef NON_MATCHING
ApiStatus func_802A1000_746E10(ScriptInstance* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
BattleStatus* secondBattleStatus = &gBattleStatus;
Actor* partnerActor = battleStatus->partnerActor;
Actor* partnerActor = battleStatus->playerActor;
f32 posX = partnerActor->currentPos.x;
f32 posY = partnerActor->currentPos.y;
f32 posZ = partnerActor->currentPos.z;
@ -14,21 +13,17 @@ ApiStatus func_802A1000_746E10(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f;
if (script->varTable[0] >= 21) {
if (script->varTable[0] > 20) {
script->varTable[0] = 20;
}
if (secondBattleStatus->unk_83 != 0) {
if (script->varTable[0] < 10) {
script->varTable[0] = 10;
if (script->varTable[0] < 6) {
script->varTable[0] = 6;
}
} else if (script->varTable[0] < 15) {
script->varTable[0] = 15;
} else if (script->varTable[0] < 12) {
script->varTable[0] = 12;
}
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/sleep_stomp_746E10", func_802A1000_746E10);
#endif

15
src/battle/move/super_jump_76F330.c
View File

@ -1,10 +1,9 @@
#include "common.h"
#ifdef NON_MATCHING
ApiStatus func_802A1000_76F330(ScriptInstance* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
BattleStatus* secondBattleStatus = &gBattleStatus;
Actor* partnerActor = battleStatus->partnerActor;
Actor* partnerActor = battleStatus->playerActor;
f32 posX = partnerActor->currentPos.x;
f32 posY = partnerActor->currentPos.y;
f32 posZ = partnerActor->currentPos.z;
@ -19,16 +18,12 @@ ApiStatus func_802A1000_76F330(ScriptInstance* script, s32 isInitialCall) {
}
if (secondBattleStatus->unk_83 != 0) {
if (script->varTable[0] < 10) {
script->varTable[0] = 10;
if (script->varTable[0] < 6) {
script->varTable[0] = 6;
}
} else if (script->varTable[0] < 15) {
script->varTable[0] = 15;
} else if (script->varTable[0] < 12) {
script->varTable[0] = 12;
}
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/super_jump_76F330", func_802A1000_76F330);
#endif

5
src/battle/move/super_smash_775100.c
View File

@ -12,7 +12,6 @@ ApiStatus func_802A1000_775100(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#ifdef NOT_MATCHING
ApiStatus func_802A1050_775150(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = 0;
@ -26,7 +25,3 @@ ApiStatus func_802A1050_775150(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "battle/move/super_smash_775100", func_802A1050_775150);
#endif

32
tools/splat.yaml
View File

@ -2432,7 +2432,7 @@ segments:
overlay: True
subsections:
- [0x73AED0, c]
- [0x73AF70, data]
- [0x73AF80, data]
- name: battle/move/jump
type: code
start: 0x73D860
@ -2448,7 +2448,7 @@ segments:
overlay: True
subsections:
- [0x740CC0, c]
- [0x740DA0, data]
- [0x740DB0, data]
- name: battle/move/power_bounce
type: code
start: 0x743DF0
@ -2464,7 +2464,7 @@ segments:
overlay: True
subsections:
- [0x746E10, c]
- [0x746EF0, data]
- [0x746F00, data]
- name: battle/move/dizzy_stomp
type: code
start: 0x748DD0
@ -2472,7 +2472,7 @@ segments:
overlay: True
subsections:
- [0x748DD0, c]
- [0x748EB0, data]
- [0x748EC0, data]
- name: battle/move/d_down_pound
type: code
start: 0x74AD90
@ -2552,7 +2552,7 @@ segments:
overlay: True
subsections:
- [0x763540, c]
- [0x7635E0, data]
- [0x7635F0, data]
- name: battle/move/auto_jump
type: code
start: 0x765C20
@ -2560,7 +2560,7 @@ segments:
overlay: True
subsections:
- [0x765C20, c]
- [0x765D00, data]
- [0x765D10, data]
- name: battle/move/power_quake
type: code
start: 0x767C90
@ -2568,7 +2568,7 @@ segments:
overlay: True
subsections:
- [0x767C90, c]
- [0x767D30, data]
- [0x767D40, data]
- name: battle/move/auto_multibounce
type: code
start: 0x76A830
@ -2576,7 +2576,7 @@ segments:
overlay: True
subsections:
- [0x76A830, c]
- [0x76A910, data]
- [0x76A920, data]
- name: battle/move/power_jump
type: code
start: 0x76D760
@ -2584,7 +2584,7 @@ segments:
overlay: True
subsections:
- [0x76D760, c]
- [0x76D840, data]
- [0x76D850, data]
- name: battle/move/super_jump
type: code
start: 0x76F330
@ -2592,7 +2592,7 @@ segments:
overlay: True
subsections:
- [0x76F330, c]
- [0x76F410, data]
- [0x76F420, data]
- name: battle/move/mega_jump
type: code
start: 0x770F30
@ -2600,7 +2600,7 @@ segments:
overlay: True
subsections:
- [0x770F30, c]
- [0x771010, data]
- [0x771020, data]
- name: battle/move/power_smash
type: code
start: 0x772BA0
@ -2608,7 +2608,7 @@ segments:
overlay: True
subsections:
- [0x772BA0, c]
- [0x772C40, data]
- [0x772C50, data]
- name: battle/move/super_smash
type: code
start: 0x775100
@ -2616,7 +2616,7 @@ segments:
overlay: True
subsections:
- [0x775100, c]
- [0x7751A0, data]
- [0x7751B0, data]
- name: battle/move/mega_smash
type: code
start: 0x777690
@ -2624,7 +2624,7 @@ segments:
overlay: True
subsections:
- [0x777690, c]
- [0x777730, data]
- [0x777740, data]
- name: battle/move/unknown_move
type: code
start: 0x779C90
@ -2640,7 +2640,7 @@ segments:
overlay: True
subsections:
- [0x77CB80, c]
- [0x77CC20, data]
- [0x77CC30, data]
- name: battle/move/shell_crack
type: code
start: 0x77F240
@ -2664,7 +2664,7 @@ segments:
overlay: True
subsections:
- [0x783BA0, c]
- [0x783C80, data]
- [0x783C90, data]
- name: battle/move/earthquake_jump
type: code
start: 0x785B20