dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into union_room_chat

Browse Source 
# Conflicts:
#	ld_script.txt
This commit is contained in:
Marcus Huderle
2019-03-29 21:27:08 -05:00
parent a978a6a624 7211f996a5
commit accc5ae8dd
9 changed files with 1016 additions and 3223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ld_script.txt
View File

@@ -57,11 +57,11 @@ SECTIONS {
src/union_room.o(.text);
asm/union_room.o(.text);
src/mevent2.o(.text);
asm/mevent_801BAAC.o(.text);
src/mevent_801BAAC.o(.text);
asm/mevent_server.o(.text);
asm/mevent_server_ish.o(.text);
asm/mevent_server_helpers.o(.text);
asm/mevent_news.o(.text);
src/mevent_news.o(.text);
src/union_room_chat.o(.text);
asm/berry_crush.o(.text);
src/berry_powder.o(.text);
@@ -410,7 +410,7 @@ SECTIONS {
src/union_room.o(.rodata);
data/union_room.o(.rodata);
src/mevent2.o(.rodata);
data/mevent_801BAAC.o(.rodata);
src/mevent_801BAAC.o(.rodata);
data/mevent_server.o(.rodata);
src/union_room_chat.o(.rodata);
data/union_room_chat.o(.rodata);