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

Signed-off-by: Anghelo <angheloalf95@gmail.com>
This commit is contained in:
Anghelo
2021-01-27 15:13:08 -03:00
196 changed files with 4773 additions and 4227 deletions
+4 -2
View File
@@ -140,6 +140,7 @@ beginseg
name "icon_item_static"
romalign 0x1000
include "build/assets/textures/icon_item_static/icon_item_static.o"
number 8
endseg
beginseg
@@ -169,7 +170,7 @@ endseg
beginseg
name "icon_item_nes_static"
romalign 0x1000
include "build/baserom/icon_item_nes_static.o" //include "build/assets/textures/icon_item_nes_static/icon_item_nes_static.o"
include "build/baserom/icon_item_nes_static.o"
endseg
beginseg
@@ -6180,7 +6181,8 @@ endseg
beginseg
name "parameter_static"
romalign 0x1000
include "build/baserom/parameter_static.o"
include "build/assets/textures/parameter_static/parameter_static.o"
number 2
endseg
beginseg