Merge pull request #65 from AnonymousRandomPerson/jp

Matched JP ROM
pret · Jun 23, 2024 · 575ab14 · 575ab14
2 parents 79d3cb2 + c8a7e30
commit 575ab14
Show file tree

Hide file tree

Showing 6,214 changed files with 36,574 additions and 4,496 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
           sudo apt update
           sudo ACCEPT_EULA=Y apt -y --fix-missing --allow-downgrades upgrade
           sudo apt -y --allow-downgrades install g++-10-multilib linux-libc-dev binutils-arm-none-eabi p7zip-full pkg-config libpugixml-dev ppa-purge
-          sudo ppa-purge -y ppa:ubuntu-toolchain-r/test
+          sudo ppa-purge -y ppa:ubuntu-toolchain-r/test || true
           sudo dpkg --add-architecture i386
           sudo mkdir -pm755 /etc/apt/keyrings
           sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
@@ -64,6 +64,12 @@ jobs:
           GAME_REVISION: 0
         run: make -j${nproc}
 
+      - name: Build Japan
+        env:
+          GAME_LANGUAGE: JAPAN
+          GAME_REVISION: 0
+        run: make -j${nproc}
+
       - name: Webhook
         if: ${{ github.event_name == 'push' }}
         run: |

diff --git a/INSTALL.md b/INSTALL.md
@@ -98,7 +98,7 @@ This repository has a [devcontainer](https://containers.dev/) containing all the
 
 ## 3. Build ROM
 
-Run `make` to build the ROM. This will build the North American ROM at `build/pmdsky.us/pmdsky.us.nds`. If you want the European ROM, run `make eu` to build the ROM at `build/pmdsky.eu/pmdsky.eu.nds`.
+Run `make` to build the ROM. This will build the North American ROM at `build/pmdsky.us/pmdsky.us.nds`. If you want the European or Japanese ROM, run `make eu` or `make jp` respectively.
 
 There are targets for building and testing changes to individual components without repackaging the ROM. For the ARM9 modules, run `make main`. For the ARM7 module, run `make sub`. For the filesystem, run `make filesystem`.
 

diff --git a/Makefile b/Makefile
@@ -67,6 +67,7 @@ $(BANNER): $(BANNER_SPEC) $(ICON_PNG:%.png=%.nbfp) $(ICON_PNG:%.png=%.nbfc)
 
 us: ; @$(MAKE) GAME_LANGUAGE=NORTH_AMERICA
 eu: ; @$(MAKE) GAME_LANGUAGE=EUROPE
+jp: ; @$(MAKE) GAME_LANGUAGE=JAPAN
 
 compare: @$(MAKE) COMPARE=1
 

diff --git a/README.md b/README.md
@@ -1,10 +1,11 @@
 # Pokémon Mystery Dungeon: Explorers of Sky
 
-This is a WIP disassembly of Pokémon Mystery Dungeon: Explorers of Sky. For instructions on how to set up the repository, please read [INSTALL.md](INSTALL.md).
+This is a WIP disassembly of Pokémon Mystery Dungeon: Explorers of Sky. For instructions on how to set up the repository, please read [INSTALL.md](INSTALL.md). For information on how to contribute changes, see [CONTRIBUTING.md](CONTRIBUTING.md).
 
 This repository builds the following ROMs:
 
 * [**pmdsky.us.nds**](https://datomatic.no-intro.org/index.php?page=show_record&s=28&n=4273) `sha1: 5fa96ca8d8dd6405d6cd2bad73ed68bc73a9d152`
 * [**pmdsky.eu.nds**](https://datomatic.no-intro.org/index.php?page=show_record&s=28&n=4468) `sha1: c838a5adf1ed32d2da8454976e5b1a1aa189c139`
+* [**pmdsky.jp.nds**](https://datomatic.no-intro.org/index.php?page=show_record&s=28&n=3656) `sha1: 7785138dd343b6f2d0f2c9cadc26b4aa927161d7`
 
 For contacts and other pret projects, see [pret.github.io](https://pret.github.io/).
diff --git a/asm/include/itcm.inc b/asm/include/itcm.inc
@@ -166,6 +166,7 @@
 .public sub_0201BD50
 .public sub_0201BD80
 .public sub_0202760C
+.public sub_0202796C_JP
 .public sub_0207A238
 .public sub_0207A244
 .public sub_0207A300

diff --git a/asm/include/main_0200C4CC.inc b/asm/include/main_0200C4CC.inc
@@ -326,9 +326,12 @@
 .public _0209B30C
 .public _0209B31C
 .public _0209B32C
+.public _0209B32C_JP
 .public _0209B32E
 .public _0209B3B4
 .public _0209B3B6
+.public _0209B408_JP
+.public _0209B488
 .public _0209B48C
 .public _0209B4A4
 .public _0209B4AC
@@ -339,6 +342,10 @@
 .public _0209B4E4
 .public _0209B4FC
 .public _0209B50C
+.public _0209B548_JP
+.public _0209C29C_JP
+.public _0209C29D_JP
+.public _0209C29E_JP
 .public _0209C5C0
 .public _0209C5D0
 .public _0209C5E0
@@ -528,6 +535,7 @@
 .public _020A32D4
 .public _020A32F8
 .public _020A3330
+.public _020A45C8_JP
 .public _020AF6C4
 .public _020AF6C8
 .public _020AF6D0
@@ -637,8 +645,11 @@
 .public _020B09C0
 .public _020B09C8
 .public _020B09D0
+.public _020B112C_JP
+.public _020B12A0_JP
 .public _020B12F4_EU
 .public _020B1308_EU
+.public _022550FF_JP
 .public _022A3824
 .public _022A4BD8
 .public _022A4BE8
@@ -692,11 +703,15 @@
 .public _022A88E4
 .public _022A88F0
 .public _022A88F8
+.public _022A88FC
 .public _022A8908
 .public _022A8990
 .public _022A8991
 .public _022A8992
 .public _022A8994
+.public _022A92B4_JP
+.public _022A92B8_JP
+.public _022A92C4
 .public _022A9A5C
 .public _022AA35C
 .public _022AAC64
@@ -998,6 +1013,7 @@
 .public sub_01FF8F28
 .public sub_01FF905C
 .public sub_01FF9128
+.public sub_01FF9130_JP
 .public sub_01FF929C
 .public sub_02001808
 .public sub_02002580

diff --git a/asm/include/main_02054C24.inc b/asm/include/main_02054C24.inc
@@ -489,6 +489,7 @@
 .public sub_020205F8
 .public sub_02024934
 .public sub_020251F0
+.public sub_02025304_JP
 .public sub_0202568C
 .public sub_02025888
 .public sub_02025AD8

diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc
@@ -211,7 +211,6 @@
 .public ov03_0233CB08
 .public ov03_0233CB94
 .public ov03_0233CF9C
-.public ov03_0233D964
 .public ov04_0233CBB8
 .public ov04_0233CC4C
 .public ov04_0233D1A0
@@ -227,6 +226,7 @@
 .public ov07_0233F6E0
 .public ov07_0233F758
 .public ov07_0233FCD8
+.public ov09_0233D964
 .public PlaySeVolumeWrapper
 .public PreprocessString
 .public PreprocessStringFromId
@@ -246,6 +246,7 @@
 .public sprintf
 .public strcmp
 .public strcpy
+.public StrcpyName
 .public StrcpySimple
 .public StringFromId
 .public StrncmpSimple
@@ -274,6 +275,7 @@
 .public sub_0202065C
 .public sub_0202380C_EU
 .public sub_020245D0
+.public sub_020253E0_JP
 .public sub_02025404
 .public sub_0202544C
 .public sub_02025480

diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03.inc
@@ -118,6 +118,7 @@
 .public RandInt
 .public SetQuestionMarks
 .public ShowKeyboard
+.public StrcpyName
 .public StringFromId
 .public StrncpySimpleNoPadSafe
 .public sub_02003B94

diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc
@@ -247,8 +247,6 @@
 .public ov11_022E03F0
 .public ov11_022E0434
 .public ov11_0230DB58
-.public ov13_0238A468
-.public ov13_0238ADFC
 .public ov14_0238B708
 .public ov15_0238AE88
 .public ov15_0238AE98
@@ -312,6 +310,7 @@
 .public ov27_0238BB54
 .public ov27_0238BB80
 .public ov28_0238A140
+.public ov28_0238A468
 .public OverlayIsLoaded
 .public PlayBgmByIdVeneer
 .public PlayBgmByIdVolumeVeneer
@@ -334,6 +333,7 @@
 .public SaveScriptVariableValueAtIndex
 .public SaveScriptVariableValueBytes
 .public SentryRunState
+.public SentryUpdateDisplay
 .public SetActorTalkMain
 .public SetActorTalkMainAndActorTalkSub
 .public SetActorTalkSub
@@ -524,6 +524,7 @@
 .public sub_0201F36C
 .public sub_0201F464
 .public sub_020236FC
+.public sub_02025304_JP
 .public sub_02026268
 .public sub_020262E0
 .public sub_020265A8

diff --git a/asm/include/overlay_13.inc b/asm/include/overlay_13.inc
@@ -60,6 +60,7 @@
 .public sub_02017C74
 .public sub_02017CB4
 .public sub_0201F2E4
+.public sub_02025304_JP
 .public sub_02027B1C
 .public sub_0202836C
 .public sub_02028770

diff --git a/asm/include/overlay_24.inc b/asm/include/overlay_24.inc
@@ -57,6 +57,7 @@
 .public sub_02017C10
 .public sub_02017C50
 .public sub_02017CB4
+.public sub_02025304_JP
 .public sub_0202836C
 .public sub_0202F2C4
 .public sub_02037468

diff --git a/asm/include/overlay_29_023082A0.inc b/asm/include/overlay_29_023082A0.inc
@@ -5,6 +5,7 @@
 .public ApplyDamageAndEffectsWrapper
 .public ATK_STAT_IDX
 .public BoostOffensiveStat
+.public CanSeeTarget
 .public CanTargetEntity
 .public CategoryIsNotPhysical
 .public ChooseAiMove

diff --git a/asm/include/overlay_29_02308FE0.inc b/asm/include/overlay_29_02308FE0.inc
@@ -188,6 +188,7 @@
 .public ov29_02305F60
 .public ov29_02307BDC
 .public ov29_02307C48
+.public ov29_02307DC0
 .public ov29_023159D4
 .public ov29_02337EC0
 .public ov29_0233847C
@@ -258,6 +259,7 @@
 .public SpawnDroppedItemWrapper
 .public SpawnMonster
 .public SPECIAL_BAND_STAT_BOOST
+.public StrcpySimple
 .public StringFromId
 .public StrncpyName
 .public StrncpySimpleNoPad

diff --git a/asm/include/overlay_29_0234DDF4.inc b/asm/include/overlay_29_0234DDF4.inc
@@ -55,6 +55,7 @@
 .public ov31_02387688
 .public OverlayIsLoaded
 .public RestMenu
+.public StrcpySimple
 .public StrncpySimple
 .public sub_0200B330
 .public sub_0200B3D4

diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc
@@ -63,6 +63,7 @@
 .public GetRecruitRate2
 .public GetSpeciesString
 .public GetStringFromFileVeneer
+.public GetTeamMember
 .public GetTeamMemberIndex
 .public GetTile
 .public GetTrapInfo
@@ -241,6 +242,7 @@
 .public sub_02054F44
 .public sub_02056228
 .public sub_020585B4
+.public TeamMemberHasEnabledIqSkill
 .public TryPointCameraToMonster
 .public UpdateMapSurveyorFlag
 .public UpdateWindow