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/lance.asm | |
| parent | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (diff) | |
| parent | 6e8c3883e430b567f7aa8f9230e366e03610bd5a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'scripts/lance.asm')
| -rwxr-xr-x | scripts/lance.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/scripts/lance.asm b/scripts/lance.asm index 948787cc..7d67f6cd 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -1,4 +1,4 @@ -LanceScript: ; 5a2ae (16:62ae) +LanceScript: call LanceShowOrHideEntranceBlocks call EnableAutoTextBoxDrawing ld hl, LanceTrainerHeaders @@ -8,7 +8,7 @@ LanceScript: ; 5a2ae (16:62ae) ld [wLanceCurScript], a ret -LanceShowOrHideEntranceBlocks: ; 5a2c4 (16:62c4) +LanceShowOrHideEntranceBlocks: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -36,22 +36,22 @@ LanceShowOrHideEntranceBlocks: ; 5a2c4 (16:62c4) .LanceSetEntranceBlock predef_jump ReplaceTileBlock -ResetLanceScript: ; 5a2f5 (16:62f5) +ResetLanceScript: xor a ld [wLanceCurScript], a ret -LanceScriptPointers: ; 5a2fa (16:62fa) +LanceScriptPointers: dw LanceScript0 dw DisplayEnemyTrainerTextAndStartBattle dw LanceScript2 dw LanceScript3 dw LanceScript4 -LanceScript4: ; 5a304 (16:6304) +LanceScript4: ret -LanceScript0: ; 5a305 (16:6305) +LanceScript0: CheckEvent EVENT_BEAT_LANCE ret nz ld hl, LanceTriggerMovementCoords @@ -76,7 +76,7 @@ LanceScript0: ; 5a305 (16:6305) call PlaySound jp LanceShowOrHideEntranceBlocks -LanceTriggerMovementCoords: ; 5a33e (16:633e) +LanceTriggerMovementCoords: db $01,$05 db $02,$06 db $0B,$05 @@ -84,7 +84,7 @@ LanceTriggerMovementCoords: ; 5a33e (16:633e) db $10,$18 db $FF -LanceScript2: ; 5a349 (16:6349) +LanceScript2: call EndTrainerBattle ld a, [wIsInBattle] cp $ff @@ -93,7 +93,7 @@ LanceScript2: ; 5a349 (16:6349) ld [hSpriteIndexOrTextID], a jp DisplayTextID -WalkToLance: ; 5a35b (16:635b) +WalkToLance: ; Moves the player down the hallway to Lance's room. ld a, $ff ld [wJoyIgnore], a @@ -108,14 +108,14 @@ WalkToLance: ; 5a35b (16:635b) ld [wCurMapScript], a ret -WalkToLance_RLEList: ; 5a379 (16:6379) +WalkToLance_RLEList: db D_UP, $0D db D_LEFT, $0C db D_DOWN, $07 db D_LEFT, $06 db $FF -LanceScript3: ; 5a382 (16:6382) +LanceScript3: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -126,11 +126,11 @@ LanceScript3: ; 5a382 (16:6382) ld [wCurMapScript], a ret -LanceTextPointers: ; 5a395 (16:6395) +LanceTextPointers: dw LanceText1 -LanceTrainerHeaders: ; 5a397 (16:6397) -LanceTrainerHeader0: ; 5a397 (16:6397) +LanceTrainerHeaders: +LanceTrainerHeader0: dbEventFlagBit EVENT_BEAT_LANCES_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_LANCES_ROOM_TRAINER_0 @@ -141,21 +141,21 @@ LanceTrainerHeader0: ; 5a397 (16:6397) db $ff -LanceText1: ; 5a3a4 (16:63a4) +LanceText1: TX_ASM ld hl, LanceTrainerHeader0 call TalkToTrainer jp TextScriptEnd -LanceBeforeBattleText: ; 5a3ae (16:63ae) +LanceBeforeBattleText: TX_FAR _LanceBeforeBattleText db "@" -LanceEndBattleText: ; 5a3b3 (16:63b3) +LanceEndBattleText: TX_FAR _LanceEndBattleText db "@" -LanceAfterBattleText: ; 5a3b8 (16:63b8) +LanceAfterBattleText: TX_FAR _LanceAfterBattleText TX_ASM SetEvent EVENT_BEAT_LANCE |