Merge branch 'master' into data_dump
This commit is contained in:
+3
-1
@@ -131,7 +131,7 @@ SECTIONS {
|
||||
src/pokedex.o(.text);
|
||||
asm/trainer_card.o(.text);
|
||||
asm/pokemon_storage_system.o(.text);
|
||||
asm/pokemon_icon.o(.text);
|
||||
src/pokemon_icon.o(.text);
|
||||
asm/script_movement.o(.text);
|
||||
asm/fldeff_cut.o(.text);
|
||||
src/mail_data.o(.text);
|
||||
@@ -420,6 +420,8 @@ SECTIONS {
|
||||
src/title_screen.o(.rodata);
|
||||
data/field_weather.o(.rodata);
|
||||
data/data_835B488.o(.rodata);
|
||||
src/pokemon_icon.o(.rodata);
|
||||
data/data_835B488.o(.rodata.83D4100);
|
||||
src/item_menu_icons.o(.rodata);
|
||||
src/battle_anim_mon_movement.o(.rodata);
|
||||
src/item.o(.rodata);
|
||||
|
||||
Reference in New Issue
Block a user