thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-10 15:30:59 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'iimarckus/master' into resplit-audio

Browse source 
Conflicts:
	main.asm
This commit is contained in:
yenatch 2014-01-22 16:37:07 -05:00
parent 93e1316e3d 47ec18ffa3
commit 2c2111b7a5
2 changed files with 285 additions and 254 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

514
main.asm
View file

File diff suppressed because it is too large Load diff

25
wram.asm
View file

@ -1421,7 +1421,19 @@ W_PLAYTIMEFRAMES: ; da45
W_NUMSAFARIBALLS: ; da47
ds 1
ds 56
W_DAYCARE_IN_USE: ; da48
; 0 if no pokemon is in the daycare
; 1 if pokemon is in the daycare
ds 1
W_DAYCAREMONNAME: ; da49
ds 11
W_DAYCAREMONOT: ; da54
ds 11
W_DAYCAREMONDATA: ; da5f
ds 33
W_NUMINBOX: ; da80
; number of mons in current box
@ -1432,5 +1444,14 @@ W_BOXMON1DATA: ; da96
W_BOXMON2DATA: ; dab7
ds 33 * 19
; dd2a
W_BOXMON1OT: ; dd2a
ds 11
W_BOXMON2OT: ; dd35
ds 11 * 19
W_BOXMON1NAME: ; de06
ds 11
W_BOXMON2NAME: ; de11
ds 11 * 19
; dee2