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

396 lines
8.9 KiB
NASM
Raw Permalink 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
SilphCo11F_Script:
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 SilphCo11FGateCallbackScript
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call EnableAutoTextBoxDrawing
The 'def_trainers' macro checks that trainers' event flag bits are correct (#318)
2021-04-13 22:24:37 +00:00
ld hl, SilphCo11TrainerHeaders
Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
ld de, SilphCo11F_ScriptPointers
ld a, [wSilphCo11FCurScript]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call ExecuteCurMapScriptInTable
Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
ld [wSilphCo11FCurScript], 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
SilphCo11FGateCallbackScript:
Fix game time labels
2016-01-03 19:17:10 +00:00
ld hl, wCurrentMapScriptFlags
Identify `wCurrentMapScriptFlags` bits (#467)
2024-09-24 15:39:44 +00:00
bit BIT_CUR_MAP_LOADED_1, [hl]
res BIT_CUR_MAP_LOADED_1, [hl]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret z
Use more lb and other clean up
2015-08-05 21:20:29 +00:00
ld hl, SilphCo11GateCoords
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 SilphCo11F_SetCardKeyDoorYScript
call SilphCo11FSetUnlockedDoorEventScript
named most of the used events
2015-07-21 17:36:03 +00:00
CheckEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret nz
ld a, $20
named animation functions/variables
2015-07-24 21:39:45 +00:00
ld [wNewTileBlockID], a
Use more lb and other clean up
2015-08-05 21:20:29 +00:00
lb bc, 6, 3
Commented/labelled misc functions
2014-09-14 18:29:18 +00:00
predef_jump ReplaceTileBlock
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
SilphCo11GateCoords:
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 3, 6
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
SilphCo11F_SetCardKeyDoorYScript:
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
push hl
Commented/labelled misc functions
2014-09-14 18:29:18 +00:00
ld hl, wCardKeyDoorY
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, [hli]
ld b, a
ld a, [hl]
ld c, a
xor a
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hUnlockedSilphCoDoors], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
pop 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
.loop_check_doors
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, [hli]
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
jr z, .exit_loop
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
push hl
Replace raw hex values with HRAM constants To do: turn constants into labels and use ldh
2020-07-04 02:11:35 +00:00
ld hl, hUnlockedSilphCoDoors
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
inc [hl]
pop hl
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, .check_y_coord
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 .loop_check_doors
.check_y_coord
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, [hli]
cp c
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, .loop_check_doors
Commented/labelled misc functions
2014-09-14 18:29:18 +00:00
ld hl, wCardKeyDoorY
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
xor a
ld [hli], a
ld [hl], a
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
.exit_loop
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 [hUnlockedSilphCoDoors], 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
SilphCo11FSetUnlockedDoorEventScript:
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh a, [hUnlockedSilphCoDoors]
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
and a
ret z
named most of the used events
2015-07-21 17:36:03 +00:00
SetEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR
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
SilphCo11FTeamRocketLeavesScript:
ld hl, .HideMissableObjectIDs
.hide_loop
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, [hli]
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
jr z, .done_hiding
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
push hl
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
pop 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 .hide_loop
.done_hiding
ld hl, .ShowMissableObjectIDs
.show_loop
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, [hli]
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
cp -1
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret z
push hl
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
pop 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 .show_loop
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
.ShowMissableObjectIDs:
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
db HS_SAFFRON_CITY_8
db HS_SAFFRON_CITY_9
db HS_SAFFRON_CITY_A
db HS_SAFFRON_CITY_B
db HS_SAFFRON_CITY_C
db HS_SAFFRON_CITY_D
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
.HideMissableObjectIDs:
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
db HS_SAFFRON_CITY_1
db HS_SAFFRON_CITY_2
db HS_SAFFRON_CITY_3
db HS_SAFFRON_CITY_4
db HS_SAFFRON_CITY_5
db HS_SAFFRON_CITY_6
db HS_SAFFRON_CITY_7
db HS_SAFFRON_CITY_E
db HS_SAFFRON_CITY_F
db HS_SILPH_CO_2F_2
db HS_SILPH_CO_2F_3
db HS_SILPH_CO_2F_4
db HS_SILPH_CO_2F_5
db HS_SILPH_CO_3F_1
db HS_SILPH_CO_3F_2
db HS_SILPH_CO_4F_1
db HS_SILPH_CO_4F_2
db HS_SILPH_CO_4F_3
db HS_SILPH_CO_5F_1
db HS_SILPH_CO_5F_2
db HS_SILPH_CO_5F_3
db HS_SILPH_CO_5F_4
db HS_SILPH_CO_6F_1
db HS_SILPH_CO_6F_2
db HS_SILPH_CO_6F_3
db HS_SILPH_CO_7F_1
db HS_SILPH_CO_7F_2
db HS_SILPH_CO_7F_3
db HS_SILPH_CO_7F_4
db HS_SILPH_CO_8F_1
db HS_SILPH_CO_8F_2
db HS_SILPH_CO_8F_3
db HS_SILPH_CO_9F_1
db HS_SILPH_CO_9F_2
db HS_SILPH_CO_9F_3
db HS_SILPH_CO_10F_1
db HS_SILPH_CO_10F_2
db HS_SILPH_CO_11F_1
db HS_SILPH_CO_11F_2
db HS_SILPH_CO_11F_3
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
SilphCo11FResetCurScript:
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
; fallthrough
SilphCo11FSetCurScript:
Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
ld [wSilphCo11FCurScript], a
No more W_
2015-08-31 02:38:41 +00:00
ld [wCurMapScript], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret
Rename map files, labels, and constants to be consistent and work with Polished Map
2019-01-01 20:06:23 +00:00
SilphCo11F_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 SilphCo11FDefaultScript, SCRIPT_SILPHCO11F_DEFAULT
dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SILPHCO11F_START_BATTLE
dw_const EndTrainerBattle, SCRIPT_SILPHCO11F_END_BATTLE
dw_const SilphCo11FGiovanniBattleFacingScript, SCRIPT_SILPHCO11F_GIOVANNI_FACING
dw_const SilphCo11FGiovanniStartBattleScript, SCRIPT_SILPHCO11F_GIOVANNI_START_BATTLE
dw_const SilphCo11FGiovanniAfterBattleScript, SCRIPT_SILPHCO11F_GIOVANNI_AFTER_BATTLE
SilphCo11FDefaultScript:
named most of the used events
2015-07-21 17:36:03 +00:00
CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret nz
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
ld hl, .PlayerCoordsArray
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers
fix variable naming
2015-07-18 15:17:29 +00:00
ld a, [wCoordIndex]
Identify `wSavedCoordIndex` and its other usages
2023-11-20 23:53:23 +00:00
ld [wSavedCoordIndex], 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
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_SILPHCO11F_GIOVANNI
Split `hSpriteIndexOrTextID` into `hSpriteIndex` and `hTextID` (#462) Also identify `wPPUpCountAndMaxPP`
2024-09-19 01:01:18 +00:00
ldh [hTextID], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call DisplayTextID
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
ld a, SILPHCO11F_GIOVANNI
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
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
ld de, .GiovanniMovement
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_SILPHCO11F_GIOVANNI_FACING
jp SilphCo11FSetCurScript
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
.PlayerCoordsArray:
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 6, 13
dbmapcoord 7, 12
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
.GiovanniMovement:
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
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
SilphCo11FSetPlayerAndSpriteFacingDirectionScript:
naming
2015-07-20 00:52:26 +00:00
ld [wPlayerMovingDirection], a
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
ld a, SILPHCO11F_GIOVANNI
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteIndex], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld a, b
Specify the ldh instruction, don't turn ld into ldh
2020-07-06 23:03:05 +00:00
ldh [hSpriteFacingDirection], a
Labelled and commented mostly sprite-related things
2014-09-10 03:55:19 +00:00
jp SetSpriteFacingDirectionAndDelay
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
SilphCo11FGiovanniAfterBattleScript:
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, SilphCo11FResetCurScript
Identify `wSavedCoordIndex` and its other usages
2023-11-20 23:53:23 +00:00
ld a, [wSavedCoordIndex]
cp 1 ; index of second, upper-right entry in SilphCo11FDefaultScript.PlayerCoordsArray
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, .face_player_up
naming
2015-07-20 00:52:26 +00:00
ld a, PLAYER_DIR_LEFT
fix variable naming
2015-07-18 15:17:29 +00:00
ld b, SPRITE_FACING_RIGHT
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
jr .continue
.face_player_up
naming
2015-07-20 00:52:26 +00:00
ld a, PLAYER_DIR_UP
fix variable naming
2015-07-18 15:17:29 +00:00
ld b, SPRITE_FACING_DOWN
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
.continue
call SilphCo11FSetPlayerAndSpriteFacingDirectionScript
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
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_SILPHCO11F_GIOVANNI_YOU_RUINED_OUR_PLANS
Split `hSpriteIndexOrTextID` into `hSpriteIndex` and `hTextID` (#462) Also identify `wPPUpCountAndMaxPP`
2024-09-19 01:01:18 +00:00
ldh [hTextID], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call DisplayTextID
Commented more sprite and map code
2014-09-13 07:50:56 +00:00
call GBFadeOutToBlack
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 SilphCo11FTeamRocketLeavesScript
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call UpdateSprites
call Delay3
Commented more sprite and map code
2014-09-13 07:50:56 +00:00
call GBFadeInFromBlack
named most of the used events
2015-07-21 17:36:03 +00:00
SetEvent EVENT_BEAT_SILPH_CO_GIOVANNI
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
jp SilphCo11FSetCurScript
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
SilphCo11FGiovanniBattleFacingScript:
Identify various flag labels and bit constants (#454)
2024-07-16 17:02:54 +00:00
ld a, [wStatusFlags5]
bit BIT_SCRIPTED_NPC_MOVEMENT, a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ret nz
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
ld a, SILPHCO11F_GIOVANNI
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
Identify `wSavedCoordIndex` and its other usages
2023-11-20 23:53:23 +00:00
ld a, [wSavedCoordIndex]
cp 1 ; index of second, upper-right entry in SilphCo11FDefaultScript.PlayerCoordsArray
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, .face_player_up
naming
2015-07-20 00:52:26 +00:00
ld a, PLAYER_DIR_LEFT
fix variable naming
2015-07-18 15:17:29 +00:00
ld b, SPRITE_FACING_RIGHT
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
jr .continue
.face_player_up
naming
2015-07-20 00:52:26 +00:00
ld a, PLAYER_DIR_UP
fix variable naming
2015-07-18 15:17:29 +00:00
ld b, SPRITE_FACING_DOWN
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
.continue
call SilphCo11FSetPlayerAndSpriteFacingDirectionScript
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, SCRIPT_SILPHCO11F_GIOVANNI_START_BATTLE
jp SilphCo11FSetCurScript
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
SilphCo11FGiovanniStartBattleScript:
Identify various flag labels and bit constants (#454)
2024-07-16 17:02:54 +00:00
ld hl, wStatusFlags3
set BIT_TALKED_TO_TRAINER, [hl]
set BIT_PRINT_END_BATTLE_TEXT, [hl]
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
ld hl, SilphCo10FGiovanniILostAgainText
ld de, SilphCo10FGiovanniILostAgainText
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, [hSpriteIndex]
Commented more sprite and map code
2014-09-13 07:50:56 +00:00
ld [wSpriteIndex], a
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call EngageMapTrainer
call InitBattleEnemyParameters
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, SCRIPT_SILPHCO11F_GIOVANNI_AFTER_BATTLE
jp SilphCo11FSetCurScript
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
SilphCo11F_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 SilphCo11FSilphPresidentText, TEXT_SILPHCO11F_SILPH_PRESIDENT
dw_const SilphCo11FBeautyText, TEXT_SILPHCO11F_BEAUTY
dw_const SilphCo11FGiovanniText, TEXT_SILPHCO11F_GIOVANNI
dw_const SilphCo11FRocket1Text, TEXT_SILPHCO11F_ROCKET1
dw_const SilphCo11FRocket2Text, TEXT_SILPHCO11F_ROCKET2
dw_const SilphCo11FGiovanniYouRuinedOurPlansText, TEXT_SILPHCO11F_GIOVANNI_YOU_RUINED_OUR_PLANS
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
The 'def_trainers' macro checks that trainers' event flag bits are correct (#318)
2021-04-13 22:24:37 +00:00
SilphCo11TrainerHeaders:
def_trainers 4
remove address comments
2016-06-12 00:24:04 +00:00
SilphCo11TrainerHeader0:
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_0, 4, SilphCo11FRocket1BattleText, SilphCo11FRocket1EndBattleText, SilphCo11FRocket1AfterBattleText
remove address comments
2016-06-12 00:24:04 +00:00
SilphCo11TrainerHeader1:
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_1, 3, SilphCo11FRocket2BattleText, SilphCo11FRocket2EndBattleText, SilphCo11FRocket2AfterBattleText
Use a 'trainer' macro for trainers in scripts/
2020-07-14 19:45:36 +00:00
db -1 ; end
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
SilphCo11FSilphPresidentText:
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_GOT_MASTER_BALL
Revise some map scripts, mostly for getting items
2020-07-16 15:19:05 +00:00
jp nz, .got_item
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
Use more lb and other clean up
2015-08-05 21:20:29 +00:00
lb bc, MASTER_BALL, 1
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call GiveItem
Revise some map scripts, mostly for getting items
2020-07-16 15:19:05 +00:00
jr nc, .bag_full
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, .ReceivedMasterBallText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
named most of the used events
2015-07-21 17:36:03 +00:00
SetEvent EVENT_GOT_MASTER_BALL
Revise some map scripts, mostly for getting items
2020-07-16 15:19:05 +00:00
jr .done
.bag_full
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, .NoRoomText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
Revise some map scripts, mostly for getting items
2020-07-16 15:19:05 +00:00
jr .done
.got_item
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, .MasterBallDescriptionText
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
call PrintText
Revise some map scripts, mostly for getting items
2020-07-16 15:19:05 +00:00
.done
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
jp TextScriptEnd
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
.Text:
text_far _SilphCo11FSilphPresidentText
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
.ReceivedMasterBallText:
text_far _SilphCo11FSilphPresidentReceivedMasterBallText
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
sound_get_key_item
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
.MasterBallDescriptionText:
text_far _SilphCo11FSilphPresidentMasterBallDescriptionText
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
.NoRoomText:
text_far _SilphCo11FSilphPresidentNoRoomText
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
SilphCo11FBeautyText:
text_far _SilphCo11FBeautyText
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
SilphCo11FGiovanniText:
text_far _SilphCo11FGiovanniText
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
SilphCo10FGiovanniILostAgainText:
text_far _SilphCo10FGiovanniILostAgainText
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
SilphCo11FGiovanniYouRuinedOurPlansText:
text_far _SilphCo11FGiovanniYouRuinedOurPlansText
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
SilphCo11FRocket1Text:
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_asm
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld hl, SilphCo11TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
SilphCo11FRocket1BattleText:
text_far _SilphCo11FRocket1BattleText
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
SilphCo11FRocket1EndBattleText:
text_far _SilphCo11FRocket1EndBattleText
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
SilphCo11FRocket1AfterBattleText:
text_far _SilphCo11FRocket1AfterBattleText
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
SilphCo11FRocket2Text:
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_asm
Pull map scripts out of main.asm
2014-05-18 18:19:10 +00:00
ld hl, SilphCo11TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
2023-07-14 01:27:56 +00:00
SilphCo11FRocket2BattleText:
text_far _SilphCo11FRocket2BattleText
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
SilphCo11FRocket2EndBattleText:
text_far _SilphCo11FRocket2EndBattleText
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
SilphCo11FRocket2AfterBattleText:
text_far _SilphCo11FRocket2AfterBattleText
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
SilphCo10FPorygonText: ; unreferenced
Port pokecrystal's formatting of text commands and special characters
2020-07-04 21:09:35 +00:00
text_asm
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
ld a, PORYGON
call DisplayPokedex
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 _SilphCo10FPorygonText
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