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. --- engine/link.asm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'engine/link.asm') diff --git a/engine/link.asm b/engine/link.asm index ab3d38968..1aac20489 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -1130,22 +1130,7 @@ TimeCapsule_ReplaceTeruSama: ; 28771 ret .TimeCapsuleAlt: ; 28785 -; Pokémon traded from RBY do not have held items, so GSC usually interprets the -; catch rate as an item. However, if the catch rate appears in this table, the -; item associated with the table entry is used instead. - db ITEM_19, LEFTOVERS - db ITEM_2D, BITTER_BERRY - db ITEM_32, GOLD_BERRY - db ITEM_5A, BERRY - db ITEM_64, BERRY - db ITEM_78, BERRY - db ITEM_87, BERRY - db ITEM_BE, BERRY - db ITEM_C3, BERRY - db ITEM_DC, BERRY - db ITEM_FA, BERRY - db -1, BERRY - db 0 +INCLUDE "data/time_capsule/catch_rate_items.asm" ; 2879e Link_CopyOTData: ; 2879e -- 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 --- engine/link.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/link.asm') diff --git a/engine/link.asm b/engine/link.asm index 1aac20489..f7e0b2ad4 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -737,8 +737,8 @@ Link_PrepPartyData_Gen1: ; 28499 .skip_steel push bc dec a - ld hl, BaseData + 7 ; type - ld bc, BaseData1 - BaseData0 + ld hl, BaseData + BASE_TYPES + ld bc, BASE_DATA_SIZE call AddNTimes ld bc, 2 ld a, BANK(BaseData) -- cgit v1.2.3 From 2d644f5077fa9ec43009ea5ec072e6ade9a1f61b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 18:04:23 -0500 Subject: Name some gfx/unknown/ files --- engine/link.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/link.asm') diff --git a/engine/link.asm b/engine/link.asm index f7e0b2ad4..b57e49e1e 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -2579,5 +2579,5 @@ Special_CableClubCheckWhichChris: ; 29f47 GFX_29f54: ; 29f54 ; unreferenced -INCBIN "gfx/unknown/029f54.2bpp" +INCBIN "gfx/unknown/unused_border.2bpp" ; 29fe4 -- cgit v1.2.3 From 213dcc70d77ade7cf587d57016cc5bb405494fe8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 22:59:30 -0500 Subject: More consistent data tables --- engine/link.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/link.asm') diff --git a/engine/link.asm b/engine/link.asm index b57e49e1e..7bca8b891 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -1112,7 +1112,7 @@ TimeCapsule_ReplaceTeruSama: ; 28771 and a ret z push hl - ld hl, .TimeCapsuleAlt + ld hl, TimeCapsule_CatchRateItems .loop ld a, [hli] and a @@ -1129,9 +1129,9 @@ TimeCapsule_ReplaceTeruSama: ; 28771 pop hl ret -.TimeCapsuleAlt: ; 28785 + INCLUDE "data/time_capsule/catch_rate_items.asm" -; 2879e + Link_CopyOTData: ; 2879e .loop -- cgit v1.2.3