pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

badge engine flags in main.asm

Browse Source
This commit is contained in:
yenatch 2013-08-27 15:35:44 -04:00
parent 7cba224d4a
commit 94fc90a243
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
main.asm
View File

@ -7326,8 +7326,8 @@ FlagAction: ; 0x2e76
Function2ead: ; 2ead Function2ead: ; 2ead
ld de, $000b ld de, ENGINE_POKEDEX
ld b, $2 ld b, CHECK_FLAG
callba EngineFlagAction callba EngineFlagAction
ld a, c ld a, c
and a and a
@ -20737,7 +20737,7 @@ Functionc6f5: ; c6f5
GetPartyNick: ; c706 GetPartyNick: ; c706
; write CurPartyMon nickname to StringBuffer1-3 ; write CurPartyMon nickname to StringBuffer1-3
ld hl, PartyMon1Nickname ld hl, PartyMon1Nickname
ld a, $02 ld a, BOXMON
ld [MonType], a ld [MonType], a
ld a, [CurPartyMon] ld a, [CurPartyMon]
call GetNick call GetNick
@ -20752,7 +20752,7 @@ GetPartyNick: ; c706
CheckEngineFlag: ; c721 CheckEngineFlag: ; c721
; Check engine flag de ; Check engine flag de
; Return carry if flag is not set ; Return carry if flag is not set
ld b, $02 ; check flag ld b, CHECK_FLAG
callba EngineFlagAction callba EngineFlagAction
ld a, c ld a, c
and a and a
@ -20765,7 +20765,8 @@ CheckEngineFlag: ; c721
; c731 ; c731
CheckBadge: ; c731 CheckBadge: ; c731
; input: a = badge flag id ($1b-$2b) ; Check engine flag a (ENGINE_ZEPHYRBADGE thru ENGINE_EARTHBADGE)
; Display "Badge required" text and return carry if the badge is not owned
call CheckEngineFlag call CheckEngineFlag
ret nc ret nc
ld hl, BadgeRequiredText ld hl, BadgeRequiredText
@ -20775,8 +20776,10 @@ CheckBadge: ; c731
; c73d ; c73d
BadgeRequiredText: ; c73d BadgeRequiredText: ; c73d
TX_FAR _BadgeRequiredText ; Sorry! A new BADGE ; Sorry! A new BADGE
db "@" ; is required. ; is required.
TX_FAR _BadgeRequiredText
db "@"
; c742 ; c742
CheckPartyMove: ; c742 CheckPartyMove: ; c742
@ -20956,10 +20959,9 @@ Functionc8ac: ; c8ac
; c8b5 ; c8b5
Functionc8b5: ; c8b5 Functionc8b5: ; c8b5
ld de, $001b ; Flash
ld a, $3 ld de, ENGINE_ZEPHYRBADGE
ld hl, $4731 callba CheckBadge
rst FarCall
jr c, .asm_c8dd jr c, .asm_c8dd
push hl push hl
ld a, $22 ld a, $22
@ -21119,7 +21121,7 @@ TrySurfOW: ; c9e7
call CheckDirection call CheckDirection
jr c, .quit jr c, .quit
ld de, $1e ; FLAG_FOG_BADGE ld de, ENGINE_FOGBADGE
call CheckEngineFlag call CheckEngineFlag
jr c, .quit jr c, .quit
@ -21183,7 +21185,7 @@ Functionca3b: ; ca3b
Functionca52: ; ca52 Functionca52: ; ca52
; Fly ; Fly
ld de, $0020 ; storm badge ld de, ENGINE_STORMBADGE
call CheckBadge call CheckBadge
jr c, .asm_ca85 jr c, .asm_ca85
call GetMapPermission call GetMapPermission
@ -21246,10 +21248,9 @@ Functioncade: ; cade
; cae7 ; cae7
Functioncae7: ; cae7 Functioncae7: ; cae7
ld de, $0022 ; Waterfall
ld a, $3 ld de, ENGINE_RISINGBADGE
ld hl, $4731 callba CheckBadge
rst FarCall
ld a, $80 ld a, $80
ret c ret c
call Functioncb07 call Functioncb07
@ -21324,7 +21325,7 @@ TryWaterfallOW: ; cb56
ld d, WATERFALL ld d, WATERFALL
call CheckPartyMove call CheckPartyMove
jr c, .asm_cb74 jr c, .asm_cb74
ld de, $0022 ld de, ENGINE_RISINGBADGE
call CheckEngineFlag call CheckEngineFlag
jr c, .asm_cb74 jr c, .asm_cb74
call Functioncb07 call Functioncb07
@ -21409,7 +21410,8 @@ Functioncce5: ; cce5
; ccee ; ccee
Functionccee: ; ccee Functionccee: ; ccee
ld de, $001d ; Strength
ld de, ENGINE_PLAINBADGE
call CheckBadge call CheckBadge
jr c, Functioncd06 jr c, Functioncd06
jr Functioncd09 jr Functioncd09
@ -21517,7 +21519,7 @@ TryWhirlpoolOW: ; ce3e
ld d, WHIRLPOOL ld d, WHIRLPOOL
call CheckPartyMove call CheckPartyMove
jr c, .asm_ce5c jr c, .asm_ce5c
ld de, $0021 ld de, ENGINE_GLACIERBADGE
call CheckEngineFlag call CheckEngineFlag
jr c, .asm_ce5c jr c, .asm_ce5c
call Functioncdde call Functioncdde
@ -21764,7 +21766,7 @@ TryCutOW: ; d186
ld d, CUT ld d, CUT
call CheckPartyMove call CheckPartyMove
jr c, .asm_d19f jr c, .asm_d19f
ld de, $001c ld de, ENGINE_HIVEBADGE
call CheckEngineFlag call CheckEngineFlag
jr c, .asm_d19f jr c, .asm_d19f
ld a, BANK(UnknownScript_0xd1a9) ld a, BANK(UnknownScript_0xd1a9)
@ -26359,9 +26361,7 @@ Function12e55: ; 12e55
; 12e6a ; 12e6a
Function12e6a: ; 12e6a Function12e6a: ; 12e6a
ld a, $3 callba Functioncce5
ld hl, $4ce5
rst FarCall
ld a, [$d0ec] ld a, [$d0ec]
cp $1 cp $1
jr nz, .asm_12e7c jr nz, .asm_12e7c