From edf42a54d5b95780725e50605672fec29a9936f1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 7 Oct 2015 13:19:41 -0400 Subject: More labels, including fns responsible for partymon generation --- home/joypad.asm | 18 +++++++++--------- home/map.asm | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'home') diff --git a/home/joypad.asm b/home/joypad.asm index 78a1ac143..c07157376 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -354,12 +354,12 @@ Functiona57:: ; a57 ; a80 Functiona80:: ; a80 - ld a, [$ffaf] + ld a, [hConnectionStripLength] push af ld a, [$ffb0] push af xor a - ld [$ffaf], a + ld [hConnectionStripLength], a ld a, $6 ld [$ffb0], a .asm_a8d @@ -374,7 +374,7 @@ Functiona80:: ; a80 pop af ld [$ffb0], a pop af - ld [$ffaf], a + ld [hConnectionStripLength], a ret ; aa5 @@ -452,9 +452,9 @@ Functionb06:: ; b06 cp b pop bc jr nz, .asm_b27 - ld a, [$ffaf] + ld a, [hConnectionStripLength] dec a - ld [$ffaf], a + ld [hConnectionStripLength], a ret nz ld a, [$ffb0] dec a @@ -463,20 +463,20 @@ Functionb06:: ; b06 ld a, $7a ld [hl], a ld a, $ff - ld [$ffaf], a + ld [hConnectionStripLength], a ld a, $6 ld [$ffb0], a ret .asm_b27 - ld a, [$ffaf] + ld a, [hConnectionStripLength] and a ret z dec a - ld [$ffaf], a + ld [hConnectionStripLength], a ret nz dec a - ld [$ffaf], a + ld [hConnectionStripLength], a ld a, [$ffb0] dec a ld [$ffb0], a diff --git a/home/map.asm b/home/map.asm index 8dccf51a0..1deb6c3d2 100644 --- a/home/map.asm +++ b/home/map.asm @@ -207,10 +207,10 @@ endr Function222a:: ; 222a ld a, $fa - ld [$ff9f], a + ld [hMapEntryMethod], a callba RunMapSetupScript xor a - ld [$ff9f], a + ld [hMapEntryMethod], a ret ; 2238 -- cgit v1.2.3 From b68913a782baee1334e9614661c712ff27895e8e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 9 Oct 2015 23:09:03 -0400 Subject: More radio labels --- home/text.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'home') diff --git a/home/text.asm b/home/text.asm index fdbafec22..1ddc72ea5 100644 --- a/home/text.asm +++ b/home/text.asm @@ -273,7 +273,7 @@ endm dict $24, PlacePOKE dict $25, NextChar dict2 $1f, " " - dict $5f, Char5F + dict "", PlaceDexEnd dict "", PlaceMoveTargetsName dict "", PlaceMoveUsersName dict "", PlaceEnemysName @@ -590,7 +590,7 @@ ContText:: ; 1345 ; 1356 -Char5F:: ; 1356 +PlaceDexEnd:: ; 1356 ; Legacy: ends a Pokédex entry (Red). ; Dex entries are now regular strings. ld [hl], "." -- cgit v1.2.3 From 327faac497b4195dbf1d3c8dbfeb2adcda9deb27 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 11 Oct 2015 12:15:03 -0400 Subject: Magikarp functions moved to event/magikarp.asm --- home/joypad.asm | 4 ++-- home/text.asm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'home') diff --git a/home/joypad.asm b/home/joypad.asm index c07157376..aa7d092af 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -331,7 +331,7 @@ Functiona57:: ; a57 jr z, .asm_a63 ld a, [hJoyDown] .asm_a63 - ld [$ffa9], a + ld [hJoyLast], a ld a, [hJoyPressed] and a jr z, .asm_a70 @@ -344,7 +344,7 @@ Functiona57:: ; a57 and a jr z, .asm_a7a xor a - ld [$ffa9], a + ld [hJoyLast], a ret .asm_a7a diff --git a/home/text.asm b/home/text.asm index 1ddc72ea5..fa8d3b23f 100644 --- a/home/text.asm +++ b/home/text.asm @@ -972,7 +972,7 @@ Text_09:: ; 14d2 ld a, b and $f0 swap a - set 6, a + set PRINTNUM_RIGHTALIGN_F, a ld b, a call PrintNum ld b, h -- cgit v1.2.3 From 88bc86b0bba2e789955d644fd26ae5b57bc85880 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 13 Oct 2015 12:46:40 -0400 Subject: Replace Functionfb8 with FillBoxWithByte --- home/text.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'home') diff --git a/home/text.asm b/home/text.asm index fa8d3b23f..79f85d38b 100644 --- a/home/text.asm +++ b/home/text.asm @@ -16,7 +16,7 @@ ClearBox:: ; fb6 ld a, " " -Functionfb8:: +FillBoxWithByte:: .col push bc push hl -- cgit v1.2.3