diff options
Diffstat (limited to 'scripts/lorelei.asm')
| -rwxr-xr-x | scripts/lorelei.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index d50fc1dc..d85dc192 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -1,4 +1,4 @@ -LoreleiScript: ; 7617b (1d:617b) +LoreleiScript: call LoreleiScript_76191 call EnableAutoTextBoxDrawing ld hl, LoreleiTrainerHeaders @@ -8,7 +8,7 @@ LoreleiScript: ; 7617b (1d:617b) ld [W_LORELEICURSCRIPT], a ret -LoreleiScript_76191: ; 76191 (1d:6191) +LoreleiScript_76191: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -26,22 +26,22 @@ LoreleiScript_76191: ; 76191 (1d:6191) lb bc, 0, 2 predef_jump ReplaceTileBlock -LoreleiScript_761b6: ; 761b6 (1d:61b6) +LoreleiScript_761b6: xor a ld [W_LORELEICURSCRIPT], a ret -LoreleiScriptPointers: ; 761bb (1d:61bb) +LoreleiScriptPointers: dw LoreleiScript0 dw DisplayEnemyTrainerTextAndStartBattle dw LoreleiScript2 dw LoreleiScript3 dw LoreleiScript4 -LoreleiScript4: ; 761c5 (1d:61c5) +LoreleiScript4: ret -LoreleiScript_761c6: ; 761c6 (1d:61c6) +LoreleiScript_761c6: ld hl, wSimulatedJoypadStatesEnd ld a, D_UP ld [hli], a @@ -58,7 +58,7 @@ LoreleiScript_761c6: ; 761c6 (1d:61c6) ld [W_CURMAPSCRIPT], a ret -LoreleiScript0: ; 761e2 (1d:61e2) +LoreleiScript0: ld hl, CoordsData_76223 call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers @@ -86,14 +86,14 @@ LoreleiScript0: ; 761e2 (1d:61e2) ld [W_CURMAPSCRIPT], a ret -CoordsData_76223: ; 76223 (1d:6223) +CoordsData_76223: db $0A,$04 db $0A,$05 db $0B,$04 db $0B,$05 db $FF -LoreleiScript3: ; 7622c (1d:622c) +LoreleiScript3: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -103,7 +103,7 @@ LoreleiScript3: ; 7622c (1d:622c) ld [W_LORELEICURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -LoreleiScript2: ; 7623f (1d:623f) +LoreleiScript2: call EndTrainerBattle ld a, [wIsInBattle] cp $ff @@ -112,12 +112,12 @@ LoreleiScript2: ; 7623f (1d:623f) ld [hSpriteIndexOrTextID], a jp DisplayTextID -LoreleiTextPointers: ; 76251 (1d:6251) +LoreleiTextPointers: dw LoreleiText1 dw LoreleiDontRunAwayText -LoreleiTrainerHeaders: ; 76255 (1d:6255) -LoreleiTrainerHeader0: ; 76255 (1d:6255) +LoreleiTrainerHeaders: +LoreleiTrainerHeader0: dbEventFlagBit EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 @@ -128,24 +128,24 @@ LoreleiTrainerHeader0: ; 76255 (1d:6255) db $ff -LoreleiText1: ; 76262 (1d:6262) +LoreleiText1: TX_ASM ld hl, LoreleiTrainerHeader0 call TalkToTrainer jp TextScriptEnd -LoreleiBeforeBattleText: ; 7626c (1d:626c) +LoreleiBeforeBattleText: TX_FAR _LoreleiBeforeBattleText db "@" -LoreleiEndBattleText: ; 76271 (1d:6271) +LoreleiEndBattleText: TX_FAR _LoreleiEndBattleText db "@" -LoreleiAfterBattleText: ; 76276 (1d:6276) +LoreleiAfterBattleText: TX_FAR _LoreleiAfterBattleText db "@" -LoreleiDontRunAwayText: ; 7627b (1d:627b) +LoreleiDontRunAwayText: TX_FAR _LoreleiDontRunAwayText db "@" |