Merge branch 'file-select' into level-select

42 files changed, 711 insertions, 230 deletions

diff --git a/NewerProject.yaml b/NewerProject.yaml
index 6044c59..ae354bf 100644
--- a/NewerProject.yaml
+++ b/NewerProject.yaml
@@ -2,6 +2,7 @@ output_dir: "NewerASM"
 code_address: 0x808D9000
 modules:
   - processed/prolog.yaml
+  - processed/fileselect.yaml
   - processed/magicplatform.yaml
   - processed/bugfixes.yaml
   - processed/worldmap.yaml
diff --git a/NewerProjectKP.yaml b/NewerProjectKP.yaml
index fdd447c..97820b5 100644
--- a/NewerProjectKP.yaml
+++ b/NewerProjectKP.yaml
@@ -2,6 +2,8 @@ output_dir: "NewerASM"
 code_address: 0x808D9000
 modules:
   - processed/prolog.yaml
+  - processed/layoutDebug.yaml
+  - processed/fileselect.yaml
   - processed/magicplatform.yaml
   - processed/cutScene.yaml
   - processed/bonepiece.yaml
diff --git a/bugfixes.yaml b/bugfixes.yaml
index 498dce1..336a524 100644
--- a/bugfixes.yaml
+++ b/bugfixes.yaml
@@ -1,5 +1,7 @@
 ---

-source_files: [../src/randomcrap.S, ../src/music.cpp, ../src/fix38.S, ../src/nullsub.S]

+# This has kind of turned into the "random stuff that we don't want to make a yaml for"

+# yaml, hasn't it...

+source_files: [../src/randomcrap.S, ../src/music.cpp, ../src/fix38.S, ../src/nullsub.S, ../src/newer.cpp]

 hooks:

   - name: FixMemoryLeaks

     type: patch

diff --git a/cutScene.yaml b/cutScene.yaml
index d338c6a..5fe95c5 100644
--- a/cutScene.yaml
+++ b/cutScene.yaml
@@ -1,5 +1,5 @@
 ---
-source_files: [.../src/cutScene.cpp]
+source_files: [../src/cutScene.cpp]
 hooks:
   - name: BuildCutScene
     type: add_func_pointer
diff --git a/fileselect.yaml b/fileselect.yaml
new file mode 100644
index 0000000..a432a13
--- /dev/null
+++ b/fileselect.yaml
@@ -0,0 +1,152 @@
+---
+source_files: [../src/fileselect.S]
+hooks:
+  - name: FSDisBrlan1 # inMulti
+    type: add_func_pointer
+    src_addr_pal: 0x80943A74
+    target_func: 'FSDummyBrlanName'
+  - name: FSDisBrlan2 # on
+    type: add_func_pointer
+    src_addr_pal: 0x80943AB4
+    target_func: 'FSDummyBrlanName'
+  - name: FSDisBrlan3 # idle
+    type: add_func_pointer
+    src_addr_pal: 0x80943AB8
+    target_func: 'FSDummyBrlanName'
+  - name: FSDisBrlan4 # hit
+    type: add_func_pointer
+    src_addr_pal: 0x80943ABC
+    target_func: 'FSDummyBrlanName'
+  - name: FSDisBrlan5 # off
+    type: add_func_pointer
+    src_addr_pal: 0x80943AC0
+    target_func: 'FSDummyBrlanName'
+  - name: FSDisBrlan6 # out
+    type: add_func_pointer
+    src_addr_pal: 0x80943AC4
+    target_func: 'FSDummyBrlanName'
+
+  - name: FSDisGroup1a # inMulti
+    type: add_func_pointer
+    src_addr_pal: 0x80943B88
+    target_func: 'FSDummyGroup'
+  - name: FSDisGroup1b # inMulti
+    type: add_func_pointer
+    src_addr_pal: 0x80943B8C
+    target_func: 'FSDummyGroup'
+  - name: FSDisGroup2a # onMulti
+    type: add_func_pointer
+    src_addr_pal: 0x80943BDC
+    target_func: 'FSDummyGroup'
+  - name: FSDisGroup2b # onMulti
+    type: add_func_pointer
+    src_addr_pal: 0x80943BE0
+    target_func: 'FSDummyGroup'
+  - name: FSDisGroup3a # idleMulti
+    type: add_func_pointer
+    src_addr_pal: 0x80943BE4
+    target_func: 'FSDummyGroup'
+  - name: FSDisGroup3b # idleMulti
+    type: add_func_pointer
+    src_addr_pal: 0x80943BE8
+    target_func: 'FSDummyGroup'
+  - name: FSDisGroup4a # hitMulti
+    type: add_func_pointer
+    src_addr_pal: 0x80943BEC
+    target_func: 'FSDummyGroup'
+  - name: FSDisGroup4b # hitMulti
+    type: add_func_pointer
+    src_addr_pal: 0x80943BF0
+    target_func: 'FSDummyGroup'
+  - name: FSDisGroup5a # offMulti
+    type: add_func_pointer
+    src_addr_pal: 0x80943BF4
+    target_func: 'FSDummyGroup'
+  - name: FSDisGroup5b # offMulti
+    type: add_func_pointer
+    src_addr_pal: 0x80943BF8
+    target_func: 'FSDummyGroup'
+#  - name: FSDisGroup6a # outMulti
+#    type: add_func_pointer
+#    src_addr_pal: 0x80943BFC
+#    target_func: 'FSDummyGroup'
+#  - name: FSDisGroup6b # outMulti
+#    type: add_func_pointer
+#    src_addr_pal: 0x80943C00
+#    target_func: 'FSDummyGroup'
+
+
+  - name: FSDummyPane1 # N_back
+    type: add_func_pointer
+    src_addr_pal: 0x80943C5C
+    target_func: 'FSDummyPane'
+
+
+  - name: FSCutOffSomeBmgs
+    type: patch
+    addr_pal: 0x80782F38
+    data: '38E00007'
+
+  - name: FSCutOffSomeTexts
+    type: patch
+    addr_pal: 0x80782F4C
+    data: '38C00002'
+
+  - name: FSNoBackBmg
+    type: nop_insn
+    area_pal: 0x80782F70
+
+  - name: FSNoWindows
+    type: nop_insn
+    area_pal: 0x80782F98
+
+  - {name: FSShowOrHideNBackNop1, type: nop_insn, area_pal: 0x80783428}
+  - {name: FSShowOrHideNBackNop2, type: nop_insn, area_pal: 0x80783440}
+  - {name: FSShowOrHideNBackNop3, type: nop_insn, area_pal: 0x80783458}
+  - {name: FSShowOrHideNBackNop4, type: nop_insn, area_pal: 0x8078346C}
+
+  - {name: FSDontMoveDown, type: patch, addr_pal: 0x80783D04, data: '4800001C'}
+  - {name: FSMoveLeftToUp, type: patch, addr_pal: 0x80783D20, data: '548007BD'}
+  - {name: FSMoveRightToDown, type: patch, addr_pal: 0x80783D3C, data: '548007FF'}
+
+  - {name: FS2MoveLeftToUp, type: patch, addr_pal: 0x8078456C, data: '540007BD'}
+  - {name: FS2MoveRightToDown, type: patch, addr_pal: 0x80784598, data: '540007FF'}
+
+  - {name: FS3MoveLeftToUp, type: patch, addr_pal: 0x80784B08, data: '540007BD'}
+  - {name: FS3MoveRightToDown, type: patch, addr_pal: 0x80784B40, data: '540007FF'}
+
+# needed because I replace A00_window with a couple of pointers LOL
+  - {name: FSFixWindowName, type: add_func_pointer, src_addr_pal: 0x80943B54, target_func: 'A00_window'}
+  - {name: FSShowRlan, type: add_func_pointer, src_addr_pal: 0x80943ACC, target_func: 'ShowEraseCopy'}
+  - {name: FSHideRlan, type: add_func_pointer, src_addr_pal: 0x80943AD0, target_func: 'HideEraseCopy'}
+  - {name: FSInitExtraRlans, type: patch, addr_pal: 0x80782EE4, data: '38A0001F'}
+#  - {name: FSFixPosFile, type: add_func_pointer, src_addr_pal: 0x80943C4C, target_func: 'N_posFile1_00'}
+#  - {name: FSCDHolderGrpA, type: add_func_pointer, src_addr_pal: 0x80943C08, target_func: 'CDHolderGroup'}
+#  - {name: FSCDHolderGrpB, type: add_func_pointer, src_addr_pal: 0x80943C0C, target_func: 'CDHolderGroup'}
+#  - {name: FSInitExtraGrps, type: patch, addr_pal: 0x80782EF8, data: '38C0002F'}
+  - {name: FSCDHolderGrpA, type: add_func_pointer, src_addr_pal: 0x80943BFC, target_func: 'CDHolderGroup'}
+  - {name: FSCDHolderGrpB, type: add_func_pointer, src_addr_pal: 0x80943C00, target_func: 'CDHolderGroup'}
+  - {name: FSRlanIdx, type: patch, addr_pal: 0x8093422C, data: '0000001D0000001E'}
+
+# disable the multi out anims
+  - {name: FSDisMulti1, type: nop_insn, area_pal: 0x80784220}
+  - {name: FSDisMulti2, type: nop_insn, area_pal: 0x80784230}
+
+  - {name: FSResetAnim, type: patch, addr_pal: 0x80783610, data: '3880002A'}
+#  - {name: FSShowCD, type: branch_insn, branch_type: b, src_addr_pal: 0x80783BFC, target_func: 'FSShowCD'}
+#  - {name: FSHideCD, type: branch_insn, branch_type: b, src_addr_pal: 0x80783F80, target_func: 'FSHideCD'}
+  - {name: FSShowCDa, type: branch_insn, branch_type: b, src_addr_pal: 0x80783810, target_func: 'FSShowCD_OpenWait'}
+#  - {name: FSHideCDa, type: branch_insn, branch_type: b, src_addr_pal: 0x80784304, target_func: 'FSHideCD_IWOSAEW'}
+# Show it on MultiButtnOnStageAnimeEndWait
+  - {name: FSShowCDOverrideA, type: patch, addr_pal: 0x80783954, data: '3880002A'}
+  - {name: FSShowCDOverrideB, type: patch, addr_pal: 0x807839AC, data: '3880002A'}
+# Hide it on MultiButtonExitAnimeEndWait
+  - {name: FSHideCD, type: branch_insn, branch_type: b, src_addr_pal: 0x80784200, target_func: 'FSHideCD'}
+
+
+  - {name: DFNiceTitle, type: branch_insn, branch_type: bl, src_addr_pal: 0x8077D044, target_func: 'DFNiceTitle'}
+  - {name: DFNiceWorldName, type: branch_insn, branch_type: bl, src_addr_pal: 0x8077DA10, target_func: 'DFNiceWorldName'}
+
+  - {name: FSDebugStates, type: add_func_pointer, src_addr_pal: 0x80943E38, target_func: 'FSDebugStates'}
+
+
diff --git a/include/game.h b/include/game.h
index f3b14c3..169b01d 100755
--- a/include/game.h
+++ b/include/game.h
@@ -137,10 +137,21 @@ public:
 	u8 worlds_available[10];	// 0x32

 	u32 ambush_countdown[10];	// 0x3C

 	u16 field_64;				// 0x64

