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

Add labels and comments to the Fan Club.

Browse source
This commit is contained in:
IIMarckus 2014-04-21 02:12:25 -06:00
parent 1040a2ccfa
commit 65e7657318
2 changed files with 83 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

131
main.asm
View file

@ -89037,9 +89037,10 @@ FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90)
FanClubScript: ; 59b70 (16:5b70) FanClubScript: ; 59b70 (16:5b70)
jp EnableAutoTextBoxDrawing jp EnableAutoTextBoxDrawing
Func_59b73: ; 59b73 (16:5b73) FanClubBikeInBag:
; check if any bike paraphernalia in bag
ld a, [$d771] ld a, [$d771]
bit 1, a bit 1, a ; got bike voucher?
ret nz ret nz
ld b, BICYCLE ld b, BICYCLE
call IsItemInBag call IsItemInBag
@ -89057,142 +89058,150 @@ FanClubTextPointers: ; 59b84 (16:5b84)
dw FanClubText7 dw FanClubText7
dw FanClubText8 dw FanClubText8
FanClubText1: ; 59b94 (16:5b94) FanClubText1:
; pikachu fan
db $08 ; asm db $08 ; asm
ld a, [$d771] ld a, [$d771]
bit 7, a bit 7, a
jr nz, asm_67b22 ; 0x59b9a jr nz, .mineisbetter
ld hl, UnnamedText_59bb7 ld hl, .normaltext
call PrintText call PrintText
ld hl, $d771 ld hl, $d771
set 6, [hl] set 6, [hl]
jr asm_64f01 ; 0x59ba7 jr .done
asm_67b22 ; 0x59ba9 .mineisbetter
ld hl, UnnamedText_59bbc ld hl, .bettertext
call PrintText call PrintText
ld hl, $d771 ld hl, $d771
res 7, [hl] res 7, [hl]
asm_64f01 ; 0x59bb4 .done
jp TextScriptEnd jp TextScriptEnd
UnnamedText_59bb7: ; 59bb7 (16:5bb7) .normaltext
TX_FAR _UnnamedText_59bb7 TX_FAR PikachuFanText
db "@" db "@"
UnnamedText_59bbc: ; 59bbc (16:5bbc) .bettertext
TX_FAR _UnnamedText_59bbc TX_FAR PikachuFanBetterText
db "@" db "@"
FanClubText2: ; 59bc1 (16:5bc1) FanClubText2:
; seel fan
db $08 ; asm db $08 ; asm
ld a, [$d771] ld a, [$d771]
bit 6, a bit 6, a
jr nz, asm_5cd59 ; 0x59bc7 jr nz, .mineisbetter
ld hl, UnnamedText_59be4 ld hl, .normaltext
call PrintText call PrintText
ld hl, $d771 ld hl, $d771
set 7, [hl] set 7, [hl]
jr asm_59625 ; 0x59bd4 jr .done
asm_5cd59 ; 0x59bd6 .mineisbetter
ld hl, UnnamedText_59be9 ld hl, .bettertext
call PrintText call PrintText
ld hl, $d771 ld hl, $d771
res 6, [hl] res 6, [hl]
asm_59625 ; 0x59be1 .done
jp TextScriptEnd jp TextScriptEnd
UnnamedText_59be4: ; 59be4 (16:5be4) .normaltext
TX_FAR _UnnamedText_59be4 TX_FAR SeelFanText
db "@" db "@"
UnnamedText_59be9: ; 59be9 (16:5be9) .bettertext
TX_FAR _UnnamedText_59be9 TX_FAR SeelFanBetterText
db "@" db "@"
FanClubText3: ; 59bee (16:5bee) FanClubText3:
; pikachu
db $8 db $8
ld hl, UnnamedText_59c00 ld hl, .text
call PrintText call PrintText
ld a, PIKACHU ld a, PIKACHU
call PlayCry call PlayCry
call WaitForSoundToFinish call WaitForSoundToFinish
jp TextScriptEnd jp TextScriptEnd
UnnamedText_59c00: ; 59c00 (16:5c00) .text
TX_FAR _UnnamedText_59c00 TX_FAR FanClubPikachuText
db "@" db "@"
FanClubText4: ; 59c05 (16:5c05) FanClubText4:
; seel
db $08 ; asm db $08 ; asm
ld hl, UnnamedText_59c17 ld hl, .text
call PrintText call PrintText
ld a, SEEL ld a, SEEL
call PlayCry call PlayCry
call WaitForSoundToFinish call WaitForSoundToFinish
jp TextScriptEnd jp TextScriptEnd
UnnamedText_59c17: ; 59c17 (16:5c17) .text
TX_FAR _UnnamedText_59c17 TX_FAR FanClubSeelText
db "@" db "@"
FanClubText5: ; 59c1c (16:5c1c) FanClubText5:
; chair
db $08 ; asm db $08 ; asm
call Func_59b73 call FanClubBikeInBag
jr nz, asm_38bb3 ; 0x59c20 jr nz, .nothingleft
ld hl, UnnamedText_59c65
ld hl, .meetchairtext
call PrintText call PrintText
call YesNoChoice call YesNoChoice
ld a, [$cc26] ld a, [$cc26]
and a and a
jr nz, asm_2c8d7 ; 0x59c2f jr nz, .nothanks
ld hl, UnnamedText_59c6a
; tell the story
ld hl, .storytext
call PrintText call PrintText
ld bc, (BIKE_VOUCHER << 8) | 1 ld bc, (BIKE_VOUCHER << 8) | 1
call GiveItem call GiveItem
jr nc, .BagFull jr nc, .BagFull
ld hl, ReceivedBikeVoucherText ld hl, .receivedvouchertext
call PrintText call PrintText
ld hl, $d771 ld hl, $d771
set 1, [hl] set 1, [hl]
jr asm_d3c26 ; 0x59c4a jr .done
.BagFull .BagFull
ld hl, UnnamedText_59c83 ld hl, .bagfulltext
call PrintText call PrintText
jr asm_d3c26 ; 0x59c52 jr .done
asm_2c8d7 ; 0x59c54 .nothanks
ld hl, UnnamedText_59c79 ld hl, .nostorytext
call PrintText call PrintText
jr asm_d3c26 ; 0x59c5a jr .done
asm_38bb3 ; 0x59c5c .nothingleft
ld hl, UnnamedText_59c7e ld hl, .finaltext
call PrintText call PrintText
asm_d3c26 ; 0x59c62 .done
jp TextScriptEnd jp TextScriptEnd
UnnamedText_59c65: ; 59c65 (16:5c65) .meetchairtext
TX_FAR _UnnamedText_59c65 TX_FAR FanClubMeetChairText
db "@" db "@"
UnnamedText_59c6a: ; 59c6a (16:5c6a) .storytext
TX_FAR _UnnamedText_59c6a TX_FAR FanClubChairStoryText
db "@" db "@"
ReceivedBikeVoucherText: ; 59c6f (16:5c6f) .receivedvouchertext
TX_FAR _ReceivedBikeVoucherText ; 0x9a82e TX_FAR ReceivedBikeVoucherText
db $11 db $11
TX_FAR _UnnamedText_59c74 ; 0x9a844 TX_FAR ExplainBikeVoucherText
db "@" db "@"
UnnamedText_59c79: ; 59c79 (16:5c79) .nostorytext
TX_FAR _UnnamedText_59c79 TX_FAR FanClubNoStoryText
db "@" db "@"
UnnamedText_59c7e: ; 59c7e (16:5c7e) .finaltext
TX_FAR _UnnamedText_59c7e TX_FAR FanClubChairFinalText
db "@" db "@"
UnnamedText_59c83: ; 59c83 (16:5c83) .bagfulltext
TX_FAR _UnnamedText_59c83 TX_FAR FanClubBagFullText
db "@" db "@"
FanClubText6: ; 59c88 (16:5c88) FanClubText6: ; 59c88 (16:5c88)

