Plus 4 on person events; feeble attempt to annotate color functions

constants/trainer_constants.asm

@@ -1,6 +1,11 @@
 ; trainer groups
 	enum_start
 	trainerclass PHONE ; 0
+	const MOM_PHONE
+	const OAK_PHONE
+	const BILL_PHONE
+	const ELM_PHONE
+	const BUENA_PHONE
 	
 	trainerclass FALKNER ; 1
 

engine/color.asm

@@ -83,7 +83,7 @@ Function8aa4: ; 8aa4
 	push bc
 	ld hl, PalPacket_9ce6
 	ld de, wcda9
-	ld bc, $0010
+	ld bc, PalPacket_9cf6 - PalPacket_9ce6
 	call CopyBytes
 	pop bc
 	pop de
@@ -105,7 +105,7 @@ Function8aa4: ; 8aa4
 
 Function8ad1: ; 8ad1
 	ld hl, PalPacket_9c56 + 1
-	call Function9610
+	call CopyFourPalettes
 	call Function971a
 	call Function9699
 	ret
@@ -196,8 +196,8 @@ Function8b4d: ; 8b4d
 .asm_8b5c
 	ld de, Unkn2Pals
 	ld a, $3b
-	call Function9625
+	call GetAthPalletFromPalettes9df6
-	jp Function9630
+	jp LoadHLPaletteIntoDE
 ; 8b67
 
 Function8b67: ; 8b67
@@ -212,8 +212,8 @@ Function8b67: ; 8b67
 .asm_8b76
 	ld de, Unkn2Pals
 	ld a, $3c
-	call Function9625
+	call GetAthPalletFromPalettes9df6
-	jp Function9630
+	jp LoadHLPaletteIntoDE
 ; 8b81
 
 Function8b81: ; 8b81
@@ -309,7 +309,7 @@ Function8bec: ; 8bec
 .asm_8c0b
 	ld b, $0
 	add hl, bc
-	ld bc, $0604
+	lb bc, 6, 4
 	ld a, [EnemySafeguardCount]
 	and $3
 	call Function9663
@@ -386,7 +386,7 @@ endr
 	jr .asm_8c7b
 
 .asm_8c82
-	ld bc, $0208
+	lb bc, 2, 8
 	ld a, e
 	call Function9663
 	ret
@@ -520,7 +520,7 @@ INCLUDE "predef/cgb.asm"
 Function95f0: ; 95f0
 	ld hl, Palette_9608
 	ld de, Unkn1Pals
-	ld bc, $0008
+	ld bc, 8
 	ld a, $5
 	call FarCopyWRAM
 	call Function96a4
@@ -537,28 +537,29 @@ Palette_9608: ; 9608
 ; 9610
 
 
-Function9610: ; 9610
+CopyFourPalettes: ; 9610
 	ld de, Unkn1Pals
 	ld c, $4
 
-Function9615: ; 9615
+CopyPalettes: ; 9615
+.loop
 	push bc
 	ld a, [hli]
 	push hl
-	call Function9625
+	call GetAthPalletFromPalettes9df6
-	call Function9630
+	call LoadHLPaletteIntoDE
 	pop hl
 	inc hl
 	pop bc
 	dec c
-	jr nz, Function9615
+	jr nz, .loop
 	ret
 ; 9625
 
-Function9625: ; 9625
+GetAthPalletFromPalettes9df6: ; 9625
 	ld l, a
 	ld h, $0
-rept 3
+rept 3 ; multiply by 8
 	add hl, hl
 endr
 	ld bc, Palettes_9df6
@@ -566,18 +567,18 @@ endr
 	ret
 ; 9630
 
-Function9630: ; 9630
+LoadHLPaletteIntoDE: ; 9630
 	ld a, [rSVBK]
 	push af
 	ld a, $5
 	ld [rSVBK], a
 	ld c, $8
-.asm_9639
+.loop
 	ld a, [hli]
 	ld [de], a
 	inc de
 	dec c
-	jr nz, .asm_9639
+	jr nz, .loop
 	pop af
 	ld [rSVBK], a
 	ret
@@ -595,12 +596,12 @@ Function9643: ; 9643
 	ld [de], a
 	inc de
 	ld c, $4
-.asm_9654
+.loop
 	ld a, [hli]
 	ld [de], a
 	inc de
 	dec c
-	jr nz, .asm_9654
+	jr nz, .loop
 	xor a
 	ld [de], a
 	inc de
@@ -612,19 +613,19 @@ Function9643: ; 9643
 ; 9663
 
 Function9663: ; 9663
