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

447 lines
10 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
Route22_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, Route22_ScriptPointers
No more W_
2015-08-31 02:38:41 +00:00
ld a, [wRoute22CurScript]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
jp CallFunctionInTable
Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
Route22_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 Route22DefaultScript, SCRIPT_ROUTE22_DEFAULT
dw_const Route22Rival1StartBattleScript, SCRIPT_ROUTE22_RIVAL1_START_BATTLE
dw_const Route22Rival1AfterBattleScript, SCRIPT_ROUTE22_RIVAL1_AFTER_BATTLE
dw_const Route22Rival1ExitScript, SCRIPT_ROUTE22_RIVAL1_EXIT
dw_const Route22Rival2StartBattleScript, SCRIPT_ROUTE22_RIVAL2_START_BATTLE
dw_const Route22Rival2AfterBattleScript, SCRIPT_ROUTE22_RIVAL2_AFTER_BATTLE
dw_const Route22Rival2ExitScript, SCRIPT_ROUTE22_RIVAL2_EXIT
dw_const Route22NoopScript, SCRIPT_ROUTE22_NOOP
Route22SetDefaultScript:
xor a ; SCRIPT_ROUTE22_DEFAULT
Rename joypad registers.
2014-05-25 17:51:53 +00:00
ld [wJoyIgnore], a
No more W_
2015-08-31 02:38:41 +00:00
ld [wRoute22CurScript], 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
Route22NoopScript:
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
Route22GetRivalTrainerNoByStarterScript:
No more W_
2015-08-31 02:38:41 +00:00
ld a, [wRivalStarter]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld b, 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
.next_trainer_no
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, [hli]
cp b
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, .got_trainer_no
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
inc 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
jr .next_trainer_no
.got_trainer_no
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, [hl]
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
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
Route22MoveRivalRightScript:
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 de, Route22RivalMovementData
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, [wcf0d]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
cp $1
Identify more map script labels
2023-11-19 00:44:03 +00:00
jr z, .skip_first_right
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
inc de
Identify more map script labels
2023-11-19 00:44:03 +00:00
.skip_first_right
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call MoveSprite
fix variable naming
2015-07-18 15:17:29 +00:00
ld a, SPRITE_FACING_RIGHT
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
jp SetSpriteFacingDirectionAndDelay
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
remove address comments
2016-06-12 00:24:04 +00:00
Route22RivalMovementData:
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
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
Route22DefaultScript:
make route22 rival events more consistent
2015-07-24 04:20:20 +00:00
CheckEvent EVENT_ROUTE22_RIVAL_WANTS_BATTLE
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret z
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, .Route22RivalBattleCoords
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call ArePlayerCoordsInArray
ret nc
fix variable naming
2015-07-18 15:17:29 +00:00
ld a, [wCoordIndex]
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 [wcf0d], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
xor a
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hJoyHeld], 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, D_RIGHT | D_LEFT | D_UP | D_DOWN
Rename joypad registers.
2014-05-25 17:51:53 +00:00
ld [wJoyIgnore], a
naming
2015-07-20 00:52:26 +00:00
ld a, PLAYER_DIR_LEFT
ld [wPlayerMovingDirection], a
named most of the used events
2015-07-21 17:36:03 +00:00
CheckEvent EVENT_1ST_ROUTE22_RIVAL_BATTLE
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, Route22FirstRivalBattleScript
CheckEventReuseA EVENT_2ND_ROUTE22_RIVAL_BATTLE
jp nz, Route22SecondRivalBattleScript
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret
Clean up white space
2014-06-09 20:58:02 +00:00
.Route22RivalBattleCoords
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 29, 4
dbmapcoord 29, 5
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
Route22FirstRivalBattleScript:
ld a, ROUTE22_RIVAL1
player animations, emotion bubbles, etc.
2015-07-14 21:32:49 +00:00
ld [wEmotionBubbleSpriteIndex], a
xor a ; EXCLAMATION_BUBBLE
ld [wWhichEmotionBubble], a
Use macros for predef calls/jumps instead of static ids.
2014-06-16 20:57:26 +00:00
predef EmotionBubble
Commented more sprite and map code
2014-09-13 07:50:56 +00:00
ld a, [wWalkBikeSurfState]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
and 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 z, .walking
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
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
.walking
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
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, ROUTE22_RIVAL1
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteIndex], 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
call Route22MoveRivalRightScript
ld a, SCRIPT_ROUTE22_RIVAL1_START_BATTLE
No more W_
2015-08-31 02:38:41 +00:00
ld [wRoute22CurScript], 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
Route22Rival1StartBattleScript:
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
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, [wcf0d]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
cp $1
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, .set_rival_facing_right
naming
2015-07-20 00:52:26 +00:00
ld a, PLAYER_DIR_DOWN
ld [wPlayerMovingDirection], a
fix variable naming
2015-07-18 15:17:29 +00:00
ld a, SPRITE_FACING_UP
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 .set_rival_facing_direction
.set_rival_facing_right
fix variable naming
2015-07-18 15:17:29 +00:00
ld a, 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
.set_rival_facing_direction
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteFacingDirection], 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, ROUTE22_RIVAL1
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteIndex], a
Labelled and commented mostly sprite-related things
2014-09-10 03:55:19 +00:00
call SetSpriteFacingDirectionAndDelay
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
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_ROUTE22_RIVAL1
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
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, Route22Rival1DefeatedText
ld de, Route22Rival1VictoryText
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_RIVAL1
No more W_
2015-08-31 02:38:41 +00:00
ld [wCurOpponent], 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 hl, .StarterTable
call Route22GetRivalTrainerNoByStarterScript
ld a, SCRIPT_ROUTE22_RIVAL1_AFTER_BATTLE
No more W_
2015-08-31 02:38:41 +00:00
ld [wRoute22CurScript], 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
.StarterTable:
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
; starter the rival picked, rival trainer number
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 STARTER2, 4
db STARTER3, 5
db STARTER1, 6
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
Route22Rival1AfterBattleScript:
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, Route22SetDefaultScript
Identify wSpriteStateData1 and wSpriteStateData2 offsets, like pokeyellow
2020-07-05 21:29:11 +00:00
ld a, [wSpritePlayerStateData1FacingDirection]
Start using text predef macros also sprite direction constants
2015-07-04 05:44:12 +00:00
and a ; cp 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, .not_facing_down
Start using text predef macros also sprite direction constants
2015-07-04 05:44:12 +00:00
ld a, SPRITE_FACING_UP
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 .set_rival_facing
.not_facing_down
Start using text predef macros also sprite direction constants
2015-07-04 05:44:12 +00:00
ld a, 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
.set_rival_facing
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteFacingDirection], 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, ROUTE22_RIVAL1
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteIndex], 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, D_RIGHT | D_LEFT | D_UP | D_DOWN
Rename joypad registers.
2014-05-25 17:51:53 +00:00
ld [wJoyIgnore], a
make route22 rival events more consistent
2015-07-24 04:20:20 +00:00
SetEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE
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_ROUTE22_RIVAL1
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
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
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, [wcf0d]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
cp $1
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, .exit_movement_2
call .RivalExit1Script
jr .next_script
.exit_movement_2
call .RivalExit2Script
.next_script
ld a, SCRIPT_ROUTE22_RIVAL1_EXIT
No more W_
2015-08-31 02:38:41 +00:00
ld [wRoute22CurScript], 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
.RivalExit1Script:
ld de, Route22Rival1ExitMovementData1
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 Route22MoveRival1
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
.RivalExit2Script:
ld de, Route22Rival1ExitMovementData2
remove address comments
2016-06-12 00:24:04 +00:00
Route22MoveRival1:
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, ROUTE22_RIVAL1
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
jp MoveSprite
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
Route22Rival1ExitMovementData1:
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
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
Route22Rival1ExitMovementData2:
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
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
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
Route22Rival1ExitScript:
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
xor a
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_ROUTE_22_RIVAL_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
Labelled and commented mostly sprite-related things
2014-09-10 03:55:19 +00:00
call PlayDefaultMusic
make route22 rival events more consistent
2015-07-24 04:20:20 +00:00
ResetEvents EVENT_1ST_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
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_ROUTE22_DEFAULT
No more W_
2015-08-31 02:38:41 +00:00
ld [wRoute22CurScript], 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
Route22SecondRivalBattleScript:
ld a, ROUTE22_RIVAL2
player animations, emotion bubbles, etc.
2015-07-14 21:32:49 +00:00
ld [wEmotionBubbleSpriteIndex], a
xor a ; EXCLAMATION_BUBBLE
ld [wWhichEmotionBubble], a
Use macros for predef calls/jumps instead of static ids.
2014-06-16 20:57:26 +00:00
predef EmotionBubble
Commented more sprite and map code
2014-09-13 07:50:56 +00:00
ld a, [wWalkBikeSurfState]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
and 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 z, .walking
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
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
.walking
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_RivalAlternateTempo
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, ROUTE22_RIVAL2
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteIndex], 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
call Route22MoveRivalRightScript
ld a, SCRIPT_ROUTE22_RIVAL2_START_BATTLE
No more W_
2015-08-31 02:38:41 +00:00
ld [wRoute22CurScript], 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
Route22Rival2StartBattleScript:
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
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, ROUTE22_RIVAL2
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteIndex], 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 a, [wcf0d]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
cp $1
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, .set_player_direction_left
naming
2015-07-20 00:52:26 +00:00
ld a, PLAYER_DIR_DOWN
ld [wPlayerMovingDirection], a
fix variable naming
2015-07-18 15:17:29 +00:00
ld a, SPRITE_FACING_UP
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 .set_rival_facing_direction
.set_player_direction_left
naming
2015-07-20 00:52:26 +00:00
ld a, PLAYER_DIR_LEFT
ld [wPlayerMovingDirection], a
fix variable naming
2015-07-18 15:17:29 +00:00
ld a, 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
.set_rival_facing_direction
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
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
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_ROUTE22_RIVAL2
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
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, Route22Rival2DefeatedText
ld de, Route22Rival2VictoryText
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
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, .StarterTable
call Route22GetRivalTrainerNoByStarterScript
ld a, SCRIPT_ROUTE22_RIVAL2_AFTER_BATTLE
No more W_
2015-08-31 02:38:41 +00:00
ld [wRoute22CurScript], 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
.StarterTable:
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 STARTER2, 10
db STARTER3, 11
db STARTER1, 12
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
Route22Rival2AfterBattleScript:
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, Route22SetDefaultScript
ld a, ROUTE22_RIVAL2
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteIndex], 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 a, [wcf0d]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
cp $1
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, .set_player_direction_left
naming
2015-07-20 00:52:26 +00:00
ld a, PLAYER_DIR_DOWN
ld [wPlayerMovingDirection], a
fix variable naming
2015-07-18 15:17:29 +00:00
ld a, SPRITE_FACING_UP
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 .set_rival_facing_direction
.set_player_direction_left
naming
2015-07-20 00:52:26 +00:00
ld a, PLAYER_DIR_LEFT
ld [wPlayerMovingDirection], a
fix variable naming
2015-07-18 15:17:29 +00:00
ld a, 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
.set_rival_facing_direction
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, D_RIGHT | D_LEFT | D_UP | D_DOWN
Rename joypad registers.
2014-05-25 17:51:53 +00:00
ld [wJoyIgnore], a
make route22 rival events more consistent
2015-07-24 04:20:20 +00:00
SetEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE
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_ROUTE22_RIVAL2
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
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_RivalAlternateStartAndTempo
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, [wcf0d]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
cp $1
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, .exit_movement_2
call .RivalExit1Script
jr .next_script
.exit_movement_2
call .RivalExit2Script
.next_script
ld a, SCRIPT_ROUTE22_RIVAL2_EXIT
No more W_
2015-08-31 02:38:41 +00:00
ld [wRoute22CurScript], 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
.RivalExit1Script:
ld de, Route22Rival2ExitMovementData1
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 Route22MoveRival2
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
.RivalExit2Script:
ld de, Route22Rival2ExitMovementData2
remove address comments
2016-06-12 00:24:04 +00:00
Route22MoveRival2:
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, ROUTE22_RIVAL2
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
jp MoveSprite
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
Route22Rival2ExitMovementData1:
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
db NPC_MOVEMENT_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
Route22Rival2ExitMovementData2:
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_LEFT
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
Route22Rival2ExitScript:
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
xor a
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_ROUTE_22_RIVAL_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
Labelled and commented mostly sprite-related things
2014-09-10 03:55:19 +00:00
call PlayDefaultMusic
make route22 rival events more consistent
2015-07-24 04:20:20 +00:00
ResetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
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_ROUTE22_NOOP
No more W_
2015-08-31 02:38:41 +00:00
ld [wRoute22CurScript], 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
Route22_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 Route22Rival1Text, TEXT_ROUTE22_RIVAL1
dw_const Route22Rival2Text, TEXT_ROUTE22_RIVAL2
dw_const Route22PokemonLeagueSignText, TEXT_ROUTE22_POKEMON_LEAGUE_SIGN
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
Route22Rival1Text:
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_asm
make route22 rival events more consistent
2015-07-24 04:20:20 +00:00
CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE
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, .before_battle
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 hl, Route22RivalAfterBattleText1
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
.before_battle
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 hl, Route22RivalBeforeBattleText1
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
.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
Route22Rival2Text:
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_asm
make route22 rival events more consistent
2015-07-24 04:20:20 +00:00
CheckEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE
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, .before_battle
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 hl, Route22RivalAfterBattleText2
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
.before_battle
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 hl, Route22RivalBeforeBattleText2
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
.text_script_end
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
jp TextScriptEnd
remove address comments
2016-06-12 00:24:04 +00:00
Route22RivalBeforeBattleText1:
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_far _Route22RivalBeforeBattleText1
text_end
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
remove address comments
2016-06-12 00:24:04 +00:00
Route22RivalAfterBattleText1:
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_far _Route22RivalAfterBattleText1
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
Route22Rival1DefeatedText:
text_far _Route22Rival1DefeatedText
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
Route22Rival1VictoryText:
text_far _Route22Rival1VictoryText
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
remove address comments
2016-06-12 00:24:04 +00:00
Route22RivalBeforeBattleText2:
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_far _Route22RivalBeforeBattleText2
text_end
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
remove address comments
2016-06-12 00:24:04 +00:00
Route22RivalAfterBattleText2:
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_far _Route22RivalAfterBattleText2
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
Route22Rival2DefeatedText:
text_far _Route22Rival2DefeatedText
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
Route22Rival2VictoryText:
text_far _Route22Rival2VictoryText
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
Route22PokemonLeagueSignText:
text_far _Route22PokemonLeagueSignText
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