Uncovered NPC Movement and named OWObjects

2 files changed, 45 insertions, 37 deletions

diff --git a/src/data/level_objects.asm b/src/data/level_objects.asm
index a0d51cc..0756f7f 100644
--- a/src/data/level_objects.asm
+++ b/src/data/level_objects.asm
@@ -1,4 +1,10 @@
-LevelObjects_13b04: ; 13b04 (3:7b04)
+; Objects around maps that can be interacted with but are not represented
+; by NPCs. Things like Deck Machines and the PCs.
+; Format:
+; Direction you need to face, X coord, Y coord
+; Routine that gets called when you hit A in front of it
+; Object Name, and Object default Text
+MasonLabObjects: ; 13b04 (3:7b04)
 	db NORTH, 18, 2
 	dw PrintInteractableObjectText
 	tx Text04a0
@@ -42,7 +48,7 @@ LevelObjects_13b04: ; 13b04 (3:7b04)
 	db $ff
 
  
-LevelObjects_13b4d: ; 13b4d (3:7b4d)
+DeckMachineRoomObjects: ; 13b4d (3:7b4d)
 	db NORTH, 2, 2
 	dw OWSequence_d932
 	tx Text041b
@@ -146,7 +152,7 @@ LevelObjects_13b4d: ; 13b4d (3:7b4d)
 	db $ff
 
  
-LevelObjects_13c02: ; 13c02 (3:7c02)
+IshiharasHouseObjects: ; 13c02 (3:7c02)
 	db NORTH, 6, 2
 	dw PrintInteractableObjectText
 	tx Text04ae
@@ -210,7 +216,7 @@ LevelObjects_13c02: ; 13c02 (3:7c02)
 	db $ff
 
  
-LevelObjects_13c6f: ; 13c6f (3:7c6f)
+FightingClubLobbyObjects: ; 13c6f (3:7c6f)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
 	tx Text04c6
@@ -244,7 +250,7 @@ LevelObjects_13c6f: ; 13c6f (3:7c6f)
 	db $ff
 
  
-LevelObjects_13ca6: ; 13ca6 (3:7ca6)
+RockClubLobbyObjects: ; 13ca6 (3:7ca6)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
 	tx Text04cc
@@ -278,7 +284,7 @@ LevelObjects_13ca6: ; 13ca6 (3:7ca6)
 	db $ff
 
  
-LevelObjects_13cdd: ; 13cdd (3:7cdd)
+WaterClubLobbyObjects: ; 13cdd (3:7cdd)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
 	tx Text04d2
@@ -312,7 +318,7 @@ LevelObjects_13cdd: ; 13cdd (3:7cdd)
 	db $ff
 
  
-LevelObjects_13d14: ; 13d14 (3:7d14)
+LightningClubLobbyObjects: ; 13d14 (3:7d14)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
 	tx Text04d8
@@ -346,7 +352,7 @@ LevelObjects_13d14: ; 13d14 (3:7d14)
 	db $ff
 
  
-LevelObjects_13d4b: ; 13d4b (3:7d4b)
+GrassClubLobbyObjects: ; 13d4b (3:7d4b)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
 	tx Text04de
@@ -380,7 +386,7 @@ LevelObjects_13d4b: ; 13d4b (3:7d4b)
 	db $ff
 
  
-LevelObjects_13d82: ; 13d82 (3:7d82)
+PsychicClubLobbyObjects: ; 13d82 (3:7d82)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
 	tx Text04e4
@@ -414,7 +420,7 @@ LevelObjects_13d82: ; 13d82 (3:7d82)
 	db $ff
 
  
-LevelObjects_13db9: ; 13db9 (3:7db9)
+ScienceClubLobbyObjects: ; 13db9 (3:7db9)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
 	tx Text04ea
@@ -448,7 +454,7 @@ LevelObjects_13db9: ; 13db9 (3:7db9)
 	db $ff
 
  
-LevelObjects_13df0: ; 13df0 (3:7df0)
+FireClubLobbyObjects: ; 13df0 (3:7df0)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
 	tx Text04f0
@@ -482,7 +488,7 @@ LevelObjects_13df0: ; 13df0 (3:7df0)
 	db $ff
 
  
-LevelObjects_13e27: ; 13e27 (3:7e27)
+ChallengeHallLobbyObjects: ; 13e27 (3:7e27)
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
 	tx Text04f6
@@ -516,7 +522,7 @@ LevelObjects_13e27: ; 13e27 (3:7e27)
 	db $ff
 
  
-LevelObjects_13e5e: ; 13e5e (3:7e5e)
+PokemonDomeEntranceObjects: ; 13e5e (3:7e5e)
 	db NORTH, 2, 2
 	dw PrintInteractableObjectText
 	tx Text04fc
@@ -576,14 +582,16 @@ LevelObjects_13e5e: ; 13e5e (3:7e5e)
 	db $ff
 
  
-LevelObjects_13ec2: ; 13ec2 (3:7ec2)
+HallOfHonorObjects: ; 13ec2 (3:7ec2)
+	; Legendary Cards
 	db NORTH, 10, 10
-	dw $7bf1
+	dw OWSequence_fbf1
 	dw $0000
 	dw $0000
 
+	; Legendary Cards
 	db NORTH, 12, 10
-	dw $7bf1
+	dw OWSequence_fbf1
 	dw $0000
 	dw $0000
 
diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm
index bd0229d..8a3dad7 100644
--- a/src/data/map_scripts.asm
+++ b/src/data/map_scripts.asm
@@ -4,8 +4,8 @@
 ; if a script pointer is $0000, that map has no script for that event
 ; 0: NPC data
 ; 2: Called after every NPC is loaded (unused)
-; 4: pressed A button
-; 6: pressed A button
+; 4: Interactable Objects
+; 6: pressed A button (if nothing interactable is found)
 ; 8: load map
 ; a: after duel
 ; c: moved player
@@ -25,17 +25,17 @@ MapScripts: ; 1162a (4:562a)
 ; MASON_LABORATORY
 	dw MasonLabNPCS
 	dw $0000
-	dw $7b04
-	dw $5565
-	dw $5549
+	dw MasonLabObjects
+	dw MasonLabPressedA
+	dw MasonLabLoadMap
 	dw MasonLaboratoryAfterDuel
 	dw $0000
-	dw $555e
+	dw MasonLabCloseTextBox
 
 ; DECK_MACHINE_ROOM
 	dw DeckMachineRoomNPCS
 	dw $0000
-	dw $7b4d
+	dw DeckMachineRoomObjects
 	dw $0000
 	dw $0000
 	dw $589f
@@ -45,7 +45,7 @@ MapScripts: ; 1162a (4:562a)
 ; ISHIHARAS_HOUSE
 	dw IshiharasHouseNPCS
 	dw $0000
-	dw $7c02
+	dw IshiharasHouseObjects
 	dw $0000
 	dw $0000
 	dw $0000
@@ -65,7 +65,7 @@ MapScripts: ; 1162a (4:562a)
 ; FIGHTING_CLUB_LOBBY
 	dw FightingClubLobbyNPCS
 	dw $0000
-	dw $7c6f
+	dw FightingClubLobbyObjects
 	dw $0000
 	dw $0000
 	dw FightingClubLobbyAfterDuel
@@ -95,7 +95,7 @@ MapScripts: ; 1162a (4:562a)
 ; ROCK_CLUB_LOBBY
 	dw RockClubLobbyNPCS
 	dw $0000
-	dw $7ca6
+	dw RockClubLobbyObjects
 	dw $0000
 	dw $0000
 	dw $5ed5
@@ -125,7 +125,7 @@ MapScripts: ; 1162a (4:562a)
 ; WATER_CLUB_LOBBY
 	dw WaterClubLobbyNPCS
 	dw $0000
-	dw $7cdd
+	dw WaterClubLobbyObjects
 	dw $0000
 	dw $0000
 	dw $60a2
@@ -155,7 +155,7 @@ MapScripts: ; 1162a (4:562a)
 ; LIGHTNING_CLUB_LOBBY
 	dw LightningClubLobbyNPCS
 	dw $0000
-	dw $7d14
+	dw LightningClubLobbyObjects
 	dw $0000
 	dw $0000
 	dw $636d
@@ -185,7 +185,7 @@ MapScripts: ; 1162a (4:562a)
 ; GRASS_CLUB_LOBBY
 	dw GrassClubLobbyNPCS
 	dw $0000
-	dw $7d4b
+	dw GrassClubLobbyObjects
 	dw $0000
 	dw $0000
 	dw GrassClubLobbyAfterDuel
@@ -215,7 +215,7 @@ MapScripts: ; 1162a (4:562a)
 ; PSYCHIC_CLUB_LOBBY
 	dw PsychicClubLobbyNPCS
 	dw $0000
-	dw $7d82
+	dw PsychicClubLobbyObjects
 	dw $0000
 	dw $6971
 	dw $6963
@@ -245,7 +245,7 @@ MapScripts: ; 1162a (4:562a)
 ; SCIENCE_CLUB_LOBBY
 	dw ScienceClubLobbyNPCS
 	dw $0000
-	dw $7db9
+	dw ScienceClubLobbyObjects
 	dw $0000
 	dw $0000
 	dw $6b57
@@ -275,8 +275,8 @@ MapScripts: ; 1162a (4:562a)
 ; FIRE_CLUB_LOBBY
 	dw FireClubLobbyNPCS
 	dw $0000
-	dw $7df0
-	dw $6d57
+	dw FireClubLobbyObjects
+	dw FireClubPressedA
 	dw $0000
 	dw $6d49
 	dw $0000
@@ -305,7 +305,7 @@ MapScripts: ; 1162a (4:562a)
 ; CHALLENGE_HALL_LOBBY
 	dw ChallengeHallLobbyNPCS
 	dw $0000
-	dw $7e27
+	dw ChallengeHallLobbyObjects
 	dw $0000
 	dw $7088
 	dw $0000
@@ -325,7 +325,7 @@ MapScripts: ; 1162a (4:562a)
 ; POKEMON_DOME_ENTRANCE
 	dw PokemonDomeEntranceNPCS
 	dw $0000
-	dw $7e5e
+	dw PokemonDomeEntranceObjects
 	dw $0000
 	dw $7607
 	dw $0000
@@ -345,9 +345,9 @@ MapScripts: ; 1162a (4:562a)
 ; HALL_OF_HONOR
 	dw HallOfHonorNPCS
 	dw $0000
-	dw $7ec2
+	dw HallOfHonorObjects
 	dw $0000
-	dw $7bdb
+	dw HallOfHonorLoadMap
 	dw $0000
 	dw $0000
 	dw $0000