Use PARTY_LENGTH and related constants in menu and hud code.

This should allow reducing PARTY_LENGTH to work as intended.
Increasing it also works provided space is provided in wram, but breaks pc/saving.
This commit is contained in:
yenatch 2014-08-22 23:17:47 -07:00
parent cf399a8c86
commit 365ae68d80
8 changed files with 64 additions and 74 deletions

View file

@ -67,9 +67,9 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
call LoadMonData
callab Func_58f43
ld a, d
cp $64
cp MAX_LEVEL
jr c, .asm_56315
ld d, $64
ld d, MAX_LEVEL
callab CalcExperience
ld hl, wDayCareMonExp
ld a, [H_NUMTOPRINT]
@ -78,7 +78,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
ld [hli], a
ld a, [$ff98]
ld [hl], a
ld d, $64
ld d, MAX_LEVEL
.asm_56315
xor a
@ -100,7 +100,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
.asm_56333
call PrintText
ld a, [wPartyCount]
cp $6
cp PARTY_LENGTH
ld hl, DayCareMText_56440
jp z, .asm_56403
ld de, wTrainerFacingDirection

View file

@ -27,11 +27,11 @@ Route5GateScript0: ; 1df50 (7:5f50)
xor a
ld [hJoyHeld], a
callba RemoveGuardDrink
ld a, [$ff00+$db]
ld a, [$ffdb]
and a
jr nz, .asm_1df82 ; 0x1df70 $10
ld a, $2
ld [$ff00+$8c], a
ld [$ff8c], a
call DisplayTextID
call Route5GateScript_1df43
ld a, $1
@ -39,7 +39,7 @@ Route5GateScript0: ; 1df50 (7:5f50)
ret
.asm_1df82
ld a, $3
ld [$ff00+$8c], a
ld [$ff8c], a
call DisplayTextID
ld hl, wd728
set 6, [hl]
@ -74,7 +74,7 @@ Route5GateText1: ; 1dfaa (7:5faa)
bit 6, a
jr nz, .asm_88856 ; 0x1dfb0 $2c
callba RemoveGuardDrink
ld a, [$ff00+$db]
ld a, [$ffdb]
and a
jr nz, .asm_768a2 ; 0x1dfbd $11
ld hl, Route5GateText2