Finished the decoration attributes table

Interpretation of the Decoration Attributes table is complete.

Other changes include some more event flag and function naming, as well as a minor tweak to the person_events of every map.

battle/core.asm

@@ -7607,7 +7607,7 @@ Function3ee3b: ; 3ee3b
 	ld [hBGMapMode], a
 
 .asm_3f035
-	callba Function2709e
+	callba LevelUpHappinessMod
 	ld a, [CurBattleMon]
 	ld b, a
 	ld a, [CurPartyMon]

constants.asm

@@ -24,3 +24,4 @@ INCLUDE "constants/gfx_constants.asm"
 INCLUDE "constants/pokemon_data_constants.asm"
 INCLUDE "constants/misc_constants.asm"
 INCLUDE "constants/std_constants.asm"
+INCLUDE "constants/deco_constants.asm"

constants/deco_constants.asm

@@ -0,0 +1,105 @@
+const_value = 1
+	const DECO_PLANT
+	const DECO_BED
+	const DECO_CARPET
+	const DECO_POSTER
+	const DECO_DOLL
+	const DECO_BIGDOLL
+
+const_value = 1
+	const PUT_IT_AWAY
+	const MAGNAPLANT
+	const TROPICPLANT
+	const JUMBOPLANT
+	const TOWN_MAP_D
+	const FAMICOM
+	const SUPER_NES
+	const NINTENDO_64
+	const VIRTUAL_BOY
+	const GOLD_TROPHY
+	const SILVER_TROPHY
+	const SURF_PIKA_DOLL
+	const _BED
+	const _CARPET
+	const _POSTER
+	const _DOLL
+	const BIG_
+	const FEATHERY_BED
+	const PIKACHU_BED
+	const PINK_BED
+	const POLKADOT_BED
+	const RED_CARPET
+	const BLUE_CARPET
+	const YELLOW_CARPET
+	const GREEN_CARPET
+
+const_value = 1
+	const SET_UP_BED
+	const PUT_AWAY_BED
+	const SET_UP_CARPET
+	const PUT_AWAY_CARPET
+	const SET_UP_PLANT
+	const PUT_AWAY_PLANT
+	const SET_UP_POSTER
+	const PUT_AWAY_POSTER
+	const SET_UP_CONSOLE
+	const PUT_AWAY_CONSOLE
+	const SET_UP_BIG_DOLL
+	const PUT_AWAY_BIG_DOLL
+	const SET_UP_DOLL
+	const PUT_AWAY_DOLL
+	const SET_UP_ORNAMENT
+	const PUT_AWAY_ORNAMENT
+
+const_value = 2
+	const DECO_FEATHERY_BED ; 2
+	const DECO_PINK_BED ; 3
+	const DECO_POLKADOT_BED ; 4
+	const DECO_PIKACHU_BED ; 5
+const_value = const_value + 1
+	const DECO_RED_CARPET ; 7
+	const DECO_BLUE_CARPET ; 8
+	const DECO_YELLOW_CARPET ; 9
+	const DECO_GREEN_CARPET ; a
+const_value = const_value + 1
+	const DECO_MAGNAPLANT ; c
+	const DECO_TROPICPLANT ; d
+	const DECO_JUMBOPLANT ; e
+const_value = const_value + 1
+	const DECO_TOWN_MAP ; 10
+	const DECO_PIKACHU_POSTER ; 11
+	const DECO_CLEFAIRY_POSTER ; 12
+	const DECO_JIGGLYPUFF_POSTER ; 13
+const_value = const_value + 1
+	const DECO_FAMICOM ; 15
+	const DECO_SNES ; 16
+	const DECO_N64 ; 17
+	const DECO_VIRTUAL_BOY ; 18
+const_value = const_value + 1
+	const DECO_BIG_SNORLAX_DOLL ; 1a
+	const DECO_BIG_ONIX_DOLL ; 1b
+	const DECO_BIG_LAPRAS_DOLL ; 1c
+const_value = const_value + 1
+	const DECO_PIKACHU_DOLL ; 1e
+	const DECO_SURF_PIKACHU_DOLL ; 1f
+	const DECO_CLEFAIRY_DOLL ; 20
+	const DECO_JIGGLYPUFF_DOLL ; 21
+	const DECO_BULBASAUR_DOLL ; 22
+	const DECO_CHARMANDER_DOLL ; 23
+	const DECO_SQUIRTLE_DOLL ; 24
+	const DECO_POLIWAG_DOLL ; 25
+	const DECO_DIGLETT_DOLL ; 26
+	const DECO_STARMIE_DOLL ; 27
+	const DECO_MAGIKARP_DOLL ; 28
+	const DECO_ODDISH_DOLL ; 29
+	const DECO_GENGAR_DOLL ; 2a
+	const DECO_SHELLDER_DOLL ; 2b
+	const DECO_GRIMER_DOLL ; 2c
+	const DECO_VOLTORB_DOLL ; 2d
+	const DECO_WEEDLE_DOLL ; 2e
+	const DECO_UNOWN_DOLL ; 2f
+	const DECO_GEODUDE_DOLL ; 30
+	const DECO_MACHOP_DOLL ; 31
+	const DECO_TENTACOOL_DOLL ; 32
+	const DECO_GOLD_TROPHY_DOLL ; 33
+	const DECO_SILVER_TROPHY_DOLL ; 34