-.asm_9663
+.row
 	push bc
 	push hl
-.asm_9665
+.col
 	ld [hli], a
 	dec c
-	jr nz, .asm_9665
+	jr nz, .col
 	pop hl
-	ld bc, $0014
+	ld bc, SCREEN_WIDTH
 	add hl, bc
 	pop bc
 	dec b
-	jr nz, .asm_9663
+	jr nz, .row
 	ret
 ; 9673
 
@@ -743,7 +744,7 @@ Function96f3: ; 96f3
 	jr .asm_970b
 
 .asm_9712
-	ld bc, $0208
+	lb bc, 2, 8
 	ld a, e
 	call Function9663
 	ret
@@ -876,21 +877,21 @@ Function97cc: ; 97cc
 	ld a, $90
 	ld [rOBPI], a
 	ld a, $1c
-	call Function9625
+	call GetAthPalletFromPalettes9df6
 	call Function97e5
 	ld a, $21
-	call Function9625
+	call GetAthPalletFromPalettes9df6
 	call Function97e5
 	ret
 ; 97e5
 
 Function97e5: ; 97e5
 	ld c, $8
-.asm_97e7
+.loop
 	ld a, [hli]
 	ld [rOBPD], a
 	dec c
-	jr nz, .asm_97e7
+	jr nz, .loop
 	ret
 ; 97ee
 
@@ -935,32 +936,32 @@ Function981a: ; 981a
 	and $7
 	ret z
 	ld b, a
-.asm_981f
+.loop
 	push bc
 	xor a
 	ld [rJOYP], a
 	ld a, $30
 	ld [rJOYP], a
 	ld b, $10
-.asm_9829
+.loop2
 	ld e, $8
 	ld a, [hli]
 	ld d, a
-.asm_982d
+.loop3
 	bit 0, d
 	ld a, $10
-	jr nz, .asm_9835
+	jr nz, .okay
 	ld a, $20
 
-.asm_9835
+.okay
 	ld [rJOYP], a
 	ld a, $30
 	ld [rJOYP], a
 	rr d
 	dec e
-	jr nz, .asm_982d
+	jr nz, .loop3
 	dec b
-	jr nz, .asm_9829
+	jr nz, .loop2
 	ld a, $20
 	ld [rJOYP], a
 	ld a, $30
@@ -968,7 +969,7 @@ Function981a: ; 981a
 	call Function9a7a
 	pop bc
 	dec b
-	jr nz, .asm_981f
+	jr nz, .loop
 	ret
 ; 9853
 

engine/title.asm

@@ -220,7 +220,7 @@ _TitleScreen: ; 10ed67
 	ld [hBGMapMode], a
 	
 	xor a
-	ld [UnknPals1 + 2], a
+	ld [Unkn1Pals + 2], a
 	
 ; Play starting sound effect
 	call SFXChannelsOff
@@ -231,7 +231,7 @@ _TitleScreen: ; 10ed67
 ; 10eea7
 
 SuicuneFrameIterator: ; 10eea7
-	ld hl, UnknPals1 + 2
+	ld hl, Unkn1Pals + 2
 	ld a, [hl]
 	ld c, a
 	inc [hl]
@@ -342,7 +342,7 @@ InitializeBackground: ; 10ef06
 .InitColumn: ; 10ef1c
 	ld c, $6
 	ld b, $40
-.loop
+.loop2
 	ld a, d
 	ld [hli], a
 	ld a, b
@@ -357,7 +357,7 @@ endr
 	ld a, $80
 	ld [hli], a
 	dec c
-	jr nz, .loop
+	jr nz, .loop2
 	ret
 ; 10ef32
 

home/copy.asm

@@ -117,8 +117,8 @@ Functione51:: ; e51
 	ret
 ; e58
 
-Functione58:: ; e58
+LoadFontsBattleExtra:: ; e58
-	callba Functionfb4be
+	callba _LoadFontsBattleExtra
 	ret
 ; e5f
 

items/item_effects.asm

@@ -2286,7 +2286,7 @@ PokeDoll: ; f48f
 	inc a
 	ld [wd232], a
 	ld a, [wd0ee]
-	and $c0
+	and 3 << 6
 	or $2
 	ld [wd0ee], a
 	jp Functionf789
@@ -2368,7 +2368,7 @@ PokeFlute: ; f50c
 .asm_f512
 
 	xor a
-	ld [wd002], a
+	ld [MiscBuffer2], a
 
 	ld b, $ff ^ SLP
 
