pret/pokepinballrs
1
0
Fork 0
mirror of https://github.com/pret/pokepinballrs.git synced 2026-10-04 15:18:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Powdinet
2025-02-17 20:01:14 +00:00
committed by GitHub
parent d5cb80b5bd 4a92d93654
commit fa435ee7ab
5 changed files with 62 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/egg_locations.inc
+56
View File
@@ -0,0 +1,56 @@
gEggLocations:: @ 0x086A4A38
@ Ruby Field
.2byte SPECIES_WURMPLE
.2byte SPECIES_SEEDOT
.2byte SPECIES_RALTS
.2byte SPECIES_SHROOMISH
.2byte SPECIES_WHISMUR
.2byte SPECIES_SKITTY
.2byte SPECIES_ZUBAT
.2byte SPECIES_ARON
.2byte SPECIES_PLUSLE
.2byte SPECIES_MINUN
.2byte SPECIES_ODDISH
.2byte SPECIES_SPOINK
.2byte SPECIES_SANDSHREW
.2byte SPECIES_SPINDA
.2byte SPECIES_TRAPINCH
.2byte SPECIES_SHUPPET
.2byte SPECIES_CHIMECHO
.2byte SPECIES_WYNAUT
.2byte SPECIES_NATU
.2byte SPECIES_PHANPY
.2byte SPECIES_SNORUNT
.2byte SPECIES_SPHEAL
.2byte SPECIES_CORSOLA
.2byte SPECIES_HORSEA
.2byte SPECIES_BAGON
.2byte SPECIES_PICHU @ Unreferenced
@ Sapphire Field
.2byte SPECIES_WURMPLE
.2byte SPECIES_LOTAD
.2byte SPECIES_RALTS
.2byte SPECIES_SURSKIT
.2byte SPECIES_WHISMUR
.2byte SPECIES_AZURILL
.2byte SPECIES_ZUBAT
.2byte SPECIES_ARON
.2byte SPECIES_ODDISH
.2byte SPECIES_GULPIN
.2byte SPECIES_SPOINK
.2byte SPECIES_SANDSHREW
.2byte SPECIES_SPINDA
.2byte SPECIES_TRAPINCH
.2byte SPECIES_IGGLYBUFF
.2byte SPECIES_SHUPPET
.2byte SPECIES_CHIMECHO
.2byte SPECIES_NATU
.2byte SPECIES_PHANPY
.2byte SPECIES_SNORUNT
.2byte SPECIES_SPHEAL
.2byte SPECIES_CORSOLA
.2byte SPECIES_CHINCHOU
.2byte SPECIES_HORSEA
.2byte SPECIES_BAGON
.2byte SPECIES_PICHU @ Unreferenced
data/rom.s
+1 -2
View File
@@ -2056,8 +2056,7 @@ gUnknown_086A2FA0:: @ 0x086A2FA0
gSpeciesInfo:: @ 0x086A3700
.incbin "baserom.gba", 0x6A3700, 0x1338
gUnknown_086A4A38:: @ 0x086A4A38
.incbin "baserom.gba", 0x6A4A38, 0x68
.include "data/egg_locations.inc"
gIntrTableTemplate:: @ 0x086A4AA0
.4byte SerialIntr
expected_objs/sub_2414.o
BIN
View File
Binary file not shown.
expected_objs/sub_4ABC8.o
BIN
View File
Binary file not shown.
src/rom_31F6C.c
+5 -5
View File
@@ -8,7 +8,7 @@
#include "main.h"
extern const u16 gWildMonLocations[][2][8];
extern const u16 gUnknown_086A4A38[2][26];
extern const u16 gEggLocations[2][26];
static inline u32 GetTimeAdjustedRandom()
{
@@ -222,9 +222,9 @@ void sub_32484(void)
gCurrentPinballGame->unk12E = 0;
for (i = 0; i < 0x19; i++)
for (i = 0; i < 25; i++)
{
currentSpecies = gUnknown_086A4A38[gMain.selectedField][i];
currentSpecies = gEggLocations[gMain.selectedField][i];
if (currentSpecies == SPECIES_ODDISH)
{
@@ -252,7 +252,7 @@ void sub_32484(void)
}
}
currentSpecies = gUnknown_086A4A38[gMain.selectedField][i];
currentSpecies = gEggLocations[gMain.selectedField][i];
if (gCurrentPinballGame->caughtMonCount == 0)
{
if (gSpeciesInfo[currentSpecies].evolutionTarget >= SPECIES_NONE)
@@ -297,7 +297,7 @@ void sub_325E0(void)
for (i = 0; i < 25 && gCurrentPinballGame->unk130[i] <= rand; i++);
gCurrentPinballGame->currentSpecies = gUnknown_086A4A38[gMain.selectedField][i];
gCurrentPinballGame->currentSpecies = gEggLocations[gMain.selectedField][i];
}
gCurrentPinballGame->lastEggSpecies = gCurrentPinballGame->currentSpecies;