diff options
Diffstat (limited to 'scripts/pokemontower6.asm')
| -rwxr-xr-x | scripts/pokemontower6.asm | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index 1c3b1050..82c39a41 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -1,27 +1,27 @@ -PokemonTower6Script: ; 60aef (18:4aef) +PokemonTower6Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower6TrainerHeaders ld de, PokemonTower6ScriptPointers - ld a, [W_POKEMONTOWER6CURSCRIPT] + ld a, [wPokemonTower6CurScript] call ExecuteCurMapScriptInTable - ld [W_POKEMONTOWER6CURSCRIPT], a + ld [wPokemonTower6CurScript], a ret -PokemonTower6Script_60b02: ; 60b02 (18:4b02) +PokemonTower6Script_60b02: xor a ld [wJoyIgnore], a - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret -PokemonTower6ScriptPointers: ; 60b0d (18:4b0d) +PokemonTower6ScriptPointers: dw PokemonTower6Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw PokemonTower6Script3 dw PokemonTower6Script4 -PokemonTower6Script0: ; 60b17 (18:4b17) +PokemonTower6Script0: CheckEvent EVENT_BEAT_GHOST_MAROWAK jp nz, CheckFightingMapTrainers ld hl, CoordsData_60b45 @@ -37,14 +37,14 @@ PokemonTower6Script0: ; 60b17 (18:4b17) ld a, 30 ld [wCurEnemyLVL], a ld a, $4 - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret -CoordsData_60b45: ; 60b45 (18:4b45) +CoordsData_60b45: db $10,$0A,$FF -PokemonTower6Script4: ; 60b48 (18:4b48) +PokemonTower6Script4: ld a, [wIsInBattle] cp $ff jp z, PokemonTower6Script_60b02 @@ -66,8 +66,8 @@ PokemonTower6Script4: ; 60b48 (18:4b48) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret .asm_60b82 ld a, $1 @@ -80,21 +80,21 @@ PokemonTower6Script4: ; 60b48 (18:4b48) ld hl, wd730 set 7, [hl] ld a, $3 - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret -PokemonTower6Script3: ; 60ba1 (18:4ba1) +PokemonTower6Script3: ld a, [wSimulatedJoypadStatesIndex] and a ret nz call Delay3 xor a - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret -PokemonTower6TextPointers: ; 60bb1 (18:4bb1) +PokemonTower6TextPointers: dw PokemonTower6Text1 dw PokemonTower6Text2 dw PokemonTower6Text3 @@ -103,8 +103,8 @@ PokemonTower6TextPointers: ; 60bb1 (18:4bb1) dw PokemonTower6Text6 dw PokemonTower6Text7 -PokemonTower6TrainerHeaders: ; 60bbf (18:4bbf) -PokemonTower6TrainerHeader0: ; 60bbf (18:4bbf) +PokemonTower6TrainerHeaders: +PokemonTower6TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_0 @@ -113,7 +113,7 @@ PokemonTower6TrainerHeader0: ; 60bbf (18:4bbf) dw PokemonTower6EndBattleText1 ; TextEndBattle dw PokemonTower6EndBattleText1 ; TextEndBattle -PokemonTower6TrainerHeader1: ; 60bcb (18:4bcb) +PokemonTower6TrainerHeader1: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_1 @@ -122,7 +122,7 @@ PokemonTower6TrainerHeader1: ; 60bcb (18:4bcb) dw PokemonTower6EndBattleText2 ; TextEndBattle dw PokemonTower6EndBattleText2 ; TextEndBattle -PokemonTower6TrainerHeader2: ; 60bd7 (18:4bd7) +PokemonTower6TrainerHeader2: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_2 @@ -133,25 +133,25 @@ PokemonTower6TrainerHeader2: ; 60bd7 (18:4bd7) db $ff -PokemonTower6Text1: ; 60be4 (18:4be4) +PokemonTower6Text1: TX_ASM ld hl, PokemonTower6TrainerHeader0 call TalkToTrainer jp TextScriptEnd -PokemonTower6Text2: ; 60bee (18:4bee) +PokemonTower6Text2: TX_ASM ld hl, PokemonTower6TrainerHeader1 call TalkToTrainer jp TextScriptEnd -PokemonTower6Text3: ; 60bf8 (18:4bf8) +PokemonTower6Text3: TX_ASM ld hl, PokemonTower6TrainerHeader2 call TalkToTrainer jp TextScriptEnd -PokemonTower6Text7: ; 60c02 (18:4c02) +PokemonTower6Text7: TX_ASM ld hl, PokemonTower2Text_60c1f call PrintText @@ -164,50 +164,50 @@ PokemonTower6Text7: ; 60c02 (18:4c02) call PrintText jp TextScriptEnd -PokemonTower2Text_60c1f: ; 60c1f (18:4c1f) +PokemonTower2Text_60c1f: TX_FAR _PokemonTower2Text_60c1f db "@" -PokemonTower2Text_60c24: ; 60c24 (18:4c24) +PokemonTower2Text_60c24: TX_FAR _PokemonTower2Text_60c24 db "@" -PokemonTower6BattleText1: ; 60c29 (18:4c29) +PokemonTower6BattleText1: TX_FAR _PokemonTower6BattleText1 db "@" -PokemonTower6EndBattleText1: ; 60c2e (18:4c2e) +PokemonTower6EndBattleText1: TX_FAR _PokemonTower6EndBattleText1 db "@" -PokemonTower6AfterBattleText1: ; 60c33 (18:4c33) +PokemonTower6AfterBattleText1: TX_FAR _PokemonTower6AfterBattleText1 db "@" -PokemonTower6BattleText2: ; 60c38 (18:4c38) +PokemonTower6BattleText2: TX_FAR _PokemonTower6BattleText2 db "@" -PokemonTower6EndBattleText2: ; 60c3d (18:4c3d) +PokemonTower6EndBattleText2: TX_FAR _PokemonTower6EndBattleText2 db "@" -PokemonTower6AfterBattleText2: ; 60c42 (18:4c42) +PokemonTower6AfterBattleText2: TX_FAR _PokemonTower6AfterBattleText2 db "@" -PokemonTower6BattleText3: ; 60c47 (18:4c47) +PokemonTower6BattleText3: TX_FAR _PokemonTower6BattleText3 db "@" -PokemonTower6EndBattleText3: ; 60c4c (18:4c4c) +PokemonTower6EndBattleText3: TX_FAR _PokemonTower6EndBattleText3 db "@" -PokemonTower6AfterBattleText3: ; 60c51 (18:4c51) +PokemonTower6AfterBattleText3: TX_FAR _PokemonTower6AfterBattleText3 db "@" -PokemonTower6Text6: ; 60c56 (18:4c56) +PokemonTower6Text6: TX_FAR _PokemonTower6Text6 db "@" |