Events and some WRAM cleanup

2025-09-08 08:13:02 -07:00 · 2015-12-18 20:07:09 -05:00
parent d644406f61
commit 3d36f1a837
60 changed files with 752 additions and 724 deletions
--- a/engine/breeding/egg.asm
+++ b/engine/breeding/egg.asm
@@ -575,7 +575,7 @@ GetHeritableMoves: ; 17197
 	ld a, [wBreedMon2Species]
 	cp DITTO
 	jr z, .ditto2
-	ld a, [wDittoInDaycare]
+	ld a, [wBreedMotherOrNonDitto]
 	and a
 	ret z
 	ld hl, wBreedMon1Moves
@@ -633,7 +633,7 @@ GetBreedmonMovePointer: ; 1720b
 	ld a, [wBreedMon2Species]
 	cp DITTO
 	jr z, .ditto
-	ld a, [wDittoInDaycare]
+	ld a, [wBreedMotherOrNonDitto]
 	and a
 	ret z

--- a/engine/clock_reset.asm
+++ b/engine/clock_reset.asm
@@ -95,7 +95,7 @@ RestartClock: ; 20021 (8:4021)
 	ld [StringBuffer2 + 2], a
 	xor a
 	ld [StringBuffer2 + 3], a
-	call Function677
+	call InitTime
 	call .PrintTime
 	ld hl, .Text_ClockReset
 	call PrintText
--- a/engine/crystal_intro.asm
+++ b/engine/crystal_intro.asm
@@ -80,7 +80,7 @@ Copyright_GFPresents: ; e4579

 	callba ClearSpriteAnims
 	depixel 10, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_03
+	ld a, SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
 	call _InitSpriteAnimStruct
 	ld hl, $7
 	add hl, bc
--- a/engine/decorations.asm
+++ b/engine/decorations.asm
@@ -6,7 +6,7 @@ InitDecorations: ; 26751 (9:6751)
 	ret

 _KrisDecorationMenu: ; 0x2675c
-	ld a, [wcf76]
+	ld a, [wWhichIndexSet]
 	push af
 	ld hl, .MenuDataHeader
 	call LoadMenuDataHeader
@@ -30,7 +30,7 @@ _KrisDecorationMenu: ; 0x2675c
 .exit_menu
 	call ExitMenu
 	pop af
-	ld [wcf76], a
+	ld [wWhichIndexSet], a
 	ld a, [Buffer5]
 	ld c, a
 	ret
@@ -74,7 +74,7 @@ _KrisDecorationMenu: ; 0x2675c

 .FindCategoriesWithOwnedDecos: ; 26806
 	xor a
-	ld [wcf76], a
+	ld [wWhichIndexSet], a
 	call .ClearStringBuffer2
 	call .FindOwndDecos
 	ld a, 7
@@ -374,7 +374,7 @@ PopulateDecoCategoryMenu: ; 2695b
 	cp 8
 	jr nc, .beyond_eight
 	xor a
-	ld [wcf76], a
+	ld [wWhichIndexSet], a
 	ld hl, .NonscrollingMenuDataHeader
 	call LoadMenuDataHeader
 	call DoNthMenu
--- a/engine/learn.asm
+++ b/engine/learn.asm
@@ -4,7 +4,7 @@ LearnMove: ; 6508
 	ld hl, PartyMonNicknames
 	call GetNick
 	ld hl, StringBuffer1
-	ld de, wd050_MonNick
+	ld de, wMonOrItemNameBuffer
 	ld bc, PKMN_NAME_LENGTH
 	call CopyBytes

--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -12,7 +12,7 @@ MainMenu: ; 49cdc
 	ld hl, GameTimerPause
 	res 0, [hl]
 	call Function49da4
-	ld [wcf76], a
+	ld [wWhichIndexSet], a
 	call Function49e09
 	ld hl, MenuDataHeader_0x49d14
 	call LoadMenuDataHeader
--- a/engine/mart.asm
+++ b/engine/mart.asm
@@ -70,10 +70,10 @@ BargainShop: ; 15a84
 Pharmacist: ; 15aae
 	call FarReadMart
 	call LoadStandardMenuDataHeader
