diff options
| author | rylieb <31797144+rylieb@users.noreply.github.com> | 2021-07-21 19:29:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-21 21:29:27 -0400 |
| commit | 87137da829c10b085925e9aae00b9dc20c3ee02f (patch) | |
| tree | f2df904302dfd69a367eaea170a66ceadc154711 /linker_scripts | |
| parent | 9637e19303bdd2c99b1a03390cc1bbea786a8150 (diff) | |
En_Bji_01 (Shikashi) OK and partially documented. (#217)
* EnBji01_Init OK and Partially Documented.
* EnBji01_Destroy OK and Fully Documented.
* func_809CCE98 OK and partially documented.
* Removed goto in func_809CCE98().
* func_809CD6C0 matching and partly documented.
* Pasted raw mips_to_c into EnBji01_Update().
* EnBji01_Update() matching and partially documented.
* EnBji01_Update() matching and partially documented.
* func_809CDA4C() matching and partially documented.
* func_809CDA4C actually matching this time, and partially documented.
* func_809CDB04() matching and partially documented.
* func_809CD028() matching and mostly documented.
* func_809CD6B0() matching.
* func_809CD328() matching and partially documented.
* func_809CCDE0() matching and partially documented, func_8013E950()
prototyped.
* func_809CD634() and func_809CD70C() matching and partially documented.
func_801A5BD0() prototyped.
* func_809CD77C() matching and mostly documented. All functions now
matching.
* Imported data from ovl_En_Bji_01_data.asm to z_en_bji_01.c. Updated
object_script.txt and code_script.txt. Ran format.sh. Builds OK.
* Documented all of the unks in Shikashi's struct. Build still OK.
* Fixed new warning in Bg_Haka_Tomb resulting from my new prototype of
func_8013E3B8().
* Renamed remaining instances of unk160 to cutscenes.
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h
Remove unnecessary comment about compiler padding.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
Correct stack declaration spacing.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Update src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h
Remove unnecessary comment about compiler alignment padding.
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
Remove unnecessary padding comment.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Apply suggestions from code review
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Batch commit for comments during code review.
* Apply suggestions from code review (trailing Us)
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Deleted exteraneous space at the bottom of En_Bji_01 struct in the
header file.
* Used params enum for switch cases.
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
* Apply suggestions from code review
replacing magic numbers with limb enums
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Renamed func_809CD328 to EnBji01_DialogueHandler per code review.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index b81b39eab..5a1665015 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -3968,9 +3968,9 @@ SECTIONS ovl_En_Bji_01 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.o(.text) - build/asm/overlays/ovl_En_Bji_01_data.o(.data) + build/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.o(.data) build/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.o(.rodata) - build/asm/overlays/ovl_En_Bji_01_rodata.o(.rodata) + build/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index fdb775b6e..5b8ba7db0 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -241,6 +241,16 @@ D_060011C0 = 0x060011C0; D_060008B4 = 0x060008B4; D_06008198 = 0x06008198; +/* z_en_bji_01 */ +D_06000FDC = 0x06000FDC; +D_06005B58 = 0x06005B58; +D_06000AB0 = 0x06000AB0; +D_0600066C = 0x0600066C; +D_060049F0 = 0x060049F0; +D_06004E70 = 0x06004E70; +D_06005270 = 0x06005270; +D_0600578C = 0x0600578C; + /* z_en_cha */ D_06000710 = 0x06000710; D_06000958 = 0x06000958; |