ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

finish battle tower data except sRubyFacilityClassToEmerald

Browse Source
This commit is contained in:
garak 2018-12-04 12:09:35 -05:00
parent e69cb6b276
commit 80c3258504
12 changed files with 23990 additions and 28737 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
data/battle_frontier/battle_frontier_held_items.inc
View File

@ -1,65 +0,0 @@
.align 2
gBattleFrontierHeldItems:: @ 85CECB0
.2byte ITEM_NONE
.2byte ITEM_KINGS_ROCK
.2byte ITEM_SITRUS_BERRY
.2byte ITEM_ORAN_BERRY
.2byte ITEM_CHESTO_BERRY
.2byte ITEM_HARD_STONE
.2byte ITEM_FOCUS_BAND
.2byte ITEM_PERSIM_BERRY
.2byte ITEM_MIRACLE_SEED
.2byte ITEM_BERRY_JUICE
.2byte ITEM_MACHO_BRACE
.2byte ITEM_SILVER_POWDER
.2byte ITEM_CHERI_BERRY
.2byte ITEM_BLACK_GLASSES
.2byte ITEM_BLACK_BELT
.2byte ITEM_SOUL_DEW
.2byte ITEM_CHOICE_BAND
.2byte ITEM_MAGNET
.2byte ITEM_SILK_SCARF
.2byte ITEM_WHITE_HERB
.2byte ITEM_DEEP_SEA_SCALE
.2byte ITEM_DEEP_SEA_TOOTH
.2byte ITEM_MYSTIC_WATER
.2byte ITEM_SHARP_BEAK
.2byte ITEM_QUICK_CLAW
.2byte ITEM_LEFTOVERS
.2byte ITEM_RAWST_BERRY
.2byte ITEM_LIGHT_BALL
.2byte ITEM_POISON_BARB
.2byte ITEM_NEVER_MELT_ICE
.2byte ITEM_ASPEAR_BERRY
.2byte ITEM_SPELL_TAG
.2byte ITEM_BRIGHT_POWDER
.2byte ITEM_LEPPA_BERRY
.2byte ITEM_SCOPE_LENS
.2byte ITEM_TWISTED_SPOON
.2byte ITEM_METAL_COAT
.2byte ITEM_MENTAL_HERB
.2byte ITEM_CHARCOAL
.2byte ITEM_PECHA_BERRY
.2byte ITEM_SOFT_SAND
.2byte ITEM_LUM_BERRY
.2byte ITEM_DRAGON_SCALE
.2byte ITEM_DRAGON_FANG
.2byte ITEM_IAPAPA_BERRY
.2byte ITEM_WIKI_BERRY
.2byte ITEM_SEA_INCENSE
.2byte ITEM_SHELL_BELL
.2byte ITEM_SALAC_BERRY
.2byte ITEM_LANSAT_BERRY
.2byte ITEM_APICOT_BERRY
.2byte ITEM_STARF_BERRY
.2byte ITEM_LIECHI_BERRY
.2byte ITEM_STICK
.2byte ITEM_LAX_INCENSE
.2byte ITEM_AGUAV_BERRY
.2byte ITEM_FIGY_BERRY
.2byte ITEM_THICK_CLUB
.2byte ITEM_MAGO_BERRY
.2byte ITEM_METAL_POWDER
.2byte ITEM_PETAYA_BERRY
.2byte ITEM_LUCKY_PUNCH
.2byte ITEM_GANLON_BERRY

6177
data/battle_frontier/battle_frontier_mons.inc
View File

File diff suppressed because it is too large Load Diff

14630
data/battle_frontier/battle_frontier_trainer_mons.inc
View File

File diff suppressed because it is too large Load Diff

7801
data/battle_frontier/battle_frontier_trainers.inc
View File

File diff suppressed because it is too large Load Diff

50
data/battle_tower.s
View File

