From 8c416b556348fe9a98e28fd0ba5628b5c74edcc8 Mon Sep 17 00:00:00 2001
From: Andrew Martinek <andrewrmartinek@gmail.com>
Date: Thu, 3 Oct 2019 22:04:51 -0400
Subject: Ronald scripts and overworld data routines. Also made script
 extractor better

---
 src/data/map_scripts.asm | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/data/map_scripts.asm')

diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm
index ae4e355..ec8c292 100644
--- a/src/data/map_scripts.asm
+++ b/src/data/map_scripts.asm
@@ -57,8 +57,8 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $67f6
+	dw LoadClubEntrance
+	dw ClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
@@ -87,8 +87,8 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $67f6
+	dw LoadClubEntrance
+	dw ClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
@@ -117,8 +117,8 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $67f6
+	dw LoadClubEntrance
+	dw ClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
@@ -147,8 +147,8 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $67f6
+	dw LoadClubEntrance
+	dw ClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
@@ -177,8 +177,8 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $6525
+	dw LoadClubEntrance
+	dw GrassClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
@@ -188,7 +188,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $7d4b
 	dw $0000
 	dw $0000
-	dw $65c4
+	dw GrassClubLobbyAfterDuel
 	dw $0000
 	dw $0000
 
@@ -207,8 +207,8 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $67f6
+	dw LoadClubEntrance
+	dw ClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
@@ -237,8 +237,8 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $67f6
+	dw LoadClubEntrance
+	dw ClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
@@ -267,8 +267,8 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $67f6
+	dw LoadClubEntrance
+	dw ClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
-- 
cgit v1.2.3


From fda59356c20813bb57d59de8d9b2b100f0fe275d Mon Sep 17 00:00:00 2001
From: Andrew Martinek <andrewrmartinek@gmail.com>
Date: Sun, 6 Oct 2019 11:24:18 -0400
Subject: Uncovered a lot of NPC map data and loading functions.

---
 src/data/map_scripts.asm | 72 ++++++++++++++++++++++++------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

(limited to 'src/data/map_scripts.asm')

diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm
index ec8c292..e156a1c 100644
--- a/src/data/map_scripts.asm
+++ b/src/data/map_scripts.asm
@@ -2,8 +2,8 @@
 ; scripts are referenced with ids [0,2,4,6,8,a,c,e]
 ; each script id is used for a specific event
 ; if a script pointer is $0000, that map has no script for that event
-; 0: load texts
-; 2: unused
+; 0: NPC data
+; 2: Called after every NPC is loaded (unused)
 ; 4: pressed A button
 ; 6: pressed A button
 ; 8: load map
@@ -17,13 +17,13 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $54ec
+	dw LoadOverworld
 	dw $0000
 	dw $0000
 	dw $0000
 
 ; MASON_LABORATORY
-	dw $772f
+	dw NPCData_772f
 	dw $0000
 	dw $7b04
 	dw $5565
@@ -33,7 +33,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $555e
 
 ; DECK_MACHINE_ROOM
-	dw $775a
+	dw NPCData_775a
 	dw $0000
 	dw $7b4d
 	dw $0000
@@ -43,7 +43,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $58ad
 
 ; ISHIHARAS_HOUSE
-	dw $7773
+	dw NPCData_7773
 	dw $0000
 	dw $7c02
 	dw $0000
@@ -53,7 +53,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; FIGHTING_CLUB_ENTRANCE
-	dw $7786
+	dw NPCData_7786
 	dw $0000
 	dw $0000
 	dw $0000
@@ -63,7 +63,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; FIGHTING_CLUB_LOBBY
-	dw $779f
+	dw NPCData_779f
 	dw $0000
 	dw $7c6f
 	dw $0000
@@ -73,7 +73,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; FIGHTING_CLUB
-	dw $77ca
+	dw NPCData_77ca
 	dw $0000
 	dw $0000
 	dw $0000
@@ -83,7 +83,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; ROCK_CLUB_ENTRANCE
-	dw $77e3
+	dw NPCData_77e3
 	dw $0000
 	dw $0000
 	dw $0000
@@ -93,7 +93,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; ROCK_CLUB_LOBBY
-	dw $77fc
+	dw NPCData_77fc
 	dw $0000
 	dw $7ca6
 	dw $0000
