Moved extern variable declarations in header files to be below the functions

Zephiles · Zephiles · commit 01161f63b6ca · 2019-06-16T13:13:06.000-05:00
diff --git a/ttyd-tools/rel/include/ttyd/battle.h b/ttyd-tools/rel/include/ttyd/battle.h
@@ -6,8 +6,6 @@ namespace ttyd::battle {
 
 extern "C" {
 
-extern void *battleWorkPointer;
-
 // BattleConsumeReserveItem
 // BattleStatusWindowCheck
 // BattleStatusWindowSystemOff
@@ -56,6 +54,8 @@ void *BattleGetUnitPtr(void *battleWorkPtr, uint32_t slot);
 // battleSeqEndCheck
 // battleMain
 
+extern void *battleWorkPointer;
+
 }
 
 }
diff --git a/ttyd-tools/rel/include/ttyd/battle_ac.h b/ttyd-tools/rel/include/ttyd/battle_ac.h
@@ -6,9 +6,6 @@ namespace ttyd::battle_ac {
 
 extern "C" {
 
-extern uint8_t GuardFrames[];
-extern uint8_t SuperguardFrames[];
-
 // BattleAcGaugeSeDelete
 // BattleAcGaugeSeUpdate
 // BattleAcGaugeSeInit
@@ -29,6 +26,9 @@ int32_t BattleActionCommandCheckDefence(void *battleUnitPtr, void *attackParams)
 // BattleActionCommandManager
 // BattleActionCommandManagerInit
 
+extern uint8_t GuardFrames[];
+extern uint8_t SuperguardFrames[];
+
 }
 
 }
diff --git a/ttyd-tools/rel/include/ttyd/cardmgr.h b/ttyd-tools/rel/include/ttyd/cardmgr.h
@@ -6,8 +6,6 @@ namespace ttyd::cardmgr {
 
 extern "C" {
 
-extern void *cardMgrWorkPointer;
-
 // memcard_open
 // statusCallback
 // readCallback
@@ -37,6 +35,8 @@ extern void *cardMgrWorkPointer;
 // cardBufReset
 // cardGetFilePtr
 
+extern void *cardMgrWorkPointer;
+
 }
 
 }
diff --git a/ttyd-tools/rel/include/ttyd/evt_yuugijou.h b/ttyd-tools/rel/include/ttyd/evt_yuugijou.h
@@ -6,8 +6,6 @@ namespace ttyd::evt_yuugijou {
 
 extern "C" {
 
-extern void *yuugijouWorkPointer;
-
 // evtYuuWindowEndChk
 // evtYuuWindow
 // yuuminigame_end
@@ -25,6 +23,8 @@ extern void *yuugijouWorkPointer;
 // monteCountDisp
 // yuugijou_init
 
+extern void *yuugijouWorkPointer;
+
 }
 
 }
diff --git a/ttyd-tools/rel/include/ttyd/fadedrv.h b/ttyd-tools/rel/include/ttyd/fadedrv.h
@@ -6,8 +6,6 @@ namespace ttyd::fadedrv {
 
 extern "C" {
 
-extern void *fadeDrvWorkPointer;
-
 // fadeSetNarrowFast
 // fadeGetTpl
 // fadeReset
@@ -36,6 +34,8 @@ void fadeEntry(int32_t type, int32_t duration, uint8_t color[4]);
 // fadeInit
 // _callback
 
+extern void *fadeDrvWorkPointer;
+
 }
 
 }
diff --git a/ttyd-tools/rel/include/ttyd/itemdrv.h b/ttyd-tools/rel/include/ttyd/itemdrv.h
@@ -15,8 +15,6 @@ static_assert(sizeof(ItemDrvWork) == 0x38);
 
 extern "C" {
 
-extern ItemDrvWork itemDrvWork;
-
 // itemPickUp
 // itemStatus
 // itemStatusOn
@@ -50,6 +48,8 @@ void *itemEntry(const char *name, int32_t id, uint32_t mode,
 // itemReInit
 // itemInit
 
+extern ItemDrvWork itemDrvWork;
+
 }
 
 }
