diff options
Diffstat (limited to 'scripts/bruno.asm')
| -rwxr-xr-x | scripts/bruno.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/scripts/bruno.asm b/scripts/bruno.asm index 5318ecba..fcf18b8d 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -1,4 +1,4 @@ -BrunoScript: ; 762d6 (1d:62d6) +BrunoScript: call BrunoScript_762ec call EnableAutoTextBoxDrawing ld hl, BrunoTrainerHeaders @@ -8,7 +8,7 @@ BrunoScript: ; 762d6 (1d:62d6) ld [W_BRUNOCURSCRIPT], a ret -BrunoScript_762ec: ; 762ec (1d:62ec) +BrunoScript_762ec: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -20,27 +20,27 @@ BrunoScript_762ec: ; 762ec (1d:62ec) .asm_76300 ld a, $24 -BrunoScript_76302: ; 76302 (1d:6302) +BrunoScript_76302: ld [wNewTileBlockID], a lb bc, 0, 2 predef_jump ReplaceTileBlock -BrunoScript_7630d: ; 7630d (1d:630d) +BrunoScript_7630d: xor a ld [W_BRUNOCURSCRIPT], a ret -BrunoScriptPointers: ; 76312 (1d:6312) +BrunoScriptPointers: dw BrunoScript0 dw DisplayEnemyTrainerTextAndStartBattle dw BrunoScript2 dw BrunoScript3 dw BrunoScript4 -BrunoScript4: ; 7631c (1d:631c) +BrunoScript4: ret -BrunoScript_7631d: ; 7631d (1d:631d) +BrunoScript_7631d: ld hl, wSimulatedJoypadStatesEnd ld a, D_UP ld [hli], a @@ -57,7 +57,7 @@ BrunoScript_7631d: ; 7631d (1d:631d) ld [W_CURMAPSCRIPT], a ret -BrunoScript0: ; 76339 (1d:6339) +BrunoScript0: ld hl, CoordsData_7637a call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers @@ -85,14 +85,14 @@ BrunoScript0: ; 76339 (1d:6339) ld [W_CURMAPSCRIPT], a ret -CoordsData_7637a: ; 7637a (1d:637a) +CoordsData_7637a: db $0A,$04 db $0A,$05 db $0B,$04 db $0B,$05 db $FF -BrunoScript3: ; 76383 (1d:6383) +BrunoScript3: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -103,7 +103,7 @@ BrunoScript3: ; 76383 (1d:6383) ld [W_CURMAPSCRIPT], a ret -BrunoScript2: ; 76396 (1d:6396) +BrunoScript2: call EndTrainerBattle ld a, [wIsInBattle] cp $ff @@ -112,12 +112,12 @@ BrunoScript2: ; 76396 (1d:6396) ld [hSpriteIndexOrTextID], a jp DisplayTextID -BrunoTextPointers: ; 763a8 (1d:63a8) +BrunoTextPointers: dw BrunoText1 dw BrunoDontRunAwayText -BrunoTrainerHeaders: ; 763ac (1d:63ac) -BrunoTrainerHeader0: ; 763ac (1d:63ac) +BrunoTrainerHeaders: +BrunoTrainerHeader0: dbEventFlagBit EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 @@ -128,24 +128,24 @@ BrunoTrainerHeader0: ; 763ac (1d:63ac) db $ff -BrunoText1: ; 763b9 (1d:63b9) +BrunoText1: TX_ASM ld hl, BrunoTrainerHeader0 call TalkToTrainer jp TextScriptEnd -BrunoBeforeBattleText: ; 763c3 (1d:63c3) +BrunoBeforeBattleText: TX_FAR _BrunoBeforeBattleText db "@" -BrunoEndBattleText: ; 763c8 (1d:63c8) +BrunoEndBattleText: TX_FAR _BrunoEndBattleText db "@" -BrunoAfterBattleText: ; 763cd (1d:63cd) +BrunoAfterBattleText: TX_FAR _BrunoAfterBattleText db "@" -BrunoDontRunAwayText: ; 763d2 (1d:63d2) +BrunoDontRunAwayText: TX_FAR _BrunoDontRunAwayText db "@" |