@@ -103,7 +103,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; ROCK_CLUB
-	dw $7827
+	dw NPCData_7827
 	dw $0000
 	dw $0000
 	dw $0000
@@ -113,7 +113,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; WATER_CLUB_ENTRANCE
-	dw $783a
+	dw NPCData_783a
 	dw $0000
 	dw $0000
 	dw $0000
@@ -123,7 +123,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; WATER_CLUB_LOBBY
-	dw $7853
+	dw NPCData_7853
 	dw $0000
 	dw $7cdd
 	dw $0000
@@ -133,7 +133,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; WATER_CLUB
-	dw $787e
+	dw NPCData_787e
 	dw $0000
 	dw $0000
 	dw $0000
@@ -143,7 +143,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; LIGHTNING_CLUB_ENTRANCE
-	dw $7897
+	dw NPCData_7897
 	dw $0000
 	dw $0000
 	dw $0000
@@ -153,7 +153,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; LIGHTNING_CLUB_LOBBY
-	dw $78b0
+	dw NPCData_78b0
 	dw $0000
 	dw $7d14
 	dw $0000
@@ -163,7 +163,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; LIGHTNING_CLUB
-	dw $78d5
+	dw NPCData_78d5
 	dw $0000
 	dw $0000
 	dw $0000
@@ -173,7 +173,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; GRASS_CLUB_ENTRANCE
-	dw $78ee
+	dw NPCData_78ee
 	dw $0000
 	dw $0000
 	dw $0000
@@ -183,7 +183,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; GRASS_CLUB_LOBBY
-	dw $790d
+	dw NPCData_790d
 	dw $0000
 	dw $7d4b
 	dw $0000
@@ -193,7 +193,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; GRASS_CLUB
-	dw $7932
+	dw NPCData_7932
 	dw $0000
 	dw $0000
 	dw $0000
@@ -203,7 +203,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; PSYCHIC_CLUB_ENTRANCE
-	dw $7945
+	dw NPCData_7945
 	dw $0000
 	dw $0000
 	dw $0000
@@ -213,7 +213,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; PSYCHIC_CLUB_LOBBY
-	dw $7964
+	dw NPCData_7964
 	dw $0000
 	dw $7d82
 	dw $0000
@@ -223,7 +223,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; PSYCHIC_CLUB
-	dw $798f
+	dw NPCData_798f
 	dw $0000
 	dw $0000
 	dw $0000
@@ -233,7 +233,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; SCIENCE_CLUB_ENTRANCE
-	dw $79a8
+	dw NPCData_79a8
 	dw $0000
 	dw $0000
 	dw $0000
@@ -243,7 +243,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; SCIENCE_CLUB_LOBBY
-	dw $79c1
+	dw NPCData_79c1
 	dw $0000
 	dw $7db9
 	dw $0000
@@ -253,7 +253,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; SCIENCE_CLUB
-	dw $79ec
+	dw NPCData_79ec
 	dw $0000
 	dw $0000
 	dw $0000
@@ -263,7 +263,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; FIRE_CLUB_ENTRANCE
-	dw $7a05
+	dw NPCData_7a05
 	dw $0000
 	dw $0000
 	dw $0000
@@ -273,7 +273,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; FIRE_CLUB_LOBBY
-	dw $7a1e
+	dw NPCData_7a1e
 	dw $0000
 	dw $7df0
 	dw $6d57
@@ -283,7 +283,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; FIRE_CLUB
-	dw $7a43
+	dw NPCData_7a43
 	dw $0000
 	dw $0000
 	dw $0000
@@ -293,7 +293,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; CHALLENGE_HALL_ENTRANCE
-	dw $7a5c
+	dw NPCData_7a5c
 	dw $0000
 	dw $0000
 	dw $0000
@@ -303,7 +303,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; CHALLENGE_HALL_LOBBY
-	dw $7a63
+	dw NPCData_7a63
 	dw $0000
 	dw $7e27
 	dw $0000
@@ -313,7 +313,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; CHALLENGE_HALL
-	dw $7a9a
+	dw NPCData_7a9a
 	dw $0000
 	dw $0000
 	dw $0000
@@ -323,7 +323,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; POKEMON_DOME_ENTRANCE
-	dw $7ab9
+	dw NPCData_7ab9
 	dw $0000
 	dw $7e5e
 	dw $0000
