diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-12-06 20:17:43 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 20:17:43 -0600 |
| commit | ec1e57b155d040beeb309a1524d496c6582da384 (patch) | |
| tree | 59b1685dc8a3b9e5ee6f9340db2b23b4f3a641aa /src/data/map_objects.asm | |
| parent | f5929eed3a960b905090fb66b9bfaafb31f7243d (diff) | |
| parent | fd08631082a6ccca84bef29f9c031747c2b60147 (diff) | |
Merge pull request #72 from dannye/rgbds
RGBDS Warnings
Diffstat (limited to 'src/data/map_objects.asm')
| -rw-r--r-- | src/data/map_objects.asm | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/data/map_objects.asm b/src/data/map_objects.asm index 4e2570b..4749a19 100644 --- a/src/data/map_objects.asm +++ b/src/data/map_objects.asm @@ -47,7 +47,7 @@ MasonLabObjects: ; 13b04 (3:7b04) db $ff - + DeckMachineRoomObjects: ; 13b4d (3:7b4d) db NORTH, 2, 2 dw Script_d932 @@ -151,7 +151,7 @@ DeckMachineRoomObjects: ; 13b4d (3:7b4d) db $ff - + IshiharasHouseObjects: ; 13c02 (3:7c02) db NORTH, 6, 2 dw PrintInteractableObjectText @@ -215,7 +215,7 @@ IshiharasHouseObjects: ; 13c02 (3:7c02) db $ff - + FightingClubLobbyObjects: ; 13c6f (3:7c6f) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -249,7 +249,7 @@ FightingClubLobbyObjects: ; 13c6f (3:7c6f) db $ff - + RockClubLobbyObjects: ; 13ca6 (3:7ca6) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -283,7 +283,7 @@ RockClubLobbyObjects: ; 13ca6 (3:7ca6) db $ff - + WaterClubLobbyObjects: ; 13cdd (3:7cdd) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -317,7 +317,7 @@ WaterClubLobbyObjects: ; 13cdd (3:7cdd) db $ff - + LightningClubLobbyObjects: ; 13d14 (3:7d14) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -351,7 +351,7 @@ LightningClubLobbyObjects: ; 13d14 (3:7d14) db $ff - + GrassClubLobbyObjects: ; 13d4b (3:7d4b) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -385,7 +385,7 @@ GrassClubLobbyObjects: ; 13d4b (3:7d4b) db $ff - + PsychicClubLobbyObjects: ; 13d82 (3:7d82) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -419,7 +419,7 @@ PsychicClubLobbyObjects: ; 13d82 (3:7d82) db $ff - + ScienceClubLobbyObjects: ; 13db9 (3:7db9) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -453,7 +453,7 @@ ScienceClubLobbyObjects: ; 13db9 (3:7db9) db $ff - + FireClubLobbyObjects: ; 13df0 (3:7df0) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -487,7 +487,7 @@ FireClubLobbyObjects: ; 13df0 (3:7df0) db $ff - + ChallengeHallLobbyObjects: ; 13e27 (3:7e27) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -521,7 +521,7 @@ ChallengeHallLobbyObjects: ; 13e27 (3:7e27) db $ff - + PokemonDomeEntranceObjects: ; 13e5e (3:7e5e) db NORTH, 2, 2 dw PrintInteractableObjectText @@ -581,7 +581,7 @@ PokemonDomeEntranceObjects: ; 13e5e (3:7e5e) db $ff - + HallOfHonorObjects: ; 13ec2 (3:7ec2) ; Legendary Cards db NORTH, 10, 10 @@ -606,5 +606,3 @@ HallOfHonorObjects: ; 13ec2 (3:7ec2) tx Text041a db $ff - - |