From 3713b71d9e3f3f1bc099d4704910cb9c1d172dcf Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Wed, 4 May 2016 11:46:23 -0400 Subject: More splitting of main.asm; remove unneeded rept 2 --- items/item_descriptions.asm | 3 +-- items/item_effects.asm | 24 ++++++++---------------- 2 files changed, 9 insertions(+), 18 deletions(-) (limited to 'items') diff --git a/items/item_descriptions.asm b/items/item_descriptions.asm index 7ff574d11..40e91b2c9 100644 --- a/items/item_descriptions.asm +++ b/items/item_descriptions.asm @@ -21,9 +21,8 @@ PrintItemDescription: ; 0x1c8955 dec a ld c, a ld b, 0 -rept 2 add hl, bc -endr + add hl, bc ld e, [hl] inc hl ld d, [hl] diff --git a/items/item_effects.asm b/items/item_effects.asm index ef05de8fd..7fde473ab 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -253,9 +253,8 @@ ParkBall: ; e8a2 jr z, .skip_or_return_from_ball_fn cp c jr z, .call_ball_function -rept 2 inc hl -endr + inc hl jr .get_multiplier_loop .call_ball_function @@ -288,9 +287,8 @@ endr ld h, d ld l, e -rept 2 add hl, de -endr + add hl, de ld d, h ld e, l ld a, d @@ -805,9 +803,8 @@ HeavyBallMultiplier: dec a ld e, a ld d, 0 -rept 2 add hl, de -endr + add hl, de ld a, BANK(PokedexDataPointerTable) call GetFarHalfword @@ -820,9 +817,8 @@ endr call GetPokedexEntryBank push bc -rept 2 inc hl -endr + inc hl call GetFarHalfword srl h @@ -868,9 +864,8 @@ endr ld a, c cp [hl] jr c, .heavymon -rept 2 inc hl -endr + inc hl jr .lookup .heavymon @@ -929,9 +924,8 @@ GLOBAL EvosAttacksPointers ld c, a ld b, 0 ld hl, EvosAttacksPointers -rept 2 add hl, bc -endr + add hl, bc ld a, BANK(EvosAttacksPointers) call GetFarHalfword pop bc @@ -2127,9 +2121,8 @@ GetHealingItemAmount: ; f395 (3:7395) jr z, .NotFound cp d jr z, .done -rept 2 inc hl -endr + inc hl jr .next .NotFound: @@ -2335,9 +2328,8 @@ XSpecial: ; f4c5 .loop cp [hl] jr z, .got_it -rept 2 inc hl -endr + inc hl jr .loop .got_it -- cgit v1.2.3 From ae36ef2c7fb722b7480d73c7a95a5d1e2ece7831 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 10 May 2016 12:31:49 -0400 Subject: Labeled every function in ROM0 that's referenced in the source --- items/item_effects.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'items') diff --git a/items/item_effects.asm b/items/item_effects.asm index 7fde473ab..6f58524d6 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -937,9 +937,9 @@ GLOBAL EvosAttacksPointers pop bc ret nz -rept 3 inc hl -endr + inc hl + inc hl ; Moon Stone's constant from Pokémon Red is used. ; No Pokémon evolve with Burn Heal, -- cgit v1.2.3 From af0119ca7e73c21205b5bb89bb9361db9aafa15f Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Wed, 11 May 2016 17:16:03 -0400 Subject: Name all printer functions --- items/item_effects.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'items') diff --git a/items/item_effects.asm b/items/item_effects.asm index 6f58524d6..b9bca17b4 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -3242,11 +3242,11 @@ GetMaxPPOfMove: ; f8ec ld hl, TempMonMoves ; Wasted cycles dec a - jr z, .got_nonpartymon ; BREEDMON + jr z, .got_nonpartymon ; TEMPMON ld hl, BattleMonMoves ; WILDMON -.got_nonpartymon ; BOXMON, BREEDMON, WILDMON +.got_nonpartymon ; BOXMON, TEMPMON, WILDMON call GetMthMoveOfCurrentMon jr .gotdatmove -- cgit v1.2.3 From a5f5418faeb2ded9ddd898851ea0716e2d6ecf09 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 14 May 2016 16:37:12 -0400 Subject: Rename FixedWords to EZChat --- items/item_effects.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'items') diff --git a/items/item_effects.asm b/items/item_effects.asm index b9bca17b4..b2ec6d0be 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -2480,20 +2480,20 @@ CoinCase: ; f59a OldRod: ; f5a5 ld e, $0 - jr Function_0xf5b1 + jr UseRod ; f5a9 GoodRod: ; f5a9 ld e, $1 - jr Function_0xf5b1 + jr UseRod ; f5ad SuperRod: ; f5ad ld e, $2 - jr Function_0xf5b1 + jr UseRod ; f5b1 -Function_0xf5b1: ; f5b1 +UseRod: ; f5b1 callba FishFunction ret ; f5b8 -- cgit v1.2.3 From 789ebc73042e07b5e50b3cc3c17ebd1df141f000 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 10:41:59 -0400 Subject: Port homecall macro --- items/item_effects.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'items') diff --git a/items/item_effects.asm b/items/item_effects.asm index b2ec6d0be..21707e3e3 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -2929,7 +2929,7 @@ Play_SFX_FULL_HEAL: ; f780 ret ; f789 -UseItemText ; f789 +UseItemText: ; f789 ld hl, UsedItemText call PrintText call Play_SFX_FULL_HEAL -- cgit v1.2.3 From ca01a92880a5d71bce2bec6caa7714c8e1cf0f17 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 7 Jun 2016 08:13:08 -0400 Subject: Fix indentation in many places --- items/item_effects.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'items') diff --git a/items/item_effects.asm b/items/item_effects.asm index 21707e3e3..3c2dc2457 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -2515,7 +2515,7 @@ Mysteryberry: ; f5bf ld [wd002], a .loop - ; Party Screen opens to choose on which Pkmn to use the Item + ; Party Screen opens to choose on which Pkmn to use the Item ld b, PARTYMENUACTION_HEALING_ITEM call UseItem_SelectMon jp c, PPRestoreItem_Cancel -- cgit v1.2.3