constants/event_flags.asm

@@ -55,7 +55,7 @@
 	const EVENT_033
 	const EVENT_034
 	const EVENT_035
-	const EVENT_036
+	const EVENT_INITIALIZED_EVENTS
 	const EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS
 	const EVENT_038
 	const EVENT_039
@@ -642,7 +642,7 @@
 	const EVENT_TODD_ASKED_FOR_PHONE_NUMBER
 	const EVENT_27E
 	const EVENT_GINA_ASKED_FOR_PHONE_NUMBER
-	const EVENT_280
+	const EVENT_280 ; 280
 	const EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER
 	const EVENT_282
 	const EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER
@@ -658,7 +658,7 @@
 	const EVENT_DEREK_ASKED_FOR_PHONE_NUMBER
 	const EVENT_28E
 	const EVENT_TULLY_ASKED_FOR_PHONE_NUMBER
-	const EVENT_290
+	const EVENT_290 ; 290
 	const EVENT_BRENT_ASKED_FOR_PHONE_NUMBER
 	const EVENT_292
 	const EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER
@@ -674,56 +674,56 @@
 	const EVENT_ERIN_ASKED_FOR_PHONE_NUMBER
 	const EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
 	const EVENT_29F
-	const EVENT_2A0
+	const EVENT_2A0 ; 2a0
 	const EVENT_2A1
 	const EVENT_2A2
 	const EVENT_2A3
-	const EVENT_2A4
+	const EVENT_DECO_BED_1
-	const EVENT_2A5
+	const EVENT_DECO_BED_2
-	const EVENT_2A6
+	const EVENT_DECO_BED_3
-	const EVENT_2A7
+	const EVENT_DECO_BED_4
-	const EVENT_2A8
+	const EVENT_DECO_CARPET_1
-	const EVENT_2A9
+	const EVENT_DECO_CARPET_2
-	const EVENT_2AA
+	const EVENT_DECO_CARPET_3
-	const EVENT_2AB
+	const EVENT_DECO_CARPET_4
-	const EVENT_2AC
+	const EVENT_DECO_PLANT_1
-	const EVENT_2AD
+	const EVENT_DECO_PLANT_2
-	const EVENT_2AE
+	const EVENT_DECO_PLANT_3
-	const EVENT_2AF
+	const EVENT_DECO_PLANT_4
-	const EVENT_2B0
+	const EVENT_DECO_POSTER_1 ; 2b0
-	const EVENT_2B1
+	const EVENT_DECO_POSTER_2
-	const EVENT_2B2
+	const EVENT_DECO_POSTER_3
-	const EVENT_2B3
+	const EVENT_DECO_FAMICOM
-	const EVENT_2B4
+	const EVENT_DECO_SNES
-	const EVENT_2B5
+	const EVENT_DECO_N64
-	const EVENT_2B6
+	const EVENT_DECO_VIRTUAL_BOY
-	const EVENT_2B7
+	const EVENT_DECO_PIKACHU_DOLL
-	const EVENT_2B8
+	const EVENT_DECO_SURFING_PIKACHU_DOLL
-	const EVENT_2B9
+	const EVENT_DECO_CLEFAIRY_DOLL
-	const EVENT_2BA
+	const EVENT_DECO_JIGGLYPUFF_DOLL
-	const EVENT_2BB
+	const EVENT_DECO_BULBASAUR_DOLL
-	const EVENT_2BC
+	const EVENT_DECO_CHARMANDER_DOLL
-	const EVENT_2BD
+	const EVENT_DECO_SQUIRTLE_DOLL
-	const EVENT_2BE
+	const EVENT_DECO_POLIWAG_DOLL
-	const EVENT_2BF
+	const EVENT_DECO_DIGLETT_DOLL
-	const EVENT_2C0
+	const EVENT_DECO_STARMIE_DOLL ; 2c0
-	const EVENT_2C1
+	const EVENT_DECO_MAGIKARP_DOLL
-	const EVENT_2C2
+	const EVENT_DECO_ODDISH_DOLL
-	const EVENT_2C3
+	const EVENT_DECO_GENGAR_DOLL
-	const EVENT_2C4
+	const EVENT_DECO_SHELLDER_DOLL
-	const EVENT_2C5
+	const EVENT_DECO_GRIMER_DOLL
-	const EVENT_2C6
+	const EVENT_DECO_VOLTORB_DOLL
-	const EVENT_2C7
+	const EVENT_DECO_WEEDLE_DOLL
-	const EVENT_2C8
+	const EVENT_DECO_UNOWN_DOLL
-	const EVENT_2C9
+	const EVENT_DECO_GEODUDE_DOLL
-	const EVENT_2CA
+	const EVENT_DECO_MACHOP_DOLL
-	const EVENT_2CB
+	const EVENT_DECO_TENTACOOL_DOLL
 	const EVENT_KRISS_ROOM_POSTER
