pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Battle animation annotations

Browse Source
This commit is contained in:
PikalaxALT 2016-03-01 22:31:21 -05:00
parent e044b8ec08
commit 599e6e8d16
49 changed files with 761 additions and 772 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/engine.asm
View File

@ -38,8 +38,8 @@ _MapSetup_Sound_Off:: ; e8000
dec e dec e
jr nz, .clearsound jr nz, .clearsound
ld hl, Channel1 ; start of channel data ld hl, Channels ; start of channel data
ld de, $1bf ; length of area to clear (entire sound wram area) ld de, ChannelsEnd - Channels ; length of area to clear (entire sound wram area)
.clearchannels ; clear Channel1-$c2bf .clearchannels ; clear Channel1-$c2bf
xor a xor a
ld [hli], a ld [hli], a

8
battle/ai/items.asm
View File

@ -9,7 +9,7 @@ AI_SwitchOrTryItem: ; 38000
and a and a
ret nz ret nz
callba CheckSubstatus_RechargeChargedRampageBideRollout callba CheckEnemyLockedIn
ret nz ret nz
ld a, [PlayerSubStatus5] ld a, [PlayerSubStatus5]
@ -716,7 +716,7 @@ AI_Switch: ; 3846c
ld d, h ld d, h
ld e, l ld e, l
ld hl, EnemyMonStatus ld hl, EnemyMonStatus
ld bc, $0004 ld bc, MON_MAXHP - MON_STATUS
call CopyBytes call CopyBytes
pop af pop af
@ -726,7 +726,7 @@ AI_Switch: ; 3846c
.skiptext .skiptext
ld a, 1 ld a, 1
ld [wd264], a ld [wAISwitch], a
callab NewEnemyMonStatus callab NewEnemyMonStatus
callab ResetEnemyStatLevels callab ResetEnemyStatLevels
ld hl, PlayerSubStatus1 ld hl, PlayerSubStatus1
@ -734,7 +734,7 @@ AI_Switch: ; 3846c
callba EnemySwitch callba EnemySwitch
callba ResetBattleParticipants callba ResetBattleParticipants
xor a xor a
ld [wd264], a ld [wAISwitch], a
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
ret nz ret nz

2
battle/ai/move.asm
View File

@ -12,7 +12,7 @@ AIChooseMove: ; 440ce
ret nz ret nz
; No use picking a move if there's no choice. ; No use picking a move if there's no choice.
callba CheckSubstatus_RechargeChargedRampageBideRollout callba CheckEnemyLockedIn
ret nz ret nz

10
battle/anim_gfx.asm
View File

@ -1,9 +1,9 @@
AnimObj00GFX: ; 84a2e AnimObj00GFX: ; 84a2e
AnimObj01GFX: INCBIN "gfx/fx/001.2bpp.lz" AnimObjHitGFX: INCBIN "gfx/fx/001.2bpp.lz"
AnimObj02GFX: INCBIN "gfx/fx/002.2bpp.lz" AnimObjCutGFX: INCBIN "gfx/fx/002.2bpp.lz"
AnimObj03GFX: INCBIN "gfx/fx/003.2bpp.lz" AnimObjFireGFX: INCBIN "gfx/fx/003.2bpp.lz"
AnimObj04GFX: INCBIN "gfx/fx/004.2bpp.lz" AnimObjWaterGFX: INCBIN "gfx/fx/004.2bpp.lz"
AnimObj05GFX: INCBIN "gfx/fx/005.2bpp.lz" AnimObjLightningGFX: INCBIN "gfx/fx/005.2bpp.lz"
AnimObj07GFX: INCBIN "gfx/fx/007.2bpp.lz" AnimObj07GFX: INCBIN "gfx/fx/007.2bpp.lz"
AnimObj08GFX: INCBIN "gfx/fx/008.2bpp.lz" AnimObj08GFX: INCBIN "gfx/fx/008.2bpp.lz"
AnimObj10GFX: INCBIN "gfx/fx/010.2bpp.lz" AnimObj10GFX: INCBIN "gfx/fx/010.2bpp.lz"

44
battle/anims.asm
View File

@ -1323,7 +1323,7 @@ BattleAnim_Thundershock: ; c9b53
BattleAnim_Thunderbolt: ; c9b66 BattleAnim_Thunderbolt: ; c9b66
anim_2gfx ANIM_GFX_LIGHTNING, ANIM_GFX_EXPLOSION anim_2gfx ANIM_GFX_LIGHTNING, ANIM_GFX_EXPLOSION
anim_obj ANIM_OBJ_32, -15, 0, 7, 0, $2 anim_obj ANIM_OBJ_LIGHTNING_BOLT, -15, 0, 7, 0, $2
anim_wait 16 anim_wait 16
anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $2 anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $2
anim_sound 0, 1, SFX_THUNDERSHOCK anim_sound 0, 1, SFX_THUNDERSHOCK
@ -2497,10 +2497,10 @@ BattleAnim_Transform: ; ca54d
anim_call BattleAnim_FollowPlayerHead_0 anim_call BattleAnim_FollowPlayerHead_0
anim_transform anim_transform
anim_sound 0, 0, SFX_PSYBEAM anim_sound 0, 0, SFX_PSYBEAM
anim_bgeffect ANIM_BG_28, $0, $1, $0 anim_bgeffect ANIM_BG_WAVE_DEFORM_USER, $0, $1, $0
anim_wait 48 anim_wait 48
anim_updateactorpic anim_updateactorpic
anim_incbgeffect ANIM_BG_28 anim_incbgeffect ANIM_BG_WAVE_DEFORM_USER
anim_wait 48 anim_wait 48
anim_call BattleAnim_ShowMon_0 anim_call BattleAnim_ShowMon_0
anim_ret anim_ret
@ -2759,10 +2759,10 @@ BattleAnim_Minimize: ; ca78a
anim_1gfx ANIM_GFX_HIT anim_1gfx ANIM_GFX_HIT
anim_call BattleAnim_FollowPlayerHead_0 anim_call BattleAnim_FollowPlayerHead_0
anim_minimize anim_minimize
anim_bgeffect ANIM_BG_28, $0, $1, $0 anim_bgeffect ANIM_BG_WAVE_DEFORM_USER, $0, $1, $0
anim_wait 48 anim_wait 48
anim_updateactorpic anim_updateactorpic
anim_incbgeffect ANIM_BG_28 anim_incbgeffect ANIM_BG_WAVE_DEFORM_USER
anim_wait 48 anim_wait 48
anim_call BattleAnim_ShowMon_0 anim_call BattleAnim_ShowMon_0
anim_ret anim_ret
@ -2774,7 +2774,7 @@ BattleAnim_SkyAttack: ; ca7a1
anim_bgeffect ANIM_BG_27, $0, $1, $0 anim_bgeffect ANIM_BG_27, $0, $1, $0
anim_wait 32 anim_wait 32
anim_sound 0, 0, SFX_HYPER_BEAM anim_sound 0, 0, SFX_HYPER_BEAM
anim_obj ANIM_OBJ_6E, 6, 0, 11, 0, $40 anim_obj ANIM_OBJ_SKY_ATTACK_FEAROW, 6, 0, 11, 0, $40
anim_wait 64 anim_wait 64
anim_incobj 1 anim_incobj 1
anim_wait 21 anim_wait 21
@ -2805,7 +2805,7 @@ BattleAnim_NightShade: ; ca7cc
BattleAnim_Lick: ; ca7e5 BattleAnim_Lick: ; ca7e5
anim_1gfx ANIM_GFX_WATER anim_1gfx ANIM_GFX_WATER
anim_sound 0, 1, SFX_LICK anim_sound 0, 1, SFX_LICK
anim_obj ANIM_OBJ_6F, -15, 0, 7, 0, $0 anim_obj ANIM_OBJ_LICK, -15, 0, 7, 0, $0
anim_wait 64 anim_wait 64
anim_ret anim_ret
; ca7f1 ; ca7f1
@ -3025,9 +3025,9 @@ BattleAnim_Meditate: ; ca9d8
anim_1gfx ANIM_GFX_HIT anim_1gfx ANIM_GFX_HIT
anim_call BattleAnim_FollowEnemyFeet_0 anim_call BattleAnim_FollowEnemyFeet_0
anim_sound 0, 0, SFX_PSYBEAM anim_sound 0, 0, SFX_PSYBEAM
anim_bgeffect ANIM_BG_28, $0, $1, $0 anim_bgeffect ANIM_BG_WAVE_DEFORM_USER, $0, $1, $0
anim_wait 48 anim_wait 48
anim_incbgeffect ANIM_BG_28 anim_incbgeffect ANIM_BG_WAVE_DEFORM_USER
anim_wait 48 anim_wait 48
anim_call BattleAnim_ShowMon_0 anim_call BattleAnim_ShowMon_0
anim_ret anim_ret
@ -3765,13 +3765,13 @@ BattleAnim_Octazooka: ; cb06f
BattleAnim_Spikes: ; cb092 BattleAnim_Spikes: ; cb092
anim_1gfx ANIM_GFX_MISC anim_1gfx ANIM_GFX_MISC
anim_sound 6, 2, SFX_MENU anim_sound 6, 2, SFX_MENU
anim_obj ANIM_OBJ_8E, 6, 0, 11, 0, $20 anim_obj ANIM_OBJ_SPIKES, 6, 0, 11, 0, $20
anim_wait 8 anim_wait 8
anim_sound 6, 2, SFX_MENU anim_sound 6, 2, SFX_MENU
anim_obj ANIM_OBJ_8E, 6, 0, 11, 0, $30 anim_obj ANIM_OBJ_SPIKES, 6, 0, 11, 0, $30
anim_wait 8 anim_wait 8
anim_sound 6, 2, SFX_MENU anim_sound 6, 2, SFX_MENU
anim_obj ANIM_OBJ_8E, 6, 0, 11, 0, $28 anim_obj ANIM_OBJ_SPIKES, 6, 0, 11, 0, $28
anim_wait 64 anim_wait 64
anim_ret anim_ret
; cb0b0 ; cb0b0
@ -3784,7 +3784,7 @@ BattleAnim_ZapCannon: ; cb0b0
anim_obj ANIM_OBJ_A3, 8, 0, 11, 4, $2 anim_obj ANIM_OBJ_A3, 8, 0, 11, 4, $2
anim_wait 40 anim_wait 40
anim_sound 0, 1, SFX_THUNDERSHOCK anim_sound 0, 1, SFX_THUNDERSHOCK
anim_obj ANIM_OBJ_32, -15, 0, 7, 0, $2 anim_obj ANIM_OBJ_LIGHTNING_BOLT, -15, 0, 7, 0, $2
anim_wait 16 anim_wait 16
anim_obj ANIM_OBJ_31, -15, 0, 7, 0, $0 anim_obj ANIM_OBJ_31, -15, 0, 7, 0, $0
anim_wait 128 anim_wait 128
@ -3830,14 +3830,14 @@ BattleAnim_PerishSong: ; cb113
anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_bgeffect ANIM_BG_06, $0, $2, $0
anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0 anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0
anim_sound 0, 2, SFX_PERISH_SONG anim_sound 0, 2, SFX_PERISH_SONG
anim_obj ANIM_OBJ_A6, 11, 0, 0, 0, $0 anim_obj ANIM_OBJ_PERISH_SONG, 11, 0, 0, 0, $0
anim_obj ANIM_OBJ_A6, 11, 0, 0, 0, $8 anim_obj ANIM_OBJ_PERISH_SONG, 11, 0, 0, 0, $8
anim_obj ANIM_OBJ_A6, 11, 0, 0, 0, $10 anim_obj ANIM_OBJ_PERISH_SONG, 11, 0, 0, 0, $10
anim_obj ANIM_OBJ_A6, 11, 0, 0, 0, $18 anim_obj ANIM_OBJ_PERISH_SONG, 11, 0, 0, 0, $18
anim_obj ANIM_OBJ_A6, 11, 0, 0, 0, $20 anim_obj ANIM_OBJ_PERISH_SONG, 11, 0, 0, 0, $20
anim_obj ANIM_OBJ_A6, 11, 0, 0, 0, $28 anim_obj ANIM_OBJ_PERISH_SONG, 11, 0, 0, 0, $28
anim_obj ANIM_OBJ_A6, 11, 0, 0, 0, $30 anim_obj ANIM_OBJ_PERISH_SONG, 11, 0, 0, 0, $30
anim_obj ANIM_OBJ_A6, 11, 0, 0, 0, $38 anim_obj ANIM_OBJ_PERISH_SONG, 11, 0, 0, 0, $38
anim_wait 112 anim_wait 112
anim_ret anim_ret
; cb14c ; cb14c
@ -4087,7 +4087,7 @@ BattleAnim_Spark: ; cb34d
anim_incobj 2 anim_incobj 2
anim_wait 1 anim_wait 1
anim_sound 0, 1, SFX_THUNDERSHOCK anim_sound 0, 1, SFX_THUNDERSHOCK
anim_obj ANIM_OBJ_32, -15, 0, 7, 0, $2 anim_obj ANIM_OBJ_LIGHTNING_BOLT, -15, 0, 7, 0, $2
anim_obj ANIM_OBJ_33, -15, 0, 7, 0, $0 anim_obj ANIM_OBJ_33, -15, 0, 7, 0, $0
anim_wait 32 anim_wait 32
anim_ret anim_ret

59
battle/core.asm
View File