-	ld hl, UnknownText_0x15e90
+	ld hl, Text_Pharmacist_Intro
 	call MartTextBox
 	call BuyMenu
-	ld hl, UnknownText_0x15eae
+	ld hl, Text_Pharmacist_ComeAgain
 	call MartTextBox
 	ret
 ; 15ac4
@@ -493,7 +493,7 @@ BuyMenuLoop: ; 15cef
 .useless_pointer
 	call MartAskPurchaseQuantity
 	jr c, .cancel
-	call Function15d97
+	call MartConfirmPurchase
 	jr c, .cancel
 	ld de, Money
 	ld bc, hMoneyTemp
@@ -551,7 +551,7 @@ StandardMartAskPurchaseQuantity:
 	ret
 ; 15d97

-Function15d97: ; 15d97
+MartConfirmPurchase: ; 15d97
 	predef PartyMonItemName
 	ld a, MARTTEXT_COSTS_THIS_MUCH
 	call LoadBuyMenuText
@@ -764,7 +764,7 @@ Text_BargainShop_ComeAgain: ; 0x15e8b
 	db "@"
 ; 0x15e90

-UnknownText_0x15e90: ; 0x15e90
+Text_Pharmacist_Intro: ; 0x15e90
 	; What's up? Need some medicine?
 	text_jump UnknownText_0x1c4e5f
 	db "@"
@@ -800,7 +800,7 @@ Text_Pharmacy_InsufficientFunds: ; 0x15ea9
 	db "@"
 ; 0x15eae

-UnknownText_0x15eae: ; 0x15eae
+Text_Pharmacist_ComeAgain: ; 0x15eae
 	; All right. See you around.
 	text_jump UnknownText_0x1c4ef6
 	db "@"
@@ -810,36 +810,35 @@ UnknownText_0x15eae: ; 0x15eae
 SellMenu: ; 15eb3
 	call DisableSpriteUpdates
 	callba DepositSellInitPackBuffers
-.asm_15ebc
+.loop
 	callba DepositSellPack
 	ld a, [wcf66]
 	and a
-	jp z, Function15ece
-	call Function15ee0
-	jr .asm_15ebc
-; 15ece
+	jp z, .quit
+	call .TryToSellItem
+	jr .loop

-Function15ece: ; 15ece
-	call Function2b74
+.quit
+	call ReturnToMapWithSpeechTextbox
 	and a
 	ret
 ; 15ed3

-Function15ed3: ; unreferenced
-	ld hl, UnknownText_0x15edb
+.NothingToSell: ; unreferenced
+	ld hl, .NothingToSellText
 	call MenuTextBoxBackup
 	and a
 	ret
 ; 15edb

-UnknownText_0x15edb: ; 0x15edb
+.NothingToSellText: ; 0x15edb
 	; You don't have anything to sell.
 	text_jump UnknownText_0x1c4f12
 	db "@"
 ; 0x15ee0


-Function15ee0: ; 15ee0
+.TryToSellItem: ; 15ee0
 	callba CheckItemMenu
 	ld a, [wItemAttributeParamBuffer]
 	ld hl, .jumptable
--- a/engine/mon_icons.asm
+++ b/engine/mon_icons.asm
@@ -243,7 +243,7 @@ Function8e97d: ; 8e97d (23:697d)
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld [hl], SPRITE_ANIM_SEQ_00
+	ld [hl], SPRITE_ANIM_SEQ_NULL
 	ret

 Function8e99a: ; 8e99a (23:699a)
@@ -371,7 +371,7 @@ FreezeMonIcons: ; 8ea4a
 	jr z, .next
 	cp d
 	jr z, .loadwithtwo
-	ld a, SPRITE_ANIM_SEQ_00
+	ld a, SPRITE_ANIM_SEQ_NULL
 	jr .ok

 .loadwithtwo
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -1,7 +1,7 @@
 _NamingScreen: ; 0x116b7
 	call DisableSpriteUpdates
 	call NamingScreen
-	call Function2b74
+	call ReturnToMapWithSpeechTextbox
 	ret
 ; 0x116c1

@@ -174,7 +174,7 @@ Function117f5: ; 117f5 (4:57f5)
 	ld [hli], a
 	ld [hl], a
 	depixel 4, 4, 4, 0
-	ld a, SPRITE_ANIM_INDEX_0A
+	ld a, SPRITE_ANIM_INDEX_WALK_CYCLE
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
@@ -220,7 +220,7 @@ Function11847: ; 11847 (4:5847)
 	ld [hli], a
 	ld [hl], a
 	pop de
-	ld b, SPRITE_ANIM_INDEX_0A
+	ld b, SPRITE_ANIM_INDEX_WALK_CYCLE
 	ld a, d
 	cp $7a
 	jr nz, .asm_11873
--- a/engine/npctrade.asm
+++ b/engine/npctrade.asm
@@ -88,7 +88,7 @@ NPCTrade:: ; fcba8
 	ld [wcf64], a
 	pop af
 	ld [wJumptableIndex], a
-	call Function2b74
+	call ReturnToMapWithSpeechTextbox
 	ret
 ; fcc23

@@ -399,7 +399,7 @@ GetTradeMonNames: ; fce1b
 	ld a, [hl]
 	call GetTradeMonName

-	ld de, wd050
+	ld de, wMonOrItemNameBuffer
 	call CopyTradeName

 	ld hl, StringBuffer1
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -633,7 +633,7 @@ GiveItem: ; 103fd
 	push af
 	call GetCurNick
 	ld hl, StringBuffer1
-	ld de, wd050_MonNick
+	ld de, wMonOrItemNameBuffer
 	ld bc, PKMN_NAME_LENGTH
 	call CopyBytes
 	call TryGiveItemToPartymon
--- a/engine/party_menu.asm
+++ b/engine/party_menu.asm
@@ -8,7 +8,7 @@ SelectMonFromParty: ; 50000
 	call SetPalettes
 	call DelayFrame
 	call PartyMenuSelect
-	call Function2b74
+	call ReturnToMapWithSpeechTextbox
 	ret
 ; 5001d

@@ -25,7 +25,7 @@ SelectTradeOrDaycareMon: ; 5001d
 	call SetPalettes
 	call DelayFrame
 	call PartyMenuSelect
-	call Function2b74
+	call ReturnToMapWithSpeechTextbox
 	ret
 ; 5003f

--- a/engine/phone.asm
+++ b/engine/phone.asm
@@ -274,7 +274,7 @@ endr
 	push hl
 	call LoadCallerScript
 	pop hl
-	ld de, wd048
+	ld de, wPhoneScriptPointer
 	ld a, [hli]
 	ld [de], a
 	inc de
@@ -442,7 +442,7 @@ WrongNumber: ; 90233
 Script_ReceivePhoneCall: ; 0x90241
 	refreshscreen $0
 	callasm RingTwice_StartCall
-	ptcall wd048
+	ptcall wPhoneScriptPointer
 	waitbutton
 	callasm HangUp
 	closetext
--- a/engine/pokecenter_pc.asm
+++ b/engine/pokecenter_pc.asm
@@ -12,7 +12,7 @@ PokemonCenterPC: ; 1559a
 	xor a
 	ld [hBGMapMode], a
 	call .ChooseWhichPCListToUse
-	ld [wcf76], a
+	ld [wWhichIndexSet], a
 	call DoNthMenu
 	jr c, .shutdown
 	ld a, [MenuSelection]
@@ -208,7 +208,7 @@ UnknownText_0x156ff: ; 0x156ff

 _PlayersPC: ; 15704
 	ld a, b
-	ld [wcf76], a
+	ld [wWhichIndexSet], a
 	ld hl, UnknownText_0x157cc
 	call PC_DisplayTextWaitMenu
 	call Function15715
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -673,7 +673,7 @@ Function9102f: ; 9102f (24:502f)
 Function9106a: ; 9106a
 	push af
 	depixel 0, 0
-	ld b, SPRITE_ANIM_INDEX_0A
+	ld b, SPRITE_ANIM_INDEX_WALK_CYCLE
 	ld a, [PlayerGender]
 	bit 0, a
 	jr z, .asm_91079
@@ -709,7 +709,7 @@ Function91098: ; 91098
 	ld [hl], $4
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld [hl], SPRITE_ANIM_SEQ_00
+	ld [hl], SPRITE_ANIM_SEQ_NULL
 	pop af
 	push bc
 	call Function910d4
@@ -2781,7 +2781,7 @@ TownMapMon: ; 91f7b
 	ld [hl], $8
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld [hl], SPRITE_ANIM_SEQ_00
+	ld [hl], SPRITE_ANIM_SEQ_NULL
 	ret
 ; 91fa6

@@ -2808,7 +2808,7 @@ TownMapPlayerIcon: ; 91fa6

 ; Animation/palette
 	depixel 0, 0
-	ld b, SPRITE_ANIM_INDEX_0A ; Male
+	ld b, SPRITE_ANIM_INDEX_WALK_CYCLE ; Male
 	ld a, [PlayerGender]
 	bit 0, a
 	jr z, .got_gender
--- a/engine/radio.asm
+++ b/engine/radio.asm
@@ -274,7 +274,7 @@ endr
 	ld [CurPartySpecies], a
 	call GetPokemonName
 	ld hl, StringBuffer1
-	ld de, wOaksPkmnTalkPkmnNameBuffer
+	ld de, wMonOrItemNameBuffer
 	ld bc, PKMN_NAME_LENGTH
 	call CopyBytes
 	; Now that we've chosen our wild Pokemon,
--- a/engine/rtc.asm
+++ b/engine/rtc.asm
@@ -163,7 +163,7 @@ Function140ae: ; 140ae
 	ret
 ; 140ed

-Function140ed:: ; 140ed
+_InitTime:: ; 140ed
 	call GetClock
 	call FixDays
 	ld hl, hRTCSeconds
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -877,7 +877,7 @@ endr
 Script_scripttalkafter: ; 97125
 ; script command 0x65

-	ld hl, wd04b
+	ld hl, wScriptAfterPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
--- a/engine/sprite_anims.asm
+++ b/engine/sprite_anims.asm
@@ -16,18 +16,18 @@ endr

 .Jumptable: ; 8d25b (23:525b)
 	jumptable_start
-	jumptable .zero        ; null
+	jumptable .Null        ; null
 	jumptable .one         ; bouncing mon icon
 	jumptable .two         ; bouncing mon icon, selected
 	jumptable .three       ; bouncing mon icon, menu open
 	jumptable .four
 	jumptable .five
-	jumptable .six         ; Game Freak logo
+	jumptable .GameFreakLogo         ; Game Freak logo
 	jumptable .seven
 	jumptable .eight
-	jumptable .nine        ; Something to do with slots
-	jumptable .ten         ; Something to do with slots
-	jumptable .eleven      ; Something to do with slots
+	jumptable .SlotsGolem        ; Something to do with slots
+	jumptable .SlotsChansey         ; Something to do with slots
+	jumptable .SlotsChanseyEgg      ; Something to do with slots
 	jumptable .twelve      ; blinking cursor
 	jumptable .thirteen
 	jumptable .fourteen
@@ -35,12 +35,12 @@ endr
 	jumptable .sixteen
 	jumptable .seventeen
 	jumptable .eighteen
-	jumptable .nineteen    ; finish egg hatching animation
-	jumptable .twenty      ; radio tuning knob
+	jumptable .EggShell    ; finish egg hatching animation
+	jumptable .RadioTuningKnob      ; radio tuning knob
 	jumptable .twentyone   ; cut grass leaves
-	jumptable .twentytwo   ; flying sprite
-	jumptable .twentythree ; flying leaves
-	jumptable .twentyfour
+	jumptable .FlyFrom   ; flying sprite
+	jumptable .FlyLeaf ; flying leaves
+	jumptable .FlyTo  ; fly to
 	jumptable .twentyfive
 	jumptable .twentysix
 	jumptable .twentyseven
@@ -53,7 +53,7 @@ endr
 	jumptable .thirtyfour  ; intro suicune facing away from us


-.zero: ; 8d2a1 (23:52a1)
+.Null: ; 8d2a1 (23:52a1)
 	ret

 .one: ; 8d2a2 (23:52a2)
@@ -94,13 +94,13 @@ endr
 	add hl, bc
 	ld a, d
 	and $10 ; bit 4
-	jr z, .load_zero
+	jr z, .load_Null
 	ld a, e
 	and a
 	jr z, .load_minus_two
 	cp $1
 	jr z, .load_minus_one
-.load_zero
+.load_Null
 	xor a
 	ld [hl], a
 	ret
@@ -140,11 +140,11 @@ endr
 ; 8d306 (23:5306)

 ; Anonymous jumptable (see .anonymous_jumptable)
-	dw .four_zero
+	dw .four_Null
 	dw .four_one
 ; 8d30a

-.four_zero: ; 8d30a
+.four_Null: ; 8d30a
 	call .IncrementSpriteAnimStruct0B

 	ld hl, SPRITEANIMSTRUCT_INDEX
@@ -227,7 +227,7 @@ endr
 	callab Function120c1
 	ret

-.six: ; 8d37a (23:537a)
+.GameFreakLogo: ; 8d37a (23:537a)
 	callab GameFreakLogoJumper
 	ret

@@ -359,11 +359,11 @@ endr
 	call DeinitializeSprite
 	ret

-.nine: ; 8d422 (23:5422)
+.SlotsGolem: ; 8d422 (23:5422)
 	callab SlotMachine_AnimateGolem
 	ret

-.ten: ; 8d429 (23:5429)
+.SlotsChansey: ; 8d429 (23:5429)
 	callab Slots_AnimateChansey
 	ld hl, wcf64
 	ld a, [hl]
@@ -374,7 +374,7 @@ endr
 	call _ReinitSpriteAnimFrame
 	ret

-.eleven: ; 8d43e (23:543e)
+.SlotsChanseyEgg: ; 8d43e (23:543e)
 	ld hl, SPRITEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -425,7 +425,7 @@ endr
 ; 8d487 (23:5487)

 ; Anonymous jumptable (see .anonymous_jumptable)
-	dw .sixteen_zero
+	dw .sixteen_Null
 	dw .sixteen_one
 	dw .sixteen_two
 	dw .sixteen_three
@@ -433,7 +433,7 @@ endr
 	dw .sixteen_five
 ; 8d493

-.sixteen_zero: ; 8d493
+.sixteen_Null: ; 8d493
 	ld a, $14
 	call _ReinitSpriteAnimFrame

@@ -573,12 +573,12 @@ endr
 	callab Function29676
 	ret

-.nineteen: ; 8d54a (23:554a)
+.EggShell: ; 8d54a (23:554a)
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
 	cp $80
-	jr nc, .finish_nineteen
+	jr nc, .finish_EggShell
 	ld d, a
 	add $8
 	ld [hl], a
@@ -606,11 +606,11 @@ endr
 	ld [hl], a
 	ret

-.finish_nineteen
+.finish_EggShell
 	call DeinitializeSprite
 	ret

-.twenty: ; 8d578 (23:5578)
+.RadioTuningKnob: ; 8d578 (23:5578)
 	callab AnimateTuningKnob
 	ret

@@ -653,7 +653,7 @@ endr
 	ld [hl], a
 	ret

-.twentytwo: ; 8d5b0 (23:55b0)
+.FlyFrom: ; 8d5b0 (23:55b0)
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -678,10 +678,10 @@ endr
 	ld a, [hl]
 	ld d, a
 	cp $40
-	jr nc, .asm_8d5d3
+	jr nc, .skip
 	add $8
 	ld [hl], a
-.asm_8d5d3
+.skip
 	ld hl, SPRITEANIMSTRUCT_0E
 	add hl, bc
 	ld a, [hl]
@@ -693,12 +693,12 @@ endr
 	ld [hl], a
 	ret

-.twentythree: ; 8d5e2 (23:55e2)
+.FlyLeaf: ; 8d5e2 (23:55e2)
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
-	cp $b8
-	jr nc, .asm_8d603
+	cp -9 * 8
+	jr nc, .delete_leaf
 rept 2
 	inc [hl]
 endr
@@ -706,8 +706,8 @@ endr
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	dec [hl]
-	ld d, $40

+	ld d, $40
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -718,15 +718,16 @@ endr
 	add hl, bc
 	ld [hl], a
 	ret
-.asm_8d603
+
+.delete_leaf
 	call DeinitializeSprite
 	ret

-.twentyfour: ; 8d607 (23:5607)
+.FlyTo: ; 8d607 (23:5607)
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
-	cp $54
+	cp 10 * 8 + 4
 	ret z

 	ld hl, SPRITEANIMSTRUCT_YCOORD
--- a/engine/sprites.asm
+++ b/engine/sprites.asm
@@ -561,48 +561,48 @@ SpriteAnimSeqData: ; 8d1c4
 	db SPRITE_ANIM_FRAMESET_01, SPRITE_ANIM_SEQ_01, $00 ; 00
 	db SPRITE_ANIM_FRAMESET_07, SPRITE_ANIM_SEQ_04, $00 ; 01
 	db SPRITE_ANIM_FRAMESET_08, SPRITE_ANIM_SEQ_05, $05 ; 02
-	db SPRITE_ANIM_FRAMESET_0A, SPRITE_ANIM_SEQ_06, $00 ; 03
+	db SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO, SPRITE_ANIM_SEQ_GAMEFREAK_LOGO, $00 ; 03
 	db SPRITE_ANIM_FRAMESET_0B, SPRITE_ANIM_SEQ_07, $06 ; 04
 	db SPRITE_ANIM_FRAMESET_0C, SPRITE_ANIM_SEQ_08, $06 ; 05
 	db SPRITE_ANIM_FRAMESET_SLOT_GOLEM, SPRITE_ANIM_SEQ_SLOT_GOLEM, $07 ; 06 slots golem
 	db SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY, SPRITE_ANIM_SEQ_SLOTS_CHANSEY, $07 ; 07 slots chansey
 	db SPRITE_ANIM_FRAMESET_SLOTS_EGG, SPRITE_ANIM_SEQ_SLOTS_EGG, $07 ; 08 slots egg
 	db SPRITE_ANIM_FRAMESET_08, SPRITE_ANIM_SEQ_0C, $05 ; 09
-	db SPRITE_ANIM_FRAMESET_11, SPRITE_ANIM_SEQ_00, $00 ; 0a flying sprite
+	db SPRITE_ANIM_FRAMESET_WALK_CYCLE, SPRITE_ANIM_SEQ_NULL, $00 ; 0a walk cycle
 	db SPRITE_ANIM_FRAMESET_12, SPRITE_ANIM_SEQ_0D, $08 ; 0b
 	db SPRITE_ANIM_FRAMESET_12, SPRITE_ANIM_SEQ_0E, $08 ; 0c
 	db SPRITE_ANIM_FRAMESET_12, SPRITE_ANIM_SEQ_0F, $08 ; 0d
 	db SPRITE_ANIM_FRAMESET_13, SPRITE_ANIM_SEQ_10, $00 ; 0e
-	db SPRITE_ANIM_FRAMESET_15, SPRITE_ANIM_SEQ_00, $00 ; 0f
+	db SPRITE_ANIM_FRAMESET_15, SPRITE_ANIM_SEQ_NULL, $00 ; 0f
 	db SPRITE_ANIM_FRAMESET_16, SPRITE_ANIM_SEQ_11, $00 ; 10
 	db SPRITE_ANIM_FRAMESET_17, SPRITE_ANIM_SEQ_12, $00 ; 11
 	db SPRITE_ANIM_FRAMESET_18, SPRITE_ANIM_SEQ_12, $00 ; 12
 	db SPRITE_ANIM_FRAMESET_19, SPRITE_ANIM_SEQ_13, $00 ; 13
 	db SPRITE_ANIM_FRAMESET_1A, SPRITE_ANIM_SEQ_14, $00 ; 14 radio tuning knob
-	db SPRITE_ANIM_FRAMESET_1B, SPRITE_ANIM_SEQ_00, $00 ; 15
-	db SPRITE_ANIM_FRAMESET_1D, SPRITE_ANIM_SEQ_15, $00 ; 16 leaves when cutting down a tree
-	db SPRITE_ANIM_FRAMESET_1E, SPRITE_ANIM_SEQ_00, $00 ; 17
-	db SPRITE_ANIM_FRAMESET_1D, SPRITE_ANIM_SEQ_17, $00 ; 18 flying leaves
-	db SPRITE_ANIM_FRAMESET_1F, SPRITE_ANIM_SEQ_00, $00 ; 19
+	db SPRITE_ANIM_FRAMESET_1B, SPRITE_ANIM_SEQ_NULL, $00 ; 15
+	db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_15, $00 ; 16 leaves when cutting down a tree
+	db SPRITE_ANIM_FRAMESET_1E, SPRITE_ANIM_SEQ_NULL, $00 ; 17
+	db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_FLY_LEAF, $00 ; 18 flying leaves
+	db SPRITE_ANIM_FRAMESET_1F, SPRITE_ANIM_SEQ_NULL, $00 ; 19
 	db SPRITE_ANIM_FRAMESET_24, SPRITE_ANIM_SEQ_19, $00 ; 1a
-	db SPRITE_ANIM_FRAMESET_25, SPRITE_ANIM_SEQ_00, $00 ; 1b headbutt
+	db SPRITE_ANIM_FRAMESET_25, SPRITE_ANIM_SEQ_NULL, $00 ; 1b headbutt
 	db SPRITE_ANIM_FRAMESET_20, SPRITE_ANIM_SEQ_13, $00 ; 1c
 	db SPRITE_ANIM_FRAMESET_26, SPRITE_ANIM_SEQ_1A, $00 ; 1d
-	db SPRITE_ANIM_FRAMESET_2D, SPRITE_ANIM_SEQ_00, $00 ; 1e
-	db SPRITE_ANIM_FRAMESET_2E, SPRITE_ANIM_SEQ_00, $00 ; 1f
-	db SPRITE_ANIM_FRAMESET_2F, SPRITE_ANIM_SEQ_00, $00 ; 20
-	db SPRITE_ANIM_FRAMESET_30, SPRITE_ANIM_SEQ_00, $00 ; 21
-	db SPRITE_ANIM_FRAMESET_31, SPRITE_ANIM_SEQ_00, $00 ; 22
+	db SPRITE_ANIM_FRAMESET_2D, SPRITE_ANIM_SEQ_NULL, $00 ; 1e
+	db SPRITE_ANIM_FRAMESET_2E, SPRITE_ANIM_SEQ_NULL, $00 ; 1f
+	db SPRITE_ANIM_FRAMESET_2F, SPRITE_ANIM_SEQ_NULL, $00 ; 20
+	db SPRITE_ANIM_FRAMESET_30, SPRITE_ANIM_SEQ_NULL, $00 ; 21
+	db SPRITE_ANIM_FRAMESET_31, SPRITE_ANIM_SEQ_NULL, $00 ; 22
 	db SPRITE_ANIM_FRAMESET_32, SPRITE_ANIM_SEQ_1B, $00 ; 23
 	db SPRITE_ANIM_FRAMESET_33, SPRITE_ANIM_SEQ_1C, $00 ; 24
-	db SPRITE_ANIM_FRAMESET_34, SPRITE_ANIM_SEQ_00, $00 ; 25
+	db SPRITE_ANIM_FRAMESET_34, SPRITE_ANIM_SEQ_NULL, $00 ; 25
 	db SPRITE_ANIM_FRAMESET_35, SPRITE_ANIM_SEQ_1D, $00 ; 26
 	db SPRITE_ANIM_FRAMESET_37, SPRITE_ANIM_SEQ_1E, $00 ; 27
 	db SPRITE_ANIM_FRAMESET_38, SPRITE_ANIM_SEQ_1E, $00 ; 28
 	db SPRITE_ANIM_FRAMESET_39, SPRITE_ANIM_SEQ_20, $00 ; 29 intro unown
 	db SPRITE_ANIM_FRAMESET_3F, SPRITE_ANIM_SEQ_21, $00 ; 2a
 	db SPRITE_ANIM_FRAMESET_3E, SPRITE_ANIM_SEQ_22, $00 ; 2b
-	db SPRITE_ANIM_FRAMESET_40, SPRITE_ANIM_SEQ_00, $00 ; 2c
+	db SPRITE_ANIM_FRAMESET_40, SPRITE_ANIM_SEQ_NULL, $00 ; 2c
 ; 8d24b

 INCLUDE "engine/sprite_anims.asm" ; DoAnimFrame
--- a/Show More
+++ b/Show More