diff options
| -rw-r--r-- | engine/bank3c.asm | 3 | ||||
| -rwxr-xr-x | scripts/vermilioncity2.asm | 68 |
2 files changed, 69 insertions, 2 deletions
diff --git a/engine/bank3c.asm b/engine/bank3c.asm index efb0c25f..7cb6ae5d 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -345,8 +345,7 @@ NurseChanseyText: dr $f0f26, $f18bb INCLUDE "scripts/viridiancity2.asm" - dr $f1a0f, $f1ad2 - +INCLUDE "scripts/vermilioncity2.asm" INCLUDE "scripts/route1_2.asm" dr $f1b27, $f220e diff --git a/scripts/vermilioncity2.asm b/scripts/vermilioncity2.asm new file mode 100755 index 00000000..4a068f88 --- /dev/null +++ b/scripts/vermilioncity2.asm @@ -0,0 +1,68 @@ +Func_f1a0f: + CheckEvent EVENT_147 + jr nz, .asm_f1a69 + ld a, [wBeatGymFlags] + bit 2, a ; THUNDERBADGE + jr nz, .asm_f1a24 + ld hl, OfficerJennyText1 + call PrintText + ret + +.asm_f1a24 + ld hl, OfficerJennyText2 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_f1a62 + ld a, SQUIRTLE + ld [wd11e], a + ld [wcf91], a + call GetMonName + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + lb bc, SQUIRTLE, 10 + call GivePokemon + ret nc + ld a, [wAddedToParty] + and a + call z, WaitForTextScrollButtonPress + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, OfficerJennyText3 + call PrintText + SetEvent EVENT_147 + ret + +.asm_f1a62 + ld hl, OfficerJennyText4 + call PrintText + ret + +.asm_f1a69 + ld hl, OfficerJennyText5 + call PrintText + ret + +OfficerJennyText1: + TX_FAR _OfficerJennyText1 + db "@" + +OfficerJennyText2: + TX_FAR _OfficerJennyText2 + db "@" + +OfficerJennyText3: + TX_FAR _OfficerJennyText3 + db $d + db "@" + +OfficerJennyText4: + TX_FAR _OfficerJennyText4 + db "@" + +OfficerJennyText5: + TX_FAR _OfficerJennyText5 + db "@" + + dr $f1a8a,$f1ad2 |