-	const EVENT_2CD
+	const EVENT_DECO_GOLD_TROPHY
-	const EVENT_2CE
+	const EVENT_DECO_SILVER_TROPHY
-	const EVENT_2CF
+	const EVENT_DECO_BIG_SNORLAX_DOLL
-	const EVENT_2D0 ; 2d0
+	const EVENT_DECO_BIG_ONIX_DOLL ; 2d0
-	const EVENT_2D1
+	const EVENT_DECO_BIG_LAPRAS_DOLL
 	const EVENT_2D2
 	const EVENT_SWITCH_1
 	const EVENT_SWITCH_2

constants/map_constants.asm

@@ -718,17 +718,16 @@ const_value SET 1
 	const MAPOBJECT_FLAG_HI ; d
 	const MAPOBJECT_E ; unused
 	const MAPOBJECT_F ; unused
-	
+
-MAPOBJECT_NOT_VISIBLE EQU -1
 MAPOBJECT_SCREEN_HEIGHT EQU 11
 MAPOBJECT_SCREEN_WIDTH EQU 12
 OBJECT_STRUCT_3_DATA_WIDTH EQU 6
 OBJECT_STRUCT_3_DATA_HEIGHT EQU 37
 
 OW_DOWN  EQU $0
-OW_RIGHT EQU $4
+OW_UP    EQU $4
-OW_UP    EQU $8
+OW_LEFT  EQU $8
-OW_LEFT  EQU $c
+OW_RIGHT EQU $c
 
 	const_def
 	const EMOTE_SHOCK ; 0

constants/misc_constants.asm

@@ -103,66 +103,3 @@ const_value = 1
 	const MOM_ITEM
 	const MOM_DOLL
 
-	const_def
-	const DECO_BED
-	const DECO_CARPET
-	const DECO_PLANT
-	const DECO_POSTER
-	const DECO_CONSOLE
-	const DECO_ORNAMENT
-	const DECO_BIGDOLL
-
-	const_def
-	const CARPET_00
-	const CARPET_01
-	const PLANT_02
-	const PLANT_03
-	const PLANT_04
-	const PLANT_05
-	const CARPET_06
-	const POSTER_07
-	const POSTER_08
-	const POSTER_09
-	const POSTER_0A
-	const CARPET_0B
-	const CARPET_0C
-	const CARPET_0D
-	const CARPET_0E
-	const CARPET_0F
-	const CARPET_10
-	const CONSOLE_11
-	const CONSOLE_12
-	const CONSOLE_13
-	const CARPET_14
-	const CARPET_FAMICOM
-	const CONSTENT_SNES
-	const CARPET_N64
-	const CARPET_VIRTUAL_BOY
-	const CARPET_19
-	const BIGDOLL_SNORLAX
-	const BIGDOLL_ONIX
-	const BIGDOLL_LAPRAS
-	const CARPET_1D
-	const DOLL_PIKACHU
-	const DOLL_SURFING_PIKACHU
-	const DOLL_CLEFAIRY
-	const DOLL_JIGGLYPUFF
-	const DOLL_BULBASAUR
-	const DOLL_CHARMANDER
-	const DOLL_SQUIRTLE
-	const DOLL_POLIWAG
-	const DOLL_DIGLETT
-	const DOLL_STARMIE
-	const DOLL_MAGIKARP
-	const DOLL_ODDISH
-	const DOLL_GENGAR
-	const DOLL_SHELLDER
-	const DOLL_GRIMER
-	const DOLL_VOLTORM
-	const DOLL_WEEDLE
-	const DOLL_UNOWN
-	const DOLL_GEODUDE
-	const DOLL_MACHOP
-	const DOLL_TENTACOOL
-	const CARPET_GOLD_TROPHY
-	const CARPET_SILVER_TROPHY