@@ -333,7 +333,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $762a
 
 ; POKEMON_DOME
-	dw $7ac0
+	dw NPCData_7ac0
 	dw $0000
 	dw $0000
 	dw $0000
@@ -343,7 +343,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $7718
 
 ; HALL_OF_HONOR
-	dw $7adf
+	dw NPCData_7adf
 	dw $0000
 	dw $7ec2
 	dw $0000
-- 
cgit v1.2.3


From cb88ee5a13498f060da1be80eb0cc0fcd1357a05 Mon Sep 17 00:00:00 2001
From: Andrew Martinek <andrewrmartinek@gmail.com>
Date: Tue, 8 Oct 2019 00:20:52 -0400
Subject: Created python script to calculate progress and documented some
 scripts

---
 src/data/map_scripts.asm | 70 ++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

(limited to 'src/data/map_scripts.asm')

diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm
index e156a1c..bd0229d 100644
--- a/src/data/map_scripts.asm
+++ b/src/data/map_scripts.asm
@@ -23,17 +23,17 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; MASON_LABORATORY
-	dw NPCData_772f
+	dw MasonLabNPCS
 	dw $0000
 	dw $7b04
 	dw $5565
 	dw $5549
-	dw $553b
+	dw MasonLaboratoryAfterDuel
 	dw $0000
 	dw $555e
 
 ; DECK_MACHINE_ROOM
-	dw NPCData_775a
+	dw DeckMachineRoomNPCS
 	dw $0000
 	dw $7b4d
 	dw $0000
@@ -43,7 +43,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $58ad
 
 ; ISHIHARAS_HOUSE
-	dw NPCData_7773
+	dw IshiharasHouseNPCS
 	dw $0000
 	dw $7c02
 	dw $0000
@@ -53,7 +53,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; FIGHTING_CLUB_ENTRANCE
-	dw NPCData_7786
+	dw FightingClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -63,17 +63,17 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; FIGHTING_CLUB_LOBBY
-	dw NPCData_779f
+	dw FightingClubLobbyNPCS
 	dw $0000
 	dw $7c6f
 	dw $0000
 	dw $0000
-	dw $5c68
+	dw FightingClubLobbyAfterDuel
 	dw $0000
 	dw $0000
 
 ; FIGHTING_CLUB
-	dw NPCData_77ca
+	dw FightingClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -83,7 +83,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; ROCK_CLUB_ENTRANCE
-	dw NPCData_77e3
+	dw RockClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -93,7 +93,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; ROCK_CLUB_LOBBY
-	dw NPCData_77fc
+	dw RockClubLobbyNPCS
 	dw $0000
 	dw $7ca6
 	dw $0000
@@ -103,7 +103,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; ROCK_CLUB
-	dw NPCData_7827
+	dw RockClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -113,7 +113,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; WATER_CLUB_ENTRANCE
-	dw NPCData_783a
+	dw WaterClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -123,7 +123,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; WATER_CLUB_LOBBY
-	dw NPCData_7853
+	dw WaterClubLobbyNPCS
 	dw $0000
 	dw $7cdd
 	dw $0000
@@ -133,7 +133,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; WATER_CLUB
-	dw NPCData_787e
+	dw WaterClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -143,7 +143,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; LIGHTNING_CLUB_ENTRANCE
-	dw NPCData_7897
+	dw LightningClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -153,7 +153,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; LIGHTNING_CLUB_LOBBY
-	dw NPCData_78b0
+	dw LightningClubLobbyNPCS
 	dw $0000
 	dw $7d14
 	dw $0000
@@ -163,7 +163,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; LIGHTNING_CLUB
-	dw NPCData_78d5
+	dw LightningClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -173,7 +173,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; GRASS_CLUB_ENTRANCE
-	dw NPCData_78ee
+	dw GrassClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -183,7 +183,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; GRASS_CLUB_LOBBY
-	dw NPCData_790d
+	dw GrassClubLobbyNPCS
 	dw $0000
 	dw $7d4b
 	dw $0000
@@ -193,7 +193,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; GRASS_CLUB
-	dw NPCData_7932
+	dw GrassClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -203,7 +203,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; PSYCHIC_CLUB_ENTRANCE
-	dw NPCData_7945
+	dw PsychicClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -213,7 +213,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; PSYCHIC_CLUB_LOBBY
-	dw NPCData_7964
+	dw PsychicClubLobbyNPCS
 	dw $0000
 	dw $7d82
 	dw $0000
