diff options
| author | Parker Burnett <burnettparker@gmail.com> | 2021-07-26 22:45:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 22:45:10 -0400 |
| commit | b59d9a99356278b0141140c7514386dd9218ea48 (patch) | |
| tree | fc9469da04348c800eda82762af488efd1d023b4 /linker_scripts | |
| parent | c774f880e1b033c53e48fc9b438f84fa47836346 (diff) | |
En_hg Decompiled (#221)
* starting on en_hg
* working on another func
* fixing some stuff in ghaka, and tweaks in en_hg
* fixing some stuff
* fixing state flags
* all functions matching just data issues
* en_hg OK
* fixed to give OK
* some docs, and fixes
* fixing warnings
* fixing some things
* fixing warning
* adding pr comments
* fixing a typo
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index e7a006dd9..faa8c99a7 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -8045,9 +8045,9 @@ SECTIONS ovl_En_Hg : AT(RomLocation) { build/src/overlays/actors/ovl_En_Hg/z_en_hg.o(.text) - build/asm/overlays/ovl_En_Hg_data.o(.data) + build/src/overlays/actors/ovl_En_Hg/z_en_hg.o(.data) build/src/overlays/actors/ovl_En_Hg/z_en_hg.o(.rodata) - build/asm/overlays/ovl_En_Hg_rodata.o(.rodata) + build/src/overlays/actors/ovl_En_Hg/z_en_hg_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 892217f32..37de76346 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -347,6 +347,18 @@ D_06006320 = 0x06006320; D_06006720 = 0x06006720; D_06006920 = 0x06006920; +/* z_en_hg */ +D_06008580 = 0x06008580; +D_0600260C = 0x0600260C; +D_06005E28 = 0x06005E28; +D_06009D44 = 0x06009D44; +D_0600A164 = 0x0600A164; +D_06000370 = 0x06000370; +D_06001138 = 0x06001138; +D_060015D4 = 0x060015D4; +D_06001960 = 0x06001960; +D_0600AE1C = 0x0600AE1C; + /* z_en_in */ D_06014EA8 = 0x06014EA8; D_06015E38 = 0x06015E38; @@ -756,3 +768,4 @@ D_06000968 = 0x06000968; /* z_obj_visiblock */ D_06000AD0 = 0x06000AD0; D_06000140 = 0x06000140; + |