@ -1,50 +0,0 @@
#include "constants/easy_chat.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/pokemon.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
@ 85CECB0
.include "data/battle_frontier/battle_frontier_held_items.inc"
@ 85CED2E
.include "data/battle_frontier/battle_frontier_trainer_mons.inc"
@ 85D5ACC
.include "data/battle_frontier/battle_frontier_trainers.inc"
@ 85D97BC
.include "data/battle_frontier/battle_frontier_mons.inc"
gTowerMaleFacilityClasses:: @ 85DCEDC
.byte 0x0e, 0x11, 0x03, 0x15, 0x17, 0x07, 0x0a, 0x19, 0x1a, 0x1b, 0x1d, 0x1e, 0x20, 0x26, 0x29, 0x09, 0x2b, 0x2d, 0x2e, 0x30, 0x32, 0x34, 0x04, 0x35, 0x3a, 0x05, 0x42, 0x44, 0x43, 0x00
gTowerFemaleFacilityClasses:: @ 85DCEFA
.byte 0x0d, 0x10, 0x12, 0x0c, 0x13, 0x14, 0x1f, 0x27, 0x2a, 0x16, 0x2f, 0x31, 0x33, 0x36, 0x37, 0x38, 0x1c, 0x02, 0x45, 0x47
gTowerMaleTrainerGfxIds:: @ 85DCF0E
.byte 0x37, 0x36, 0x21, 0x0f, 0x27, 0x33, 0x2c, 0x42, 0x42, 0x1f, 0x27, 0x25, 0x30, 0x26, 0x19, 0x15, 0x23, 0x32, 0x38, 0x33, 0x33, 0x21, 0x42, 0x05, 0x31, 0x27, 0x41, 0x1f, 0x24, 0x37
gTowerFemaleTrainerGfxIds:: @ 85DCF2C
.byte 0x14, 0x35, 0x22, 0x28, 0x14, 0x2d, 0x2f, 0x0e, 0x12, 0x16, 0x39, 0x34, 0x34, 0x0e, 0x22, 0x34, 0x20, 0x14, 0x20, 0x2f
sRubyFacilityClassToEmerald:: @ 85DCF40
.byte 0x00, 0x0b, 0x01, 0x01, 0x02, 0x06, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x0f, 0x06, 0x10, 0x07, 0x11, 0x08, 0x03, 0x09, 0x12, 0x0a, 0x0c, 0x0b, 0x13, 0x0c, 0x14, 0x0d, 0x15, 0x0e, 0x17, 0x0f, 0x07
.byte 0x10, 0x0a, 0x11, 0x19, 0x12, 0x1a, 0x13, 0x1b, 0x14, 0x1d, 0x15, 0x1e, 0x16, 0x1f, 0x17, 0x20, 0x18, 0x21, 0x19, 0x22, 0x1a, 0x23, 0x1b, 0x24, 0x1c, 0x25, 0x1d, 0x26, 0x1e, 0x27, 0x1f, 0x28
.byte 0x20, 0x29, 0x21, 0x2a, 0x22, 0x09, 0x23, 0x16, 0x24, 0x2b, 0x25, 0x2c, 0x26, 0x2d, 0x27, 0x2e, 0x28, 0x2f, 0x29, 0x30, 0x2a, 0x31, 0x2b, 0x32, 0x2c, 0x33, 0x2d, 0x34, 0x2e, 0x04, 0x2f, 0x35
.byte 0x30, 0x36, 0x31, 0x37, 0x32, 0x38, 0x33, 0x1c, 0x34, 0x39, 0x35, 0x3a, 0x38, 0x05, 0x39, 0x3b, 0x3a, 0x3c, 0x3b, 0x3d, 0x3c, 0x3e, 0x3d, 0x3f, 0x3e, 0x40, 0x3f, 0x41, 0x40, 0x42, 0x41, 0x02
.byte 0x42, 0x44, 0x43, 0x45, 0x44, 0x46, 0x45, 0x08, 0x46, 0x18, 0x47, 0x47, 0x48, 0x43, 0x49, 0x00, 0x4a, 0x48, 0x4b, 0x49, 0x4c, 0x4a, 0x00, 0x00

5
include/battle_tower.h
View File

@ -33,11 +33,6 @@ struct FacilityMon
u8 nature;
};
extern const u8 gTowerMaleFacilityClasses[30];
extern const u8 gTowerMaleTrainerGfxIds[30];
extern const u8 gTowerFemaleFacilityClasses[20];
extern const u8 gTowerFemaleTrainerGfxIds[20];
extern u16 gUnknown_03006298[];
extern const struct BattleFrontierTrainer *gFacilityTrainers;

1
ld_script.txt
View File

