diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-16 18:12:21 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-11-17 08:16:28 -0600 |
| commit | 6ac7efb54f79a3ecd216cdc560bf2703b6c799c2 (patch) | |
| tree | 16b81bf939ce3f96c513c6b63b4575a8148ce0f1 /asm | |
| parent | f7e17ca985fcc2b027a16d2cba30e6500e664207 (diff) | |
Document Scotts House and begin frontier macros
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros.inc | 1 | ||||
| -rw-r--r-- | asm/macros/battle_frontier.inc | 35 | ||||
| -rw-r--r-- | asm/macros/event.inc | 1 |
3 files changed, 37 insertions, 0 deletions
diff --git a/asm/macros.inc b/asm/macros.inc index 7c35e059d..f6a143d7a 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -6,6 +6,7 @@ .include "asm/macros/ec.inc" .include "asm/macros/map.inc" .include "asm/macros/field_effect_script.inc" + .include "asm/macros/battle_frontier.inc" .macro region_map_entry x, y, width, height, name .byte \x diff --git a/asm/macros/battle_frontier.inc b/asm/macros/battle_frontier.inc new file mode 100644 index 000000000..8a5f369a3 --- /dev/null +++ b/asm/macros/battle_frontier.inc @@ -0,0 +1,35 @@ +@ To be populated with macros for the Battle Frontier CallFacilityFunction specials + + +@ Frontier Util + +.macro frontier_setlvlmode lvlmode:req +setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 +setvar VAR_0x8005, 1 +setvar VAR_0x8006, \lvlmode +special CallFrontierUtilFunc +.endm + +@ Battle Tower + +.macro battletower_getstreak +setvar VAR_0x8004, BATTLE_TOWER_FUNC_1 +setvar VAR_0x8005, 1 +special CallBattleTowerFunc +.endm + +@ Battle Dome + +@ Battle Palace + +@ Battle Arena + +@ Battle Factory + +@ Battle Pike + +@ Battle Pyramid + +@ Battle Tent + +@ Apprentice diff --git a/asm/macros/event.inc b/asm/macros/event.inc index ba617f629..9db57daf1 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1655,6 +1655,7 @@ MSGBOX_DEFAULT = 4 MSGBOX_YESNO = 5 MSGBOX_AUTOCLOSE = 6 + MSGBOX_GETPOINTS = 9 YES = 1 NO = 0 |