foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
pokered/scripts/PokemonTower2F.asm

195 lines
4.4 KiB
NASM
Raw Normal View History

Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
PokemonTower2F_Script:
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call EnableAutoTextBoxDrawing
Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
ld hl, PokemonTower2F_ScriptPointers
ld a, [wPokemonTower2FCurScript]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
jp CallFunctionInTable
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
PokemonTower2FResetRivalEncounter:
xor a ; SCRIPT_POKEMONTOWER2F_DEFAULT
Rename joypad registers.
2014-05-25 17:51:53 +00:00
ld [wJoyIgnore], a
Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
ld [wPokemonTower2FCurScript], a
No more W_
2015-08-31 02:38:41 +00:00
ld [wCurMapScript], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret
Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
PokemonTower2F_ScriptPointers:
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
def_script_pointers
dw_const PokemonTower2FDefaultScript, SCRIPT_POKEMONTOWER2F_DEFAULT
dw_const PokemonTower2FDefeatedRivalScript, SCRIPT_POKEMONTOWER2F_DEFEATED_RIVAL
dw_const PokemonTower2FRivalExitsScript, SCRIPT_POKEMONTOWER2F_RIVAL_EXITS
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
PokemonTower2FDefaultScript:
Disassemble the BLUEMONS.GB debug ROM
2020-07-15 17:35:39 +00:00
IF DEF(_DEBUG)
call DebugPressedOrHeldB
ret nz
ENDC
named most of the used events
2015-07-21 17:36:03 +00:00
CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret nz
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
ld hl, PokemonTower2FRivalEncounterEventCoords
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call ArePlayerCoordsInArray
ret nc
Organize macros/ like pokecrystal While doing so I replaced the StopAllMusic macro with a SFX_STOP_ALL_MUSIC constant and applied it throughout the code.
2020-07-03 20:37:47 +00:00
ld a, SFX_STOP_ALL_MUSIC
commented audio code
2015-08-09 05:32:44 +00:00
ld [wNewSoundID], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PlaySound
ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
named most of the used events
2015-07-21 17:36:03 +00:00
ResetEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT
fix variable naming
2015-07-18 15:17:29 +00:00
ld a, [wCoordIndex]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
cp $1
naming
2015-07-20 00:52:26 +00:00
ld a, PLAYER_DIR_UP
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
ld b, SPRITE_FACING_DOWN
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
jr nz, .player_below_rival
named most of the used events
2015-07-21 17:36:03 +00:00
; the rival is on the left side and the player is on the right side
SetEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT
naming
2015-07-20 00:52:26 +00:00
ld a, PLAYER_DIR_LEFT
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
ld b, SPRITE_FACING_RIGHT
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
.player_below_rival
naming
2015-07-20 00:52:26 +00:00
ld [wPlayerMovingDirection], a
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
ld a, POKEMONTOWER2F_RIVAL
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteIndex], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, b
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteFacingDirection], a
Labelled and commented mostly sprite-related things
2014-09-10 03:55:19 +00:00
call SetSpriteFacingDirectionAndDelay
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
ld a, TEXT_POKEMONTOWER2F_RIVAL
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteIndexOrTextID], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call DisplayTextID
xor a
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hJoyHeld], a
ldh [hJoyPressed], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
PokemonTower2FRivalEncounterEventCoords:
Reformat map scripts' coordinate and movement data 'dbmapcoord' has X, Y order like other coordinate-related data macros
2020-07-16 16:32:19 +00:00
dbmapcoord 15, 5
dbmapcoord 14, 6
db $0F ; end? (should be $ff?)
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
PokemonTower2FDefeatedRivalScript:
No more W_
2015-08-31 02:38:41 +00:00
ld a, [wIsInBattle]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
cp $ff
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
jp z, PokemonTower2FResetRivalEncounter
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
Rename joypad registers.
2014-05-25 17:51:53 +00:00
ld [wJoyIgnore], a
named most of the used events
2015-07-21 17:36:03 +00:00
SetEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
ld a, TEXT_POKEMONTOWER2F_RIVAL
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteIndexOrTextID], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call DisplayTextID
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
ld de, PokemonTower2FRivalDownThenRightMovement
named most of the used events
2015-07-21 17:36:03 +00:00
CheckEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
jr nz, .got_movement
ld de, PokemonTower2FRivalRightThenDownMovement
.got_movement
ld a, POKEMONTOWER2F_RIVAL
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteIndex], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call MoveSprite
Organize macros/ like pokecrystal While doing so I replaced the StopAllMusic macro with a SFX_STOP_ALL_MUSIC constant and applied it throughout the code.
2020-07-03 20:37:47 +00:00
ld a, SFX_STOP_ALL_MUSIC
commented audio code
2015-08-09 05:32:44 +00:00
ld [wNewSoundID], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PlaySound
callba/callab -> farcall/callfar; jpba/jpab -> farjp/jpfar
2020-07-07 01:18:22 +00:00
farcall Music_RivalAlternateStart
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
ld a, SCRIPT_POKEMONTOWER2F_RIVAL_EXITS
Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
ld [wPokemonTower2FCurScript], a
No more W_
2015-08-31 02:38:41 +00:00
ld [wCurMapScript], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
PokemonTower2FRivalRightThenDownMovement:
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_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
Reformat map scripts' coordinate and movement data 'dbmapcoord' has X, Y order like other coordinate-related data macros
2020-07-16 16:32:19 +00:00
db -1 ; end
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
PokemonTower2FRivalDownThenRightMovement:
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_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
Reformat map scripts' coordinate and movement data 'dbmapcoord' has X, Y order like other coordinate-related data macros
2020-07-16 16:32:19 +00:00
db -1 ; end
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
PokemonTower2FRivalExitsScript:
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
Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
ld a, HS_POKEMON_TOWER_2F_RIVAL
more naming variables
2015-07-25 03:27:59 +00:00
ld [wMissableObjectIndex], a
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
Labelled and commented mostly sprite-related things
2014-09-10 03:55:19 +00:00
call PlayDefaultMusic
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
ld a, SCRIPT_POKEMONTOWER2F_DEFAULT
Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
ld [wPokemonTower2FCurScript], a
No more W_
2015-08-31 02:38:41 +00:00
ld [wCurMapScript], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret
Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
PokemonTower2F_TextPointers:
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
def_text_pointers
dw_const PokemonTower2FRivalText, TEXT_POKEMONTOWER2F_RIVAL
dw_const PokemonTower2FChannelerText, TEXT_POKEMONTOWER2F_CHANNELER
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
PokemonTower2FRivalText:
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_asm
named most of the used events
2015-07-21 17:36:03 +00:00
CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
jr z, .do_battle
ld hl, .HowsYourDexText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
jr .text_script_end
.do_battle
ld hl, .WhatBringsYouHereText
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, wd72d
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
set 6, [hl]
set 7, [hl]
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
ld hl, .DefeatedText
ld de, .VictoryText
Commented/labelled misc functions
2014-09-14 18:29:18 +00:00
call SaveEndBattleTextPointers
SONY -> RIVAL
2020-07-17 17:27:27 +00:00
ld a, OPP_RIVAL2
No more W_
2015-08-31 02:38:41 +00:00
ld [wCurOpponent], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
; select which team to use during the encounter
No more W_
2015-08-31 02:38:41 +00:00
ld a, [wRivalStarter]
Use constants for the starter mons
2014-05-21 12:48:30 +00:00
cp STARTER2
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
jr nz, .NotSquirtle
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, $4
jr .done
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
.NotSquirtle
Use constants for the starter mons
2014-05-21 12:48:30 +00:00
cp STARTER3
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
jr nz, .Charmander
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, $5
jr .done
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
.Charmander
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, $6
.done
No more W_
2015-08-31 02:38:41 +00:00
ld [wTrainerNo], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
ld a, SCRIPT_POKEMONTOWER2F_DEFEATED_RIVAL
Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
ld [wPokemonTower2FCurScript], a
No more W_
2015-08-31 02:38:41 +00:00
ld [wCurMapScript], a
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
.text_script_end
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
jp TextScriptEnd
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
.WhatBringsYouHereText:
text_far _PokemonTower2FRivalWhatBringsYouHereText
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_end
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
.DefeatedText:
text_far _PokemonTower2FRivalDefeatedText
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_end
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
.VictoryText:
text_far _PokemonTower2FRivalVictoryText
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_end
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
.HowsYourDexText:
text_far _PokemonTower2FRivalHowsYourDexText
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_end
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
PokemonTower2FChannelerText:
text_far _PokemonTower2FChannelerText
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_end
Reference in a new issue Copy permalink