summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-05-23 11:08:23 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-05-23 11:08:23 -0400
commitd2880d1981876b06bc867ae17376e31f2d4df60d (patch)
treeea7fb05c55bd1f3d6f3f44811fcff935b11a99ee
parentad5337863ddbb7b821f57a0c8af2c767cc767f19 (diff)
Factor out GetHPPals and SetHPPals from home.asm
The remaining code in home.asm is almost all "generic", unrelated to Pokémon-specific game logic, so leaving it as-is might be neater than little home/*.asm files for each routine.
-rw-r--r--home.asm21
-rw-r--r--home/hp_pals.asm19
2 files changed, 20 insertions, 20 deletions
diff --git a/home.asm b/home.asm
index 1963e2f6a..9aaa50098 100644
--- a/home.asm
+++ b/home.asm
@@ -227,26 +227,7 @@ CompareLong:: ; 31e4
; 31f3
INCLUDE "home/tilemap.asm"
-
-SetHPPal:: ; 334e
-; Set palette for hp bar pixel length e at hl.
- call GetHPPal
- ld [hl], d
- ret
-; 3353
-
-GetHPPal:: ; 3353
-; Get palette for hp bar pixel length e in d.
- ld d, HP_GREEN
- ld a, e
- cp (50 * 48 / 100)
- ret nc
- inc d ; HP_YELLOW
- cp (21 * 48 / 100)
- ret nc
- inc d ; HP_RED
- ret
-; 335f
+INCLUDE "home/hp_pals.asm"
CountSetBits:: ; 0x335f
; Count the number of set bits in b bytes starting from hl.
diff --git a/home/hp_pals.asm b/home/hp_pals.asm
new file mode 100644
index 000000000..527ec860e
--- /dev/null
+++ b/home/hp_pals.asm
@@ -0,0 +1,19 @@
+SetHPPal:: ; 334e
+; Set palette for hp bar pixel length e at hl.
+ call GetHPPal
+ ld [hl], d
+ ret
+; 3353
+
+GetHPPal:: ; 3353
+; Get palette for hp bar pixel length e in d.
+ ld d, HP_GREEN
+ ld a, e
+ cp (50 * 48 / 100)
+ ret nc
+ inc d ; HP_YELLOW
+ cp (21 * 48 / 100)
+ ret nc
+ inc d ; HP_RED
+ ret
+; 335f