Skip to content

Commit

Permalink
Introduce a small change
Browse files Browse the repository at this point in the history
  • Loading branch information
Pseurae committed Oct 19, 2024
1 parent 5738f74 commit 57a00c9
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 16 deletions.
3 changes: 3 additions & 0 deletions config.asm
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@
; Trainer battle balances.
.definelabel TRAINER_CHANGES, 1

; Why would you need to heal an egg?
.definelabel CENTER_DISREGARD_EGG, 1

; Bugfixes
; --------

Expand Down
1 change: 1 addition & 0 deletions linker/text.ld
Original file line number Diff line number Diff line change
Expand Up @@ -271,3 +271,4 @@ SetInputState = 0x80b6210 | 1;
MainState_StartPageSwap = 0x80b61c8 | 1;
GetTextEntryPosition = 0x80b6f44 | 1;
ResetGpuAndVram = 0x80f9368 | 1;
CountPartyNonEggMons = 0x8095b6c | 1;
7 changes: 6 additions & 1 deletion main.asm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
.include "scripts/include/types.asm"
.include "scripts/include/vars_flags.asm"

; Remove spaces from the game header
.org 0x80000A9
.byte 0x0, 0x0, 0x0

.org 0x88866c0
.region 0x479940
.endregion
Expand Down Expand Up @@ -50,8 +54,9 @@
.include "scripts/ability_changer.asm"
.include "scripts/autocase.asm"
.include "scripts/autorun.asm"
.include "scripts/birch_speech.asm"
.include "scripts/bag_expansion.asm"
.include "scripts/birch_speech.asm"
.include "scripts/center_disregard_egg.asm"
.include "scripts/colored_field_moves.asm"
.include "scripts/colored_stats.asm"
.include "scripts/emerald_save_prompt.asm"
Expand Down
6 changes: 6 additions & 0 deletions scripts/center_disregard_egg.asm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.if CENTER_DISREGARD_EGG

.org 0x8085D82
bl 0x8095b6c

.endif
30 changes: 15 additions & 15 deletions src/data/trainers.c
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lizzie[2] = {
},
{
.iv = 0,
.level = 4,
.level = 3,
.species = SPECIES_ROTMANDER,
},
};
Expand Down Expand Up @@ -1838,7 +1838,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Mimi[2] = {
const struct TrainerMonItemDefaultMoves gTrainerParty_Richie[1] = {
{
.iv = 0,
.level = 11,
.level = 8,
.species = SPECIES_SURSKIT,
.heldItem = ITEM_TAIJI_DUST,
},
Expand All @@ -1847,7 +1847,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Richie[1] = {
const struct TrainerMonNoItemDefaultMoves gTrainerParty_Orobas[1] = {
{
.iv = 40,
.level = 16,
.level = 14,
.species = SPECIES_DIRTKROW,
},
};
Expand Down Expand Up @@ -2178,7 +2178,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shunkle[2] = {
const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benji[1] = {
{
.iv = 0,
.level = 14,
.level = 12,
.species = SPECIES_EYE_EYE,
},
};
Expand Down Expand Up @@ -4701,8 +4701,8 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allen[2] = {
},
{
.iv = 0,
.level = 6,
.species = SPECIES_BOILBASAUR,
.level = 4,
.species = SPECIES_POLIHAG,
},
};

Expand Down Expand Up @@ -8321,17 +8321,17 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt4[1] = {
const struct TrainerMonItemCustomMoves gTrainerParty_Zabulon[2] = {
{
.iv = 10,
.level = 11,
.level = 9,
.species = SPECIES_HOUNDSOUR,
.heldItem = ITEM_CINNAMON,
.moves = { MOVE_EMBER, MOVE_GLARE, MOVE_LEER, MOVE_TACKLE },
},
{
.iv = 30,
.level = 13,
.level = 9,
.species = SPECIES_DIRTKROW,
.heldItem = ITEM_STAR_PIECE,
.moves = { MOVE_PECK, MOVE_GUST, MOVE_GLARE, MOVE_NONE },
.moves = { MOVE_PECK, MOVE_ASTONISH, MOVE_GLARE, MOVE_NONE },
},
};

Expand Down Expand Up @@ -8562,12 +8562,12 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Salaryman5[1] = {
const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kent[2] = {
{
.iv = 0,
.level = 14,
.level = 10,
.species = SPECIES_EYE_EYE,
},
{
.iv = 0,
.level = 14,
.level = 13,
.species = SPECIES_EYE_EYE,
},
};
Expand Down Expand Up @@ -8746,7 +8746,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Harvey2[2] = {
const struct TrainerMonNoItemDefaultMoves gTrainerParty_Janice[1] = {
{
.iv = 0,
.level = 9,
.level = 6,
.species = SPECIES_ROTMANDER,
},
};
Expand Down Expand Up @@ -8876,12 +8876,12 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Crissy[2] = {
const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rica[2] = {
{
.iv = 0,
.level = 4,
.level = 3,
.species = SPECIES_GRAVEILL,
},
{
.iv = 0,
.level = 4,
.level = 3,
.species = SPECIES_GRAVEILL,
},
};
Expand Down Expand Up @@ -8959,7 +8959,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cinnabar[1] = {
const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andromalius[1] = {
{
.iv = 70,
.level = 12,
.level = 8,
.species = SPECIES_SECRETEGG,
},
};
Expand Down

0 comments on commit 57a00c9

Please sign in to comment.