Registrarse

[Decomp-GBA] Error Al Usar "make j-2" [pokeemerald_expansion]

Estado
Cerrado para nuevas respuestas.

CoqeeinRH

Leyenda de WaH
Hola amigos pues bueno ayer intentando instalar las ramas de Dizzy egg tales como pokemon_expansion, item_expansion, etc.
Usando este tutorial en especifico: https://whackahack.com/foro/threads/como-empezar-un-proyecto-usando-la-pokeemerald-expansion.66175/
Bueno pues use el método 2 y todo bien hasta que al momento de terminar todo y querer compilar mi ROM el siguiente error. 😕
Código:
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:132: note: this is the location of the previous definition
     #define ITEM_ELECTRIUM_Z         10098
 
In file included from src/field_specials.c:55:
include/constants/items.h:433: warning: "ITEM_GRASSIUM_Z" redefined
 #define ITEM_GRASSIUM_Z 361
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:131: note: this is the location of the previous definition
     #define ITEM_GRASSIUM_Z          10097
 
In file included from src/field_specials.c:55:
include/constants/items.h:434: warning: "ITEM_ICIUM_Z" redefined
 #define ITEM_ICIUM_Z 362
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:134: note: this is the location of the previous definition
     #define ITEM_ICIUM_Z             10100
 
In file included from src/field_specials.c:55:
include/constants/items.h:435: warning: "ITEM_FIGHTINIUM_Z" redefined
 #define ITEM_FIGHTINIUM_Z 363
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:121: note: this is the location of the previous definition
     #define ITEM_FIGHTINIUM_Z        10087
 
In file included from src/field_specials.c:55:
include/constants/items.h:436: warning: "ITEM_POISONIUM_Z" redefined
 #define ITEM_POISONIUM_Z 364
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:123: note: this is the location of the previous definition
     #define ITEM_POISONIUM_Z         10089
 
In file included from src/field_specials.c:55:
include/constants/items.h:437: warning: "ITEM_GROUNDIUM_Z" redefined
 #define ITEM_GROUNDIUM_Z 365
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:124: note: this is the location of the previous definition
     #define ITEM_GROUNDIUM_Z         10090
 
In file included from src/field_specials.c:55:
include/constants/items.h:438: warning: "ITEM_FLYINIUM_Z" redefined
 #define ITEM_FLYINIUM_Z 366
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:122: note: this is the location of the previous definition
     #define ITEM_FLYINIUM_Z          10088
 
In file included from src/field_specials.c:55:
include/constants/items.h:439: warning: "ITEM_PSYCHIUM_Z" redefined
 #define ITEM_PSYCHIUM_Z 367
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:133: note: this is the location of the previous definition
     #define ITEM_PSYCHIUM_Z          10099
 
In file included from src/field_specials.c:55:
include/constants/items.h:440: warning: "ITEM_BUGINIUM_Z" redefined
 #define ITEM_BUGINIUM_Z 368
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:126: note: this is the location of the previous definition
     #define ITEM_BUGINIUM_Z          10092
 
In file included from src/field_specials.c:55:
include/constants/items.h:441: warning: "ITEM_ROCKIUM_Z" redefined
 #define ITEM_ROCKIUM_Z 369
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:125: note: this is the location of the previous definition
     #define ITEM_ROCKIUM_Z           10091
 
In file included from src/field_specials.c:55:
include/constants/items.h:442: warning: "ITEM_GHOSTIUM_Z" redefined
 #define ITEM_GHOSTIUM_Z 370
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:127: note: this is the location of the previous definition
     #define ITEM_GHOSTIUM_Z          10093
 
In file included from src/field_specials.c:55:
include/constants/items.h:443: warning: "ITEM_DRAGONIUM_Z" redefined
 #define ITEM_DRAGONIUM_Z 371
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:135: note: this is the location of the previous definition
     #define ITEM_DRAGONIUM_Z         10101
 
In file included from src/field_specials.c:55:
include/constants/items.h:444: warning: "ITEM_DARKINIUM_Z" redefined
 #define ITEM_DARKINIUM_Z 372
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:136: note: this is the location of the previous definition
     #define ITEM_DARKINIUM_Z         10102
 
In file included from src/field_specials.c:55:
include/constants/items.h:445: warning: "ITEM_STEELIUM_Z" redefined
 #define ITEM_STEELIUM_Z 373
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:128: note: this is the location of the previous definition
     #define ITEM_STEELIUM_Z          10094
 
