You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Fix merge conflicts
This commit is contained in:
@@ -23,7 +23,7 @@ UnknownText_0x88013: ; 0x88013
|
||||
; 0x88018
|
||||
|
||||
Special_SelectApricornForKurt: ; 88018
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
ld c, $1
|
||||
xor a
|
||||
ld [wd0e4], a
|
||||
@@ -52,7 +52,7 @@ Special_SelectApricornForKurt: ; 88018
|
||||
call Kurt_GiveUpSelectedQuantityOfSelectedApricorn
|
||||
|
||||
.done
|
||||
call Function1d7d
|
||||
call Call_ExitMenu
|
||||
ret
|
||||
; 88055
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@ endr
|
||||
.AccessBankOfMom: ; 162a8
|
||||
ld hl, UnknownText_0x1665d
|
||||
call PrintText
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
ld hl, MenuDataHeader_0x166b5
|
||||
call CopyMenuDataHeader
|
||||
call InterpretMenu2
|
||||
@@ -148,7 +148,7 @@ endr
|
||||
ld [hl], a
|
||||
ld a, $5
|
||||
ld [wcf64], a
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
call Function16517
|
||||
call Function1656b
|
||||
call Function16571
|
||||
@@ -216,7 +216,7 @@ endr
|
||||
ld [hl], a
|
||||
ld a, $5
|
||||
ld [wcf64], a
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
call Function16512
|
||||
call Function1656b
|
||||
call Function16571
|
||||
|
||||
@@ -19,7 +19,7 @@ MoveDeletion:
|
||||
jr z, .asm_2c5ca
|
||||
ld hl, UnknownText_0x2c5ea
|
||||
call PrintText
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
callba Function12f5b
|
||||
push af
|
||||
call Function2b74
|
||||
|
||||
Reference in New Issue
Block a user