izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Match Remaining EnGinkoMan Functions (EnGinkoMan OK) (#175)

Browse Source 
* EnGinkoMan OK

* Cleanup

* Minor PR suggestion
This commit is contained in:
engineer124
2021-06-09 18:49:20 -04:00
committed by GitHub
parent 83e263ab12
commit 8b21da8c34
5 changed files with 168 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/variables.h
+2 -2
View File
@@ -1404,10 +1404,10 @@ extern room_draw_func roomDrawFuncs[4];
extern u32 gBitFlags[32];
extern u16 gEquipMasks[];
extern u16 gEquipNegMasks[];
extern u32 gUpgradeMasks[];
extern u32 gUpgradeMasks[8];
extern u32 gUpgradeNegMasks[];
extern u8 gEquipShifts[];
extern u8 gUpgradeShifts[];
extern u8 gUpgradeShifts[16];
extern u16 gUpgradeCapacities[][4];
extern u32 gGsFlagsMask[];
extern u32 gGsFlagsShift[];
linker_scripts/code_script.txt
+3 -2
View File
@@ -716,8 +716,9 @@ SECTIONS
gFramebufferHighRes1 = 0x80000500;
gFramebufferHighRes0 = 0x80780000;
/* Unkown buffers */
/* Unknown buffers */
D_80025D00 = 0x80025D00; /* Used in z_vr_box.c */
D_801C1E2C = 0x801C1E2C; /* Used in z_en_ginko_man.c */
D_80780000 = 0x80780000;
D_80784600 = 0x80784600;
@@ -5006,7 +5007,7 @@ SECTIONS
build/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.o(.text)
build/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.o(.data)
build/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.o(.rodata)
build/asm/overlays/ovl_En_Ginko_Man_rodata.o(.rodata)
build/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man_overlay.o(.ovl)
}
SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart;
src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
+160 -249
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h
+2 -2
View File
@@ -18,8 +18,8 @@ typedef struct EnGinkoMan {
/* 0x258 */ s16 curTextId;
/* 0x25A */ s16 serviceFee;
/* 0x25C */ s16 choiceDepositWithdrawl;
/* 0x25E */ s16 newAccountFlag;
/* 0x260 */ s16 stampChecked;
/* 0x25E */ s16 isNewAccount;
/* 0x260 */ s16 isStampChecked;
/* 0x262 */ s16 previousBankValue;
/* 0x264 */ s16 animTimer;
} EnGinkoMan; // size = 0x268
tables/functions.txt
+1 -1
View File
@@ -10826,7 +10826,7 @@
0x80A65988:("EnGinkoMan_SwitchAnimation",),
0x80A65A5C:("EnGinkoMan_FacePlayer",),
0x80A65ADC:("EnGinkoMan_Update",),
0x80A65B44:("EnGinkoMan_LimbDraw",),
0x80A65B44:("EnGinkoMan_OverrideLimbDraw",),
0x80A65C18:("EnGinkoMan_PostLimbDraw",),
0x80A65C30:("EnGinkoMan_Draw",),
0x80A66180:("EnWarpUzu_Init",),