@@ -223,7 +223,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; PSYCHIC_CLUB
-	dw NPCData_798f
+	dw PsychicClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -233,7 +233,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; SCIENCE_CLUB_ENTRANCE
-	dw NPCData_79a8
+	dw ScienceClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -243,7 +243,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; SCIENCE_CLUB_LOBBY
-	dw NPCData_79c1
+	dw ScienceClubLobbyNPCS
 	dw $0000
 	dw $7db9
 	dw $0000
@@ -253,7 +253,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; SCIENCE_CLUB
-	dw NPCData_79ec
+	dw ScienceClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -263,7 +263,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; FIRE_CLUB_ENTRANCE
-	dw NPCData_7a05
+	dw FireClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -273,7 +273,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; FIRE_CLUB_LOBBY
-	dw NPCData_7a1e
+	dw FireClubLobbyNPCS
 	dw $0000
 	dw $7df0
 	dw $6d57
@@ -283,7 +283,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; FIRE_CLUB
-	dw NPCData_7a43
+	dw FireClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -293,7 +293,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; CHALLENGE_HALL_ENTRANCE
-	dw NPCData_7a5c
+	dw ChallengeHallEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -303,7 +303,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; CHALLENGE_HALL_LOBBY
-	dw NPCData_7a63
+	dw ChallengeHallLobbyNPCS
 	dw $0000
 	dw $7e27
 	dw $0000
@@ -313,7 +313,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; CHALLENGE_HALL
-	dw NPCData_7a9a
+	dw ChallengeHallNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -323,7 +323,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; POKEMON_DOME_ENTRANCE
-	dw NPCData_7ab9
+	dw PokemonDomeEntranceNPCS
 	dw $0000
 	dw $7e5e
 	dw $0000
@@ -333,7 +333,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $762a
 
 ; POKEMON_DOME
-	dw NPCData_7ac0
+	dw PokemonDomeNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -343,7 +343,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $7718
 
 ; HALL_OF_HONOR
-	dw NPCData_7adf
+	dw HallOfHonorNPCS
 	dw $0000
 	dw $7ec2
 	dw $0000
-- 
cgit v1.2.3


From 3ac91a513dc9351734927182e46b0acd010053cf Mon Sep 17 00:00:00 2001
From: Andrew Martinek <andrewrmartinek@gmail.com>
Date: Thu, 24 Oct 2019 17:45:50 -0400
Subject: Uncovered NPC Movement and named OWObjects

---
 src/data/map_scripts.asm | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'src/data/map_scripts.asm')

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
-- 
cgit v1.2.3


From 3f99d5555ce7b8a2467aef9d24d7192f993343d9 Mon Sep 17 00:00:00 2001
From: Andrew Martinek <andrewrmartinek@gmail.com>
Date: Mon, 28 Oct 2019 17:25:50 -0400
Subject: extracted a lot of challenge hall scripts

---
 src/data/map_scripts.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/data/map_scripts.asm')

diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm
index 8a3dad7..f75d963 100644
--- a/src/data/map_scripts.asm
+++ b/src/data/map_scripts.asm
@@ -317,8 +317,8 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $7258
-	dw $7239
+	dw ChallengeHallLoadMap
+	dw ChallengeHallAfterDuel
 	dw $0000
 	dw $0000
 
-- 
cgit v1.2.3


From adc5a467eeccb0e44f4fcd2ed14d2b185ca1c14c Mon Sep 17 00:00:00 2001
From: Andrew Martinek <andrewrmartinek@gmail.com>
Date: Tue, 29 Oct 2019 16:35:04 -0400
Subject: Finished extracting Challenge Hall scripts

---
 src/data/map_scripts.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/data/map_scripts.asm')

diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm
index f75d963..f969d45 100644
--- a/src/data/map_scripts.asm
+++ b/src/data/map_scripts.asm
@@ -307,7 +307,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 	dw ChallengeHallLobbyObjects
 	dw $0000
-	dw $7088
+	dw ChallengeHallLobbyLoadMap
 	dw $0000
 	dw $0000
 	dw $0000
-- 
cgit v1.2.3