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

Obj_Syokudai (Torch) OK and mostly documented (#306)

Browse Source 
* Started uncommenting statics, but then realized this actor has BSS, lol.

* Import .data and .bss. Run format.sh.

* ObjSyokudai_Init OK and mostly documented.

* ObjSyokudai_Destroy OK and fully documented.

* ObjSyokudai_Draw OK and partially documented.

* Good progress on ObjSyokudai_Update, but NOT OK.

* Instruction match, but needs regalloc and stack.

* Stack is closer now.

* Obj_Syokudai OK, no new warnings, ran formatter.

* Documented .data and .bss variables.

* Final documentation pass before PR.

* Add header, fix build errors.

* Use COLTYPE_METAL and COLTYPE_WOOD macros.

* Apply suggestions from code review

engineer124's suggestions.

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Apply suggestions from code review

engineer124: WaterBox* instead of UNK_PTR

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

engineer124: AC_HARD -> AC_HIT so Jenkins stops complaining

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Hopefully fix Jenkins via z_bg_lotus WaterBox*.

* Rename sp2C to waterBox in BgLotus.

* Run format.sh.

* Update include/functions.h

Change func_800F22C4 param_1 from s8 to s16.

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Change func_801A5CFC param_1 to sfxId in prototype

* Document interactions.

* Run formatter.

* Clarify that posDiff is relative to stick *tip*.

* Changed interaction comparisons to better fit enum

* snuffTimer enum

* Added more #defines.

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
rylieb
2021-09-25 09:53:53 -04:00
committed by GitHub
co-authored by engineer124
parent f77cfb9020
commit bc5c3866d5
10 changed files with 351 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/disasm/variables.txt
+6 -6
View File
@@ -6810,14 +6810,14 @@
0x808BC000:("D_808BC000","UNK_TYPE1","",0x1),
0x808BC004:("D_808BC004","UNK_TYPE1","",0x1),
0x808BCCA0:("Obj_Syokudai_InitVars","UNK_TYPE1","",0x1),
0x808BCCC0:("D_808BCCC0","UNK_TYPE1","",0x1),
0x808BCCEC:("D_808BCCEC","UNK_TYPE1","",0x1),
0x808BCD18:("D_808BCD18","UNK_TYPE1","",0x1),
0x808BCD28:("D_808BCD28","UNK_TYPE1","",0x1),
0x808BCD2C:("D_808BCD2C","UNK_TYPE1","",0x1),
0x808BCCC0:("sStandColliderInit","UNK_TYPE1","",0x1),
0x808BCCEC:("sFlameColliderInit","UNK_TYPE1","",0x1),
0x808BCD18:("sInitChain","UNK_TYPE1","",0x1),
0x808BCD28:("sColTypes","UNK_TYPE1","",0x1),
0x808BCD2C:("sDLists","UNK_TYPE1","",0x1),
0x808BCD40:("D_808BCD40","f32","",0x4),
0x808BCD44:("D_808BCD44","f32","",0x4),
0x808BCDE0:("D_808BCDE0","UNK_TYPE1","",0x1),
0x808BCDE0:("sNumLitTorchesInGroup","UNK_TYPE1","",0x1),
0x808BD160:("Item_B_Heart_InitVars","UNK_TYPE1","",0x1),
0x808BD180:("D_808BD180","UNK_TYPE1","",0x1),
0x808BD190:("D_808BD190","f32","",0x4),