Reorganize macros

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

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

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