In file included from src/field_specials.c:55:
include/constants/items.h:446: warning: "ITEM_FAIRIUM_Z" redefined
 #define ITEM_FAIRIUM_Z 374
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:137: note: this is the location of the previous definition
     #define ITEM_FAIRIUM_Z           10103
 
In file included from src/field_specials.c:55:
include/constants/items.h:477: warning: "ITEM_GRISEOUS_ORB" redefined
 #define ITEM_GRISEOUS_ORB 403
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:89: note: this is the location of the previous definition
     #define ITEM_GRISEOUS_ORB   369
 
In file included from src/field_specials.c:55:
include/constants/items.h:586: warning: "ITEM_RAZOR_CLAW" redefined
 #define ITEM_RAZOR_CLAW 492
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:99: note: this is the location of the previous definition
     #define ITEM_RAZOR_CLAW          10067
 
In file included from src/field_specials.c:55:
include/constants/items.h:587: warning: "ITEM_RAZOR_FANG" redefined
 #define ITEM_RAZOR_FANG 493
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:98: note: this is the location of the previous definition
     #define ITEM_RAZOR_FANG          10066
 
In file included from src/field_specials.c:55:
include/constants/items.h:645: warning: "ITEM_CHILAN_BERRY" redefined
 #define ITEM_CHILAN_BERRY 549
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:76: note: this is the location of the previous definition
     #define ITEM_CHILAN_BERRY   188
 
In file included from src/field_specials.c:55:
include/constants/items.h:646: warning: "ITEM_OCCA_BERRY" redefined
 #define ITEM_OCCA_BERRY 550
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:84: note: this is the location of the previous definition
     #define ITEM_OCCA_BERRY     204
 
In file included from src/field_specials.c:55:
include/constants/items.h:647: warning: "ITEM_PASSHO_BERRY" redefined
 #define ITEM_PASSHO_BERRY 551
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:85: note: this is the location of the previous definition
     #define ITEM_PASSHO_BERRY   205
 
In file included from src/field_specials.c:55:
include/constants/items.h:648: warning: "ITEM_WACAN_BERRY" redefined
 #define ITEM_WACAN_BERRY 552
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:86: note: this is the location of the previous definition
     #define ITEM_WACAN_BERRY    206
 
In file included from src/field_specials.c:55:
include/constants/items.h:649: warning: "ITEM_RINDO_BERRY" redefined
 #define ITEM_RINDO_BERRY 553
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:87: note: this is the location of the previous definition
     #define ITEM_RINDO_BERRY    207
 
In file included from src/field_specials.c:55:
include/constants/items.h:650: warning: "ITEM_YACHE_BERRY" redefined
 #define ITEM_YACHE_BERRY 554
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:88: note: this is the location of the previous definition
     #define ITEM_YACHE_BERRY    208
 
In file included from src/field_specials.c:55:
include/constants/items.h:651: warning: "ITEM_CHOPLE_BERRY" redefined
 #define ITEM_CHOPLE_BERRY 555
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:65: note: this is the location of the previous definition
     #define ITEM_CHOPLE_BERRY   177
 
In file included from src/field_specials.c:55:
include/constants/items.h:652: warning: "ITEM_KEBIA_BERRY" redefined
 #define ITEM_KEBIA_BERRY 556
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:66: note: this is the location of the previous definition
     #define ITEM_KEBIA_BERRY    178
 
In file included from src/field_specials.c:55:
include/constants/items.h:653: warning: "ITEM_SHUCA_BERRY" redefined
 #define ITEM_SHUCA_BERRY 557
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:67: note: this is the location of the previous definition
     #define ITEM_SHUCA_BERRY    179
 
In file included from src/field_specials.c:55:
include/constants/items.h:654: warning: "ITEM_COBA_BERRY" redefined
 #define ITEM_COBA_BERRY 558
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:68: note: this is the location of the previous definition
     #define ITEM_COBA_BERRY     180
 
In file included from src/field_specials.c:55:
include/constants/items.h:655: warning: "ITEM_PAYAPA_BERRY" redefined
 #define ITEM_PAYAPA_BERRY 559
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:69: note: this is the location of the previous definition
     #define ITEM_PAYAPA_BERRY   181
 
