mirror of
https://github.com/zeldaret/oot
synced 2026-08-16 21:17:48 -04:00
Merge remote-tracking branch 'upstream/master' into ovl_Eff_Dust
Signed-off-by: Anghelo <angheloalf95@gmail.com>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user