diff options
| author | Sylvie <35663410+Rangi42@users.noreply.github.com> | 2024-07-16 13:02:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-16 13:02:54 -0400 |
| commit | 8fafca714c07500d1d87bba224f12cf9cc2c8789 (patch) | |
| tree | 273ca88fcfcd80df9c318c9cb8d17a1f7aa240cb /scripts/PokemonTower7F.asm | |
| parent | Build with RGBDS 0.8.0, though it is not yet required (diff) | |
| download | pokeyellow-8fafca714c07500d1d87bba224f12cf9cc2c8789.tar.gz pokeyellow-8fafca714c07500d1d87bba224f12cf9cc2c8789.tar.xz pokeyellow-8fafca714c07500d1d87bba224f12cf9cc2c8789.zip | |
Identify various flag labels and bit constants (#454)
Diffstat (limited to 'scripts/PokemonTower7F.asm')
| -rw-r--r-- | scripts/PokemonTower7F.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/PokemonTower7F.asm b/scripts/PokemonTower7F.asm index 85cc4309..be9aacd9 100644 --- a/scripts/PokemonTower7F.asm +++ b/scripts/PokemonTower7F.asm @@ -23,8 +23,8 @@ PokemonTower7F_ScriptPointers: dw_const PokemonTower7FWarpToMrFujiHouseScript, SCRIPT_POKEMONTOWER7F_WARP_TO_MR_FUJI_HOUSE PokemonTower7FEndBattleScript: - ld hl, wFlags_0xcd60 - res 0, [hl] + ld hl, wMiscFlags + res BIT_SEEN_BY_TRAINER, [hl] ld a, [wIsInBattle] cp $ff jp z, PokemonTower7FSetDefaultScript @@ -41,8 +41,8 @@ PokemonTower7FEndBattleScript: ret PokemonTower7FHideNPCScript: - ld a, [wd730] - bit 0, a + ld a, [wStatusFlags5] + bit BIT_SCRIPTED_NPC_MOVEMENT, a ret nz ld hl, wMissableObjectList ld a, [wSpriteIndex] @@ -78,8 +78,8 @@ PokemonTower7FWarpToMrFujiHouseScript: ld [wDestinationWarpID], a ld a, LAVENDER_TOWN ld [wLastMap], a - ld hl, wd72d - set 3, [hl] + ld hl, wStatusFlags3 + set BIT_WARP_FROM_CUR_SCRIPT, [hl] ld a, SCRIPT_POKEMONTOWER7F_DEFAULT ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a |