In file included from src/field_specials.c:55:
include/constants/items.h:656: warning: "ITEM_TANGA_BERRY" redefined
 #define ITEM_TANGA_BERRY 560
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:70: note: this is the location of the previous definition
     #define ITEM_TANGA_BERRY    182
 
In file included from src/field_specials.c:55:
include/constants/items.h:657: warning: "ITEM_CHARTI_BERRY" redefined
 #define ITEM_CHARTI_BERRY 561
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:71: note: this is the location of the previous definition
     #define ITEM_CHARTI_BERRY   183
 
In file included from src/field_specials.c:55:
include/constants/items.h:658: warning: "ITEM_KASIB_BERRY" redefined
 #define ITEM_KASIB_BERRY 562
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:72: note: this is the location of the previous definition
     #define ITEM_KASIB_BERRY    184
 
In file included from src/field_specials.c:55:
include/constants/items.h:659: warning: "ITEM_HABAN_BERRY" redefined
 #define ITEM_HABAN_BERRY 563
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:73: note: this is the location of the previous definition
     #define ITEM_HABAN_BERRY    185
 
In file included from src/field_specials.c:55:
include/constants/items.h:660: warning: "ITEM_COLBUR_BERRY" redefined
 #define ITEM_COLBUR_BERRY 564
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:74: note: this is the location of the previous definition
     #define ITEM_COLBUR_BERRY   186
 
In file included from src/field_specials.c:55:
include/constants/items.h:661: warning: "ITEM_BABIRI_BERRY" redefined
 #define ITEM_BABIRI_BERRY 565
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:75: note: this is the location of the previous definition
     #define ITEM_BABIRI_BERRY   187
 
In file included from src/field_specials.c:55:
include/constants/items.h:662: warning: "ITEM_ROSELI_BERRY" redefined
 #define ITEM_ROSELI_BERRY 566
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:77: note: this is the location of the previous definition
     #define ITEM_ROSELI_BERRY   189
 
In file included from src/field_specials.c:55:
include/constants/items.h:671: warning: "ITEM_MICLE_BERRY" redefined
 #define ITEM_MICLE_BERRY 575
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:78: note: this is the location of the previous definition
     #define ITEM_MICLE_BERRY    197
 
In file included from src/field_specials.c:55:
include/constants/items.h:672: warning: "ITEM_CUSTAP_BERRY" redefined
 #define ITEM_CUSTAP_BERRY 576
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:79: note: this is the location of the previous definition
     #define ITEM_CUSTAP_BERRY   199
 
In file included from src/field_specials.c:55:
include/constants/items.h:673: warning: "ITEM_JABOCA_BERRY" redefined
 #define ITEM_JABOCA_BERRY 577
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:80: note: this is the location of the previous definition
     #define ITEM_JABOCA_BERRY   200
 
In file included from src/field_specials.c:55:
include/constants/items.h:674: warning: "ITEM_ROWAP_BERRY" redefined
 #define ITEM_ROWAP_BERRY 578
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:81: note: this is the location of the previous definition
     #define ITEM_ROWAP_BERRY    201
 
In file included from src/field_specials.c:55:
include/constants/items.h:675: warning: "ITEM_KEE_BERRY" redefined
 #define ITEM_KEE_BERRY 579
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:82: note: this is the location of the previous definition
     #define ITEM_KEE_BERRY      202
 
In file included from src/field_specials.c:55:
include/constants/items.h:676: warning: "ITEM_MARANGA_BERRY" redefined
 #define ITEM_MARANGA_BERRY 580
 
In file included from include/pokemon.h:236,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/battle_config.h:83: note: this is the location of the previous definition
     #define ITEM_MARANGA_BERRY  203
 
In file included from src/field_specials.c:55:
include/constants/items.h:861: warning: "ITEM_GRACIDEA" redefined
 #define ITEM_GRACIDEA 695
 
In file included from include/pokemon.h:6,
                 from include/global.h:542,
                 from src/field_specials.c:1:
include/constants/pokemon_config.h:161: note: this is the location of the previous definition
     #define ITEM_GRACIDEA            10125
 
In file included from include/global.h:17,
                 from src/field_specials.c:1:
include/constants/expansion_branches.h:8: syntax error before `=='
In file included from src/field_specials.c:1:
include/global.h:146: syntax error before `}'
In file included from include/global.h:542,
                 from src/field_specials.c:1:
