diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2021-06-01 20:40:27 -0400 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2021-06-01 20:40:27 -0400 |
| commit | f0b41debc35c2084aad6d369eab11a2d2df4ab44 (patch) | |
| tree | 9b720ab0b617fa207051efc7ff9373669f7dc47b /common_syms | |
| parent | a839463c849679974c986bf9c9c260eff0e94cb7 (diff) | |
| parent | 9f5bf65fb336cf7a3ba68d32267bf993f0f6a494 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps
Diffstat (limited to 'common_syms')
| -rw-r--r-- | common_syms/battle_factory_screen.txt | 2 | ||||
| -rw-r--r-- | common_syms/battle_main.txt | 2 | ||||
| -rw-r--r-- | common_syms/text.txt | 4 | ||||
| -rw-r--r-- | common_syms/window.txt | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/common_syms/battle_factory_screen.txt b/common_syms/battle_factory_screen.txt index 9f6868139..3ddeb6d3b 100644 --- a/common_syms/battle_factory_screen.txt +++ b/common_syms/battle_factory_screen.txt @@ -1 +1 @@ -gUnknown_030062E8 +gFactorySelect_CurrentOptionFunc diff --git a/common_syms/battle_main.txt b/common_syms/battle_main.txt index 35a925946..f6f02c48d 100644 --- a/common_syms/battle_main.txt +++ b/common_syms/battle_main.txt @@ -6,4 +6,4 @@ gBattlerControllerFuncs gHealthboxSpriteIds gMultiUsePlayerCursor gNumberOfMovesToChoose -gUnknown_03005D7C +gBattleControllerData diff --git a/common_syms/text.txt b/common_syms/text.txt index 4406c8bf9..cd8886e5b 100644 --- a/common_syms/text.txt +++ b/common_syms/text.txt @@ -1,4 +1,4 @@ gFonts -gUnknown_03002F84 -gUnknown_03002F90 +gDisableTextPrinters +gCurGlyph gTextFlags diff --git a/common_syms/window.txt b/common_syms/window.txt index 87a1679d1..416d9d732 100644 --- a/common_syms/window.txt +++ b/common_syms/window.txt @@ -1,5 +1,5 @@ -filler_03002F58 -filler_03002F5C +gUnusedWindowVar1 +gUnusedWindowVar2 gTransparentTileNumber -filler_03002F64 -gUnknown_03002F70 +gUnusedWindowVar3 +gWindowBgTilemapBuffers |