From 5be98bae3c3c27b4b57bb8fda9368cf6c7f0d473 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 15:20:32 -0500 Subject: Move more data tables into data/ files. --- home.asm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'home.asm') diff --git a/home.asm b/home.asm index 4686ed4b1..7e2cc786f 100644 --- a/home.asm +++ b/home.asm @@ -1041,14 +1041,7 @@ IsHMMove:: ; 34e7 jp IsInArray .HMMoves: - db CUT - db FLY - db SURF - db STRENGTH - db FLASH - db WATERFALL - db WHIRLPOOL - db -1 +INCLUDE "data/hm_moves.asm" ; 34f8 GetMoveName:: ; 34f8 -- cgit v1.2.3 From 4afc2f01ef96e6e94f3171c1c6bac84e70596854 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 17:35:35 -0500 Subject: Add member constants for the base data struct, same as most other structs --- home.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'home.asm') diff --git a/home.asm b/home.asm index 7e2cc786f..b2e96b160 100644 --- a/home.asm +++ b/home.asm @@ -1704,11 +1704,11 @@ GetBaseData:: ; 3856 ; Get BaseData dec a - ld bc, BaseData1 - BaseData0 + ld bc, BASE_DATA_SIZE ld hl, BaseData call AddNTimes ld de, CurBaseData - ld bc, BaseData1 - BaseData0 + ld bc, BASE_DATA_SIZE call CopyBytes jr .end @@ -1881,8 +1881,8 @@ Function392d:: ; 392d dec a ld b, 0 add hl, bc - ld hl, BaseData + 0 - ld bc, BaseData1 - BaseData0 + ld hl, BaseData + BASE_DEX_NO + ld bc, BASE_DATA_SIZE call AddNTimes ld a, BANK(BaseData) call GetFarHalfword -- cgit v1.2.3 From f1f84743f7759a0f808f935add82439ba6637d2b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 22:44:25 -0500 Subject: Keep table labels in the same files as their contents. --- home.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'home.asm') diff --git a/home.asm b/home.asm index b2e96b160..670f63f95 100644 --- a/home.asm +++ b/home.asm @@ -1036,13 +1036,13 @@ IsHM:: ; 34df ; 34e7 IsHMMove:: ; 34e7 - ld hl, .HMMoves + ld hl, HMMoves ld de, 1 jp IsInArray -.HMMoves: + INCLUDE "data/hm_moves.asm" -; 34f8 + GetMoveName:: ; 34f8 push hl -- cgit v1.2.3