diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-05-30 18:20:41 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-05-30 18:20:41 -0400 |
| commit | 3330662296eabb6b3b7f0eed1c79003c8873c712 (patch) | |
| tree | dae9a2f40425a236a3ef6ecce453cf16b4359c26 /scripts/museum2f.asm | |
| parent | Bank7 misc functions (diff) | |
| parent | Digletts Cave Route 11 Entrance (diff) | |
| download | pokeyellow-3330662296eabb6b3b7f0eed1c79003c8873c712.tar.gz pokeyellow-3330662296eabb6b3b7f0eed1c79003c8873c712.tar.xz pokeyellow-3330662296eabb6b3b7f0eed1c79003c8873c712.zip | |
Merge pull request #9 from PikalaxALT/master
Disassemble banks 3A, 3F, and all outdoor maps
Diffstat (limited to 'scripts/museum2f.asm')
| -rwxr-xr-x | scripts/museum2f.asm | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/scripts/museum2f.asm b/scripts/museum2f.asm index 0f8a63ec..56d113ae 100755 --- a/scripts/museum2f.asm +++ b/scripts/museum2f.asm @@ -1,5 +1,6 @@ Museum2FScript: ; 5c317 (17:4317) - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret Museum2FTextPointers: ; 5c31a (17:431a) dw Museum2FText1 @@ -27,9 +28,40 @@ Museum2FText4: ; 5c337 (17:4337) db "@" Museum2FText5: ; 5c33c (17:433c) + TX_ASM + ld a, [wd472] + bit 7, a + jr nz, .asm_5c1f6 + ld hl, Museum2FText_5c20e + call PrintText + jr .asm_5c20b + +.asm_5c1f6 + ld a, [wPikachuHappiness] + cp 101 + jr c, .asm_5c205 + ld hl, Museum2FText_5c218 + call PrintText + jr .asm_5c20b + +.asm_5c205 + ld hl, Museum2FText_5c213 + call PrintText +.asm_5c20b + jp TextScriptEnd + +Museum2FText_5c20e: TX_FAR _Museum2FText5 db "@" +Museum2FText_5c213: + TX_FAR _Museum2FPikachuText1 + db "@" + +Museum2FText_5c218: + TX_FAR _Museum2FPikachuText2 + db "@" + Museum2FText6: ; 5c341 (17:4341) TX_FAR _Museum2FText6 db "@" |