pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity
d626a0dc3b
pokecrystal-board/engine/overworld/map_setup.asm

248 lines
3.8 KiB
NASM
Raw Normal View History

Remove all address comments
2018-06-24 07:09:41 -07:00
RunMapSetupScript::
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hMapEntryMethod]
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
and $f
dec a
ld c, a
ld b, 0
ld hl, MapSetupScripts
add hl, bc
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
add hl, bc
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ld a, [hli]
ld h, [hl]
ld l, a
call ReadMapSetupScript
ret
Remove redundant data/ filename prefixes
2017-12-26 22:29:15 -08:00
INCLUDE "data/maps/setup_scripts.asm"
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
ReadMapSetupScript:
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
.loop
ld a, [hli]
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
cp map_end
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ret z
push hl
ld c, a
ld b, 0
ld hl, MapSetupCommands
add hl, bc
Labeled every function in ROM0 that's referenced in the source
2016-05-10 09:31:49 -07:00
add hl, bc
add hl, bc
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
; bank
ld b, [hl]
inc hl
; address
ld a, [hli]
ld h, [hl]
ld l, a
; Bit 7 of the bank indicates a parameter.
; This is left unused.
bit 7, b
jr z, .go
pop de
ld a, [de]
ld c, a
inc de
push de
.go
ld a, b
and $7f
rst FarCall
pop hl
jr .loop
Remove all address comments
2018-06-24 07:09:41 -07:00
MapSetupCommands:
Split battle/ into data/ and engine/ components
2017-12-26 14:47:05 -08:00
; entries correspond to command indexes in constants/map_setup_constants.asm
dbw BANK, addr replaced with dba
2015-11-03 16:43:47 -08:00
dba EnableLCD ; 00
dba DisableLCD ; 01
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
dba InitSound ; 02
dbw BANK, addr replaced with dba
2015-11-03 16:43:47 -08:00
dba PlayMapMusic ; 03
dba RestartMapMusic ; 04
dba FadeToMapMusic ; 05
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
dba FadeMapMusicAndPalettes ; 06
dba PlayMapMusicBike ; 07
dbw BANK, addr replaced with dba
2015-11-03 16:43:47 -08:00
dba ForceMapMusic ; 08
Comment more ROM labels as unreferenced (Some unreferenced labels are above code which is still used via fallthrough!)
2020-06-21 15:33:31 -07:00
dba FadeInToMusic ; 09
Make town map pals more intuitive in source
2016-04-02 06:28:46 -07:00
dba LoadBlockData ; 0a (callback 1)
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
dba LoadConnectionBlockData ; 0b
dbw BANK, addr replaced with dba
2015-11-03 16:43:47 -08:00
dba SaveScreen ; 0c
dba BufferScreen ; 0d
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
dba LoadMapGraphics ; 0e
dba LoadMapTileset ; 0f
dbw BANK, addr replaced with dba
2015-11-03 16:43:47 -08:00
dba LoadMapTimeOfDay ; 10
Remove Special_ prefix from special routines (close #478)
2018-01-24 08:17:05 -08:00
dba LoadMapPalettes ; 11
dbw BANK, addr replaced with dba
2015-11-03 16:43:47 -08:00
dba LoadWildMonData ; 12
dba RefreshMapSprites ; 13
engine/events.asm labels finished fixed palred/green/blue macros
2016-05-17 05:40:42 -07:00
dba HandleNewMap ; 14
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
dba HandleContinueMap ; 15
dba LoadMapObjects ; 16
dba EnterMapSpawnPoint ; 17
dbw BANK, addr replaced with dba
2015-11-03 16:43:47 -08:00
dba EnterMapConnection ; 18
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
dba EnterMapWarp ; 19
dbw BANK, addr replaced with dba
2015-11-03 16:43:47 -08:00
dba LoadMapAttributes ; 1a
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
dba LoadMapAttributes_SkipObjects ; 1b
More splits; map setup labels
2015-11-11 20:38:57 -08:00
dba ClearBGPalettes ; 1c
Remove Special_ prefix from special routines (close #478)
2018-01-24 08:17:05 -08:00
dba FadeOutPalettes ; 1d
dba FadeInPalettes ; 1e
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
dba GetMapScreenCoords ; 1f
dba GetWarpDestCoords ; 20
dbw BANK, addr replaced with dba
2015-11-03 16:43:47 -08:00
dba SpawnInFacingDown ; 21
Fully label home/map_objects.asm
2016-01-10 23:36:39 -08:00
dba SpawnPlayer ; 22
dbw BANK, addr replaced with dba
2015-11-03 16:43:47 -08:00
dba RefreshPlayerCoords ; 23
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
dba ResetPlayerObjectAction ; 24
dba SkipUpdateMapSprites ; 25
dbw BANK, addr replaced with dba
2015-11-03 16:43:47 -08:00
dba UpdateRoamMons ; 26
dba JumpRoamMons ; 27
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
dba FadeOutMapMusic ; 28
dbw BANK, addr replaced with dba
2015-11-03 16:43:47 -08:00
dba ActivateMapAnims ; 29
dba SuspendMapAnims ; 2a
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
dba ApplyMapPalettes ; 2b
dba EnableTextAcceleration ; 2c
dba InitMapNameSign ; 2d
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
EnableTextAcceleration:
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
xor a
Mobile and more battle anims
2016-05-05 12:07:37 -07:00
ld [wDisableTextAcceleration], a
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ActivateMapAnims:
Replace "Unreferenced" labels with "; unreferenced" comments
2020-06-21 13:27:43 -07:00
ld a, TRUE
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMapAnims], a
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
SuspendMapAnims:
Replace "Unreferenced" labels with "; unreferenced" comments
2020-06-21 13:27:43 -07:00
xor a ; FALSE
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMapAnims], a
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ret
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
LoadMapObjects:
Map callback constants
2016-01-06 04:44:50 -08:00
ld a, MAPCALLBACK_OBJECTS
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
call RunMapCallback
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall LoadObjectMasks
farcall InitializeVisibleSprites
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ret
More unreferenced labels cleanup
2018-01-02 07:04:21 -08:00
; unused
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ret
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
ResetPlayerObjectAction:
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld hl, wPlayerSpriteSetupFlags
More engine flag constants
2018-01-22 11:34:55 -08:00
set PLAYERSPRITESETUP_RESET_ACTION_F, [hl]
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ret
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
SkipUpdateMapSprites:
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld hl, wPlayerSpriteSetupFlags
More engine flag constants
2018-01-22 11:34:55 -08:00
set PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ret
ReplaceKrisSprite -> UpdatePlayerSprite
2020-06-16 16:38:00 -07:00
CheckUpdatePlayerSprite:
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
nop
Map header labels, tileset constants
2015-11-12 08:10:19 -08:00
call .CheckBiking
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
jr c, .ok
Map header labels, tileset constants
2015-11-12 08:10:19 -08:00
call .CheckSurfing
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
jr c, .ok
Map header labels, tileset constants
2015-11-12 08:10:19 -08:00
call .CheckSurfing2
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
jr c, .ok
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ret
Map header labels, tileset constants
2015-11-12 08:10:19 -08:00
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
.ok
ReplaceKrisSprite -> UpdatePlayerSprite
2020-06-16 16:38:00 -07:00
call UpdatePlayerSprite
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
.CheckBiking:
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
and a
Prefix engine_flags wram addresses with w
2017-12-28 04:15:46 -08:00
ld hl, wBikeFlags
More engine bit flag constants
2018-01-22 10:57:44 -08:00
bit BIKEFLAGS_ALWAYS_ON_BIKE_F, [hl]
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ret z
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
ld a, PLAYER_BIKE
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wPlayerState], a
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
scf
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
.CheckSurfing2:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerState]
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp PLAYER_NORMAL
jr z, .nope
PLAYER_SLIP → PLAYER_SKATE (probably used for the beta skateboard; DoPlayerMovement.BikeCheck returns true for it)
2017-12-15 20:29:42 -08:00
cp PLAYER_SKATE
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
jr z, .nope
cp PLAYER_SURF
jr z, .surfing
cp PLAYER_SURF_PIKA
jr z, .surfing
Rename "map permissions" to "map environment" (fix #396)
2017-12-24 10:08:38 -08:00
call GetMapEnvironment
Map header labels, tileset constants
2015-11-12 08:10:19 -08:00
cp INDOOR
Update some labels
2019-12-03 06:17:21 -08:00
jr z, .no_biking
Rename "map permissions" to "map environment" (fix #396)
2017-12-24 10:08:38 -08:00
cp ENVIRONMENT_5
Update some labels
2019-12-03 06:17:21 -08:00
jr z, .no_biking
Map header labels, tileset constants
2015-11-12 08:10:19 -08:00
cp DUNGEON
Update some labels
2019-12-03 06:17:21 -08:00
jr z, .no_biking
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
jr .nope
Update some labels
2019-12-03 06:17:21 -08:00
.no_biking
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerState]
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp PLAYER_BIKE
jr nz, .nope
.surfing
ld a, PLAYER_NORMAL
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wPlayerState], a
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
scf
ret
Map header labels, tileset constants
2015-11-12 08:10:19 -08:00
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
.nope
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
and a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
.CheckSurfing:
Wild Pokemon functions and data Replaced encounter rates with percent values Added new constants denoting the number of wild Pokemon in the grass and water wild constructs Annotated and relabeled the encounter generating functions Renamed a WRAM address associaed with the temporary storage of the wild Pokemon's species Moved spawn constants to constants/map_constants.asm for use anywhere in the disassembly
2015-07-23 00:41:52 -07:00
call CheckOnWater
Update some labels
2019-12-03 06:17:21 -08:00
jr nz, .nope2
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerState]
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp PLAYER_SURF
Update some labels
2019-12-03 06:17:21 -08:00
jr z, .is_surfing
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp PLAYER_SURF_PIKA
Update some labels
2019-12-03 06:17:21 -08:00
jr z, .is_surfing
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
ld a, PLAYER_SURF
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wPlayerState], a
Update some labels
2019-12-03 06:17:21 -08:00
.is_surfing
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
scf
ret
Update some labels
2019-12-03 06:17:21 -08:00
.nope2
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
and a
ret
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
FadeOutMapMusic:
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ld a, 6
call SkipMusic
ret
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
ApplyMapPalettes:
Consistent predef function names
2018-01-02 09:49:25 -08:00
farcall _UpdateTimePals
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ret
Make the map setup commands match the actual function names better These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
2019-11-18 09:16:50 -08:00
FadeMapMusicAndPalettes:
More miscellaneous fixes (see #709)
2020-04-17 07:52:59 -07:00
ld e, LOW(MUSIC_NONE)
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wMusicFadeID]
More miscellaneous fixes (see #709)
2020-04-17 07:52:59 -07:00
ld d, HIGH(MUSIC_NONE)
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wMusicFadeID + 1]
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ld a, $4
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wMusicFade], a
bgcoord
2015-11-20 08:47:52 -08:00
call RotateThreePalettesRight
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ForceMapMusic:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerState]
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp PLAYER_BIKE
jr nz, .notbiking
Update audio macros and arguments and update related labels/constants/comments this fixes a lot of mistakes and maximizes compatibility with red
2019-09-02 01:40:58 -07:00
call MinVolume
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ld a, $88
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wMusicFade], a
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
.notbiking
Move radio code to its own file
2015-07-20 22:52:46 -07:00
call TryRestartMapMusic
Split out the map setup scripts.
2015-02-11 14:01:04 -08:00
ret
Reference in New Issue Copy Permalink