Fix Ike/Robin for Codename STEAM

hax0kartik · Jul 9, 2022 · 421eb3f · 421eb3f
1 parent a2c24e0
commit 421eb3f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/jsons/amiibos.json b/jsons/amiibos.json
@@ -3960,7 +3960,7 @@
  "code-name-s-t-e-a-m": [
  [
  "Ike",
- "0x021f000103170502"
+ "0x2101000000180002"
  ],
  [
  "Lucina",
@@ -3972,7 +3972,7 @@
  ],
  [
  "Robin",
- "0x022e000101d30502"
+ "0x21030000002a0002"
  ]
  ],
  "detective-pikachu": [

diff --git a/wumiibohelper/romfs/amiibos.json b/wumiibohelper/romfs/amiibos.json
@@ -3960,7 +3960,7 @@
  "code-name-s-t-e-a-m": [
  [
  "Ike",
- "0x021f000103170502"
+ "0x2101000000180002"
  ],
  [
  "Lucina",
@@ -3972,7 +3972,7 @@
  ],
  [
  "Robin",
- "0x022e000101d30502"
+ "0x21030000002a0002"
  ]
  ],
  "detective-pikachu": [

diff --git a/wumiibohelper/source/States/AmiiboSelection.cpp b/wumiibohelper/source/States/AmiiboSelection.cpp
@@ -132,6 +132,9 @@ void AmiiboSelection::OnStateExit(App *app){
  /* Signal the event once because thread is stuck waiting on it */
  LightEvent_Signal(&m_event); 
  /* Wait for both threads to exit */
+ //while(!(worker.IsDone() && worker1.IsDone())){
+ // svcSleepThread(0.005e+9);
+ //}
  worker1.Join();
  worker.Join();
  m_optiontexts.clear();

diff --git a/wumiibohelper/source/app.cpp b/wumiibohelper/source/app.cpp
@@ -10,6 +10,7 @@ void App::Intialize(){
  acInit();
  gdbHioDevInit();
  gdbHioDevRedirectStdStreams(true, true, true);
+ //aptSetHomeAllowed(false);
  uint32_t status = 0;
  ACU_GetStatus(&status);
  if(status == 3){
@@ -27,6 +28,12 @@ void App::Intialize(){
  ChangeState(ui::Initial);
 }
 
+void App::Finalize(){
+ acExit();
+ amExit();
+ gfxExit();
+}
+
 void App::RunLoop(){
  while(aptMainLoop()){
  hidScanInput();

diff --git a/wumiibohelper/source/app.hpp b/wumiibohelper/source/app.hpp
@@ -14,6 +14,7 @@ class App{
  public:
  void Intialize();
  void RunLoop();
+ void Finalize();
  void ChangeState(auto newstate);
  auto& GetTitleManager(){ return m_titlemanager; };
  auto& GetJsonManager(){ return m_jsonmanager; };

diff --git a/wumiibohelper/source/main.cpp b/wumiibohelper/source/main.cpp
@@ -4,5 +4,6 @@ int main()
  App app;
  app.Intialize();
  app.RunLoop();
+ app.Finalize();
  return 0;
 }