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 --- misc/mobile_40.asm | 4 ++-- misc/mobile_5f.asm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'misc') diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index fa3490f82..3fcd0969a 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -407,10 +407,10 @@ Function1002c9: ; 1002c9 Function1002dc: ; 1002dc ld a, $f8 - ld [$ff9f], a + ld [hMapEntryMethod], a callba RunMapSetupScript xor a - ld [$ff9f], a + ld [hMapEntryMethod], a call Functione51 ret ; 1002ed diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 9c38fbb27..eb9231a18 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -2359,7 +2359,7 @@ Function17ded9: ; 17ded9 ld [MonType], a push hl push bc - predef Functiond88c + predef TryAddMonToParty callba Function4db49 pop bc pop hl -- cgit v1.2.3 From d42330ed8b591db79c43ef680edc5965d6a7b14b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 10 Oct 2015 17:03:04 -0400 Subject: Annotation of PrintNum arguments in bc, and radio functions --- misc/mobile_40.asm | 4 ++-- misc/mobile_42.asm | 4 ++-- misc/mobile_45.asm | 4 ++-- misc/mobile_5f.asm | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'misc') diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 3fcd0969a..f60ce3bd1 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -1097,7 +1097,7 @@ Function100697: ; 100697 ret .asm_1006b4 - ld bc, $8102 + lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum ret @@ -1484,7 +1484,7 @@ Function100902: ; 100902 hlcoord 4, 11 call PlaceString hlcoord 8, 11 - ld bc, $0102 + lb bc, 1, 2 ld de, StringBuffer2 call PrintNum ld de, SFX_TWO_PC_BEEPS diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index b12fb29b3..a66e375ea 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -1343,7 +1343,7 @@ Function108a87: ; 108a87 Function108a92: ; 108a92 hlcoord 9, 0 - ld bc, $8103 + lb bc, PRINTNUM_LEADINGZEROS | 1, 3 call PrintNum ret ; 108a9c @@ -1380,7 +1380,7 @@ Unknown_108abb: ; 108abb Function108abe: ; 108abe hlcoord 8, 6 - ld bc, $8205 + lb bc, PRINTNUM_LEADINGZEROS | 2, 5 call PrintNum ret ; 108ac8 diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 7ae4f8327..25d753edc 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -13368,11 +13368,11 @@ Function11a302: ; 11a302 call PlaceString hlcoord 9, 4 ld de, wcd68 - ld bc, $8102 + lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum hlcoord 14, 4 ld de, wcd67 - ld bc, $8102 + lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum ld a, $80 ld [wcd44], a diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index eb9231a18..e56cd83e5 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -5347,7 +5347,7 @@ Function17ff3c: ; 17ff3c ld [wc300], a hlcoord 14, 2 ld de, wc300 - ld bc, $8103 + lb bc, PRINTNUM_LEADINGZEROS | 1, 3 call PrintNum pop af ld [wc300], a -- 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 --- misc/mobile_40.asm | 2 +- misc/mobile_5f.asm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'misc') diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index f60ce3bd1..3e000c054 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -1843,7 +1843,7 @@ Function100b9f: ; 100b9f callba Function3e786 ret z call Function100dd8 - jp c, Function2ec8 + jp c, xor_a_dec_a call Function100e72 call Function100bc2 push af diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index e56cd83e5..d722a59d4 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -4359,9 +4359,9 @@ Function17f382: ; 17f382 ld de, $b2f4 .asm_17f3ab - ld a, $82 + ld a, PRINTNUM_LEADINGZEROS | 2 ld b, a - ld a, $3 + ld a, 3 ld c, a call PrintNum call CloseSRAM -- cgit v1.2.3 From 8c2766e1b955b6b23a78d014340f51a281b2a114 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 13 Oct 2015 11:37:10 -0400 Subject: ldtile and dwtile macros added and globally implemented --- misc/mobile_45.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'misc') diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 25d753edc..7b4e8ca90 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -8345,7 +8345,7 @@ Function117bb6: ld a, [wd001] cp $f jr nz, .asm_117c16 ; 0x117c01 $13 - ld hl, wdfec + ld hl, wMagikarpRecordHoldersName + 2 ld de, wcd69 ld c, $10 .asm_117c0b -- 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 --- misc/mobile_40.asm | 2 +- misc/mobile_45.asm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'misc') diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 3e000c054..64608d2a8 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -7557,7 +7557,7 @@ Function1034e0: ; 1034e0 add hl, bc pop bc ld a, $6 - call Functionfb8 + call FillBoxWithByte ret ; 1034f1 diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 7b4e8ca90..17300348a 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -8345,7 +8345,7 @@ Function117bb6: ld a, [wd001] cp $f jr nz, .asm_117c16 ; 0x117c01 $13 - ld hl, wMagikarpRecordHoldersName + 2 + ld hl, $e000 - 20 ld de, wcd69 ld c, $10 .asm_117c0b @@ -15254,7 +15254,7 @@ Function11b22a: ; 11b22a ; 11b236 Function11b236: ; 11b236 - jp Functionfb8 + jp FillBoxWithByte ; 11b239 Function11b239: ; 11b239 -- cgit v1.2.3