atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Final fixes before dump

Browse source
This commit is contained in:
Diegoisawesome 2017-10-26 18:03:19 -05:00
parent 118b29ed03
commit 7827feaa2f
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -24,7 +24,7 @@ CPP := $(DEVKITARM)/bin/arm-none-eabi-cpp
CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef
LD := $(DEVKITARM)/bin/arm-none-eabi-ld LD := $(DEVKITARM)/bin/arm-none-eabi-ld
LDFLAGS = -Map $(MAP) LDFLAGS = -Map ../../$(MAP)
OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy

11
asm/macros/event.inc
View file

@ -1490,6 +1490,17 @@
goto_eq \dest goto_eq \dest
.endm .endm
.macro msgbox text, type=4
loadword 0, \text
callstd \type
.endm
@ Message box types
MSGBOX_YESNO = 5
YES = 1
NO = 0
.macro giveitem_std item, amount=1, function=0 .macro giveitem_std item, amount=1, function=0
setorcopyvar 0x8000, \item setorcopyvar 0x8000, \item
setorcopyvar 0x8001, \amount setorcopyvar 0x8001, \amount

2
data/cable_car.s
View file

@ -86,7 +86,7 @@ gMtChimneyHikerGraphicsIDs:: @ 85CDBE6
.byte MAP_OBJ_GFX_HIKER .byte MAP_OBJ_GFX_HIKER
.byte MAP_OBJ_GFX_CAMPER .byte MAP_OBJ_GFX_CAMPER
.byte MAP_OBJ_GFX_PICNICKER .byte MAP_OBJ_GFX_PICNICKER
.byte MAP_OBJ_GFX_ZIGZAGOON @ not used .byte MAP_OBJ_GFX_ZIGZAGOON_1 @ not used
.align 1 .align 1
gMtChimneyHikerCoords:: @ 85CDBEA gMtChimneyHikerCoords:: @ 85CDBEA