diff --git a/ttyd-tools/rel/include/ttyd/mapdata.h b/ttyd-tools/rel/include/ttyd/mapdata.h
@@ -48,13 +48,13 @@ static_assert(sizeof(WorldData) == 0x108);
 
 extern "C" {
 
-extern WorldData worldData;
-
 // relSetBtlAddr
 // relSetEvtAddr
 // areaDataPtr
 // mapDataPtr
 
+extern WorldData worldData;
+
 }
 
 }
diff --git a/ttyd-tools/rel/include/ttyd/mariost.h b/ttyd-tools/rel/include/ttyd/mariost.h
@@ -6,8 +6,6 @@ namespace ttyd::mariost {
 
 extern "C" {
 
-extern void *globalWorkPointer;
-
 void marioStInit();
 void marioStMain();
 void marioStDisp();
@@ -17,6 +15,8 @@ void viPostCallback(uint32_t retraceCount);
 void gcDvdCheckThread();
 void gcRumbleCheck();
 
+extern void *globalWorkPointer;
+
 }
 
 }
diff --git a/ttyd-tools/rel/include/ttyd/memory.h b/ttyd-tools/rel/include/ttyd/memory.h
@@ -40,8 +40,6 @@ enum SmartAllocationGroup
 
 extern "C" {
 
-extern SmartWork *smartWorkPointer;
-
 // memInit
 // memClear
 void *__memAlloc(uint32_t heap, uint32_t size);
@@ -57,6 +55,8 @@ SmartAllocationData *smartAlloc(uint32_t size, uint32_t group);
 // smartGarbage
 // smartTexObj
 
+extern SmartWork *smartWorkPointer;
+
 }
 
 }
diff --git a/ttyd-tools/rel/include/ttyd/seq_mapchange.h b/ttyd-tools/rel/include/ttyd/seq_mapchange.h
@@ -6,17 +6,17 @@ namespace ttyd::seq_mapchange {
 
 extern "C" {
 
-extern char NextBero[];
-extern char NextMap[];
-extern char NextArea[];
-
 // _relUnLoad
 // _load
 // _unload
 // seq_mapChangeMain
 // seq_mapChangeExit
 // seq_mapChangeInit
 
+extern char NextBero[];
+extern char NextMap[];
+extern char NextArea[];
+
 }
 
 }
diff --git a/ttyd-tools/rel/include/ttyd/seq_title.h b/ttyd-tools/rel/include/ttyd/seq_title.h
@@ -6,8 +6,6 @@ namespace ttyd::seq_title {
 
 extern "C" {
 
-extern void *seqTitleWorkPointer2;
-
 // pressStartGX
 // disp2
 // disp1
@@ -19,6 +17,8 @@ extern void *seqTitleWorkPointer2;
 // seq_titleInit
 // DbgBtlSel_GetMsgDataPtr
 
+extern void *seqTitleWorkPointer2;
+
 }
 
 }
