diff options
Diffstat (limited to 'scripts/pokemontower7.asm')
| -rwxr-xr-x | scripts/pokemontower7.asm | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 0aebfec2..15c79b4d 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -1,4 +1,4 @@ -PokemonTower7Script: ; 60d05 (18:4d05) +PokemonTower7Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower7TrainerHeaders ld de, PokemonTower7ScriptPointers @@ -7,7 +7,7 @@ PokemonTower7Script: ; 60d05 (18:4d05) ld [wPokemonTower7CurScript], a ret -PokemonTower7Script_60d18: ; 60d18 (18:4d18) +PokemonTower7Script_60d18: xor a ld [wJoyIgnore], a ld [wPokemonTower7CurScript], a @@ -21,7 +21,7 @@ PokemonTower7ScriptPointers: dw PokemonTower7Script3 dw PokemonTower7Script4 -PokemonTower7Script2: ; 60d23 (18:4d23) +PokemonTower7Script2: ld hl, wFlags_0xcd60 res 0, [hl] ld a, [wIsInBattle] @@ -39,7 +39,7 @@ PokemonTower7Script2: ; 60d23 (18:4d23) ld [wCurMapScript], a ret -PokemonTower7Script3: ; 60d56 (18:4d56) +PokemonTower7Script3: ld a, [wd730] bit 0, a ret nz @@ -63,7 +63,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56) ld [wCurMapScript], a ret -PokemonTower7Script4: ; 60d86 (18:4d86) +PokemonTower7Script4: ld a, $ff ld [wJoyIgnore], a ld a, HS_POKEMONTOWER_7_MR_FUJI @@ -84,7 +84,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86) ld [wCurMapScript], a ret -PokemonTower7Script_60db6: ; 60db6 (18:4db6) +PokemonTower7Script_60db6: ld hl, CoordsData_60de3 ld a, [wSpriteIndex] dec a @@ -116,7 +116,7 @@ PokemonTower7Script_60db6: ; 60db6 (18:4db6) inc hl jr .asm_60dcb -CoordsData_60de3: ; 60de3 (18:4de3) +CoordsData_60de3: db $0C,$09 dw MovementData_60e13 db $0B,$0A @@ -198,14 +198,14 @@ MovementData_60e37: ; 60e37 db NPC_MOVEMENT_DOWN db $FF -PokemonTower7TextPointers: ; 60e3f (18:4e3f) +PokemonTower7TextPointers: dw PokemonTower7Text1 dw PokemonTower7Text2 dw PokemonTower7Text3 dw PokemonTower7FujiText -PokemonTower7TrainerHeaders: ; 60e47 (18:4e47) -PokemonTower7TrainerHeader0: ; 60e47 (18:4e47) +PokemonTower7TrainerHeaders: +PokemonTower7TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_7_TRAINER_0 @@ -214,7 +214,7 @@ PokemonTower7TrainerHeader0: ; 60e47 (18:4e47) dw PokemonTower7EndBattleText1 ; TextEndBattle dw PokemonTower7EndBattleText1 ; TextEndBattle -PokemonTower7TrainerHeader1: ; 60e53 (18:4e53) +PokemonTower7TrainerHeader1: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_7_TRAINER_1 @@ -223,7 +223,7 @@ PokemonTower7TrainerHeader1: ; 60e53 (18:4e53) dw PokemonTower7EndBattleText2 ; TextEndBattle dw PokemonTower7EndBattleText2 ; TextEndBattle -PokemonTower7TrainerHeader2: ; 60e5f (18:4e5f) +PokemonTower7TrainerHeader2: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_7_TRAINER_2 @@ -234,19 +234,19 @@ PokemonTower7TrainerHeader2: ; 60e5f (18:4e5f) db $ff -PokemonTower7Text1: ; 60e6c (18:4e6c) +PokemonTower7Text1: TX_ASM ld hl, PokemonTower7TrainerHeader0 call TalkToTrainer jp TextScriptEnd -PokemonTower7Text2: ; 60e76 (18:4e76) +PokemonTower7Text2: TX_ASM ld hl, PokemonTower7TrainerHeader1 call TalkToTrainer jp TextScriptEnd -PokemonTower7Text3: ; 60e80 (18:4e80) +PokemonTower7Text3: TX_ASM ld hl, PokemonTower7TrainerHeader2 call TalkToTrainer @@ -276,38 +276,38 @@ TowerRescueFujiText: TX_FAR _TowerRescueFujiText db "@" -PokemonTower7BattleText1: ; 60ec9 (18:4ec9) +PokemonTower7BattleText1: TX_FAR _PokemonTower7BattleText1 db "@" -PokemonTower7EndBattleText1: ; 60ece (18:4ece) +PokemonTower7EndBattleText1: TX_FAR _PokemonTower7EndBattleText1 db "@" -PokemonTower7AfterBattleText1: ; 60ed3 (18:4ed3) +PokemonTower7AfterBattleText1: TX_FAR _PokemonTower7AfterBattleText1 db "@" -PokemonTower7BattleText2: ; 60ed8 (18:4ed8) +PokemonTower7BattleText2: TX_FAR _PokemonTower7BattleText2 db "@" -PokemonTower7EndBattleText2: ; 60edd (18:4edd) +PokemonTower7EndBattleText2: TX_FAR _PokemonTower7EndBattleText2 db "@" -PokemonTower7AfterBattleText2: ; 60ee2 (18:4ee2) +PokemonTower7AfterBattleText2: TX_FAR _PokemonTower7AfterBattleText2 db "@" -PokemonTower7BattleText3: ; 60ee7 (18:4ee7) +PokemonTower7BattleText3: TX_FAR _PokemonTower7BattleText3 db "@" -PokemonTower7EndBattleText3: ; 60eec (18:4eec) +PokemonTower7EndBattleText3: TX_FAR _PokemonTower7EndBattleText3 db "@" -PokemonTower7AfterBattleText3: ; 60ef1 (18:4ef1) +PokemonTower7AfterBattleText3: TX_FAR _PokemonTower7AfterBattleText3 db "@" |