diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
| commit | c94e5e9ab0b2b65c8c6275f84043807b2743d6f2 (patch) | |
| tree | b188427bb1942695f32e14ee3fe137855d638c8c /common_syms | |
| parent | 0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff) | |
| parent | ed16a7409ae9c808a110975dec1930f9f949a6d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'common_syms')
| -rw-r--r-- | common_syms/battle_anim_special.txt | 6 | ||||
| -rw-r--r-- | common_syms/battle_controller_pokedude.txt | 2 | ||||
| -rw-r--r-- | common_syms/battle_main.txt | 2 | ||||
| -rw-r--r-- | common_syms/main.txt | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/common_syms/battle_anim_special.txt b/common_syms/battle_anim_special.txt index 7e68496a0..5e2e8b3ff 100644 --- a/common_syms/battle_anim_special.txt +++ b/common_syms/battle_anim_special.txt @@ -1,3 +1,3 @@ -sUnknown_3005424 -sUnknown_3005428 -sUnknown_300542C +gMonShrinkDuration +gMonShrinkDelta +gMonShrinkDistance diff --git a/common_syms/battle_controller_pokedude.txt b/common_syms/battle_controller_pokedude.txt index 4986343f1..c96cab771 100644 --- a/common_syms/battle_controller_pokedude.txt +++ b/common_syms/battle_controller_pokedude.txt @@ -1 +1 @@ -gUnknown_3005EE0 +gPokedudeBattlerStates diff --git a/common_syms/battle_main.txt b/common_syms/battle_main.txt index 36f7596e2..f6f02c48d 100644 --- a/common_syms/battle_main.txt +++ b/common_syms/battle_main.txt @@ -6,4 +6,4 @@ gBattlerControllerFuncs gHealthboxSpriteIds gMultiUsePlayerCursor gNumberOfMovesToChoose -gUnknown_3004FFC +gBattleControllerData diff --git a/common_syms/main.txt b/common_syms/main.txt index af834cad8..b1f274b58 100644 --- a/common_syms/main.txt +++ b/common_syms/main.txt @@ -4,9 +4,9 @@ gMain gKeyRepeatContinueDelay gSoftResetDisabled gIntrTable -gUnknown_3003578 +sVcountAfterSound gLinkVSyncDisabled IntrMain_Buffer -gUnknown_3003D80 -gUnknown_3003D84 +sVcountAtIntr +sVcountBeforeSound gPcmDmaCounter |