diff options
| author | GliMusings <gcreative7@gmail.com> | 2021-07-05 12:59:36 -0500 |
|---|---|---|
| committer | GliMusings <gcreative7@gmail.com> | 2021-07-05 12:59:36 -0500 |
| commit | 76f29d0a5078061da4cfc0ddef7c5d56d6a005e5 (patch) | |
| tree | 8ef487fe3929cd7c73fe2be8b3c373e1a3104ad7 /arm9/global.inc | |
| parent | 6008ec050279c966454f1a3c1e067295b3d9c254 (diff) | |
| parent | 53664729466e97abbe10c14fe735083b2d604add (diff) | |
Merge branch 'master' of https://github.com/GliMusings/pokediamond
Diffstat (limited to 'arm9/global.inc')
| -rw-r--r-- | arm9/global.inc | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/arm9/global.inc b/arm9/global.inc index 284d26bf..da12b3fd 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -2473,21 +2473,21 @@ .extern FUN_02033F20 .extern FUN_02033F70 .extern ShowWFCUserInfoWarning -.extern FUN_02034494 -.extern FUN_020344AC -.extern FUN_020344D0 -.extern FUN_020344D8 -.extern FUN_020344FC -.extern FUN_0203450C -.extern FUN_0203451C -.extern FUN_02034554 -.extern FUN_02034574 -.extern FUN_02034578 -.extern FUN_020345A8 -.extern FUN_020345DC -.extern FUN_020345F0 -.extern FUN_020345FC -.extern FUN_02034660 +.extern MapMatrix_New +.extern MapMatrix_Load +.extern MapMatrix_Free +.extern MapMatrix_GetMapData +.extern MapMatrix_GetWidth +.extern MapMatrix_GetHeight +.extern MapMatrix_GetMapHeader +.extern MapMatrix_GetMapHeaderFromID +.extern MapMatrix_GetMatrixID +.extern MapMatrix_GetMapAltitude +.extern MapMatrix_MapData_New +.extern MapMatrix_MapData_Free +.extern MapMatrix_MapData_GetData +.extern GetMapHeader +.extern GetMapData .extern FUN_02034678 .extern FUN_020346CC .extern MapHeader_GetAreaDataBank @@ -2504,23 +2504,23 @@ .extern MapHeader_GetMapSec .extern MapHeader_GetWeatherType .extern MapHeader_GetCameraType -.extern MapHeader_GetField17_0 -.extern MapHeader_GetField17_6 +.extern MapHeader_GetBattleBg +.extern MapHeader_IsEscapeRopeAllowed .extern MapHeader_IsFlyAllowed .extern MapHeader_IsBikeAllowed .extern FUN_020348E4 -.extern MapHeader_MapIsOnOverworldMatrix +.extern MapHeader_MapIsOnMainMatrix .extern FUN_02034930 .extern FUN_02034944 .extern FUN_02034964 .extern FUN_02034984 -.extern FUN_02034998 -.extern FUN_020349AC -.extern FUN_020349B8 -.extern FUN_020349CC -.extern FUN_020349D8 -.extern FUN_020349E4 -.extern FUN_02034A04 +.extern MapHeader_MapIsUnionRoom +.extern MapHeader_MapIsMtCoronetFeebasRoom +.extern MapHeader_MapIsTrophyGarden +.extern MapHeader_MapIsAmitySquare +.extern MapHeader_MapIsSpearPillar +.extern MapHeader_MapIsPokemonCenterSecondFloor +.extern MapHeader_GetMapEvolutionMethod .extern FUN_02034A28 .extern FUN_02034A48 .extern FUN_02034A60 |