diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/decorations.asm | 12 | ||||
| -rwxr-xr-x | engine/events/pokecenter_pc.asm | 62 | ||||
| -rw-r--r-- | engine/events/std_scripts.asm | 12 | ||||
| -rwxr-xr-x | engine/mail.asm | 2 | ||||
| -rw-r--r-- | engine/specials.asm | 4 |
5 files changed, 46 insertions, 46 deletions
diff --git a/engine/decorations.asm b/engine/decorations.asm index 413a049a2..9c00f51b1 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -5,7 +5,7 @@ InitDecorations: ; 26751 (9:6751) ld [Poster], a ret -_KrisDecorationMenu: ; 0x2675c +_PlayerDecorationMenu: ; 0x2675c ld a, [wWhichIndexSet] push af ld hl, .MenuDataHeader @@ -1233,7 +1233,7 @@ SetPosterVisibility: ; 27027 ld b, RESET_FLAG .ok - ld de, EVENT_KRISS_ROOM_POSTER + ld de, EVENT_PLAYERS_ROOM_POSTER jp EventFlagAction ; 27037 @@ -1249,19 +1249,19 @@ SetDecorationTile: ; 27037 ; 27043 Special_ToggleDecorationsVisibility: ; 27043 - ld de, EVENT_KRISS_HOUSE_2F_CONSOLE + ld de, EVENT_PLAYERS_HOUSE_2F_CONSOLE ld hl, VariableSprites + SPRITE_CONSOLE - SPRITE_VARS ld a, [Console] call ToggleDecorationVisibility - ld de, EVENT_KRISS_HOUSE_2F_DOLL_1 + ld de, EVENT_PLAYERS_HOUSE_2F_DOLL_1 ld hl, VariableSprites + SPRITE_DOLL_1 - SPRITE_VARS ld a, [LeftOrnament] call ToggleDecorationVisibility - ld de, EVENT_KRISS_HOUSE_2F_DOLL_2 + ld de, EVENT_PLAYERS_HOUSE_2F_DOLL_2 ld hl, VariableSprites + SPRITE_DOLL_2 - SPRITE_VARS ld a, [RightOrnament] call ToggleDecorationVisibility - ld de, EVENT_KRISS_HOUSE_2F_BIG_DOLL + ld de, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL ld hl, VariableSprites + SPRITE_BIG_DOLL - SPRITE_VARS ld a, [BigDoll] call ToggleDecorationVisibility diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index 75d2d5392..213427119 100755 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -171,7 +171,7 @@ PC_WaitPlaySFX: ; 156d0 ret ; 156d9 -_KrissHousePC: ; 156d9 +_PlayersHousePC: ; 156d9 call PC_PlayBootSound ld hl, UnknownText_0x156ff call PC_DisplayText @@ -212,7 +212,7 @@ Function15715: ; 15715 xor a ld [wPCItemsCursor], a ld [wPCItemsScrollPosition], a - ld hl, KrissPCMenuData + ld hl, PlayersPCMenuData call LoadMenuDataHeader .asm_15722 call UpdateTimePals @@ -230,28 +230,28 @@ Function15715: ; 15715 ret ; 15736 -KrissPCMenuData: ; 0x15736 +PlayersPCMenuData: ; 0x15736 db MENU_BACKUP_TILES ; flags db 0, 0 ; top left corner coords (y, x) db 12, 15 ; bottom right corner coords (y, x) - dw .KrissPCMenuData2 + dw .PlayersPCMenuData2 db 1 ; default selected option -.KrissPCMenuData2: +.PlayersPCMenuData2: db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 0 ; # items? - dw .KrissPCMenuList1 + dw .PlayersPCMenuList1 dw PlaceNthMenuStrings - dw .KrissPCMenuPointers + dw .PlayersPCMenuPointers -.KrissPCMenuPointers: ; 0x15746 - dw KrisWithdrawItemMenu, .WithdrawItem - dw KrisDepositItemMenu, .DepositItem - dw KrisTossItemMenu, .TossItem - dw KrisMailBoxMenu, .MailBox - dw KrisDecorationMenu, .Decoration - dw KrisLogOffMenu, .LogOff - dw KrisLogOffMenu, .TurnOff +.PlayersPCMenuPointers: ; 0x15746 + dw PlayerWithdrawItemMenu, .WithdrawItem + dw PlayerDepositItemMenu, .DepositItem + dw PlayerTossItemMenu, .TossItem + dw PlayerMailBoxMenu, .MailBox + dw PlayerDecorationMenu, .Decoration + dw PlayerLogOffMenu, .LogOff + dw PlayerLogOffMenu, .TurnOff .WithdrawItem: db "WITHDRAW ITEM@" .DepositItem: db "DEPOSIT ITEM@" @@ -269,7 +269,7 @@ DECORATION EQU 4 TURN_OFF EQU 5 LOG_OFF EQU 6 -.KrissPCMenuList1: +.PlayersPCMenuList1: db 5 db WITHDRAW_ITEM db DEPOSIT_ITEM @@ -278,7 +278,7 @@ LOG_OFF EQU 6 db TURN_OFF db -1 -.KrissPCMenuList2: +.PlayersPCMenuList2: db 6 db WITHDRAW_ITEM db DEPOSIT_ITEM @@ -305,7 +305,7 @@ UnknownText_0x157cc: ; 0x157cc db "@" ; 0x157d1 -KrisWithdrawItemMenu: ; 0x157d1 +PlayerWithdrawItemMenu: ; 0x157d1 call LoadStandardMenuDataHeader farcall ClearPCItemScreen .loop @@ -370,18 +370,18 @@ KrisWithdrawItemMenu: ; 0x157d1 ret .HowManyText: ; 0x15850 - text_jump _KrissPCHowManyWithdrawText + text_jump _PlayersPCHowManyWithdrawText db "@" .WithdrewText: ; 0x15855 - text_jump _KrissPCWithdrewItemsText + text_jump _PlayersPCWithdrewItemsText db "@" .NoRoomText: ; 0x1585a - text_jump _KrissPCNoRoomWithdrawText + text_jump _PlayersPCNoRoomWithdrawText db "@" -KrisTossItemMenu: ; 0x1585f +PlayerTossItemMenu: ; 0x1585f call LoadStandardMenuDataHeader farcall ClearPCItemScreen .loop @@ -397,8 +397,8 @@ KrisTossItemMenu: ; 0x1585f ret ; 0x1587d -KrisDecorationMenu: ; 0x1587d - farcall _KrisDecorationMenu +PlayerDecorationMenu: ; 0x1587d + farcall _PlayerDecorationMenu ld a, c and a ret z @@ -406,13 +406,13 @@ KrisDecorationMenu: ; 0x1587d ret ; 0x15888 -KrisLogOffMenu: ; 0x15888 +PlayerLogOffMenu: ; 0x15888 xor a scf ret ; 0x1588b -KrisDepositItemMenu: ; 0x1588b +PlayerDepositItemMenu: ; 0x1588b call .CheckItemsInBag jr c, .nope call DisableSpriteUpdates @@ -532,19 +532,19 @@ KrisDepositItemMenu: ; 0x1588b ret .HowManyText: ; 0x1596e - text_jump _KrissPCHowManyDepositText + text_jump _PlayersPCHowManyDepositText db "@" .DepositText: ; 0x15973 - text_jump _KrissPCDepositItemsText + text_jump _PlayersPCDepositItemsText db "@" .NoRoomText: ; 0x15978 - text_jump _KrissPCNoRoomDepositText + text_jump _PlayersPCNoRoomDepositText db "@" -KrisMailBoxMenu: ; 0x1597d - farcall _KrisMailBoxMenu +PlayerMailBoxMenu: ; 0x1597d + farcall _PlayerMailBoxMenu xor a ret ; 0x15985 diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index e4dd586b0..eff1ab8f6 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -539,10 +539,10 @@ InitializeEventsScript: setevent EVENT_MAHOGANY_MART_OWNERS setevent EVENT_TIN_TOWER_ROOF_HO_OH setevent EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA - setevent EVENT_KRISS_HOUSE_2F_CONSOLE - setevent EVENT_KRISS_HOUSE_2F_DOLL_1 - setevent EVENT_KRISS_HOUSE_2F_DOLL_2 - setevent EVENT_KRISS_HOUSE_2F_BIG_DOLL + setevent EVENT_PLAYERS_HOUSE_2F_CONSOLE + setevent EVENT_PLAYERS_HOUSE_2F_DOLL_1 + setevent EVENT_PLAYERS_HOUSE_2F_DOLL_2 + setevent EVENT_PLAYERS_HOUSE_2F_BIG_DOLL setevent EVENT_DECO_BED_1 setevent EVENT_DECO_PLANT_4 setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN @@ -576,7 +576,7 @@ InitializeEventsScript: setevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS setevent EVENT_DRAGON_SHRINE_CLAIR setevent EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER - setevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR + setevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR setevent EVENT_AZALEA_TOWN_KURT setevent EVENT_AZALEA_TOWN_KURT setevent EVENT_ILEX_FOREST_KURT @@ -585,7 +585,7 @@ InitializeEventsScript: setevent EVENT_GOLDENROD_SALE_OFF setevent EVENT_ECRUTEAK_CITY_GRAMPS setevent EVENT_EUSINE_IN_BURNED_TOWER - setevent EVENT_KRISS_HOUSE_MOM_2 + setevent EVENT_PLAYERS_HOUSE_MOM_2 setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 setevent EVENT_CIANWOOD_CITY_EUSINE setevent EVENT_TIN_TOWER_1F_EUSINE diff --git a/engine/mail.asm b/engine/mail.asm index 68b16fd10..d2649bdc5 100755 --- a/engine/mail.asm +++ b/engine/mail.asm @@ -310,7 +310,7 @@ IsAnyMonHoldingMail: ; 44781 ret ; 447a0 -_KrisMailBoxMenu: ; 0x447a0 +_PlayerMailBoxMenu: ; 0x447a0 call InitMail jr z, .nomail call LoadStandardMenuDataHeader diff --git a/engine/specials.asm b/engine/specials.asm index 429b752c3..0cf0948e7 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -129,10 +129,10 @@ Special_DisplayLinkRecord: ; c2da ret ; c2e7 -Special_KrissHousePC: ; c2e7 +Special_PlayersHousePC: ; c2e7 xor a ld [ScriptVar], a - farcall _KrissHousePC + farcall _PlayersHousePC ld a, c ld [ScriptVar], a ret |