@ -7,7 +7,7 @@ DoBattle: ; 3c000
ld [wPlayerAction], a ld [wPlayerAction], a
ld [BattleEnded], a ld [BattleEnded], a
inc a inc a
ld [wd264], a ld [wAISwitch], a
ld hl, OTPartyMon1HP ld hl, OTPartyMon1HP
ld bc, PARTYMON_STRUCT_LENGTH - 1 ld bc, PARTYMON_STRUCT_LENGTH - 1
ld d, BATTLEACTION_SWITCH1 - 1 ld d, BATTLEACTION_SWITCH1 - 1
@ -60,7 +60,7 @@ DoBattle: ; 3c000
xor a xor a
ld [CurPartyMon], a ld [CurPartyMon], a
.loop2 .loop2
call CheckIfPartyHasPkmnToBattleWith call CheckIfCurPartyMonIsFitToFight
jr nz, .alive2 jr nz, .alive2
ld hl, CurPartyMon ld hl, CurPartyMon
inc [hl] inc [hl]
@ -170,7 +170,7 @@ BattleTurn: ; 3c12f
xor a xor a
ld [wPlayerIsSwitching], a ld [wPlayerIsSwitching], a
ld [wEnemyIsSwitching], a ld [wEnemyIsSwitching], a
ld [wd264], a ld [wAISwitch], a
ld [wPlayerJustGotFrozen], a ld [wPlayerJustGotFrozen], a
ld [wEnemyJustGotFrozen], a ld [wEnemyJustGotFrozen], a
ld [CurDamage], a ld [CurDamage], a
@ -2497,7 +2497,7 @@ WinTrainerBattle: ; 3cfa4
call PrintWinLossText call PrintWinLossText
.skip_win_loss_text .skip_win_loss_text
jp HandleBattleReward jp .GiveMoney
.mobile .mobile
call BattleWinSlideInEnemyTrainerFrontpic call BattleWinSlideInEnemyTrainerFrontpic
@ -2524,9 +2524,8 @@ WinTrainerBattle: ; 3cfa4
call ClearTileMap call ClearTileMap
call ClearBGPalettes call ClearBGPalettes
ret ret
; 3d02b
HandleBattleReward: ; 3d02b .GiveMoney
ld a, [wAmuletCoin] ld a, [wAmuletCoin]
and a and a
call nz, .DoubleReward call nz, .DoubleReward
@ -3024,7 +3023,7 @@ PickPartyMonInBattle: ; 3d33c
call JumpToPartyMenuAndPrintText call JumpToPartyMenuAndPrintText
call SelectBattleMon call SelectBattleMon
ret c ret c
call CheckIfPartyHasPkmnToBattleWith call CheckIfCurPartyMonIsFitToFight
jr z, .loop jr z, .loop
xor a xor a
ret ret
@ -3373,14 +3372,14 @@ CheckWhetherSwitchmonIsPredetermined: ; 3d533
.not_linked .not_linked
ld a, [wEnemySwitchMonIndex] ld a, [wEnemySwitchMonIndex]
and a and a
jr z, .check_wd264 jr z, .check_wAISwitch
dec a dec a
ld b, a ld b, a
jr .return_carry jr .return_carry
.check_wd264 .check_wAISwitch
ld a, [wd264] ld a, [wAISwitch]
and a and a
ld b, $0 ld b, $0
jr nz, .return_carry jr nz, .return_carry
@ -3656,7 +3655,7 @@ LoadEnemyPkmnToSwitchTo: ; 3d6ca
; 3d714 ; 3d714
CheckWhetherToAskSwitch: ; 3d714 CheckWhetherToAskSwitch: ; 3d714
ld a, [wd264] ld a, [wAISwitch]
dec a dec a
jp z, .return_nc jp z, .return_nc
ld a, [PartyCount] ld a, [PartyCount]
@ -3836,19 +3835,19 @@ CheckPlayerPartyForFitPkmn: ; 3d873
xor a xor a
ld hl, PartyMon1HP ld hl, PartyMon1HP
ld bc, PartyMon2 - (PartyMon1 + 1) ld bc, PartyMon2 - (PartyMon1 + 1)
.asm_3d87e .loop
or [hl] or [hl]
inc hl inc hl
or [hl] or [hl]
add hl, bc add hl, bc
dec e dec e
jr nz, .asm_3d87e jr nz, .loop
ld d, a ld d, a
ret ret
; 3d887 ; 3d887
CheckIfPartyHasPkmnToBattleWith: ; 3d887 CheckIfCurPartyMonIsFitToFight: ; 3d887
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld hl, PartyMon1HP ld hl, PartyMon1HP
call GetPartyLocation call GetPartyLocation
@ -3856,9 +3855,9 @@ CheckIfPartyHasPkmnToBattleWith: ; 3d887
or [hl] or [hl]
ret nz ret nz
ld a, [wd264] ld a, [wAISwitch]
and a and a
jr nz, .asm_3d8b1 jr nz, .finish_fail
ld hl, PartySpecies ld hl, PartySpecies
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld c, a ld c, a
@ -3867,14 +3866,14 @@ CheckIfPartyHasPkmnToBattleWith: ; 3d887
ld a, [hl] ld a, [hl]
cp EGG cp EGG
ld hl, BattleText_AnEGGCantBattle ld hl, BattleText_AnEGGCantBattle
jr z, .asm_3d8ae jr z, .print_textbox
ld hl, BattleText_TheresNoWillToBattle ld hl, BattleText_TheresNoWillToBattle
.asm_3d8ae .print_textbox
call StdBattleTextBox call StdBattleTextBox
.asm_3d8b1 .finish_fail
xor a xor a
ret ret
; 3d8b3 ; 3d8b3
@ -4501,6 +4500,8 @@ HandleHPHealingItem: ; 3dd2f
ld hl, BattleMonMaxHP ld hl, BattleMonMaxHP
.go .go
; If, and only if, Pokemon's HP is less than half max, use the item.
; Store current HP in Buffer 3/4
push bc push bc
ld a, [de] ld a, [de]
ld [Buffer3], a ld [Buffer3], a
@ -4528,6 +4529,7 @@ HandleHPHealingItem: ; 3dd2f
.less .less
call ItemRecoveryAnim call ItemRecoveryAnim
; store max HP in Buffer1/2
ld a, [hli] ld a, [hli]
ld [Buffer2], a ld [Buffer2], a
ld a, [hl] ld a, [hl]
@ -5434,7 +5436,7 @@ TryPlayerSwitch: ; 3e358
jp BattleMenuPKMN_Loop jp BattleMenuPKMN_Loop
.try_switch .try_switch
call CheckIfPartyHasPkmnToBattleWith call CheckIfCurPartyMonIsFitToFight
jp z, BattleMenuPKMN_Loop jp z, BattleMenuPKMN_Loop
ld a, [CurBattleMon] ld a, [CurBattleMon]
ld [LastPlayerMon], a ld [LastPlayerMon], a
@ -5675,15 +5677,15 @@ MoveSelectionScreen: ; 3e4bc
ld c, $2c ld c, $2c
ld a, [wMoveSelectionMenuType] ld a, [wMoveSelectionMenuType]
dec a dec a
ld b, $c1 ld b, D_DOWN | D_UP | A_BUTTON
jr z, .okay jr z, .okay
dec a dec a
ld b, $c3 ld b, D_DOWN | D_UP | A_BUTTON | B_BUTTON
jr z, .okay jr z, .okay
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
jr nz, .okay jr nz, .okay
ld b, $c7 ld b, D_DOWN | D_UP | A_BUTTON | B_BUTTON | SELECT
.okay .okay
ld a, b ld a, b
@ -5727,6 +5729,7 @@ MoveSelectionScreen: ; 3e4bc
bit SELECT_F, a bit SELECT_F, a
jp nz, .pressed_select jp nz, .pressed_select
bit B_BUTTON_F, a bit B_BUTTON_F, a
; A button
push af push af
xor a xor a
@ -6106,7 +6109,7 @@ ParseEnemyAction: ; 3e7c1
jp .finish jp .finish
.skip_encore .skip_encore
call CheckSubstatus_RechargeChargedRampageBideRollout call CheckEnemyLockedIn
jp nz, ResetVarsForSubstatusRage jp nz, ResetVarsForSubstatusRage
jr .continue jr .continue
@ -6173,7 +6176,7 @@ ParseEnemyAction: ; 3e7c1
.skip_load .skip_load
call SetEnemyTurn call SetEnemyTurn
callab UpdateMoveData callab UpdateMoveData
call CheckSubstatus_RechargeChargedRampageBideRollout call CheckEnemyLockedIn
jr nz, .raging jr nz, .raging
xor a xor a
ld [wEnemyCharging], a ld [wEnemyCharging], a
@ -6219,7 +6222,7 @@ ResetVarsForSubstatusRage: ; 3e8c1
ret ret
; 3e8d1 ; 3e8d1
CheckSubstatus_RechargeChargedRampageBideRollout: ; 3e8d1 CheckEnemyLockedIn: ; 3e8d1
ld a, [EnemySubStatus4] ld a, [EnemySubStatus4]
and 1 << SUBSTATUS_RECHARGE and 1 << SUBSTATUS_RECHARGE
ret nz ret nz
@ -8025,7 +8028,7 @@ SendOutPkmnText: ; 3f26d
ld hl, JumpText_GoPkmn ; If we're in a LinkBattle print just "Go <PlayerMon>" ld hl, JumpText_GoPkmn ; If we're in a LinkBattle print just "Go <PlayerMon>"
ld a, [wd264] ; unless this (unidentified) variable is set ld a, [wAISwitch] ; unless this (unidentified) variable is set
and a and a
jr nz, .skip_to_textbox jr nz, .skip_to_textbox
@ -8482,7 +8485,7 @@ BattleIntro: ; 3f4dd
ld [hMapAnims], a ld [hMapAnims], a
callba PlayBattleMusic callba PlayBattleMusic
callba ShowLinkBattleParticipants callba ShowLinkBattleParticipants
callba FindFirstAliveMon callba FindFirstAliveMonAndStartBattle
call DisableSpriteUpdates call DisableSpriteUpdates
callba ClearBattleRAM callba ClearBattleRAM
call InitEnemy call InitEnemy

2
battle/moves/move_effects.asm
View File

@ -2095,7 +2095,7 @@ FutureSight:
damagestats damagestats
damagecalc damagecalc
futuresight futuresight
damagevariation damagevariation ; skip here if last turn
checkhit checkhit
hittargetnosub hittargetnosub
failuretext failuretext

10
battle/objects/data.asm
View File

@ -156,7 +156,7 @@ endm
; ANIM_OBJ_31 ; ANIM_OBJ_31
battleanimobj $21, $90, BATTLEANIMFRAMESET_36, BATTLEANIMFUNC_00, $03, $05 battleanimobj $21, $90, BATTLEANIMFRAMESET_36, BATTLEANIMFUNC_00, $03, $05
; ANIM_OBJ_32 ; ANIM_OBJ_LIGHTNING_BOLT
battleanimobj $21, $90, BATTLEANIMFRAMESET_37, BATTLEANIMFUNC_03, $02, $08 battleanimobj $21, $90, BATTLEANIMFRAMESET_37, BATTLEANIMFUNC_03, $02, $08
; ANIM_OBJ_33 ; ANIM_OBJ_33
@ -336,10 +336,10 @@ endm
; ANIM_OBJ_6D ; ANIM_OBJ_6D
battleanimobj $01, $88, BATTLEANIMFRAMESET_7A, BATTLEANIMFUNC_31, $03, $11 battleanimobj $01, $88, BATTLEANIMFRAMESET_7A, BATTLEANIMFUNC_31, $03, $11
; ANIM_OBJ_6E ; ANIM_OBJ_SKY_ATTACK_FEAROW
battleanimobj $21, $88, BATTLEANIMFRAMESET_7B, BATTLEANIMFUNC_32, $02, $20 battleanimobj $21, $88, BATTLEANIMFRAMESET_7B, BATTLEANIMFUNC_32, $02, $20
; ANIM_OBJ_6F ; ANIM_OBJ_LICK
battleanimobj $21, $98, BATTLEANIMFRAMESET_7C, BATTLEANIMFUNC_00, $02, $04 battleanimobj $21, $98, BATTLEANIMFRAMESET_7C, BATTLEANIMFUNC_00, $02, $04
; ANIM_OBJ_70 ; ANIM_OBJ_70
@ -432,7 +432,7 @@ endm
; ANIM_OBJ_8D ; ANIM_OBJ_8D
battleanimobj $21, $a0, BATTLEANIMFRAMESET_99, BATTLEANIMFUNC_35, $04, $19 battleanimobj $21, $a0, BATTLEANIMFRAMESET_99, BATTLEANIMFUNC_35, $04, $19
; ANIM_OBJ_8E ; ANIM_OBJ_SPIKES
battleanimobj $21, $70, BATTLEANIMFRAMESET_8B, BATTLEANIMFUNC_3F, $02, $1f battleanimobj $21, $70, BATTLEANIMFRAMESET_8B, BATTLEANIMFUNC_3F, $02, $1f
; ANIM_OBJ_8F ; ANIM_OBJ_8F
@ -504,7 +504,7 @@ endm
; ANIM_OBJ_A5 ; ANIM_OBJ_A5
battleanimobj $61, $90, BATTLEANIMFRAMESET_A9, BATTLEANIMFUNC_46, $02, $23 battleanimobj $61, $90, BATTLEANIMFRAMESET_A9, BATTLEANIMFUNC_46, $02, $23
; ANIM_OBJ_A6 ; ANIM_OBJ_PERISH_SONG
battleanimobj $00, $00, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_47, $02, $0e battleanimobj $00, $00, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_47, $02, $0e
; ANIM_OBJ_A7 ; ANIM_OBJ_A7

10
battle/objects/gfx_headers.asm
View File

@ -8,11 +8,11 @@ object_gfx: MACRO
ENDM ENDM
object_gfx 0, AnimObj00GFX object_gfx 0, AnimObj00GFX
object_gfx 21, AnimObj01GFX object_gfx 21, AnimObjHitGFX
object_gfx 6, AnimObj02GFX object_gfx 6, AnimObjCutGFX
object_gfx 6, AnimObj03GFX object_gfx 6, AnimObjFireGFX
object_gfx 20, AnimObj04GFX object_gfx 20, AnimObjWaterGFX
object_gfx 26, AnimObj05GFX object_gfx 26, AnimObjLightningGFX
object_gfx 18, AnimObj06GFX object_gfx 18, AnimObj06GFX
object_gfx 12, AnimObj07GFX object_gfx 12, AnimObj07GFX
object_gfx 9, AnimObj08GFX object_gfx 9, AnimObj08GFX

53
constants/animation_constants.asm
View File

@ -76,7 +76,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const ANIM_OBJ_2F const ANIM_OBJ_2F
const ANIM_OBJ_30 const ANIM_OBJ_30
const ANIM_OBJ_31 const ANIM_OBJ_31
const ANIM_OBJ_32 const ANIM_OBJ_LIGHTNING_BOLT
const ANIM_OBJ_33 const ANIM_OBJ_33
const ANIM_OBJ_34 const ANIM_OBJ_34
const ANIM_OBJ_35 const ANIM_OBJ_35
@ -136,8 +136,8 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const ANIM_OBJ_6B const ANIM_OBJ_6B
const ANIM_OBJ_6C const ANIM_OBJ_6C
const ANIM_OBJ_6D const ANIM_OBJ_6D
const ANIM_OBJ_6E const ANIM_OBJ_SKY_ATTACK_FEAROW
const ANIM_OBJ_6F const ANIM_OBJ_LICK
const ANIM_OBJ_70 const ANIM_OBJ_70
const ANIM_OBJ_71 const ANIM_OBJ_71
const ANIM_OBJ_72 const ANIM_OBJ_72
@ -168,7 +168,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const ANIM_OBJ_8B const ANIM_OBJ_8B
const ANIM_OBJ_8C const ANIM_OBJ_8C
const ANIM_OBJ_8D const ANIM_OBJ_8D
const ANIM_OBJ_8E const ANIM_OBJ_SPIKES
const ANIM_OBJ_8F const ANIM_OBJ_8F
const ANIM_OBJ_90 const ANIM_OBJ_90
const ANIM_OBJ_91 const ANIM_OBJ_91
@ -192,7 +192,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const ANIM_OBJ_A3 const ANIM_OBJ_A3
const ANIM_OBJ_A4 const ANIM_OBJ_A4
const ANIM_OBJ_A5 const ANIM_OBJ_A5
const ANIM_OBJ_A6 const ANIM_OBJ_PERISH_SONG
const ANIM_OBJ_A7 const ANIM_OBJ_A7
const ANIM_OBJ_A8 const ANIM_OBJ_A8
const ANIM_OBJ_A9 const ANIM_OBJ_A9
@ -742,7 +742,7 @@ const_value SET 1
const ANIM_BG_25 const ANIM_BG_25
const ANIM_BG_26 const ANIM_BG_26
const ANIM_BG_27 const ANIM_BG_27
const ANIM_BG_28 const ANIM_BG_WAVE_DEFORM_USER
const ANIM_BG_PSYCHIC const ANIM_BG_PSYCHIC
const ANIM_BG_2A const ANIM_BG_2A
const ANIM_BG_2B const ANIM_BG_2B
@ -768,6 +768,47 @@ const_value SET 1
const ANIM_MON_EGG1 ; 7 const ANIM_MON_EGG1 ; 7
const ANIM_MON_EGG2 ; 8 const ANIM_MON_EGG2 ; 8
const_value SET 1
const ANIM_GFX_HIT
const ANIM_GFX_CUT
const ANIM_GFX_FIRE
const ANIM_GFX_WATER
const ANIM_GFX_LIGHTNING
const ANIM_GFX_PLANT
const ANIM_GFX_SMOKE
const ANIM_GFX_EXPLOSION
const ANIM_GFX_ROCKS
const ANIM_GFX_ICE
const ANIM_GFX_POKE_BALL
const ANIM_GFX_POISON
const ANIM_GFX_BUBBLE
const ANIM_GFX_NOISE
const ANIM_GFX_POWDER
const ANIM_GFX_BEAM
const ANIM_GFX_SPEED
const ANIM_GFX_CHARGE
const ANIM_GFX_WIND
const ANIM_GFX_WHIP
const ANIM_GFX_EGG
const ANIM_GFX_ROPE
const ANIM_GFX_PSYCHIC
const ANIM_GFX_REFLECT
const ANIM_GFX_STATUS
const ANIM_GFX_SAND
const ANIM_GFX_WEB
const ANIM_GFX_HAZE
const ANIM_GFX_HORN
const ANIM_GFX_FLOWER
const ANIM_GFX_MISC
const ANIM_GFX_SKY_ATTACK
const ANIM_GFX_GLOBE
const ANIM_GFX_SHAPES
const ANIM_GFX_OBJECTS
const ANIM_GFX_SHINE
const ANIM_GFX_ANGELS
const ANIM_GFX_WAVE
const ANIM_GFX_AEROBLAST
const_def const_def
const BG_EFFECT_STRUCT_FUNCTION const BG_EFFECT_STRUCT_FUNCTION
const BG_EFFECT_STRUCT_JT_INDEX const BG_EFFECT_STRUCT_JT_INDEX

42
constants/gfx_constants.asm
View File

@ -1,45 +1,3 @@
const_value SET 1
const ANIM_GFX_HIT
const ANIM_GFX_CUT
const ANIM_GFX_FIRE
const ANIM_GFX_WATER
const ANIM_GFX_LIGHTNING
const ANIM_GFX_PLANT
const ANIM_GFX_SMOKE
const ANIM_GFX_EXPLOSION
const ANIM_GFX_ROCKS
const ANIM_GFX_ICE
const ANIM_GFX_POKE_BALL
const ANIM_GFX_POISON
const ANIM_GFX_BUBBLE
const ANIM_GFX_NOISE
const ANIM_GFX_POWDER
const ANIM_GFX_BEAM
const ANIM_GFX_SPEED
const ANIM_GFX_CHARGE
const ANIM_GFX_WIND
const ANIM_GFX_WHIP
const ANIM_GFX_EGG
const ANIM_GFX_ROPE
const ANIM_GFX_PSYCHIC
const ANIM_GFX_REFLECT
const ANIM_GFX_STATUS
const ANIM_GFX_SAND
const ANIM_GFX_WEB
const ANIM_GFX_HAZE
const ANIM_GFX_HORN
const ANIM_GFX_FLOWER
const ANIM_GFX_MISC
const ANIM_GFX_SKY_ATTACK
const ANIM_GFX_GLOBE
const ANIM_GFX_SHAPES
const ANIM_GFX_OBJECTS
const ANIM_GFX_SHINE
const ANIM_GFX_ANGELS
const ANIM_GFX_WAVE
const ANIM_GFX_AEROBLAST
LEN_2BPP_TILE EQU 16 LEN_2BPP_TILE EQU 16
LEN_1BPP_TILE EQU 8 LEN_1BPP_TILE EQU 8
TILES_PER_FRAME EQU 6 TILES_PER_FRAME EQU 6

2
constants/map_setup_constants.asm
View File

@ -19,7 +19,7 @@ const_value SET 1
const MAPCALLBACK_SPRITES const MAPCALLBACK_SPRITES
const MAPCALLBACK_NEWMAP const MAPCALLBACK_NEWMAP
; Command descriptions from Condensation water's scripting compendium. const_def ; Command descriptions from Condensation water's scripting compendium.
const_def const_def
const map_lcd_on ; 00 const map_lcd_on ; 00

66
engine/anim_hp_bar.asm
View File