@@ -2391,7 +2391,7 @@ PokeFlute: ; f50c
 	and b
 	ld [hl], a
 
-	ld a, [wd002]
+	ld a, [MiscBuffer2]
 	and a
 	ld hl, UnknownText_0xf56c
 	jp z, PrintText
@@ -2416,7 +2416,7 @@ PokeFlute: ; f50c
 	and SLP
 	jr z, .asm_f564
 	ld a, 1
-	ld [wd002], a
+	ld [MiscBuffer2], a
 .asm_f564
 	pop af
 	and b
@@ -2517,27 +2517,27 @@ MaxEther:
 Elixer:
 Mysteryberry: ; f5bf
 	ld a, [CurItem]
-	ld [wd002], a
+	ld [MiscBuffer2], a
 
-.asm_f5c5
+.loop
 	ld b, $1
 	call Functionf1f9
 	jp c, Functionf6e0
 
-.asm_f5cd
+.loop2
-	ld a, [wd002]
+	ld a, [MiscBuffer2]
 	cp MAX_ELIXER
-	jp z, Functionf6af
+	jp z, Elixer_RestorePPofAllMoves
 	cp ELIXER
-	jp z, Functionf6af
+	jp z, Elixer_RestorePPofAllMoves
 
 	ld hl, UnknownText_0xf725
-	ld a, [wd002]
+	ld a, [MiscBuffer2]
 	cp PP_UP
-	jr z, .asm_f5e7
+	jr z, .ppup
 	ld hl, UnknownText_0xf72a
 
-.asm_f5e7
+.ppup
 	call PrintText
 
 	ld a, [CurMoveNum]
@@ -2551,10 +2551,10 @@ Mysteryberry: ; f5bf
 	pop bc
 	ld a, b
 	ld [CurMoveNum], a
-	jr nz, .asm_f5c5
+	jr nz, .loop
 	ld hl, PartyMon1Moves
 	ld bc, PartyMon2 - PartyMon1
-	call Functionf963
+	call GetMthMoveOfNthPartymon
 
 	push hl
 	ld a, [hl]
@@ -2563,28 +2563,28 @@ Mysteryberry: ; f5bf
 	call CopyName1
 
 	pop hl
-	ld a, [wd002]
+	ld a, [MiscBuffer2]
 	cp PP_UP
 	jp nz, Functionf6a7
 
 	ld a, [hl]
-	cp $a6
+	cp SKETCH
-	jr z, .asm_f62f
+	jr z, .CantUsePPUpOnSketch
 
 	ld bc, $0015
 	add hl, bc
 	ld a, [hl]
-	cp $c0
+	cp 3 << 6
-	jr c, .asm_f637
+	jr c, .do_ppup
 
-.asm_f62f
+.CantUsePPUpOnSketch
 	ld hl, UnknownText_0xf72f
 	call PrintText
-	jr .asm_f5cd
+	jr .loop2
 
-.asm_f637
+.do_ppup
 	ld a, [hl]
-	add $40
+	add 1 << 6
 	ld [hl], a
 	ld a, $1
 	ld [wd265], a
@@ -2657,37 +2657,37 @@ Functionf652: ; f652
 ; f6a7
 
 Functionf6a7: ; f6a7
-	call Functionf6e8
+	call RestorePP
 	jr nz, Functionf652
 	jp Functionf6dd
 ; f6af
 
-Functionf6af: ; f6af
+Elixer_RestorePPofAllMoves: ; f6af
 	xor a
 	ld hl, wcfa9
 	ld [hli], a
 	ld [hl], a
 	ld b, NUM_MOVES
-.asm_f6b7
+.moveLoop
 	push bc
 	ld hl, PartyMon1Moves
 	ld bc, PartyMon2 - PartyMon1
-	call Functionf963
+	call GetMthMoveOfNthPartymon
 	ld a, [hl]
 	and a
-	jr z, .asm_f6ce
+	jr z, .cant_restore_pp
 
-	call Functionf6e8
+	call RestorePP
-	jr z, .asm_f6ce
+	jr z, .cant_restore_pp
 	ld hl, wcfaa
 	inc [hl]
 
-.asm_f6ce
+.cant_restore_pp
 	ld hl, wcfa9
 	inc [hl]
 	pop bc
 	dec b
-	jr nz, .asm_f6b7
+	jr nz, .moveLoop
 	ld a, [wcfaa]
 	and a
 	jp nz, Functionf652
@@ -2702,48 +2702,48 @@ Functionf6e0: ; f6e0
 	ret
 ; f6e8
 