engine/map_objects.asm

@@ -2780,7 +2780,7 @@ Function5629: ; 5629
 	ld hl, MAPOBJECT_OBJECT_STRUCT_ID
 	add hl, bc
 	ld a, [hl]
-	cp MAPOBJECT_NOT_VISIBLE
+	cp -1
 	ret z
 	cp $d
 	ret nc

engine/specials.asm

@@ -91,7 +91,7 @@ SpecialsPointers:: ; c029
 	add_special Function17440
 	add_special Special_SelectRandomBugContestContestants
 	add_special Functionc3fc
-	add_special Function26feb
+	add_special ToggleMaptileDecorations
 	add_special ToggleDecorationsVisibility
 	add_special SpecialGiveShuckle
 	add_special SpecialReturnShuckle
@@ -265,7 +265,7 @@ Functionc298: ; c298
 SpecialNameRival: ; 0xc29d
 	ld b, $2 ; rival
 	ld de, RivalName
-	callba Function116b7
+	callba _NamingScreen
 	; default to "SILVER"
 	ld hl, RivalName
 	ld de, DefaultRivalName

engine/std_scripts.asm

@@ -542,8 +542,8 @@ InitializeEventsScript:
 	setevent EVENT_KRISS_HOUSE_2F_DOLL_1
 	setevent EVENT_KRISS_HOUSE_2F_DOLL_2
 	setevent EVENT_KRISS_HOUSE_2F_BIG_DOLL
-	setevent EVENT_2A4
+	setevent EVENT_DECO_BED_1
-	setevent EVENT_2AF
+	setevent EVENT_DECO_PLANT_4
 	setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
 	setevent EVENT_OLIVINE_GYM_JASMINE
 	setevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
@@ -617,7 +617,7 @@ InitializeEventsScript:
 	setevent EVENT_MT_MOON_SQUARE_CLEFAIRY
 	setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION
 	setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
-	setevent EVENT_036
+	setevent EVENT_INITIALIZED_EVENTS
 	return
 
 AskNumber1MScript:

event/move_deleter.asm

@@ -5,7 +5,7 @@ MoveDeletion:
 	jr c, .asm_2c5c3
 	ld hl, UnknownText_0x2c5f4
 	call PrintText
-	callba Function50000
+	callba SelectMonFromParty
 	jr c, .asm_2c5c3
 	ld a, [CurPartySpecies]
 	cp EGG

event/name_rater.asm

@@ -1,24 +1,31 @@
 NameRater: ; fb6ed
-	ld hl, UnknownText_0xfb80f
+; Introduce himself
+	ld hl, NameRaterIntroText
 	call PrintText
 	call YesNoBox
-	jp c, .asm_fb77e
+	jp c, .cancel
-	ld hl, UnknownText_0xfb814
+; Select a Pokemon from your party
+	ld hl, NameRaterWhichMonText
 	call PrintText
-	callba Function50000
+	callba SelectMonFromParty
-	jr c, .asm_fb77e
+	jr c, .cancel
+; He can't rename an egg...
 	ld a, [CurPartySpecies]
 	cp EGG
-	jr z, .asm_fb783
+	jr z, .egg
+; ... or a Pokemon you got from a trade.
 	call GetCurNick
