Merge branch 'master' into doc-overworld

2020-07-08 15:51:58 -04:00
parent c0bc7e8f7b 9ff261ac2a
commit ebb6c4ee66
498 changed files with 8011 additions and 7053 deletions
@@ -65,6 +65,7 @@ SECTIONS {
        src/union_room.o(.text);
        src/mystery_gift.o(.text);
        src/union_room_player_avatar.o(.text);
+        src/wireless_communication_status_screen.o(.text);
        src/union_room_battle.o(.text);
        src/mevent2.o(.text);
        src/mevent_801BAAC.o(.text);
@@ -450,6 +451,7 @@ SECTIONS {
        src/union_room.o(.rodata);
        src/mystery_gift.o(.rodata);
        src/union_room_player_avatar.o(.rodata);
+        src/wireless_communication_status_screen.o(.rodata);
        src/union_room_battle.o(.rodata);
        src/mevent2.o(.rodata);
        src/mevent_801BAAC.o(.rodata);