diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2021-03-22 21:48:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-22 17:48:15 -0400 |
| commit | 1a2e6d7ffe675de5409067e902de0f7ff87449dd (patch) | |
| tree | f039dcd0278dfc7a4e71565494cf565014ded8eb /linker_scripts/code_script.txt | |
| parent | 32d0e622fd958fb02086131ae58b1283518e7df3 (diff) | |
z_collision_check.c (#58)
* setup
* Progress on z_collision_check.c
* Further progress on z_collision_check.c
* renamed code_0x800E03A0 to z_collision_btltbls, z_collision_check.c decompiled besides bss
* Structs changes
* Document functions
* overlayhelpers folder, colliderinit.py and ichaindis.py
* Flags, format existing ColliderInits
* Fix merge
* Few more small improvements
* Review suggestions
Diffstat (limited to 'linker_scripts/code_script.txt')
| -rw-r--r-- | linker_scripts/code_script.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index df24a2b9a..590a774d7 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -337,9 +337,9 @@ SECTIONS build/src/code/code_0x800CAE10.o(.text) build/asm/code/code_0x800CB000.o(.text) build/asm/code/z_camera.o(.text) - build/src/code/code_0x800E03A0.o(.text) + build/src/code/z_collision_btltbls.o(.text) . += 0x10; - build/asm/code/z_collision_check.o(.text) + build/src/code/z_collision_check.o(.text) build/src/code/code_0x800E8EA0.o(.text) build/asm/code/code_0x800E9360.o(.text) build/asm/code/z_debug.o(.text) @@ -473,7 +473,8 @@ SECTIONS build/src/code/z_actor_dlftbls.o(.data) build/asm/code/code_data_z_bgcheck.o(.data) build/asm/code/code_data_z_camera.o(.data) - build/asm/code/code_data_z_collision_check.o(.data) + build/src/code/z_collision_btltbls.o(.data) + build/src/code/z_collision_check.o(.data) build/asm/code/code_data_z_debug_display.o(.data) build/asm/code/code_data_z_debug_mode.o(.data) build/asm/code/code_data_z_draw.o(.data) @@ -549,7 +550,7 @@ SECTIONS build/asm/code/code_rodata_z_bgcheck.o(.rodata) build/asm/code/code_rodata_0x800CB000.o(.rodata) build/asm/code/code_rodata_z_camera.o(.rodata) - build/asm/code/code_rodata_z_collision_check.o(.rodata) + build/src/code/z_collision_check.o(.rodata) build/asm/code/code_rodata_0x800E8EA0.o(.rodata) build/asm/code/code_rodata_z_debug_mode.o(.rodata) build/asm/code/code_rodata_z_draw.o(.rodata) |