-	call Functionfb78a
+	call CheckIfMonIsYourOT
-	jr c, .asm_fb779
+	jr c, .traded
-	ld hl, UnknownText_0xfb819
+; This name is good, but we can do better.  How about it?
+	ld hl, NameRaterIsGoodText
 	call PrintText
 	call YesNoBox
-	jr c, .asm_fb77e
+	jr c, .cancel
-	ld hl, UnknownText_0xfb81e
+; What name shall I give it then?
+	ld hl, NameRaterWhichNameText
 	call PrintText
+; Load the new nickname into StringBuffer2
 	xor a
 	ld [MonType], a
 	ld a, [CurPartySpecies]
@@ -27,148 +34,156 @@ NameRater: ; fb6ed
 	call GetBaseData
 	ld b, 0
 	ld de, StringBuffer2
-	callba Function116b7
+	callba _NamingScreen
-	call Functionfb7be
+; If the new name is empty, treat it as unchanged.
-	ld hl, UnknownText_0xfb837
+	call IsNewNameEmpty
-	jr c, .asm_fb76c
+	ld hl, NameRaterSameAsBeforeText
-	call Functionfb7d3
+	jr c, .samename
-	ld hl, UnknownText_0xfb837
+; If the new name is the same as the old name, treat it as unchanged.
-	jr c, .asm_fb76c
+	call CompareNewToOld
+	ld hl, NameRaterSameAsBeforeText
+	jr c, .samename
+; Copy the new name from StringBuffer2
 	ld hl, PartyMonNicknames
-	ld bc, $000b
+	ld bc, PKMN_NAME_LENGTH
 	ld a, [CurPartyMon]
 	call AddNTimes
 	ld e, l
 	ld d, h
 	ld hl, StringBuffer2
-	ld bc, $000b
+	ld bc, PKMN_NAME_LENGTH
 	call CopyBytes
-	ld hl, UnknownText_0xfb823
+	ld hl, NameRaterEvenBetterText
 
-.asm_fb76c
+.samename
 	push hl
 	call GetCurNick
-	ld hl, UnknownText_0xfb83c
+	ld hl, NameRaterDoneText
 	call PrintText
 	pop hl
-	jr .asm_fb786
+	jr .done
 
-.asm_fb779
+.traded
-	ld hl, UnknownText_0xfb82d
+	ld hl, NameRaterTradedText
-	jr .asm_fb786
+	jr .done
 
-.asm_fb77e
+.cancel
-	ld hl, UnknownText_0xfb828
+	ld hl, NameRaterCancelText
-	jr .asm_fb786
+	jr .done
 
-.asm_fb783
+.egg
-	ld hl, UnknownText_0xfb832
+	ld hl, NameRaterEggText
 
-.asm_fb786
+.done
 	call PrintText
 	ret
 ; fb78a
 
-Functionfb78a: ; fb78a
+CheckIfMonIsYourOT: ; fb78a
+; Checks to see if the partymon loaded in [CurPartyMon] has the different OT as you.  Returns carry if not.
 	ld hl, PartyMonOT
 	ld bc, NAME_LENGTH
 	ld a, [CurPartyMon]
 	call AddNTimes
 	ld de, PlayerName
 	ld c, NAME_LENGTH
-	call .asm_fb7b1
+	call .loop
-	jr c, .asm_fb7bc
+	jr c, .nope
+
 	ld hl, PartyMon1ID
 	ld bc, PartyMon2 - PartyMon1
 	ld a, [CurPartyMon]
 	call AddNTimes
 	ld de, PlayerID
-	ld c, $2
+	ld c, 2 ; number of bytes in which your ID is stored
-.asm_fb7b1
+.loop
 	ld a, [de]
 	cp [hl]
-	jr nz, .asm_fb7bc
+	jr nz, .nope
 	inc hl
 	inc de
 	dec c
-	jr nz, .asm_fb7b1
+	jr nz, .loop
 	and a
 	ret
 
-.asm_fb7bc
+.nope
 	scf
 	ret
 ; fb7be
 
-Functionfb7be: ; fb7be
+IsNewNameEmpty: ; fb7be
+; Checks to see if the nickname loaded in StringBuffer2 is empty.  If so, return carry.
 	ld hl, StringBuffer2
-	ld c, 10
+	ld c, PKMN_NAME_LENGTH - 1
-.asm_fb7c3
+.loop
 	ld a, [hli]
 	cp "@"
-	jr z, .asm_fb7cf
+	jr z, .terminator
 	cp " "