-Functionf6e8: ; f6e8
+RestorePP: ; f6e8
 	xor a ; PARTYMON
 	ld [MonType], a
 	call Functionf8ec
 	ld hl, PartyMon1PP
 	ld bc, PartyMon2 - PartyMon1
-	call Functionf963
+	call GetMthMoveOfNthPartymon
 	ld a, [wd265]
 	ld b, a
 	ld a, [hl]
-	and $3f
+	and (1 << 6) - 1
 	cp b
-	jr nc, .asm_f723
+	jr nc, .dont_restore
 
-	ld a, [wd002]
+	ld a, [MiscBuffer2]
 	cp MAX_ELIXER
-	jr z, .asm_f71d
+	jr z, .restore_all
 	cp MAX_ETHER
-	jr z, .asm_f71d
+	jr z, .restore_all
 
 	ld c, 5
 	cp MYSTERYBERRY
-	jr z, .asm_f715
+	jr z, .restore_some
 
 	ld c, 10
 
-.asm_f715
+.restore_some
 	ld a, [hl]
-	and $3f
+	and (1 << 6) - 1
 	add c
 	cp b
-	jr nc, .asm_f71d
+	jr nc, .restore_all
 	ld b, a
 
-.asm_f71d
+.restore_all
 	ld a, [hl]
-	and $c0
+	and 3 << 6
 	or b
 	ld [hl], a
 	ret
 
-.asm_f723
+.dont_restore
 	xor a
 	ret
 ; f725
@@ -3127,9 +3127,9 @@ Functionf84c: ; f84c
 
 .asm_f876
 	ld a, [hl]
-	and $c0
+	and 3 << 6
-	ld a, [de]
+	ld a, [de] ; wasted cycle
-	call nz, Functionf881
+	call nz, ComputeMaxPP
 
 .asm_f87d
 	inc hl
@@ -3139,8 +3139,9 @@ Functionf84c: ; f84c
 
 
 
-Functionf881: ; f881
+ComputeMaxPP: ; f881
 	push bc
+	; Divide the base PP by 5.
 	ld a, [de]
 	ld [hDividend + 3], a
 	xor a
@@ -3151,6 +3152,7 @@ Functionf881: ; f881
 	ld [hDivisor], a
 	ld b, 4
 	call Divide
+	; Get the number of PP, which are bits 6 and 7 of the PP value stored in RAM.
 	ld a, [hl]
 	ld b, a
 	swap a
@@ -3158,24 +3160,30 @@ Functionf881: ; f881
 	srl a
 	srl a
 	ld c, a
+	; If this value is 0, we are done
 	and a
-	jr z, .asm_f8b6
+	jr z, .NoPPUp
-.asm_f8a3
+
-	ld a, [$ffb6]
+.loop
+	; Normally, a move with 40 PP would have 64 PP with three PP Ups.
+	; Since this would overflow into bit 6, we prevent that from happening
+	; by decreasing the extra amount of PP each PP Up provides, resulting
+	; in a maximum of 61.
+	ld a, [hQuotient + 2]
 	cp $8
-	jr c, .asm_f8ab
+	jr c, .okay
 	ld a, $7
 
-.asm_f8ab
+.okay
 	add b
 	ld b, a
 	ld a, [wd265]
 	dec a
-	jr z, .asm_f8b6
+	jr z, .NoPPUp
 	dec c
-	jr nz, .asm_f8a3
+	jr nz, .loop
 
-.asm_f8b6
+.NoPPUp
 	ld [hl], b
 	pop bc
 	ret
@@ -3203,7 +3211,7 @@ Functionf8b9: ; f8b9
 	pop bc
 	pop de
 	ld a, [de]
-	and $c0
+	and 3 << 6
 	ld b, a
 	ld a, [wd265]
 	add b
@@ -3229,30 +3237,30 @@ Functionf8ec: ; f8ec
 
 	ld hl, PartyMon1Moves
 	ld bc, PartyMon2 - PartyMon1
-	jr z, .asm_f91a ; PARTYMON
+	jr z, .got_partymon ; PARTYMON
 
 	ld hl, OTPartyMon1Moves
 	dec a
-	jr z, .asm_f91a ; OTPARTYMON
+	jr z, .got_partymon ; OTPARTYMON
 
 	ld hl, TempMonMoves
 	dec a
-	jr z, .asm_f915 ; BOXMON
+	jr z, .got_nonpartymon ; BOXMON
 
 	ld hl, TempMonMoves ; Wasted cycles
 	dec a
-	jr z, .asm_f915 ; BREEDMON
+	jr z, .got_nonpartymon ; BREEDMON
 
 	ld hl, BattleMonMoves ; WILDMON
 
