mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-19 13:54:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Unify asm for non-matching functions

Browse Source 
So that tools can easier work with them.
This commit is contained in:
octorock
2022-01-11 19:12:19 +01:00
parent 3cd77bb034
commit b0b39514c2
18 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/player.c
+2 -2
View File
@@ -324,7 +324,7 @@ extern u16 script_BedAtSimons;
extern Entity* gPlayerClones[];
extern ScriptExecutionContext gPlayerScriptExecutionContext;
NONMATCH("asm/non_matching/playerItemPacciCane/sub_080705AC.inc", u32 CheckPlayerInactive(void)) {
NONMATCH("asm/non_matching/playerItemPacciCane/CheckPlayerInactive.inc", u32 CheckPlayerInactive(void)) {
if (!((gInput.newKeys & START_BUTTON) == 0 || gFadeControl.active || gUnk_02034490[0] ||
(gMessage.doTextBox & 0x7F) || gSave.stats.health == 0 || !gSave.fillerD0[34] ||
gPlayerState.controlMode != 0 || gPriorityHandler.priority_timer != 0)) {
@@ -703,7 +703,7 @@ static void PlayerBounceInit(Entity* this) {
}
// minor regalloc
static NONMATCH("asm/non_matching/player/sub_08070DC4.inc", void PlayerBounceUpdate(Entity* this)) {
static NONMATCH("asm/non_matching/player/PlayerBounceUpdate.inc", void PlayerBounceUpdate(Entity* this)) {
UpdateAnimationSingleFrame(this);
sub_080085B0(this);
UpdatePlayerMovement();