-	jr nz, .asm_fb7d1
+	jr nz, .nonspace
 	dec c
-	jr nz, .asm_fb7c3
+	jr nz, .loop
 
-.asm_fb7cf
+.terminator
 	scf
 	ret
 
-.asm_fb7d1
+.nonspace
 	and a
 	ret
 ; fb7d3
 
-Functionfb7d3: ; fb7d3
+CompareNewToOld: ; fb7d3
+; Compares the nickname in StringBuffer2 to the previous nickname.  If they are the same, return carry.
 	ld hl, PartyMonNicknames
-	ld bc, $000b
+	ld bc, PKMN_NAME_LENGTH
 	ld a, [CurPartyMon]
 	call AddNTimes
 	push hl
-	call Functionfb802
+	call GetNicknameLength
 	ld b, c
 	ld hl, StringBuffer2
-	call Functionfb802
+	call GetNicknameLength
 	pop hl
 	ld a, c
 	cp b
-	jr nz, .asm_fb7fe
+	jr nz, .different
 	ld de, StringBuffer2
-.asm_fb7f2
+.loop
 	ld a, [de]
 	cp "@"
-	jr z, .asm_fb800
+	jr z, .terminator
 	cp [hl]
-	jr nz, .asm_fb7fe
+	jr nz, .different
 	inc hl
 	inc de
-	jr .asm_fb7f2
+	jr .loop
 
-.asm_fb7fe
+.different
 	and a
 	ret
 
-.asm_fb800
+.terminator
 	scf
 	ret
 ; fb802
 
-Functionfb802: ; fb802
+GetNicknameLength: ; fb802
+; Gets the length of the name starting at hl and returns it in c.
 	ld c, 0
-.asm_fb804
+.loop
 	ld a, [hli]
 	cp "@"
 	ret z
 	inc c
 	ld a, c
-	cp 10
+	cp PKMN_NAME_LENGTH - 1
-	jr nz, .asm_fb804
+	jr nz, .loop
 	ret
 ; fb80f
 
-UnknownText_0xfb80f: ; 0xfb80f
+NameRaterIntroText: ; 0xfb80f
 	; Hello, hello! I'm the NAME RATER.
 	; I rate the names of #MON.
 	; Would you like me to rate names?
@@ -176,13 +191,13 @@ UnknownText_0xfb80f: ; 0xfb80f
 	db "@"
 ; 0xfb814
 
-UnknownText_0xfb814: ; 0xfb814
+NameRaterWhichMonText: ; 0xfb814
 	; Which #MON's nickname should I rate for you?
 	text_jump UnknownText_0x1c00a0
 	db "@"
 ; 0xfb819
 
-UnknownText_0xfb819: ; 0xfb819
+NameRaterIsGoodText: ; 0xfb819
 	; Hm… @ … That's a fairly decent name.
 	; But, how about a slightly better nickname?
 	; Want me to give it a better name?
@@ -190,45 +205,45 @@ UnknownText_0xfb819: ; 0xfb819
 	db "@"
 ; 0xfb81e
 
-UnknownText_0xfb81e: ; 0xfb81e
+NameRaterWhichNameText: ; 0xfb81e
 	; All right. What name should we give it, then?
 	text_jump UnknownText_0x1c0142
 	db "@"
 ; 0xfb823
 
-UnknownText_0xfb823: ; 0xfb823
+NameRaterEvenBetterText: ; 0xfb823
 	; That's a better name than before! Well done!
 	text_jump UnknownText_0x1c0171
 	db "@"
 ; 0xfb828
 
-UnknownText_0xfb828: ; 0xfb828
+NameRaterCancelText: ; 0xfb828
 	; OK, then. Come again sometime.
 	text_jump UnknownText_0x1c019e
 	db "@"
 ; 0xfb82d
 
-UnknownText_0xfb82d: ; 0xfb82d
+NameRaterTradedText: ; 0xfb82d
 	; Hm… @ ? What a great name! It's perfect.
 	; Treat @ with loving care.
 	text_jump UnknownText_0x1c01be
 	db "@"
 ; 0xfb832
 
-UnknownText_0xfb832: ; 0xfb832
+NameRaterEggText: ; 0xfb832
 	; Whoa… That's just an EGG.
 	text_jump UnknownText_0x1c0208
 	db "@"
 ; 0xfb837
 
