foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-23 06:58:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
pokered/scripts/pokemontower7.asm

316 lines
6.5 KiB
NASM
Raw Normal View History

Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
PokemonTower7Script: ; 60d05 (18:4d05)
call EnableAutoTextBoxDrawing
ld hl, PokemonTower7TrainerHeaders
ld de, PokemonTower7ScriptPointers
ld a, [W_POKEMONTOWER7CURSCRIPT]
call ExecuteCurMapScriptInTable
ld [W_POKEMONTOWER7CURSCRIPT], a
ret
PokemonTower7Script_60d18: ; 60d18 (18:4d18)
xor a
Rename joypad registers.
2014-05-25 17:51:53 +00:00
ld [wJoyIgnore], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld [W_POKEMONTOWER7CURSCRIPT], a
ld [W_CURMAPSCRIPT], a
ret
Labels for Fuji in Pokémon Tower.
2014-10-27 03:00:29 +00:00
PokemonTower7ScriptPointers:
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
dw CheckFightingMapTrainers
Commented/labelled misc functions
2014-09-14 18:29:18 +00:00
dw DisplayEnemyTrainerTextAndStartBattle
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
dw PokemonTower7Script2
dw PokemonTower7Script3
dw PokemonTower7Script4
PokemonTower7Script2: ; 60d23 (18:4d23)
ld hl, wFlags_0xcd60
res 0, [hl]
Rename/organize part 2 of 4 rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
2015-07-03 19:38:12 +00:00
ld a, [W_ISINBATTLE]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
cp $ff
jp z, PokemonTower7Script_60d18
call EndTrainerBattle
ld a, $f0
Rename joypad registers.
2014-05-25 17:51:53 +00:00
ld [wJoyIgnore], a
Commented more sprite and map code
2014-09-13 07:50:56 +00:00
ld a, [wSpriteIndex]
Rename/organize part 2 of 4 rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
2015-07-03 19:38:12 +00:00
ld [H_DOWNARROWBLINKCNT2], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call DisplayTextID
call PokemonTower7Script_60db6
ld a, $3
ld [W_POKEMONTOWER7CURSCRIPT], a
ld [W_CURMAPSCRIPT], a
ret
PokemonTower7Script3: ; 60d56 (18:4d56)
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wd730]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
bit 0, a
ret nz
ld hl, W_MISSABLEOBJECTLIST
Commented more sprite and map code
2014-09-13 07:50:56 +00:00
ld a, [wSpriteIndex]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld b, a
.missableObjectsListLoop
ld a, [hli]
cp b ; search for sprite ID in missing objects list
ld a, [hli]
jr nz, .missableObjectsListLoop
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wcc4d], a ; remove missable object
Use macros for predef calls/jumps instead of static ids.
2014-06-16 20:57:26 +00:00
predef HideObject
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
xor a
Rename joypad registers.
2014-05-25 17:51:53 +00:00
ld [wJoyIgnore], a
Commented more sprite and map code
2014-09-13 07:50:56 +00:00
ld [wSpriteIndex], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld [wTrainerHeaderFlagBit], a
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wda38], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, $0
ld [W_POKEMONTOWER7CURSCRIPT], a
ld [W_CURMAPSCRIPT], a
ret
PokemonTower7Script4: ; 60d86 (18:4d86)
ld a, $ff
Rename joypad registers.
2014-05-25 17:51:53 +00:00
ld [wJoyIgnore], a
Make Hide/Show objects more dynamic be on the look out for more static ids in the wild unused constants are still included because a script could be written to check whether the player has picked up an item/fought a legendary etc.
2014-09-25 23:21:49 +00:00
ld a, HS_POKEMONTOWER_7_MR_FUJI
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wcc4d], a
Use macros for predef calls/jumps instead of static ids.
2014-06-16 20:57:26 +00:00
predef HideObject
Start using text predef macros also sprite direction constants
2015-07-04 05:44:12 +00:00
ld a, SPRITE_FACING_UP
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wSpriteStateData1 + 9], a
Pick off some more static map ids.
2015-02-07 19:16:00 +00:00
ld a, LAVENDER_HOUSE_1
Rename/organize part 2 of 4 rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
2015-07-03 19:38:12 +00:00
ld [H_DOWNARROWBLINKCNT1], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, $1
Commented more sprite and map code
2014-09-13 07:50:56 +00:00
ld [wDestinationWarpID], a
Merge branch 'master' of https://github.com/huderlem/pokered into pull-data Conflicts: main.asm text.asm text/maps/route_22.asm
2014-05-19 14:38:20 +00:00
ld a, LAVENDER_TOWN
ld [wLastMap], a
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld hl, wd72d
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
set 3, [hl]
ld a, $0
ld [W_POKEMONTOWER7CURSCRIPT], a
ld [W_CURMAPSCRIPT], a
ret
PokemonTower7Script_60db6: ; 60db6 (18:4db6)
Rename/organize part 2 of 4 rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
2015-07-03 19:38:12 +00:00
ld hl, CoordsData_60de3
Commented more sprite and map code
2014-09-13 07:50:56 +00:00
ld a, [wSpriteIndex]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
dec a
swap a
ld d, $0
ld e, a
add hl, de
Rename/organize part 2 of 4 rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
2015-07-03 19:38:12 +00:00
ld a, [W_YCOORD]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld b, a
Rename/organize part 2 of 4 rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
2015-07-03 19:38:12 +00:00
ld a, [W_XCOORD]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld c, a
.asm_60dcb
ld a, [hli]
cp b
jr nz, .asm_60dde
ld a, [hli]
cp c
jr nz, .asm_60ddf
ld a, [hli]
ld d, [hl]
ld e, a
Commented more sprite and map code
2014-09-13 07:50:56 +00:00
ld a, [wSpriteIndex]
Rename/organize part 2 of 4 rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
2015-07-03 19:38:12 +00:00
ld [H_DOWNARROWBLINKCNT2], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
jp MoveSprite
.asm_60dde
inc hl
.asm_60ddf
inc hl
inc hl
jr .asm_60dcb
CoordsData_60de3: ; 60de3 (18:4de3)
db $0C,$09
dw MovementData_60e13
db $0B,$0A
dw MovementData_60e1b
db $0B,$0B
dw MovementData_60e22
db $0B,$0C
dw MovementData_60e22
db $0A,$0C
dw MovementData_60e28
db $09,$0B
dw MovementData_60e30
db $09,$0A
dw MovementData_60e22
db $09,$09
dw MovementData_60e22
db $08,$09
dw MovementData_60e37
db $07,$0A
dw MovementData_60e22
db $07,$0B
dw MovementData_60e22
db $07,$0C
dw MovementData_60e22
MovementData_60e13: ; 60e13
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_LEFT
db $FF
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
MovementData_60e1b: ; 60e1b
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
MovementData_60e22: ; 60e22
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
MovementData_60e28: ; 60e28
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
MovementData_60e30: ; 60e30
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
MovementData_60e37: ; 60e37
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
PokemonTower7TextPointers: ; 60e3f (18:4e3f)
dw PokemonTower7Text1
dw PokemonTower7Text2
dw PokemonTower7Text3
Labels for Fuji in Pokémon Tower.
2014-10-27 03:00:29 +00:00
dw PokemonTower7FujiText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
PokemonTower7TrainerHeaders: ; 60e47 (18:4e47)
PokemonTower7TrainerHeader0: ; 60e47 (18:4e47)
db $1 ; flag's bit
db ($3 << 4) ; trainer's view range
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
dw wd769 ; flag's byte
Rename/organize part 2 of 4 rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
2015-07-03 19:38:12 +00:00
dw PokemonTower7BattleText1 ; TextBeforeBattle
dw PokemonTower7AfterBattleText1 ; TextAfterBattle
dw PokemonTower7EndBattleText1 ; TextEndBattle
dw PokemonTower7EndBattleText1 ; TextEndBattle
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
PokemonTower7TrainerHeader1: ; 60e53 (18:4e53)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
dw wd769 ; flag's byte
Rename/organize part 2 of 4 rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
2015-07-03 19:38:12 +00:00
dw PokemonTower7BattleText2 ; TextBeforeBattle
dw PokemonTower7AfterBattleText2 ; TextAfterBattle
dw PokemonTower7EndBattleText2 ; TextEndBattle
dw PokemonTower7EndBattleText2 ; TextEndBattle
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
PokemonTower7TrainerHeader2: ; 60e5f (18:4e5f)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
dw wd769 ; flag's byte
Rename/organize part 2 of 4 rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
2015-07-03 19:38:12 +00:00
dw PokemonTower7BattleText3 ; TextBeforeBattle
dw PokemonTower7AfterBattleText3 ; TextAfterBattle
dw PokemonTower7EndBattleText3 ; TextEndBattle
dw PokemonTower7EndBattleText3 ; TextEndBattle
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
db $ff
PokemonTower7Text1: ; 60e6c (18:4e6c)
TX_ASM
2015-07-03 19:58:50 +00:00
TX_ASM
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld hl, PokemonTower7TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
PokemonTower7Text2: ; 60e76 (18:4e76)
TX_ASM
2015-07-03 19:58:50 +00:00
TX_ASM
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld hl, PokemonTower7TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
PokemonTower7Text3: ; 60e80 (18:4e80)
TX_ASM
2015-07-03 19:58:50 +00:00
TX_ASM
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld hl, PokemonTower7TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
Labels for Fuji in Pokémon Tower.
2014-10-27 03:00:29 +00:00
PokemonTower7FujiText:
More TX_ASM
2015-07-04 03:49:20 +00:00
TX_ASM
Labels for Fuji in Pokémon Tower.
2014-10-27 03:00:29 +00:00
ld hl, TowerRescueFujiText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld hl, wd7e0
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
set 7, [hl]
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld hl, wd769
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
set 7, [hl]
Make Hide/Show objects more dynamic be on the look out for more static ids in the wild unused constants are still included because a script could be written to check whether the player has picked up an item/fought a legendary etc.
2014-09-25 23:21:49 +00:00
ld a, HS_LAVENDER_HOUSE_1_MR_FUJI
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wcc4d], a
Use macros for predef calls/jumps instead of static ids.
2014-06-16 20:57:26 +00:00
predef ShowObject
Make Hide/Show objects more dynamic be on the look out for more static ids in the wild unused constants are still included because a script could be written to check whether the player has picked up an item/fought a legendary etc.
2014-09-25 23:21:49 +00:00
ld a, HS_SAFFRON_CITY_E
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wcc4d], a
Use macros for predef calls/jumps instead of static ids.
2014-06-16 20:57:26 +00:00
predef HideObject
Make Hide/Show objects more dynamic be on the look out for more static ids in the wild unused constants are still included because a script could be written to check whether the player has picked up an item/fought a legendary etc.
2014-09-25 23:21:49 +00:00
ld a, HS_SAFFRON_CITY_F
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wcc4d], a
Use macros for predef calls/jumps instead of static ids.
2014-06-16 20:57:26 +00:00
predef ShowObject
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, $4
ld [W_POKEMONTOWER7CURSCRIPT], a
ld [W_CURMAPSCRIPT], a
jp TextScriptEnd
Labels for Fuji in Pokémon Tower.
2014-10-27 03:00:29 +00:00
TowerRescueFujiText:
TX_FAR _TowerRescueFujiText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
db "@"
PokemonTower7BattleText1: ; 60ec9 (18:4ec9)
TX_FAR _PokemonTower7BattleText1
db "@"
PokemonTower7EndBattleText1: ; 60ece (18:4ece)
TX_FAR _PokemonTower7EndBattleText1
db "@"
PokemonTower7AfterBattleText1: ; 60ed3 (18:4ed3)
TX_FAR _PokemonTower7AfterBattleText1
db "@"
PokemonTower7BattleText2: ; 60ed8 (18:4ed8)
TX_FAR _PokemonTower7BattleText2
db "@"
PokemonTower7EndBattleText2: ; 60edd (18:4edd)
TX_FAR _PokemonTower7EndBattleText2
db "@"
PokemonTower7AfterBattleText2: ; 60ee2 (18:4ee2)
TX_FAR _PokemonTower7AfterBattleText2
db "@"
PokemonTower7BattleText3: ; 60ee7 (18:4ee7)
TX_FAR _PokemonTower7BattleText3
db "@"
PokemonTower7EndBattleText3: ; 60eec (18:4eec)
TX_FAR _PokemonTower7EndBattleText3
db "@"
PokemonTower7AfterBattleText3: ; 60ef1 (18:4ef1)
TX_FAR _PokemonTower7AfterBattleText3
db "@"
Reference in a new issue Copy permalink