diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
| commit | 50fcc3a1e96a1e35576d2d0769aec251a40805dd (patch) | |
| tree | f100b156dfa1eb6fe773d90004d79bb246e9dcbf /asm/new_game.s | |
| parent | acdd8cab26671a975b4f155b84b24388df9d84bc (diff) | |
| parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/new_game.s')
| -rw-r--r-- | asm/new_game.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/new_game.s b/asm/new_game.s index d7808dba7..b8f6515ef 100644 --- a/asm/new_game.s +++ b/asm/new_game.s @@ -253,7 +253,7 @@ sub_8054A60: @ 8054A60 bl sub_80A0904 bl sub_80A0958 bl sub_806E190 - ldr r0, _08054B64 @ =gUnknown_2024029 + ldr r0, _08054B64 @ =gPlayerPartyCount strb r5, [r0] bl ZeroPlayerPartyMons bl sub_808C7E0 @@ -291,7 +291,7 @@ _08054B54: .4byte 0x00003a4c _08054B58: .4byte gUnknown_2031DB0 _08054B5C: .4byte gSaveBlock2Ptr _08054B60: .4byte 0x00000bb8 -_08054B64: .4byte gUnknown_2024029 +_08054B64: .4byte gPlayerPartyCount _08054B68: .4byte 0x00000296 _08054B6C: .4byte gUnknown_81A6481 thumb_func_end sub_8054A60 |