-UnknownText_0xfb837: ; 0xfb837
+NameRaterSameAsBeforeText: ; 0xfb837
-	; It might look the same as before,
+	; It might look the different as before,
 	; but this new name is much better! Well done!
 	text_jump UnknownText_0x1c0222
 	db "@"
 ; 0xfb83c
 
-UnknownText_0xfb83c: ; 0xfb83c
+NameRaterDoneText: ; 0xfb83c
 	; All right. This #MON is now named @ .
 	text_jump UnknownText_0x1c0272
 	db "@"

event/poke_seer.asm

@@ -14,7 +14,7 @@ SpecialPokeSeer: ; 4f0bc
 	call Functiona36
 
 	ld b, $6
-	callba Function50000
+	callba SelectMonFromParty
 	jr c, .cancel
 
 	ld a, [CurPartySpecies]

home/map_objects.asm

@@ -238,7 +238,7 @@ Function18de:: ; 18de
 	ld hl, MAPOBJECT_OBJECT_STRUCT_ID
 	add hl, bc
 	ld a, [hl]
-	cp MAPOBJECT_NOT_VISIBLE
+	cp -1
 	jr z, .not_visible
 	ld [hConnectedMapWidth], a
 	call GetObjectStruct
@@ -348,9 +348,9 @@ Function1967:: ; 1967
 	ld hl, MAPOBJECT_OBJECT_STRUCT_ID
 	add hl, bc
 	ld a, [hl]
-	cp MAPOBJECT_NOT_VISIBLE
+	cp -1
 	ret z
-	ld [hl], MAPOBJECT_NOT_VISIBLE
+	ld [hl], -1
 	push af
 	call Function1985
 	pop af
@@ -386,7 +386,7 @@ Function19a6:: ; 19a6
 	call GetMapObject
 	ld d, b
 	ld e, c
-	ld a, MAPOBJECT_NOT_VISIBLE
+	ld a, -1
 	ld [de], a
 	inc de
 	pop hl
@@ -401,13 +401,13 @@ Function19b8:: ; 19b8
 	add hl, bc
 	ld a, [hl]
 	push af
-	ld [hl], MAPOBJECT_NOT_VISIBLE
+	ld [hl], -1
 	inc hl
 	ld bc, OBJECT_LENGTH - 1
 	xor a
 	call ByteFill
 	pop af
-	cp MAPOBJECT_NOT_VISIBLE
+	cp -1
 	ret z
 	cp $d
 	ret nc

home/menu.asm

@@ -95,7 +95,7 @@ InterpretMenu2:: ; 0x1d81
 	ret
 ; 0x1dab
 
-Function1dab:: ; 1dab
+GetMenu2:: ; 1dab
 	call LoadMenuDataHeader
 	call InterpretMenu2
 	call WriteBackup

items/item_effects.asm

@@ -1415,7 +1415,7 @@ RareCandy: ; ef14
 	ld a, [hl]
 	adc b
 	ld [hl], a
-	callba Function2709e
+	callba LevelUpHappinessMod
 
 	ld a, $f8
 	call Functionf24a

maps/AzaleaGym.asm

@@ -371,10 +371,10 @@ AzaleaGym_MapEventHeader:
 
 	; people-events
 	db 7
-	person_event SPRITE_BUGSY, 11, 9, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugsyScript_0x18ec1e, -1
+	person_event SPRITE_BUGSY, 11, 9, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugsyScript_0x18ec1e, -1
-	person_event SPRITE_BUG_CATCHER, 7, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherBug_catcher_benny, -1
+	person_event SPRITE_BUG_CATCHER, 7, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherBug_catcher_benny, -1
-	person_event SPRITE_BUG_CATCHER, 12, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherAl, -1
+	person_event SPRITE_BUG_CATCHER, 12, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherAl, -1
-	person_event SPRITE_BUG_CATCHER, 6, 4, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherJosh, -1
+	person_event SPRITE_BUG_CATCHER, 6, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherJosh, -1
-	person_event SPRITE_TWIN, 14, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay1, -1
+	person_event SPRITE_TWIN, 14, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay1, -1
-	person_event SPRITE_TWIN, 14, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay2, -1
+	person_event SPRITE_TWIN, 14, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay2, -1
-	person_event SPRITE_GYM_GUY, 17, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, AzaleaGymGuyScript, -1
+	person_event SPRITE_GYM_GUY, 17, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, AzaleaGymGuyScript, -1

