Permalink
Browse files

Fix: Lyra's Bag is the female version.

  • Loading branch information...
roukaour committed Oct 14, 2016
1 parent 16e6742 commit 3b7ad0953a7d405d8accd42052d57c6e40ad8a4c
Showing with 36 additions and 38 deletions.
  1. +1 −0 README.md
  2. +12 −22 engine/pack.asm
  3. +18 −11 main.asm
  4. +5 −5 wram.asm
View
@@ -239,3 +239,4 @@ These changes have been made since the current 2.2.0 release. If you build the p
* Fix: Enemy Psystrike uses player's Defense.
* Fix: Yellow Carpet is buyable.
* Fix: Tangrowth can learn Curse.
* Fix: Lyra's Bag is the female version.
View
@@ -1255,7 +1255,7 @@ TutorialPack: ; 107bb
ld a, [InputType]
or a
jr z, .loop
farcall _DudeAutoInput_RightA
farcall _DudeAutoInput_RightRightA
.loop
call .RunJumptable
call DepositSellTutorial_InterpretJoypad
@@ -1276,12 +1276,11 @@ TutorialPack: ; 107bb
.dw ; 107e1 (4:47e1)
dw .Items
dw .Medicine
dw .Balls
dw .KeyItems
dw .TMHM
.Items: ; 107e9 (4:47e9)
xor a
ld a, ITEM - 1
ld hl, .ItemsMenuDataHeader
jr .DisplayPocket
@@ -1304,41 +1303,32 @@ TutorialPack: ; 107bb
dba UpdateItemDescription
; 10807
.KeyItems: ; 10807 (4:4807)
ld a, 2
ld hl, .KeyItemsMenuDataHeader
.Medicine: ; 10807 (4:4807)
ld a, MEDICINE - 1
ld hl, .MedicineMenuDataHeader
jr .DisplayPocket
; 1080e (4:480e)
.KeyItemsMenuDataHeader: ; 0x1080e
.MedicineMenuDataHeader: ; 0x1080e
db $40 ; flags
db 01, 07 ; start coords
db 11, 19 ; end coords
dw .KeyItemsMenuData2
dw .MedicineMenuData2
db 1 ; default option
; 0x10816
.KeyItemsMenuData2: ; 0x10816
.MedicineMenuData2: ; 0x10816
db $ae ; flags
db 5, 8 ; rows, columns
db 1 ; horizontal spacing
dbw 0, wDudeNumKeyItems
db 2 ; horizontal spacing
dbw 0, wDudeNumMedicine
dba PlaceMenuItemName
dba PlaceMenuItemQuantity
dba UpdateItemDescription
; 10826
.TMHM: ; 10826 (4:4826)
ld a, 3
call InitPocket
call WaitBGMap_DrawPackGFX
farcall TMHMPocket
ld a, [CurItem]
ld [CurItem], a
ret
.Balls: ; 1083b (4:483b)
ld a, 1
ld a, BALL - 1
ld hl, .BallsMenuDataHeader
jr .DisplayPocket
View
@@ -3736,21 +3736,26 @@ CatchTutorial:: ; 4e554
ld hl, wDudeNumItems
ld [hl], 1
inc hl
ld [hl], POTION
ld [hl], REPEL
inc hl
ld [hl], 1
inc hl
ld [hl], -1
ld hl, wDudeNumKeyItems
ld [hl], 0
ld hl, wDudeNumMedicine
ld [hl], 1
inc hl
ld [hl], POTION
inc hl
ld [hl], 1
inc hl
ld [hl], -1
ld hl, wDudeNumBalls
ld a, 1
ld [hli], a
ld a, POKE_BALL
ld [hli], a
ld [hli], a
ld [hl], 1
inc hl
ld [hl], POKE_BALL
inc hl
ld [hl], 10
inc hl
ld [hl], -1
ret
@@ -6061,8 +6066,8 @@ _DudeAutoInput_A:: ; 1de28a
ld hl, DudeAutoInput_A
jr _DudeAutoInput
_DudeAutoInput_RightA: ; 1de28f
ld hl, DudeAutoInput_RightA
_DudeAutoInput_RightRightA: ; 1de28f
ld hl, DudeAutoInput_RightRightA
jr _DudeAutoInput
_DudeAutoInput_DownA: ; 1de294
@@ -6081,7 +6086,9 @@ DudeAutoInput_A: ; 1de29f
db A_BUTTON, $00
db NO_INPUT, $ff ; end
DudeAutoInput_RightA: ; 1de2a5
DudeAutoInput_RightRightA: ; 1de2a5
db NO_INPUT, $08
db D_RIGHT, $00
db NO_INPUT, $08
db D_RIGHT, $00
db NO_INPUT, $08
View
@@ -2104,15 +2104,15 @@ OTPartyEnd:: ds 1
wDudeBag:: ; d288
wDudeNumItems:: ds 1
wDudeItems:: ds 2 * 4
wDudeItems: ds 2 * 2
wDudeItemsEnd:: ds 1
wDudeNumKeyItems:: ds 1 ; d292
wDudeKeyItems:: ds 18
wDudeKeyItemsEnd:: ds 1
wDudeNumMedicine:: ds 1
wDudeMedicine:: ds 2 * 2
wDudeMedicineEnd:: ds 1
wDudeNumBalls:: ds 1 ; d2a6
wDudeBalls:: ds 2 * 4 ; d2a7
wDudeBalls:: ds 2 * 2 ; d2a7
wDudeBallsEnd:: ds 1 ; d2af
wDudeBagEnd::
ds wDudeBag - @

0 comments on commit 3b7ad09

Please sign in to comment.