pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Group unused data

Browse Source
This commit is contained in:
Remy Oukaour 2018-01-15 00:44:40 -05:00
parent 07b8fe2983
commit fe3ef73a8c
9 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/sprite_anim_constants.asm
View File

@ -189,7 +189,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 ; 0a const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 ; 0a
const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4 ; 0b const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4 ; 0b
const SPRITE_ANIM_OAMSET_GS_INTRO_NOTE ; 0c const SPRITE_ANIM_OAMSET_GS_INTRO_NOTE ; 0c
const SPRITE_ANIM_OAMSET_GS_INTRO_SMALL_NOTE ; 0d const SPRITE_ANIM_OAMSET_GS_INTRO_INVISIBLE_NOTE ; 0d
const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1 ; 0e const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1 ; 0e
const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2 ; 0f const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2 ; 0f
const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3 ; 10 const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3 ; 10

2
data/sprite_anims/oam.asm
View File

@ -14,7 +14,7 @@ SpriteAnimOAMData: ; 8d94d
dbw $00, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 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_4
dbw $0c, .OAMData_GSIntroNote ; SPRITE_ANIM_OAMSET_GS_INTRO_NOTE dbw $0c, .OAMData_GSIntroNote ; SPRITE_ANIM_OAMSET_GS_INTRO_NOTE
dbw $0d, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_SMALL_NOTE dbw $0d, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_INVISIBLE_NOTE
dbw $00, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1 dbw $00, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1
dbw $04, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2 dbw $04, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2
dbw $08, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3 dbw $08, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3

0
data/unused_text/dakutens.asm → data/unused/dakutens.asm
View File

0
data/unused_text/gen_1_trainers.asm → data/unused/gen_1_trainer_names.asm
View File

0
data/unused_text/sweet_honey.asm → data/unused/sweet_honey_text.asm
View File

0
data/unknown_table.asm → data/unused/unknown_53d84.asm
View File

2
engine/namingscreen.asm
View File

@ -771,7 +771,7 @@ NamingScreen_AdvanceCursor_CheckEndOfString: ; 11b27
; 11b56 ; 11b56
INCLUDE "data/unused_text/dakutens.asm" INCLUDE "data/unused/dakutens.asm"
; 11bbc ; 11bbc

4
main.asm
View File

@ -253,7 +253,7 @@ INCLUDE "engine/events/basement_key.asm"
INCLUDE "engine/events/sacred_ash.asm" INCLUDE "engine/events/sacred_ash.asm"
INCLUDE "engine/tempmon.asm" INCLUDE "engine/tempmon.asm"
INCLUDE "engine/types.asm" INCLUDE "engine/types.asm"
INCLUDE "data/unused_text/gen_1_trainers.asm" INCLUDE "data/unused/gen_1_trainer_names.asm"
INCLUDE "engine/mon_stats.asm" INCLUDE "engine/mon_stats.asm"
INCLUDE "engine/routines/initlist.asm" INCLUDE "engine/routines/initlist.asm"
INCLUDE "engine/experience.asm" INCLUDE "engine/experience.asm"
@ -262,7 +262,7 @@ INCLUDE "gfx/load_pics.asm"
INCLUDE "engine/move_mon_wo_mail.asm" INCLUDE "engine/move_mon_wo_mail.asm"
INCLUDE "data/pokemon/base_stats.asm" INCLUDE "data/pokemon/base_stats.asm"
INCLUDE "data/pokemon/names.asm" INCLUDE "data/pokemon/names.asm"
INCLUDE "data/unknown_table.asm" INCLUDE "data/unused/unknown_53d84.asm"
UnknownEggPic:: ; 53d9c UnknownEggPic:: ; 53d9c
; Another egg pic. This is shifted up a few pixels. ; Another egg pic. This is shifted up a few pixels.

2
maps/GoldenrodNameRater.asm
View File

@ -22,7 +22,7 @@ GoldenrodNameRaterBookshelf:
GoldenrodNameRaterRadio: GoldenrodNameRaterRadio:
jumpstd radio2 jumpstd radio2
INCLUDE "data/unused_text/sweet_honey.asm" INCLUDE "data/unused/sweet_honey_text.asm"
GoldenrodNameRater_MapEventHeader: GoldenrodNameRater_MapEventHeader:
; filler ; filler