mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
More splits; map setup labels
This commit is contained in:
parent
91068077f0
commit
2ffcb4b490
@ -6,7 +6,7 @@
|
||||
; FadeMusic
|
||||
; PlayStereoSFX
|
||||
|
||||
_SoundRestart:: ; e8000
|
||||
_MapSetup_Sound_Off:: ; e8000
|
||||
; restart sound operation
|
||||
; clear all relevant hardware registers & wram
|
||||
push hl
|
||||
@ -63,7 +63,7 @@ MusicFadeRestart: ; e803d
|
||||
push af
|
||||
ld a, [MusicFadeIDLo]
|
||||
push af
|
||||
call _SoundRestart
|
||||
call _MapSetup_Sound_Off
|
||||
pop af
|
||||
ld [MusicFadeIDLo], a
|
||||
pop af
|
||||
@ -3161,7 +3161,7 @@ ChannelPointers: ; e8fd9
|
||||
|
||||
ClearChannels:: ; e8fe9
|
||||
; runs ClearChannel for all 4 channels
|
||||
; doesn't seem to be used, but functionally identical to SoundRestart
|
||||
; doesn't seem to be used, but functionally identical to MapSetup_Sound_Off
|
||||
ld hl, rNR50
|
||||
xor a
|
||||
rept 2
|
||||
|
@ -2527,7 +2527,7 @@ WinTrainerBattle: ; 3cfa4
|
||||
or [hl]
|
||||
ret nz
|
||||
call ClearTileMap
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
ret
|
||||
; 3d02b
|
||||
|
||||
@ -2911,7 +2911,7 @@ ForcePlayerMonChoice: ; 3d227
|
||||
|
||||
.enemy_fainted_mobile_error
|
||||
call ClearSprites
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
call _LoadHPBar
|
||||
call ExitMenu
|
||||
call LoadTileMapToTempTileMap
|
||||
@ -2995,7 +2995,7 @@ IsMobileBattle: ; 3d2f1
|
||||
; 3d2f7
|
||||
|
||||
Function3d2f7: ; 3d2f7
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
Function3d2fa: ; switch to fullscreen menu?
|
||||
callba Function5004f
|
||||
callba Function50405
|
||||
@ -3137,7 +3137,7 @@ LostBattle: ; 3d38e
|
||||
callba BattleTowerText
|
||||
call WaitPressAorB_BlinkCursor
|
||||
call ClearTileMap
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
ret
|
||||
|
||||
.not_canlose
|
||||
@ -5290,7 +5290,7 @@ Function3e234: ; 3e234
|
||||
ld a, [wItemAttributeParamBuffer]
|
||||
cp $3
|
||||
jr z, .asm_3e24a
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
|
||||
.asm_3e24a
|
||||
xor a
|
||||
@ -5332,7 +5332,7 @@ BattleMenu_PKMN: ; 3e28d
|
||||
Function3e290:
|
||||
call ExitMenu
|
||||
call LoadStandardMenuDataHeader
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
Function3e299:
|
||||
call Function3d2fa
|
||||
xor a
|
||||
@ -8816,7 +8816,7 @@ endr
|
||||
bit 0, a
|
||||
ret z
|
||||
call ClearTileMap
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
ret
|
||||
; 3f759
|
||||
|
||||
|
@ -540,7 +540,7 @@ const_value SET 1
|
||||
const OBJECT_SPRITE_Y
|
||||
const OBJECT_SPRITE_X_OFFSET
|
||||
const OBJECT_SPRITE_Y_OFFSET
|
||||
const OBJECT_27
|
||||
const OBJECT_MOVEMENT_BYTE_INDEX
|
||||
const OBJECT_28
|
||||
const OBJECT_29
|
||||
const OBJECT_30
|
||||
|
@ -1,16 +1,16 @@
|
||||
const_value SET $f1
|
||||
const MAPSETUP_WARP
|
||||
const MAPSETUP_02
|
||||
const MAPSETUP_CONTINUE
|
||||
const MAPSETUP_RELOADMAP
|
||||
const MAPSETUP_04
|
||||
const MAPSETUP_05
|
||||
const MAPSETUP_06
|
||||
const MAPSETUP_07
|
||||
const MAPSETUP_08
|
||||
const MAPSETUP_09
|
||||
const MAPSETUP_10
|
||||
const MAPSETUP_TELEPORT
|
||||
const MAPSETUP_DOOR
|
||||
const MAPSETUP_FALL
|
||||
const MAPSETUP_CONNECTION
|
||||
const MAPSETUP_LINKRETURN
|
||||
const MAPSETUP_TRAIN
|
||||
const MAPSETUP_SUBMENU
|
||||
const MAPSETUP_BADWARP
|
||||
const MAPSETUP_12
|
||||
const MAPSETUP_FLY
|
||||
|
||||
; Command descriptions from Condensation water's scripting compendium. const_def
|
||||
const_def
|
||||
|
@ -42,10 +42,10 @@ const_value SET -1
|
||||
const PLAYEREVENT_SEENBYTRAINER
|
||||
const PLAYEREVENT_TALKTOTRAINER
|
||||
const PLAYEREVENT_ITEMBALL
|
||||
const PLAYEREVENT_4
|
||||
const PLAYEREVENT_CONNECTION
|
||||
const PLAYEREVENT_WARP
|
||||
const PLAYEREVENT_FALL
|
||||
const PLAYEREVENT_WHITEOUT
|
||||
const PLAYEREVENT_HATCH
|
||||
const PLAYEREVENT_9
|
||||
const PLAYEREVENT_JOYCHANGEFACING
|
||||
NUM_PLAYER_EVENTS EQU const_value
|
||||
|
2667
engine/billspc.asm
Executable file
2667
engine/billspc.asm
Executable file
File diff suppressed because it is too large
Load Diff
2560
engine/card_flip.asm
Executable file
2560
engine/card_flip.asm
Executable file
File diff suppressed because it is too large
Load Diff
@ -131,7 +131,7 @@ Function109847:: ; 109847
|
||||
ld a, $5
|
||||
ld [rSVBK], a
|
||||
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
call ClearTileMap
|
||||
call ClearSprites
|
||||
|
||||
@ -210,7 +210,7 @@ Function109847:: ; 109847
|
||||
jr .asm_1098de
|
||||
|
||||
.asm_1098ee
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
xor a
|
||||
ld [hLCDStatCustom], a
|
||||
ld [hBGMapAddress], a
|
||||
|
@ -6,7 +6,7 @@ Function1dd702: ; 1dd702
|
||||
; 1dd709
|
||||
|
||||
Function1dd709: ; 1dd709
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
call ClearTileMap
|
||||
call ClearSprites
|
||||
call DisableLCD
|
||||
|
615
engine/dummy_game.asm
Executable file
615
engine/dummy_game.asm
Executable file
File diff suppressed because it is too large
Load Diff
@ -138,7 +138,7 @@ EnterMap: ; 9673e
|
||||
call ClearAllScriptFlags3
|
||||
|
||||
ld a, [hMapEntryMethod]
|
||||
cp MAPSETUP_07
|
||||
cp MAPSETUP_CONNECTION
|
||||
jr nz, .dontset
|
||||
call SetAll_ScriptFlags3
|
||||
.dontset
|
||||
@ -322,9 +322,9 @@ PlayerEvents: ; 9681f
|
||||
ld [ScriptRunning], a
|
||||
call DoPlayerEvent
|
||||
ld a, [ScriptRunning]
|
||||
cp PLAYEREVENT_4
|
||||
cp PLAYEREVENT_CONNECTION
|
||||
jr z, .ok2
|
||||
cp PLAYEREVENT_9
|
||||
cp PLAYEREVENT_JOYCHANGEFACING
|
||||
jr z, .ok2
|
||||
|
||||
xor a
|
||||
@ -1050,8 +1050,10 @@ DoPlayerEvent: ; 96beb
|
||||
ld a, [ScriptRunning]
|
||||
and a
|
||||
ret z
|
||||
|
||||
cp PLAYEREVENT_MAPSCRIPT ; run script
|
||||
ret z
|
||||
|
||||
cp NUM_PLAYER_EVENTS
|
||||
ret nc
|
||||
|
||||
@ -1088,7 +1090,7 @@ Invalid_0x96c2d: ; 96c2d
|
||||
end
|
||||
; 96c2e
|
||||
|
||||
UnknownScript_0x96c2e: ; 96c2e
|
||||
; unreferenced
|
||||
end
|
||||
; 96c2f
|
||||
|
||||
@ -1099,12 +1101,12 @@ HatchEggScript: ; 96c2f
|
||||
|
||||
WarpToNewMapScript: ; 96c34
|
||||
warpsound
|
||||
newloadmap MAPSETUP_05
|
||||
newloadmap MAPSETUP_DOOR
|
||||
end
|
||||
; 96c38
|
||||
|
||||
FallIntoMapScript: ; 96c38
|
||||
newloadmap MAPSETUP_06
|
||||
newloadmap MAPSETUP_FALL
|
||||
playsound SFX_KINESIS
|
||||
applymovement PLAYER, MovementData_0x96c48
|
||||
playsound SFX_STRENGTH
|
||||
@ -1123,7 +1125,7 @@ LandAfterPitfallScript: ; 96c4a
|
||||
; 96c4d
|
||||
|
||||
UnknownScript_0x96c4d: ; 4
|
||||
reloadandreturn MAPSETUP_07
|
||||
reloadandreturn MAPSETUP_CONNECTION
|
||||
; 96c4f
|
||||
|
||||
UnknownScript_0x96c4f: ; 9
|
||||
|
863
engine/events_3.asm
Executable file
863
engine/events_3.asm
Executable file
File diff suppressed because it is too large
Load Diff
@ -372,7 +372,7 @@ INCBIN "gfx/evo/bubble_large.2bpp"
|
||||
INCBIN "gfx/evo/bubble.2bpp"
|
||||
|
||||
Function4e881: ; 4e881
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
call ClearTileMap
|
||||
call ClearSprites
|
||||
call DisableLCD
|
||||
@ -405,7 +405,7 @@ UnknownText_0x4e8bd: ; 0x4e8bd
|
||||
|
||||
|
||||
Function4e8c2: ; 4e8c2
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
call ClearTileMap
|
||||
call ClearSprites
|
||||
call DisableLCD
|
||||
|
916
engine/flypoints.asm
Executable file
916
engine/flypoints.asm
Executable file
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
LinkCommunications: ; 28000
|
||||
call WhiteBGMap
|
||||
ld c, $50
|
||||
call ClearBGPalettes
|
||||
ld c, 80
|
||||
call DelayFrames
|
||||
call ClearScreen
|
||||
call ClearSprites
|
||||
@ -8,7 +8,7 @@ LinkCommunications: ; 28000
|
||||
xor a
|
||||
ld [hSCX], a
|
||||
ld [hSCY], a
|
||||
ld c, $50
|
||||
ld c, 80
|
||||
call DelayFrames
|
||||
call ClearScreen
|
||||
call UpdateSprites
|
||||
@ -431,7 +431,7 @@ Function28177: ; 28177
|
||||
ld de, OTName
|
||||
ld bc, NAME_LENGTH
|
||||
call CopyBytes
|
||||
call Function222a
|
||||
call ReturnToMapFromSubmenu
|
||||
ld a, [wc2d7]
|
||||
push af
|
||||
ld a, $1
|
||||
@ -509,7 +509,7 @@ UnknownText_0x283ed: ; 0x283ed
|
||||
|
||||
Function283f2: ; 283f2
|
||||
ld a, $1
|
||||
ld [$ffcc], a
|
||||
ld [hFFCC], a
|
||||
.asm_283f6
|
||||
ld a, [hl]
|
||||
ld [hSerialSend], a
|
||||
@ -521,14 +521,14 @@ Function283f2: ; 283f2
|
||||
.asm_28401
|
||||
dec a
|
||||
jr nz, .asm_28401
|
||||
ld a, [$ffcc]
|
||||
ld a, [hFFCC]
|
||||
and a
|
||||
ld a, b
|
||||
pop bc
|
||||
jr z, .asm_28411
|
||||
dec hl
|
||||
xor a
|
||||
ld [$ffcc], a
|
||||
ld [hFFCC], a
|
||||
jr .asm_283f6
|
||||
|
||||
.asm_28411
|
||||
@ -2172,7 +2172,7 @@ Function28fa1: ; 28fa1
|
||||
Function28fdb: ; 28fdb
|
||||
xor a
|
||||
ld [wJumptableIndex], a
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
call ClearSprites
|
||||
call ClearTileMap
|
||||
call DisableLCD
|
||||
@ -2495,7 +2495,7 @@ Function29220: ; 29220
|
||||
; 29229
|
||||
|
||||
Function29229: ; 29229
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
call ClearTileMap
|
||||
call ClearSprites
|
||||
call DisableLCD
|
||||
@ -2623,7 +2623,7 @@ Function292ec: ; 292ec
|
||||
|
||||
Function292f6: ; 292f6
|
||||
push af
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
call WaitTop
|
||||
ld a, VBGMap1 / $100
|
||||
ld [hBGMapAddress + 1], a
|
||||
@ -3902,7 +3902,7 @@ Function29dba: ; 29dba
|
||||
|
||||
Function29e0c: ; 29e0c
|
||||
xor a
|
||||
ld [$ffca], a
|
||||
ld [hFFCA], a
|
||||
ld a, [wcf5b]
|
||||
ld h, a
|
||||
ld a, [wcf5c]
|
||||
|
@ -655,7 +655,7 @@ Function467b: ; 467b
|
||||
ld hl, OBJECT_12
|
||||
add hl, bc
|
||||
ld [hl], a
|
||||
ld hl, OBJECT_27
|
||||
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
|
||||
add hl, bc
|
||||
rept 3
|
||||
ld [hli], a
|
||||
@ -848,28 +848,28 @@ RestoreDefaultMovement: ; 4769
|
||||
; 4780
|
||||
|
||||
ClearObjectStructField27: ; 4780
|
||||
ld hl, OBJECT_27
|
||||
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
|
||||
add hl, bc
|
||||
ld [hl], 0
|
||||
ret
|
||||
; 4787
|
||||
|
||||
IncrementObjectStructField27: ; 4787
|
||||
ld hl, OBJECT_27
|
||||
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
|
||||
add hl, bc
|
||||
inc [hl]
|
||||
ret
|
||||
; 478d
|
||||
|
||||
DecrementObjectStructField27: ; 478d
|
||||
ld hl, OBJECT_27
|
||||
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
|
||||
add hl, bc
|
||||
dec [hl]
|
||||
ret
|
||||
; 4793
|
||||
|
||||
JumptoObjectStructField27: ; 4793
|
||||
ld hl, OBJECT_27
|
||||
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
pop hl
|
||||
@ -1043,17 +1043,17 @@ Function47dd: ; 47dd
|
||||
|
||||
.ObeyDPad: ; 487c
|
||||
ld hl, Function5000
|
||||
jp Function5041
|
||||
jp HandleMovementData
|
||||
; 4882
|
||||
|
||||
.Movement08: ; 4882
|
||||
ld hl, Function5015
|
||||
jp Function5041
|
||||
jp HandleMovementData
|
||||
; 4888
|
||||
|
||||
.Movement09: ; 4888
|
||||
ld hl, Function5026
|
||||
jp Function5041
|
||||
jp HandleMovementData
|
||||
; 488e
|
||||
|
||||
.Movement0a: ; 488e
|
||||
@ -1070,7 +1070,7 @@ Function47dd: ; 47dd
|
||||
|
||||
.Movement0d: ; 4897
|
||||
ld hl, Function5000
|
||||
jp Function5041
|
||||
jp HandleMovementData
|
||||
; 489d
|
||||
|
||||
.Movement0e: ; 489d
|
||||
@ -1079,12 +1079,12 @@ Function47dd: ; 47dd
|
||||
|
||||
.Follow: ; 48a0
|
||||
ld hl, Function54e6
|
||||
jp Function5041
|
||||
jp HandleMovementData
|
||||
; 48a6
|
||||
|
||||
.Script: ; 48a6
|
||||
ld hl, Function500e
|
||||
jp Function5041
|
||||
jp HandleMovementData
|
||||
; 48ac
|
||||
|
||||
.Strength: ; 48ac
|
||||
@ -1149,12 +1149,15 @@ Function47dd: ; 47dd
|
||||
ld hl, OBJECT_MAP_X
|
||||
add hl, bc
|
||||
ld d, [hl]
|
||||
|
||||
ld hl, OBJECT_MAP_Y
|
||||
add hl, bc
|
||||
ld e, [hl]
|
||||
|
||||
ld hl, OBJECT_32
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
|
||||
push bc
|
||||
call GetObjectStruct
|
||||
ld hl, OBJECT_DIRECTION_WALKING
|
||||
@ -1162,6 +1165,7 @@ Function47dd: ; 47dd
|
||||
ld a, [hl]
|
||||
cp STANDING
|
||||
jr z, .standing
|
||||
|
||||
ld hl, OBJECT_NEXT_MAP_X
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
@ -2400,11 +2404,14 @@ UpdateJumpPosition: ; 4fd5
|
||||
; 5000
|
||||
|
||||
Function5000: ; unscripted?
|
||||
; copy [wc3de] to [wc2df]
|
||||
ld a, [wc2de]
|
||||
ld hl, wc2df
|
||||
ld [hl], a
|
||||
ld a, $3e
|
||||
; load [wc2de] with movement_step_sleep_1
|
||||
ld a, movement_step_sleep_1
|
||||
ld [wc2de], a
|
||||
; recover the previous value of [wc2de]
|
||||
ld a, [hl]
|
||||
ret
|
||||
; 500e
|
||||
@ -2416,7 +2423,7 @@ Function500e: ; scripted
|
||||
; 5015
|
||||
|
||||
Function5015: ; 5015
|
||||
ld hl, OBJECT_27
|
||||
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
|
||||
add hl, bc
|
||||
ld e, [hl]
|
||||
inc [hl]
|
||||
@ -2431,7 +2438,7 @@ Function5015: ; 5015
|
||||
; 5026
|
||||
|
||||
Function5026: ; 5026
|
||||
ld hl, OBJECT_27
|
||||
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
|
||||
add hl, bc
|
||||
ld e, [hl]
|
||||
inc [hl]
|
||||
@ -2446,16 +2453,16 @@ Function5026: ; 5026
|
||||
; 5037
|
||||
|
||||
Function5037: ; 5037
|
||||
ld hl, Function503d
|
||||
jp Function5041
|
||||
ld hl, GetMovementPerson
|
||||
jp HandleMovementData
|
||||
; 503d
|
||||
|
||||
Function503d: ; 503d
|
||||
GetMovementPerson: ; 503d
|
||||
ld a, [wMovementPerson]
|
||||
ret
|
||||
; 5041
|
||||
|
||||
Function5041: ; 5041
|
||||
HandleMovementData: ; 5041
|
||||
call CopyMovementPointer
|
||||
.loop
|
||||
xor a
|
||||
@ -2484,7 +2491,7 @@ GetMovementByte: ; 505e
|
||||
jp [hl]
|
||||
; 5065
|
||||
|
||||
Function5065: ; 5065
|
||||
ContinueReadingMovement: ; 5065
|
||||
ld a, 1
|
||||
ld [wc2ea], a
|
||||
ret
|
||||
@ -2563,7 +2570,8 @@ Function54e6: ; 54e6
|
||||
.done
|
||||
call Function550a
|
||||
ret c
|
||||
ld a, $3e
|
||||
|
||||
ld a, movement_step_sleep_1
|
||||
ret
|
||||
; 550a
|
||||
|
||||
@ -2585,7 +2593,7 @@ Function550a: ; 550a
|
||||
.nope
|
||||
ld a, $ff
|
||||
ld [wObjectFollow_Follower], a
|
||||
ld a, $47
|
||||
ld a, movement_step_end
|
||||
scf
|
||||
ret
|
||||
; 5529
|
||||
@ -2696,6 +2704,7 @@ Function5582: ; 5582
|
||||
Function55ac: ; 55ac
|
||||
call FindFirstEmptyObjectStruct
|
||||
ret nc
|
||||
|
||||
ld d, h
|
||||
ld e, l
|
||||
callba Function8286
|
||||
@ -2703,11 +2712,14 @@ Function55ac: ; 55ac
|
||||
; 55b9
|
||||
|
||||
Function55b9: ; 55b9
|
||||
; load into wc2f0:
|
||||
; -1, -1, [de], [de + 1], [de + 2], [hMapObjectIndexBuffer], [MapX], [MapY], -1
|
||||
ld hl, wc2f0
|
||||
ld [hl], -1
|
||||
inc hl
|
||||
ld [hl], -1
|
||||
inc hl
|
||||
|
||||
ld a, [de]
|
||||
inc de
|
||||
ld [hli], a
|
||||
@ -2716,8 +2728,10 @@ Function55b9: ; 55b9
|
||||
ld [hli], a
|
||||
ld a, [de]
|
||||
ld [hli], a
|
||||
|
||||
ld a, [hMapObjectIndexBuffer]
|
||||
ld [hli], a
|
||||
|
||||
push hl
|
||||
ld hl, OBJECT_MAP_X
|
||||
add hl, bc
|
||||
@ -2726,6 +2740,7 @@ Function55b9: ; 55b9
|
||||
add hl, bc
|
||||
ld e, [hl]
|
||||
pop hl
|
||||
|
||||
ld [hl], d
|
||||
inc hl
|
||||
ld [hl], e
|
||||
@ -2786,17 +2801,21 @@ Function561d: ; 561d
|
||||
Function5629: ; 5629
|
||||
cp NUM_OBJECTS
|
||||
ret nc
|
||||
|
||||
call GetMapObject
|
||||
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
cp -1
|
||||
ret z
|
||||
|
||||
cp NUM_OBJECT_STRUCTS
|
||||
ret nc
|
||||
|
||||
call GetObjectStruct
|
||||
call GetObjectSprite
|
||||
ret z
|
||||
|
||||
call Function5673
|
||||
ret
|
||||
; 5645
|
||||
@ -2977,9 +2996,9 @@ Function56cd: ; 56cd
|
||||
|
||||
.ok7
|
||||
ld a, d
|
||||
ld [$ffbf], a
|
||||
ld [hFFBF], a
|
||||
.loop
|
||||
ld a, [$ffbf]
|
||||
ld a, [hFFBF]
|
||||
ld d, a
|
||||
ld a, [hUsedSpriteTile]
|
||||
add e
|
||||
@ -3180,7 +3199,7 @@ ResetFollower: ; 5847
|
||||
cp -1
|
||||
ret z
|
||||
call GetObjectStruct
|
||||
callba Function58e3
|
||||
callba Function58e3 ; no need to bankswitch
|
||||
ld a, -1
|
||||
ld [wObjectFollow_Follower], a
|
||||
ret
|
||||
@ -3294,16 +3313,19 @@ Function58e3: ; 58e3
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
cp -1
|
||||
jp z, Function5903
|
||||
jp z, Function5903 ; a jr would have been appropriate here
|
||||
|
||||
push bc
|
||||
call GetMapObject
|
||||
ld hl, MAPOBJECT_MOVEMENT
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
pop bc
|
||||
|
||||
ld hl, OBJECT_MOVEMENTTYPE
|
||||
add hl, bc
|
||||
ld [hl], a
|
||||
|
||||
ld hl, OBJECT_09
|
||||
add hl, bc
|
||||
ld [hl], 0
|
||||
@ -3322,6 +3344,7 @@ Function5903: ; 5903
|
||||
ld hl, OBJECT_MOVEMENTTYPE
|
||||
add hl, bc
|
||||
ld [hl], a
|
||||
|
||||
ld hl, OBJECT_09
|
||||
add hl, bc
|
||||
ld [hl], 0
|
||||
@ -3495,7 +3518,7 @@ Function59f3: ; 59f3
|
||||
.next
|
||||
ld a, [hli]
|
||||
ld d, a
|
||||
and %11110000
|
||||
and $f0
|
||||
ret z
|
||||
cp c
|
||||
jr nz, .next
|
||||
@ -3503,20 +3526,20 @@ Function59f3: ; 59f3
|
||||
push bc
|
||||
push hl
|
||||
ld a, d
|
||||
and %00001111
|
||||
call Function5ac2
|
||||
call Function5a0d
|
||||
and $f
|
||||
call .GetObjectStructPointer
|
||||
call .asm_5a0d
|
||||
pop hl
|
||||
pop bc
|
||||
jr .next
|
||||
; 5a0d
|
||||
|
||||
Function5a0d: ; 5a0d
|
||||
.asm_5a0d: ; 5a0d
|
||||
ld hl, OBJECT_SPRITE_TILE
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
and %01111111
|
||||
ld [$ffc1], a
|
||||
ld [hFFC1], a
|
||||
|
||||
xor a
|
||||
bit 7, [hl]
|
||||
@ -3550,7 +3573,7 @@ Function5a0d: ; 5a0d
|
||||
jr z, .skip4
|
||||
or %10000000
|
||||
.skip4
|
||||
ld [$ffc2], a
|
||||
ld [hFFC2], a
|
||||
|
||||
ld hl, OBJECT_SPRITE_X
|
||||
add hl, bc
|
||||
@ -3565,7 +3588,7 @@ Function5a0d: ; 5a0d
|
||||
ld e, a
|
||||
ld a, [wd14c]
|
||||
add e
|
||||
ld [$ffbf], a
|
||||
ld [hFFBF], a
|
||||
|
||||
ld hl, OBJECT_SPRITE_Y
|
||||
add hl, bc
|
||||
@ -3580,7 +3603,7 @@ Function5a0d: ; 5a0d
|
||||
ld e, a
|
||||
ld a, [wd14d]
|
||||
add e
|
||||
ld [$ffc0], a
|
||||
ld [hFFC0], a
|
||||
|
||||
ld hl, OBJECT_FACING_STEP
|
||||
add hl, bc
|
||||
@ -3609,14 +3632,14 @@ Function5a0d: ; 5a0d
|
||||
jr nc, .full
|
||||
|
||||
.addsprite
|
||||
ld a, [$ffc0]
|
||||
ld a, [hFFC0]
|
||||
add [hl]
|
||||
inc hl
|
||||
|
||||
ld [bc], a
|
||||
inc c
|
||||
|
||||
ld a, [$ffbf]
|
||||
ld a, [hFFBF]
|
||||
add [hl]
|
||||
inc hl
|
||||
|
||||
@ -3626,7 +3649,7 @@ Function5a0d: ; 5a0d
|
||||
ld e, [hl]
|
||||
inc hl
|
||||
|
||||
ld a, [$ffc1]
|
||||
ld a, [hFFC1]
|
||||
bit 2, e
|
||||
jr z, .nope1
|
||||
xor a
|
||||
@ -3640,7 +3663,7 @@ Function5a0d: ; 5a0d
|
||||
ld a, e
|
||||
bit 1, a
|
||||
jr z, .nope2
|
||||
ld a, [$ffc2]
|
||||
ld a, [hFFC2]
|
||||
or e
|
||||
.nope2
|
||||
and %11110000
|
||||
@ -3665,7 +3688,7 @@ Function5a0d: ; 5a0d
|
||||
ret
|
||||
; 5ac2
|
||||
|
||||
Function5ac2: ; 5ac2
|
||||
.GetObjectStructPointer: ; 5ac2
|
||||
ld c, a
|
||||
ld b, 0
|
||||
ld hl, .Addresses
|
||||
|
@ -17,28 +17,28 @@ endr
|
||||
; 15377
|
||||
|
||||
MapSetupScripts: ; 15377
|
||||
dw MapSetupScript1
|
||||
dw MapSetupScript2
|
||||
dw MapSetupScript3
|
||||
dw MapSetupScript4
|
||||
dw MapSetupScript5
|
||||
dw MapSetupScript6
|
||||
dw MapSetupScript7
|
||||
dw MapSetupScript8
|
||||
dw MapSetupScript9
|
||||
dw MapSetupScript10
|
||||
dw MapSetupScript11
|
||||
dw MapSetupScript12
|
||||
dw MapSetupScript_Warp
|
||||
dw MapSetupScript_Continue
|
||||
dw MapSetupScript_ReloadMap
|
||||
dw MapSetupScript_Teleport
|
||||
dw MapSetupScript_Door
|
||||
dw MapSetupScript_Fall
|
||||
dw MapSetupScript_Connection
|
||||
dw MapSetupScript_LinkReturn
|
||||
dw MapSetupScript_Train
|
||||
dw MapSetupScript_Submenu
|
||||
dw MapSetupScript_BadWarp
|
||||
dw MapSetupScript_Fly
|
||||
; 1538f
|
||||
|
||||
MapSetupScript4: ; 1538f
|
||||
MapSetupScript_Teleport: ; 1538f
|
||||
db map_prolong_sprites
|
||||
|
||||
MapSetupScript12: ; 15390
|
||||
MapSetupScript_Fly: ; 15390
|
||||
db map_fade_out_palettes
|
||||
db map_keep_roam
|
||||
|
||||
MapSetupScript1: ; 15392
|
||||
MapSetupScript_Warp: ; 15392
|
||||
db map_lcd_off
|
||||
db map_sound_off
|
||||
db map_load_spawn
|
||||
@ -63,7 +63,7 @@ MapSetupScript1: ; 15392
|
||||
db map_wildmons
|
||||
db map_end_setup_script
|
||||
|
||||
MapSetupScript11: ; 153a9
|
||||
MapSetupScript_BadWarp: ; 153a9
|
||||
db map_load_spawn
|
||||
db map_attributes
|
||||
db map_change_callback
|
||||
@ -87,7 +87,7 @@ MapSetupScript11: ; 153a9
|
||||
db map_wildmons
|
||||
db map_end_setup_script
|
||||
|
||||
MapSetupScript7: ; 153bf
|
||||
MapSetupScript_Connection: ; 153bf
|
||||
db map_animations_off
|
||||
db map_load_connection
|
||||
db map_attributes
|
||||
@ -106,13 +106,13 @@ MapSetupScript7: ; 153bf
|
||||
db map_animations_on
|
||||
db map_end_setup_script
|
||||
|
||||
MapSetupScript6: ; 153d0
|
||||
MapSetupScript_Fall: ; 153d0
|
||||
db map_prolong_sprites
|
||||
|
||||
MapSetupScript5: ; 153d1
|
||||
MapSetupScript_Door: ; 153d1
|
||||
db map_fade_out_palettes
|
||||
|
||||
MapSetupScript9: ; 153d2
|
||||
MapSetupScript_Train: ; 153d2
|
||||
db map_load_warp
|
||||
db map_attributes
|
||||
db map_warp_face
|
||||
@ -135,7 +135,7 @@ MapSetupScript9: ; 153d2
|
||||
db map_update_roam
|
||||
db map_end_setup_script
|
||||
|
||||
MapSetupScript3: ; 153e7
|
||||
MapSetupScript_ReloadMap: ; 153e7
|
||||
db map_fade
|
||||
db map_clear_bg_palettes
|
||||
db map_lcd_off
|
||||
@ -153,7 +153,7 @@ MapSetupScript3: ; 153e7
|
||||
db map_wildmons
|
||||
db map_end_setup_script
|
||||
|
||||
MapSetupScript8: ; 153f7
|
||||
MapSetupScript_LinkReturn: ; 153f7
|
||||
db map_fade
|
||||
db map_lcd_off
|
||||
db map_sound_off
|
||||
@ -172,7 +172,7 @@ MapSetupScript8: ; 153f7
|
||||
db map_text_scroll_off
|
||||
db map_end_setup_script
|
||||
|
||||
MapSetupScript2: ; 15408
|
||||
MapSetupScript_Continue: ; 15408
|
||||
db map_lcd_off
|
||||
db map_sound_off
|
||||
db map_attributes_2
|
||||
@ -192,7 +192,7 @@ MapSetupScript2: ; 15408
|
||||
db map_wildmons
|
||||
db map_end_setup_script
|
||||
|
||||
MapSetupScript10: ; 1541a
|
||||
MapSetupScript_Submenu: ; 1541a
|
||||
db map_load_blocks
|
||||
db map_connection_blocks
|
||||
db map_end_setup_script
|
||||
@ -245,7 +245,7 @@ endr
|
||||
MapSetupCommands: ; 15440
|
||||
dba EnableLCD ; 00
|
||||
dba DisableLCD ; 01
|
||||
dba SoundRestart ; 02
|
||||
dba MapSetup_Sound_Off ; 02
|
||||
dba PlayMapMusic ; 03
|
||||
dba RestartMapMusic ; 04
|
||||
dba FadeToMapMusic ; 05
|
||||
@ -271,9 +271,9 @@ MapSetupCommands: ; 15440
|
||||
dba LoadWarpData ; 19
|
||||
dba LoadMapAttributes ; 1a
|
||||
dba LoadMapAttributes_IgnoreHidden ; 1b
|
||||
dba WhiteBGMap ; 1c
|
||||
dba FadeBlackBGMap ; 1d
|
||||
dba FadeInBGMap ; 1e
|
||||
dba ClearBGPalettes ; 1c
|
||||
dba FadeOutPalettes ; 1d
|
||||
dba FadeInPalettes ; 1e
|
||||
dba GetCoordOfUpperLeftCorner ; 1f
|
||||
dba RestoreFacingAfterWarp ; 20
|
||||
dba SpawnInFacingDown ; 21
|
||||
|
@ -61,32 +61,32 @@ MovementPointers: ; 5075
|
||||
dw Movement_fix_facing ; 3b
|
||||
dw Movement_3c ; 3c
|
||||
dw Movement_hide_person ; 3d
|
||||
dw Movement_show_person ; 3e
|
||||
dw Movement_3f ; 3f
|
||||
dw Movement_40 ; 40
|
||||
dw Movement_41 ; 41
|
||||
dw Movement_42 ; 42
|
||||
dw Movement_43 ; 43
|
||||
dw Movement_44 ; 44
|
||||
dw Movement_accelerate_last ; 45
|
||||
dw Movement_step_sleep_1 ; 3e
|
||||
dw Movement_step_sleep_2 ; 3f
|
||||
dw Movement_step_sleep_3 ; 40
|
||||
dw Movement_step_sleep_4 ; 41
|
||||
dw Movement_step_sleep_5 ; 42
|
||||
dw Movement_step_sleep_6 ; 43
|
||||
dw Movement_step_sleep_7 ; 44
|
||||
dw Movement_step_sleep_8 ; 45
|
||||
dw Movement_step_sleep ; 46
|
||||
dw Movement_step_end ; 47
|
||||
dw Movement_48 ; 48
|
||||
dw Movement_remove_person ; 49
|
||||
dw Movement_4a ; 4a
|
||||
dw Movement_step_loop ; 4a
|
||||
dw Movement_4b ; 4b
|
||||
dw Movement_teleport_from ; 4c
|
||||
dw Movement_teleport_to ; 4d
|
||||
dw Movement_skyfall ; 4e
|
||||
dw Movement_step_wait5 ; 4f
|
||||
dw Movement_50 ; 50
|
||||
dw Movement_51 ; 51
|
||||
dw Movement_52 ; 52
|
||||
dw Movement_fish_got_bite ; 51
|
||||
dw Movement_fish_cast_rod ; 52
|
||||
dw Movement_hide_emote ; 53
|
||||
dw Movement_show_emote ; 54
|
||||
dw Movement_step_shake ; 55
|
||||
dw Movement_56 ; 56
|
||||
dw Movement_57 ; 57
|
||||
dw Movement_rock_smash ; 57
|
||||
dw Movement_58 ; 58
|
||||
dw Movement_59 ; 59
|
||||
; 5129
|
||||
@ -139,7 +139,7 @@ Movement_step_wait5: ; 5145
|
||||
ld [hl], $3
|
||||
ld hl, OBJECT_DIRECTION_WALKING
|
||||
add hl, bc
|
||||
ld [hl], $ff
|
||||
ld [hl], STANDING
|
||||
ret
|
||||
; 516a
|
||||
|
||||
@ -156,14 +156,14 @@ Movement_58: ; 516a
|
||||
ld [hl], a
|
||||
ld hl, OBJECT_DIRECTION_WALKING
|
||||
add hl, bc
|
||||
ld [hl], $ff
|
||||
ld [hl], STANDING
|
||||
ld hl, OBJECT_09
|
||||
add hl, bc
|
||||
ld [hl], $12
|
||||
ret
|
||||
; 5189
|
||||
|
||||
Movement_51: ; 5189
|
||||
Movement_fish_got_bite: ; 5189
|
||||
ld hl, OBJECT_11
|
||||
add hl, bc
|
||||
ld [hl], $6
|
||||
@ -173,7 +173,7 @@ Movement_51: ; 5189
|
||||
ret
|
||||
; 5196
|
||||
|
||||
Movement_57: ; 5196
|
||||
Movement_rock_smash: ; 5196
|
||||
call GetMovementByte
|
||||
ld hl, OBJECT_STEP_DURATION
|
||||
add hl, bc
|
||||
@ -187,7 +187,7 @@ Movement_57: ; 5196
|
||||
ret
|
||||
; 51ab
|
||||
|
||||
Movement_52: ; 51ab
|
||||
Movement_fish_cast_rod: ; 51ab
|
||||
ld hl, OBJECT_11
|
||||
add hl, bc
|
||||
ld [hl], $6
|
||||
@ -197,11 +197,11 @@ Movement_52: ; 51ab
|
||||
ret
|
||||
; 51b8
|
||||
|
||||
Movement_4a: ; 51b8
|
||||
ld hl, OBJECT_27
|
||||
Movement_step_loop: ; 51b8
|
||||
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
|
||||
add hl, bc
|
||||
ld [hl], $0
|
||||
jp Function5065
|
||||
jp ContinueReadingMovement
|
||||
; 51c1
|
||||
|
||||
Movement_step_end: ; 51c1
|
||||
@ -209,11 +209,14 @@ Movement_step_end: ; 51c1
|
||||
ld hl, OBJECT_MOVEMENTTYPE
|
||||
add hl, bc
|
||||
ld [hl], a
|
||||
ld hl, OBJECT_27
|
||||
|
||||
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
|
||||
add hl, bc
|
||||
ld [hl], $0
|
||||
|
||||
ld hl, VramState
|
||||
res 7, [hl]
|
||||
|
||||
ld hl, OBJECT_09
|
||||
add hl, bc
|
||||
ld [hl], $1
|
||||
@ -225,16 +228,20 @@ Movement_48: ; 51db
|
||||
ld hl, OBJECT_MOVEMENTTYPE
|
||||
add hl, bc
|
||||
ld [hl], a
|
||||
ld hl, OBJECT_27
|
||||
|
||||
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
|
||||
add hl, bc
|
||||
ld [hl], $0
|
||||
|
||||
call GetMovementByte
|
||||
ld hl, OBJECT_STEP_DURATION
|
||||
add hl, bc
|
||||
ld [hl], a
|
||||
|
||||
ld hl, OBJECT_09
|
||||
add hl, bc
|
||||
ld [hl], $3
|
||||
|
||||
ld hl, VramState
|
||||
res 7, [hl]
|
||||
ret
|
||||
@ -245,10 +252,10 @@ Movement_remove_person: ; 51fd
|
||||
ld hl, wObjectFollow_Leader
|
||||
ld a, [hMapObjectIndexBuffer]
|
||||
cp [hl]
|
||||
jr nz, .asm_520a
|
||||
ld [hl], $ff
|
||||
jr nz, .not_leading
|
||||
ld [hl], -1
|
||||
|
||||
.asm_520a
|
||||
.not_leading
|
||||
ld hl, VramState
|
||||
res 7, [hl]
|
||||
ret
|
||||
@ -258,43 +265,45 @@ Movement_4b: ; 5210
|
||||
ld hl, OBJECT_11
|
||||
add hl, bc
|
||||
ld [hl], $1
|
||||
|
||||
ld hl, OBJECT_09
|
||||
add hl, bc
|
||||
ld [hl], $4
|
||||
|
||||
ld hl, VramState
|
||||
res 7, [hl]
|
||||
ret
|
||||
; 5222
|
||||
|
||||
Movement_show_person: ; 5222
|
||||
Movement_step_sleep_1: ; 5222
|
||||
ld a, $1
|
||||
jr Function5247
|
||||
|
||||
Movement_3f: ; 5226
|
||||
Movement_step_sleep_2: ; 5226
|
||||
ld a, $2
|
||||
jr Function5247
|
||||
|
||||
Movement_40: ; 522a
|
||||
Movement_step_sleep_3: ; 522a
|
||||
ld a, $3
|
||||
jr Function5247
|
||||
|
||||
Movement_41: ; 522e
|
||||
Movement_step_sleep_4: ; 522e
|
||||
ld a, $4
|
||||
jr Function5247
|
||||
|
||||
Movement_42: ; 5232
|
||||
Movement_step_sleep_5: ; 5232
|
||||
ld a, $5
|
||||
jr Function5247
|
||||
|
||||
Movement_43: ; 5236
|
||||
Movement_step_sleep_6: ; 5236
|
||||
ld a, $6
|
||||
jr Function5247
|
||||
|
||||
Movement_44: ; 523a
|
||||
Movement_step_sleep_7: ; 523a
|
||||
ld a, $7
|
||||
jr Function5247
|
||||
|
||||
Movement_accelerate_last: ; 523e
|
||||
Movement_step_sleep_8: ; 523e
|
||||
ld a, $8
|
||||
jr Function5247
|
||||
|
||||
@ -309,15 +318,18 @@ Function5247: ; 5247
|
||||
ld hl, OBJECT_STEP_DURATION
|
||||
add hl, bc
|
||||
ld [hl], a
|
||||
|
||||
ld hl, OBJECT_09
|
||||
add hl, bc
|
||||
ld [hl], $3
|
||||
|
||||
ld hl, OBJECT_11
|
||||
add hl, bc
|
||||
ld [hl], $1
|
||||
|
||||
ld hl, OBJECT_DIRECTION_WALKING
|
||||
add hl, bc
|
||||
ld [hl], $ff
|
||||
ld [hl], STANDING
|
||||
ret
|
||||
; 525f
|
||||
|
||||
@ -334,7 +346,7 @@ Movement_50: ; 525f
|
||||
ld [hl], $3
|
||||
ld hl, OBJECT_DIRECTION_WALKING
|
||||
add hl, bc
|
||||
ld [hl], $ff
|
||||
ld [hl], STANDING
|
||||
ret
|
||||
; 5279
|
||||
|
||||
@ -351,7 +363,7 @@ Movement_56: ; 5279
|
||||
ld [hl], $b
|
||||
ld hl, OBJECT_DIRECTION_WALKING
|
||||
add hl, bc
|
||||
ld [hl], $ff
|
||||
ld [hl], STANDING
|
||||
ret
|
||||
; 5293
|
||||
|
||||
@ -359,52 +371,52 @@ Movement_38: ; 5293
|
||||
ld hl, OBJECT_FLAGS1
|
||||
add hl, bc
|
||||
res 3, [hl]
|
||||
jp Function5065
|
||||
jp ContinueReadingMovement
|
||||
; 529c
|
||||
|
||||
Movement_39: ; 529c
|
||||
ld hl, OBJECT_FLAGS1
|
||||
add hl, bc
|
||||
set 3, [hl]
|
||||
jp Function5065
|
||||
jp ContinueReadingMovement
|
||||
; 52a5
|
||||
|
||||
Movement_remove_fixed_facing: ; 52a5
|
||||
ld hl, OBJECT_FLAGS1
|
||||
add hl, bc
|
||||
res 2, [hl]
|
||||
jp Function5065
|
||||
jp ContinueReadingMovement
|
||||
; 52ae
|
||||
|
||||
Movement_fix_facing: ; 52ae
|
||||
ld hl, OBJECT_FLAGS1
|
||||
add hl, bc
|
||||
set 2, [hl]
|
||||
jp Function5065
|
||||
jp ContinueReadingMovement
|
||||
; 52b7
|
||||
|
||||
Movement_3c: ; 52b7
|
||||
ld hl, OBJECT_FLAGS1
|
||||
add hl, bc
|
||||
res 0, [hl]
|
||||
jp Function5065
|
||||
jp ContinueReadingMovement
|
||||
; 52c0
|
||||
|
||||
Movement_hide_person: ; 52c0
|
||||
ld hl, OBJECT_FLAGS1
|
||||
add hl, bc
|
||||
set 0, [hl]
|
||||
jp Function5065
|
||||
jp ContinueReadingMovement
|
||||
; 52c9
|
||||
|
||||
Movement_hide_emote: ; 52c9
|
||||
call Function5579
|
||||
jp Function5065
|
||||
jp ContinueReadingMovement
|
||||
; 52cf
|
||||
|
||||
Movement_show_emote: ; 52cf
|
||||
call Function5547
|
||||
jp Function5065
|
||||
jp ContinueReadingMovement
|
||||
; 52d5
|
||||
|
||||
Movement_step_shake: ; 52d5
|
||||
@ -413,7 +425,7 @@ Movement_step_shake: ; 52d5
|
||||
|
||||
call GetMovementByte
|
||||
call Function5565
|
||||
jp Function5065
|
||||
jp ContinueReadingMovement
|
||||
; 52de
|
||||
|
||||
Movement_turn_head_down: ; 52de
|
||||
@ -441,7 +453,7 @@ TurnHead: ; 52ee
|
||||
ld [hl], $1
|
||||
ld hl, OBJECT_DIRECTION_WALKING
|
||||
add hl, bc
|
||||
ld [hl], $ff
|
||||
ld [hl], STANDING
|
||||
ret
|
||||
; 5300
|
||||
|
||||
|
@ -40,7 +40,7 @@ NamingScreen: ; 116c1
|
||||
; 116f8
|
||||
|
||||
Function116f8: ; 116f8
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
ld b, $8
|
||||
call GetSGBLayout
|
||||
call DisableLCD
|
||||
|
@ -594,7 +594,7 @@ Function103fd: ; 103fd
|
||||
ld [Options], a
|
||||
ld a, $8
|
||||
ld [PartyMenuActionText], a
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
callba Function5004f
|
||||
callba Function50405
|
||||
callba Function503e0
|
||||
@ -922,7 +922,7 @@ Function105dc: ; 105dc (4:45dc)
|
||||
ret
|
||||
|
||||
.asm_1066c: ; 1066c (4:466c)
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
jr .asm_1067e
|
||||
|
||||
.BattleOnly: ; 10671 (4:4671)
|
||||
@ -1401,7 +1401,7 @@ Function108d4: ; 108d4 (4:48d4)
|
||||
|
||||
|
||||
Function10955: ; 10955
|
||||
call WhiteBGMap
|
||||
call ClearBGPalettes
|
||||
call ClearTileMap
|
||||
call ClearSprites
|
||||
call DisableLCD
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user