Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Match InitShadowSprites and move missing data to pokemon.c #305

Merged
merged 1 commit into from
Dec 20, 2024
+149 −248
Merged

Match InitShadowSprites and move missing data to pokemon.c #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 0 additions & 147 deletions asm/pokemon_2.s
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions data/data_81076E4.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,5 @@
.section .rodata

.global gUnknown_810763C
gUnknown_810763C: @ 810763C
.string "{color}%c%s{reset}\0"

.global gUnknown_8107645
gUnknown_8107645: @ 8107645
.byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

.global gUnknown_8107654
gUnknown_8107654: @ 8107654
.byte 0x9d, 0x01, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00
.byte 0x33, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

.global gUnknown_8107684
gUnknown_8107684: @ 8107684
.string "kao%03d\0"
.align 2,0

.global gUnknown_810768C
gUnknown_810768C: @ 810768C
.string "lvmp%03d\0"
.align 2,0

.global gShadowSpriteSizeFlags_8107698
gShadowSpriteSizeFlags_8107698: @ 8107698
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00

.global gUnknown_81076BC
gUnknown_81076BC: @ 81076BC
.string "etcfont\0"
.align 2,0

.global gUnknown_81076C4
gUnknown_81076C4: @ 81076C4
.4byte -4
.4byte -8
.4byte -16
.4byte -4
.4byte -8
.4byte -16
.align 2,0

@ pokemon_3 #1
Expand Down
1 change: 0 additions & 1 deletion ld_script.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ SECTIONS {
src/code_80869E4.o(.text);
src/dungeon_cutscenes.o(.text);
src/pokemon.o(.text);
asm/pokemon_2.o(.text);
src/pokemon_3.o(.text);
src/dungeon.o(.text);
asm/dungeon_2.o(.text);
Expand Down
Loading
Loading