From 4d8528f90329e2ddfac16046ad8bf309ec1887f2 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 22 Jan 2018 14:34:55 -0500 Subject: [PATCH] More engine flag constants --- constants/engine_flags.asm | 2 +- constants/wram_constants.asm | 16 ++++++++++++++++ data/engine_flags.asm | 8 ++++---- engine/battle/core.asm | 4 ++-- engine/caught_data.asm | 2 +- engine/cgb_layouts.asm | 4 ++-- engine/color.asm | 2 +- engine/events/loadfishinggfx.asm | 2 +- engine/events/magnet_train.asm | 2 +- engine/intro_menu.asm | 4 ++-- engine/map_objects.asm | 6 +++--- engine/map_setup.asm | 4 ++-- engine/overworld.asm | 4 ++-- engine/pack.asm | 2 +- engine/player_gfx.asm | 20 ++++++++++---------- engine/player_object.asm | 4 ++-- engine/pokegear.asm | 6 +++--- engine/scripting.asm | 2 +- engine/specials.asm | 2 +- engine/tileset_anims.asm | 8 ++++---- engine/warp_connection.asm | 2 +- home/text.asm | 2 +- maps/AzaleaTown.asm | 2 +- maps/IlexForest.asm | 2 +- mobile/mobile_12.asm | 4 ++-- mobile/mobile_22.asm | 4 ++-- wram.asm | 9 +++++++-- 27 files changed, 75 insertions(+), 54 deletions(-) diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index f28a38fb5..0b5695dd3 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -120,7 +120,7 @@ ; wPlayerGender const ENGINE_PLAYER_IS_FEMALE ; wCelebiEvent - const ENGINE_HAVE_EXAMINED_GS_BALL + const ENGINE_FOREST_IS_RESTLESS ; wDailyRematchFlags const ENGINE_JACK const ENGINE_HUEY diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 5bd6ad80c..dce4ab551 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -105,6 +105,16 @@ DARKNESS EQU 1 << DARKNESS_F ANYTIME EQU MORN | DAY | NITE +; wPlayerSpriteSetupFlags:: ; d45b +PLAYERSPRITESETUP_FACING_MASK EQU %11 +PLAYERSPRITESETUP_FEMALE_TO_MALE_F EQU 2 +PLAYERSPRITESETUP_CUSTOM_FACING_F EQU 5 +PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F EQU 6 +PLAYERSPRITESETUP_RESET_ACTION_F EQU 7 + +; wPlayerGender:: ; d472 +PLAYERGENDER_FEMALE_F EQU 0 + ; ScriptFlags:: ; d434 SCRIPT_RUNNING EQU 2 @@ -185,12 +195,18 @@ PLAYER_SKATE EQU 2 PLAYER_SURF EQU 4 PLAYER_SURF_PIKA EQU 8 +; wCelebiEvent:: ; dbf3 +CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2 + ; wBikeFlags:: ; dbf5 const_def const BIKEFLAGS_STRENGTH_ACTIVE_F ; 0 const BIKEFLAGS_ALWAYS_ON_BIKE_F ; 1 const BIKEFLAGS_DOWNHILL_F ; 2 +; wLuckyNumberShowFlag:: ; dc9d +LUCKYNUMBERSHOW_GAME_OVER_F EQU 0 + ; wDayCareMan:: ; def5 DAYCAREMAN_HAS_MON_F EQU 0 DAYCAREMAN_MONS_COMPATIBLE_F EQU 5 diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 8ad4fb4a3..064f08de3 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -99,7 +99,7 @@ EngineFlags: ; 80462 engine_flag wVisitedSpawns, SPAWN_MT_SILVER engine_flag wVisitedSpawns, NUM_SPAWNS ; unused - engine_flag wLuckyNumberShowFlag, 0 ; lucky number show + engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F engine_flag wStatusFlags2, 3 ; ???? engine_flag wDailyFlags, 0 ; kurt making balls ; $50 @@ -125,9 +125,9 @@ EngineFlags: ; 80462 engine_flag wGameTimerPause, 7 ; $62 - engine_flag wPlayerGender, 0 ; player is female + engine_flag wPlayerGender, PLAYERGENDER_FEMALE_F - engine_flag wCelebiEvent, 2 ; have gs ball after kurt examined it + engine_flag wCelebiEvent, CELEBIEVENT_FOREST_IS_RESTLESS_F ; rematches engine_flag wDailyRematchFlags, 0 ; jack @@ -191,7 +191,7 @@ EngineFlags: ; 80462 engine_flag wDailyPhoneTimeOfDayFlags, 22 ; parry engine_flag wDailyPhoneTimeOfDayFlags, 23 ; erin - engine_flag wPlayerSpriteSetupFlags, 2 ; female player has been transformed into male + engine_flag wPlayerSpriteSetupFlags, PLAYERSPRITESETUP_FEMALE_TO_MALE_F engine_flag wSwarmFlags, 2 ; dunsparce swarm ; $a0 engine_flag wSwarmFlags, 3 ; yanma swarm diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d62e2014b..fd3125420 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -9263,10 +9263,10 @@ GetTrainerBackpic: ; 3fbff ; What gender are we? ld a, [wPlayerSpriteSetupFlags] - bit 2, a ; transformed to male + bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a jr nz, .Chris ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .Chris ; It's a girl. diff --git a/engine/caught_data.asm b/engine/caught_data.asm index 9310b7b90..f194ce1f0 100644 --- a/engine/caught_data.asm +++ b/engine/caught_data.asm @@ -194,7 +194,7 @@ SetBoxmonOrEggmonCaughtData: ; 4db53 call GetWorldMapLocation ld b, a ld a, [wPlayerGender] - rrca + rrca ; shift bit 0 (PLAYERGENDER_FEMALE_F) to bit 7 (CAUGHT_GENDER_MASK) or b ld [hl], a ret diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm index 84fb6c9de..cf43a0607 100644 --- a/engine/cgb_layouts.asm +++ b/engine/cgb_layouts.asm @@ -184,7 +184,7 @@ InitPartyMenuBGPal0: ; 8e9f _CGB_PokegearPals: ; 8eb9 ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .male ld hl, FemalePokegearPals jr .got_pals @@ -821,7 +821,7 @@ _CGB_PackPals: ; 93d3 jr z, .tutorial_male ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .tutorial_male ld hl, .KrisPackPals diff --git a/engine/color.asm b/engine/color.asm index 485125821..0cce49655 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -707,7 +707,7 @@ GetPlayerOrMonPalettePointer: and a jp nz, GetMonNormalOrShinyPalettePointer ld a, [wPlayerSpriteSetupFlags] - bit 2, a ; transformed to male + bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a jr nz, .male ld a, [wPlayerGender] and a diff --git a/engine/events/loadfishinggfx.asm b/engine/events/loadfishinggfx.asm index f67c51d8b..3d3ab0ba0 100644 --- a/engine/events/loadfishinggfx.asm +++ b/engine/events/loadfishinggfx.asm @@ -6,7 +6,7 @@ LoadFishingGFX: ; b84b3 ld de, FishingGFX ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .got_gender ld de, KrisFishingGFX .got_gender diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm index 232372dbd..be3faac28 100755 --- a/engine/events/magnet_train.asm +++ b/engine/events/magnet_train.asm @@ -327,7 +327,7 @@ MagnetTrain_Jumptable: ; 8cdf7 ld a, BANK(wPlayerGender) ld [rSVBK], a ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .got_gender ld b, SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index c9270358b..c825a6216 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -812,7 +812,7 @@ NamePlayer: ; 0x6074 ld hl, PlayerName ld de, .Chris ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .Male ld de, .Kris .Male: @@ -988,7 +988,7 @@ Intro_PlacePlayerSprite: ; 61cd ld b, PAL_OW_RED ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .male ld b, PAL_OW_BLUE .male diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 00ce599e3..398a3ff59 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -2543,7 +2543,7 @@ RefreshPlayerSprite: ; 579d .TryResetPlayerAction: ; 57bc ld hl, wPlayerSpriteSetupFlags - bit 7, [hl] + bit PLAYERSPRITESETUP_RESET_ACTION_F, [hl] jr nz, .ok ret @@ -2555,10 +2555,10 @@ RefreshPlayerSprite: ; 579d .SpawnInCustomFacing: ; 57ca ld hl, wPlayerSpriteSetupFlags - bit 5, [hl] + bit PLAYERSPRITESETUP_CUSTOM_FACING_F, [hl] ret z ld a, [wPlayerSpriteSetupFlags] - and 3 + and PLAYERSPRITESETUP_FACING_MASK add a add a jr ContinueSpawnFacing diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 5e593e04e..d2140c569 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -143,13 +143,13 @@ LoadObjectsRunCallback_02: ; 154d7 DelayClearingOldSprites: ; 154eb ld hl, wPlayerSpriteSetupFlags - set 7, [hl] + set PLAYERSPRITESETUP_RESET_ACTION_F, [hl] ret ; 154f1 DelayLoadingNewSprites: ; 154f1 ld hl, wPlayerSpriteSetupFlags - set 6, [hl] + set PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl] ret CheckReplaceKrisSprite: ; 154f7 diff --git a/engine/overworld.asm b/engine/overworld.asm index 4c379711d..2cac7df02 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -62,10 +62,10 @@ GetPlayerSprite: ; 14183 ; Get Chris or Kris's sprite. ld hl, .Chris ld a, [wPlayerSpriteSetupFlags] - bit 2, a + bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a jr nz, .go ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .go ld hl, .Kris diff --git a/engine/pack.asm b/engine/pack.asm index f9c7490af..da75b71b1 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -1288,7 +1288,7 @@ DrawPackGFX: ; 1089d cp BATTLETYPE_TUTORIAL jr z, .male_dude ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr nz, .female .male_dude ld hl, PackGFXPointers diff --git a/engine/player_gfx.asm b/engine/player_gfx.asm index 21929e32c..28441e700 100644 --- a/engine/player_gfx.asm +++ b/engine/player_gfx.asm @@ -1,7 +1,7 @@ Unreferenced_Function88248: ; 88248 ld c, CAL ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .okay ld c, KAREN @@ -58,7 +58,7 @@ MovePlayerPic: ; 88266 ShowPlayerNamingChoices: ; 88297 ld hl, ChrisNameMenuDataHeader ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .GotGender ld hl, KrisNameMenuDataHeader .GotGender: @@ -76,7 +76,7 @@ GetPlayerNameArray: ; 88318 This Function is never called ld hl, PlayerName ld de, MalePlayerNameArray ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .done ld de, FemalePlayerNameArray @@ -92,7 +92,7 @@ GetPlayerIcon: ; 8832c ld b, BANK(ChrisSpriteGFX) ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .done ; Female @@ -105,7 +105,7 @@ GetPlayerIcon: ; 8832c GetCardPic: ; 8833e ld hl, ChrisCardPic ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .GotClass ld hl, KrisCardPic .GotClass: @@ -131,7 +131,7 @@ INCBIN "gfx/trainer_card/trainer_card.2bpp" GetPlayerBackpic: ; 88825 ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, GetChrisBackpic call GetKrisBackpic ret @@ -150,7 +150,7 @@ HOF_LoadTrainerFrontpic: ; 88840 ld [hBGMapMode], a ld e, 0 ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .GotClass ld e, 1 @@ -159,7 +159,7 @@ HOF_LoadTrainerFrontpic: ; 88840 ld [TrainerClass], a ld de, ChrisPic ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .GotPic ld de, KrisPic @@ -179,7 +179,7 @@ DrawIntroPlayerPic: ; 88874 ; Get class ld e, CHRIS ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .GotClass ld e, KRIS .GotClass: @@ -189,7 +189,7 @@ DrawIntroPlayerPic: ; 88874 ; Load pic ld de, ChrisPic ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .GotPic ld de, KrisPic .GotPic: diff --git a/engine/player_object.asm b/engine/player_object.asm index 802cf6ade..f89a63fb1 100755 --- a/engine/player_object.asm +++ b/engine/player_object.asm @@ -31,10 +31,10 @@ SpawnPlayer: ; 8029 add hl, bc ln e, PAL_NPC_RED, OBJECTTYPE_SCRIPT ld a, [wPlayerSpriteSetupFlags] - bit 2, a + bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a jr nz, .ok ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .ok ln e, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT diff --git a/engine/pokegear.asm b/engine/pokegear.asm index cfb8857fa..86c538253 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -687,7 +687,7 @@ PokegearMap_InitPlayerIcon: ; 9106a depixel 0, 0 ld b, SPRITE_ANIM_INDEX_RED_WALK ld a, [wPlayerGender] - bit 0, a ; ENGINE_PLAYER_IS_FEMALE + bit PLAYERGENDER_FEMALE_F, a jr z, .got_gender ld b, SPRITE_ANIM_INDEX_BLUE_WALK .got_gender @@ -2690,7 +2690,7 @@ Pokedex_GetArea: ; 91d11 push bc ld c, PAL_OW_RED ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .male inc c ; PAL_OW_BLUE .male @@ -2917,7 +2917,7 @@ TownMapPlayerIcon: ; 91fa6 depixel 0, 0 ld b, SPRITE_ANIM_INDEX_RED_WALK ; Male ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .got_gender ld b, SPRITE_ANIM_INDEX_BLUE_WALK ; Female .got_gender diff --git a/engine/scripting.asm b/engine/scripting.asm index c847ed96d..eebebb752 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -2477,7 +2477,7 @@ Script_warpfacing: maskbits NUM_DIRECTIONS ld c, a ld a, [wPlayerSpriteSetupFlags] - set 5, a + set PLAYERSPRITESETUP_CUSTOM_FACING_F, a or c ld [wPlayerSpriteSetupFlags], a ; fall through diff --git a/engine/specials.asm b/engine/specials.asm index 965e3d58b..429b752c3 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -350,7 +350,7 @@ Special_CheckPokerus: ; c419 Special_ResetLuckyNumberShowFlag: ; c422 farcall RestartLuckyNumberCountdown ld hl, wLuckyNumberShowFlag - res 0, [hl] + res LUCKYNUMBERSHOW_GAME_OVER_F, [hl] farcall LoadOrRegenerateLuckyIDNumber ret ; c434 diff --git a/engine/tileset_anims.asm b/engine/tileset_anims.asm index 5113ae9a3..62e84a401 100644 --- a/engine/tileset_anims.asm +++ b/engine/tileset_anims.asm @@ -502,7 +502,7 @@ ForestTreeLeftAnimation: ; fc45c ; Only during the Celebi event. ld a, [wCelebiEvent] - bit 2, a + bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a jr nz, .asm_fc46c ld hl, ForestTreeLeftFrames jr .asm_fc47d @@ -544,7 +544,7 @@ ForestTreeRightAnimation: ; fc4c4 ; Only during the Celebi event. ld a, [wCelebiEvent] - bit 2, a + bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a jr nz, .asm_fc4d4 ld hl, ForestTreeRightFrames jr .asm_fc4eb @@ -579,7 +579,7 @@ ForestTreeLeftAnimation2: ; fc4f2 ; Only during the Celebi event. ld a, [wCelebiEvent] - bit 2, a + bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a jr nz, .asm_fc502 ld hl, ForestTreeLeftFrames jr .asm_fc515 @@ -611,7 +611,7 @@ ForestTreeRightAnimation2: ; fc51c ; Only during the Celebi event. ld a, [wCelebiEvent] - bit 2, a + bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a jr nz, .asm_fc52c ld hl, ForestTreeRightFrames jr .asm_fc545 diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index e15809c04..a16a2885e 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -322,7 +322,7 @@ RefreshMapSprites: ; 1047f0 farcall RefreshPlayerSprite farcall CheckReplaceKrisSprite ld hl, wPlayerSpriteSetupFlags - bit 6, [hl] + bit PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl] jr nz, .skip ld hl, VramState set 0, [hl] diff --git a/home/text.asm b/home/text.asm index 2dbb85f6d..ef8832857 100644 --- a/home/text.asm +++ b/home/text.asm @@ -399,7 +399,7 @@ PlaceGenderedPlayerName:: ; 1252 ld h, b ld l, c ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a ld de, KunSuffixText jr z, PlaceCommandCharacter ld de, ChanSuffixText diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 16889aa51..bb637fa26 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -167,7 +167,7 @@ AzaleaTownCelebiScene: waitbutton verbosegiveitem GS_BALL spriteface AZALEATOWN_KURT_OUTSIDE, LEFT - setflag ENGINE_HAVE_EXAMINED_GS_BALL + setflag ENGINE_FOREST_IS_RESTLESS clearevent EVENT_ILEX_FOREST_LASS setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS setscene 0 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 01351cd84..4d818133f 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -464,7 +464,7 @@ MapIlexForestSignpost4Script: pause 30 spriteface PLAYER, DOWN pause 20 - clearflag ENGINE_HAVE_EXAMINED_GS_BALL + clearflag ENGINE_FOREST_IS_RESTLESS special Special_CelebiShrineEvent loadwildmon CELEBI, 30 startbattle diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index 934afb457..9d08c9284 100755 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -315,7 +315,7 @@ asm_4828d: ; 4828d (12:428d) ld a, [hli] cp $50 jr nz, .asm_482e1 - ld a, $1 + ld a, 1 << PLAYERGENDER_FEMALE_F ld [wPlayerGender], a jr .asm_482f1 .asm_482ed @@ -800,7 +800,7 @@ Function4873c: ; 4873c (12:473c) add B_BUTTON ld [hli], a ; joypad filter ; ld a, [wPlayerGender] - ; xor 1 + ; xor 1 << PLAYERGENDER_FEMALE_F ; inc a ld a, [wPlayerGender] and a diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 618c8a312..e96fd1e8f 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -619,7 +619,7 @@ Function89481: ; 89481 Function89492: ; 89492 (22:5492) ld d, 0 ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a ret z inc d ret @@ -1269,7 +1269,7 @@ Function897d5: ; 897d5 Function89807: ; 89807 (22:5807) ld hl, MobileAdapterGFX + $20 tiles ld a, [wPlayerGender] - bit 0, a + bit PLAYERGENDER_FEMALE_F, a jr z, .asm_89814 ld hl, MobileAdapterGFX + $43 tiles .asm_89814 diff --git a/wram.asm b/wram.asm index efd8345de..8eb667c58 100644 --- a/wram.asm +++ b/wram.asm @@ -2285,7 +2285,9 @@ wXYComparePointer:: dw ; d453 wBattleScriptFlags:: dw ; d459 wPlayerSpriteSetupFlags:: ; d45b ; bit 7: if set, cancel PlayerAction +; bit 6: RefreshMapSprites doesn't reload player sprite ; bit 5: if set, set facing according to bits 0-1 +; bit 2: female player has been transformed into male ; bits 0-1: direction facing db wMapReentryScriptQueueFlag:: db ; d45c MemScriptFlag @@ -2626,7 +2628,9 @@ wCurBox:: db ; db72 ; 8 chars + $50 wBoxNames:: ds BOX_NAME_LENGTH * NUM_BOXES ; db75 -wCelebiEvent:: db +wCelebiEvent:: ; dbf3 +; bit 2: forest is restless + db ds 1 @@ -2720,7 +2724,8 @@ wPhoneList:: ds CONTACT_LIST_SIZE ; dc7c ; dc86 ds 23 -wLuckyNumberShowFlag:: dw ; dc9d +wLuckyNumberShowFlag:: db ; dc9d + ds 1 wLuckyIDNumber:: dw ; dc9f wRepelEffect:: db ; If a Repel is in use, it contains the nr of steps it's still active