Merge remote-tracking branch 'upstream/master' into elemental-arrows

This commit is contained in:
fig02
2020-03-31 05:03:25 -04:00
372 changed files with 3338 additions and 4404 deletions
-2
View File
@@ -314,7 +314,6 @@ beginseg
include "build/src/code/z_draw.o"
include "build/asm/code_8006BA00.o"
include "build/src/code/z_elf_message.o"
include "build/data/z_elf_message.data.o"
include "build/src/code/z_face_reaction.o"
include "build/src/code/code_8006C3A0.o"
include "build/src/code/code_8006C510.o"
@@ -356,7 +355,6 @@ beginseg
include "build/src/code/z_prenmi.o"
include "build/src/code/z_quake.o"
include "build/src/code/z_rcp.o"
include "build/data/z_rcp.data.o"
include "build/src/code/z_room.o"
include "build/src/code/z_sample.o"
include "build/src/code/code_80097A00.o"