ref: f4572ecd4dc8effb26c2a14de30f0ba58c317078
parent: 4983c46a26ff2c165c67a78cebc0c686a23f9cda
author: yenatch <[email protected]>
date: Fri Aug 30 15:14:04 EDT 2013
use more egg constants in main
--- a/main.asm
+++ b/main.asm
@@ -7377,7 +7377,7 @@
Function3741: ; 3741
and a
jr z, .asm_374c
- cp $fd
+ cp EGG
jr z, .asm_374e
cp $fc
jr c, .asm_374e
@@ -24912,7 +24912,7 @@
Function12fba: ; 12fba
ld a, [CurPartySpecies]
- cp $fd
+ cp EGG
jr z, .asm_12fd2
ld hl, Options
ld a, [hl]
@@ -25025,13 +25025,13 @@
inc a
ld [CurPartyMon], a
ld c, a
- ld b, $0
+ ld b, 0
ld hl, PartySpecies
add hl, bc
ld a, [hl]
cp $ff
jr z, .asm_130a7
- cp $fd
+ cp EGG
ret nz
jr .asm_1308f
@@ -25044,11 +25044,11 @@
dec a
ld [CurPartyMon], a
ld c, a
- ld b, $0
+ ld b, 0
ld hl, PartySpecies
add hl, bc
ld a, [hl]
- cp $fd
+ cp EGG
ret nz
ld a, [CurPartyMon]
and a
@@ -25302,7 +25302,7 @@
ret z
ld c, a
ld e, a
- ld d, $0
+ ld d, 0
ld hl, PartyCount
add hl, de
.asm_132e7
@@ -25309,7 +25309,7 @@
ld a, [hl]
and a
jr z, .asm_132f3
- cp $fd
+ cp EGG
jr z, .asm_132f3
cp $fc
jr c, .asm_132f8
@@ -25334,7 +25334,7 @@
cp c
ret z
ld e, c
- ld d, $0
+ ld d, 0
ld hl, PartySpecies
add hl, de
.asm_1330f
@@ -25343,7 +25343,7 @@
ret z
and a
jr z, .asm_1331e
- cp $fd
+ cp EGG
jr z, .asm_1331e
cp $fc
jr c, .asm_13321
@@ -25353,8 +25353,8 @@
jr .asm_1330f
.asm_13321
- ld hl, $c4b2
- ld [hl], $ed
+ hlcoord 18, 0
+ ld [hl], "▶"
ret
; 13327
@@ -34860,7 +34860,7 @@
callba PartyMenuSelect
push af
ld a, [CurPartySpecies]
- cp $fd
+ cp EGG
pop bc
jr z, .asm_2c854
push bc
@@ -39983,10 +39983,10 @@
ld hl, PartySpecies
ld a, [CurPartyMon]
ld c, a
- ld b, $0
+ ld b, 0
add hl, bc
ld a, [hl]
- cp $fd
+ cp EGG
ld hl, BattleText_0x80b26
jr z, .asm_3d8ae
ld hl, BattleText_0x80b0b
@@ -47627,9 +47627,9 @@
callba PartyMenuSelect
jr c, .asm_44939
ld a, [CurPartySpecies]
- cp $fd
+ cp EGG
jr z, .asm_44923
- ld a, $1
+ ld a, PartyMon1Item - PartyMon1
call GetPartyParamLocation
ld a, [hl]
and a
@@ -51404,14 +51404,14 @@
Function50389: ; 50389
- ld a, $d8
+ ld a, PartySpecies & $ff
add b
ld e, a
- ld a, $dc
- adc $0
+ ld a, PartySpecies >> 8
+ adc 0
ld d, a
ld a, [de]
- cp $fd
+ cp EGG
ret
; 50396
@@ -51422,7 +51422,7 @@
ld a, [PartyMenuActionText]
and $f
ld e, a
- ld d, $0
+ ld d, 0
ld hl, $43b2
add hl, de
add hl, de
@@ -54798,12 +54798,12 @@
ld [de], a
inc de
ld hl, PartySpecies
- ld c, $0
+ ld c, 0
.asm_86556
ld a, [hli]
cp $ff
jr z, .asm_865b1
- cp $fd
+ cp EGG
jr nz, .asm_86562
inc c
jr .asm_86556
@@ -55021,7 +55021,7 @@
ld hl, $c50a
call Function378b
ld a, [CurPartySpecies]
- cp $fd
+ cp EGG
jr z, .asm_867f8
ld hl, $c5a5
ld a, $74