include/pokemon.h:463: syntax error before `<'
include/pokemon.h:468: syntax error before `>'
In file included from src/field_specials.c:1:
include/global.h:549: conflicting types for `y'
include/global.h:145: previous declaration of `y'
include/global.h:550: syntax error before `}'
include/global.h:934: field `location' has incomplete type
include/global.h:935: field `continueGameWarp' has incomplete type
include/global.h:936: field `dynamicWarp' has incomplete type
include/global.h:937: field `lastHealLocation' has incomplete type
include/global.h:938: field `escapeWarp' has incomplete type
make: *** [Makefile:339: build/emerald/src/mystery_gift_view.o] Error 1
make: *** Se borra el archivo 'build/emerald/src/mystery_gift_view.o'
make: *** Se espera a que terminen otras tareas....
src/field_specials.c: In function `UpdateCyclingRoadState':
src/field_specials.c:257: invalid use of undefined type `struct WarpData'
src/field_specials.c:257: invalid use of undefined type `struct WarpData'
agbcc: warnings being treated as errors
src/field_specials.c: In function `SetDeptStoreFloor':
src/field_specials.c:1709: warning: unreachable code at beginning of switch statement
src/field_specials.c: In function `GetDeptStoreDefaultFloorChoice':
src/field_specials.c:1743: warning: unreachable code at beginning of switch statement
src/field_specials.c: In function `UsedPokemonCenterWarp':
src/field_specials.c:1960: invalid use of undefined type `struct WarpData'
src/field_specials.c:1960: invalid use of undefined type `struct WarpData'
src/field_specials.c: In function `AbnormalWeatherHasExpired':
src/field_specials.c:3468: warning: unreachable code at beginning of switch statement
src/field_specials.c:3483: warning: unreachable code at beginning of switch statement
make: *** [Makefile:339: build/emerald/src/field_specials.o] Error 1
[CENTER]make: *** Se borra el archivo 'build/emerald/src/field_specials.o'
Y por favor necesito ayuda, aparentemente hice algo mal al corregir los conflictos de fusión, si alguien puede decirme el error o como solucionarlo se los agradecería mucho de corazón, saludos.[/CENTER]
 

ivaantxo

Usuario de oro
Hola, no te preocupes, es un conflicto normal al fusionar varias ramas. Lo que te está indicando ahí es que tienes esos ítems definidos dos veces, así que todo lo que tienes que hacer es ir a donde están esas definiciones (include/constants/pokemon_config.h) y borrar una de las dos de cada ítem que te indique error.
 

Lunos

Enfrentando a La Organización
Miembro insignia
Hola, no te preocupes, es un conflicto normal al fusionar varias ramas. Lo que te está indicando ahí es que tienes esos ítems definidos dos veces, así que todo lo que tienes que hacer es ir a donde están esas definiciones (include/constants/pokemon_config.h) y borrar una de las dos de cada ítem que te indique error.
Estás parcialmente equivocado.
Yo ya le expliqué por Discord el asunto de las constantes definidas dos veces, pero ahi se ven claramente lo que seguramente son conflictos sin resolver.
include/constants/expansion_branches.h:8: syntax error before `=='
Esto tambien se lo mencioné por Discord.
EDITO: Y por ahi ya le expliqué un poco de que van los conflictos de fusión, y de que puede usar git grep "<<<<" para encontrar conflictos sin resolver.
 
Última edición:

ivaantxo

Usuario de oro
Estás parcialmente equivocado.
Yo ya le expliqué por Discord el asunto de las constantes definidas dos veces, pero ahi se ven claramente lo que seguramente son conflictos sin resolver.


Esto tambien se lo mencioné por Discord.
EDITO: Y por ahi ya le expliqué un poco de que van los conflictos de fusión, y de que puede usar git grep "<<<<" para encontrar conflictos sin resolver.
Sí, tienes razón, no había leído la última parte del mensaje.
En cualquier caso, @coqeeinrh te recomiendo que uses GitHub Desktop. A mí por lo menos me hace mucho más sencillo el tema de los conflictos de fusión.
 

CoqeeinRH

Leyenda de WaH
Muchas gracias por la ayuda muchachos, el problema era que había resuelto mal un par de conflictos, y tuve que empezar todo de 0, así que use el método 1 y ya tengo la ROM con las expansiones, saludos.
 
Estado
Cerrado para nuevas respuestas.
Arriba