diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-22 13:57:44 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-22 13:57:44 -0500 |
| commit | 125d51b3b2e91230b693406de153e172f752bf41 (patch) | |
| tree | 5bdf61368cb51635f5f1691b731d4fa6cedea450 /data | |
| parent | f75bfbeac3aa826e1f402a649fa1389e889b5af9 (diff) | |
More engine bit flag constants
Diffstat (limited to 'data')
| -rw-r--r-- | data/engine_flags.asm | 20 | ||||
| -rw-r--r-- | data/wild/unlocked_unowns.asm | 36 |
2 files changed, 30 insertions, 26 deletions
diff --git a/data/engine_flags.asm b/data/engine_flags.asm index f75b050c6..8ad4fb4a3 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -19,8 +19,8 @@ EngineFlags: ; 80462 engine_flag wDayCareMan, DAYCAREMAN_HAS_MON_F engine_flag wDayCareLady, DAYCARELADY_HAS_MON_F - engine_flag wMomSavingMoney, 0 ; mom saving money ; $8 - engine_flag wMomSavingMoney, 7 ; dst + engine_flag wMomSavingMoney, MOM_SAVING_SOME_MONEY_F ; $8 + engine_flag wMomSavingMoney, MOM_ACTIVE_F engine_flag wUnusedTwoDayTimerOn, 0 ; unused, possibly related to a 2-day timer @@ -38,9 +38,9 @@ EngineFlags: ; 80462 engine_flag wStatusFlags2, 6 ; berry -> berry juice when trading? engine_flag wStatusFlags2, 7 ; rockets in mahogany - engine_flag wBikeFlags, 0 ; strength active ; $18 - engine_flag wBikeFlags, 1 ; always on bike (cant surf) - engine_flag wBikeFlags, 2 ; downhill (cycling road) + engine_flag wBikeFlags, BIKEFLAGS_STRENGTH_ACTIVE_F ; $18 + engine_flag wBikeFlags, BIKEFLAGS_ALWAYS_ON_BIKE_F + engine_flag wBikeFlags, BIKEFLAGS_DOWNHILL_F engine_flag wJohtoBadges, ZEPHYRBADGE engine_flag wJohtoBadges, HIVEBADGE @@ -60,15 +60,15 @@ EngineFlags: ; 80462 engine_flag wKantoBadges, VOLCANOBADGE engine_flag wKantoBadges, EARTHBADGE - ; unown sets + ; unown sets (see data/wild/unlocked_unowns.asm) engine_flag wUnlockedUnowns, 0 ; A-K engine_flag wUnlockedUnowns, 1 ; L-R engine_flag wUnlockedUnowns, 2 ; S-W engine_flag wUnlockedUnowns, 3 ; X-Z - engine_flag wUnlockedUnowns, 4 ; unused 5 - engine_flag wUnlockedUnowns, 5 ; unused 6 ; $30 - engine_flag wUnlockedUnowns, 6 ; unused 7 - engine_flag wUnlockedUnowns, 7 ; unused 8 + engine_flag wUnlockedUnowns, 4 ; unused + engine_flag wUnlockedUnowns, 5 ; unused ; $30 + engine_flag wUnlockedUnowns, 6 ; unused + engine_flag wUnlockedUnowns, 7 ; unused ; fly engine_flag wVisitedSpawns, SPAWN_HOME diff --git a/data/wild/unlocked_unowns.asm b/data/wild/unlocked_unowns.asm index 71b639036..d09064c4b 100644 --- a/data/wild/unlocked_unowns.asm +++ b/data/wild/unlocked_unowns.asm @@ -1,20 +1,24 @@ +unown_set: MACRO +rept _NARG + db UNOWN_\1 + shift +endr + db -1 +ENDM + UnlockedUnownLetterSets: ; entries correspond to wUnlockedUnowns bits - dw .Set1 ; ENGINE_UNLOCKED_UNOWNS_A_TO_K - dw .Set2 ; ENGINE_UNLOCKED_UNOWNS_L_TO_R - dw .Set3 ; ENGINE_UNLOCKED_UNOWNS_S_TO_W - dw .Set4 ; ENGINE_UNLOCKED_UNOWNS_X_TO_Z + dw .Set_A_K ; ENGINE_UNLOCKED_UNOWNS_A_TO_K + dw .Set_L_R ; ENGINE_UNLOCKED_UNOWNS_L_TO_R + dw .Set_S_W ; ENGINE_UNLOCKED_UNOWNS_S_TO_W + dw .Set_X_Z ; ENGINE_UNLOCKED_UNOWNS_X_TO_Z .End -.Set1: - ; A B C D E F G H I J K - db 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, -1 -.Set2: - ; L M N O P Q R - db 12, 13, 14, 15, 16, 17, 18, -1 -.Set3: - ; S T U V W - db 19, 20, 21, 22, 23, -1 -.Set4: - ; X Y Z - db 24, 25, 26, -1 +.Set_A_K: + unown_set A, B, C, D, E, F, G, H, I, J, K +.Set_L_R: + unown_set L, M, N, O, P, Q, R +.Set_S_W: + unown_set S, T, U, V, W +.Set_X_Z: + unown_set X, Y, Z |