-.asm_f915 ; BOXMON, BREEDMON, WILDMON
+.got_nonpartymon ; BOXMON, BREEDMON, WILDMON
-	call Functionf969
+	call GetMthMoveOfCurrentMon
-	jr .asm_f91d
+	jr .gotdatmove
 
-.asm_f91a ; PARTYMON, OTPARTYMON
+.got_partymon ; PARTYMON, OTPARTYMON
-	call Functionf963
+	call GetMthMoveOfNthPartymon
 
-.asm_f91d
+.gotdatmove
 	ld a, [hl]
 	dec a
 
@@ -3271,12 +3279,12 @@ Functionf8ec: ; f8ec
 	ld bc, PartyMon1PP - PartyMon1Moves
 	ld a, [MonType]
 	cp WILDMON
-	jr nz, .asm_f942
+	jr nz, .notwild
 	ld bc, EnemyMonPP - EnemyMonMoves
-.asm_f942
+.notwild
 	add hl, bc
 	ld a, [hl]
-	and $c0
+	and 3 << 6
 	pop bc
 
 	or b
@@ -3284,10 +3292,10 @@ Functionf8ec: ; f8ec
 	ld [hl], a
 	xor a
 	ld [wd265], a
-	ld a, b
+	ld a, b ; this gets lost anyway
-	call Functionf881
+	call ComputeMaxPP
 	ld a, [hl]
-	and $3f
+	and (1 << 6) - 1
 	ld [wd265], a
 
 	pop af
@@ -3297,11 +3305,11 @@ Functionf8ec: ; f8ec
 	ret
 ; f963
 
-Functionf963: ; f963
+GetMthMoveOfNthPartymon: ; f963
 	ld a, [CurPartyMon]
 	call AddNTimes
 
-Functionf969: ; f969
+GetMthMoveOfCurrentMon: ; f969
 	ld a, [wcfa9]
 	ld c, a
 	ld b, 0

maps/AzaleaGym.asm

@@ -371,10 +371,10 @@ AzaleaGym_MapEventHeader:
 
 .PersonEvents:
 	db 7
-	person_event SPRITE_BUGSY, 11, 9, $3, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, BugsyScript_0x18ec1e, -1
+	person_event SPRITE_BUGSY, 7 + 4, 5 + 4, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugsyScript_0x18ec1e, -1
-	person_event SPRITE_BUG_CATCHER, 7, 9, $a, 0, 0, -1, -1, 8 + PAL_OW_BROWN, 2, 2, TrainerBug_catcherBug_catcher_benny, -1
+	person_event SPRITE_BUG_CATCHER, 3 + 4, 5 + 4, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBug_catcherBug_catcher_benny, -1
-	person_event SPRITE_BUG_CATCHER, 12, 12, $6, 0, 0, -1, -1, 8 + PAL_OW_BROWN, 2, 3, TrainerBug_catcherAl, -1
+	person_event SPRITE_BUG_CATCHER, 8 + 4, 8 + 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherAl, -1
-	person_event SPRITE_BUG_CATCHER, 6, 4, $6, 0, 0, -1, -1, 8 + PAL_OW_BROWN, 2, 3, TrainerBug_catcherJosh, -1
+	person_event SPRITE_BUG_CATCHER, 2 + 4, 0 + 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherJosh, -1
-	person_event SPRITE_TWIN, 14, 8, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay1, -1
+	person_event SPRITE_TWIN, 10 + 4, 4 + 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay1, -1
-	person_event SPRITE_TWIN, 14, 9, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay2, -1
+	person_event SPRITE_TWIN, 10 + 4, 5 + 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay2, -1
-	person_event SPRITE_GYM_GUY, 17, 11, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, AzaleaGymGuyScript, -1
+	person_event SPRITE_GYM_GUY, 13 + 4, 7 + 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, AzaleaGymGuyScript, -1

maps/AzaleaMart.asm

@@ -57,6 +57,6 @@ AzaleaMart_MapEventHeader:
 
 .PersonEvents:
 	db 3
-	person_event SPRITE_CLERK, 7, 5, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18e040, -1
+	person_event SPRITE_CLERK, 3 + 4, 1 + 4, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18e040, -1
-	person_event SPRITE_COOLTRAINER_M, 9, 6, $7, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x18e047, -1
+	person_event SPRITE_COOLTRAINER_M, 5 + 4, 2 + 4, $7, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x18e047, -1
-	person_event SPRITE_BUG_CATCHER, 6, 11, $5, 0, 2, -1, -1, 8 + PAL_OW_RED, 0, 0, BugCatcherScript_0x18e04a, -1
+	person_event SPRITE_BUG_CATCHER, 2 + 4, 7 + 4, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x18e04a, -1

