Commit a898e08e authored by nanahira's avatar nanahira Committed by GitHub

fix merging thing

parent 632d741b
...@@ -268,7 +268,7 @@ public: ...@@ -268,7 +268,7 @@ public:
int32 is_status(uint32 status); int32 is_status(uint32 status);
uint32 get_column_zone(int32 location); uint32 get_column_zone(int32 location);
void get_column_cards(card_set* cset); void get_column_cards(card_set* cset);
int32 is_all_column();k int32 is_all_column();
uint8 get_select_sequence(uint8 *deck_seq_pointer); uint8 get_select_sequence(uint8 *deck_seq_pointer);
uint32 get_select_info_location(uint8 *deck_seq_pointer); uint32 get_select_info_location(uint8 *deck_seq_pointer);
int32 is_treated_as_not_on_field(); int32 is_treated_as_not_on_field();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment