mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-06 22:02:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'functions'

Browse Source
This commit is contained in:
Pheenoh
2021-01-31 15:39:31 -05:00
parent ccf862fbb2 90578d539a
commit fb0493b171
117 changed files with 3995 additions and 6091 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SComponent/c_xyz.h
+1
View File
@@ -2,6 +2,7 @@
#define C_XYZ_H_
#include "SComponent/c_math.h"
#include "mtx_vec.h"
#include "global.h"
extern f32 /* 1.0 */ lbl_80455070;
include/d/d_com/d_com_inf_game/asm/func_8002E0A8.s
+14
View File
@@ -0,0 +1,14 @@
/* 8002E0A8 0002AFE8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8002E0AC 0002AFEC 7C 08 02 A6 */ mflr r0
/* 8002E0B0 0002AFF0 90 01 00 14 */ stw r0, 0x14(r1)
/* 8002E0B4 0002AFF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002E0B8 0002AFF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8002E0BC 0002AFFC 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 8002E0C0 0002B000 38 80 1D 01 */ li r4, 0x1d01
/* 8002E0C4 0002B004 48 00 68 F9 */ bl isEventBit__11dSv_event_cCFUs
/* 8002E0C8 0002B008 7C 60 00 34 */ cntlzw r0, r3
/* 8002E0CC 0002B00C 54 03 D9 7E */ srwi r3, r0, 5
/* 8002E0D0 0002B010 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8002E0D4 0002B014 7C 08 03 A6 */ mtlr r0
/* 8002E0D8 0002B018 38 21 00 10 */ addi r1, r1, 0x10
/* 8002E0DC 0002B01C 4E 80 00 20 */ blr
include/d/d_com/d_com_inf_game/d_com_inf_game.h
+3 -3
View File
@@ -440,9 +440,9 @@ inline u16 dComIfGs_getMaxLife(void) {
inline void dComIfGs_offEventBit(u16 event) {
g_dComIfG_gameInfo.getSaveFile().getEventFlags().offEventBit(event);
}
inline int dComIfGs_isEventBit(u16 event) {
return g_dComIfG_gameInfo.getSaveFile().getEventFlags().isEventBit(event);
}
// inline int dComIfGs_isEventBit(u16 event) {
// return g_dComIfG_gameInfo.getSaveFile().getEventFlags().isEventBit(event);
// }
inline const char* dComIfGs_getLastWarpMarkStageName(void) {
return g_dComIfG_gameInfo.getSaveFile().getPlayerLastMarkInfo().getName();
}
include/d/d_save/d_save/asm/func_80032AF8.s
+24
View File
@@ -0,0 +1,24 @@
/* 80032AF8 0002FA38 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80032AFC 0002FA3C 7C 08 02 A6 */ mflr r0
/* 80032B00 0002FA40 90 01 00 14 */ stw r0, 0x14(r1)
/* 80032B04 0002FA44 54 84 06 3F */ clrlwi. r4, r4, 0x18
/* 80032B08 0002FA48 40 82 00 1C */ bne lbl_80032B24
/* 80032B0C 0002FA4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80032B10 0002FA50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80032B14 0002FA54 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 80032B18 0002FA58 38 80 23 04 */ li r4, 0x2304
/* 80032B1C 0002FA5C 48 00 1E A1 */ bl isEventBit__11dSv_event_cCFUs
/* 80032B20 0002FA60 48 00 00 20 */ b lbl_80032B40
lbl_80032B24:
/* 80032B24 0002FA64 88 63 00 1C */ lbz r3, 0x1c(r3)
/* 80032B28 0002FA68 38 00 00 01 */ li r0, 1
/* 80032B2C 0002FA6C 7C 00 20 30 */ slw r0, r0, r4
/* 80032B30 0002FA70 54 00 06 3E */ clrlwi r0, r0, 0x18
/* 80032B34 0002FA74 7C 63 00 38 */ and r3, r3, r0
/* 80032B38 0002FA78 30 03 FF FF */ addic r0, r3, -1
/* 80032B3C 0002FA7C 7C 60 19 10 */ subfe r3, r0, r3
lbl_80032B40:
/* 80032B40 0002FA80 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80032B44 0002FA84 7C 08 03 A6 */ mtlr r0
/* 80032B48 0002FA88 38 21 00 10 */ addi r1, r1, 0x10
/* 80032B4C 0002FA8C 4E 80 00 20 */ blr
include/d/d_save/d_save/asm/func_80033754.s
+41
View File
@@ -0,0 +1,41 @@
/* 80033754 00030694 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80033758 00030698 7C 08 02 A6 */ mflr r0
/* 8003375C 0003069C 90 01 00 24 */ stw r0, 0x24(r1)
/* 80033760 000306A0 39 61 00 20 */ addi r11, r1, 0x20
/* 80033764 000306A4 48 32 EA 71 */ bl _savegpr_27
/* 80033768 000306A8 3B 60 00 00 */ li r27, 0
/* 8003376C 000306AC 3B E0 00 00 */ li r31, 0
/* 80033770 000306B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033774 000306B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033778 000306B8 3B A3 00 CC */ addi r29, r3, 0xcc
/* 8003377C 000306BC 3B 83 07 F0 */ addi r28, r3, 0x7f0
/* 80033780 000306C0 3C 60 80 3A */ lis r3, lbl_803A7288@ha
/* 80033784 000306C4 3B C3 72 88 */ addi r30, r3, lbl_803A7288@l
lbl_80033788:
/* 80033788 000306C8 7F A3 EB 78 */ mr r3, r29
/* 8003378C 000306CC 38 1B 00 C0 */ addi r0, r27, 0xc0
/* 80033790 000306D0 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80033794 000306D4 48 00 07 35 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 80033798 000306D8 2C 03 00 00 */ cmpwi r3, 0
/* 8003379C 000306DC 41 82 00 24 */ beq lbl_800337C0
/* 800337A0 000306E0 7F 83 E3 78 */ mr r3, r28
/* 800337A4 000306E4 7C 9E FA 14 */ add r4, r30, r31
/* 800337A8 000306E8 A0 84 03 22 */ lhz r4, 0x322(r4)
/* 800337AC 000306EC 48 00 12 11 */ bl isEventBit__11dSv_event_cCFUs
/* 800337B0 000306F0 2C 03 00 00 */ cmpwi r3, 0
/* 800337B4 000306F4 40 82 00 0C */ bne lbl_800337C0
/* 800337B8 000306F8 38 60 00 01 */ li r3, 1
/* 800337BC 000306FC 48 00 00 18 */ b lbl_800337D4
lbl_800337C0:
/* 800337C0 00030700 3B 7B 00 01 */ addi r27, r27, 1
/* 800337C4 00030704 2C 1B 00 18 */ cmpwi r27, 0x18
/* 800337C8 00030708 3B FF 00 02 */ addi r31, r31, 2
/* 800337CC 0003070C 41 80 FF BC */ blt lbl_80033788
/* 800337D0 00030710 38 60 00 00 */ li r3, 0
lbl_800337D4:
/* 800337D4 00030714 39 61 00 20 */ addi r11, r1, 0x20
/* 800337D8 00030718 48 32 EA 49 */ bl _restgpr_27
/* 800337DC 0003071C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 800337E0 00030720 7C 08 03 A6 */ mtlr r0
/* 800337E4 00030724 38 21 00 20 */ addi r1, r1, 0x20
/* 800337E8 00030728 4E 80 00 20 */ blr
include/functions.h
-6000
View File
File diff suppressed because it is too large Load Diff
include/global.h
-1
View File
@@ -42,7 +42,6 @@ inline double sqrt(float f) {
#include "ar/AR.h"
#include "ar/ARQ.h"
#include "functions.h"
#include "mwcc.h"
#include "os/OS.h"
#include "variables.h"