maps/AzaleaPokeCenter1F.asm

@@ -90,7 +90,7 @@ AzaleaPokeCenter1F_MapEventHeader:
 
 .PersonEvents:
 	db 4
-	person_event SPRITE_NURSE, 5, 7, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18db28, -1
+	person_event SPRITE_NURSE, 1 + 4, 3 + 4, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18db28, -1
-	person_event SPRITE_GENTLEMAN, 10, 13, $4, 1, 0, -1, -1, 0, 0, 0, GentlemanScript_0x18db2b, -1
+	person_event SPRITE_GENTLEMAN, 6 + 4, 9 + 4, $4, 1, 0, -1, -1, 0, 0, 0, GentlemanScript_0x18db2b, -1
-	person_event SPRITE_FISHING_GURU, 5, 10, $6, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x18db2e, -1
+	person_event SPRITE_FISHING_GURU, 1 + 4, 6 + 4, $6, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x18db2e, -1
-	person_event SPRITE_POKEFAN_F, 8, 5, $2, 2, 1, -1, -1, 0, 0, 0, PokefanFScript_0x18db31, -1
+	person_event SPRITE_POKEFAN_F, 4 + 4, 1 + 4, $2, 2, 1, -1, -1, 0, 0, 0, PokefanFScript_0x18db31, -1

maps/AzaleaTown.asm

@@ -481,15 +481,15 @@ AzaleaTown_MapEventHeader:
 
 .PersonEvents:
 	db 12
-	person_event SPRITE_AZALEA_ROCKET, 13, 35, $6, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
+	person_event SPRITE_AZALEA_ROCKET, 9 + 4, 31 + 4, $6, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
-	person_event SPRITE_GRAMPS, 13, 25, $2, 2, 1, -1, -1, 0, 0, 0, GrampsScript_0x1980b1, -1
+	person_event SPRITE_GRAMPS, 9 + 4, 21 + 4, $2, 2, 1, -1, -1, 0, 0, 0, GrampsScript_0x1980b1, -1
-	person_event SPRITE_TEACHER, 17, 19, $4, 2, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, TeacherScript_0x1980c5, -1
+	person_event SPRITE_TEACHER, 13 + 4, 15 + 4, $4, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x1980c5, -1
-	person_event SPRITE_YOUNGSTER, 13, 11, $5, 0, 1, -1, -1, 8 + PAL_OW_GREEN, 0, 0, YoungsterScript_0x1980c8, -1
+	person_event SPRITE_YOUNGSTER, 9 + 4, 7 + 4, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1980c8, -1
-	person_event SPRITE_SLOWPOKE, 21, 12, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
+	person_event SPRITE_SLOWPOKE, 17 + 4, 8 + 4, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
-	person_event SPRITE_SLOWPOKE, 13, 22, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
+	person_event SPRITE_SLOWPOKE, 9 + 4, 18 + 4, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
-	person_event SPRITE_SLOWPOKE, 13, 33, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
+	person_event SPRITE_SLOWPOKE, 9 + 4, 29 + 4, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
-	person_event SPRITE_SLOWPOKE, 19, 19, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
+	person_event SPRITE_SLOWPOKE, 15 + 4, 15 + 4, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
-	person_event SPRITE_FRUIT_TREE, 6, 12, $1, 0, 0, -1, -1, 0, 0, 0, WhiteApricornTree, -1
+	person_event SPRITE_FRUIT_TREE, 2 + 4, 8 + 4, $1, 0, 0, -1, -1, 0, 0, 0, WhiteApricornTree, -1
-	person_event SPRITE_AZALEA_ROCKET, 14, 15, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
+	person_event SPRITE_AZALEA_ROCKET, 10 + 4, 11 + 4, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
-	person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
+	person_event SPRITE_AZALEA_ROCKET, 16 + 4, 10 + 4, $6, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
-	person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, 0, 0, -1, -1, 0, 0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT
+	person_event SPRITE_KURT_OUTSIDE, 5 + 4, 6 + 4, $8, 0, 0, -1, -1, 0, 0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT

maps/BattleTower1F.asm

@@ -810,8 +810,8 @@ BattleTower1F_MapEventHeader:
 
 .PersonEvents:
 	db 5