@ -1,8 +1,8 @@
_AnimateHPBar: ; d627 _AnimateHPBar: ; d627
call Functiond65f call .IsMaximumMoreThan48Pixels
jr c, .do_player jr c, .MoreThan48Pixels
call Functiond670 call .ComputePixels
.enemy_loop .ShortAnimLoop
push bc push bc
push hl push hl
call Functiond6e2 call Functiond6e2
@ -16,12 +16,12 @@ _AnimateHPBar: ; d627
pop hl pop hl
pop bc pop bc
pop af pop af
jr nc, .enemy_loop jr nc, .ShortAnimLoop
ret ret
.do_player .MoreThan48Pixels
call Functiond670 call .ComputePixels
.player_loop .LongAnimLoop
push bc push bc
push hl push hl
call Functiond6f5 call Functiond6f5
@ -36,11 +36,11 @@ _AnimateHPBar: ; d627
pop hl pop hl
pop bc pop bc
pop af pop af
jr nc, .player_loop jr nc, .LongAnimLoop
ret ret
; d65f ; d65f
Functiond65f: ; d65f .IsMaximumMoreThan48Pixels: ; d65f
ld a, [Buffer2] ld a, [Buffer2]
and a and a
jr nz, .player jr nz, .player
@ -55,7 +55,7 @@ Functiond65f: ; d65f
ret ret
; d670 ; d670
Functiond670: ; d670 .ComputePixels: ; d670
; Buffer1-2: Max HP ; Buffer1-2: Max HP
; Buffer3-4: Old HP ; Buffer3-4: Old HP
; Buffer5-6: New HP ; Buffer5-6: New HP
@ -72,7 +72,7 @@ Functiond670: ; d670
pop hl pop hl
call ComputeHPBarPixels call ComputeHPBarPixels
ld a, e ld a, e
ld [wd1f1], a ld [wCurHPBarPixels], a
ld a, [Buffer5] ld a, [Buffer5]
ld c, a ld c, a
@ -84,7 +84,7 @@ Functiond670: ; d670
ld d, a ld d, a
call ComputeHPBarPixels call ComputeHPBarPixels
ld a, e ld a, e
ld [wd1f2], a ld [wNewHPBarPixels], a
push hl push hl
ld hl, Buffer3 ld hl, Buffer3
@ -103,15 +103,15 @@ Functiond670: ; d670
ld a, d ld a, d
sbc b sbc b
ld d, a ld d, a
jr c, .asm_d6c1 jr c, .negative
ld a, [Buffer3] ld a, [Buffer3]
ld [wd1f5], a ld [wd1f5], a
ld a, [Buffer5] ld a, [Buffer5]
ld [wd1f6], a ld [wd1f6], a
ld bc, 1 ld bc, 1
jr .asm_d6d9 jr .got_direction
.asm_d6c1 .negative
ld a, [Buffer3] ld a, [Buffer3]
ld [wd1f6], a ld [wd1f6], a
ld a, [Buffer5] ld a, [Buffer5]
@ -123,8 +123,8 @@ Functiond670: ; d670
ld a, d ld a, d
xor $ff xor $ff
ld d, a ld d, a
ld bc, rIE ld bc, -1
.asm_d6d9 .got_direction
ld a, d ld a, d
ld [wd1f3], a ld [wd1f3], a
ld a, e ld a, e
@ -133,14 +133,14 @@ Functiond670: ; d670
; d6e2 ; d6e2
Functiond6e2: ; d6e2 Functiond6e2: ; d6e2
ld hl, wd1f1 ld hl, wCurHPBarPixels
ld a, [wd1f2] ld a, [wNewHPBarPixels]
cp [hl] cp [hl]
jr nz, .asm_d6ed jr nz, .not_finished
scf scf
ret ret
.asm_d6ed .not_finished
ld a, c ld a, c
add [hl] add [hl]
ld [hl], a ld [hl], a
@ -150,7 +150,7 @@ Functiond6e2: ; d6e2
; d6f5 ; d6f5
Functiond6f5: ; d6f5 Functiond6f5: ; d6f5
.asm_d6f5 .loop
ld hl, Buffer3 ld hl, Buffer3
ld a, [hli] ld a, [hli]
ld e, a ld e, a
@ -158,22 +158,22 @@ Functiond6f5: ; d6f5
ld d, a ld d, a
ld a, e ld a, e
cp [hl] cp [hl]
jr nz, .asm_d707 jr nz, .next
inc hl inc hl
ld a, d ld a, d
cp [hl] cp [hl]
jr nz, .asm_d707 jr nz, .next
scf scf
ret ret
.asm_d707 .next
ld l, e ld l, e
ld h, d ld h, d
add hl, bc add hl, bc
ld a, l ld a, l
ld [Buffer3], a ld [Buffer3], a
ld a, h ld a, h
ld [wd1ed], a ld [Buffer4], a
push hl push hl
push de push de
push bc push bc
@ -191,9 +191,9 @@ Functiond6f5: ; d6f5
pop de pop de
pop hl pop hl
ld a, e ld a, e
ld hl, wd1f1 ld hl, wCurHPBarPixels
cp [hl] cp [hl]
jr z, .asm_d6f5 jr z, .loop
ld [hl], a ld [hl], a
and a and a
ret ret
@ -205,7 +205,7 @@ Functiond730: ; d730
ld a, [wWhichHPBar] ld a, [wWhichHPBar]
and $1 and $1
ld b, a ld b, a
ld a, [wd1f1] ld a, [wCurHPBarPixels]
ld e, a ld e, a
ld c, a ld c, a
push de push de
@ -219,7 +219,7 @@ Functiond749: ; d749
call Functiond784 call Functiond784
ld a, [Buffer3] ld a, [Buffer3]
ld c, a ld c, a
ld a, [wd1ed] ld a, [Buffer4]
ld b, a ld b, a
ld a, [Buffer1] ld a, [Buffer1]
ld e, a ld e, a
@ -275,7 +275,7 @@ endr
dec hl dec hl
ld a, [Buffer3] ld a, [Buffer3]
ld [StringBuffer2 + 1], a ld [StringBuffer2 + 1], a
ld a, [wd1ed] ld a, [Buffer4]
ld [StringBuffer2], a ld [StringBuffer2], a
ld de, StringBuffer2 ld de, StringBuffer2
lb bc, 2, 3 lb bc, 2, 3
@ -375,7 +375,7 @@ Functiond839: ; d839
ld c, a ld c, a
ld b, 0 ld b, 0
ld hl, 0 ld hl, 0
ld a, [wd1f1] ld a, [wCurHPBarPixels]
cp 6 * 8 cp 6 * 8
jr nc, .coppy_buffer jr nc, .coppy_buffer
and a and a

12
engine/battle_start.asm
View File

@ -1,5 +1,5 @@
Predef_StartBattle: ; 8c20f Predef_StartBattle: ; 8c20f
call Function8c26d call .InitGFX
ld a, [rBGP] ld a, [rBGP]
ld [wBGP], a ld [wBGP], a
ld a, [rOBP0] ld a, [rOBP0]
@ -52,15 +52,15 @@ Predef_StartBattle: ; 8c20f
ret ret
; 8c26d ; 8c26d
Function8c26d: ; 8c26d .InitGFX: ; 8c26d
ld a, [wLinkMode] ld a, [wLinkMode]
cp LINK_MOBILE cp LINK_MOBILE
jr z, .mobile jr z, .mobile
callba Function6454 callba Function6454
call UpdateSprites call UpdateSprites
call DelayFrame call DelayFrame
call Function8c2a0 call .NonMobile_LoadPokeballTiles
call Function8cf4f call BattleStart_LoadEDTile
jr .resume jr .resume
.mobile .mobile
@ -81,7 +81,7 @@ Function8c26d: ; 8c26d
ret ret
; 8c2a0 ; 8c2a0
Function8c2a0: ; 8c2a0 .NonMobile_LoadPokeballTiles: ; 8c2a0
call LoadTrainerBattlePokeballTiles call LoadTrainerBattlePokeballTiles
hlbgcoord 0, 0 hlbgcoord 0, 0
call Function8c2cf call Function8c2cf
@ -663,7 +663,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
ld a, $1 ld a, $1
ld [hCGBPalUpdate], a ld [hCGBPalUpdate], a
call DelayFrame call DelayFrame
call Function8cf4f call BattleStart_LoadEDTile
.nextscene: ; 8c673 (23:4673) .nextscene: ; 8c673 (23:4673)
call StartTrainerBattle_NextScene call StartTrainerBattle_NextScene

2
engine/init_gender.asm
View File

@ -67,7 +67,7 @@ TextJump_AreYouABoyOrAreYouAGirl: ; 0x48e0f
InitGenderScreen: ; 48e14 (12:4e14) InitGenderScreen: ; 48e14 (12:4e14)
ld a, $10 ld a, $10
ld [MusicFade], a ld [MusicFade], a
ld a, $0 ld a, MUSIC_NONE
ld [MusicFadeIDLo], a ld [MusicFadeIDLo], a
ld a, $0 ld a, $0
ld [MusicFadeIDHi], a ld [MusicFadeIDHi], a

2
engine/main_menu.asm
View File

@ -202,7 +202,7 @@ MainMenuJoypadLoop: ; 49de4
ld a, [w2DMenuFlags1] ld a, [w2DMenuFlags1]
set 5, a set 5, a
ld [w2DMenuFlags1], a ld [w2DMenuFlags1], a
call Function1f1a call GetScrollingMenuJoypad
ld a, [wMenuJoypad] ld a, [wMenuJoypad]
cp B_BUTTON cp B_BUTTON
jr z, .b_button jr z, .b_button

25
engine/mon_icons.asm
View File

@ -14,7 +14,7 @@ LoadOverworldMonIcon: ; 8e82b
ret ret
; 8e83f ; 8e83f
Function8e83f: ; 8e83f LoadMenuMonIcon: ; 8e83f
push hl push hl
push de push de
push bc push bc
@ -28,9 +28,8 @@ Function8e83f: ; 8e83f
.LoadIcon: ; 8e849 .LoadIcon: ; 8e849
ld d, 0 ld d, 0
ld hl, .Jumptable ld hl, .Jumptable
rept 2
add hl, de add hl, de
endr add hl, de
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@ -39,13 +38,13 @@ endr
.Jumptable: ; 8e854 (23:6854) .Jumptable: ; 8e854 (23:6854)
dw Function8e8d5 ; init dw Function8e8d5 ; party menu
dw Function8e961 dw Function8e961 ; naming screen
dw Function8e97d dw Function8e97d ; moves (?)
dw Trade_LoadMonIconGFX dw Trade_LoadMonIconGFX ; trade
dw Function8e898 dw Function8e898 ; mobile
dw Mobile_InitPartyMenuBGPal71 dw Mobile_InitPartyMenuBGPal71 ; mobile
dw .GetPartyMenuMonIcon dw .GetPartyMenuMonIcon ; unused
.GetPartyMenuMonIcon: ; 8e862 (23:6862) .GetPartyMenuMonIcon: ; 8e862 (23:6862)
@ -89,7 +88,7 @@ Function8e898: ; 8e898 (23:6898)
call Function8e8d5 call Function8e8d5
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc add hl, bc
ld a, $0 ld a, SPRITE_ANIM_SEQ_NULL
ld [hl], a ld [hl], a
ld hl, SPRITEANIMSTRUCT_XCOORD ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc add hl, bc
@ -106,7 +105,7 @@ Mobile_InitPartyMenuBGPal71: ; 8e8b1 (23:68b1)
call SetPartyMonIconAnimSpeed call SetPartyMonIconAnimSpeed
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc add hl, bc
ld a, $0 ld a, SPRITE_ANIM_SEQ_NULL
ld [hl], a ld [hl], a
ld hl, SPRITEANIMSTRUCT_XCOORD ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc add hl, bc
@ -229,7 +228,7 @@ Function8e961: ; 8e961 (23:6961)
call InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc add hl, bc
ld [hl], $0 ld [hl], SPRITE_ANIM_SEQ_NULL
ret ret
Function8e97d: ; 8e97d (23:697d) Function8e97d: ; 8e97d (23:697d)

8
engine/movement.asm
View File

@ -55,8 +55,8 @@ MovementPointers: ; 5075
dw Movement_fast_jump_step_up ; 35 dw Movement_fast_jump_step_up ; 35
dw Movement_fast_jump_step_left ; 36 dw Movement_fast_jump_step_left ; 36
dw Movement_fast_jump_step_right ; 37 dw Movement_fast_jump_step_right ; 37
dw Movement_38 ; 38 dw Movement_remove_sliding ; 38
dw Movement_39 ; 39 dw Movement_set_sliding ; 39
dw Movement_remove_fixed_facing ; 3a dw Movement_remove_fixed_facing ; 3a
dw Movement_fix_facing ; 3b dw Movement_fix_facing ; 3b
dw Movement_show_person ; 3c dw Movement_show_person ; 3c
@ -373,14 +373,14 @@ Movement_56: ; 5279
ret ret
; 5293 ; 5293
Movement_38: ; 5293 Movement_remove_sliding: ; 5293
ld hl, OBJECT_FLAGS1 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
res SLIDING, [hl] res SLIDING, [hl]
jp ContinueReadingMovement jp ContinueReadingMovement
; 529c ; 529c
Movement_39: ; 529c Movement_set_sliding: ; 529c
ld hl, OBJECT_FLAGS1 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
set SLIDING, [hl] set SLIDING, [hl]

6
engine/namingscreen.asm
View File

@ -88,10 +88,10 @@ endr
.Pokemon: ; 1173e (4:573e) .Pokemon: ; 1173e (4:573e)
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
ld [wd265], a ld [wd265], a
ld hl, Function8e83f ld hl, LoadMenuMonIcon
ld a, BANK(Function8e83f) ld a, BANK(LoadMenuMonIcon)
ld e, $1 ld e, $1
rst FarCall ; ; indirect jump to Function8e83f (8e83f (23:683f)) rst FarCall ; ; indirect jump to LoadMenuMonIcon (8e83f (23:683f))
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
ld [wd265], a ld [wd265], a
call GetPokemonName call GetPokemonName

8
engine/party_menu.asm
View File

@ -658,8 +658,8 @@ InitPartyMenuGFX: ; 503e0
.loop .loop
push bc push bc
push hl push hl
ld hl, Function8e83f ld hl, LoadMenuMonIcon
ld a, BANK(Function8e83f) ld a, BANK(LoadMenuMonIcon)
ld e, $0 ld e, $0
rst FarCall rst FarCall
ld a, [hObjectStructIndexBuffer] ld a, [hObjectStructIndexBuffer]
@ -752,8 +752,8 @@ PartyMenuSelect: ; 0x50457
ld [wPartyMenuCursor], a ld [wPartyMenuCursor], a
ld a, [hJoyLast] ld a, [hJoyLast]
ld b, a ld b, a
bit 1, b bit B_BUTTON_F, b
jr nz, .exitmenu ; B button? jr nz, .exitmenu ; B button
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
dec a dec a
ld [CurPartyMon], a ld [CurPartyMon], a

4
engine/player_movement.asm
View File

@ -121,12 +121,12 @@ DoPlayerMovement:: ; 80000
ld a, [PlayerStandingTile] ld a, [PlayerStandingTile]
ld c, a ld c, a
call CheckWhirlpoolTile call CheckWhirlpoolTile
jr c, .asm_800c4 jr c, .not_whirlpool
ld a, 3 ld a, 3
scf scf
ret ret
.asm_800c4 .not_whirlpool
and $f0 and $f0
cp $30 ; moving water cp $30 ; moving water
jr z, .water jr z, .water

243
engine/pokecenter_pc.asm
View File

