diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-14 00:36:24 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-14 00:36:24 -0500 |
| commit | e48a401290e794854880f06fc230a369f37e6b9b (patch) | |
| tree | dcad6cd5d1a7e62a2f2a92522c5619d41dc416cf /home | |
| parent | 8745915dbd38e9647e0b27d20cb73da0fdde353f (diff) | |
Reorganize macros
Diffstat (limited to 'home')
| -rw-r--r-- | home/hm_moves.asm | 17 | ||||
| -rw-r--r-- | home/text.asm | 7 | ||||
| -rw-r--r-- | home/time.asm | 3 |
3 files changed, 19 insertions, 8 deletions
diff --git a/home/hm_moves.asm b/home/hm_moves.asm new file mode 100644 index 000000000..082005186 --- /dev/null +++ b/home/hm_moves.asm @@ -0,0 +1,17 @@ +; HM moves can't be forgotten + +IsHMMove:: ; 34e7 + ld hl, .HMMoves + ld de, 1 + jp IsInArray + +.HMMoves: ; 34f0 + db CUT + db FLY + db SURF + db STRENGTH + db FLASH + db WATERFALL + db WHIRLPOOL + db -1 ; end +; 34f8 diff --git a/home/text.asm b/home/text.asm index a70424048..c78a9c0be 100644 --- a/home/text.asm +++ b/home/text.asm @@ -8,9 +8,6 @@ TEXTBOX_INNERX EQU TEXTBOX_X + 1 TEXTBOX_Y EQU SCREEN_HEIGHT - TEXTBOX_HEIGHT TEXTBOX_INNERY EQU TEXTBOX_Y + 2 -TEXTBOX_PAL EQU 7 - - ClearBox:: ; fb6 ; Fill a c*b box at hl with blank tiles. @@ -51,7 +48,7 @@ ClearTileMap:: ; fc8 ClearScreen:: ; fdb - ld a, TEXTBOX_PAL + ld a, PAL_BG_TEXT hlcoord 0, 0, AttrMap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill @@ -133,7 +130,7 @@ TextBoxPalette:: ; 1024 inc b inc c inc c - ld a, TEXTBOX_PAL + ld a, PAL_BG_TEXT .col push bc push hl diff --git a/home/time.asm b/home/time.asm index 338168752..abdd34fe2 100644 --- a/home/time.asm +++ b/home/time.asm @@ -49,19 +49,16 @@ GetClock:: ; 5b7 ld [hl], RTC_S ld a, [de] maskbits 60 - and x ld [hRTCSeconds], a ld [hl], RTC_M ld a, [de] maskbits 60 - and x ld [hRTCMinutes], a ld [hl], RTC_H ld a, [de] maskbits 24 - and x ld [hRTCHours], a ld [hl], RTC_DL |