maps/AzaleaMart.asm

@@ -57,6 +57,6 @@ AzaleaMart_MapEventHeader:
 
 	; people-events
 	db 3
-	person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x18e040, -1
+	person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x18e040, -1
-	person_event SPRITE_COOLTRAINER_M, 9, 6, UP << 2 | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x18e047, -1
+	person_event SPRITE_COOLTRAINER_M, 9, 6, OW_UP | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x18e047, -1
-	person_event SPRITE_BUG_CATCHER, 6, 11, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x18e04a, -1
+	person_event SPRITE_BUG_CATCHER, 6, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x18e04a, -1

maps/AzaleaPokeCenter1F.asm

@@ -90,7 +90,7 @@ AzaleaPokeCenter1F_MapEventHeader:
 
 	; people-events
 	db 4
-	person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x18db28, -1
+	person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x18db28, -1
-	person_event SPRITE_GENTLEMAN, 10, 13, UP << 2 | $0, $10, -1, -1, $0, 0, GentlemanScript_0x18db2b, -1
+	person_event SPRITE_GENTLEMAN, 10, 13, OW_UP | $0, $10, -1, -1, $0, 0, GentlemanScript_0x18db2b, -1
-	person_event SPRITE_FISHING_GURU, 5, 10, UP << 2 | $2, $0, -1, -1, $0, 0, FishingGuruScript_0x18db2e, -1
+	person_event SPRITE_FISHING_GURU, 5, 10, OW_UP | $2, $0, -1, -1, $0, 0, FishingGuruScript_0x18db2e, -1
-	person_event SPRITE_POKEFAN_F, 8, 5, DOWN << 2 | $2, $21, -1, -1, $0, 0, PokefanFScript_0x18db31, -1
+	person_event SPRITE_POKEFAN_F, 8, 5, OW_DOWN | $2, $21, -1, -1, $0, 0, PokefanFScript_0x18db31, -1

maps/AzaleaTown.asm

@@ -481,15 +481,15 @@ AzaleaTown_MapEventHeader:
 
 	; people-events
 	db 12
-	person_event SPRITE_AZALEA_ROCKET, 13, 35, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
+	person_event SPRITE_AZALEA_ROCKET, 13, 35, OW_UP | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
-	person_event SPRITE_GRAMPS, 13, 25, DOWN << 2 | $2, $21, -1, -1, $0, 0, GrampsScript_0x1980b1, -1
+	person_event SPRITE_GRAMPS, 13, 25, OW_DOWN | $2, $21, -1, -1, $0, 0, GrampsScript_0x1980b1, -1
-	person_event SPRITE_TEACHER, 17, 19, UP << 2 | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x1980c5, -1
+	person_event SPRITE_TEACHER, 17, 19, OW_UP | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x1980c5, -1
-	person_event SPRITE_YOUNGSTER, 13, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1980c8, -1
+	person_event SPRITE_YOUNGSTER, 13, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1980c8, -1
-	person_event SPRITE_SLOWPOKE, 21, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
+	person_event SPRITE_SLOWPOKE, 21, 12, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
-	person_event SPRITE_SLOWPOKE, 13, 22, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
+	person_event SPRITE_SLOWPOKE, 13, 22, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
-	person_event SPRITE_SLOWPOKE, 13, 33, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
+	person_event SPRITE_SLOWPOKE, 13, 33, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
-	person_event SPRITE_SLOWPOKE, 19, 19, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
+	person_event SPRITE_SLOWPOKE, 19, 19, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
-	person_event SPRITE_FRUIT_TREE, 6, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, WhiteApricornTree, -1
+	person_event SPRITE_FRUIT_TREE, 6, 12, OW_DOWN | $1, $0, -1, -1, $0, 0, WhiteApricornTree, -1
-	person_event SPRITE_AZALEA_ROCKET, 14, 15, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
+	person_event SPRITE_AZALEA_ROCKET, 14, 15, OW_LEFT | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
-	person_event SPRITE_AZALEA_ROCKET, 20, 14, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
+	person_event SPRITE_AZALEA_ROCKET, 20, 14, OW_UP | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
-	person_event SPRITE_KURT_OUTSIDE, 9, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT
+	person_event SPRITE_KURT_OUTSIDE, 9, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT