summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/credits_strings.asm2
-rw-r--r--data/sprite_anims/framesets.asm16
-rw-r--r--data/sprite_anims/oam.asm26
-rw-r--r--data/sprite_anims/sequences.asm4
4 files changed, 24 insertions, 24 deletions
diff --git a/data/credits_strings.asm b/data/credits_strings.asm
index 7d1996a4c..22ee7c382 100644
--- a/data/credits_strings.asm
+++ b/data/credits_strings.asm
@@ -1,4 +1,4 @@
-CreditsStrings:
+CreditsStringsPointers:
; entries correspond to constants/credits_constants.asm
dw .SatoshiTajiri
dw .JunichiMasuda
diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm
index 549b4b637..ac50d8031 100644
--- a/data/sprite_anims/framesets.asm
+++ b/data/sprite_anims/framesets.asm
@@ -36,7 +36,7 @@ SpriteAnimFrameData:
dw .Frameset_EggHatch2
dw .Frameset_EggHatch3
dw .Frameset_EggHatch4
- dw .Frameset_GSIntroHoOh
+ dw .Frameset_GSIntroHoOhLugia
dw .Frameset_HeadbuttTree
dw .Frameset_EZChatCursor1
dw .Frameset_EZChatCursor2
@@ -325,13 +325,13 @@ SpriteAnimFrameData:
frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_X_FLIP, OAM_Y_FLIP
endanim
-.Frameset_GSIntroHoOh:
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1, 10
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2, 9
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3, 10
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4, 10
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3, 9
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5, 10
+.Frameset_GSIntroHoOhLugia:
+ frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_1, 10
+ frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2, 9
+ frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3, 10
+ frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_4, 10
+ frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3, 9
+ frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_5, 10
dorestart
.Frameset_HeadbuttTree:
diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm
index 23591c6b7..1667766c7 100644
--- a/data/sprite_anims/oam.asm
+++ b/data/sprite_anims/oam.asm
@@ -9,10 +9,10 @@ SpriteAnimOAMData:
dbw $6e, .OAMData_GSIntroShellder ; SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_2
dbw $2d, .OAMData_GSIntroMagikarp ; SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1
dbw $4d, .OAMData_GSIntroMagikarp ; SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2
- dbw $60, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1
+ dbw $60, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_UNUSED_LAPRAS
+ dbw $00, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1
dbw $00, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2
- dbw $00, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3
- dbw $06, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4
+ dbw $06, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3
dbw $0c, .OAMData_GSIntroNote ; SPRITE_ANIM_OAMSET_GS_INTRO_NOTE
dbw $0d, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_INVISIBLE_NOTE
dbw $00, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1
@@ -87,11 +87,11 @@ SpriteAnimOAMData:
dbw $00, .OAMData_CutTree4 ; SPRITE_ANIM_OAMSET_CUT_TREE_4
dbw $00, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_EGG_CRACK
dbw $01, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_EGG_HATCH
- dbw $00, .OAMData_GSIntroHoOh1 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1
- dbw $00, .OAMData_GSIntroHoOh2 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2
- dbw $00, .OAMData_GSIntroHoOh3 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3
- dbw $00, .OAMData_GSIntroHoOh4 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4
- dbw $00, .OAMData_GSIntroHoOh5 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5
+ dbw $00, .OAMData_GSIntroHoOhLugia1 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_1
+ dbw $00, .OAMData_GSIntroHoOhLugia2 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2
+ dbw $00, .OAMData_GSIntroHoOhLugia3 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3
+ dbw $00, .OAMData_GSIntroHoOhLugia4 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_4
+ dbw $00, .OAMData_GSIntroHoOhLugia5 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_5
dbw $04, .OAMData_Tree ; SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2
dbw $00, .OAMData_EZChatCursor1 ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_1
dbw $00, .OAMData_EZChatCursor2 ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_2
@@ -586,7 +586,7 @@ SpriteAnimOAMData:
dbsprite -2, 0, 0, 0, $02, PAL_OW_TREE
dbsprite 1, 0, 0, 0, $03, PAL_OW_TREE
-.OAMData_GSIntroHoOh1:
+.OAMData_GSIntroHoOhLugia1:
db 19
dbsprite -4, -1, 0, 0, $00, 0
dbsprite -3, -2, 0, 0, $02, 0
@@ -608,7 +608,7 @@ SpriteAnimOAMData:
dbsprite 3, -2, 0, 0, $22, 0
dbsprite 3, 0, 0, 0, $24, 0
-.OAMData_GSIntroHoOh2:
+.OAMData_GSIntroHoOhLugia2:
db 16
dbsprite -4, -1, 0, 0, $00, 0
dbsprite -3, -2, 0, 0, $02, 0
@@ -627,7 +627,7 @@ SpriteAnimOAMData:
dbsprite 3, -2, 0, 0, $22, 0
dbsprite 3, 0, 0, 0, $24, 0
-.OAMData_GSIntroHoOh3:
+.OAMData_GSIntroHoOhLugia3:
db 15
dbsprite -4, -1, 0, 0, $00, 0
dbsprite -3, -2, 0, 0, $02, 0
@@ -645,7 +645,7 @@ SpriteAnimOAMData:
dbsprite 3, -2, 0, 0, $22, 0
dbsprite 3, 0, 0, 0, $24, 0
-.OAMData_GSIntroHoOh4:
+.OAMData_GSIntroHoOhLugia4:
db 17
dbsprite -4, -1, 0, 0, $00, 0
dbsprite -3, -2, 0, 0, $02, 0
@@ -665,7 +665,7 @@ SpriteAnimOAMData:
dbsprite 3, -2, 0, 0, $22, 0
dbsprite 3, 0, 0, 0, $24, 0
-.OAMData_GSIntroHoOh5:
+.OAMData_GSIntroHoOhLugia5:
db 17
dbsprite -4, -1, 0, 0, $00, 0
dbsprite -3, -2, 0, 0, $02, 0
diff --git a/data/sprite_anims/sequences.asm b/data/sprite_anims/sequences.asm
index 77171bb8f..1c2cfa721 100644
--- a/data/sprite_anims/sequences.asm
+++ b/data/sprite_anims/sequences.asm
@@ -1,6 +1,6 @@
SpriteAnimSeqData:
; entries correspond to SPRITE_ANIM_INDEX_* constants
- ; frameset sequence, tile
+ ; frameset, sequence, tile
db SPRITE_ANIM_FRAMESET_PARTY_MON, SPRITE_ANIM_SEQ_PARTY_MON, $00 ; SPRITE_ANIM_INDEX_PARTY_MON
db SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL, SPRITE_ANIM_SEQ_GS_TITLE_TRAIL, $00 ; SPRITE_ANIM_INDEX_GS_TITLE_TRAIL
db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR, $05 ; SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR
@@ -27,7 +27,7 @@ SpriteAnimSeqData:
db SPRITE_ANIM_FRAMESET_CUT_TREE, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_CUT_TREE
db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_FLY_LEAF, $00 ; SPRITE_ANIM_INDEX_FLY_LEAF
db SPRITE_ANIM_FRAMESET_EGG_CRACK, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_EGG_CRACK
- db SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH, SPRITE_ANIM_SEQ_GS_INTRO_HO_OH, $00 ; SPRITE_ANIM_INDEX_GS_INTRO_HO_OH
+ db SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH_LUGIA, SPRITE_ANIM_SEQ_GS_INTRO_HO_OH_LUGIA, $00 ; SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA
db SPRITE_ANIM_FRAMESET_HEADBUTT, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_HEADBUTT
db SPRITE_ANIM_FRAMESET_EGG_HATCH_1, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 ; SPRITE_ANIM_INDEX_EGG_HATCH
db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1, SPRITE_ANIM_SEQ_EZCHAT_CURSOR, $00 ; SPRITE_ANIM_INDEX_EZCHAT_CURSOR
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 17:05:09 +0000