From 249bad9551b1c9c29fd64bc36486eb6612427c3b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 13 Jul 2015 00:16:35 -0400 Subject: Replace EVENT_ALWAYS_THERE with -1 --- macros/enum.asm | 5 +++++ macros/map.asm | 14 ++++++++++++++ 2 files changed, 19 insertions(+) (limited to 'macros') diff --git a/macros/enum.asm b/macros/enum.asm index 0a72d49d8..aee6ee530 100644 --- a/macros/enum.asm +++ b/macros/enum.asm @@ -29,3 +29,8 @@ const: MACRO \1 EQU const_value const_value = const_value + 1 ENDM + +shift_const: MACRO +\1 EQU 1 << const_value +const_value = const_value + 1 +ENDM diff --git a/macros/map.asm b/macros/map.asm index 2ab981823..54b543c6d 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -162,3 +162,17 @@ if "\1" == "east" endc ENDM + +mapgroup: MACRO +\1\@ EQUS "GROUP_\1" +\1\@2 EQUS "MAP_\1" +\1\@ EQU const_value + enum \1\@2 +\1_HEIGHT EQU \2 +\1_WIDTH EQU \3 +ENDM + +newgroup: MACRO +const_value = const_value + 1 + enum_start 1 +ENDM -- cgit v1.2.3 From 8fa8e29170fe78a7f9ed1b2396935af47e16c0c1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 13 Jul 2015 02:23:48 -0400 Subject: - Update variable sprites to use constants rather than fixed values --- macros/event.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'macros') diff --git a/macros/event.asm b/macros/event.asm index 893d55fe6..678648a04 100644 --- a/macros/event.asm +++ b/macros/event.asm @@ -690,7 +690,7 @@ faceperson: macro enum variablesprite_command variablesprite: macro db variablesprite_command - db \1 ; byte + db \1 - SPRITE_VARS ; byte db \2 ; sprite endm -- cgit v1.2.3 From 39524cdb766660a7bf6d60379040349652cecc04 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 15 Jul 2015 15:48:44 -0400 Subject: More enumeration of constants, more annotations of scripts. --- macros/map.asm | 1 + macros/movement.asm | 227 ++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 157 insertions(+), 71 deletions(-) (limited to 'macros') diff --git a/macros/map.asm b/macros/map.asm index 54b543c6d..570205517 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -164,6 +164,7 @@ endc ENDM mapgroup: MACRO +; map id, height, width \1\@ EQUS "GROUP_\1" \1\@2 EQUS "MAP_\1" \1\@ EQU const_value diff --git a/macros/movement.asm b/macros/movement.asm index 1d556f922..71eb01339 100644 --- a/macros/movement.asm +++ b/macros/movement.asm @@ -1,285 +1,370 @@ + enum_start + + enum movement_turn_head_down turn_head_down: macro - db $00 + db movement_turn_head_down ; $00 endm + enum movement_turn_head_up turn_head_up: macro - db $01 + db movement_turn_head_up ; $01 endm + enum movement_turn_head_left turn_head_left: macro - db $02 + db movement_turn_head_left ; $02 endm + enum movement_turn_head_right turn_head_right: macro - db $03 + db movement_turn_head_right ; $03 endm + enum movement_half_step_down half_step_down: macro - db $04 + db movement_half_step_down ; $04 endm + enum movement_half_step_up half_step_up: macro - db $05 + db movement_half_step_up ; $05 endm + enum movement_half_step_left half_step_left: macro - db $06 + db movement_half_step_left ; $06 endm + enum movement_half_step_right half_step_right: macro - db $07 + db movement_half_step_right ; $07 endm + enum movement_slow_step_down slow_step_down: macro - db $08 + db movement_slow_step_down ; $08 endm + enum movement_slow_step_up slow_step_up: macro - db $09 + db movement_slow_step_up ; $09 endm + enum movement_slow_step_left slow_step_left: macro - db $0a + db movement_slow_step_left ; $0a endm + enum movement_slow_step_right slow_step_right: macro - db $0b + db movement_slow_step_right ; $0b endm + enum movement_step_down step_down: macro - db $0c + db movement_step_down ; $0c endm + enum movement_step_up step_up: macro - db $0d + db movement_step_up ; $0d endm + enum movement_step_left step_left: macro - db $0e + db movement_step_left ; $0e endm + enum movement_step_right step_right: macro - db $0f + db movement_step_right ; $0f endm + enum movement_big_step_down big_step_down: macro - db $10 + db movement_big_step_down ; $10 endm + enum movement_big_step_up big_step_up: macro - db $11 + db movement_big_step_up ; $11 endm + enum movement_big_step_left big_step_left: macro - db $12 + db movement_big_step_left ; $12 endm + enum movement_big_step_right big_step_right: macro - db $13 + db movement_big_step_right ; $13 endm + enum movement_slow_slide_step_down slow_slide_step_down: macro - db $14 + db movement_slow_slide_step_down ; $14 endm + enum movement_slow_slide_step_up slow_slide_step_up: macro - db $15 + db movement_slow_slide_step_up ; $15 endm + enum movement_slow_slide_step_left slow_slide_step_left: macro - db $16 + db movement_slow_slide_step_left ; $16 endm + enum movement_slow_slide_step_right slow_slide_step_right: macro - db $17 + db movement_slow_slide_step_right ; $17 endm + enum movement_slide_step_down slide_step_down: macro - db $18 + db movement_slide_step_down ; $18 endm + enum movement_slide_step_up slide_step_up: macro - db $19 + db movement_slide_step_up ; $19 endm + enum movement_slide_step_left slide_step_left: macro - db $1a + db movement_slide_step_left ; $1a endm + enum movement_slide_step_right slide_step_right: macro - db $1b + db movement_slide_step_right ; $1b endm + enum movement_fast_slide_step_down fast_slide_step_down: macro - db $1c + db movement_fast_slide_step_down ; $1c endm + enum movement_fast_slide_step_up fast_slide_step_up: macro - db $1d + db movement_fast_slide_step_up ; $1d endm + enum movement_fast_slide_step_left fast_slide_step_left: macro - db $1e + db movement_fast_slide_step_left ; $1e endm + enum movement_fast_slide_step_right fast_slide_step_right: macro - db $1f + db movement_fast_slide_step_right ; $1f endm + enum movement_turn_away_down turn_away_down: macro - db $20 + db movement_turn_away_down ; $20 endm + enum movement_turn_away_up turn_away_up: macro - db $21 + db movement_turn_away_up ; $21 endm + enum movement_turn_away_left turn_away_left: macro - db $22 + db movement_turn_away_left ; $22 endm + enum movement_turn_away_right turn_away_right: macro - db $23 + db movement_turn_away_right ; $23 endm + enum movement_turn_in_down turn_in_down: macro - db $24 + db movement_turn_in_down ; $24 endm + enum movement_turn_in_up turn_in_up: macro - db $25 + db movement_turn_in_up ; $25 endm + enum movement_turn_in_left turn_in_left: macro - db $26 + db movement_turn_in_left ; $26 endm + enum movement_turn_in_right turn_in_right: macro - db $27 + db movement_turn_in_right ; $27 endm + enum movement_turn_waterfall_down turn_waterfall_down: macro - db $28 + db movement_turn_waterfall_down ; $28 endm + enum movement_turn_waterfall_up turn_waterfall_up: macro - db $29 + db movement_turn_waterfall_up ; $29 endm + enum movement_turn_waterfall_left turn_waterfall_left: macro - db $2a + db movement_turn_waterfall_left ; $2a endm + enum movement_turn_waterfall_right turn_waterfall_right: macro - db $2b + db movement_turn_waterfall_right ; $2b endm + enum movement_slow_jump_step_down slow_jump_step_down: macro - db $2c + db movement_slow_jump_step_down ; $2c endm + enum movement_slow_jump_step_up slow_jump_step_up: macro - db $2d + db movement_slow_jump_step_up ; $2d endm + enum movement_slow_jump_step_left slow_jump_step_left: macro - db $2e + db movement_slow_jump_step_left ; $2e endm + enum movement_slow_jump_step_right slow_jump_step_right: macro - db $2f + db movement_slow_jump_step_right ; $2f endm + enum movement_jump_step_down jump_step_down: macro - db $30 + db movement_jump_step_down ; $30 endm + enum movement_jump_step_up jump_step_up: macro - db $31 + db movement_jump_step_up ; $31 endm + enum movement_jump_step_left jump_step_left: macro - db $32 + db movement_jump_step_left ; $32 endm + enum movement_jump_step_right jump_step_right: macro - db $33 + db movement_jump_step_right ; $33 endm + enum movement_fast_jump_step_down fast_jump_step_down: macro - db $34 + db movement_fast_jump_step_down ; $34 endm + enum movement_fast_jump_step_up fast_jump_step_up: macro - db $35 + db movement_fast_jump_step_up ; $35 endm + enum movement_fast_jump_step_left fast_jump_step_left: macro - db $36 + db movement_fast_jump_step_left ; $36 endm + enum movement_fast_jump_step_right fast_jump_step_right: macro - db $37 + db movement_fast_jump_step_right ; $37 endm +__enum__ = $3a + + enum movement_remove_fixed_facing remove_fixed_facing: macro - db $3a + db movement_remove_fixed_facing ; $3a endm + enum movement_fix_facing fix_facing: macro - db $3b + db movement_fix_facing ; $3b endm +__enum__ = $3d + + enum movement_hide_person hide_person: macro - db $3d + db movement_hide_person ; $3d endm + enum movement_show_person show_person: macro - db $3e + db movement_show_person ; $3e endm +__enum__ = $45 + + enum movement_accelerate_last accelerate_last: macro - db $45 + db movement_accelerate_last ; $45 endm + enum movement_step_sleep step_sleep: macro - db $46 + db movement_step_sleep ; $46 db \1 ; duration endm + enum movement_step_end step_end: macro - db $47 + db movement_step_end ; $47 endm +__enum__ = $49 + + enum movement_remove_person remove_person: macro - db $49 + db movement_remove_person ; $49 endm +__enum__ = $4c + + enum movement_teleport_from teleport_from: macro - db $4c + db movement_teleport_from ; $4c endm + enum movement_teleport_to teleport_to: macro - db $4d + db movement_teleport_to ; $4d endm + enum movement_skyfall skyfall: macro - db $4e + db movement_skyfall ; $4e endm + enum movement_step_wait5 step_wait5: macro - db $4f + db movement_step_wait5 ; $4f endm +__enum__ = $53 + + enum movement_hide_emote hide_emote: macro - db $53 + db movement_hide_emote ; $53 endm + enum movement_show_emote show_emote: macro - db $54 + db movement_show_emote ; $54 endm + enum movement_step_shake step_shake: macro - db $55 + db movement_step_shake ; $55 db \1 ; displacement endm -- cgit v1.2.3 From 894955f9d922de5fc33e6c0aa7af9795dbcbc158 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 Jul 2015 18:10:10 -0400 Subject: Special script annotation, trainer constant enumeration, person-event structure update --- macros/charmap.asm | 1 + 1 file changed, 1 insertion(+) (limited to 'macros') diff --git a/macros/charmap.asm b/macros/charmap.asm index b6344a1fa..bc5f16c4f 100644 --- a/macros/charmap.asm +++ b/macros/charmap.asm @@ -281,5 +281,6 @@ charmap "", $59 charmap "", $5a charmap "", $3f + charmap "", $4a charmap "", $14 ; + gender -- cgit v1.2.3 From e674869018ffe8f9be2351b2b569eb7300910e6a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 18 Jul 2015 15:46:38 -0400 Subject: Updated signpost items and person_event flags --- macros/trainer.asm | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 macros/trainer.asm (limited to 'macros') diff --git a/macros/trainer.asm b/macros/trainer.asm new file mode 100644 index 000000000..610de1c13 --- /dev/null +++ b/macros/trainer.asm @@ -0,0 +1,4 @@ +trainerclass: MACRO + enum \1 +const_value = 1 +ENDM -- cgit v1.2.3 From 60cd04b02300c288a01a2f78a44cb39cbe6861d1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 18 Jul 2015 23:45:39 -0400 Subject: Trainer data structure and field move functions Trainer data in map scripts is now a macro-defined structure. Field move functions in main.asm are now nearly completely annotated, with local references. Trailing white space deleted. --- macros/movement.asm | 18 ++++++++++++++++-- macros/trainer.asm | 7 +++++++ 2 files changed, 23 insertions(+), 2 deletions(-) (limited to 'macros') diff --git a/macros/movement.asm b/macros/movement.asm index 71eb01339..a647e4176 100644 --- a/macros/movement.asm +++ b/macros/movement.asm @@ -292,7 +292,11 @@ fix_facing: macro db movement_fix_facing ; $3b endm -__enum__ = $3d + enum movement_return_dig +return_dig: macro + db movement_return_dig + db \1 + endm enum movement_hide_person hide_person: macro @@ -351,7 +355,17 @@ step_wait5: macro db movement_step_wait5 ; $4f endm -__enum__ = $53 +__enum__ = $51 + + enum movement_fish_got_bite +fish_got_bite: macro + db movement_fish_got_bite + endm + + enum movement_fish_got_bite_2 +fish_got_bite_2: macro + db movement_fish_got_bite_2 + endm enum movement_hide_emote hide_emote: macro diff --git a/macros/trainer.asm b/macros/trainer.asm index 610de1c13..b7c8ad803 100644 --- a/macros/trainer.asm +++ b/macros/trainer.asm @@ -2,3 +2,10 @@ trainerclass: MACRO enum \1 const_value = 1 ENDM + +trainer: MACRO + ; flag, group, id, seen text, win text, lost text, talk-again text + dw \1 + db \2, \3 + dw \4, \5, \6, \7 +ENDM -- cgit v1.2.3 From bef792f2d21ccac0127aeffd9e0838aba81f44b6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 20 Jul 2015 03:51:52 -0400 Subject: More label updates, moved predefs to new file Also named most of the engine and event flag constants. --- macros/map.asm | 2 +- macros/predef.asm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'macros') diff --git a/macros/map.asm b/macros/map.asm index 570205517..17b1f5a65 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -67,7 +67,7 @@ warp_def: macro map_header: MACRO - ; label, tileset, permission, location, music, time of day, fishing group + ; label, tileset, permission, location, music, phone service flag, time of day, fishing group \1_MapHeader: db BANK(\1_SecondMapHeader), \2, \3 dw \1_SecondMapHeader diff --git a/macros/predef.asm b/macros/predef.asm index d6c0344e6..b99c6e1f2 100644 --- a/macros/predef.asm +++ b/macros/predef.asm @@ -1,7 +1,6 @@ add_predef: MACRO \1Predef:: - dw \1 - db BANK(\1) + dwb \1, BANK(\1) ENDM predef_id: MACRO -- cgit v1.2.3