@ -537,7 +537,6 @@ SECTIONS {
data/battle_anim_815A0D4.o(.rodata);
src/learn_move.o(.rodata);
src/roamer.o(.rodata);
data/battle_tower.o(.rodata);
src/battle_tower.o(.rodata);
src/use_pokeblock.o(.rodata);
data/use_pokeblock.o(.rodata);

188
src/battle_tower.c
View File

@ -31,10 +31,7 @@
extern void sub_81A4C30(void);
extern const u16 gBattleFrontierHeldItems[];
extern const u16 gUnknown_085DFA46[];
extern const struct FacilityMon gBattleFrontierMons[];
extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224157[];
extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224166[];
@ -79,15 +76,192 @@ static void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderT
static u8 SetTentPtrsGetLevel(void);
// Const rom data.
const u16 gBattleFrontierHeldItems[] =
{
ITEM_NONE,
ITEM_KINGS_ROCK,
ITEM_SITRUS_BERRY,
ITEM_ORAN_BERRY,
ITEM_CHESTO_BERRY,
ITEM_HARD_STONE,
ITEM_FOCUS_BAND,
ITEM_PERSIM_BERRY,
ITEM_MIRACLE_SEED,
ITEM_BERRY_JUICE,
ITEM_MACHO_BRACE,
ITEM_SILVER_POWDER,
ITEM_CHERI_BERRY,
ITEM_BLACK_GLASSES,
ITEM_BLACK_BELT,
ITEM_SOUL_DEW,
ITEM_CHOICE_BAND,
ITEM_MAGNET,
ITEM_SILK_SCARF,
ITEM_WHITE_HERB,
ITEM_DEEP_SEA_SCALE,
ITEM_DEEP_SEA_TOOTH,
ITEM_MYSTIC_WATER,
ITEM_SHARP_BEAK,
ITEM_QUICK_CLAW,
ITEM_LEFTOVERS,
ITEM_RAWST_BERRY,
ITEM_LIGHT_BALL,
ITEM_POISON_BARB,
ITEM_NEVER_MELT_ICE,
ITEM_ASPEAR_BERRY,
ITEM_SPELL_TAG,
ITEM_BRIGHT_POWDER,
ITEM_LEPPA_BERRY,
ITEM_SCOPE_LENS,
ITEM_TWISTED_SPOON,
ITEM_METAL_COAT,
ITEM_MENTAL_HERB,
ITEM_CHARCOAL,
ITEM_PECHA_BERRY,
ITEM_SOFT_SAND,
ITEM_LUM_BERRY,
ITEM_DRAGON_SCALE,
ITEM_DRAGON_FANG,
ITEM_IAPAPA_BERRY,
ITEM_WIKI_BERRY,
ITEM_SEA_INCENSE,
ITEM_SHELL_BELL,
ITEM_SALAC_BERRY,
ITEM_LANSAT_BERRY,
ITEM_APICOT_BERRY,
ITEM_STARF_BERRY,
ITEM_LIECHI_BERRY,
ITEM_STICK,
ITEM_LAX_INCENSE,
ITEM_AGUAV_BERRY,
ITEM_FIGY_BERRY,
ITEM_THICK_CLUB,
ITEM_MAGO_BERRY,
ITEM_METAL_POWDER,
ITEM_PETAYA_BERRY,
ITEM_LUCKY_PUNCH,
ITEM_GANLON_BERRY
};
#include "data/battle_frontier/battle_frontier_trainer_mons.h"
#include "data/battle_frontier/battle_frontier_trainers.h"
#include "data/battle_frontier/battle_frontier_mons.h"
const u8 gTowerMaleFacilityClasses[] =
{
FACILITY_CLASS_RUIN_MANIAC,
FACILITY_CLASS_TUBER_M,
FACILITY_CLASS_COOLTRAINER_M,
FACILITY_CLASS_RICH_BOY,
FACILITY_CLASS_POKEMANIAC,
FACILITY_CLASS_SWIMMER_M,
FACILITY_CLASS_BLACK_BELT,
FACILITY_CLASS_GUITARIST,
FACILITY_CLASS_KINDLER,
FACILITY_CLASS_CAMPER,
FACILITY_CLASS_BUG_MANIAC,
FACILITY_CLASS_PSYCHIC_M,
FACILITY_CLASS_GENTLEMAN,
FACILITY_CLASS_SCHOOL_KID_M,
FACILITY_CLASS_POKEFAN_M,
FACILITY_CLASS_EXPERT_M,
FACILITY_CLASS_YOUNGSTER,
FACILITY_CLASS_FISHERMAN,
FACILITY_CLASS_CYCLING_TRIATHLETE_M,
FACILITY_CLASS_RUNNING_TRIATHLETE_M,
FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
FACILITY_CLASS_DRAGON_TAMER,
FACILITY_CLASS_BIRD_KEEPER,
FACILITY_CLASS_NINJA_BOY,
FACILITY_CLASS_SAILOR,
FACILITY_CLASS_COLLECTOR,
FACILITY_CLASS_PKMN_BREEDER_M,
FACILITY_CLASS_PKMN_RANGER_M,
FACILITY_CLASS_BUG_CATCHER,
FACILITY_CLASS_HIKER
};
const u8 gTowerFemaleFacilityClasses[] =
{
FACILITY_CLASS_AROMA_LADY,
FACILITY_CLASS_TUBER_F,
FACILITY_CLASS_COOLTRAINER_F,
FACILITY_CLASS_HEX_MANIAC,
FACILITY_CLASS_LADY,
FACILITY_CLASS_BEAUTY,
FACILITY_CLASS_PSYCHIC_F,
FACILITY_CLASS_SCHOOL_KID_F,
FACILITY_CLASS_POKEFAN_F,
FACILITY_CLASS_EXPERT_F,
FACILITY_CLASS_CYCLING_TRIATHLETE_F,
FACILITY_CLASS_RUNNING_TRIATHLETE_F,
FACILITY_CLASS_SWIMMING_TRIATHLETE_F,
FACILITY_CLASS_BATTLE_GIRL,
FACILITY_CLASS_PARASOL_LADY,
FACILITY_CLASS_SWIMMER_F,
FACILITY_CLASS_PICNICKER,
FACILITY_CLASS_POKEMON_BREEDER_F,
FACILITY_CLASS_PKMN_RANGER_F,
FACILITY_CLASS_LASS
};
const u8 gTowerMaleTrainerGfxIds[] =
{
EVENT_OBJ_GFX_HIKER,
EVENT_OBJ_GFX_TUBER_M,
EVENT_OBJ_GFX_MAN_3,
EVENT_OBJ_GFX_RICH_BOY,
EVENT_OBJ_GFX_MANIAC,
EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M,
EVENT_OBJ_GFX_BLACK_BELT,
EVENT_OBJ_GFX_MAN_5,
EVENT_OBJ_GFX_MAN_5,
EVENT_OBJ_GFX_CAMPER,
EVENT_OBJ_GFX_MANIAC,
EVENT_OBJ_GFX_PSYCHIC_M,
EVENT_OBJ_GFX_GENTLEMAN,
EVENT_OBJ_GFX_SCHOOL_KID_M,
EVENT_OBJ_GFX_POKEFAN_M,
EVENT_OBJ_GFX_EXPERT_M,
EVENT_OBJ_GFX_YOUNGSTER,
EVENT_OBJ_GFX_FISHERMAN,
EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M,
EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M,
EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M,
EVENT_OBJ_GFX_MAN_3,
EVENT_OBJ_GFX_MAN_5,
EVENT_OBJ_GFX_NINJA_BOY,
EVENT_OBJ_GFX_SAILOR,
EVENT_OBJ_GFX_MANIAC,
EVENT_OBJ_GFX_MAN_4,
EVENT_OBJ_GFX_CAMPER,
EVENT_OBJ_GFX_BUG_CATCHER,
EVENT_OBJ_GFX_HIKER
};
const u8 gTowerFemaleTrainerGfxIds[] =
{
EVENT_OBJ_GFX_WOMAN_2,
EVENT_OBJ_GFX_TUBER_F,
EVENT_OBJ_GFX_WOMAN_5,
EVENT_OBJ_GFX_HEX_MANIAC,
EVENT_OBJ_GFX_WOMAN_2,
EVENT_OBJ_GFX_BEAUTY,
EVENT_OBJ_GFX_LASS,
EVENT_OBJ_GFX_GIRL_3,
EVENT_OBJ_GFX_POKEFAN_F,
EVENT_OBJ_GFX_EXPERT_F,
EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F,
EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F,
EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F,
EVENT_OBJ_GFX_GIRL_3,
EVENT_OBJ_GFX_WOMAN_5,
EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F,
EVENT_OBJ_GFX_PICNICKER,
EVENT_OBJ_GFX_WOMAN_2,
EVENT_OBJ_GFX_PICNICKER,
EVENT_OBJ_GFX_LASS
};
extern const u8 sRubyFacilityClassToEmerald[82][2];
/*

6177
src/data/battle_frontier/battle_frontier_mons.h Normal file
View File

File diff suppressed because it is too large Load Diff

15229
src/data/battle_frontier/battle_frontier_trainer_mons.h Normal file
View File

File diff suppressed because it is too large Load Diff

2403
src/data/battle_frontier/battle_frontier_trainers.h Normal file
View File

File diff suppressed because it is too large Load Diff

1
src/data/battle_frontier/battle_tent.h
View File

@ -1,4 +1,3 @@
// Slateport Battle Tent.
const u16 gSlateportBattleTentTrainerMons_Jolie[] =
{