diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-09 03:29:54 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-09 03:29:54 -0500 |
| commit | 7ab0460e9c04100dcc0ebb824a870069348030df (patch) | |
| tree | 36c5398e43d4c3dfd034631fb3601a4a3a92f12f | |
| parent | eecafbaec17ba0721d091d1a12ac20fa71da352a (diff) | |
formatting
| -rwxr-xr-x | include/ewram.h | 2 | ||||
| -rw-r--r-- | src/scene/evolution_scene.c | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/include/ewram.h b/include/ewram.h index 051b9eac1..b5acbc8ed 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -181,7 +181,6 @@ extern u8 ewram[]; #define EWRAM_18000 ((u16 *)(ewram + 0x18000)) #define ewram18000 ((u16 *)(ewram + 0x18000)) #define ewram18000_2 (&ewram[0x18000]) -// extern struct Pokemon *unk_2018000; #define ewram18000_3 *(struct Pokemon **)(ewram + 0x18000) #define eBerryBlenderData (struct BerryBlenderData*)(&ewram[0x18000]) #define eEggHatchData (struct EggHatchData*)(&ewram[0x18000]) @@ -207,7 +206,6 @@ extern u8 ewram[]; #define ewramSavedItemsPocket ((struct ItemSlot *)(ewram + 0x1E000)) // saved items pocket (for Wally battle) #define ewram1E000(i) (ewram[0x1E000 + i]) #define eHallOfFameMons2 (struct HallofFameMons*)(&ewram[0x1E000]) -// extern struct HallOfFame gHallOfFame; #define eHallOfFame (struct HallOfFame *)(ewram + 0x1E000) #define HALL_OF_FAME_SHEET_0 ((u8 *)(ewram + 0x1E000)) #define HALL_OF_FAME_SHEET_1 ((u8 *)(ewram + 0x1E800)) diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index c68acafc4..742f663f6 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -178,10 +178,6 @@ void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStop SetMainCallback2(CB2_BeginEvolutionScene); } -struct Struct2009000 { - u16 pal[0x30]; -}; - void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID) { u8 name[20]; |