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/FightingDojo.asm

297 lines
7.8 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
FightingDojo_Script:
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call EnableAutoTextBoxDrawing
The 'def_trainers' macro checks that trainers' event flag bits are correct (#318)
2021-04-13 22:24:37 +00:00
ld hl, FightingDojoTrainerHeaders
Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
ld de, FightingDojo_ScriptPointers
No more W_
2015-08-31 02:38:41 +00:00
ld a, [wFightingDojoCurScript]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call ExecuteCurMapScriptInTable
No more W_
2015-08-31 02:38:41 +00:00
ld [wFightingDojoCurScript], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret
Identify more map script labels
2023-11-19 00:44:03 +00:00
FightingDojoResetScripts:
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
xor a ; SCRIPT_FIGHTINGDOJO_DEFAULT
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 [wJoyIgnore], a
No more W_
2015-08-31 02:38:41 +00:00
ld [wFightingDojoCurScript], a
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
FightingDojo_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 FightingDojoDefaultScript, SCRIPT_FIGHTINGDOJO_DEFAULT
dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_FIGHTINGDOJO_START_BATTLE
dw_const EndTrainerBattle, SCRIPT_FIGHTINGDOJO_END_BATTLE
dw_const FightingDojoKarateMasterPostBattleScript, SCRIPT_FIGHTINGDOJO_KARATE_MASTER_POST_BATTLE
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
FightingDojoDefaultScript:
named most of the used events
2015-07-21 17:36:03 +00:00
CheckEvent EVENT_DEFEATED_FIGHTING_DOJO
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret nz
call CheckFightingMapTrainers
ld a, [wTrainerHeaderFlagBit]
and a
ret nz
named most of the used events
2015-07-21 17:36:03 +00:00
CheckEvent EVENT_BEAT_KARATE_MASTER
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret nz
xor a
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hJoyHeld], a
Identify `wSavedCoordIndex` and its other usages
2023-11-20 23:53:23 +00:00
ld [wSavedCoordIndex], a
No more W_
2015-08-31 02:38:41 +00:00
ld a, [wYCoord]
Use decimal, not hex, for sprite (object) coordinates in map scripts
2020-08-28 16:10:55 +00:00
cp 3
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret nz
No more W_
2015-08-31 02:38:41 +00:00
ld a, [wXCoord]
Use decimal, not hex, for sprite (object) coordinates in map scripts
2020-08-28 16:10:55 +00:00
cp 4
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret nz
Identify `wSavedCoordIndex` and its other usages
2023-11-20 23:53:23 +00:00
ld a, 1
ld [wSavedCoordIndex], a
naming
2015-07-20 00:52:26 +00:00
ld a, PLAYER_DIR_RIGHT
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, FIGHTINGDOJO_KARATE_MASTER
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteIndex], a
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
ld a, SPRITE_FACING_LEFT
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_FIGHTINGDOJO_KARATE_MASTER
Split `hSpriteIndexOrTextID` into `hSpriteIndex` and `hTextID` (#462) Also identify `wPPUpCountAndMaxPP`
2024-09-19 01:01:18 +00:00
ldh [hTextID], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call DisplayTextID
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
FightingDojoKarateMasterPostBattleScript:
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
Identify more map script labels
2023-11-19 00:44:03 +00:00
jp z, FightingDojoResetScripts
Identify `wSavedCoordIndex` and its other usages
2023-11-20 23:53:23 +00:00
ld a, [wSavedCoordIndex]
and a ; nz if the player was at (4, 3), left of the Karate Master
Identify more map script labels
2023-11-19 00:44:03 +00:00
jr z, .already_facing
naming
2015-07-20 00:52:26 +00:00
ld a, PLAYER_DIR_RIGHT
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, FIGHTINGDOJO_KARATE_MASTER
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteIndex], a
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
ld a, SPRITE_FACING_LEFT
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
Identify more map script labels
2023-11-19 00:44:03 +00:00
.already_facing
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, D_RIGHT | D_LEFT | D_UP | D_DOWN
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 [wJoyIgnore], a
named most of the used events
2015-07-21 17:36:03 +00:00
SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3
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_FIGHTINGDOJO_KARATE_MASTER_I_WILL_GIVE_YOU_A_POKEMON
Split `hSpriteIndexOrTextID` into `hSpriteIndex` and `hTextID` (#462) Also identify `wPPUpCountAndMaxPP`
2024-09-19 01:01:18 +00:00
ldh [hTextID], 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
xor a ; SCRIPT_FIGHTINGDOJO_DEFAULT
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 [wJoyIgnore], a
No more W_
2015-08-31 02:38:41 +00:00
ld [wFightingDojoCurScript], a
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
FightingDojo_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 FightingDojoKarateMasterText, TEXT_FIGHTINGDOJO_KARATE_MASTER
dw_const FightingDojoBlackbelt1Text, TEXT_FIGHTINGDOJO_BLACKBELT1
dw_const FightingDojoBlackbelt2Text, TEXT_FIGHTINGDOJO_BLACKBELT2
dw_const FightingDojoBlackbelt3Text, TEXT_FIGHTINGDOJO_BLACKBELT3
dw_const FightingDojoBlackbelt4Text, TEXT_FIGHTINGDOJO_BLACKBELT4
dw_const FightingDojoHitmonleePokeBallText, TEXT_FIGHTINGDOJO_HITMONLEE_POKE_BALL
dw_const FightingDojoHitmonchanPokeBallText, TEXT_FIGHTINGDOJO_HITMONCHAN_POKE_BALL
dw_const FightingDojoKarateMasterText.IWillGiveYouAPokemonText, TEXT_FIGHTINGDOJO_KARATE_MASTER_I_WILL_GIVE_YOU_A_POKEMON
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
The 'def_trainers' macro checks that trainers' event flag bits are correct (#318)
2021-04-13 22:24:37 +00:00
FightingDojoTrainerHeaders:
def_trainers 2
remove address comments
2016-06-12 00:24:04 +00:00
FightingDojoTrainerHeader0:
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
trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_0, 4, FightingDojoBlackbelt1BattleText, FightingDojoBlackbelt1EndBattleText, FightingDojoBlackbelt1AfterBattleText
remove address comments
2016-06-12 00:24:04 +00:00
FightingDojoTrainerHeader1:
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
trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_1, 4, FightingDojoBlackbelt2BattleText, FightingDojoBlackbelt2EndBattleText, FightingDojoBlackbelt2AfterBattleText
remove address comments
2016-06-12 00:24:04 +00:00
FightingDojoTrainerHeader2:
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
trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_2, 3, FightingDojoBlackbelt3BattleText, FightingDojoBlackbelt3EndBattleText, FightingDojoBlackbelt3AfterBattleText
remove address comments
2016-06-12 00:24:04 +00:00
FightingDojoTrainerHeader3:
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
trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_3, 3, FightingDojoBlackbelt4BattleText, FightingDojoBlackbelt4EndBattleText, FightingDojoBlackbelt4AfterBattleText
Use a 'trainer' macro for trainers in scripts/
2020-07-14 19:45:36 +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
FightingDojoKarateMasterText:
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_DEFEATED_FIGHTING_DOJO
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 nz, .defeated_dojo
named most of the used events
2015-07-21 17:36:03 +00:00
CheckEventReuseA EVENT_BEAT_KARATE_MASTER
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 nz, .defeated_master
ld hl, .Text
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
Identify various flag labels and bit constants (#454)
2024-07-16 17:02:54 +00:00
ld hl, wStatusFlags3
set BIT_TALKED_TO_TRAINER, [hl]
set BIT_PRINT_END_BATTLE_TEXT, [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, .DefeatedText
Commented/labelled misc functions
2014-09-14 18:29:18 +00:00
call SaveEndBattleTextPointers
Split `hSpriteIndexOrTextID` into `hSpriteIndex` and `hTextID` (#462) Also identify `wPPUpCountAndMaxPP`
2024-09-19 01:01:18 +00:00
ldh a, [hSpriteIndex]
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
call EngageMapTrainer
call InitBattleEnemyParameters
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_FIGHTINGDOJO_KARATE_MASTER_POST_BATTLE
No more W_
2015-08-31 02:38:41 +00:00
ld [wFightingDojoCurScript], a
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
jr .end
.defeated_dojo
ld hl, .StayAndTrainWithUsText
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 .end
.defeated_master
ld hl, .IWillGiveYouAPokemonText
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
.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
.Text:
text_far _FightingDojoKarateMasterText
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 _FightingDojoKarateMasterDefeatedText
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
.IWillGiveYouAPokemonText:
text_far _FightingDojoKarateMasterIWillGiveYouAPokemonText
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
.StayAndTrainWithUsText:
text_far _FightingDojoKarateMasterStayAndTrainWithUsText
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
FightingDojoBlackbelt1Text:
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_asm
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld hl, FightingDojoTrainerHeader0
call TalkToTrainer
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
FightingDojoBlackbelt1BattleText:
text_far _FightingDojoBlackbelt1BattleText
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
FightingDojoBlackbelt1EndBattleText:
text_far _FightingDojoBlackbelt1EndBattleText
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
FightingDojoBlackbelt1AfterBattleText:
text_far _FightingDojoBlackbelt1AfterBattleText
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
FightingDojoBlackbelt2Text:
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_asm
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld hl, FightingDojoTrainerHeader1
call TalkToTrainer
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
FightingDojoBlackbelt2BattleText:
text_far _FightingDojoBlackbelt2BattleText
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
FightingDojoBlackbelt2EndBattleText:
text_far _FightingDojoBlackbelt2EndBattleText
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
FightingDojoBlackbelt2AfterBattleText:
text_far _FightingDojoBlackbelt2AfterBattleText
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
FightingDojoBlackbelt3Text:
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_asm
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld hl, FightingDojoTrainerHeader2
call TalkToTrainer
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
FightingDojoBlackbelt3BattleText:
text_far _FightingDojoBlackbelt3BattleText
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
FightingDojoBlackbelt3EndBattleText:
text_far _FightingDojoBlackbelt3EndBattleText
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
FightingDojoBlackbelt3AfterBattleText:
text_far _FightingDojoBlackbelt3AfterBattleText
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
FightingDojoBlackbelt4Text:
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_asm
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld hl, FightingDojoTrainerHeader3
call TalkToTrainer
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
FightingDojoBlackbelt4BattleText:
text_far _FightingDojoBlackbelt4BattleText
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
FightingDojoBlackbelt4EndBattleText:
text_far _FightingDojoBlackbelt4EndBattleText
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
FightingDojoBlackbelt4AfterBattleText:
text_far _FightingDojoBlackbelt4AfterBattleText
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
FightingDojoHitmonleePokeBallText:
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
CheckEitherEventSet EVENT_GOT_HITMONLEE, EVENT_GOT_HITMONCHAN
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
jr z, .GetMon
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, FightingDojoBetterNotGetGreedyText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
jr .done
.GetMon
ld a, HITMONLEE
call DisplayPokedex
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, .Text
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
call YesNoChoice
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, [wCurrentMenuItem]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
and a
jr nz, .done
Identify wcf91 as wCurPartySpecies, wCurItem, and wCurListMenuItem (#457)
2024-08-04 14:05:33 +00:00
ld a, [wCurPartySpecies]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld b, a
ld c, 30
call GivePokemon
jr nc, .done
; once Poké Ball is taken, hide sprite
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_FIGHTING_DOJO_GIFT_1
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
named most of the used events
2015-07-21 17:36:03 +00:00
SetEvents EVENT_GOT_HITMONLEE, EVENT_DEFEATED_FIGHTING_DOJO
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
.done
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
.Text:
text_far _FightingDojoHitmonleePokeBallText
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
FightingDojoHitmonchanPokeBallText:
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
CheckEitherEventSet EVENT_GOT_HITMONLEE, EVENT_GOT_HITMONCHAN
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
jr z, .GetMon
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, FightingDojoBetterNotGetGreedyText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
jr .done
.GetMon
ld a, HITMONCHAN
call DisplayPokedex
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, .Text
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
call YesNoChoice
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, [wCurrentMenuItem]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
and a
jr nz, .done
Identify wcf91 as wCurPartySpecies, wCurItem, and wCurListMenuItem (#457)
2024-08-04 14:05:33 +00:00
ld a, [wCurPartySpecies]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld b, a
Add space between arguments in assembly instructions and remove redundant a in instructions like add a, x
2017-12-30 00:54:27 +00:00
ld c, 30
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call GivePokemon
jr nc, .done
named most of the used events
2015-07-21 17:36:03 +00:00
SetEvents EVENT_GOT_HITMONCHAN, EVENT_DEFEATED_FIGHTING_DOJO
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
; once Poké Ball is taken, hide sprite
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_FIGHTING_DOJO_GIFT_2
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
.done
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
.Text:
text_far _FightingDojoHitmonchanPokeBallText
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
FightingDojoBetterNotGetGreedyText:
text_far _FightingDojoBetterNotGetGreedyText
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