thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-14 09:06:41 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Function $3493, former CheckBagItemExist, is now called IsItemInBag (consistency). Added base routine for text-special id $F7

Browse source 
hg-commit-id: 105c01affa23
This commit is contained in:
Sawakita 2012-01-10 23:54:38 +01:00
parent cdaf8e3d9a
commit 6ca9439c65
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
constants.asm
View file

@ -2,6 +2,8 @@ RED EQU 1
BLUE EQU 0 BLUE EQU 0
GREEN EQU 0 GREEN EQU 0
;\1 = X
;\2 = Y
FuncCoord: MACRO FuncCoord: MACRO
Coord = $C3A0 + 20 * \2 + \1 Coord = $C3A0 + 20 * \2 + \1
ENDM ENDM
@ -154,6 +156,9 @@ W_CURMAP EQU $D35E
W_YCOORD EQU $D361 ; player’s position on the current map W_YCOORD EQU $D361 ; player’s position on the current map
W_XCOORD EQU $D362 W_XCOORD EQU $D362
W_PLAYERCOINS1 EQU $D5A4
W_PLAYERCOINS2 EQU $D5A5
W_RIVALSTARTER EQU $D715 W_RIVALSTARTER EQU $D715
W_PLAYERSTARTER EQU $D717 W_PLAYERSTARTER EQU $D717

22
pokered.asm
View file

@ -1113,9 +1113,19 @@ TechnicalPrefix:
HiddenPrefix: HiddenPrefix:
db "HM" db "HM"
INCBIN "baserom.gbc",$3040,$3493 - $3040 INCBIN "baserom.gbc",$3040,$3474 - $3040
CheckBagItemExist: ; $3493: ; 3493 FuncTX_F7: ; 3474
; XXX find a better name for this function
; special_F7
ld b,BANK(CeladonPrizeMenu)
ld hl,CeladonPrizeMenu
call Bankswitch
jp $29DF ; continue to main text-engine function
INCBIN "baserom.gbc",$347F,$3493 - $347F
IsItemInBag: ; 3493
; given an item_id in b ; given an item_id in b
; set zero flag if item isn't in player's bag ; set zero flag if item isn't in player's bag
; else reset zero flag ; else reset zero flag
@ -12172,7 +12182,7 @@ Function583A: ; 583A
cp a,$95 ; Pokémon Tower cp a,$95 ; Pokémon Tower
jr nc,.next\@ jr nc,.next\@
ld b,SILPH_SCOPE ld b,SILPH_SCOPE
call CheckBagItemExist ; $3493 call IsItemInBag ; $3493
ret z ret z
.next\@ .next\@
ld a,1 ld a,1
@ -17310,7 +17320,11 @@ Mansion4Object: ; 0x52498 (size=69)
; warp-to ; warp-to
EVENT_DISP $f, $16, $17 ; MANSION_1 EVENT_DISP $f, $16, $17 ; MANSION_1
INCBIN "baserom.gbc",$524dd,$1b23 INCBIN "baserom.gbc",$524DD,$5271B - $524DD
CeladonPrizeMenu: ; 14:671B
INCBIN "baserom.gbc",$5271B,$54000 - $5271B
;INCBIN "baserom.gbc",$52996,$54000 - $52996
SECTION "bank15",DATA,BANK[$15] SECTION "bank15",DATA,BANK[$15]