-	person_event SPRITE_RECEPTIONIST, 10, 11, $6, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x9e3e2, -1
+	person_event SPRITE_RECEPTIONIST, 6 + 4, 7 + 4, $6, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x9e3e2, -1
-	person_event SPRITE_YOUNGSTER, 13, 18, $9, 0, 0, -1, -1, 8 + PAL_OW_BROWN, 0, 0, YoungsterScript_0x9e55d, -1
+	person_event SPRITE_YOUNGSTER, 9 + 4, 14 + 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, YoungsterScript_0x9e55d, -1
-	person_event SPRITE_COOLTRAINER_F, 13, 8, $5, 0, 1, -1, -1, 8 + PAL_OW_RED, 0, 0, CooltrainerFScript_0x9e568, -1
+	person_event SPRITE_COOLTRAINER_F, 9 + 4, 4 + 4, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x9e568, -1
-	person_event SPRITE_BUG_CATCHER, 7, 5, $2, 1, 1, -1, -1, 8 + PAL_OW_BLUE, 0, 0, BugCatcherScript_0x9e56b, -1
+	person_event SPRITE_BUG_CATCHER, 3 + 4, 1 + 4, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BugCatcherScript_0x9e56b, -1
-	person_event SPRITE_GRANNY, 7, 18, $4, 1, 0, -1, -1, 0, 0, 0, GrannyScript_0x9e56e, -1
+	person_event SPRITE_GRANNY, 3 + 4, 14 + 4, $4, 1, 0, -1, -1, 0, 0, 0, GrannyScript_0x9e56e, -1

maps/BattleTowerBattleRoom.asm

@@ -155,5 +155,5 @@ BattleTowerBattleRoom_MapEventHeader:
 
 .PersonEvents:
 	db 2
-	person_event SPRITE_YOUNGSTER, 4, 8, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
+	person_event SPRITE_YOUNGSTER, 0 + 4, 4 + 4, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
-	person_event SPRITE_RECEPTIONIST, 10, 5, $9, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1
+	person_event SPRITE_RECEPTIONIST, 6 + 4, 1 + 4, $9, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1

maps/BattleTowerElevator.asm

@@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader:
 
 .PersonEvents:
 	db 1
-	person_event SPRITE_RECEPTIONIST, 6, 5, $9, 0, 0, -1, -1, 0, 0, 0, MovementData_0x9f58f, -1
+	person_event SPRITE_RECEPTIONIST, 2 + 4, 1 + 4, $9, 0, 0, -1, -1, 0, 0, 0, MovementData_0x9f58f, -1

maps/BattleTowerHallway.asm

@@ -98,4 +98,4 @@ BattleTowerHallway_MapEventHeader:
 
 .PersonEvents:
 	db 1
-	person_event SPRITE_RECEPTIONIST, 6, 15, $6, 0, 0, -1, -1, 0, 0, 0, BattleTowerHallway_MapEventHeader, -1
+	person_event SPRITE_RECEPTIONIST, 2 + 4, 11 + 4, $6, 0, 0, -1, -1, 0, 0, 0, BattleTowerHallway_MapEventHeader, -1

maps/BattleTowerOutside.asm

@@ -142,7 +142,7 @@ BattleTowerOutside_MapEventHeader:
 
 .PersonEvents:
 	db 4
-	person_event SPRITE_STANDING_YOUNGSTER, 16, 10, $7, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, StandingYoungsterScript_0x9f85f, -1
+	person_event SPRITE_STANDING_YOUNGSTER, 12 + 4, 6 + 4, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x9f85f, -1
-	person_event SPRITE_BUENA, 15, 17, $2, 1, 1, -1, -1, 8 + PAL_OW_GREEN, 0, 0, BuenaScript_0x9f862, -1
+	person_event SPRITE_BUENA, 11 + 4, 13 + 4, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BuenaScript_0x9f862, -1
-	person_event SPRITE_SAILOR, 22, 16, $5, 0, 1, -1, -1, 0, 0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+	person_event SPRITE_SAILOR, 18 + 4, 12 + 4, $5, 0, 1, -1, -1, 0, 0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
-	person_event SPRITE_LASS, 28, 16, $3, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, ObjectEvent, -1
+	person_event SPRITE_LASS, 24 + 4, 12 + 4, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, -1

maps/BillsHouse.asm

@@ -367,4 +367,4 @@ BillsHouse_MapEventHeader:
 
 .PersonEvents:
 	db 1
-	person_event SPRITE_GRAMPS, 7, 6, $7, 2, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, GrampsScript_0x189538, -1
+	person_event SPRITE_GRAMPS, 3 + 4, 2 + 4, $7, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x189538, -1