@ -2,9 +2,9 @@ PokemonCenterPC: ; 1559a
call PC_CheckPartyForPokemon call PC_CheckPartyForPokemon
ret c ret c
call PC_PlayBootSound call PC_PlayBootSound
ld hl, UnknownText_0x15a27 ld hl, PokeCenterPCText_BootedUpPC
call PC_DisplayText call PC_DisplayText
ld hl, UnknownText_0x15a2c ld hl, PokeCenterPCText_AccessWhosePC
call PC_DisplayTextWaitMenu call PC_DisplayTextWaitMenu
ld hl, .TopMenu ld hl, .TopMenu
call LoadMenuDataHeader call LoadMenuDataHeader
@ -25,40 +25,35 @@ PokemonCenterPC: ; 1559a
call ExitMenu call ExitMenu
call CloseWindow call CloseWindow
ret ret
; 155d6
.TopMenu: ; 0x155d6 .TopMenu
db $48 ; flags db $48 ; flags
db 00, 00 ; start coords db 00, 00 ; start coords
db 12, 15 ; end coords db 12, 15 ; end coords
dw .MenuData2 dw .MenuData2
db 1 ; default option db 1 ; default option
; 0x155de
.MenuData2: ; 0x155de .MenuData2
db $a0 ; flags db $a0 ; flags
db 0 ; items db 0 ; items
dw .WhichPC dw .WhichPC
dw PlaceNthMenuStrings dw PlaceNthMenuStrings
dw .JumpTable dw .JumpTable
; 0x155e6
.JumpTable: ; 155e6 .JumpTable
dw PlayersPC, .String_PlayersPC dw PlayersPC, .String_PlayersPC
dw BillsPC, .String_BillsPC dw BillsPC, .String_BillsPC
dw OaksPC, .String_OaksPC dw OaksPC, .String_OaksPC
dw HallOfFamePC, .String_HallOfFame dw HallOfFamePC, .String_HallOfFame
dw TurnOffPC, .String_TurnOff dw TurnOffPC, .String_TurnOff
; 155fa
.String_PlayersPC: db "<PLAYER>'s PC@" .String_PlayersPC: db "<PLAYER>'s PC@"
.String_BillsPC: db "BILL's PC@" .String_BillsPC: db "BILL's PC@"
.String_OaksPC: db "PROF.OAK's PC@" .String_OaksPC: db "PROF.OAK's PC@"
.String_HallOfFame: db "HALL OF FAME@" .String_HallOfFame: db "HALL OF FAME@"
.String_TurnOff: db "TURN OFF@" .String_TurnOff: db "TURN OFF@"
; 1562c
.WhichPC: ; 1562c .WhichPC
; before pokedex ; before pokedex
db 3 ; items db 3 ; items
db 1, 0, 4 ; bill's, player's, turn off db 1, 0, 4 ; bill's, player's, turn off
@ -73,9 +68,8 @@ PokemonCenterPC: ; 1559a
db 5 ; items db 5 ; items
db 1, 0, 2, 3, 4 ; bill's, player's, oak's, hall of fame, turn off db 1, 0, 2, 3, 4 ; bill's, player's, oak's, hall of fame, turn off
db -1 db -1
; 1563e
.ChooseWhichPCListToUse: ; 1563e .ChooseWhichPCListToUse
call CheckReceivedDex call CheckReceivedDex
jr nz, .got_dex jr nz, .got_dex
ld a, $0 ld a, $0
@ -96,13 +90,12 @@ PC_CheckPartyForPokemon: ; 15650
ret nz ret nz
ld de, SFX_CHOOSE_PC_OPTION ld de, SFX_CHOOSE_PC_OPTION
call PlaySFX call PlaySFX
ld hl, UnknownText_0x15663 ld hl, .MustHavePokemonToUse
call PC_DisplayText call PC_DisplayText
scf scf
ret ret
; 15663
UnknownText_0x15663: ; 0x15663 .MustHavePokemonToUse
; Bzzzzt! You must have a #MON to use this! ; Bzzzzt! You must have a #MON to use this!
text_jump UnknownText_0x1c1328 text_jump UnknownText_0x1c1328
db "@" db "@"
@ -110,7 +103,7 @@ UnknownText_0x15663: ; 0x15663
BillsPC: ; 15668 BillsPC: ; 15668
call PC_PlayChoosePCSound call PC_PlayChoosePCSound
ld hl, UnknownText_0x15a31 ld hl, PokeCenterPCText_AccessedBillsPC
call PC_DisplayText call PC_DisplayText
callba _BillsPC callba _BillsPC
and a and a
@ -119,7 +112,7 @@ BillsPC: ; 15668
PlayersPC: ; 15679 PlayersPC: ; 15679
call PC_PlayChoosePCSound call PC_PlayChoosePCSound
ld hl, UnknownText_0x15a36 ld hl, PokeCenterPCText_AccessedOwnPC
call PC_DisplayText call PC_DisplayText
ld b, $0 ld b, $0
call _PlayersPC call _PlayersPC
@ -129,7 +122,7 @@ PlayersPC: ; 15679
OaksPC: ; 15689 OaksPC: ; 15689
call PC_PlayChoosePCSound call PC_PlayChoosePCSound
ld hl, UnknownText_0x15a3b ld hl, PokeCenterPCText_AccessedOaksPC
call PC_DisplayText call PC_DisplayText
callba ProfOaksPC callba ProfOaksPC
and a and a
@ -146,7 +139,7 @@ HallOfFamePC: ; 1569a
; 156ab ; 156ab
TurnOffPC: ; 156ab TurnOffPC: ; 156ab
ld hl, UnknownText_0x15a40 ld hl, PokeCenterPCText_LinkClosed
call PrintText call PrintText
scf scf
ret ret
@ -166,7 +159,7 @@ PC_PlayChoosePCSound: ; 156c2
ld de, SFX_CHOOSE_PC_OPTION ld de, SFX_CHOOSE_PC_OPTION
jr PC_WaitPlaySFX jr PC_WaitPlaySFX
Function156c7: ; 156c7 PC_PlaySwapItemsSound: ; 156c7
ld de, SFX_SWITCH_POKEMON ld de, SFX_SWITCH_POKEMON
call PC_WaitPlaySFX call PC_WaitPlaySFX
ld de, SFX_SWITCH_POKEMON ld de, SFX_SWITCH_POKEMON
@ -218,8 +211,8 @@ _PlayersPC: ; 15704
Function15715: ; 15715 Function15715: ; 15715
xor a xor a
ld [wd0d7], a ld [wPCItemsCursor], a
ld [wd0dd], a ld [wPCItemsScrollPosition], a
ld hl, KrissPCMenuData ld hl, KrissPCMenuData
call LoadMenuDataHeader call LoadMenuDataHeader
.asm_15722 .asm_15722
@ -316,19 +309,18 @@ UnknownText_0x157cc: ; 0x157cc
KrisWithdrawItemMenu: ; 0x157d1 KrisWithdrawItemMenu: ; 0x157d1
call LoadStandardMenuDataHeader call LoadStandardMenuDataHeader
callba ClearPCItemScreen callba ClearPCItemScreen
.asm_157da .loop
call Function15985 call PCItemsJoypad
jr c, .asm_157e4 jr c, .quit
call Function157e9 call .Submenu
jr .asm_157da jr .loop
.asm_157e4 .quit
call CloseSubmenu call CloseSubmenu
xor a xor a
ret ret
; 0x157e9
Function157e9: ; 0x157e9 .Submenu
; check if the item has a quantity ; check if the item has a quantity
callba _CheckTossableItem callba _CheckTossableItem
ld a, [wItemAttributeParamBuffer] ld a, [wItemAttributeParamBuffer]
@ -351,7 +343,7 @@ Function157e9: ; 0x157e9
.withdraw .withdraw
ld a, [wItemQuantityChangeBuffer] ld a, [wItemQuantityChangeBuffer]
ld [Buffer1], a ; quantity ld [Buffer1], a ; quantity
ld a, [wd107] ld a, [CurItemQuantity]
ld [Buffer2], a ld [Buffer2], a
ld hl, NumItems ld hl, NumItems
call ReceiveItem call ReceiveItem
@ -359,7 +351,7 @@ Function157e9: ; 0x157e9
ld a, [Buffer1] ld a, [Buffer1]
ld [wItemQuantityChangeBuffer], a ld [wItemQuantityChangeBuffer], a
ld a, [Buffer2] ld a, [Buffer2]
ld [wd107], a ld [CurItemQuantity], a
ld hl, PCItems ld hl, PCItems
call TossItem call TossItem
predef PartyMonItemName predef PartyMonItemName
@ -377,7 +369,6 @@ Function157e9: ; 0x157e9
.done .done
ret ret
; 0x15850
.HowManyText ; 0x15850 .HowManyText ; 0x15850
text_jump _KrissPCHowManyWithdrawText text_jump _KrissPCHowManyWithdrawText
@ -391,24 +382,22 @@ Function157e9: ; 0x157e9
text_jump _KrissPCNoRoomWithdrawText text_jump _KrissPCNoRoomWithdrawText
db "@" db "@"
KrisTossItemMenu: ; 0x1585f KrisTossItemMenu: ; 0x1585f
call LoadStandardMenuDataHeader call LoadStandardMenuDataHeader
callba ClearPCItemScreen callba ClearPCItemScreen
.asm_15868 .loop
call Function15985 call PCItemsJoypad
jr c, .asm_15878 jr c, .quit
ld de, PCItems ld de, PCItems
callba Function129f4 callba TossItemFromPC
jr .asm_15868 jr .loop
.asm_15878 .quit
call CloseSubmenu call CloseSubmenu
xor a xor a
ret ret
; 0x1587d ; 0x1587d
KrisDecorationMenu: ; 0x1587d KrisDecorationMenu: ; 0x1587d
callba _KrisDecorationMenu callba _KrisDecorationMenu
ld a, c ld a, c
@ -418,54 +407,48 @@ KrisDecorationMenu: ; 0x1587d
ret ret
; 0x15888 ; 0x15888
KrisLogOffMenu: ; 0x15888 KrisLogOffMenu: ; 0x15888
xor a xor a
scf scf
ret ret
; 0x1588b ; 0x1588b
KrisDepositItemMenu: ; 0x1588b KrisDepositItemMenu: ; 0x1588b
call Function158b8 call .CheckItemsInBag
jr c, .asm_158b6 jr c, .nope
call DisableSpriteUpdates call DisableSpriteUpdates
call LoadStandardMenuDataHeader call LoadStandardMenuDataHeader
callba DepositSellInitPackBuffers callba DepositSellInitPackBuffers
.asm_1589c .loop
callba DepositSellPack callba DepositSellPack
ld a, [wcf66] ld a, [wcf66]
and a and a
jr z, .asm_158b3 jr z, .close
call Function158cc call .TryDepositItem
callba CheckRegisteredItem callba CheckRegisteredItem
jr .asm_1589c jr .loop
.asm_158b3 .close
call CloseSubmenu call CloseSubmenu
.asm_158b6 .nope
xor a xor a
ret ret
; 0x158b8
Function158b8: ; 0x158b8 .CheckItemsInBag
callba HasNoItems callba HasNoItems
ret nc ret nc
ld hl, UnknownText_0x158c7 ld hl, .NoItemsInBag
call MenuTextBoxBackup call MenuTextBoxBackup
scf scf
ret ret
; 0x158c7
UnknownText_0x158c7: ; 0x158c7 .NoItemsInBag
; No items here! ; No items here!
text_jump UnknownText_0x1c13df text_jump UnknownText_0x1c13df
db "@" db "@"
; 0x158cc
.TryDepositItem
Function158cc: ; 0x158cc
ld a, [wSpriteUpdatesEnabled] ld a, [wSpriteUpdatesEnabled]
push af push af
ld a, $0 ld a, $0
@ -477,9 +460,8 @@ Function158cc: ; 0x158cc
pop af pop af
ld [wSpriteUpdatesEnabled], a ld [wSpriteUpdatesEnabled], a
ret ret
; 0x158e7
.dw: ; 0x158e7 .dw
dw .tossable dw .tossable
dw .no_toss dw .no_toss
dw .no_toss dw .no_toss
@ -488,32 +470,31 @@ Function158cc: ; 0x158cc
dw .tossable dw .tossable
dw .tossable dw .tossable
.no_toss: .no_toss
ret ret
.tossable: .tossable
ld a, [Buffer1] ld a, [Buffer1]
push af push af
ld a, [Buffer2] ld a, [Buffer2]
push af push af
call Function1590a call .DepositItem_
pop af pop af
ld [Buffer2], a ld [Buffer2], a
pop af pop af
ld [Buffer1], a ld [Buffer1], a
ret ret
; 0x1590a
Function1590a: ; 0x1590a .DepositItem_
callba _CheckTossableItem callba _CheckTossableItem
ld a, [wItemAttributeParamBuffer] ld a, [wItemAttributeParamBuffer]
and a and a
jr z, .asm_1591d jr z, .AskQuantity
ld a, $1 ld a, $1
ld [wItemQuantityChangeBuffer], a ld [wItemQuantityChangeBuffer], a
jr .asm_15933 jr .DepositItem
.asm_1591d .AskQuantity
ld hl, .HowManyText ld hl, .HowManyText
call MenuTextBox call MenuTextBox
callba SelectQuantityToToss callba SelectQuantityToToss
@ -521,20 +502,20 @@ Function1590a: ; 0x1590a
call ExitMenu call ExitMenu
call ExitMenu call ExitMenu
pop af pop af
jr c, .asm_1596c jr c, .DeclinedToDeposit
.asm_15933 .DepositItem
ld a, [wItemQuantityChangeBuffer] ld a, [wItemQuantityChangeBuffer]
ld [Buffer1], a ld [Buffer1], a
ld a, [wd107] ld a, [CurItemQuantity]
ld [Buffer2], a ld [Buffer2], a
ld hl, PCItems ld hl, PCItems
call ReceiveItem call ReceiveItem
jr nc, .asm_15965 jr nc, .NoRoomInPC
ld a, [Buffer1] ld a, [Buffer1]
ld [wItemQuantityChangeBuffer], a ld [wItemQuantityChangeBuffer], a
ld a, [Buffer2] ld a, [Buffer2]
ld [wd107], a ld [CurItemQuantity], a
ld hl, NumItems ld hl, NumItems
call TossItem call TossItem
predef PartyMonItemName predef PartyMonItemName
@ -542,16 +523,14 @@ Function1590a: ; 0x1590a
call PrintText call PrintText
ret ret
.asm_15965 .NoRoomInPC
ld hl, .NoRoomText ld hl, .NoRoomText
call PrintText call PrintText
ret ret
.asm_1596c .DeclinedToDeposit
and a and a
ret ret
; 0x1596e
.HowManyText ; 0x1596e .HowManyText ; 0x1596e
text_jump _KrissPCHowManyDepositText text_jump _KrissPCHowManyDepositText
@ -565,87 +544,82 @@ Function1590a: ; 0x1590a
text_jump _KrissPCNoRoomDepositText text_jump _KrissPCNoRoomDepositText
db "@" db "@"
KrisMailBoxMenu: ; 0x1597d KrisMailBoxMenu: ; 0x1597d
callba _KrisMailBoxMenu callba _KrisMailBoxMenu
xor a xor a
ret ret
; 0x15985 ; 0x15985
PCItemsJoypad: ; 0x15985
Function15985: ; 0x15985
xor a xor a
ld [wd0e3], a ld [wSwitchItem], a
.asm_15989 .loop
ld a, [wSpriteUpdatesEnabled] ld a, [wSpriteUpdatesEnabled]
push af push af
ld a, $0 ld a, $0
ld [wSpriteUpdatesEnabled], a ld [wSpriteUpdatesEnabled], a
ld hl, MenuData15a08 ld hl, .PCItemsMenuData
call CopyMenuDataHeader call CopyMenuDataHeader
hlcoord 0, 0 hlcoord 0, 0
ld b, $a ld b, 10
ld c, $12 ld c, 18
call TextBox call TextBox
ld a, [wd0d7] ld a, [wPCItemsCursor]
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0dd] ld a, [wPCItemsScrollPosition]
ld [wMenuScrollPosition], a ld [wMenuScrollPosition], a
call ScrollingMenu call ScrollingMenu
ld a, [wMenuScrollPosition] ld a, [wMenuScrollPosition]
ld [wd0dd], a ld [wPCItemsScrollPosition], a
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
ld [wd0d7], a ld [wPCItemsCursor], a
pop af pop af
ld [wSpriteUpdatesEnabled], a ld [wSpriteUpdatesEnabled], a
ld a, [wd0e3] ld a, [wSwitchItem]
and a and a
jr nz, .asm_159d8 jr nz, .moving_stuff_around
ld a, [wMenuJoypad] ld a, [wMenuJoypad]
cp $2 cp B_BUTTON
jr z, .asm_15a06 jr z, .b_1
cp $1 cp A_BUTTON
jr z, .asm_159fb jr z, .a_1
cp $4 cp SELECT
jr z, .asm_159f2 jr z, .select_1
jr .asm_159f8 jr .next
.asm_159d8 .moving_stuff_around
ld a, [wMenuJoypad] ld a, [wMenuJoypad]
cp $2 cp B_BUTTON
jr z, .asm_159e9 jr z, .b_2
cp $1 cp A_BUTTON
jr z, .asm_159ef jr z, .a_select_2
cp $4 cp SELECT
jr z, .asm_159ef jr z, .a_select_2
jr .asm_159f8 jr .next
.asm_159e9 .b_2
xor a xor a
ld [wd0e3], a ld [wSwitchItem], a
jr .asm_159f8 jr .next
.asm_159ef .a_select_2
call Function156c7 call PC_PlaySwapItemsSound
.select_1
.asm_159f2
callba SwitchItemsInBag callba SwitchItemsInBag
.next
jp .loop
.asm_159f8 .a_1
jp .asm_15989 callba ScrollingMenu_ClearLeftColumn
.asm_159fb
callba Function24706
call PlaceHollowCursor call PlaceHollowCursor
and a and a
ret ret
.asm_15a06 .b_1
scf scf
ret ret
; 0x15a08
MenuData15a08: ; 0x15a08 .PCItemsMenuData
db %01000000 db %01000000
db 1, 4 ; start coords db 1, 4 ; start coords
db 10, 18 ; end coords db 10, 18 ; end coords
@ -667,38 +641,37 @@ PC_DisplayText: ; 15a20
ret ret
; 15a27 ; 15a27
PokeCenterPCText_BootedUpPC: ; 0x15a27
UnknownText_0x15a27: ; 0x15a27
; turned on the PC. ; turned on the PC.
text_jump UnknownText_0x1c144d text_jump UnknownText_0x1c144d
db "@" db "@"
; 0x15a2c ; 0x15a2c
UnknownText_0x15a2c: ; 0x15a2c PokeCenterPCText_AccessWhosePC: ; 0x15a2c
; Access whose PC? ; Access whose PC?
text_jump UnknownText_0x1c1462 text_jump UnknownText_0x1c1462
db "@" db "@"
; 0x15a31 ; 0x15a31
UnknownText_0x15a31: ; 0x15a31 PokeCenterPCText_AccessedBillsPC: ; 0x15a31
; BILL's PC accessed. #MON Storage System opened. ; BILL's PC accessed. #MON Storage System opened.
text_jump UnknownText_0x1c1474 text_jump UnknownText_0x1c1474
db "@" db "@"
; 0x15a36 ; 0x15a36
UnknownText_0x15a36: ; 0x15a36 PokeCenterPCText_AccessedOwnPC: ; 0x15a36
; Accessed own PC. Item Storage System opened. ; Accessed own PC. Item Storage System opened.
text_jump UnknownText_0x1c14a4 text_jump UnknownText_0x1c14a4
db "@" db "@"
; 0x15a3b ; 0x15a3b
UnknownText_0x15a3b: ; 0x15a3b PokeCenterPCText_AccessedOaksPC: ; 0x15a3b
; PROF.OAK's PC accessed. #DEX Rating System opened. ; PROF.OAK's PC accessed. #DEX Rating System opened.
text_jump UnknownText_0x1c14d2 text_jump UnknownText_0x1c14d2
db "@" db "@"
; 0x15a40 ; 0x15a40
UnknownText_0x15a40: ; 0x15a40 PokeCenterPCText_LinkClosed: ; 0x15a40
; … Link closed… ; … Link closed…
text_jump UnknownText_0x1c1505 text_jump UnknownText_0x1c1505
db "@" db "@"

6
engine/scrolling_menu.asm
View File

@ -210,17 +210,17 @@ ScrollingMenu_GetCursorPosition: ; 246fc
ret ret
; 24706 ; 24706
Function24706: ; 24706 (9:4706) ScrollingMenu_ClearLeftColumn: ; 24706 (9:4706)
call MenuBoxCoord2Tile call MenuBoxCoord2Tile
ld de, SCREEN_WIDTH ld de, SCREEN_WIDTH
add hl, de add hl, de
ld de, 2 * SCREEN_WIDTH ld de, 2 * SCREEN_WIDTH
ld a, [wMenuData2_ScrollingMenuHeight] ld a, [wMenuData2_ScrollingMenuHeight]
.asm_24713 .loop
ld [hl], " " ld [hl], " "
add hl, de add hl, de
dec a dec a
jr nz, .asm_24713 jr nz, .loop
ret ret
InitScrollingMenuCursor: ; 2471a InitScrollingMenuCursor: ; 2471a

88
engine/startmenu.asm
View File

@ -91,7 +91,7 @@ StartMenu:: ; 125cd
ld [MenuSelection], a ld [MenuSelection], a
.loop .loop
call .PrintMenuAccount call .PrintMenuAccount
call Function1f1a call GetScrollingMenuJoypad
ld a, [wMenuJoypad] ld a, [wMenuJoypad]
cp B_BUTTON cp B_BUTTON
jr z, .b jr z, .b
@ -591,70 +591,66 @@ HasNoItems: ; 129d5
and a and a
ret ret
Function129f4: ; 129f4 TossItemFromPC: ; 129f4
push de push de
call PartyMonItemName call PartyMonItemName
callba _CheckTossableItem callba _CheckTossableItem
ld a, [wItemAttributeParamBuffer] ld a, [wItemAttributeParamBuffer]
and a and a
jr nz, .asm_12a3f jr nz, .key_item
ld hl, UnknownText_0x12a45 ld hl, .TossHowMany
call MenuTextBox call MenuTextBox
callba SelectQuantityToToss callba SelectQuantityToToss
push af push af
call CloseWindow call CloseWindow
call ExitMenu call ExitMenu
pop af pop af
jr c, .asm_12a42 jr c, .quit
ld hl, UnknownText_0x12a4a ld hl, .ConfirmToss
call MenuTextBox call MenuTextBox
call YesNoBox call YesNoBox
push af push af
call ExitMenu call ExitMenu
pop af pop af
jr c, .asm_12a42 jr c, .quit
pop hl pop hl
ld a, [wd107] ld a, [wd107]
call TossItem call TossItem
call PartyMonItemName call PartyMonItemName
ld hl, UnknownText_0x12a4f ld hl, .TossedThisMany
call MenuTextBox call MenuTextBox
call ExitMenu call ExitMenu
and a and a
ret ret
.asm_12a3f
call Function12a54 .key_item
.asm_12a42 call .CantToss
.quit
pop hl pop hl
scf scf
ret ret
; 12a45 (4:6a45)
UnknownText_0x12a45: ; 0x12a45 .TossHowMany
; Toss out how many @ (S)? ; Toss out how many @ (S)?
text_jump UnknownText_0x1c1a90 text_jump UnknownText_0x1c1a90
db "@" db "@"
; 0x12a4a
UnknownText_0x12a4a: ; 0x12a4a .ConfirmToss
; Throw away @ @ (S)? ; Throw away @ @ (S)?
text_jump UnknownText_0x1c1aad text_jump UnknownText_0x1c1aad
db "@" db "@"
; 0x12a4f
UnknownText_0x12a4f: ; 0x12a4f .TossedThisMany
; Discarded @ (S). ; Discarded @ (S).
text_jump UnknownText_0x1c1aca text_jump UnknownText_0x1c1aca
db "@" db "@"
; 0x12a54
Function12a54: ; 12a54 (4:6a54) .CantToss
ld hl, UnknownText_0x12a5b ld hl, .TooImportantToToss
call MenuTextBoxBackup call MenuTextBoxBackup
ret ret
; 12a5b (4:6a5b)
UnknownText_0x12a5b: ; 0x12a5b .TooImportantToToss
; That's too impor- tant to toss out! ; That's too impor- tant to toss out!
text_jump UnknownText_0x1c1adf text_jump UnknownText_0x1c1adf
db "@" db "@"
@ -830,7 +826,7 @@ GiveTakePartyMonItem: ; 12b60
; 12ba9 ; 12ba9
.GiveItem: ; 12ba9 .GiveItem
callba DepositSellInitPackBuffers callba DepositSellInitPackBuffers
@ -1168,7 +1164,7 @@ MonMailAction: ; 12d45
; 12dc9 ; 12dc9
.MenuDataHeader: ; 0x12dc9 .MenuDataHeader
db $40 ; flags db $40 ; flags
db 10, 12 ; start coords db 10, 12 ; start coords
db 17, 19 ; end coords db 17, 19 ; end coords
@ -1176,7 +1172,7 @@ MonMailAction: ; 12d45
db 1 ; default option db 1 ; default option
; 0x12dd1 ; 0x12dd1
.MenuData2: ; 0x12dd1 .MenuData2
db $80 ; flags db $80 ; flags
db 3 ; items db 3 ; items
db "READ@" db "READ@"
@ -1185,37 +1181,37 @@ MonMailAction: ; 12d45
; 0x12de2 ; 0x12de2
.mailwilllosemessagetext: ; 0x12de2 .mailwilllosemessagetext
; The MAIL will lose its message. OK? ; The MAIL will lose its message. OK?
text_jump UnknownText_0x1c1c22 text_jump UnknownText_0x1c1c22
db "@" db "@"
; 0x12de7 ; 0x12de7
.tookmailfrommontext: ; 0x12de7 .tookmailfrommontext
; MAIL detached from <POKEMON>. ; MAIL detached from <POKEMON>.
text_jump UnknownText_0x1c1c47 text_jump UnknownText_0x1c1c47
db "@" db "@"
; 0x12dec ; 0x12dec
.bagfulltext: ; 0x12dec .bagfulltext
; There's no space for removing MAIL. ; There's no space for removing MAIL.
text_jump UnknownText_0x1c1c62 text_jump UnknownText_0x1c1c62
db "@" db "@"
; 0x12df1 ; 0x12df1
.sendmailtopctext: ; 0x12df1 .sendmailtopctext
; Send the removed MAIL to your PC? ; Send the removed MAIL to your PC?
text_jump UnknownText_0x1c1c86 text_jump UnknownText_0x1c1c86
db "@" db "@"
; 0x12df6 ; 0x12df6
.mailboxfulltext: ; 0x12df6 .mailboxfulltext
; Your PC's MAILBOX is full. ; Your PC's MAILBOX is full.
text_jump UnknownText_0x1c1ca9 text_jump UnknownText_0x1c1ca9
db "@" db "@"
; 0x12dfb ; 0x12dfb
.sentmailtopctext: ; 0x12dfb .sentmailtopctext
; The MAIL was sent to your PC. ; The MAIL was sent to your PC.
text_jump UnknownText_0x1c1cc4 text_jump UnknownText_0x1c1cc4
db "@" db "@"
@ -1392,13 +1388,13 @@ MonMenu_Softboiled_MilkDrink: ; 12ee6
ret ret
; 12f00 ; 12f00
.Text_NotEnoughHP: ; 0x12f00 .Text_NotEnoughHP
; Not enough HP! ; Not enough HP!
text_jump UnknownText_0x1c1ce3 text_jump UnknownText_0x1c1ce3
db "@" db "@"
; 0x12f05 ; 0x12f05
.CheckMonHasEnoughHP: ; 12f05 .CheckMonHasEnoughHP
; Need to have at least (MaxHP / 5) HP left. ; Need to have at least (MaxHP / 5) HP left.
ld a, MON_MAXHP ld a, MON_MAXHP
call GetPartyParamLocation call GetPartyParamLocation
@ -1471,7 +1467,7 @@ ChooseMoveToDelete: ; 12f5b
ret ret
; 12f73 ; 12f73
.asm_12f73: ; 12f73 .asm_12f73
call SetUpMoveScreenBG call SetUpMoveScreenBG
ld de, DeleteMoveScreenAttrs ld de, DeleteMoveScreenAttrs
call SetMenuAttributes call SetMenuAttributes
@ -1480,27 +1476,27 @@ ChooseMoveToDelete: ; 12f5b
set 6, [hl] set 6, [hl]
jr .asm_12f93 jr .asm_12f93
.asm_12f86: ; 12f86 .asm_12f86
call ScrollingMenuJoypad call ScrollingMenuJoypad
bit 1, a bit 1, a
jp nz, .asm_12f9f jp nz, .asm_12f9f
bit 0, a bit 0, a
jp nz, .asm_12f9c jp nz, .asm_12f9c
.asm_12f93: ; 12f93 .asm_12f93
call PrepareToPlaceMoveData call PrepareToPlaceMoveData
call PlaceMoveData call PlaceMoveData
jp .asm_12f86 jp .asm_12f86
; 12f9c ; 12f9c
.asm_12f9c: ; 12f9c .asm_12f9c
and a and a
jr .asm_12fa0 jr .asm_12fa0
.asm_12f9f: ; 12f9f .asm_12f9f
scf scf
.asm_12fa0: ; 12fa0 .asm_12fa0
push af push af
xor a xor a
ld [wSwitchMon], a ld [wSwitchMon], a
@ -1583,7 +1579,7 @@ MoveScreenLoop: ; 12fd5
ld de, String_1316b ld de, String_1316b
call PlaceString call PlaceString
jp .joy_loop jp .joy_loop
.b_button: ; 13038 .b_button
call PlayClickSFX call PlayClickSFX
call WaitSFX call WaitSFX
ld a, [wMoveSwapBuffer] ld a, [wMoveSwapBuffer]
@ -1600,7 +1596,7 @@ MoveScreenLoop: ; 12fd5
jp .loop jp .loop
; 1305b ; 1305b
.d_right: ; 1305b .d_right
ld a, [wMoveSwapBuffer] ld a, [wMoveSwapBuffer]
and a and a
jp nz, .joy_loop jp nz, .joy_loop
@ -1615,7 +1611,7 @@ MoveScreenLoop: ; 12fd5
jp z, .joy_loop jp z, .joy_loop
jp MoveScreenLoop jp MoveScreenLoop
.d_left: ; 13075 .d_left
ld a, [wMoveSwapBuffer] ld a, [wMoveSwapBuffer]
and a and a
jp nz, .joy_loop jp nz, .joy_loop
@ -1665,7 +1661,7 @@ MoveScreenLoop: ; 12fd5
jr .cycle_left_loop jr .cycle_left_loop
; 130c6 ; 130c6
.a_button: ; 130c6 .a_button
call PlayClickSFX call PlayClickSFX
call WaitSFX call WaitSFX
ld a, [wMoveSwapBuffer] ld a, [wMoveSwapBuffer]
@ -1716,7 +1712,7 @@ MoveScreenLoop: ; 12fd5
jp .loop jp .loop
; 1313a ; 1313a
.copy_move: ; 1313a .copy_move
push hl push hl
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
dec a dec a
@ -1739,7 +1735,7 @@ MoveScreenLoop: ; 12fd5
ret ret
; 13154 ; 13154
.exit: ; 13154 .exit
xor a xor a
ld [wMoveSwapBuffer], a ld [wMoveSwapBuffer], a
ld hl, w2DMenuFlags1 ld hl, w2DMenuFlags1
@ -1776,7 +1772,7 @@ SetUpMoveScreenBG: ; 13172
ld a, [hl] ld a, [hl]
ld [wd265], a ld [wd265], a
ld e, $2 ld e, $2
callba Function8e83f callba LoadMenuMonIcon
hlcoord 0, 1 hlcoord 0, 1
ld b, 9 ld b, 9
ld c, 18 ld c, 18

10
engine/tile_events.asm
View File

@ -21,17 +21,17 @@ CheckDirectionalWarp:: ; 149af
; Else, set carry (immediate warp). ; Else, set carry (immediate warp).
ld a, [PlayerStandingTile] ld a, [PlayerStandingTile]
cp $70 ; Warp on down cp $70 ; Warp on down
jr z, .not_warp jr z, .directional
cp $76 ; Warp on left cp $76 ; Warp on left
jr z, .not_warp jr z, .directional
cp $78 ; Warp on up cp $78 ; Warp on up
jr z, .not_warp jr z, .directional
cp $7e ; Warp on right cp $7e ; Warp on right
jr z, .not_warp jr z, .directional
scf scf
ret ret
.not_warp .directional
xor a xor a
ret ret
; 149c6 ; 149c6

2
engine/time.asm
View File

@ -133,7 +133,7 @@ endr
; 11485 ; 11485
Special_SampleKenjiBreakCountdown: ; 11485 Special_SampleKenjiBreakCountdown: ; 11485
; Generate a random number between 3 and 5 ; Generate a random number between 3 and 6
call Random call Random
and 3 and 3
add 3 add 3

2
engine/trade/animation.asm
View File

@ -1440,7 +1440,7 @@ LoadTradeBallAndCableGFX: ; 2982b
LoadTradeBubbleGFX: ; 2985a LoadTradeBubbleGFX: ; 2985a
call DelayFrame call DelayFrame
ld e, $3 ld e, $3
callab Function8e83f callab LoadMenuMonIcon
ld de, TradeBubbleGFX ld de, TradeBubbleGFX
ld hl, VTiles0 tile $72 ld hl, VTiles0 tile $72
lb bc, BANK(TradeBubbleGFX), $4 lb bc, BANK(TradeBubbleGFX), $4

2
event/mom.asm
View File

@ -480,7 +480,7 @@ Function1651a: ; 1651a
lb bc, PRINTNUM_MONEY | PRINTNUM_LEADINGZEROS | 3, 6 lb bc, PRINTNUM_MONEY | PRINTNUM_LEADINGZEROS | 3, 6
call PrintNum call PrintNum
call UpdateSprites call UpdateSprites
call Function3238 call CGBOnly_LoadEDTile
ret ret
; 1656b ; 1656b

1
event/poke_seer.asm
View File

@ -163,6 +163,7 @@ GetCaughtLevel: ; 4f18c
call ByteFill call ByteFill
; caught level ; caught level
; Limited to between 1 and 63 for some reason.
ld a, [wSeerCaughtData] ld a, [wSeerCaughtData]
and $3f and $3f
jr z, .unknown jr z, .unknown

2
home.asm
View File

@ -560,7 +560,7 @@ ApplyTilemap:: ; 321c
ret ret
; 3238 ; 3238
Function3238:: ; 3238 CGBOnly_LoadEDTile:: ; 3238
ld a, [hCGB] ld a, [hCGB]
and a and a
jr z, WaitBGMap jr z, WaitBGMap

9
home/map.asm
View File

@ -1593,7 +1593,14 @@ GetMovementPermissions:: ; 2914
; 2945 ; 2945
.MovementPermissionsData ; 2945 .MovementPermissionsData ; 2945
db 1, 2, 4, 8, 9, 10, 5, 6 db 1 << DOWN
db 1 << UP
db 1 << LEFT
db 1 << RIGHT
db (1 << DOWN) | (1 << RIGHT)
db (1 << UP) | (1 << RIGHT)
db (1 << DOWN) | (1 << LEFT)
db (1 << UP) | (1 << LEFT)
; 294d ; 294d
.UpDown .UpDown

10
home/menu.asm
View File

@ -232,7 +232,7 @@ DoNthMenu:: ; 1e5d
call MenuFunc_1e7f call MenuFunc_1e7f
call MenuWriteText call MenuWriteText
call Function1eff call Function1eff
call Function1f23 call GetStaticMenuJoypad
call GetMenuJoypad call GetMenuJoypad
call MenuClickSound call MenuClickSound
ret ret
@ -360,20 +360,20 @@ Function1eff:: ; 1eff
; 1f1a ; 1f1a
Function1f1a:: ; 1f1a GetScrollingMenuJoypad:: ; 1f1a
call ScrollingMenuJoypad call ScrollingMenuJoypad
ld hl, wMenuJoypadFilter ld hl, wMenuJoypadFilter
and [hl] and [hl]
jr Function1f2a jr ContinueGettingMenuJoypad
; 1f23 ; 1f23
Function1f23:: ; 1f23 GetStaticMenuJoypad:: ; 1f23
xor a xor a
ld [wMenuJoypad], a ld [wMenuJoypad], a
call StaticMenuJoypad call StaticMenuJoypad
; 1f2a ; 1f2a
Function1f2a:: ; 1f2a ContinueGettingMenuJoypad:
bit A_BUTTON_F, a bit A_BUTTON_F, a
jr nz, .a_button jr nz, .a_button
bit B_BUTTON_F, a bit B_BUTTON_F, a

4
home/movement.asm
View File

@ -4,9 +4,9 @@ InitMovementBuffer:: ; 1b1e
ld [wMovementBufferCount], a ld [wMovementBufferCount], a
ld a, $0 ; useless ld a, $0 ; useless
ld [wd004], a ld [wd004], a
ld a, $7 ld a, MovementBuffer % $100
ld [wd005], a ld [wd005], a
ld a, $d0 ld a, MovementBuffer / $100
ld [wd006], a ld [wd006], a
ret ret
; 1b35 ; 1b35

350
macros/move_effect.asm
View File

@ -5,181 +5,181 @@ endm
enum_start 1 enum_start 1
command checkturn command checkturn ; 01
command checkobedience command checkobedience ; 02
command usedmovetext command usedmovetext ; 03
command doturn command doturn ; 04
command critical command critical ; 05
command damagestats command damagestats ; 06
command stab command stab ; 07
command damagevariation command damagevariation ; 08
command checkhit command checkhit ; 09
command lowersub command lowersub ; 0a
command hittargetnosub command hittargetnosub ; 0b
command raisesub command raisesub ; 0c
command failuretext command failuretext ; 0d
command checkfaint command checkfaint ; 0e
command criticaltext command criticaltext ; 0f
command supereffectivetext command supereffectivetext ; 10
command checkdestinybond command checkdestinybond ; 11
command buildopponentrage command buildopponentrage ; 12
command poisontarget command poisontarget ; 13
command sleeptarget command sleeptarget ; 14
command draintarget command draintarget ; 15
command eatdream command eatdream ; 16
command burntarget command burntarget ; 17
command freezetarget command freezetarget ; 18
command paralyzetarget command paralyzetarget ; 19
command selfdestruct command selfdestruct ; 1a
command mirrormove command mirrormove ; 1b
command statup command statup ; 1c
command statdown command statdown ; 1d
command payday command payday ; 1e
command conversion command conversion ; 1f
command resetstats command resetstats ; 20
command storeenergy command storeenergy ; 21
command unleashenergy command unleashenergy ; 22
command forceswitch command forceswitch ; 23
command endloop command endloop ; 24
command flinchtarget command flinchtarget ; 25
command ohko command ohko ; 26
command recoil command recoil ; 27
command mist command mist ; 28
command focusenergy command focusenergy ; 29
command confuse command confuse ; 2a
command confusetarget command confusetarget ; 2b
command heal command heal ; 2c
command transform command transform ; 2d
command screen command screen ; 2e
command poison command poison ; 2f
command paralyze command paralyze ; 30
command substitute command substitute ; 31
command rechargenextturn command rechargenextturn ; 32
command mimic command mimic ; 33
command metronome command metronome ; 34
command leechseed command leechseed ; 35
command splash command splash ; 36
command disable command disable ; 37
command cleartext command cleartext ; 38
command charge command charge ; 39
command checkcharge command checkcharge ; 3a
command traptarget command traptarget ; 3b
command effect0x3c command effect0x3c ; 3c
command rampage command rampage ; 3d
command checkrampage command checkrampage ; 3e
command constantdamage command constantdamage ; 3f
command counter command counter ; 40
command encore command encore ; 41
command painsplit command painsplit ; 42
command snore command snore ; 43
command conversion2 command conversion2 ; 44
command lockon command lockon ; 45
command sketch command sketch ; 46
command defrostopponent command defrostopponent ; 47
command sleeptalk command sleeptalk ; 48
command destinybond command destinybond ; 49
command spite command spite ; 4a
command falseswipe command falseswipe ; 4b
command healbell command healbell ; 4c
command kingsrock command kingsrock ; 4d
command triplekick command triplekick ; 4e
command kickcounter command kickcounter ; 4f
command thief command thief ; 50
command arenatrap command arenatrap ; 51
command nightmare command nightmare ; 52
command defrost command defrost ; 53
command curse command curse ; 54
command protect command protect ; 55
command spikes command spikes ; 56
command foresight command foresight ; 57
command perishsong command perishsong ; 58
command startsandstorm command startsandstorm ; 59
command endure command endure ; 5a
command checkcurl command checkcurl ; 5b
command rolloutpower command rolloutpower ; 5c
command effect0x5d command effect0x5d ; 5d
command furycutter command furycutter ; 5e
command attract command attract ; 5f
command happinesspower command happinesspower ; 60
command present command present ; 61
command damagecalc command damagecalc ; 62
command frustrationpower command frustrationpower ; 63
command safeguard command safeguard ; 64
command checksafeguard command checksafeguard ; 65
command getmagnitude command getmagnitude ; 66
command batonpass command batonpass ; 67
command pursuit command pursuit ; 68
command clearhazards command clearhazards ; 69
command healmorn command healmorn ; 6a
command healday command healday ; 6b
command healnite command healnite ; 6c
command hiddenpower command hiddenpower ; 6d
command startrain command startrain ; 6e
command startsun command startsun ; 6f
command attackup command attackup ; 70
command defenseup command defenseup ; 71
command speedup command speedup ; 72
command specialattackup command specialattackup ; 73
command specialdefenseup command specialdefenseup ; 74
command accuracyup command accuracyup ; 75
command evasionup command evasionup ; 76
command attackup2 command attackup2 ; 77
command defenseup2 command defenseup2 ; 78
command speedup2 command speedup2 ; 79
command specialattackup2 command specialattackup2 ; 7a
command specialdefenseup2 command specialdefenseup2 ; 7b
command accuracyup2 command accuracyup2 ; 7c
command evasionup2 command evasionup2 ; 7d
command attackdown command attackdown ; 7e
command defensedown command defensedown ; 7f
command speeddown command speeddown ; 80
command specialattackdown command specialattackdown ; 81
command specialdefensedown command specialdefensedown ; 82
command accuracydown command accuracydown ; 83
command evasiondown command evasiondown ; 84
command attackdown2 command attackdown2 ; 85
command defensedown2 command defensedown2 ; 86
command speeddown2 command speeddown2 ; 87
command specialattackdown2 command specialattackdown2 ; 88
command specialdefensedown2 command specialdefensedown2 ; 89
command accuracydown2 command accuracydown2 ; 8a
command evasiondown2 command evasiondown2 ; 8b
command statupmessage command statupmessage ; 8c
command statdownmessage command statdownmessage ; 8d
command statupfailtext command statupfailtext ; 8e
command statdownfailtext command statdownfailtext ; 8f
command effectchance command effectchance ; 90
command statdownanim command statdownanim ; 91
command statupanim command statupanim ; 92
command switchturn command switchturn ; 93
command fakeout command fakeout ; 94
command bellydrum command bellydrum ; 95
command psychup command psychup ; 96
command rage command rage ; 97
command doubleflyingdamage command doubleflyingdamage ; 98
command doubleundergrounddamage command doubleundergrounddamage ; 99
command mirrorcoat command mirrorcoat ; 9a
command checkfuturesight command checkfuturesight ; 9b
command futuresight command futuresight ; 9c
command doubleminimizedamage command doubleminimizedamage ; 9d
command skipsuncharge command skipsuncharge ; 9e
command thunderaccuracy command thunderaccuracy ; 9f
command teleport command teleport ; a0
command beatup command beatup ; a1
command ragedamage command ragedamage ; a2
command resettypematchup command resettypematchup ; a3
command allstatsup command allstatsup ; a4
command effect0xa5 command effect0xa5 ; a5
command raisesubnoanim command raisesubnoanim ; a6
command lowersubnoanim command lowersubnoanim ; a7
command effect0xa8 command effect0xa8 ; a8
command clearmissdamage command clearmissdamage ; a9
command movedelay command movedelay ; aa
command hittarget command hittarget ; ab
command tristatuschance command tristatuschance ; ac
command supereffectivelooptext command supereffectivelooptext ; ad
command startloop command startloop ; ae
command curl command curl ; af
enum_start -1, -1 enum_start -1, -1
command endmove command endmove

10
macros/movement.asm
View File

@ -281,7 +281,15 @@ fast_jump_step_right: macro
db movement_fast_jump_step_right ; $37 db movement_fast_jump_step_right ; $37
endm endm
__enum__ = $3a enum movement_remove_sliding
remove_sliding: macro
db movement_remove_sliding ; $38
endm
enum movement_set_sliding
set_sliding: macro
db movement_set_sliding ; $39
endm
enum movement_remove_fixed_facing enum movement_remove_fixed_facing
remove_fixed_facing: macro remove_fixed_facing: macro

2
macros/sound.asm
View File

@ -15,7 +15,7 @@ noise: macro
endm endm
musicheader: macro musicheader: macro
; number of tracks, ??, address ; number of tracks, track idx, address
dbw ((\1 - 1) << 6) + (\2 - 1), \3 dbw ((\1 - 1) << 6) + (\2 - 1), \3
endm endm

8
main.asm
View File

@ -3799,7 +3799,7 @@ BikeFunction: ; d0b3
ld hl, Script_GetOffBike ld hl, Script_GetOffBike
ld de, Script_GetOffBike_Register ld de, Script_GetOffBike_Register
call .CheckIfRegistered call .CheckIfRegistered
ld a, $3 ld a, BANK(Script_GetOffBike)
jr .done jr .done
.CantGetOffBike .CantGetOffBike
@ -6275,7 +6275,7 @@ ShowLinkBattleParticipants: ; 2ee18
call ClearSprites call ClearSprites
ret ret
FindFirstAliveMon: ; 2ee2f FindFirstAliveMonAndStartBattle: ; 2ee2f
xor a xor a
ld [hMapAnims], a ld [hMapAnims], a
call DelayFrame call DelayFrame
@ -10522,8 +10522,8 @@ Function8c7c9: ; unreferenced
INCLUDE "event/field_moves.asm" INCLUDE "event/field_moves.asm"
INCLUDE "event/magnet_train.asm" INCLUDE "event/magnet_train.asm"
Function8cf4f: ; 8cf4f BattleStart_LoadEDTile: ; 8cf4f
call Function3238 call CGBOnly_LoadEDTile
ret ret
INCLUDE "engine/sprites.asm" INCLUDE "engine/sprites.asm"

24
maps/BurnedTowerB1F.asm
View File

@ -130,53 +130,53 @@ BurnedTowerB1FBoulder:
jumpstd strengthboulder jumpstd strengthboulder
MovementData_0x186236: MovementData_0x186236:
db $39 ; movement set_sliding
fast_jump_step_down fast_jump_step_down
fast_jump_step_left fast_jump_step_left
db $38 ; movement remove_sliding
step_end step_end
MovementData_0x18623b: MovementData_0x18623b:
db $39 ; movement set_sliding
fast_jump_step_right fast_jump_step_right
fast_jump_step_down fast_jump_step_down
fast_jump_step_right fast_jump_step_right
db $38 ; movement remove_sliding
step_end step_end
MovementData_0x186241: MovementData_0x186241:
db $39 ; movement set_sliding
fast_jump_step_right fast_jump_step_right
fast_jump_step_down fast_jump_step_down
fast_jump_step_down fast_jump_step_down
fast_jump_step_left fast_jump_step_left
db $38 ; movement remove_sliding
step_end step_end
MovementData_0x186248: MovementData_0x186248:
db $39 ; movement set_sliding
fast_jump_step_left fast_jump_step_left
fast_jump_step_up fast_jump_step_up
big_step_up big_step_up
fast_jump_step_right fast_jump_step_right
db $38 ; movement remove_sliding
step_end step_end
MovementData_0x18624f: MovementData_0x18624f:
db $39 ; movement set_sliding
big_step_down big_step_down
db $38 ; movement remove_sliding
step_end step_end
MovementData_0x186253: MovementData_0x186253:
db $39 ; movement set_sliding
big_step_up big_step_up
fast_jump_step_right fast_jump_step_right
fast_jump_step_down fast_jump_step_down
fast_jump_step_down fast_jump_step_down
fast_jump_step_down fast_jump_step_down
fast_jump_step_down fast_jump_step_down
db $38 ; movement remove_sliding
step_end step_end
MovementData_0x18625c: MovementData_0x18625c:

80
maps/CianwoodGym.asm
View File

@ -21,31 +21,31 @@ ChuckScript_0x9d60f:
opentext opentext
checkevent EVENT_BEAT_CHUCK checkevent EVENT_BEAT_CHUCK
iftrue .FightDone iftrue .FightDone
writetext UnknownText_0x9d6f9 writetext ChuckIntroText1
waitbutton waitbutton
closetext closetext
spriteface CIANWOODGYM_CHUCK, RIGHT spriteface CIANWOODGYM_CHUCK, RIGHT
opentext opentext
writetext UnknownText_0x9d76f writetext ChuckIntroText2
waitbutton waitbutton
closetext closetext
applymovement CIANWOODGYM_BOULDER1, MovementData_0x9d6f3 applymovement CIANWOODGYM_BOULDER1, CianwoodGymMovement_ChuckChucksBoulder
playsound SFX_STRENGTH playsound SFX_STRENGTH
earthquake 80 earthquake 80
disappear CIANWOODGYM_BOULDER1 disappear CIANWOODGYM_BOULDER1
pause 30 pause 30
faceplayer faceplayer
opentext opentext
writetext UnknownText_0x9d78a writetext ChuckIntroText3
waitbutton waitbutton
closetext closetext
winlosstext UnknownText_0x9d7f6, 0 winlosstext ChuckLossText, 0
loadtrainer CHUCK, 1 loadtrainer CHUCK, 1
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
setevent EVENT_BEAT_CHUCK setevent EVENT_BEAT_CHUCK
opentext opentext
writetext UnknownText_0x9d835 writetext GetStormBadgeText
playsound SFX_GET_BADGE playsound SFX_GET_BADGE
waitsfx waitsfx
setflag ENGINE_STORMBADGE setflag ENGINE_STORMBADGE
@ -53,25 +53,25 @@ ChuckScript_0x9d60f:
scall CianwoodGymTriggerRockets scall CianwoodGymTriggerRockets
.FightDone .FightDone
checkevent EVENT_GOT_TM01_DYNAMICPUNCH checkevent EVENT_GOT_TM01_DYNAMICPUNCH
iftrue UnknownScript_0x9d67b iftrue .AlreadyGotTM
setevent EVENT_BEAT_BLACKBELT_YOSHI setevent EVENT_BEAT_BLACKBELT_YOSHI
setevent EVENT_BEAT_BLACKBELT_LAO setevent EVENT_BEAT_BLACKBELT_LAO
setevent EVENT_BEAT_BLACKBELT_NOB setevent EVENT_BEAT_BLACKBELT_NOB
setevent EVENT_BEAT_BLACKBELT_LUNG setevent EVENT_BEAT_BLACKBELT_LUNG
writetext UnknownText_0x9d84d writetext ChuckExplainBadgeText
buttonsound buttonsound
verbosegiveitem TM_DYNAMICPUNCH verbosegiveitem TM_DYNAMICPUNCH
iffalse UnknownScript_0x9d67f iffalse .BagFull
setevent EVENT_GOT_TM01_DYNAMICPUNCH setevent EVENT_GOT_TM01_DYNAMICPUNCH
writetext UnknownText_0x9d8da writetext ChuckExplainTMText
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x9d67b: .AlreadyGotTM:
writetext UnknownText_0x9d930 writetext ChuckAfterText
waitbutton waitbutton
UnknownScript_0x9d67f: .BagFull:
closetext closetext
end end
@ -87,45 +87,45 @@ CianwoodGymTriggerRockets:
jumpstd radiotowerrockets jumpstd radiotowerrockets
TrainerBlackbeltYoshi: TrainerBlackbeltYoshi:
trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, BlackbeltYoshiScript trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script
BlackbeltYoshiScript: .Script:
end_if_just_battled end_if_just_battled
opentext opentext
writetext UnknownText_0x9d9fa writetext BlackbeltYoshiAfterText
waitbutton waitbutton
closetext closetext
end end
TrainerBlackbeltLao: TrainerBlackbeltLao:
trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, BlackbeltLaoScript trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, .Script
BlackbeltLaoScript: .Script:
end_if_just_battled end_if_just_battled
opentext opentext
writetext UnknownText_0x9da61 writetext BlackbeltLaoAfterText
waitbutton waitbutton
closetext closetext
end end
TrainerBlackbeltNob: TrainerBlackbeltNob:
trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, BlackbeltNobScript trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, .Script
BlackbeltNobScript: .Script:
end_if_just_battled end_if_just_battled
opentext opentext
writetext UnknownText_0x9dac0 writetext BlackbeltNobAfterText
waitbutton waitbutton
closetext closetext
end end
TrainerBlackbeltLung: TrainerBlackbeltLung:
trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, BlackbeltLungScript trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, .Script
BlackbeltLungScript: .Script:
end_if_just_battled end_if_just_battled
opentext opentext
writetext UnknownText_0x9db14 writetext BlackbeltLungAfterText
waitbutton waitbutton
closetext closetext
end end
@ -141,15 +141,15 @@ CianwoodGymStatue:
trainertotext CHUCK, 1, $1 trainertotext CHUCK, 1, $1
jumpstd gymstatue2 jumpstd gymstatue2
MovementData_0x9d6f3: CianwoodGymMovement_ChuckChucksBoulder:
db $39 ; movement set_sliding
big_step_left big_step_left
big_step_up big_step_up
fast_jump_step_right fast_jump_step_right
db $38 ; movement remove_sliding
step_end step_end
UnknownText_0x9d6f9: ChuckIntroText1:
text "WAHAHAH!" text "WAHAHAH!"
para "So you've come" para "So you've come"
@ -165,14 +165,14 @@ UnknownText_0x9d6f9:
para "Watch this!" para "Watch this!"
done done
UnknownText_0x9d76f: ChuckIntroText2:
text "CHUCK: Urggh!" text "CHUCK: Urggh!"
line "…" line "…"
para "Oooarrgh!" para "Oooarrgh!"
done done
UnknownText_0x9d78a: ChuckIntroText3:
text "There! Scared now," text "There! Scared now,"
line "are you?" line "are you?"
@ -186,7 +186,7 @@ UnknownText_0x9d78a:
line "do battle!" line "do battle!"
done done
UnknownText_0x9d7f6: ChuckLossText:
text "Wha? Huh?" text "Wha? Huh?"
line "I lost?" line "I lost?"
@ -195,12 +195,12 @@ UnknownText_0x9d7f6:
cont "STORMBADGE!" cont "STORMBADGE!"
done done
UnknownText_0x9d835: GetStormBadgeText:
text "<PLAYER> received" text "<PLAYER> received"
line "STORMBADGE." line "STORMBADGE."
done done
UnknownText_0x9d84d: ChuckExplainBadgeText:
text "STORMBADGE makes" text "STORMBADGE makes"
line "all #MON up to" line "all #MON up to"
@ -217,7 +217,7 @@ UnknownText_0x9d84d:
line "too!" line "too!"
done done
UnknownText_0x9d8da: ChuckExplainTMText:
text "That is DYNAMIC-" text "That is DYNAMIC-"
line "PUNCH." line "PUNCH."
@ -228,7 +228,7 @@ UnknownText_0x9d8da:
line "confusion!" line "confusion!"
done done
UnknownText_0x9d930: ChuckAfterText:
text "WAHAHAH! I enjoyed" text "WAHAHAH! I enjoyed"
line "battling you!" line "battling you!"
@ -253,7 +253,7 @@ BlackbeltYoshiBeatenText:
text "This isn't real!" text "This isn't real!"
done done
UnknownText_0x9d9fa: BlackbeltYoshiAfterText:
text "You seem to have a" text "You seem to have a"
line "strong bond with" line "strong bond with"
cont "your #MON too!" cont "your #MON too!"
@ -268,7 +268,7 @@ BlackbeltLaoBeatenText:
text "That's shocking!" text "That's shocking!"
done done
UnknownText_0x9da61: BlackbeltLaoAfterText:
text "Fighting #MON" text "Fighting #MON"
line "are afraid of psy-" line "are afraid of psy-"
cont "chics…" cont "chics…"
@ -284,7 +284,7 @@ BlackbeltNobBeatenText:
text "…" text "…"
done done
UnknownText_0x9dac0: BlackbeltNobAfterText:
text "I lost! " text "I lost! "
line "I'm speechless!" line "I'm speechless!"
done done
@ -299,7 +299,7 @@ BlackbeltLungBeatenText:
text "I got shattered!" text "I got shattered!"
done done
UnknownText_0x9db14: BlackbeltLungAfterText:
text "My #MON lost…" text "My #MON lost…"
line "My… my pride is" line "My… my pride is"
cont "shattered…" cont "shattered…"

92
maps/LancesRoom.asm
View File

@ -8,36 +8,36 @@ LancesRoom_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw UnknownScript_0x180e39, 0 dw .Trigger0, 0
dw UnknownScript_0x180e3d, 0 dw .Trigger1, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks ; callbacks
dbw MAPCALLBACK_TILES, UnknownScript_0x180e3e dbw MAPCALLBACK_TILES, .CheckDoor
UnknownScript_0x180e39: .Trigger0:
priorityjump UnknownScript_0x180e53 priorityjump LancesRoom_PlayerWalksIn_DoorsCloseBehind
end end
UnknownScript_0x180e3d: .Trigger1:
end end
UnknownScript_0x180e3e: .CheckDoor:
checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
iffalse UnknownScript_0x180e48 iffalse .LanceEntranceOpen
changeblock $4, $16, $34 changeblock $4, $16, $34
UnknownScript_0x180e48: .LanceEntranceOpen:
checkevent EVENT_LANCES_ROOM_EXIT_OPEN checkevent EVENT_LANCES_ROOM_EXIT_OPEN
iffalse UnknownScript_0x180e52 iffalse .LanceExitClosed
changeblock $4, $0, $b changeblock $4, $0, $b
UnknownScript_0x180e52: .LanceExitClosed:
return return
UnknownScript_0x180e53: LancesRoom_PlayerWalksIn_DoorsCloseBehind:
applymovement PLAYER, MovementData_0x180f33 applymovement PLAYER, LancesRoom_PlayerWalksInMovementData
refreshscreen $86 refreshscreen $86
playsound SFX_STRENGTH playsound SFX_STRENGTH
earthquake 80 earthquake 80
@ -48,21 +48,21 @@ UnknownScript_0x180e53:
setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
end end
UnknownScript_0x180e6a: Script_ApproachLanceFromLeft:
special Special_FadeOutMusic special Special_FadeOutMusic
applymovement PLAYER, MovementData_0x180f38 applymovement PLAYER, MovementData_ApproachLanceFromLeft
jump LanceScript_0x180e7b jump LanceScript_0x180e7b
UnknownScript_0x180e74: Script_ApproachLanceFromRight:
special Special_FadeOutMusic special Special_FadeOutMusic
applymovement PLAYER, MovementData_0x180f3c applymovement PLAYER, MovementData_ApproachLanceFromRight
LanceScript_0x180e7b: LanceScript_0x180e7b:
spriteface LANCESROOM_LANCE, LEFT spriteface LANCESROOM_LANCE, LEFT
opentext opentext
writetext UnknownText_0x180f67 writetext LanceBattleIntroText
waitbutton waitbutton
closetext closetext
winlosstext UnknownText_0x1810a4, 0 winlosstext LanceBattleWinText, 0
setlasttalked LANCESROOM_LANCE setlasttalked LANCESROOM_LANCE
loadtrainer CHAMPION, LANCE loadtrainer CHAMPION, LANCE
startbattle startbattle
@ -70,7 +70,7 @@ LanceScript_0x180e7b:
reloadmapafterbattle reloadmapafterbattle
setevent EVENT_BEAT_CHAMPION_LANCE setevent EVENT_BEAT_CHAMPION_LANCE
opentext opentext
writetext UnknownText_0x181132 writetext LanceBattleAfterText
waitbutton waitbutton
closetext closetext
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
@ -85,15 +85,15 @@ LanceScript_0x180e7b:
pause 10 pause 10
spriteface PLAYER, DOWN spriteface PLAYER, DOWN
appear LANCESROOM_MARY appear LANCESROOM_MARY
applymovement LANCESROOM_MARY, MovementData_0x180f41 applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRushesIn
opentext opentext
writetext UnknownText_0x1811dd writetext UnknownText_0x1811dd
waitbutton waitbutton
closetext closetext
appear LANCESROOM_OAK appear LANCESROOM_OAK
applymovement LANCESROOM_OAK, MovementData_0x180f46 applymovement LANCESROOM_OAK, LancesRoomMovementData_OakWalksIn
follow LANCESROOM_MARY, LANCESROOM_OAK follow LANCESROOM_MARY, LANCESROOM_OAK
applymovement LANCESROOM_MARY, MovementData_0x180f49 applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryYieldsToOak
stopfollow stopfollow
spriteface LANCESROOM_OAK, UP spriteface LANCESROOM_OAK, UP
spriteface LANCESROOM_LANCE, LEFT spriteface LANCESROOM_LANCE, LEFT
@ -101,13 +101,13 @@ LanceScript_0x180e7b:
writetext UnknownText_0x18121b writetext UnknownText_0x18121b
waitbutton waitbutton
closetext closetext
applymovement LANCESROOM_MARY, MovementData_0x180f4c applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryInterviewChampion
spriteface PLAYER, LEFT spriteface PLAYER, LEFT
opentext opentext
writetext UnknownText_0x18134b writetext UnknownText_0x18134b
waitbutton waitbutton
closetext closetext
applymovement LANCESROOM_LANCE, MovementData_0x180f4f applymovement LANCESROOM_LANCE, LancesRoomMovementData_LancePositionsSelfToGuidePlayerAway
spriteface PLAYER, UP spriteface PLAYER, UP
opentext opentext
writetext UnknownText_0x18137b writetext UnknownText_0x18137b
@ -116,88 +116,88 @@ LanceScript_0x180e7b:
follow LANCESROOM_LANCE, PLAYER follow LANCESROOM_LANCE, PLAYER
spriteface LANCESROOM_MARY, UP spriteface LANCESROOM_MARY, UP
spriteface LANCESROOM_OAK, UP spriteface LANCESROOM_OAK, UP
applymovement LANCESROOM_LANCE, MovementData_0x180f53 applymovement LANCESROOM_LANCE, LancesRoomMovementData_LanceLeadsPlayerToHallOfFame
stopfollow stopfollow
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
disappear LANCESROOM_LANCE disappear LANCESROOM_LANCE
applymovement PLAYER, MovementData_0x180f55 applymovement PLAYER, LancesRoomMovementData_PlayerExits
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
disappear PLAYER disappear PLAYER
applymovement LANCESROOM_MARY, MovementData_0x180f57 applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryTriesToFollow
showemote EMOTE_SHOCK, LANCESROOM_MARY, 15 showemote EMOTE_SHOCK, LANCESROOM_MARY, 15
opentext opentext
writetext UnknownText_0x1813c5 writetext UnknownText_0x1813c5
pause 30 pause 30
closetext closetext
applymovement LANCESROOM_MARY, MovementData_0x180f5b applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth
special FadeOutPalettes special FadeOutPalettes
pause 15 pause 15
warpfacing UP, HALL_OF_FAME, $4, $d warpfacing UP, HALL_OF_FAME, $4, $d
end end
MovementData_0x180f33: LancesRoom_PlayerWalksInMovementData:
step_up step_up
step_up step_up
step_up step_up
step_up step_up
step_end step_end
MovementData_0x180f38: MovementData_ApproachLanceFromLeft:
step_up step_up
step_up step_up
turn_head_right turn_head_right
step_end step_end
MovementData_0x180f3c: MovementData_ApproachLanceFromRight:
step_up step_up
step_left step_left
step_up step_up
turn_head_right turn_head_right
step_end step_end
MovementData_0x180f41: LancesRoomMovementData_MaryRushesIn:
big_step_up big_step_up
big_step_up big_step_up
big_step_up big_step_up
turn_head_down turn_head_down
step_end step_end
MovementData_0x180f46: LancesRoomMovementData_OakWalksIn:
step_up step_up
step_up step_up
step_end step_end
MovementData_0x180f49: LancesRoomMovementData_MaryYieldsToOak:
step_left step_left
turn_head_right turn_head_right
step_end step_end
MovementData_0x180f4c: LancesRoomMovementData_MaryInterviewChampion:
big_step_up big_step_up
turn_head_right turn_head_right
step_end step_end
MovementData_0x180f4f: LancesRoomMovementData_LancePositionsSelfToGuidePlayerAway:
step_up step_up
step_left step_left
turn_head_down turn_head_down
step_end step_end
MovementData_0x180f53: LancesRoomMovementData_LanceLeadsPlayerToHallOfFame:
step_up step_up
step_end step_end
MovementData_0x180f55: LancesRoomMovementData_PlayerExits:
step_up step_up
step_end step_end
MovementData_0x180f57: LancesRoomMovementData_MaryTriesToFollow:
step_up step_up
step_right step_right
turn_head_up turn_head_up
step_end step_end
MovementData_0x180f5b: LancesRoomMovementData_MaryRunsBackAndForth:
big_step_right big_step_right
big_step_right big_step_right
big_step_left big_step_left
@ -211,7 +211,7 @@ MovementData_0x180f5b:
turn_head_up turn_head_up
step_end step_end
UnknownText_0x180f67: LanceBattleIntroText:
text "LANCE: I've been" text "LANCE: I've been"
line "waiting for you." line "waiting for you."
@ -243,7 +243,7 @@ UnknownText_0x180f67:
cont "your challenge!" cont "your challenge!"
done done
UnknownText_0x1810a4: LanceBattleWinText:
text "…It's over." text "…It's over."
para "But it's an odd" para "But it's an odd"
@ -260,7 +260,7 @@ UnknownText_0x1810a4:
line "CHAMPION!" line "CHAMPION!"
done done
UnknownText_0x181132: LanceBattleAfterText:
text "…Whew." text "…Whew."
para "You have become" para "You have become"
@ -355,8 +355,8 @@ LancesRoom_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 1, $5, $4, $0, UnknownScript_0x180e6a, $0, $0 xy_trigger 1, $5, $4, $0, Script_ApproachLanceFromLeft, $0, $0
xy_trigger 1, $5, $5, $0, UnknownScript_0x180e74, $0, $0 xy_trigger 1, $5, $5, $0, Script_ApproachLanceFromRight, $0, $0
.Signposts: .Signposts:
db 0 db 0

120
maps/Route36.asm
View File

@ -14,23 +14,23 @@ Route36_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw UnknownScript_0x19400d, 0 dw .Trigger0, 0
dw UnknownScript_0x19400e, 0 dw .Trigger1, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks ; callbacks
dbw MAPCALLBACK_OBJECTS, ArthurCallback dbw MAPCALLBACK_OBJECTS, .ArthurCallback
UnknownScript_0x19400d: .Trigger0:
end end
UnknownScript_0x19400e: .Trigger1:
end end
ArthurCallback: .ArthurCallback:
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
if_equal THURSDAY, .ArthurAppears if_equal THURSDAY, .ArthurAppears
disappear ROUTE36_YOUNGSTER3 disappear ROUTE36_YOUNGSTER3
@ -40,12 +40,12 @@ ArthurCallback:
appear ROUTE36_YOUNGSTER3 appear ROUTE36_YOUNGSTER3
return return
UnknownScript_0x19401b: Route36SuicuneTrigger:
showemote EMOTE_SHOCK, PLAYER, 15 showemote EMOTE_SHOCK, PLAYER, 15
pause 15 pause 15
playsound SFX_WARP_FROM playsound SFX_WARP_FROM
spriteface PLAYER, UP spriteface PLAYER, UP
applymovement ROUTE36_SUICUNE, MovementData_0x194262 applymovement ROUTE36_SUICUNE, Route36SuicuneMovement
disappear ROUTE36_SUICUNE disappear ROUTE36_SUICUNE
spriteface PLAYER, DOWN spriteface PLAYER, DOWN
pause 10 pause 10
@ -56,103 +56,103 @@ UnknownScript_0x19401b:
WeirdTreeScript_0x19403c: WeirdTreeScript_0x19403c:
checkitem SQUIRTBOTTLE checkitem SQUIRTBOTTLE
iftrue UnknownScript_0x19404a iftrue .HaveSquirtbottle
waitsfx waitsfx
playsound SFX_SANDSTORM playsound SFX_SANDSTORM
applymovement ROUTE36_WEIRD_TREE, MovementData_0x194249 applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Shake
end end
UnknownScript_0x19404a: .HaveSquirtbottle:
opentext opentext
writetext UnknownText_0x19426b writetext WeirdTreeText_AskUseBottle
yesorno yesorno
iffalse UnknownScript_0x194079 iffalse DidntWaterSudowoodo
closetext closetext
; fallthrough ; fallthrough
WateredWeirdTreeScript:: WateredWeirdTreeScript::
opentext opentext
writetext UnknownText_0x194290 writetext WeirdTreeText_PlayerUsedBottle
waitbutton waitbutton
closetext closetext
waitsfx waitsfx
playsound SFX_SANDSTORM playsound SFX_SANDSTORM
applymovement ROUTE36_WEIRD_TREE, MovementData_0x194249 applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Shake
opentext opentext
writetext UnknownText_0x1942aa writetext WeirdTreeText_DidntLikeTheBottle
waitbutton waitbutton
closetext closetext
loadwildmon SUDOWOODO, 20 loadwildmon SUDOWOODO, 20
startbattle startbattle
setevent EVENT_FOUGHT_SUDOWOODO setevent EVENT_FOUGHT_SUDOWOODO
if_equal $2, UnknownScript_0x19407b if_equal $2, DidntCatchSudowoodo
disappear ROUTE36_WEIRD_TREE disappear ROUTE36_WEIRD_TREE
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
reloadmapafterbattle reloadmapafterbattle
end end
UnknownScript_0x194079: DidntWaterSudowoodo:
closetext closetext
end end
UnknownScript_0x19407b: DidntCatchSudowoodo:
reloadmapafterbattle reloadmapafterbattle
applymovement ROUTE36_WEIRD_TREE, MovementData_0x19424b applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee
disappear ROUTE36_WEIRD_TREE disappear ROUTE36_WEIRD_TREE
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
special RunCallback_04 special RunCallback_04
special RefreshSprites special RefreshSprites
end end
LassScript_0x19408c: Route36FloriaScript:
faceplayer faceplayer
opentext opentext
checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
iftrue UnknownScript_0x1940b3 iftrue .TalkedToFloriaAtFlowerShop
setevent EVENT_MET_FLORIA setevent EVENT_MET_FLORIA
writetext UnknownText_0x1942f1 writetext Route36FloriaText1
waitbutton waitbutton
closetext closetext
clearevent EVENT_FLORIA_AT_FLOWER_SHOP clearevent EVENT_FLORIA_AT_FLOWER_SHOP
checkcode VAR_FACING checkcode VAR_FACING
if_equal UP, UnknownScript_0x1940ac if_equal UP, .Depart2
applymovement ROUTE36_LASS2, MovementData_0x19424e applymovement ROUTE36_LASS2, Route36FloriaDepartureMovement1
disappear ROUTE36_LASS2 disappear ROUTE36_LASS2
end end
UnknownScript_0x1940ac: .Depart2:
applymovement ROUTE36_LASS2, MovementData_0x194258 applymovement ROUTE36_LASS2, Route36FloriaDepartureMovement2
disappear ROUTE36_LASS2 disappear ROUTE36_LASS2
end end
UnknownScript_0x1940b3: .TalkedToFloriaAtFlowerShop:
writetext UnknownText_0x1943ed writetext Route36FloriaText2
waitbutton waitbutton
closetext closetext
end end
FisherScript_0x1940b9: Route36RockSmashGuyScript:
faceplayer faceplayer
opentext opentext
checkevent EVENT_GOT_TM08_ROCK_SMASH checkevent EVENT_GOT_TM08_ROCK_SMASH
iftrue UnknownScript_0x1940da iftrue .AlreadyGotRockSmash
checkevent EVENT_FOUGHT_SUDOWOODO checkevent EVENT_FOUGHT_SUDOWOODO
iftrue UnknownScript_0x1940cd iftrue .ClearedSudowoodo
writetext UnknownText_0x19446f writetext RockSmashGuyText1
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x1940cd: .ClearedSudowoodo:
writetext UnknownText_0x1944d0 writetext RockSmashGuyText2
buttonsound buttonsound
verbosegiveitem TM_ROCK_SMASH verbosegiveitem TM_ROCK_SMASH
iffalse UnknownScript_0x1940de iffalse .NoRoomForTM
setevent EVENT_GOT_TM08_ROCK_SMASH setevent EVENT_GOT_TM08_ROCK_SMASH
UnknownScript_0x1940da: .AlreadyGotRockSmash:
writetext UnknownText_0x19452c writetext RockSmashGuyText3
waitbutton waitbutton
UnknownScript_0x1940de: .NoRoomForTM:
closetext closetext
end end
@ -160,13 +160,13 @@ LassScript_0x1940e0:
faceplayer faceplayer
opentext opentext
checkevent EVENT_FOUGHT_SUDOWOODO checkevent EVENT_FOUGHT_SUDOWOODO
iftrue UnknownScript_0x1940ee iftrue .ClearedSudowoodo
writetext UnknownText_0x194626 writetext UnknownText_0x194626
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x1940ee: .ClearedSudowoodo:
writetext UnknownText_0x19469e writetext UnknownText_0x19469e
waitbutton waitbutton
closetext closetext
@ -372,16 +372,16 @@ MapRoute36Signpost0Script:
FruitTreeScript_0x194247: FruitTreeScript_0x194247:
fruittree FRUITTREE_ROUTE_36 fruittree FRUITTREE_ROUTE_36
MovementData_0x194249: WeirdTreeMovement_Shake:
db $56 ; movement db $56 ; movement
step_end step_end
MovementData_0x19424b: WeirdTreeMovement_Flee:
fast_jump_step_up fast_jump_step_up
fast_jump_step_up fast_jump_step_up
step_end step_end
MovementData_0x19424e: Route36FloriaDepartureMovement1:
step_down step_down
step_down step_down
step_down step_down
@ -393,7 +393,7 @@ MovementData_0x19424e:
step_left step_left
step_end step_end
MovementData_0x194258: Route36FloriaDepartureMovement2:
step_left step_left
step_down step_down
step_down step_down
@ -405,28 +405,28 @@ MovementData_0x194258:
step_left step_left
step_end step_end
MovementData_0x194262: Route36SuicuneMovement:
db $39 ; movement set_sliding
fast_jump_step_down fast_jump_step_down
fast_jump_step_down fast_jump_step_down
fast_jump_step_down fast_jump_step_down
fast_jump_step_right fast_jump_step_right
fast_jump_step_right fast_jump_step_right
fast_jump_step_right fast_jump_step_right
db $38 ; movement remove_sliding
step_end step_end
UnknownText_0x19426b: WeirdTreeText_AskUseBottle:
text "It's a weird tree." text "It's a weird tree."
line "Use SQUIRTBOTTLE?" line "Use SQUIRTBOTTLE?"
done done
UnknownText_0x194290: WeirdTreeText_PlayerUsedBottle:
text "<PLAYER> used the" text "<PLAYER> used the"
line "SQUIRTBOTTLE." line "SQUIRTBOTTLE."
done done
UnknownText_0x1942aa: WeirdTreeText_DidntLikeTheBottle:
text "The weird tree" text "The weird tree"
line "doesn't like the" line "doesn't like the"
cont "SQUIRTBOTTLE!" cont "SQUIRTBOTTLE!"
@ -435,7 +435,7 @@ UnknownText_0x1942aa:
line "attacked!" line "attacked!"
done done
UnknownText_0x1942f1: Route36FloriaText1:
text "I'm the FLOWER" text "I'm the FLOWER"
line "SHOP's FLORIA!" line "SHOP's FLORIA!"
@ -461,7 +461,7 @@ UnknownText_0x1942f1:
cont "her water bottle!" cont "her water bottle!"
done done
UnknownText_0x1943ed: Route36FloriaText2:
text "When I told my sis" text "When I told my sis"
line "about the jiggly" line "about the jiggly"
@ -475,7 +475,7 @@ UnknownText_0x1943ed:
line "bottle…" line "bottle…"
done done
UnknownText_0x19446f: RockSmashGuyText1:
text "Wa-hey!" text "Wa-hey!"
para "I was going to" para "I was going to"
@ -488,7 +488,7 @@ UnknownText_0x19446f:
line "I'm a failure!" line "I'm a failure!"
done done
UnknownText_0x1944d0: RockSmashGuyText2:
text "Did you clear that" text "Did you clear that"
line "wretched tree?" line "wretched tree?"
@ -502,7 +502,7 @@ UnknownText_0x19451a:
line "TM08." line "TM08."
done done
UnknownText_0x19452c: RockSmashGuyText3:
text "That happens to be" text "That happens to be"
line "ROCK SMASH." line "ROCK SMASH."
@ -678,8 +678,8 @@ Route36_MapEventHeader:
.XYTriggers: .XYTriggers:
db 2 db 2
xy_trigger 1, $7, $14, $0, UnknownScript_0x19401b, $0, $0 xy_trigger 1, $7, $14, $0, Route36SuicuneTrigger, $0, $0
xy_trigger 1, $7, $16, $0, UnknownScript_0x19401b, $0, $0 xy_trigger 1, $7, $16, $0, Route36SuicuneTrigger, $0, $0
.Signposts: .Signposts:
db 4 db 4
@ -694,8 +694,8 @@ Route36_MapEventHeader:
person_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1 person_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1
person_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WeirdTreeScript_0x19403c, EVENT_ROUTE_36_SUDOWOODO person_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WeirdTreeScript_0x19403c, EVENT_ROUTE_36_SUDOWOODO
person_event SPRITE_LASS, 8, 51, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1940e0, -1 person_event SPRITE_LASS, 8, 51, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1940e0, -1
person_event SPRITE_FISHER, 9, 44, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x1940b9, -1 person_event SPRITE_FISHER, 9, 44, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1
person_event SPRITE_FRUIT_TREE, 4, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x194247, -1 person_event SPRITE_FRUIT_TREE, 4, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x194247, -1
person_event SPRITE_YOUNGSTER, 6, 46, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY person_event SPRITE_YOUNGSTER, 6, 46, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
person_event SPRITE_LASS, 12, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO person_event SPRITE_LASS, 12, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO
person_event SPRITE_SUICUNE, 6, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 person_event SPRITE_SUICUNE, 6, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36

20
maps/TinTower1F.asm
View File

@ -243,37 +243,37 @@ MovementData_0x1851cb:
step_end step_end
MovementData_0x1851d0: MovementData_0x1851d0:
db $39 ; movement set_sliding
fast_jump_step_down fast_jump_step_down
db $38 ; movement remove_sliding
step_end step_end
MovementData_0x1851d4: MovementData_0x1851d4:
db $39 ; movement set_sliding
fast_jump_step_down fast_jump_step_down
fast_jump_step_right fast_jump_step_right
fast_jump_step_down fast_jump_step_down
db $38 ; movement remove_sliding
step_end step_end
MovementData_0x1851da: MovementData_0x1851da:
db $39 ; movement set_sliding
fast_jump_step_down fast_jump_step_down
db $38 ; movement remove_sliding
step_end step_end
MovementData_0x1851de: MovementData_0x1851de:
db $39 ; movement set_sliding
fast_jump_step_down fast_jump_step_down
fast_jump_step_left fast_jump_step_left
fast_jump_step_down fast_jump_step_down
db $38 ; movement remove_sliding
step_end step_end
MovementData_0x1851e4: MovementData_0x1851e4:
db $39 ; movement set_sliding
fast_jump_step_down fast_jump_step_down
db $38 ; movement remove_sliding
step_end step_end
MovementData_0x1851e8: MovementData_0x1851e8:

2
misc/mobile_12_2.asm
View File

@ -443,7 +443,7 @@ Function4aad3: ; 4aad3
push bc push bc
push hl push hl
ld e, 0 ld e, 0
callba Function8e83f callba LoadMenuMonIcon
ld a, [hObjectStructIndexBuffer] ld a, [hObjectStructIndexBuffer]
inc a inc a
ld [hObjectStructIndexBuffer], a ld [hObjectStructIndexBuffer], a

6
misc/mobile_22.asm
View File

@ -2216,7 +2216,7 @@ Function89d85: ; 89d85 (22:5d85)
push hl push hl
call Function8923c call Function8923c
call _hl_ call _hl_
call Function3238 call CGBOnly_LoadEDTile
pop hl pop hl
asm_89d90: ; 89d90 (22:5d90) asm_89d90: ; 89d90 (22:5d90)
@ -2661,7 +2661,7 @@ rept 3
endr endr
ld a, $6 ld a, $6
call Function8a5a3 call Function8a5a3
call Function3238 call CGBOnly_LoadEDTile
pop bc pop bc
ld a, c ld a, c
cp $b cp $b
@ -2676,7 +2676,7 @@ endr
ld a, $6 ld a, $6
hlcoord 15, 4, AttrMap hlcoord 15, 4, AttrMap
call Function8a5a3 call Function8a5a3
call Function3238 call CGBOnly_LoadEDTile
jp Function89e36 jp Function89e36
Function8a0a1: ; 8a0a1 (22:60a1) Function8a0a1: ; 8a0a1 (22:60a1)

2
misc/mobile_22_2.asm
View File

@ -401,7 +401,7 @@ Function8b539: ; 8b539 (22:7539)
call Function8b4fd call Function8b4fd
ld e, $0 ld e, $0
call Function89c44 call Function89c44
call Function3238 call CGBOnly_LoadEDTile
ret ret
Function8b555: ; 8b555 (22:7555) Function8b555: ; 8b555 (22:7555)

2
misc/mobile_40.asm
View File

@ -3079,7 +3079,7 @@ Function1013d6: ; 1013d6
; 1013dd ; 1013dd
Function1013dd: ; 1013dd Function1013dd: ; 1013dd
call Function3238 call CGBOnly_LoadEDTile
ret ret
; 1013e1 ; 1013e1

8
misc/mobile_46.asm
View File

@ -5846,12 +5846,12 @@ Function11ad1b: ; 11ad1b
ld [hObjectStructIndexBuffer], a ld [hObjectStructIndexBuffer], a
ld a, $10 ld a, $10
ld [wCurIconTile], a ld [wCurIconTile], a
ld hl, Function8e83f ld hl, LoadMenuMonIcon
ld a, BANK(Function8e83f) ld a, BANK(LoadMenuMonIcon)
ld e, $4 ld e, $4
rst FarCall rst FarCall
ld hl, Function8e83f ld hl, LoadMenuMonIcon
ld a, BANK(Function8e83f) ld a, BANK(LoadMenuMonIcon)
ld e, $5 ld e, $5
rst FarCall rst FarCall
ld hl, $c6d0 ld hl, $c6d0

2
sram.asm
View File

@ -69,7 +69,7 @@ sMysteryGiftTimerStartDay:: ds 1
sMysteryGiftTrainerHouseFlag:: ds 1 sMysteryGiftTrainerHouseFlag:: ds 1
sMysteryGiftPartnerName:: ds NAME_LENGTH sMysteryGiftPartnerName:: ds NAME_LENGTH
s0_ac09:: ds 1 s0_ac09:: ds 1
sMysteryGiftTrainer:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2 sMysteryGiftTrainer:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2 ; ac0a
sBackupMysteryGiftItemEnd:: sBackupMysteryGiftItemEnd::
ds $30 ds $30

47
wram.asm
View File

@ -118,7 +118,7 @@ Channel1JumpCondition:: ds 1
Channel2JumpCondition:: ds 1 Channel2JumpCondition:: ds 1
Channel3JumpCondition:: ds 1 Channel3JumpCondition:: ds 1
Channel4JumpCondition:: ds 1 Channel4JumpCondition:: ds 1
wStereoPanningMask:: ds 1 wStereoPanningMask:: ds 1 ; c2bc
CryTracks:: ; c2bd CryTracks:: ; c2bd
; plays only in left or right track depending on what side the monster is on ; plays only in left or right track depending on what side the monster is on
; both tracks active outside of battle ; both tracks active outside of battle
@ -127,7 +127,7 @@ wSFXDuration:: ds 1
CurSFX:: ; c2bf CurSFX:: ; c2bf
; id of sfx currently playing ; id of sfx currently playing
ds 1 ds 1
ChannelsEnd::
wMapMusic:: ; c2c0 wMapMusic:: ; c2c0
ds 1 ds 1
@ -1328,9 +1328,9 @@ wWindowStackPointer:: dw ; cf71
wMenuJoypad:: ds 1 ; cf73 wMenuJoypad:: ds 1 ; cf73
MenuSelection:: ds 1 ; cf74 MenuSelection:: ds 1 ; cf74
MenuSelectionQuantity:: ds 1 ; cf75 MenuSelectionQuantity:: ds 1 ; cf75
wWhichIndexSet:: ds 1 wWhichIndexSet:: ds 1 ; cf76
wScrollingMenuCursorPosition:: ds 1 wScrollingMenuCursorPosition:: ds 1 ; cf77
wWindowStackSize:: ds 9 wWindowStackSize:: ds 9 ; cf78
; menu data header ; menu data header
wMenuDataHeader:: ; cf81 wMenuDataHeader:: ; cf81
@ -1727,18 +1727,21 @@ CurMoveNum:: ; d0d5
ds 1 ds 1
wLastPocket:: ds 1 wLastPocket:: ds 1
wd0d7:: ds 1
wd0d8:: wPCItemsCursor:: ds 1
wPartyMenuCursor:: ds 1 wPartyMenuCursor:: ds 1
wItemsPocketCursor:: ds 1 wItemsPocketCursor:: ds 1
wKeyItemsPocketCursor:: ds 1 wKeyItemsPocketCursor:: ds 1
wBallsPocketCursor:: ds 1 wBallsPocketCursor:: ds 1
wTMHMPocketCursor:: ds 1 wTMHMPocketCursor:: ds 1
wd0dd:: ds 2
wPCItemsScrollPosition:: ds 1
wPartyMenuScrollPosition:: ds 1 ; unused
wItemsPocketScrollPosition:: ds 1 wItemsPocketScrollPosition:: ds 1
wKeyItemsPocketScrollPosition:: ds 1 wKeyItemsPocketScrollPosition:: ds 1
wBallsPocketScrollPosition:: ds 1 wBallsPocketScrollPosition:: ds 1
wTMHMPocketScrollPosition:: ds 1 wTMHMPocketScrollPosition:: ds 1
wMoveSwapBuffer:: wMoveSwapBuffer::
wSwitchMon:: wSwitchMon::
wSwitchItem:: wSwitchItem::
@ -1764,9 +1767,9 @@ VramState:: ; d0ed
; flickers when climbing waterfall ; flickers when climbing waterfall
ds 1 ds 1
wBattleResult:: ds 1 wBattleResult:: ds 1 ; d0ee
wUsingItemWithSelect:: ds 1 wUsingItemWithSelect:: ds 1 ; d0ef
CurMart:: ds 16 CurMart:: ds 16 ; d0f0
CurMartEnd:: CurMartEnd::
ds CurMart - @ ds CurMart - @
CurElevator:: ds 1 CurElevator:: ds 1
@ -1776,7 +1779,7 @@ wCurMessageIndex:: ds 1
wd0f2:: wd0f2::
wMailboxCount:: ds 1 wMailboxCount:: ds 1
wMailboxItems:: ds MAILBOX_CAPACITY wMailboxItems:: ds MAILBOX_CAPACITY
wMailboxEnd:: ds 1 ; d1fe wMailboxEnd:: ds 1 ; d0fe
ds 2 ds 2
wd100:: ds 1 wd100:: ds 1
@ -1786,9 +1789,7 @@ wd103:: ds 1
wd104:: ds 1 wd104:: ds 1
wd105:: ds 1 wd105:: ds 1
CurItem:: ; d106 CurItem:: ds 1 ; d106
ds 1
CurItemQuantity:: ; d107 CurItemQuantity:: ; d107
wMartItemID:: wMartItemID::
wd107:: ds 1 wd107:: ds 1
@ -2027,7 +2028,9 @@ wd1ee:: ds 1
Buffer6:: Buffer6::
wd1ef:: ds 1 wd1ef:: ds 1
wd1f0:: ds 1 wd1f0:: ds 1
wCurHPBarPixels::
wd1f1:: ds 1 wd1f1:: ds 1
wNewHPBarPixels::
wd1f2:: ds 1 wd1f2:: ds 1
wd1f3:: ds 1 wd1f3:: ds 1
wd1f4:: ds 1 wd1f4:: ds 1
@ -2148,7 +2151,7 @@ wWaterEncounterRate:: ds 1 ; d25d
wListMoves_MoveIndicesBuffer:: ds NUM_MOVES wListMoves_MoveIndicesBuffer:: ds NUM_MOVES
wPutativeTMHMMove:: ds 1 wPutativeTMHMMove:: ds 1
wd263:: ds 1 wd263:: ds 1
wd264:: ds 1 wAISwitch:: ds 1
wFoundMatchingIDInParty:: wFoundMatchingIDInParty::
wNamedObjectIndexBuffer:: wNamedObjectIndexBuffer::
wCurTMHM:: wCurTMHM::
@ -2801,16 +2804,16 @@ wMapData::
VisitedSpawns:: ; dca5 VisitedSpawns:: ; dca5
flag_array NUM_SPAWNS flag_array NUM_SPAWNS
wDigWarp:: ds 1 wDigWarp:: ds 1 ; dcaa
wDigMapGroup:: ds 1 wDigMapGroup:: ds 1 ; dcab
wDigMapNumber:: ds 1 wDigMapNumber:: ds 1 ; dcac
; used on maps like second floor pokécenter, which are reused, so we know which ; used on maps like second floor pokécenter, which are reused, so we know which
; map to return to ; map to return to
BackupWarpNumber:: ; dcac BackupWarpNumber:: ; dcad
ds 1 ds 1
BackupMapGroup:: ; dcad BackupMapGroup:: ; dcae
ds 1 ds 1
BackupMapNumber:: ; dcae BackupMapNumber:: ; dcaf
ds 1 ds 1
ds 3 ds 3