diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-29 20:52:05 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-29 20:52:05 -0400 |
| commit | b8cced19fce2a212f5cb205039382a63821a3762 (patch) | |
| tree | 6a01fb5bbe4e6558a25db77c76cf357e846e7590 /constants | |
| parent | Mt Moon B2F (diff) | |
| download | pokeyellow-b8cced19fce2a212f5cb205039382a63821a3762.tar.gz pokeyellow-b8cced19fce2a212f5cb205039382a63821a3762.tar.xz pokeyellow-b8cced19fce2a212f5cb205039382a63821a3762.zip | |
Mt Moon B2F
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/event_macros.asm | 32 | ||||
| -rwxr-xr-x | constants/hide_show_constants.asm | 34 |
2 files changed, 48 insertions, 18 deletions
diff --git a/constants/event_macros.asm b/constants/event_macros.asm index 5eb73147..bf0a95b5 100644 --- a/constants/event_macros.asm +++ b/constants/event_macros.asm @@ -452,6 +452,36 @@ CheckEitherEventSet: MACRO ENDC ENDM +CheckEitherEventSetReuseA: MACRO + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld a, [wEventFlags + event_byte] + ENDC + IF ((\1) / 8) == ((\2) / 8) + ld a, [wEventFlags + ((\1) / 8)] + and (1 << ((\1) % 8)) | (1 << ((\2) % 8)) + ELSE + ; This case doesn't happen in the original ROM. + IF ((\1) % 8) == ((\2) % 8) + push hl + ld a, [wEventFlags + ((\1) / 8)] + ld hl, wEventFlags + ((\2) / 8) + or [hl] + bit ((\1) % 8), a + pop hl + ELSE + push bc + ld a, [wEventFlags + ((\1) / 8)] + and (1 << ((\1) % 8)) + ld b, a + ld a, [wEventFlags + ((\2) / 8)] + and (1 << ((\2) % 8)) + or b + pop bc + ENDC + ENDC + ENDM + ; for handling fixed event bits when events are inserted/removed ;\1 = event index ;\2 = fixed flag bit @@ -459,4 +489,4 @@ AdjustEventBit: MACRO IF ((\1) % 8) != (\2) add ((\1) % 8) - (\2) ENDC - ENDM
\ No newline at end of file + ENDM diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index ffc4ea08..6fc52187 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -114,27 +114,27 @@ const_value SET $43 ; replace the tower rockets with jessie/james const HS_VIRIDIAN_FOREST_ITEM_1 ; 64 X const HS_VIRIDIAN_FOREST_ITEM_2 ; 65 X const HS_VIRIDIAN_FOREST_ITEM_3 ; 66 X - const HS_MT_MOON_1_ITEM_1 ; 67 X - const HS_MT_MOON_1_ITEM_2 ; 68 X + const HS_MT_MOON_1_ITEM_1 ; 67 + const HS_MT_MOON_1_ITEM_2 ; 68 const HS_MT_MOON_1_ITEM_3 ; 69 X const HS_MT_MOON_1_ITEM_4 ; 6A X const HS_MT_MOON_1_ITEM_5 ; 6B X const HS_MT_MOON_1_ITEM_6 ; 6C X - const HS_MT_MOON_3_FOSSIL_1 ; 6D - const HS_MT_MOON_3_FOSSIL_2 ; 6E - const HS_MT_MOON_3_ITEM_1 ; 6F X - const HS_MT_MOON_3_ITEM_2 ; 70 X - const HS_SS_ANNE_2_RIVAL ; 71 - const HS_SS_ANNE_8_ITEM ; 72 X - const HS_SS_ANNE_9_ITEM_1 ; 73 X - const HS_SS_ANNE_9_ITEM_2 ; 74 X - const HS_SS_ANNE_10_ITEM_1 ; 75 X - const HS_SS_ANNE_10_ITEM_2 ; 76 X - const HS_SS_ANNE_10_ITEM_3 ; 77 X - const HS_VICTORY_ROAD_3_ITEM_1 ; 78 X - const HS_VICTORY_ROAD_3_ITEM_2 ; 79 X - -const_value SET $7c ; idk anymore lol + const HS_MT_MOON_JESSIE ; 6D + const HS_MT_MOON_JAMES ; 6E + const HS_MT_MOON_3_FOSSIL_1 ; 6F X + const HS_MT_MOON_3_FOSSIL_2 ; 70 X + const HS_MT_MOON_3_ITEM_1 ; 71 + const HS_MT_MOON_3_ITEM_2 ; 72 X + const HS_SS_ANNE_2_RIVAL ; 73 X + const HS_SS_ANNE_8_ITEM ; 74 X + const HS_SS_ANNE_9_ITEM_1 ; 75 X + const HS_SS_ANNE_9_ITEM_2 ; 76 X + const HS_SS_ANNE_10_ITEM_1 ; 77 X + const HS_SS_ANNE_10_ITEM_2 ; 78 X + const HS_SS_ANNE_10_ITEM_3 ; 79 X + const HS_VICTORY_ROAD_3_ITEM_1 ; 7A + const HS_VICTORY_ROAD_3_ITEM_2 ; 7B const HS_VICTORY_ROAD_3_BOULDER ; 7C X const HS_ROCKET_HIDEOUT_1_ITEM_1 ; 7D X const HS_ROCKET_HIDEOUT_1_ITEM_2 ; 7E X |