diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-26 18:03:19 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-26 18:03:19 -0500 |
| commit | 7827feaa2f8973e8e9a704ba7bc546e2e77d8f77 (patch) | |
| tree | 761580229de926fa7f14b2f9d1b255b6775268f7 | |
| parent | 118b29ed035f138dc2917fc7778bba905d0463f0 (diff) | |
Final fixes before dump
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | asm/macros/event.inc | 11 | ||||
| -rw-r--r-- | data/cable_car.s | 2 |
3 files changed, 13 insertions, 2 deletions
@@ -24,7 +24,7 @@ CPP := $(DEVKITARM)/bin/arm-none-eabi-cpp CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef LD := $(DEVKITARM)/bin/arm-none-eabi-ld -LDFLAGS = -Map $(MAP) +LDFLAGS = -Map ../../$(MAP) OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy diff --git a/asm/macros/event.inc b/asm/macros/event.inc index c224861b0..6a7bc2b47 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1490,6 +1490,17 @@ goto_eq \dest .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 setorcopyvar 0x8000, \item setorcopyvar 0x8001, \amount diff --git a/data/cable_car.s b/data/cable_car.s index 23b81cba7..0f3bf3e2e 100644 --- a/data/cable_car.s +++ b/data/cable_car.s @@ -86,7 +86,7 @@ gMtChimneyHikerGraphicsIDs:: @ 85CDBE6 .byte MAP_OBJ_GFX_HIKER .byte MAP_OBJ_GFX_CAMPER .byte MAP_OBJ_GFX_PICNICKER - .byte MAP_OBJ_GFX_ZIGZAGOON @ not used + .byte MAP_OBJ_GFX_ZIGZAGOON_1 @ not used .align 1 gMtChimneyHikerCoords:: @ 85CDBEA |