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

461 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
CeruleanCity_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, CeruleanCity_ScriptPointers
No more W_
2015-08-31 02:38:41 +00:00
ld a, [wCeruleanCityCurScript]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
jp CallFunctionInTable
Identify more map script labels
2023-11-19 00:44:03 +00:00
CeruleanCityClearScripts:
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_CERULEANCITY_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 [wCeruleanCityCurScript], 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_CERULEAN_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_jump HideObject
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
CeruleanCity_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 CeruleanCityDefaultScript, SCRIPT_CERULEANCITY_DEFAULT
dw_const CeruleanCityRivalBattleScript, SCRIPT_CERULEANCITY_RIVAL_BATTLE
dw_const CeruleanCityRivalDefeatedScript, SCRIPT_CERULEANCITY_RIVAL_DEFEATED
dw_const CeruleanCityRivalCleanupScript, SCRIPT_CERULEANCITY_RIVAL_CLEANUP
dw_const CeruleanCityRocketDefeatedScript, SCRIPT_CERULEANCITY_ROCKET_DEFEATED
CeruleanCityRocketDefeatedScript:
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, CeruleanCityClearScripts
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
named most of the used events
2015-07-21 17:36:03 +00:00
SetEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF
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_CERULEANCITY_ROCKET
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
xor a ; SCRIPT_CERULEANCITY_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 [wCeruleanCityCurScript], 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
CeruleanCityDefaultScript:
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_CERULEAN_ROCKET_THIEF
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr nz, .skipRocketThiefEncounter
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld hl, CeruleanCityCoords1
call ArePlayerCoordsInArray
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr nc, .skipRocketThiefEncounter
misc
2015-07-19 03:49:52 +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
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr nz, .playerBelowRocketThief
naming
2015-07-20 00:52:26 +00:00
ld a, PLAYER_DIR_DOWN
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
ld b, SPRITE_FACING_UP
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
.playerBelowRocketThief
naming
2015-07-20 00:52:26 +00:00
ld [wPlayerMovingDirection], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, b
Identify wSpriteStateData1 and wSpriteStateData2 offsets, like pokeyellow
2020-07-05 21:29:11 +00:00
ld [wSprite02StateData1FacingDirection], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call Delay3
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_CERULEANCITY_ROCKET
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
jp DisplayTextID
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
.skipRocketThiefEncounter
named most of the used events
2015-07-21 17:36:03 +00:00
CheckEvent EVENT_BEAT_CERULEAN_RIVAL
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret nz
ld hl, CeruleanCityCoords2
call ArePlayerCoordsInArray
ret nc
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
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +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
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +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
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
No more W_
2015-08-31 02:38:41 +00:00
ld a, [wXCoord]
Update CeruleanCity.asm
2021-05-31 20:00:32 +00:00
cp 20 ; is the player standing on the right side of the bridge?
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr z, .playerOnRightSideOfBridge
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, CERULEANCITY_RIVAL
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteIndex], a
Identify some hSpriteDataOffset values
2020-08-30 20:33:14 +00:00
ld a, SPRITESTATEDATA2_MAPX
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteDataOffset], a
Labelled and commented mostly sprite-related things
2014-09-10 03:55:19 +00:00
call GetPointerWithinSpriteStateData2
Identify some hSpriteDataOffset values
2020-08-30 20:33:14 +00:00
ld [hl], 25
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
.playerOnRightSideOfBridge
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_CERULEAN_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 ShowObject
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld de, CeruleanCityMovement1
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, CERULEANCITY_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
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_CERULEANCITY_RIVAL_BATTLE
No more W_
2015-08-31 02:38:41 +00:00
ld [wCeruleanCityCurScript], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret
remove address comments
2016-06-12 00:24:04 +00:00
CeruleanCityCoords1:
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 30, 7
dbmapcoord 30, 9
db -1 ; 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
CeruleanCityCoords2:
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 20, 6
dbmapcoord 21, 6
db -1 ; 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
CeruleanCityMovement1:
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
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
Identify more map script labels
2023-11-19 00:44:03 +00:00
CeruleanCityFaceRivalScript:
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, CERULEANCITY_RIVAL
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
xor a ; SPRITE_FACING_DOWN
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 ; face object
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
CeruleanCityRivalBattleScript:
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
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_CERULEANCITY_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
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, CeruleanCityRivalDefeatedText
ld de, CeruleanCityRivalVictoryText
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
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, $7
jr .done
.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, $8
jr .done
.Charmander
ld a, $9
.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
xor a
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hJoyHeld], a
Identify more map script labels
2023-11-19 00:44:03 +00:00
call CeruleanCityFaceRivalScript
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_CERULEANCITY_RIVAL_DEFEATED
No more W_
2015-08-31 02:38:41 +00:00
ld [wCeruleanCityCurScript], 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
CeruleanCityRivalDefeatedScript:
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, CeruleanCityClearScripts
call CeruleanCityFaceRivalScript
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
named most of the used events
2015-07-21 17:36:03 +00:00
SetEvent EVENT_BEAT_CERULEAN_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_CERULEANCITY_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
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, CERULEANCITY_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 SetSpriteMovementBytesToFF
No more W_
2015-08-31 02:38:41 +00:00
ld a, [wXCoord]
Update CeruleanCity.asm
2021-05-31 20:00:32 +00:00
cp 20 ; is the player standing on the right side of the bridge?
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr nz, .playerOnRightSideOfBridge
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld de, CeruleanCityMovement4
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr .skip
.playerOnRightSideOfBridge
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld de, CeruleanCityMovement3
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
.skip
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, CERULEANCITY_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
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_CERULEANCITY_RIVAL_CLEANUP
No more W_
2015-08-31 02:38:41 +00:00
ld [wCeruleanCityCurScript], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret
remove address comments
2016-06-12 00:24:04 +00:00
CeruleanCityMovement3:
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
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
remove address comments
2016-06-12 00:24:04 +00:00
CeruleanCityMovement4:
More direction constants facing directions, npc movement, joypad
2015-07-17 07:52:25 +00:00
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
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
CeruleanCityRivalCleanupScript:
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
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_CERULEAN_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_CERULEANCITY_DEFAULT
No more W_
2015-08-31 02:38:41 +00:00
ld [wCeruleanCityCurScript], 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
CeruleanCity_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 CeruleanCityRivalText, TEXT_CERULEANCITY_RIVAL
dw_const CeruleanCityRocketText, TEXT_CERULEANCITY_ROCKET
dw_const CeruleanCityCooltrainerMText, TEXT_CERULEANCITY_COOLTRAINER_M
dw_const CeruleanCitySuperNerd1Text, TEXT_CERULEANCITY_SUPER_NERD1
dw_const CeruleanCitySuperNerd2Text, TEXT_CERULEANCITY_SUPER_NERD2
dw_const CeruleanCityGuardText, TEXT_CERULEANCITY_GUARD1
dw_const CeruleanCityCooltrainerF1Text, TEXT_CERULEANCITY_COOLTRAINER_F1
dw_const CeruleanCitySlowbroText, TEXT_CERULEANCITY_SLOWBRO
dw_const CeruleanCityCooltrainerF2Text, TEXT_CERULEANCITY_COOLTRAINER_F2
dw_const CeruleanCitySuperNerd3Text, TEXT_CERULEANCITY_SUPER_NERD3
dw_const CeruleanCityGuardText, TEXT_CERULEANCITY_GUARD2
dw_const CeruleanCitySignText, TEXT_CERULEANCITY_SIGN
dw_const CeruleanCityTrainerTipsText, TEXT_CERULEANCITY_TRAINER_TIPS
dw_const MartSignText, TEXT_CERULEANCITY_MART_SIGN
dw_const PokeCenterSignText, TEXT_CERULEANCITY_POKECENTER_SIGN
dw_const CeruleanCityBikeShopSign, TEXT_CERULEANCITY_BIKESHOP_SIGN
dw_const CeruleanCityGymSign, TEXT_CERULEANCITY_GYM_SIGN
CeruleanCityRivalText:
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_CERULEAN_RIVAL
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
; do pre-battle text
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, .PreBattle
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
; or talk about bill
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, CeruleanCityRivalIWentToBillsText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
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 .end
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
.PreBattle
ld hl, .PreBattleText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
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
.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
.PreBattleText:
text_far _CeruleanCityRivalPreBattleText
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
CeruleanCityRivalDefeatedText:
text_far _CeruleanCityRivalDefeatedText
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
CeruleanCityRivalVictoryText:
text_far _CeruleanCityRivalVictoryText
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
CeruleanCityRivalIWentToBillsText:
text_far _CeruleanCityRivalIWentToBillsText
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
CeruleanCityRocketText:
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_CERULEAN_ROCKET_THIEF
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr nz, .beatRocketThief
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
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, .IGiveUpText
ld de, .IGiveUpText
Commented/labelled misc functions
2014-09-14 18:29:18 +00:00
call SaveEndBattleTextPointers
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh a, [hSpriteIndexOrTextID]
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_CERULEANCITY_ROCKET_DEFEATED
No more W_
2015-08-31 02:38:41 +00:00
ld [wCeruleanCityCurScript], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
jp TextScriptEnd
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
.beatRocketThief
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, .IllReturnTheTMText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
TM/HM constants named after moves
2020-07-06 02:52:27 +00:00
lb bc, TM_DIG, 1
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call GiveItem
jr c, .Success
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, .TM28NoRoomText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
jr .Done
.Success
ld a, $1
Commented more sprite and map code
2014-09-13 07:50:56 +00:00
ld [wDoNotWaitForButtonPressAfterDisplayingText], 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, .ReceivedTM28Text
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
callba/callab -> farcall/callfar; jpba/jpab -> farjp/jpfar
2020-07-07 01:18:22 +00:00
farcall CeruleanHideRocket
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 _CeruleanCityRocketText
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
.ReceivedTM28Text:
text_far _CeruleanCityRocketReceivedTM28Text
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
sound_get_item_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
text_far _CeruleanCityRocketIBetterGetMovingText
text_linkpromptbutton -> text_waitbutton Fixes #260
2020-07-06 16:39:29 +00:00
text_waitbutton
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
.TM28NoRoomText:
text_far _CeruleanCityRocketTM28NoRoomText
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
.IGiveUpText:
text_far _CeruleanCityRocketIGiveUpText
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
.IllReturnTheTMText:
text_far _CeruleanCityRocketIllReturnTheTMText
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
CeruleanCityCooltrainerMText:
text_far _CeruleanCityCooltrainerMText
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
CeruleanCitySuperNerd1Text:
text_far _CeruleanCitySuperNerd1Text
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
CeruleanCitySuperNerd2Text:
text_far _CeruleanCitySuperNerd2Text
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
CeruleanCityGuardText:
text_far _CeruleanCityGuardText
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
CeruleanCityCooltrainerF1Text:
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_asm
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh a, [hRandomAdd]
Update CeruleanCity.asm
2021-05-31 20:00:32 +00:00
cp 180 ; 76/256 chance of 1st dialogue
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr c, .notFirstText
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, .SlowbroUseSonicboomText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr .end
.notFirstText
Update CeruleanCity.asm
2021-05-31 20:00:32 +00:00
cp 100 ; 80/256 chance of 2nd dialogue
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr c, .notSecondText
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, .SlowbroPunchText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr .end
.notSecondText
Update CeruleanCity.asm
2021-05-31 20:00:32 +00:00
; 100/256 chance of 3rd dialogue
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, .SlowbroWithdrawText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +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
.SlowbroUseSonicboomText:
text_far _CeruleanCityCooltrainerF1SlowbroUseSonicboomText
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
.SlowbroPunchText:
text_far _CeruleanCityCooltrainerF1SlowbroPunchText
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
.SlowbroWithdrawText:
text_far _CeruleanCityCooltrainerF1SlowbroWithdrawText
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
CeruleanCitySlowbroText:
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_asm
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh a, [hRandomAdd]
Update CeruleanCity.asm
2021-05-31 20:00:32 +00:00
cp 180 ; 76/256 chance of 1st dialogue
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr c, .notFirstText
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, .TookASnoozeText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr .end
.notFirstText
Update CeruleanCity.asm
2021-05-31 20:00:32 +00:00
cp 120 ; 60/256 chance of 2nd dialogue
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr c, .notSecondText
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, .IsLoafingAroundText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr .end
.notSecondText
Update CeruleanCity.asm
2021-05-31 20:00:32 +00:00
cp 60 ; 60/256 chance of 3rd dialogue
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr c, .notThirdText
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, .TurnedAwayText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +00:00
jr .end
.notThirdText
Update CeruleanCity.asm
2021-05-31 20:00:32 +00:00
; 60/256 chance of 4th dialogue
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, .IgnoredOrdersText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
Partially document CeruleanCity.asm
2021-05-31 15:41:36 +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
.TookASnoozeText:
text_far _CeruleanCitySlowbroTookASnoozeText
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
.IsLoafingAroundText:
text_far _CeruleanCitySlowbroIsLoafingAroundText
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
.TurnedAwayText:
text_far _CeruleanCitySlowbroTurnedAwayText
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
.IgnoredOrdersText:
text_far _CeruleanCitySlowbroIgnoredOrdersText
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
CeruleanCityCooltrainerF2Text:
text_far _CeruleanCityCooltrainerF2Text
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
CeruleanCitySuperNerd3Text:
text_far _CeruleanCitySuperNerd3Text
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
CeruleanCitySignText:
text_far _CeruleanCitySignText
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
CeruleanCityTrainerTipsText:
text_far _CeruleanCityTrainerTipsText
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
CeruleanCityBikeShopSign:
text_far _CeruleanCityBikeShopSign
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
CeruleanCityGymSign:
text_far _CeruleanCityGymSign
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