diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
| commit | c979b3bb03b121dd03a800df74144cd69a74601a (patch) | |
| tree | 0d6bb48125efe6f6215347967383ba4c3b7da391 /scripts/museum1f.asm | |
| parent | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (diff) | |
| parent | 6e8c3883e430b567f7aa8f9230e366e03610bd5a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'scripts/museum1f.asm')
| -rwxr-xr-x | scripts/museum1f.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index 8da518cf..30e6f594 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -1,4 +1,4 @@ -Museum1FScript: ; 5c0f7 (17:40f7) +Museum1FScript: ld a, $1 ld [wAutoTextBoxDrawingControl], a xor a @@ -8,11 +8,11 @@ Museum1FScript: ; 5c0f7 (17:40f7) call JumpTable ret -Museum1FScriptPointers: ; 5c109 (17:4109) +Museum1FScriptPointers: dw Museum1FScript0 dw Museum1FScript1 -Museum1FScript0: ; 5c10d (17:410d) +Museum1FScript0: ld a, [wYCoord] cp $4 ret nz @@ -29,37 +29,37 @@ Museum1FScript0: ; 5c10d (17:410d) ld [hSpriteIndexOrTextID], a jp DisplayTextID -Museum1FScript1: ; 5c12a (17:412a) +Museum1FScript1: ret -Museum1FTextPointers: ; 5c12b (17:412b) +Museum1FTextPointers: dw Museum1FText1 dw Museum1FText2 dw Museum1FText3 dw Museum1FText4 dw Museum1FText5 -Museum1FText1: ; 5c135 (17:4135) +Museum1FText1: TX_ASM callba Func_f1c1b jp TextScriptEnd -Museum1FText2: ; 5c135 (17:4135) +Museum1FText2: TX_ASM callba Func_f1d2a jp TextScriptEnd -Museum1FText3: ; 5c135 (17:4135) +Museum1FText3: TX_ASM callba Func_f1d36 jp TextScriptEnd -Museum1FText4: ; 5c135 (17:4135) +Museum1FText4: TX_ASM callba Func_f1d80 jp TextScriptEnd -Museum1FText5: ; 5c135 (17:4135) +Museum1FText5: TX_ASM callba Func_f1d8c jp TextScriptEnd |