-	u16 credits_hiscore;		// 0x66

+	union {

+		u16 credits_hiscore;		// 0x66

+		u16 spentStarCoins;

+	};

 	u16 score;					// 0x68

 	u32 completions[10][0x2A];	// 0x6C

-	u8 hint_movie_bought[70];	// 0x6FC

+	union {

+		u8 hint_movie_bought[70];	// 0x6FC

+

+		struct {

+			// ALL Newer additions should go here

+			// This array has been verified as safe to replace

+			u8 currentNewerWorld; // 0x6FC

+		};

+	};

 	u8 toad_location[10];		// 0x742

 	u8 field_74C[10][4];		// 0x74C

 	u8 field_774[10][4];		// 0x774

@@ -2590,7 +2601,7 @@ namespace m2d {
 	class AnmResHandler_c {

 		public:

 			AnmResHandler_c();

-			~AnmResHandler_c();

+			virtual ~AnmResHandler_c();

 

 			struct Thing {

 				nw4r::lyt::Group *group;

@@ -3056,7 +3067,30 @@ namespace mHeap {
 };

 

 void WriteNumberToTextBox(int *number, const int *fieldLength, nw4r::lyt::TextBox *textBox, bool unk); // 800B3B60

+extern "C" dAc_Py_c* GetSpecificPlayerActor(int number);

+extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer);

+extern "C" dStageActor_c *Actor_SearchByID(u32 actorID);

+

+struct DoSomethingCool {

+	u32 unk_01; //0000

+	Vec3 pos;  //0004

+	Vec3 scale; //0010

+	f32 unk_02; //001C

+	f32 unk_03; //0020

+	f32 unk_04; //0024

+	f32 unk_05; //0028

+	f32 unk_06; //002C

+	f32 unk_07; //0030

+	f32 unk_08; //0034

+	f32 unk_09; //0038

+};

+extern "C" u8 dSprite_c__getXDirectionOfFurthestPlayerRelativeToVEC3(dEn_c *, Vec pos);

+extern "C" void *ShakeScreen(void *, unsigned int, unsigned int, unsigned int, unsigned int);

+extern "C" void *PlaySound(dStageActor_c *, int soundID);

+extern "C" void *PlaySoundAsync(dStageActor_c *, int soundID);

+extern "C" u32 GetActivePlayerCount();

 

+#include "newer.h"

 

 #endif

 

diff --git a/include/newer.h b/include/newer.h
new file mode 100644
index 0000000..4f34f81
--- /dev/null
+++ b/include/newer.h
@@ -0,0 +1,31 @@
+#ifndef NEWER_H
+#define NEWER_H 
+
+enum NWRWorld {
+	ISLAND = 0, YOSHI_ISLAND = 0,
+	DESERT = 1, RUBBLE_RUINS = 1,
+	SEWER = 2, SOGGY_SEWERS = 2,
+	MOUNTAIN = 3, MUSHROOM_PEAKS = 3,
+	SAKURA = 4, SAKURA_VILLAGE = 4,
+	FREEZEFLAME = 5, FREEZEFLAME_GLACIER = 5,
+	VOLCANO = 6, FREEZEFLAME_VOLCANO = 6,
+	PUMPKIN = 7, PUMPKIN_BONEYARD = 7,
+	SKY_MOUNTAIN = 8,
+	SKY = 9, STARRY_SKIES = 9,
+	PLANET = 10, KOOPA_PLANET = 10,
+	CORE = 11, KOOPA_CORE = 11,
+	BONUS_LAND = 12,
+	GOLDWOOD = 13, GOLDWOOD_FOREST = 13,
+	MINIMEGA = 14, MINIMEGA_ISLAND = 14,
+	CRYSTAL = 15, CRYSTAL_CAVES = 15,
+	BOMBARD = 16, BOMBARD_CLIFFS = 16,
+	SKY_CITY = 17,
+	WORLD_COUNT = 18,
+	UNKNOWN_WORLD = 255
+};
+
+NWRWorld NewerWorldForLevelID(int world, int level);
+
+const wchar_t *NewerWorldName(NWRWorld world);
+
+#endif /* NEWER_H */
diff --git a/kamek_pal.x b/kamek_pal.x
index 4a44383..88b811b 100644
--- a/kamek_pal.x
+++ b/kamek_pal.x
@@ -1,6 +1,8 @@
 SECTIONS {
 
 /* Scrolling is annoying, clown car goes here! */
+	m2d__Anm_c__Load = 0x801644F0;
+	m2d__AnmResHandler_c__Load = 0x80163FA0;
 
 	RealAcPyDtor = 0x80144820;
 
diff --git a/layoutDebug.yaml b/layoutDebug.yaml
new file mode 100644
index 0000000..7c1dae2
--- /dev/null
+++ b/layoutDebug.yaml
@@ -0,0 +1,14 @@
+---
+source_files: [../src/layoutDebug.S]
+hooks:
+  - name: RlanLoadDebugHook
+    type: branch_insn
+    branch_type: bl
+    src_addr_pal: 0x800C9118
+    target_func: 'RlanLoadDebugHook'
+  - name: AnmLoadDebugHook
+    type: branch_insn
+    branch_type: bl
+    src_addr_pal: 0x800C9268
+    target_func: 'AnmLoadDebugHook'
+
diff --git a/makeNewerKP b/makeNewerKP
index 9337a0e..87a3daa 100755
--- a/makeNewerKP
+++ b/makeNewerKP
@@ -1,6 +1,6 @@
 #!/bin/sh
 python2 tools/mapfile_tool.py
-python2 tools/kamek.py NewerProjectKP.yaml --no-rels --use-mw --use-wine --gcc-type=/opt/wiidev/bin/powerpc-elf --mw-path=tools
+python2 tools/kamek.py NewerProjectKP.yaml --no-rels --use-mw --use-wine --gcc-type=/opt/wiidev/bin/powerpc-elf --mw-path=tools --fast-hack
 if [ "$?" = "0" ]; then
 	echo "compile successful"
 else
diff --git a/spriteswapper.yaml b/spriteswapper.yaml
index 76bf7d5..e05ba54 100644
--- a/spriteswapper.yaml
+++ b/spriteswapper.yaml
@@ -1,7 +1,7 @@
 ---
 # Replaces EN_Remocon_ToriMochi
 
-source_files: [../src/spriteSwapper.cpp]
+source_files: [../src/spriteswapper.cpp]
 hooks:
   - name: SpriteSpawnerTimedBuild
     type: add_func_pointer
diff --git a/src/bonusRoom.cpp b/src/bonusRoom.cpp
index c4a84cd..1f60399 100644
--- a/src/bonusRoom.cpp
+++ b/src/bonusRoom.cpp
@@ -5,11 +5,8 @@
 #include <stage.h>
 
 extern "C" bool SpawnEffect(const char*, int, Vec*, S16Vec*, Vec*);
-extern "C" void *PlaySound(dStageActor_c *, int soundID);
-extern "C" void *PlaySoundAsync(dStageActor_c *, int soundID);
 extern "C" void *StopBGMMusic();
 extern "C" void *StartBGMMusic();
-extern "C" dStageActor_c* GetSpecificPlayerActor(int number);
 extern "C" void *SoundRelatedClass;
 extern "C" void *MapSoundPlayer(void *SoundClass, int soundID, int unk);
 
diff --git a/src/boss.h b/src/boss.h
index 4c31021..57ef494 100644
--- a/src/boss.h
+++ b/src/boss.h
@@ -7,16 +7,10 @@
 #include <stage.h>
 #include <sfx.h>
 
-extern "C" void *PlaySound(dStageActor_c *, int soundID);
-extern "C" void *PlaySoundAsync(dStageActor_c *, int soundID);
 
 extern "C" bool SpawnEffect(const char*, int, Vec*, S16Vec*, Vec*);
 
-extern "C" dStageActor_c* GetSpecificPlayerActor(int number);
-extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer);
-
 extern "C" u32 GenerateRandomNumber(int max);
-extern "C" u8 dSprite_c__getXDirectionOfFurthestPlayerRelativeToVEC3(dEn_c *, Vec pos);
 extern "C" char usedForDeterminingStatePress_or_playerCollision(dEn_c* t, ActivePhysics *apThis, ActivePhysics *apOther, int unk1);
 
 extern "C" void *StopBGMMusic();
diff --git a/src/bossCaptainBowser.cpp b/src/bossCaptainBowser.cpp
index c3c1b62..119779f 100644
--- a/src/bossCaptainBowser.cpp
+++ b/src/bossCaptainBowser.cpp
@@ -5,7 +5,6 @@
 #include <stage.h>
 #include "boss.h"
 
-extern "C" void *ShakeScreen(void *, unsigned int, unsigned int, unsigned int, unsigned int);
 extern "C" void *StageScreen;
 
 
@@ -109,7 +108,6 @@ daCaptainBowser *daCaptainBowser::build() {
 // Externs and States
 ///////////////////////
 
-	extern "C" u32 GetActivePlayerCount();
 
 	CREATE_STATE(daCaptainBowser, Wait);
 	CREATE_STATE(daCaptainBowser, Throw);
diff --git a/src/bossMegaGoomba.cpp b/src/bossMegaGoomba.cpp
index 9b6f577..79ebd34 100644
--- a/src/bossMegaGoomba.cpp
+++ b/src/bossMegaGoomba.cpp
@@ -4,7 +4,6 @@
 #include <sfx.h>
 #include "boss.h"
 
-extern "C" void *ShakeScreen(void *, unsigned int, unsigned int, unsigned int, unsigned int);
 extern "C" void *ShakePlayers(dEn_c *);
 extern "C" void *StopPlayerShake(dEn_c *);
 extern "C" void *StageScreen;
diff --git a/src/bossPodouble.cpp b/src/bossPodouble.cpp
index 961d760..a1e1464 100644
--- a/src/bossPodouble.cpp
+++ b/src/bossPodouble.cpp
@@ -82,7 +82,6 @@ daPodouble *daPodouble::build() {
 // Externs and States
 ///////////////////////
 	extern "C" int SmoothRotation(short* rot, u16 amt, int unk2);
-	extern "C" int GetActivePlayerCount();
 
 	CREATE_STATE(daPodouble, Bounce);
 	CREATE_STATE(daPodouble, Spit);
diff --git a/src/bossRamboo.cpp b/src/bossRamboo.cpp
index c12b709..de01fe9 100644
--- a/src/bossRamboo.cpp
+++ b/src/bossRamboo.cpp
@@ -70,14 +70,6 @@ CREATE_STATE(daRamboo_c, Flee);
 CREATE_STATE(daRamboo_c, Outro);
 
 
-struct EventTable_t {
-	u64 events;
-	// ...
-};
-
-extern EventTable_t *EventTable;
-
-
 void daRamboo_c::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther) { DamagePlayer(this, apThis, apOther); }
 void daRamboo_c::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) { 
 	SpawnEffect("Wm_en_obakedoor_sm", 0, &apOther->owner->pos, &(S16Vec){0,0,0}, &(Vec){0.5, 0.5, 0.5});
@@ -236,7 +228,7 @@ int daRamboo_c::onExecute() {
 	if(this->fogSrt.isEntryAnimationDone(0))
 		this->fogSrt.setFrameForEntry(1.0, 0);
 	
-	if (EventTable->events & this->eventFlag) {
+	if (dFlagMgr_c::instance->flags & this->eventFlag) {
 		doStateChange(&StateID_Outro);
 	}
 
diff --git a/src/bossThwompaDomp.cpp b/src/bossThwompaDomp.cpp
index 85799c3..4bce47c 100644
--- a/src/bossThwompaDomp.cpp
+++ b/src/bossThwompaDomp.cpp
@@ -8,7 +8,6 @@
 // Externs
 	extern "C" int posIsInZone(Vec,float*,float*,u8 zone);
 	extern "C" void* ScreenPositionClass;
-	extern "C" void ShakeScreen(void*,int,int,int,int); // (ScreenPositionClass, some other ints - set the second one to 1 to shake it) 
 	extern "C" int SpawnThwompEffects(dEn_c *);
 
 	extern "C" void* SoundRelatedClass;
diff --git a/src/challengeStar.cpp b/src/challengeStar.cpp
index 051f9c4..790b0c4 100644
--- a/src/challengeStar.cpp
+++ b/src/challengeStar.cpp
@@ -4,17 +4,10 @@
 #include <sfx.h>
 
 
-extern "C" void *PlaySound(dEn_c *, int soundID);
-extern "C" void *PlaySoundAsync(dStageActor_c *, int soundID);
-
 extern "C" bool SpawnEffect(const char*, int, Vec*, S16Vec*, Vec*);
-extern "C" dStageActor_c* GetSpecificPlayerActor(int number);
 
 extern int GlobalStarsCollected;
 
-struct EventTable_t { u64 events; };
-extern EventTable_t *EventTable;
-
 
 class dChallengeStar : public dEn_c {
 	int onCreate();
@@ -51,7 +44,7 @@ void dChallengeStar::playerCollision(ActivePhysics *apThis, ActivePhysics *apOth
 	
 	GlobalStarsCollected--;
 	if (GlobalStarsCollected == 0) {
-		EventTable->events |= this->eventFlag;
+		dFlagMgr_c::instance->flags |= this->eventFlag;
 	}
 
 	this->Delete(1);
diff --git a/src/effectvideo.cpp b/src/effectvideo.cpp
index d690263..24089ef 100644
--- a/src/effectvideo.cpp
+++ b/src/effectvideo.cpp
@@ -4,7 +4,6 @@
 #include <sfx.h>
 
 
-extern "C" void *PlaySoundAsync(dEn_c *, int soundID);
 extern "C" bool SpawnEffect(const char*, int, Vec*, S16Vec*, Vec*);
 
 
@@ -25,12 +24,6 @@ class EffectVideo : public dEn_c {
 
 };
 
-struct EventTable_t {
-	u64 events;
-};
-
-extern EventTable_t *EventTable;
-
 
 EffectVideo *EffectVideo::build() {
 	void *buffer = AllocFromGameHeap1(sizeof(EffectVideo));
@@ -65,7 +58,7 @@ int EffectVideo::onDelete() {
 
 int EffectVideo::onExecute() {
 
-	if (EventTable->events & this->eventFlag) {		
+	if (dFlagMgr_c::instance->flags & this->eventFlag) {
 
 		if (this->timer == this->delay) {
 
diff --git a/src/electricLine.cpp b/src/electricLine.cpp
index af8c7ea..b6bb0bf 100644
--- a/src/electricLine.cpp
+++ b/src/electricLine.cpp
@@ -33,10 +33,6 @@ daElectricLine *daElectricLine::build() {
 ///////////////////////
 // Externs and States
 ///////////////////////
-	extern "C" void *PlaySound(dStageActor_c *, int soundID);
-	extern "C" void *PlaySoundAsync(dStageActor_c *, int soundID);
-
-	extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer);
 
 
 	CREATE_STATE(daElectricLine, Activate);
diff --git a/src/eventlooper.cpp b/src/eventlooper.cpp
index 5acb43c..4c0a232 100644
--- a/src/eventlooper.cpp
+++ b/src/eventlooper.cpp
@@ -18,13 +18,6 @@ struct EventLooper {
 	u8 delayCount;	// 0x3D7
 };
 
-struct EventTable_t {
-	u64 events;
-	// ...
-};
-
-extern EventTable_t *EventTable;
-
 void EventLooper_Update(EventLooper *self);
 
 
@@ -58,10 +51,10 @@ bool EventLooper_Create(EventLooper *self) {
 	}
 	
 
-	if (EventTable->events & self->eventActive)
+	if (dFlagMgr_c::instance->flags & self->eventActive)
 	{
 		u64 evState = (u64)1 << (eventStart - 1);
-		EventTable->events = EventTable->events | evState;
+		dFlagMgr_c::instance->flags |= evState;
 	}
 
 	EventLooper_Update(self);
@@ -77,7 +70,7 @@ bool EventLooper_Execute(EventLooper *self) {
 
 void EventLooper_Update(EventLooper *self) {
 	
-	if ((EventTable->events & self->eventActive) == 0)
+	if ((dFlagMgr_c::instance->flags & self->eventActive) == 0)
 		return;
 
 	// Waiting for the right moment
@@ -92,23 +85,23 @@ void EventLooper_Update(EventLooper *self) {
 	self->delayCount = 0;
 	
 	// Find which event(s) is/are on
-	u64 evState = EventTable->events & self->eventFlag;
+	u64 evState = dFlagMgr_c::instance->flags & self->eventFlag;
 	
 	// Turn off the old events
-	EventTable->events = EventTable->events & (~self->eventFlag);
+	dFlagMgr_c::instance->flags = dFlagMgr_c::instance->flags & (~self->eventFlag);
 	
 	// Shift them right if they can, if not, reset!
 	evState = evState << 1;
 	if (evState < self->eventFlag)
 	{
-		EventTable->events = EventTable->events | evState;
+		dFlagMgr_c::instance->flags = dFlagMgr_c::instance->flags | evState;
 	}
 	
 	else
 	{
 		char eventStart	= (self->settings >> 24)	& 0xFF;
 		evState = (u64)1 << (eventStart - 1);
-		EventTable->events = EventTable->events | evState;
+		dFlagMgr_c::instance->flags = dFlagMgr_c::instance->flags | evState;
 	}
 	
 	
diff --git a/src/fakeStarCoin.cpp b/src/fakeStarCoin.cpp
index b69e039..579054f 100644
--- a/src/fakeStarCoin.cpp
+++ b/src/fakeStarCoin.cpp
@@ -4,7 +4,6 @@
 #include <sfx.h>
 
 
-extern "C" void *PlaySound(dEn_c *, int soundID);
 extern "C" bool SpawnEffect(const char*, int, Vec*, S16Vec*, Vec*);
 
 
diff --git a/src/fileselect.S b/src/fileselect.S
new file mode 100644
index 0000000..faa6f48
--- /dev/null
+++ b/src/fileselect.S
@@ -0,0 +1,183 @@
+.set sp,1
+.set rtoc,2
+
+.text
+.extern OSReport
+
+.extern enableNonLoopAnim__Q23m2d13EmbedLayout_cFib
+.global FSShowCD, FSHideCD
+FSShowCD:
+	addi r3, r3, 0x74
+	li r4, 0x2A
+	b enableNonLoopAnim__Q23m2d13EmbedLayout_cFib
+
+FSHideCD:
+	addi r3, r3, 0x74
+	li r4, 0x2B
+	b enableNonLoopAnim__Q23m2d13EmbedLayout_cFib
+
+.global FSShowCD_OpenWait
+FSShowCD_OpenWait:
+	addi r3, r31, 0x74
+	li r4, 0x2A
+	bl enableNonLoopAnim__Q23m2d13EmbedLayout_cFib
+	lwz r0, 0x14(r1)
+	lwz r31, 0xC(r1)
+	mtlr r0
+	addi r1, r1, 0x10
+	blr
+
+#.global FSHideCD_IWOSAEW
+#FSHideCD_IWOSAEW:
+#	addi r3, r31, 0x74
+#	li r4, 0x2B
+#	bl enableNonLoopAnim__Q23m2d13EmbedLayout_cFib
+#	lwz r0, 0x14(r1)
+#	lwz r31, 0xC(r1)
+#	mtlr r0
+#	addi r1, r1, 0x10
+#	blr
+
+.global DFNiceTitle
+DFNiceTitle:
+	mr r3, r4
+	lis r4, DFTitle@h
+	ori r4, r4, DFTitle@l
+	lwz r6, 0xE44(r30)
+	addi r6, r6, '1'
+	sth r6, 0xA(r4)
+	li r5, 0
+	li r6, 6
+	lwz r12, 0(r3)
+	lwz r12, 0x80(r12)
+	mtctr r12
+	bctr
+
+.extern NewerWorldNames
+.global DFNiceWorldName
+DFNiceWorldName:
+	stwu r1, -0x10(r1)
+	mflr r0
+	stw r0, 0x14(r1)
+	stw r20, 0xC(r1)
+	mr r20, r4
+
+	# get Newer map number
+	lbz r6, 0x6FC(r31)
+	slwi r6, r6, 4
+	lis r7, NewerWorldNames@h
+	ori r7, r7, NewerWorldNames@l
+	lwzx r4, r7, r6
+	li r5, 0
+
+	mr r3, r20
+	lwz r12, 0(r3)
+	lwz r12, 0x7C(r12)
+	mtctr r12
+	bctrl
+
+	lwz r20, 0xC(r1)
+	lwz r0, 0x14(r1)
+	mtlr r0
+	addi r1, r1, 0x10
+	blr
+
+.global FSDebugStates
+FSDebugStates:
+	stwu r1, -0x10(r1)
+	mflr r0
+	stw r0, 0x14(r1)
+	stw r31, 0xC(r1)
+	stw r30, 0x8(r1)
+	mr r31, r3
+	mr r30, r4
+
+	lis r3, FSStateDebugStr@h
+	ori r3, r3, FSStateDebugStr@l
+	crclr 4*cr1+eq
+	lwz r4, 4(r4)
+	bl OSReport
+
+	mr r3, r31
+	mr r4, r30
+	lwzu r12, 0x18(r3)
+	lwz r12, 0x18(r12)
+	mtctr r12
+	bctrl
+
+	lwz r31, 0xC(r1)
+	lwz r30, 0x8(r1)
+	lwz r0, 0x14(r1)
+	mtlr r0
+	addi r1, r1, 0x10
+	blr
+
+.align 4
+
+.data
+FSStateDebugStr: .string "State: %s\n"
+
+.global FSDummyBrlanName, FSDummyGroup, FSDummyPane
+FSDummyBrlanName: .string "fileSelectBase_18_DummyAnim.brlan"
+FSDummyGroup: .string "DummyGroup"
+FSDummyPane: .string "DummyPane"
+
+.global A00_window
+A00_window: .string "A00_window"
+.global ShowEraseCopy, HideEraseCopy
+ShowEraseCopy: .string "fileSelectBase_18_ShowEraseCopy.brlan"
+HideEraseCopy: .string "fileSelectBase_18_HideEraseCopy.brlan"
+.global N_posFile1_00
+N_posFile1_00: .string "N_posFile1_00"
+.global CDHolderGroup
+CDHolderGroup: .string "CDHolderGroup"
+
+.align 4
+DFTitle:
+.short 'F','i','l','e',' ','X'
+
+NameYI: .string "Yoshi's Island"
+NameDesert: .string "Rubble Ruins"
+NameSewer: .string "Soggy Sewers"
+NameMountain: .string "Mushroom Peaks"
+NameJapan: .string "Sakura Village"
+NameFF: .string "FreezeFlame Valley"
+NameVolcano: .string "FreezeFlame Volcano"
+NameGhost: .string "Pumpkin Boneyard"
+NameSkyM: .string "Sky Mountain"
+NameSky: .string "Starry Skies"
+NameKoopa: .string "Koopa Planet"
+NameCore: .string "Koopa Core"
+NameGoldwood: .string "Goldwood Forest"
+NameCaverns: .string "Crystal Caves"
+NameBomb: .string "Bombard Cliffs"
+NameMiniMega: .string "Mini-Mega Island"
+NameSkyCity: .string "Sky City"
+NameBonus: .string "Bonus Land"
+
+# [05:59:00] <Tempus> W1 GW W2 MM W3 W4 W5 CC W6 BC W7 SC W8 KC W9
+.align 4
+# Struct definition: World, Level, IsSecret, Name
+.long -1,-1,0,NameYI
+.long 1,6,1,NameGoldwood
+.long 1,38,0,NameDesert
+.long 2,1,0,NameSewer
+.long 2,15,0,NameDesert
+.long 2,9,1,NameMiniMega
+.long 2,38,0,NameMountain
+.long 3,38,0,NameJapan
+.long 4,38,0,NameFF
+.long 5,6,0,NameVolcano
+.long 5,8,0,NameFF
+.long 5,10,0,NameFF
+.long 5,9,1,NameCaverns
+.long 5,38,0,NameGhost
+.long 6,8,0,NameBomb
+.long 6,38,0,NameSkyM
+.long 7,3,0,NameSky
+.long 7,4,1,NameSkyCity
+.long 7,38,0,NameKoopa
+.long 8,25,0,NameCore
+.long 8,26,0,NameBonus
+.long 0,0,0,0
+
diff --git a/src/firelaser.cpp b/src/firelaser.cpp
index 32eb0bd..fa240d0 100755
--- a/src/firelaser.cpp
+++ b/src/firelaser.cpp
@@ -25,18 +25,9 @@ daFireLaser_c *daFireLaser_c::build() {
 }
 
 
-extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer);
-
-
 CREATE_STATE(daFireLaser_c, pewpewpew);
 
 
-struct EventTable_t {
-	u64 events;
-};
-
-extern EventTable_t *EventTable;
-
 
 
 int daFireLaser_c::onCreate() {
@@ -77,7 +68,7 @@ void daFireLaser_c::beginState_pewpewpew() {
 void daFireLaser_c::executeState_pewpewpew() { 
 	
 	
-	if (EventTable->events & this->eventFlag) {
+	if (dFlagMgr_c::instance->flags & this->eventFlag) {
 		
 		this->timer = this->timer + 1;
 	
diff --git a/src/koopatlas/hud.cpp b/src/koopatlas/hud.cpp
index 8f4b778..3989a1c 100644
--- a/src/koopatlas/hud.cpp
+++ b/src/koopatlas/hud.cpp
@@ -383,72 +383,7 @@ void dWMHud_c::setWorldName() {
 		int world = node->levelNumber[0];
 		int level = node->levelNumber[1];
 
-		switch (world) {
-			case 1:		
-				setWorldText("Yoshi's\nIsland");
-				break;	
-
-			case 2:
-				if (((level > 1) && (level < 5)) || (level == 15) || (level == 33) || (level == 34))
-					setWorldText("Soggy\nSewers");
-				else
-					setWorldText("Rubble\nRuins");
-				break;	
-
-			case 3:		
-				setWorldText("Mushroom\nPeaks");
-				break;	
-
-			case 4:		
-				setWorldText("Sakura\nVillage");
-				break;	
-
-			case 5:		
-				if ((level < 6) || (level == 15) || (level == 33) || (level == 34))
-					setWorldText("FreezeFlame\nValley");
-				else
-					setWorldText("FreezeFlame\nVolcano");
-				break;	
-
-			case 6:		
-				setWorldText("Pumpkin\nBoneyard");
-				break;	
-
-			case 7:		
-				if (level < 4)
-					setWorldText("Sky\nMountain");
-				else
-					setWorldText("Starry\nSkies");
-				break;	
-
-			case 8:		
-				if ((level < 6) || (level == 15) || (level == 25) || (level == 33) || (level == 34))
-					setWorldText("Koopa\nPlanet");
-				else
-					setWorldText("Koopa\nCore");
-				break;	
-
-			case 9:		
-				setWorldText("Bonus\nLand");
-				break;	
-
-			case 10:		
-				if      ((level < 6)  || (level == 30) || (level == 41) )
-					setWorldText("Goldwood\nForest");
-				else if ((level < 11) || (level == 32))
-					setWorldText("Mini-Mega\nIsland");
-				else if ((level < 16) || (level == 33) || (level == 34) || (level == 31) )
-					setWorldText("Crystal\nCaves");
-				else if (level < 19)
-					setWorldText("Bombard\nCliffs");
-				else
-					setWorldText("Sky\nCity");
-				break;	
-
-			default:
-				setWorldText("Unknown\nWorld");
-				break;
-		}
+		setWorldText(NewerWorldName(NewerWorldForLevelID(world, level)));
 	}
 }
 
diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp
index ffc4dfd..49ee728 100644
--- a/src/koopatlas/pathmanager.cpp
+++ b/src/koopatlas/pathmanager.cpp
@@ -560,6 +560,13 @@ void dWMPathManager_c::moveThroughPath() {
 			SaveBlock *save = GetSaveFile()->GetBlock(-1);
 			save->current_path_node = pathLayer->findNodeID(to);
 
+			if (to->type == dKPNode_s::LEVEL) {
+				NWRWorld nWorld = NewerWorldForLevelID(to->levelNumber[0], to->levelNumber[1]);
+				if (nWorld != UNKNOWN_WORLD) {
+					save->currentNewerWorld = (u8)nWorld;
+				}
+			}
+
 			dWMHud_c::instance->showPointBar();
 			SpammyReport("Point bar shown\n");
 		} else {
diff --git a/src/layoutDebug.S b/src/layoutDebug.S
new file mode 100644
index 0000000..591bfd5
--- /dev/null
+++ b/src/layoutDebug.S
@@ -0,0 +1,148 @@
+.text
+
+.extern OSReport
+.extern strcmp
+
+.global RlanLoadDebugHook
+.extern m2d__AnmResHandler_c__Load
+RlanLoadDebugHook:
+	stwu r1, -0x20(r1)
+	mflr r0
+	stw r0, 0x24(r1)
+	stw r21, 0x1C(r1)
+	stw r22, 0x18(r1)
+	stw r23, 0x14(r1)
+	stw r24, 0x10(r1)
+	stw r25, 0xC(r1)
+
+	mr r21, r3
+	mr r22, r4
+	mr r23, r5
+	mr r24, r6
+	mr r25, r7
+
+	lis r3, RlanLoadStr@h
+	ori r3, r3, RlanLoadStr@l
+	mr r4, r29 # rlan num
+	mr r5, r28 # rlan count
+	mr r6, r21 # anmreshandler
+	mr r7, r22 # rlan name
+	mr r8, r23 # resAcc
+	mr r9, r24 # layout
+	crclr 4*cr1+eq
+	bl OSReport
+
+	lis r3, BreakOnRlan@h
+	ori r3, r3, BreakOnRlan@l
+	mr r4, r22
+	bl strcmp
+	cmpwi r3, 0
+	bne thatsFine
+	lis r3, 0xDEAD
+	ori r3, r3, 0xBEEF
+thatsFine:
+	mr r3, r21
+	mr r4, r22
+	mr r5, r23
+	mr r6, r24
+	mr r7, r25
+	bl m2d__AnmResHandler_c__Load
+	mr r25, r3
+
+#	lis r3, RlanGrpCount@h
+#	ori r3, r3, RlanGrpCount@l
+#	lwz r4, 0x18(r21)
+#	crclr 4*cr1+eq
+#	bl OSReport
+
+	# Thing: r22
+	# ID: r23
+	# Count: r24
+	li r23, 0
+	lwz r24, 0x18(r21)
+	lwz r22, 0x14(r21)
+	b startGroupReportLoop
+groupReportLoop:
+
+	lis r3, RlanGroupStr@h
+	ori r3, r3, RlanGroupStr@l
+
+	mr r4, r23 # ID
+	mr r5, r24 # count
+	lwz r6, 0(r22) # group
+	addi r7, r6, 0x18
+	lwz r8, 4(r22) # animTransform
+
+	crclr 4*cr1+eq
+	bl OSReport
+
+	addi r23, r23, 1
+	addi r22, r22, 8
+
+startGroupReportLoop:
+	cmpw r23, r24
+	blt groupReportLoop
+
+	mr r3, r25
+
+	lwz r21, 0x1C(r1)
+	lwz r22, 0x18(r1)
+	lwz r23, 0x14(r1)
+	lwz r24, 0x10(r1)
+	lwz r25, 0xC(r1)
+	lwz r0, 0x24(r1)
+	mtlr r0
+	addi r1, r1, 0x20
+	blr
+
+
+
+
+.global AnmLoadDebugHook
+.extern m2d__Anm_c__Load
+
+AnmLoadDebugHook:
+	stwu r1, -0x20(r1)
+	mflr r0
+	stw r0, 0x24(r1)
+	stw r21, 0x1C(r1)
+	stw r22, 0x18(r1)
+	stw r23, 0x14(r1)
+
+	mr r21, r3
+	mr r22, r4
+	mr r23, r5
+
+	lis r3, AnmLoadStr@h
+	ori r3, r3, AnmLoadStr@l
+	mr r4, r30 # anim num
+	mr r5, r29 # anim count
+	lwz r6, 0(r28) # rlan ID
+	mr r7, r21 # anim
+	mr r8, r22 # anmreshandler
+	mr r9, r23 # group name
+	crclr 4*cr1+eq
+	bl OSReport
+
+	mr r3, r21
+	mr r4, r22
+	mr r5, r23
+	bl m2d__Anm_c__Load
+
+	lwz r21, 0x1C(r1)
+	lwz r22, 0x18(r1)
+	lwz r23, 0x14(r1)
+	lwz r0, 0x24(r1)
+	mtlr r0
+	addi r1, r1, 0x20
+	blr
+
+
+.data
+.align 4
+AnmLoadStr: .string "[Anm %d/%d] Anm[%d] @ %p, ResHandler @ %p, Group: %s\n"
+RlanLoadStr: .string "[Rlan %d/%d] ResHandler: %p, Rlan Name: %s, ResAcc: %p, Layout: %p\n"
+#RlanGrpCount: .string "%d group(s):\n"
+RlanGroupStr: .string "--[%d/%d] %p : %s - AnimTransform: %p\n"
+BreakOnRlan: .string "fileSelectBase_18_DummyAnim.brlan"
+
diff --git a/src/levelinfo_old.h b/src/levelinfo_old.h
index 8e1e916..d8cb888 100644
--- a/src/levelinfo_old.h
+++ b/src/levelinfo_old.h
@@ -1,5 +1,5 @@
-#ifndef __NEWER_LEVELINFO_H
-#define __NEWER_LEVELINFO_H
+#ifndef __NEWER_LEVELINFO_OLD_H
+#define __NEWER_LEVELINFO_OLD_H
 
 #include <common.h>
 #include "fileload.h"
diff --git a/src/levelspecial.cpp b/src/levelspecial.cpp
index dc503e0..adadc50 100644
--- a/src/levelspecial.cpp
+++ b/src/levelspecial.cpp
@@ -19,12 +19,6 @@ struct LevelSpecial {
 	u8 func;		// 0x3D7
 };
 
-struct EventTable_t {
-	u64 events;
-	// ...
-};
-
-extern EventTable_t *EventTable;
 
 extern u16 TimeStopFlag;
 extern u32 TimerBranch;
@@ -50,7 +44,6 @@ float GlobalRiderFloatModifications [] = {1, 0.6, 0.7, 0.9, 1, 1, 1, 1.1, 1.25,
 
 
 
-extern "C" dAc_Py_c *GetSpecificPlayerActor(int number);
 void LevelSpecial_Update(LevelSpecial *self);
 bool ResetAfterLevel();
 
@@ -105,7 +98,7 @@ bool LevelSpecial_Execute(LevelSpecial *self) {
 void LevelSpecial_Update(LevelSpecial *self) {
 	
 	u8 newEvState = 0;
-	if (EventTable->events & self->eventFlag)
+	if (dFlagMgr_c::instance->flags & self->eventFlag)
 		newEvState = 1;
 	
 	if (newEvState == self->lastEvState)
diff --git a/src/linegod.cpp b/src/linegod.cpp
index c727de4..dedbea6 100644
--- a/src/linegod.cpp
+++ b/src/linegod.cpp
@@ -72,12 +72,6 @@ struct LineGod {
 	BgActor *ac[8];	// 0x3D8

 };

 

-struct EventTable_t {

-	u64 events;

-	// ...

-};

-

-extern EventTable_t *EventTable;

 

 fBase_c *FindActorByID(u32 id);

 

@@ -174,7 +168,7 @@ bool LineGod_AppendToList(LineGod *self, BgActor *ac) {
 void LineGod_Update(LineGod *self) {

 	

 	u8 newEvState = 0;

-	if (EventTable->events & self->eventFlag)

+	if (dFlagMgr_c::instance->flags & self->eventFlag)

 		newEvState = 1;

 	

 	if (newEvState == self->lastEvState)

diff --git a/src/meteor.cpp b/src/meteor.cpp
index 5eea95f..219bab3 100755
--- a/src/meteor.cpp
+++ b/src/meteor.cpp
@@ -4,8 +4,6 @@
 #include <sfx.h>
 #include "boss.h"
 
-extern "C" void *PlaySound(dStageActor_c *, int soundID);
-
 class dMeteor : public dEn_c {
 	int onCreate();
 	int onDelete();
diff --git a/src/mrsun.cpp b/src/mrsun.cpp
index 86c5bfb..5b9130c 100755
--- a/src/mrsun.cpp
+++ b/src/mrsun.cpp
@@ -86,13 +86,6 @@ CREATE_STATE(daMrSun_c, Wait);
 #define DEACTIVATE	0
 
 
-struct EventTable_t {
-	u64 events;
-	// ...
-};
-
-extern EventTable_t *EventTable;
-
 
 
 void daMrSun_c::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther) {  DamagePlayer(this, apThis, apOther); }
@@ -253,7 +246,7 @@ int daMrSun_c::onExecute() {
 	acState.execute();
 	updateModelMatrices();
 		
-	if (EventTable->events & this->eventFlag) {
+	if (dFlagMgr_c::instance->flags & this->eventFlag) {
 		if (this->killFlag == 0) {
 			this->kill();
 			this->pos.y = this->pos.y + 800.0; 
diff --git a/src/newer.cpp b/src/newer.cpp
new file mode 100644
index 0000000..215dfeb
--- /dev/null
+++ b/src/newer.cpp
@@ -0,0 +1,72 @@
+#include <newer.h>
+
+NWRWorld NewerWorldForLevelID(int w, int l) {
+	switch (w) {
+		case 1: return YOSHI_ISLAND;
+		case 2:
+				if (((l>1) && (l<5)) || (l==15) || (l==33) || (l==34))
+					return SOGGY_SEWERS;
+				else
+					return RUBBLE_RUINS;
+		case 3: return MUSHROOM_PEAKS;
+		case 4: return SAKURA_VILLAGE;
+		case 5:
+				if (l<7 || l==15 || l==33 || l==34)
+					return FREEZEFLAME_GLACIER;
+				else
+					return FREEZEFLAME_VOLCANO;
+		case 6: return PUMPKIN_BONEYARD;
+		case 7:
+				if (l<4)
+					return SKY_MOUNTAIN;
+				else
+					return STARRY_SKIES;
+		case 8:
+				if (l<6 || l==15 || l==25 || l==33 || l==34)
+					return KOOPA_PLANET;
+				else
+					return KOOPA_CORE;
+		case 9: return BONUS_LAND;
+		case 10:
+				if (l<6 || l==30 || l==41)
+					return GOLDWOOD_FOREST;
+				else if (l<11 || l==32)
+					return MINIMEGA_ISLAND;
+				else if (l<16 || l==33 || l==34 || l==31)
+					return CRYSTAL_CAVES;
+				else if (l<19)
+					return BOMBARD_CLIFFS;
+				else
+					return SKY_CITY;
+	}
+
+	return UNKNOWN_WORLD;
+}
+
+
+const wchar_t *NewerWorldNames[] = {
+	L"Yoshi's Island",
+	L"Rubble Ruins",
+	L"Soggy Sewers",
+	L"Mushroom Peaks",
+	L"Sakura Village",
+	L"Freezeflame Glacier",
+	L"Freezeflame Volcano",
+	L"Pumpkin Boneyard",
+	L"Sky Mountain",
+	L"Starry Skies",
+	L"Koopa Planet",
+	L"Koopa Core",
+	L"Bonus Land",
+	L"Goldwood Forest",
+	L"Mini-Mega Island",
+	L"Crystal Caves",
+	L"Bombard Cliffs",
+	L"Sky City"
+};
+
+const wchar_t *NewerWorldName(NWRWorld world) {
+	if (world < 0 || world >= WORLD_COUNT)
+		return L"Unknown World";
+	return NewerWorldNames[world];
+}
diff --git a/src/penguin.cpp b/src/penguin.cpp
index 2105291..6112285 100644
--- a/src/penguin.cpp
+++ b/src/penguin.cpp
@@ -63,10 +63,6 @@ daPengi *daPengi::build() {
 ///////////////////////
 // Externs and States
 ///////////////////////
-	extern "C" void *PlaySound(dStageActor_c *, int soundID);
-
-	extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer);
-	extern "C" u8 dSprite_c__getXDirectionOfFurthestPlayerRelativeToVEC3(daPengi *, Vec pos);
 
 	//FIXME make this dEn_c->used...
 	extern "C" char usedForDeterminingStatePress_or_playerCollision(dEn_c* t, ActivePhysics *apThis, ActivePhysics *apOther, int unk1);
diff --git a/src/player.h b/src/player.h
index 267729f..e1bbed5 100644
--- a/src/player.h
+++ b/src/player.h
@@ -4,7 +4,6 @@
 #include <common.h>
 #include <game.h>
 
-extern "C" dStageActor_c* GetSpecificPlayerActor(int number);
 char NearestPlayer(dStageActor_c* actor);
 void setNewActivePhysicsRect(dStageActor_c* actor, Vec* scale);
 void changeActivePhysicsRect(dStageActor_c* actor, float xc, float yc, float xe, float ye);
diff --git a/src/pumpkinGoomba.cpp b/src/pumpkinGoomba.cpp
index 64d98fc..1cc7a96 100644
--- a/src/pumpkinGoomba.cpp
+++ b/src/pumpkinGoomba.cpp
@@ -59,8 +59,6 @@ dGoombaPie *dGoombaPie::build() {
 ///////////////////////
 // Externs and States
 ///////////////////////
-	extern "C" void *PlaySound(dStageActor_c *, int soundID);
-	extern "C" void *PlaySoundAsync(dStageActor_c *, int soundID);
 	extern "C" void *EN_LandbarrelPlayerCollision(dEn_c* t, ActivePhysics *apThis, ActivePhysics *apOther);
 	extern "C" int SmoothRotation(short* rot, u16 amt, int unk2);
 	extern "C" char usedForDeterminingStatePress_or_playerCollision(dEn_c* t, ActivePhysics *apThis, ActivePhysics *apOther, int unk1);
@@ -132,19 +130,7 @@ dGoombaPie *dGoombaPie::build() {
 		doStateChange(&StateID_Burst);
 	}
 
-	struct DoSomethingCool {
-	    u32 unk_01; //0000
-	    Vec3 pos;  //0004
-	    Vec3 scale; //0010
-	    f32 unk_02; //001C
-	    f32 unk_03; //0020
-	    f32 unk_04; //0024
-	    f32 unk_05; //0028
-	    f32 unk_06; //002C
-	    f32 unk_07; //0030
-	    f32 unk_08; //0034
-	    f32 unk_09; //0038
-	} goombIceBlock;
+	DoSomethingCool goombIceBlock;
 
 	extern "C" void sub_80024C20(void);
 	extern "C" void __destroy_arr(void*, void(*)(void), int, int);
diff --git a/src/shyguy.cpp b/src/shyguy.cpp
index 213caa8..174b075 100644
--- a/src/shyguy.cpp
+++ b/src/shyguy.cpp
@@ -147,13 +147,8 @@ daShyGuy *daShyGuy::build() {
 ///////////////////////
 // Externs and States
 ///////////////////////
-	extern "C" void *PlaySound(dStageActor_c *, int soundID);
-	extern "C" void *PlaySoundAsync(dStageActor_c *, int soundID);
 	extern "C" bool SpawnEffect(const char*, int, Vec*, S16Vec*, Vec*);
 
-	extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer);
-	extern "C" u8 dSprite_c__getXDirectionOfFurthestPlayerRelativeToVEC3(daShyGuy *, Vec pos);
-
 	//FIXME make this dEn_c->used...
 	extern "C" char usedForDeterminingStatePress_or_playerCollision(dEn_c* t, ActivePhysics *apThis, ActivePhysics *apOther, int unk1);
 	extern "C" int SomeStrangeModification(dStageActor_c* actor);
diff --git a/src/spritespawner.cpp b/src/spritespawner.cpp
index 56ac383..4be86a3 100755
--- a/src/spritespawner.cpp
+++ b/src/spritespawner.cpp
@@ -19,9 +19,6 @@ struct SpriteSpawner {
 	u32 createdActor;
 };
 
-struct EventTable_t {
-	u64 events;
-};
 
 
 struct VEC {
@@ -31,9 +28,6 @@ struct VEC {
 };
 
 
-extern EventTable_t *EventTable;
-extern "C" dStageActor_c *CreateActor(u16 classID, int settings, VEC pos, char rot, char layer);
-extern "C" dStageActor_c *Actor_SearchByID(u32 actorID);
 
 void SpriteSpawner_Update(SpriteSpawner *self);
 
@@ -67,13 +61,13 @@ bool SpriteSpawner_Execute(SpriteSpawner *self) {
 
 void SpriteSpawner_Update(SpriteSpawner *self) {
 				
-	if (EventTable->events & self->eventFlag)
+	if (dFlagMgr_c::instance->flags & self->eventFlag)
 	{		
 		// Put an action for when the event turns on here
 		
 		if (self->createdActor == 0)
 		{
-			VEC pos;
+			Vec pos;
 			pos.x = self->x;
 			pos.y = self->y;
 			pos.z = self->z;
diff --git a/src/spriteswapper.cpp b/src/spriteswapper.cpp
index 89ead56..3fc78e0 100755
--- a/src/spriteswapper.cpp
+++ b/src/spriteswapper.cpp
@@ -16,19 +16,12 @@ public:
 	u32 timer;
 };
 
-struct EventTable_t {
-	u64 events;
-};
-
 
 SpriteSpawnerTimed *SpriteSpawnerTimed::build() {
 	void *buffer = AllocFromGameHeap1(sizeof(SpriteSpawnerTimed));
 	return new(buffer) SpriteSpawnerTimed;
 }
 
-extern EventTable_t *EventTable;
-extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer);
-
 
 
 int SpriteSpawnerTimed::onCreate() {
@@ -48,7 +41,7 @@ int SpriteSpawnerTimed::onCreate() {
 
 int SpriteSpawnerTimed::onExecute() {
 
-	if (EventTable->events & this->eventFlag) {		 // If the event is on
+	if (dFlagMgr_c::instance->flags & this->eventFlag) {		 // If the event is on
 		if (this->timer < 1) {						// If the timer is empty
 			CreateActor(this->type, this->inheritSet, this->pos, 0, 0);
 			this->timer = 120;
@@ -62,4 +55,4 @@ int SpriteSpawnerTimed::onExecute() {
 	}
 
 	return true;
-}
\ No newline at end of file
+}
diff --git a/src/topman.cpp b/src/topman.cpp
index edf75dd..5a313ae 100644
--- a/src/topman.cpp
+++ b/src/topman.cpp
@@ -73,13 +73,8 @@ daTopman *daTopman::build() {
 ///////////////////////
 // Externs and States
 ///////////////////////
-	extern "C" void *PlaySound(dStageActor_c *, int soundID);
-	extern "C" void *PlaySoundAsync(dStageActor_c *, int soundID);
 	extern "C" void *EN_LandbarrelPlayerCollision(dEn_c* t, ActivePhysics *apThis, ActivePhysics *apOther);
 
-	extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer);
-	extern "C" u8 dSprite_c__getXDirectionOfFurthestPlayerRelativeToVEC3(daTopman *, Vec pos);
-
 	//FIXME make this dEn_c->used...
 	extern "C" char usedForDeterminingStatePress_or_playerCollision(dEn_c* t, ActivePhysics *apThis, ActivePhysics *apOther, int unk1);
 	extern "C" int SmoothRotation(short* rot, u16 amt, int unk2);
@@ -194,19 +189,7 @@ daTopman *daTopman::build() {
 		doStateChange(&StateID_Die);
 	}
 
-	struct DoSomethingCool {
-	    u32 unk_01; //0000
-	    Vec3 pos;  //0004
-	    Vec3 scale; //0010
-	    f32 unk_02; //001C
-	    f32 unk_03; //0020
-	    f32 unk_04; //0024
-	    f32 unk_05; //0028
-	    f32 unk_06; //002C
-	    f32 unk_07; //0030
-	    f32 unk_08; //0034
-	    f32 unk_09; //0038
-	} my_struct;
+	DoSomethingCool my_struct;
 
 	extern "C" void sub_80024C20(void);
 	extern "C" void __destroy_arr(void*, void(*)(void), int, int);
diff --git a/tools/kamek.py b/tools/kamek.py
index ee67a5a..a82740f 100644
--- a/tools/kamek.py
+++ b/tools/kamek.py
@@ -35,10 +35,11 @@ show_cmd = False
 delete_temp = True
 override_config_file = None
 only_build = None
+fast_hack = False
 
 
 def parse_cmd_options():
-	global use_rels, use_mw, use_wine, show_cmd, delete_temp, only_build
+	global use_rels, use_mw, use_wine, show_cmd, delete_temp, only_build, fast_hack
 	global override_config_file, gcc_type, gcc_path, mw_path
 	
 	if '--no-rels' in sys.argv:
@@ -56,7 +57,9 @@ def parse_cmd_options():
 	if '--keep-temp' in sys.argv:
 		delete_temp = False
 	
-	
+	if '--fast-hack' in sys.argv:
+		fast_hack = True
+
 	
 	only_build = []
 	
@@ -408,6 +411,11 @@ class KamekBuilder(object):
 		
 		
 		self._moduleFiles = []
+
+		if fast_hack:
+			fast_cpp_path = os.path.join(self._configTempDir, 'fasthack.cpp')
+			fast_cpp = open(fast_cpp_path, 'w')
+
 		for m in self.project.modules:
 			for normal_sourcefile in m.data['source_files']:
 				print_debug('Compiling %s : %s' % (m.moduleName, normal_sourcefile))
@@ -421,6 +429,11 @@ class KamekBuilder(object):
 					# todo: better extension detection
 					if sourcefile.endswith('.s') or sourcefile.endswith('.S'):
 						command = as_command
+					elif sourcefile.endswith('.cpp') and fast_hack:
+						fast_cpp.write('//\n// %s\n//\n\n' % sourcefile)
+						fast_cpp.write(open(sourcefile, 'r').read())
+						fast_cpp.write('\n')
+						continue
 					else:
 						command = cc_command
 					
@@ -440,6 +453,24 @@ class KamekBuilder(object):
 				
 				self._moduleFiles.append(objfile)
 		
+		if fast_hack:
+			fast_cpp.close()
+
+			print_debug('Fast compilation!!')
+			objfile = os.path.join(self._configTempDir, 'fasthack.o')
+
+			new_command = cc_command + ['-c', '-o', objfile, fast_cpp_path]
+			if show_cmd:
+				print_debug(new_command)
+
+			errorVal = subprocess.call(new_command)
+			if errorVal != 0:
+				print 'BUILD FAILED!'
+				print 'compiler returned %d - an error occurred while compiling the fast hack' % errorVal
+				sys.exit(1)
+
+			self._moduleFiles.append(objfile)
+
 		print_debug('Compilation complete')