26
text/maps/fan_club.asm
View file

@ -1,16 +1,16 @@
_UnnamedText_59bb7:: ; 9a572 (26:6572) PikachuFanText::
text "Won't you admire" text "Won't you admire"
line "my PIKACHU's" line "my PIKACHU's"
cont "adorable tail?" cont "adorable tail?"
done done
_UnnamedText_59bbc:: ; 9a59e (26:659e) PikachuFanBetterText::
text "Humph! My PIKACHU" text "Humph! My PIKACHU"
line "is twice as cute" line "is twice as cute"
cont "as that one!" cont "as that one!"
done done
_UnnamedText_59be4:: ; 9a5cf (26:65cf) SeelFanText::
text "I just love my" text "I just love my"
line "SEEL!" line "SEEL!"
@ -18,23 +18,23 @@ _UnnamedText_59be4:: ; 9a5cf (26:65cf)
line "hug it!" line "hug it!"
done done
_UnnamedText_59be9:: ; 9a5ff (26:65ff) SeelFanBetterText::
text "Oh dear!" text "Oh dear!"
para "My SEEL is far" para "My SEEL is far"
line "more attractive!" line "more attractive!"
done done
_UnnamedText_59c00:: ; 9a629 (26:6629) FanClubPikachuText::
text "PIKACHU: Chu!" text "PIKACHU: Chu!"
line "Pikachu!" line "Pikachu!"
done done
_UnnamedText_59c17:: ; 9a641 (26:6641) FanClubSeelText::
text "SEEL: Kyuoo!" text "SEEL: Kyuoo!"
done done
_UnnamedText_59c65:: ; 9a64f (26:664f) FanClubMeetChairText::
text "I chair the" text "I chair the"
line "#MON Fan Club!" line "#MON Fan Club!"
@ -52,7 +52,7 @@ _UnnamedText_59c65:: ; 9a64f (26:664f)
cont "about my #MON?" cont "about my #MON?"
done done
_UnnamedText_59c6a:: ; 9a6e0 (26:66e0) FanClubChairStoryText::
text "Good!" text "Good!"
line "Then listen up!" line "Then listen up!"
@ -82,13 +82,13 @@ _UnnamedText_59c6a:: ; 9a6e0 (26:66e0)
cont "you to have this!" cont "you to have this!"
prompt prompt
_ReceivedBikeVoucherText:: ; 9a82e (26:682e) ReceivedBikeVoucherText::
text $52, " received" text $52, " received"
line "a @" line "a @"
TX_RAM $cf4b TX_RAM $cf4b
text "!@@" text "!@@"
_UnnamedText_59c74:: ; 9a844 (26:6844) ExplainBikeVoucherText::
db $0 db $0
para "Exchange that for" para "Exchange that for"
line "a BICYCLE!" line "a BICYCLE!"
@ -104,13 +104,13 @@ _UnnamedText_59c74:: ; 9a844 (26:6844)
line "cycling!" line "cycling!"
done done
_UnnamedText_59c79:: ; 9a8c3 (26:68c3) FanClubNoStoryText::
text "Oh. Come back" text "Oh. Come back"
line "when you want to" line "when you want to"
cont "hear my story!" cont "hear my story!"
done done
_UnnamedText_59c7e:: ; 9a8f2 (26:68f2) FanClubChairFinalText::
text "Hello, ", $52, "!" text "Hello, ", $52, "!"
para "Did you come see" para "Did you come see"
@ -120,7 +120,7 @@ _UnnamedText_59c7e:: ; 9a8f2 (26:68f2)
para "No? Too bad!" para "No? Too bad!"
done done
_UnnamedText_59c83:: ; 9a933 (26:6933) FanClubBagFullText::
text "Make room for" text "Make room for"
line "this!" line "this!"
done done