maps/BlackthornCity.asm

@@ -333,12 +333,12 @@ BlackthornCity_MapEventHeader:
 
 .PersonEvents:
 	db 9
-	person_event SPRITE_SUPER_NERD, 16, 22, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
+	person_event SPRITE_SUPER_NERD, 12 + 4, 18 + 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
-	person_event SPRITE_SUPER_NERD, 16, 23, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
+	person_event SPRITE_SUPER_NERD, 12 + 4, 19 + 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
-	person_event SPRITE_GRAMPS, 6, 24, $6, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
+	person_event SPRITE_GRAMPS, 2 + 4, 20 + 4, $6, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
-	person_event SPRITE_GRAMPS, 6, 25, $8, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
+	person_event SPRITE_GRAMPS, 2 + 4, 21 + 4, $8, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
-	person_event SPRITE_BLACK_BELT, 35, 28, $5, 0, 1, -1, -1, 8 + PAL_OW_BLUE, 0, 0, BlackBeltScript_0x1a470e, -1
+	person_event SPRITE_BLACK_BELT, 31 + 4, 24 + 4, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x1a470e, -1
-	person_event SPRITE_COOLTRAINER_F, 29, 13, $5, 0, 2, -1, -1, 8 + PAL_OW_RED, 0, 0, CooltrainerFScript_0x1a4722, -1
+	person_event SPRITE_COOLTRAINER_F, 25 + 4, 9 + 4, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x1a4722, -1
-	person_event SPRITE_YOUNGSTER, 19, 17, $5, 0, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1a4725, -1
+	person_event SPRITE_YOUNGSTER, 15 + 4, 13 + 4, $5, 0, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1a4725, -1
-	person_event SPRITE_YOUNGSTER, 24, 26, $6, 0, 0, -1, -1, 0, 0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
+	person_event SPRITE_YOUNGSTER, 20 + 4, 22 + 4, $6, 0, 0, -1, -1, 0, 0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
-	person_event SPRITE_COOLTRAINER_F, 23, 39, $7, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x1a4728, -1
+	person_event SPRITE_COOLTRAINER_F, 19 + 4, 35 + 4, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x1a4728, -1

maps/BlackthornDodrioTradeHouse.asm

@@ -35,4 +35,4 @@ BlackthornDodrioTradeHouse_MapEventHeader:
 
 .PersonEvents:
 	db 1
-	person_event SPRITE_LASS, 7, 6, $3, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, Emy, -1
+	person_event SPRITE_LASS, 3 + 4, 2 + 4, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, Emy, -1

maps/BlackthornDragonSpeechHouse.asm

@@ -58,5 +58,5 @@ BlackthornDragonSpeechHouse_MapEventHeader:
 
 .PersonEvents:
 	db 2
-	person_event SPRITE_GRANNY, 7, 6, $3, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x195949, -1
+	person_event SPRITE_GRANNY, 3 + 4, 2 + 4, $3, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x195949, -1
-	person_event SPRITE_EKANS, 9, 9, $16, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, EkansScript_0x19594c, -1
+	person_event SPRITE_EKANS, 5 + 4, 5 + 4, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, EkansScript_0x19594c, -1

maps/BlackthornGym1F.asm

@@ -404,8 +404,8 @@ BlackthornGym1F_MapEventHeader:
 
 .PersonEvents:
 	db 5
-	person_event SPRITE_CLAIR, 7, 9, $6, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, ClairScript_0x194e24, -1
+	person_event SPRITE_CLAIR, 3 + 4, 5 + 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClairScript_0x194e24, -1
-	person_event SPRITE_COOLTRAINER_M, 10, 10, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 3, TrainerCooltrainermMike, -1
+	person_event SPRITE_COOLTRAINER_M, 6 + 4, 6 + 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermMike, -1
-	person_event SPRITE_COOLTRAINER_M, 18, 5, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 3, TrainerCooltrainermPaul, -1
+	person_event SPRITE_COOLTRAINER_M, 14 + 4, 1 + 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermPaul, -1
-	person_event SPRITE_COOLTRAINER_F, 6, 13, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 1, TrainerCooltrainerfLola, -1
+	person_event SPRITE_COOLTRAINER_F, 2 + 4, 9 + 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfLola, -1
-	person_event SPRITE_GYM_GUY, 19, 11, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, BlackthornGymGuyScript, -1
+	person_event SPRITE_GYM_GUY, 15 + 4, 7 + 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BlackthornGymGuyScript, -1