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/route25.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/route25.asm')
| -rwxr-xr-x | scripts/route25.asm | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/scripts/route25.asm b/scripts/route25.asm index 49580ba6..20dcc890 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -1,14 +1,21 @@ Route25Script: ; 515cb (14:55cb) - call Route25Script_515e1 call EnableAutoTextBoxDrawing ld hl, Route25TrainerHeaders ld de, Route25ScriptPointers ld a, [W_ROUTE25CURSCRIPT] call ExecuteCurMapScriptInTable ld [W_ROUTE25CURSCRIPT], a + call Route25Script_515e1 ret Route25Script_515e1: ; 515e1 (14:55e1) + ld hl, wPreventBlackout + res 2, [hl] + res 3, [hl] + res 4, [hl] + res 7, [hl] + xor a + ld [W_BILLSHOUSECURSCRIPT], a ld hl, wd126 bit 6, [hl] res 6, [hl] @@ -16,14 +23,16 @@ Route25Script_515e1: ; 515e1 (14:55e1) CheckEventHL EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING ret nz CheckEventReuseHL EVENT_MET_BILL_2 - jr nz, .asm_515ff + jr nz, .asm_51638 ResetEventReuseHL EVENT_BILL_SAID_USE_CELL_SEPARATOR ld a, HS_BILL_POKEMON ld [wMissableObjectIndex], a - predef_jump ShowObject -.asm_515ff + predef ShowObject + jr .asm_5165c + +.asm_51638 CheckEventAfterBranchReuseHL EVENT_GOT_SS_TICKET, EVENT_MET_BILL_2 - ret z + jr z, .asm_5165c SetEventReuseHL EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING ld a, HS_NUGGET_BRIDGE_GUY ld [wMissableObjectIndex], a @@ -33,7 +42,9 @@ Route25Script_515e1: ; 515e1 (14:55e1) predef HideObject ld a, HS_BILL_2 ld [wMissableObjectIndex], a - predef_jump ShowObject + predef ShowObject +.asm_5165c + ret Route25ScriptPointers: ; 51622 (14:5622) dw CheckFightingMapTrainers |