diff options
Diffstat (limited to 'engine/bank3c.asm')
| -rw-r--r-- | engine/bank3c.asm | 133 |
1 files changed, 17 insertions, 116 deletions
diff --git a/engine/bank3c.asm b/engine/bank3c.asm index d176511c..e7ac2a4e 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -330,7 +330,7 @@ Pic_f0cf4: ; f0cf4 (3c:4cf4) GFX_f0d82: ; f0d82 (3c:4d82) dr $f0d82, $f0f12 -Func_f0f12: +PokecenterChanseyText: ld hl, NurseChanseyText call PrintText ld a, CHANSEY @@ -367,125 +367,26 @@ PikachuMovementData_f1e2b: db $38 db $3f -Func_f1e30 - CheckEvent EVENT_GOT_TM18 - jr nz, .asm_f1e54 - ld hl, CeladonMart3Text_f1e5b - call PrintText - lb bc, TM_18, 1 - call GiveItem - jr nc, .asm_f1e4f - SetEvent EVENT_GOT_TM18 - ld hl, CeladonMart3Text_f1e60 - jr .asm_f1e57 - -.asm_f1e4f - ld hl, CeladonMart3Text_f1e6b - jr .asm_f1e57 - -.asm_f1e54 - ld hl, CeladonMart3Text_f1e66 -.asm_f1e57 - call PrintText - ret - -CeladonMart3Text_f1e5b: - TX_FAR _TM18PreReceiveText - db "@" - -CeladonMart3Text_f1e60: - TX_FAR _ReceivedTM18Text - TX_SFX_ITEM - db "@" - -CeladonMart3Text_f1e66: - TX_FAR _TM18ExplanationText - db "@" +INCLUDE "scripts/celadonmart3_2.asm" +INCLUDE "scripts/celadonmansion1_2.asm" +INCLUDE "scripts/celadonmansion3_2.asm" -CeladonMart3Text_f1e6b: - TX_FAR _TM18NoRoomText - db "@" - -Func_f1e70: - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, CeladonMansion1Text_f1e96 - call PrintText - callab IsStarterPikachuInOurParty - ret nc - ld hl, CeladonMansionText_f1e9c - call PrintText - ld a, $0 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - call Func_f1ea2 - call PrintText - ret - -CeladonMansion1Text_f1e96: - TX_FAR _CeladonMansion1Text2 - TX_WAIT_BUTTON - db "@" - -CeladonMansionText_f1e9c: - TX_FAR _CeladonMansion1Text6 - TX_BUTTON_SOUND - db "@" - -Func_f1ea2: - ld hl, PikachuHappinessThresholds_f1eb9 -.asm_f1ea5 - ld a, [hli] - inc hl - and a - jr z, .asm_f1eb5 - ld b, a - ld a, [wPikachuHappiness] - cp b - jr c, .asm_f1eb5 - inc hl - inc hl - jr .asm_f1ea5 - -.asm_f1eb5 - ld a, [hli] - ld h, [hl] - ld l, a +Func_f1f23: + ld hl, PikachuMovementData_f1f2c + ld b, SPRITE_FACING_DOWN + call Func_f0a82 ret -PikachuHappinessThresholds_f1eb9 - dw 51, CeladonMansion1Text_f1ed5 - dw 101, CeladonMansion1Text_f1eda - dw 131, CeladonMansion1Text_f1edf - dw 161, CeladonMansion1Text_f1ee4 - dw 201, CeladonMansion1Text_f1ee9 - dw 255, CeladonMansion1Text_f1eee - dbbw 0, $ff, CeladonMansion1Text_f1eee - -CeladonMansion1Text_f1ed5: - TX_FAR _CeladonMansion1Text7 - db "@" - -CeladonMansion1Text_f1eda: - TX_FAR _CeladonMansion1Text8 - db "@" - -CeladonMansion1Text_f1edf: - TX_FAR _CeladonMansion1Text9 - db "@" - -CeladonMansion1Text_f1ee4: - TX_FAR _CeladonMansion1Text10 - db "@" - -CeladonMansion1Text_f1ee9: - TX_FAR _CeladonMansion1Text11 - db "@" - -CeladonMansion1Text_f1eee: - TX_FAR _CeladonMansion1Text12 - db "@" +PikachuMovementData_f1f2c: + db $00 + db $20 + db $1e + db $35 + db $3f - dr $f1ef3, $f218c +INCLUDE "scripts/celadondiner2.asm" +INCLUDE "scripts/safarizoneentrance2.asm" +INCLUDE "scripts/cinnabargym2.asm" INCLUDE "scripts/mtmoonpokecenter2.asm" |