diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/event_constants.asm | 2 | ||||
| -rw-r--r-- | constants/event_macros.asm | 10 | ||||
| -rwxr-xr-x | constants/hide_show_constants.asm | 3 | ||||
| -rw-r--r-- | constants/music_constants.asm | 3 | ||||
| -rw-r--r-- | constants/pikachu_emotion_constants.asm | 4 | ||||
| -rwxr-xr-x | constants/sprite_constants.asm | 2 |
6 files changed, 21 insertions, 3 deletions
diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 5b379fae..d2bf1123 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -2560,3 +2560,5 @@ const_value = 0 const EVENT_9FD ; 9FD, (D886, bit 5) const EVENT_9FE ; 9FE, (D886, bit 6) const EVENT_9FF ; 9FF, (D886, bit 7) + +NUM_EVENT_FLAGS EQU const_value diff --git a/constants/event_macros.asm b/constants/event_macros.asm index bf0a95b5..a3ce9746 100644 --- a/constants/event_macros.asm +++ b/constants/event_macros.asm @@ -57,6 +57,16 @@ event_byte = ((\2) / 8) ld \1, wEventFlags + event_byte ENDM +EventFlagAddressa: MACRO +event_byte = ((\1) / 8) + ld [wEventFlags + event_byte], a + ENDM + +aEventFlagAddress: MACRO +event_byte = ((\1) / 8) + ld a, [wEventFlags + event_byte] + ENDM + ;\1 = event index CheckEventHL: MACRO event_byte = ((\1) / 8) diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 10cffac8..fb4116d7 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -240,3 +240,6 @@ const HS_SEAFOAM_ISLANDS_5_BOULDER_1 ; E9 const HS_SEAFOAM_ISLANDS_5_BOULDER_2 ; EA const HS_ARTICUNO ; EB + const HS_DAISY_SITTING_COPY ; EC + const HS_DAISY_WALKING_COPY ; ED + const HS_TOWN_MAP_COPY ; EE diff --git a/constants/music_constants.asm b/constants/music_constants.asm index c0ff2b8b..71ff1aba 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -276,9 +276,10 @@ ENDM music_const SFX_SHOOTING_STAR, SFX_Shooting_Star ; AUDIO_4 + music_const SFX_UNKNOWN_801B0_4, SFX_801b0_4 music_const SFX_UNKNOWN_801B3_4, SFX_801b3_4 music_const SFX_UNKNOWN_801B6_4, SFX_801b6_4 music_const SFX_UNKNOWN_801B9_4, SFX_801b9_4 music_const SFX_UNKNOWN_801BC_4, SFX_801bc_4 music_const SFX_UNKNOWN_801BF_4, SFX_801bf_4 - music_const SFX_UNKNOWN_GET_ITEM2_4_2, SFX_Get_Item2_4_2 + music_const SFX_GET_ITEM2_4_2, SFX_Get_Item2_4_2 diff --git a/constants/pikachu_emotion_constants.asm b/constants/pikachu_emotion_constants.asm index 13033857..c34a08f7 100644 --- a/constants/pikachu_emotion_constants.asm +++ b/constants/pikachu_emotion_constants.asm @@ -47,12 +47,12 @@ pikaemotion_emotebubble: MACRO db \1 ENDM -pikaemotion_4: MACRO +pikaemotion_movement: MACRO db PIKAEMOTION_4 dw \1 ENDM -pikaemotion_5: MACRO +pikaemotion_pikapic: MACRO db PIKAEMOTION_5 db \1 ENDM diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index ae0c9dfa..3349e374 100755 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -85,6 +85,8 @@ const_value = 1 const SPRITE_CHANSEY ; $44 const SPRITE_JESSIE ; $45 const SPRITE_JAMES ; $46 + + ; 4-tile sprites const SPRITE_BALL ; $47 const SPRITE_OMANYTE ; $48 const SPRITE_BOULDER ; $49 |