diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2021-03-30 13:11:51 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-30 13:11:51 -0500 |
commit | a2d206665c6fffbd962375f262b7fbb05c7b7478 (patch) | |
tree | 6710109c4d9098b74da68ca8f18024d6c184ebc2 /ld_script.txt | |
parent | 2fd4f339b42c010191c199772b09ac34c580de94 (diff) |
Move some data and Splitting (#32)
* move friend area settings to src
* split out playtime into different C file and decomp a few more funcs
* time -> play_time
* fix include
* split out more wonder mail stuff
* unify 203B2C0 and unkDungeon structs. snuck in a decomp func too
* split out more menu screens
* work some more on trade items
* doc a few more things
* add a close nonmatch and decomp nullsub and small func
* rollback struct attempt since it causes nonmatchings
* only one func left in asm
* death to trade_item asm and unify into one C file
* more docing and cleanup
* label main menu and trade items menu global menu struct
* doc itemMode
Diffstat (limited to 'ld_script.txt')
-rwxr-xr-x | ld_script.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt index 5dc23b5..2390b0c 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -89,9 +89,11 @@ SECTIONS { asm/code_801D760.o(.text); src/code_8027C84_pre.o(.text); asm/code_8027C84.o(.text); + src/wonder_mail_pre.o(.text); + asm/wonder_mail.o(.text); src/wonder_mail.o(.text); src/wonder_mail_mid.o(.text); - asm/wonder_mail.o(.text); + asm/wonder_mail_1.o(.text); src/friend_rescue.o(.text); asm/friend_rescue.o(.text); src/friend_rescue_1.o(.text); @@ -101,6 +103,11 @@ SECTIONS { asm/main_menu.o(.text); src/main_menu_mid.o(.text); asm/main_menu_1.o(.text); + src/trade_items_menu.o(.text); + asm/other_menus.o(.text); + asm/rescue_password_menu.o(.text); + asm/load_screen.o(.text); + src/main_menu_1.o(.text); src/wonder_mail_main_menu_pre.o(.text); asm/wonder_mail_main_menu.o(.text); src/wonder_mail_main_menu.o(.text); @@ -140,6 +147,7 @@ SECTIONS { asm/friend_area_1.o(.text); src/friend_area_1.o(.text); asm/code_8092334.o(.text); + src/play_time.o(.text); src/code_8094F88.o(.text); asm/code_8095014.o(.text); src/code_809747C.o(.text); @@ -233,7 +241,7 @@ SECTIONS { data/personality_test.o(.rodata); src/personality_test.o(.rodata); data/data_80F4278.o(.rodata); - data/friend_areas.o(.rodata); + src/friend_area.o(.rodata); data/data_810AC60.o(.rodata); src/exclusive_pokemon.o(.rodata); src/rescue_team_info.o(.rodata); |