diff options
| author | huderlem <huderlem@gmail.com> | 2019-04-01 17:54:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-01 17:54:30 -0500 |
| commit | 4d938cb622a50a5f6659fccc69fca6da78e83ed4 (patch) | |
| tree | 6ddfad5ea68e51bcf4065054ff78ff0db833ae73 /ld_script.txt | |
| parent | 1e8e5af033008e901271b3769142b81a22ba0765 (diff) | |
| parent | 08f4d3e105a77531c3d817b16d0797b2be885f7f (diff) | |
Merge pull request #642 from PikalaxALT/union_room_player_avatar
Union Room event objects
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt index 5230fee78..a7bd9eaad 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -56,7 +56,8 @@ SECTIONS { src/link_rfu.o(.text); src/union_room.o(.text); src/mystery_gift.o(.text); - asm/union_room_player_avatar.o(.text); + src/union_room_player_avatar.o(.text); + asm/union_room_battle.o(.text); src/mevent2.o(.text); src/mevent_801BAAC.o(.text); asm/mevent_server.o(.text); @@ -411,7 +412,8 @@ SECTIONS { src/link_rfu.o(.rodata); src/union_room.o(.rodata); src/mystery_gift.o(.rodata); - data/union_room_player_avatar.o(.rodata); + src/union_room_player_avatar.o(.rodata); + data/union_room_battle.o(.rodata); src/mevent2.o(.rodata); src/mevent_801BAAC.o(.rodata); data/mevent_server.o(.rodata); |