ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-28 16:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

move wild data to C

Browse Source
This commit is contained in:
DizzyEggg 2018-02-05 22:27:29 +01:00
parent e6eae224fc
commit 541fef5368
5 changed files with 4562 additions and 4827 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

295
data/wild_encounter.s
View File

@ -1,295 +0,0 @@
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
@ 85507E4
.include "data/wild_mons.inc"
gBattlePyramidPlaceholders_1:: @ 55370C
wild_mon SPECIES_BULBASAUR, 5
wild_mon SPECIES_BULBASAUR, 5
wild_mon SPECIES_BULBASAUR, 5
wild_mon SPECIES_BULBASAUR, 5
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_CHARMANDER, 5
gBattlePyramidPlaceholders_1Info:: @ 55373C
.4byte 4
.4byte gBattlePyramidPlaceholders_1
gBattlePyramidPlaceholders_2:: @ 553744
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMANDER, 5
gBattlePyramidPlaceholders_2Info:: @ 553774
.4byte 4
.4byte gBattlePyramidPlaceholders_2
gBattlePyramidPlaceholders_3:: @ 55377C
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARIZARD, 5
gBattlePyramidPlaceholders_3Info:: @ 5537AC
.4byte 4
.4byte gBattlePyramidPlaceholders_3
gBattlePyramidPlaceholders_4:: @ 5537B4
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_SQUIRTLE, 5
gBattlePyramidPlaceholders_4Info:: @ 5537E4
.4byte 4
.4byte gBattlePyramidPlaceholders_4
gBattlePyramidPlaceholders_5:: @ 5537EC
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_WARTORTLE, 5
gBattlePyramidPlaceholders_5Info:: @ 55381C
.4byte 4
.4byte gBattlePyramidPlaceholders_5
gBattlePyramidPlaceholders_6:: @ 553824
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
gBattlePyramidPlaceholders_6Info:: @ 553854
.4byte 4
.4byte gBattlePyramidPlaceholders_6
gBattlePyramidPlaceholders_7:: @ 55385C
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
gBattlePyramidPlaceholders_7Info:: @ 55388C
.4byte 8
.4byte gBattlePyramidPlaceholders_7
gBattlePyramidWildMonHeaders:: @ 8553894
.byte 0, 1
.2byte 0
.4byte gBattlePyramidPlaceholders_1Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 2
.2byte 0
.4byte gBattlePyramidPlaceholders_2Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 3
.2byte 0
.4byte gBattlePyramidPlaceholders_3Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 4
.2byte 0
.4byte gBattlePyramidPlaceholders_4Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 5
.2byte 0
.4byte gBattlePyramidPlaceholders_5Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 6
.2byte 0
.4byte gBattlePyramidPlaceholders_6Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 7
.2byte 0
.4byte gBattlePyramidPlaceholders_7Info
.4byte NULL
.4byte NULL
.4byte NULL
.2byte 0xFFFF
.2byte 0
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
gBattlePikeMons_1:: @ 8553934
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
gBattlePikeMonsInfo_1:: @ 8553964
.4byte 10
.4byte gBattlePikeMons_1
gBattlePikeMons_2:: @ 855396C
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
gBattlePikeMonsInfo_2:: @ 855399C
.4byte 10
.4byte gBattlePikeMons_2
gBattlePikeMons_3:: @ 85539A4
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
gBattlePikeMonsInfo_3:: @ 85539D4
.4byte 10
.4byte gBattlePikeMons_3
gBattlePikeMons_4:: @ 85539DC
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
gBattlePikeMonsInfo_4:: @ 8553A0C
.4byte 10
.4byte gBattlePikeMons_4
gBattlePikeWildMonHeaders:: @ 8553A14
.byte 0, 1
.2byte 0
.4byte gBattlePikeMonsInfo_1
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 2
.2byte 0
.4byte gBattlePikeMonsInfo_2
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 3
.2byte 0
.4byte gBattlePikeMonsInfo_3
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 4
.2byte 0
.4byte gBattlePikeMonsInfo_4
.4byte NULL
.4byte NULL
.4byte NULL
.2byte 0xFFFF
.2byte 0
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
gWildFeebasRoute119Data:: @ 8553A78
wild_mon SPECIES_FEEBAS, 20, 25
gRoute119WaterTileData:: @ 8553A7C
.2byte 0, 0x2D, 0, 0x2E, 0x5B, 0x83, 0x5C, 0x8B, 0x12A, 0

4524
data/wild_mons.inc
View File

File diff suppressed because it is too large Load Diff

3
include/constants/maps.h
View File

@ -56,6 +56,9 @@
#define MAP_UNDERWATER2 (51 | (0 << 8))
#define MAP_UNDERWATER3 (52 | (0 << 8))
#define MAP_UNDERWATER4 (53 | (0 << 8))
#define MAP_UNDERWATER5 (54 | (0 << 8))
#define MAP_UNDERWATER6 (55 | (0 << 8))
#define MAP_UNDERWATER7 (56 | (0 << 8))
// Map Group 1
#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8))

2
ld_script.txt
View File

@ -426,7 +426,7 @@ SECTIONS {
src/battle_setup.o(.rodata);
data/cable_club.o(.rodata);
src/trainer_see.o(.rodata);
data/wild_encounter.o(.rodata);
src/wild_encounter.o(.rodata);
data/field_effect.o(.rodata);
src/option_menu.o(.rodata);
src/pokedex.o(.rodata);

4565
src/wild_encounter.c
View File

File diff suppressed because it is too large Load Diff