diff --git a/ttyd-tools/rel/include/ttyd/seqdrv.h b/ttyd-tools/rel/include/ttyd/seqdrv.h
@@ -40,8 +40,6 @@ static_assert(sizeof(SeqWork) == 0x20);
 
 extern "C" {
 
-extern SeqWork seqWork;
-
 void seqInit_MARIOSTORY();
 void seqMain();
 void seqSetSeq(SeqIndex seq, const char *map, const char *bero);
@@ -50,6 +48,8 @@ SeqIndex seqGetPrevSeq();
 SeqIndex seqGetNextSeq();
 bool seqCheckSeq();
 
+extern SeqWork seqWork;
+
 }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ namespace ttyd::battle {`
`6`	`6`
`7`	`7`	`extern "C" {`
`8`	`8`
`9`		`-extern void *battleWorkPointer;`
`10`		`-`
`11`	`9`	`// BattleConsumeReserveItem`
`12`	`10`	`// BattleStatusWindowCheck`
`13`	`11`	`// BattleStatusWindowSystemOff`
`@@ -56,6 +54,8 @@ void BattleGetUnitPtr(void battleWorkPtr, uint32_t slot);`
`56`	`54`	`// battleSeqEndCheck`
`57`	`55`	`// battleMain`
`58`	`56`
	`57`	`+extern void *battleWorkPointer;`
	`58`	`+`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ namespace ttyd::cardmgr {`
`6`	`6`
`7`	`7`	`extern "C" {`
`8`	`8`
`9`		`-extern void *cardMgrWorkPointer;`
`10`		`-`
`11`	`9`	`// memcard_open`
`12`	`10`	`// statusCallback`
`13`	`11`	`// readCallback`
`@@ -37,6 +35,8 @@ extern void *cardMgrWorkPointer;`
`37`	`35`	`// cardBufReset`
`38`	`36`	`// cardGetFilePtr`
`39`	`37`
	`38`	`+extern void *cardMgrWorkPointer;`
	`39`	`+`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ namespace ttyd::evt_yuugijou {`
`6`	`6`
`7`	`7`	`extern "C" {`
`8`	`8`
`9`		`-extern void *yuugijouWorkPointer;`
`10`		`-`
`11`	`9`	`// evtYuuWindowEndChk`
`12`	`10`	`// evtYuuWindow`
`13`	`11`	`// yuuminigame_end`
`@@ -25,6 +23,8 @@ extern void *yuugijouWorkPointer;`
`25`	`23`	`// monteCountDisp`
`26`	`24`	`// yuugijou_init`
`27`	`25`
	`26`	`+extern void *yuugijouWorkPointer;`
	`27`	`+`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ namespace ttyd::fadedrv {`
`6`	`6`
`7`	`7`	`extern "C" {`
`8`	`8`
`9`		`-extern void *fadeDrvWorkPointer;`
`10`		`-`
`11`	`9`	`// fadeSetNarrowFast`
`12`	`10`	`// fadeGetTpl`
`13`	`11`	`// fadeReset`
`@@ -36,6 +34,8 @@ void fadeEntry(int32_t type, int32_t duration, uint8_t color[4]);`
`36`	`34`	`// fadeInit`
`37`	`35`	`// _callback`
`38`	`36`
	`37`	`+extern void *fadeDrvWorkPointer;`
	`38`	`+`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@ static_assert(sizeof(ItemDrvWork) == 0x38);`
`15`	`15`
`16`	`16`	`extern "C" {`
`17`	`17`
`18`		`-extern ItemDrvWork itemDrvWork;`
`19`		`-`
`20`	`18`	`// itemPickUp`
`21`	`19`	`// itemStatus`
`22`	`20`	`// itemStatusOn`
`@@ -50,6 +48,8 @@ void itemEntry(const char name, int32_t id, uint32_t mode,`
`50`	`48`	`// itemReInit`
`51`	`49`	`// itemInit`
`52`	`50`
	`51`	`+extern ItemDrvWork itemDrvWork;`
	`52`	`+`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,13 @@ static_assert(sizeof(WorldData) == 0x108);`
`48`	`48`
`49`	`49`	`extern "C" {`
`50`	`50`
`51`		`-extern WorldData worldData;`
`52`		`-`
`53`	`51`	`// relSetBtlAddr`
`54`	`52`	`// relSetEvtAddr`
`55`	`53`	`// areaDataPtr`
`56`	`54`	`// mapDataPtr`
`57`	`55`
	`56`	`+extern WorldData worldData;`
	`57`	`+`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ namespace ttyd::mariost {`
`6`	`6`
`7`	`7`	`extern "C" {`
`8`	`8`
`9`		`-extern void *globalWorkPointer;`
`10`		`-`
`11`	`9`	`void marioStInit();`
`12`	`10`	`void marioStMain();`
`13`	`11`	`void marioStDisp();`
`@@ -17,6 +15,8 @@ void viPostCallback(uint32_t retraceCount);`
`17`	`15`	`void gcDvdCheckThread();`
`18`	`16`	`void gcRumbleCheck();`
`19`	`17`
	`18`	`+extern void *globalWorkPointer;`
	`19`	`+`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@ enum SmartAllocationGroup`
`40`	`40`
`41`	`41`	`extern "C" {`
`42`	`42`
`43`		`-extern SmartWork *smartWorkPointer;`
`44`		`-`
`45`	`43`	`// memInit`
`46`	`44`	`// memClear`
`47`	`45`	`void *__memAlloc(uint32_t heap, uint32_t size);`
`@@ -57,6 +55,8 @@ SmartAllocationData *smartAlloc(uint32_t size, uint32_t group);`
`57`	`55`	`// smartGarbage`
`58`	`56`	`// smartTexObj`
`59`	`57`
	`58`	`+extern SmartWork *smartWorkPointer;`
	`59`	`+`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`}`